-                      rcee5c78
+                      r0231f93
         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

-                      r04ac604
+                      r0231f93
 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
 …
         color = PlotUtilities.getValidColor(color)
+        self.data.custom_color = color
         markersize = self._data.markersize
 …
                             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
 …
         self.plot_dict = {}
         plt.cla()
+        mpl.pyplot.cla()
         self.ax.cla()
 …
         # Clean the canvas
         plt.cla()
+        mpl.pyplot.cla()
         self.ax.cla()

Note: See TracChangeset for help on using the changeset viewer.

SasView