Changeset 0231f93 in sasview

Timestamp:

Aug 31, 2018 5:55:51 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

aa1db44

Parents:

eef298d4

git-author:

Piotr Rozyczko <rozyczko@…> (08/31/18 05:55:03)

git-committer:

Piotr Rozyczko <rozyczko@…> (08/31/18 05:55:51)

Message:

Improved line colour handling for 1D data charts.

Location:

src/sas/qtgui/Plotting

Files:

• PlotUtilities.py (modified) (1 diff)
• Plotter.py (modified) (5 diffs)

src/sas/qtgui/Plotting/PlotUtilities.py

@@ -274 +274 @@
         if 0 <= color <=6:
             color = list(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)
-        assert(all(c in string.hexdigits for c in color[1:]))
+        # This could be a one letter code
+        if len(color) == 1:
+            if not color in list (COLORS.values()):
+                raise AttributeError
+        else:
+            # or an RGB string
+            assert(color[0]=="#" and len(color) == 7)
+            assert(all(c in string.hexdigits for c in color[1:]))
     else:
         raise AttributeError

src/sas/qtgui/Plotting/Plotter.py

@@ -5 +5 @@
 import functools
 import copy
-import matplotlib.pyplot as plt
+import matplotlib as mpl
 from matplotlib.font_manager import FontProperties
 from sas.qtgui.Plotting.PlotterData import Data1D
@@ -126 +126 @@
 
         color = PlotUtilities.getValidColor(color)
+        self.data.custom_color = color
 
         markersize = self._data.markersize
@@ -162 +163 @@
                             picker=True)
 
+        # Now we know what the potential new color is, let's save it
+        if isinstance(line, mpl.lines.Line2D):
+            self.data.custom_color = line.get_color()
+
         # Update the list of data sets (plots) in chart
         self.plot_dict[self._data.id] = self.data
@@ -433 +438 @@
         self.plot_dict = {}
 
-        plt.cla()
+        mpl.pyplot.cla()
         self.ax.cla()
 
@@ -496 +501 @@
 
         # Clean the canvas
-        plt.cla()
+        mpl.pyplot.cla()
         self.ax.cla()