Merge pull request #1258 from chaosphere2112/colorpicker_renderer_sel…

…ection Colorpicker renderer selection
CDAT · May 4, 2015 · 32f3893 · 32f3893
2 parents c4c39c0 + 7ae5bf7
commit 32f3893
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/Packages/vcs/Lib/colorpicker.py b/Packages/vcs/Lib/colorpicker.py
@@ -120,7 +120,7 @@ def cancel(self, state):
         self.close()
 
     def selectCell(self, cellId):
-        if cellId == -1:
+        if cellId in (None, -1):
             return
         ids = vtk.vtkIdTypeArray();
         ids.SetNumberOfComponents(1);
@@ -152,7 +152,7 @@ def clickEvent(self, obj, event):
 
         x, y = inter.GetEventPosition()
 
-        renderer = self.topRendererAtPoint(x, y)
+        renderer = self.color_renderer
 
         if renderer:
             picker = vtk.vtkCellPicker()

diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
@@ -628,6 +628,11 @@ cdat_add_test(vcs_test_endconfigure
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_endconfigure.py
 )
 
+cdat_add_test(vcs_test_colorpicker_selection
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_colorpicker_selection.py
+)
+
 cdat_add_test(vcs_test_configurator_click_text
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_configurator_click_text.py

diff --git a/testing/vcs/test_vcs_colorpicker_selection.py b/testing/vcs/test_vcs_colorpicker_selection.py
@@ -0,0 +1,19 @@
+import vcs, sys
+
+passing = False
+
+
+def save_clicked(colormap, color):
+    if color == 135:
+        global passing
+        passing = True
+
+
+picker = vcs.colorpicker.ColorPicker(500, 500, None, None, on_save=save_clicked)
+
+interactor = picker.render_window.GetInteractor()
+interactor.SetEventInformation(250, 260)
+picker.clickEvent(None, None)
+picker.save(0)
+
+sys.exit(0 if passing else 1)