Changeset 0f3c22d in sasview for src/sas/qtgui/PlotProperties.py

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

File:

• src/sas/qtgui/PlotProperties.py (modified) (5 diffs, 1 prop)

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