Changeset 87cc73a in sasview

Timestamp:

Jan 11, 2017 7:31:58 AM (7 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:

db5cd8d

Parents:

b46f285

Message:

Added Modify Plot Properties functionality. SASVIEW-169

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (1 diff)
• GUITests.py (modified) (2 diffs)
• LinearFit.py (modified) (1 diff)
• PlotProperties.py (added)
• PlotUtilities.py (modified) (4 diffs)
• Plotter.py (modified) (10 diffs)
• UI/PlotPropertiesUI.ui (added)
• UnitTesting/PlotPropertiesTest.py (added)
• UnitTesting/PlotUtilitiesTest.py (added)
• UnitTesting/PlotterTest.py (modified) (3 diffs)
• UnitTesting/TestUtils.py (modified) (1 diff, 1 prop)
• run_tests.bat (modified) (1 diff, 1 prop)
• run_tests.sh (modified) (1 diff, 1 prop)

src/sas/qtgui/DataExplorer.py

@@ -769 +769 @@
         new_plot = globals()[method_name](self, quickplot=True)
         new_plot.data = data
-        new_plot.plot(marker='o', linestyle='')
+        new_plot.plot(marker='o')
 
         # Update the global plot counter

src/sas/qtgui/GUITests.py

@@ -21 +21 @@
 from UnitTesting import SetGraphRangeTest
 from UnitTesting import LinearFitTest
+from UnitTesting import PlotPropertiesTest
+from UnitTesting import PlotUtilitiesTest
 
 def suite():
@@ -44 +46 @@
         unittest.makeSuite(SetGraphRangeTest.SetGraphRangeTest, 'test'),
         unittest.makeSuite(LinearFitTest.LinearFitTest, 'test'),
+        unittest.makeSuite(PlotPropertiesTest.PlotPropertiesTest, 'test'),
+        unittest.makeSuite(PlotUtilitiesTest.PlotUtilitiesTest, 'test'),
     )
     return unittest.TestSuite(suites)

src/sas/qtgui/LinearFit.py

@@ -259 +259 @@
             return numpy.sqrt(numpy.sqrt(numpy.power(10, x)))
         return x
+
+

src/sas/qtgui/PlotUtilities.py

@@ -1 +1 @@
 import sys
 import numpy
-
+from collections import OrderedDict
+
+SHAPES = OrderedDict([
+        ('Circle' , 'o'),
+        ('Point' , '.'),
+        ('Pixel' , ','),
+        ('Triangle Down' , 'v'),
+        ('Triangle Up' , '^'),
+        ('Triangle Left' , '<'),
+        ('Triangle Right' , '>'),
+        ('Octagon' , '8'),
+        ('Square' , 's'),
+        ('Pentagon' , 'p'),
+        ('Star' , '*'),
+        ('Hexagon1' , 'h'),
+        ('Hexagon2' , 'H'),
+        ('Cross +' , 'p'),
+        ('Cross X ' , 'x'),
+        ('Diamond' , 'D'),
+        ('Thin Diamond' , 'd'),
+        ('Line' , '-'),
+        ('Dash' , '--'),
+        ('Vline' , 'vline'),
+        ('Step' , 'step'),
+])
+
+COLORS = OrderedDict([
+        ('Blue', 'b'),
+        ('Green', 'g'),
+        ('Red', 'r'),
+        ('Cyan', 'c'),
+        ('Magenta', 'm'),
+        ('Yellow', 'y'),
+        ('Black', 'k'),
+        ('Custom', 'x'),
+])
 
 def build_matrix(data, qx_data, qy_data):
@@ -57 +92 @@
         if loop >= max_loop:  # this protects never-ending loop
             break
-        image = fillup_pixels(image=image, weights=weights)
+        image = fillupPixels(image=image, weights=weights)
         loop += 1
 
@@ -108 +143 @@
     return x_bins, y_bins
 
-def fillup_pixels(image=None, weights=None):
+def fillupPixels(image=None, weights=None):
     """
     Fill z values of the empty cells of 2d image matrix
@@ -221 +256 @@
     return (lo, hi)
 
+def getValidColor(color):
+    '''
+    Returns a valid matplotlib color
+    '''
+
+    if color is not None:
+        # Check if it's an int
+        if isinstance(color, int):
+            # Check if it's within the range
+            if 0 <= color <=6:
+                color = COLORS.values()[color]
+        # Check if it's an RGB string
+        elif isinstance(color, str):
+            # Assure the correctnes of the string
+            assert(color[0]=="#" and len(color) == 7)
+            import string
+            assert(all(c in string.hexdigits for c in color[1:]))
+        else:
+            raise AttributeError
+
+    return color

src/sas/qtgui/Plotter.py

@@ -13 +13 @@
 from sas.qtgui.SetGraphRange import SetGraphRange
 from sas.qtgui.LinearFit import LinearFit
+from sas.qtgui.PlotProperties import PlotProperties
+import sas.qtgui.PlotUtilities as PlotUtilities
 
 class PlotterWidget(PlotterBase):
@@ -59 +61 @@
         self.title(title=value.name)
 
-    def plot(self, data=None, marker=None, linestyle=None, hide_error=False):
+    def plot(self, data=None, color=None, marker=None, hide_error=False):
         """
         Add a new plot of self._data to the chart.
