Merge pull request #1242 from chaosphere2112/text_resizing_window_place

Fixed resizing issue and added two tests to cover it

Author: doutriaux1

Packages/vcs/Lib/VTKPlots.py

@@ -1482,6 +1482,7 @@ def hideGUI(self):
       if manager_exists(self.renWin.GetInteractor()):
           manager = get_manager(self.renWin.GetInteractor())
           self.renWin.RemoveRenderer(manager.renderer)
+          self.renWin.RemoveRenderer(manager.actor_renderer)
 
   def showGUI(self, render=True):
     plot = self.get3DPlot()
@@ -1493,6 +1494,7 @@ def showGUI(self, render=True):
       if manager_exists(self.renWin.GetInteractor()):
           manager = get_manager(self.renWin.GetInteractor())
           self.renWin.AddRenderer(manager.renderer)
+          self.renWin.AddRenderer(manager.actor_renderer)
           # Bring the manager's renderer to the top of the stack
           manager.elevate()
       if render:

testing/vcs/CMakeLists.txt

@@ -645,6 +645,12 @@ cdat_add_test(vcs_test_configurator_click_marker
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_configurator_click_marker.py
 )
+cdat_add_test(vcs_test_configurator_resize
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_configurator_resize.py
+  ${BASELINE_DIR}/test_vcs_configurator_resize.png
+)
+
 cdat_add_test(vcs_test_colorpicker_appearance
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_colorpicker_appearance.py

testing/vcs/test_vcs_configurator_resize.py

@@ -0,0 +1,29 @@
+import vcs, vtk
+
+x = vcs.init()
+x.open()
+x.configure()
+
+x.backend.renWin.SetSize(814, 303)
+x.backend.renWin.Modified()
+
+fnm = "test_vcs_configurator_resize.png"
+
+win = x.backend.renWin
+win.Render()
+out_filter = vtk.vtkWindowToImageFilter()
+out_filter.SetInput(win)
+
+png_writer = vtk.vtkPNGWriter()
+png_writer.SetFileName(fnm)
+png_writer.SetInputConnection(out_filter.GetOutputPort())
+png_writer.Write()
+
+import sys, os
+if len(sys.argv) > 1:
+    pth = os.path.join(os.path.dirname(__file__), "..")
+    sys.path.append(pth)
+    import checkimage
+    src = sys.argv[1]
+    ret = checkimage.check_result_image(fnm, src, checkimage.defaultThreshold)
+    sys.exit(ret)

testing/vcs/vtk_ui/CMakeLists.txt

@@ -168,6 +168,11 @@ cdat_add_test(test_vtk_ui_white_or_black
   ${TEST_DIR}/test_vtk_ui_white_or_black.py
 )
 
+cdat_add_test(test_vtk_ui_manager_resize
+  "${PYTHON_EXECUTABLE}"
+  ${TEST_DIR}/test_vtk_ui_manager_resize.py
+  ${BASELINE_DIR}/test_vtk_ui_manager_resize.png
+)
 cdat_add_test(test_vtk_ui_textbox_blank_text
   "${PYTHON_EXECUTABLE}"
   ${TEST_DIR}/test_vtk_ui_textbox_blank_text.py

testing/vcs/vtk_ui/test_vtk_ui_manager_resize.py

@@ -0,0 +1,26 @@
+"""
+Test window resizing placing widgets correctly
+"""
+import vcs.vtk_ui
+
+from vtk_ui_test import vtk_ui_test
+
+
+class test_vtk_ui_manager_resize(vtk_ui_test):
+    def do_test(self):
+        self.win.SetSize(250, 100)
+        # Due to UV-CDAT/uvcdat#1148, have to render on screen when resizing
+        self.win.SetOffScreenRendering(0)
+
+        button = vcs.vtk_ui.Button(self.inter, label="Position me", left=10, top=10)
+        button.place()
+        button.show()
+
+        self.win.SetSize(200, 50)
+
+        self.win.Modified()
+
+        self.test_file = "test_vtk_ui_manager_resize.png"
+
+if __name__ == "__main__":
+    test_vtk_ui_manager_resize().test()