Changeset 0f3c22d in sasview

Timestamp:

Jan 16, 2017 6:05:40 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

092a3d9

Parents:

239214f

Message:

Code review for SASVIEW-383

Location:

src/sas/qtgui

Files:

• PlotProperties.py (modified) (5 diffs, 1 prop)
• Plotter.py (modified) (2 diffs)
• UnitTesting/PlotPropertiesTest.py (modified) (4 diffs)

src/sas/qtgui/PlotProperties.py

@@ -1 +1 @@
 from PyQt4 import QtGui
-
-import sas.sasview
 
 from sas.qtgui.PlotUtilities import COLORS, SHAPES
@@ -24 +22 @@
         self._legend = legend
         self._markersize = marker_size if marker_size else 5
-        self.custom_color = False
+        self.custom_color = False if isinstance(self._color, int) else True
 
         # Fill out the color combobox
@@ -68 +66 @@
             return self.cbColor.currentIndex()
 
-    def onColorChange(self, event):
+    def onColorChange(self):
         """
         Pop up the standard Qt color change dialog
         """
         # Pick up the chosen color
-        self._color = QtGui.QColorDialog.getColor(parent=self)
+        proposed_color = QtGui.QColorDialog.getColor(parent=self)
         # Update the text control
-        if self._color.isValid():
+        if proposed_color.isValid():
             # Block currentIndexChanged
             self.cbColor.blockSignals(True)
@@ -85 +83 @@
             # Save the color as #RRGGBB
             self.custom_color = True
-            self._color = str(self._color.name())
+            self._color = str(proposed_color.name())
    
-    def onColorIndexChange(self, index):
+    def onColorIndexChange(self):
         """
         Dynamically add/remove "Custom" color index
@@ -96 +94 @@
         if custom_index > -1:
             self.cbColor.removeItem(custom_index)
-
-        pass # debug hook
         

src/sas/qtgui/Plotter.py

@@ -438 +438 @@
         """
         selected_plot = self.plot_dict[id]
-        current = selected_plot.hide_error
 
         # Old style color - single integer for enum color
@@ -455 +454 @@
                                 legend=legend)
         if plotPropertiesWidget.exec_() == QtGui.QDialog.Accepted:
-            marker = plotPropertiesWidget.marker()
-            marker_size = plotPropertiesWidget.markersize()
-            color = plotPropertiesWidget.color()
-            legend = plotPropertiesWidget.legend()
-
             # Update Data1d
-            selected_plot.markersize = marker_size
-            selected_plot.custom_color = color
-            selected_plot.symbol = marker
-            selected_plot.title = legend
+            selected_plot.markersize = plotPropertiesWidget.markersize()
+            selected_plot.custom_color = plotPropertiesWidget.color()
+            selected_plot.symbol = plotPropertiesWidget.marker()
+            selected_plot.title = plotPropertiesWidget.legend()
 
             # Redraw the plot

src/sas/qtgui/UnitTesting/PlotPropertiesTest.py

@@ -57 +57 @@
         QtGui.QColorDialog.getColor = MagicMock(return_value=QtGui.QColor(255, 0, 255))
 
-        self.widget.onColorChange(None)
+        self.widget.onColorChange()
 
         self.assertEqual(self.widget.color(), "#ff00ff")
@@ -72 +72 @@
         bad_color = QtGui.QColor() # constructs an invalid color
         QtGui.QColorDialog.getColor = MagicMock(return_value=bad_color)
-        self.widget.onColorChange(None)
+        self.widget.onColorChange()
 
         self.assertEqual(self.widget.color(), 1)
@@ -83 +83 @@
         '''Test the response to color index change event'''
         # Intitial population of the color combo box
-        self.widget.onColorIndexChange(0)
+        self.widget.onColorIndexChange()
         self.assertEqual(self.widget.cbColor.count(), 7)
         # Block the callback so we can update the cb
@@ -94 +94 @@
         self.assertEqual(self.widget.cbColor.count(), 8)
         # Call the method
-        self.widget.onColorIndexChange(0)
+        self.widget.onColorIndexChange()
         # see that the Custom entry disappeared
         self.assertEqual(self.widget.cbColor.count(), 7)