@@ -68 +70 @@
         assert(self._data)
 
-        is_fit = (self._data.id=="fit")
-
-        # Shortcut for the current axis
+        is_fit = (self.data.id=="fit")
+
+        # Shortcuts
         ax = self.ax
-
-        if marker == None:
-            marker = 'o'
-
-        if linestyle == None:
-            linestyle = ''
-
-        if not self._title:
-            self.title(title=self.data.name)
-
-        # plot data with/without errorbars
-        if hide_error:
-            line = ax.plot(self._data.view.x, self._data.view.y,
-                    marker=marker,
-                    linestyle=linestyle,
-                    label=self._title,
-                    picker=True)
+        x = self._data.view.x
+        y = self._data.view.y
+
+        # Marker symbol. Passed marker is one of matplotlib.markers characters
+        # Alternatively, picked up from Data1D as an int index of PlotUtilities.SHAPES dict
+        if marker is None:
+            marker = self.data.symbol
+            marker = PlotUtilities.SHAPES.values()[marker]
+
+        # Plot name
+        self.title(title=self.data.title)
+
+        # Error marker toggle
+        if hide_error is None:
+            hide_error = self.data.hide_error
+
+        # Plot color
+        if color is None:
+            color = self.data.custom_color
+
+        color = PlotUtilities.getValidColor(color)
+
+        markersize = self._data.markersize
+
+        # Draw non-standard markers
+        l_width = markersize * 0.4
+        if marker == '-' or marker == '--':
+            line = self.ax.plot(x, y, color=color, lw=l_width, marker='',
+                             linestyle=marker, label=self._title, zorder=10)[0]
+
+        elif marker == 'vline':
+            y_min = min(y)*9.0/10.0 if min(y) < 0 else 0.0
+            line = self.ax.vlines(x=x, ymin=y_min, ymax=y, color=color,
+                            linestyle='-', label=self._title, lw=l_width, zorder=1)
+
+        elif marker == 'step':
+            line = self.ax.step(x, y, color=color, marker='', linestyle='-',
+                                label=self._title, lw=l_width, zorder=1)[0]
+
         else:
-            line = ax.errorbar(self._data.view.x, self._data.view.y,
-                        yerr=self._data.view.dy, xerr=None,
-                        capsize=2, linestyle='',
-                        barsabove=False,
-                        marker=marker,
-                        lolims=False, uplims=False,
-                        xlolims=False, xuplims=False,
-                        label=self._title,
-                        picker=True)
+            # plot data with/without errorbars
+            if hide_error:
+                line = ax.plot(x, y, marker=marker, color=color, markersize=markersize,
+                        linestyle='', label=self._title, picker=True)
+            else:
+                line = ax.errorbar(x, y,
+                            yerr=self._data.view.dy, xerr=None,
+                            capsize=2, linestyle='',
+                            barsabove=False,
+                            color=color,
+                            marker=marker,
+                            markersize=markersize,
+                            lolims=False, uplims=False,
+                            xlolims=False, xuplims=False,
+                            label=self._title,
+                            picker=True)
 
         # Update the list of data sets (plots) in chart
@@ -112 +143 @@
         if self.x_label and not is_fit:
             ax.set_xlabel(self.x_label)
-
-        # Title only for regular charts
-        if not self.quickplot and not is_fit:
-            ax.set_title(label=self._title)
 
         # Include scaling (log vs. linear)
@@ -170 +197 @@
         for id in self.plot_dict.keys():
             plot = self.plot_dict[id]
-            name = plot.name
+            #name = plot.name
+            name = plot.title
             plot_menu = self.contextMenu.addMenu('&%s' % name)
 
@@ -210 +238 @@
 
             self.actionModifyPlot = plot_menu.addAction('&Modify Plot Property')
-            self.actionModifyPlot.triggered.connect(self.onModifyPlot)
+            self.actionModifyPlot.triggered.connect(
+                                functools.partial(self.onModifyPlot, id))
 
     def createContextMenuQuick(self):
