Changeset 239214f in sasview for src/sas

Timestamp:

Jan 13, 2017 9:23:38 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:

0f3c22d

Parents:

2e3e959

Message:

Remove graph properties - MPL dialog is enough.
Minor fix in Plot Properties (WP review)

Location:

src/sas

Files:

• qtgui/PlotProperties.py (modified) (1 diff)
• qtgui/PlotUtilities.py (modified) (2 diffs)
• qtgui/Plotter.py (modified) (3 diffs)
• qtgui/UnitTesting/PlotPropertiesTest.py (modified) (2 diffs)
• sasgui/plottools/config.py (modified) (2 diffs)

src/sas/qtgui/PlotProperties.py

@@ -34 +34 @@
             self.cbColor.setCurrentIndex(self._color)
         else:
+            # Need the Custom entry here. "Custom" is always last.
+            self.cbColor.addItems([COLORS.keys()[-1]])
             self.cbColor.setCurrentIndex(COLORS.keys().index("Custom"))
 

src/sas/qtgui/PlotUtilities.py

@@ -3 +3 @@
 from collections import OrderedDict
 
+# MPL shapes dictionary with some extra styles rendered internally.
+# Ordered for consistent display in combo boxes
 SHAPES = OrderedDict([
         ('Circle' , 'o'),
@@ -27 +29 @@
 ])
 
+# MPL Colors dictionary. Ordered for consistent display
 COLORS = OrderedDict([
         ('Blue', 'b'),

src/sas/qtgui/Plotter.py

@@ -166 +166 @@
         # Additional menu items
         self.contextMenu.addSeparator()
-        self.actionModifyGraphAppearance =\
-            self.contextMenu.addAction("Modify Graph Appearance")
-        self.contextMenu.addSeparator()
         self.actionAddText = self.contextMenu.addAction("Add Text")
         self.actionRemoveText = self.contextMenu.addAction("Remove Text")
@@ -183 +180 @@
 
         # Define the callbacks
-        self.actionModifyGraphAppearance.triggered.connect(self.onModifyGraph)
         self.actionAddText.triggered.connect(self.onAddText)
         self.actionRemoveText.triggered.connect(self.onRemoveText)
@@ -264 +260 @@
             self.xLogLabel, self.yLogLabel = self.properties.getValues()
             self.xyTransform(self.xLogLabel, self.yLogLabel)
-
-    def onModifyGraph(self):
-        """
-        Show a dialog allowing chart manipulations
-        """
-        print ("onModifyGraph")
-        pass
 
     def onAddText(self):

src/sas/qtgui/UnitTesting/PlotPropertiesTest.py

@@ -18 +18 @@
         '''Create the PlotProperties'''
 
-        self.widget = PlotProperties(None, 
+        self.widget = PlotProperties(None,
                          color=1,
                          marker=3,
@@ -36 +36 @@
         # Check the combo boxes
         self.assertEqual(self.widget.cbColor.currentText(), "Green")
+        self.assertEqual(self.widget.cbColor.count(), 7)
         self.assertEqual(self.widget.cbShape.currentText(), "Triangle Down")
         self.assertEqual(self.widget.txtLegend.text(), "LL")
         self.assertEqual(self.widget.sbSize.value(), 10)
+
+    def testDefaultsWithCustomColor(self):
+        '''Test the GUI when called with custom color'''
+        widget = PlotProperties(None,
+                         color="#FF00FF",
+                         marker=7,
+                         marker_size=10,
+                         legend="LL")
+
+        self.assertEqual(widget.cbColor.currentText(), "Custom")
+        self.assertEqual(widget.cbColor.count(), 8)
         
     def testOnColorChange(self):

src/sas/sasgui/plottools/config.py

@@ -30 +30 @@
 __all__ = []
 
-plot_version = "0.98"
+#plot_version = "0.98"
 #plot_backend = "WXAgg"
 plot_backend = "Qt4Agg"
@@ -60 +60 @@
 matplotlib.rcParams[param] = 0.05
 matplotlib.rcParams['legend.numpoints'] = 1
+#matplotlib.rcParams['interactive'] = True
+
 
 # this should happen after initial matplotlib configuration