@@ -361 +390 @@
             return
 
+    def replacePlot(self, id, new_plot):
+        """
+        Remove plot 'id' and add 'new_plot' to the chart.
+        This effectlvely refreshes the chart with changes to one of its plots
+        """
+        self.removePlot(id)
+        self.plot(data=new_plot)
+
     def onRemovePlot(self, id):
         """
@@ -407 +444 @@
         self.manager.add_data(data_list=[plot])
 
-    def onModifyPlot(self):
+    def onModifyPlot(self, id):
         """
         Allows for MPL modifications to the selected plot
         """
-        pass
+        selected_plot = self.plot_dict[id]
+        current = selected_plot.hide_error
+
+        # Old style color - single integer for enum color
+        # New style color - #hhhhhh
+        color = selected_plot.custom_color
+        # marker symbol and size
+        marker = selected_plot.symbol
+        marker_size = selected_plot.markersize
+        # plot name
+        legend = selected_plot.title
+
+        plotPropertiesWidget = PlotProperties(self,
+                                color=color,
+                                marker=marker,
+                                marker_size=marker_size,
+                                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
+
+            # Redraw the plot
+            self.replacePlot(id, selected_plot)
 
     def onToggleHideError(self, id):
@@ -461 +528 @@
             # Directly overwrite the data to avoid label reassignment
             self._data = current_plot
-            self.plot(marker='o', linestyle='')
+            self.plot()
 
         pass # debug hook
@@ -491 +558 @@
 
         # Plot the line
-        self.plot(data=self.fit_result, marker='', linestyle='solid', hide_error=True)
+        self.plot(data=self.fit_result, marker='-', hide_error=True)
 
 

src/sas/qtgui/UnitTesting/PlotterTest.py

@@ -13 +13 @@
 from sas.sasgui.guiframe.dataFitting import Data1D
 from sas.sasgui.guiframe.dataFitting import Data2D
-from UnitTesting.TestUtils import QtSignalSpy
+from UnitTesting.TestUtils import WarningNotImplemented
 
 # Tested module
@@ -19 +19 @@
 
 app = QtGui.QApplication(sys.argv)
+
 
 class PlotterTest(unittest.TestCase):
@@ -223 +224 @@
     def testOnLinearFit(self):
         """ Checks the response to LinearFit call """
-        pass
+        WarningNotImplemented(sys._getframe().f_code.co_name)
 
     def testOnRemovePlot(self):
         """ Assure plots get removed when requested """
-        pass
+        WarningNotImplemented(sys._getframe().f_code.co_name)
 
     def testRemovePlot(self):
         """ Test plot removal """
-        pass
+        WarningNotImplemented(sys._getframe().f_code.co_name)
 
     def testOnToggleHideError(self):
         """ Test the error bar toggle on plots """
-        pass
+        WarningNotImplemented(sys._getframe().f_code.co_name)
 
     def testOnFitDisplay(self):
         """ Test the fit line display on the chart """
-        pass
+        WarningNotImplemented(sys._getframe().f_code.co_name)
+
+    def testReplacePlot(self):
+        """ Test the plot refresh functionality """
+        WarningNotImplemented(sys._getframe().f_code.co_name)
+
+    def testReplacePlot(self):
+        """ Test the plot refresh functionality """
+        WarningNotImplemented(sys._getframe().f_code.co_name)
+
+    def testOnModifyPlot(self):
+        """ Test the functionality for changing plot properties """
+        WarningNotImplemented(sys._getframe().f_code.co_name)
 
 if __name__ == "__main__":

src/sas/qtgui/UnitTesting/TestUtils.py

@@ -2 +2 @@
 from PyQt4.QtGui import *
 from PyQt4.QtTest import *
+
+def WarningNotImplemented(method_name):
+    """ Prints warning about a non-implemented test """
+    print("\nWARNING: %s needs implementing!"%method_name)
 
 class QtSignalSpy(QObject):

src/sas/qtgui/run_tests.bat

@@ -20 +20 @@
 python -m UnitTesting.SetGraphRangeTest
 python -m UnitTesting.LinearFitTest
+python -m UnitTesting.PlotPropertiesTest
+python -m UnitTesting.PlotUtilitiesTest

src/sas/qtgui/run_tests.sh

@@ -19 +19 @@
 python -m UnitTesting.SetGraphRangeTest
 python -m UnitTesting.LinearFitTest
+python -m UnitTesting.PlotPropertiesTest
+python -m UnitTesting.PlotUtilitiesTest