Changeset 706bb4e in sasview for src/sas/sasgui/plottools

Timestamp:

Sep 18, 2017 10:20:29 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, 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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

60a7820

Parents:

460d3a1 (diff), cfd27dd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket-887-reorg

Location:

src/sas/sasgui/plottools

Files:

• plottables.py (modified) (1 diff)
• __init__.py (modified) (1 diff)
• config.py (modified) (1 diff)

src/sas/sasgui/plottools/plottables.py

@@ -239 +239 @@
     def replace(self, plottable):
         """Replace an existing plottable from the graph"""
-        selected_color = None
+        # If the user has set a custom color, ensure the new plot is the same color
+        selected_color = plottable.custom_color
         selected_plottable = None
         for p in self.plottables.keys():
             if plottable.id == p.id:
                 selected_plottable = p
-                selected_color = self.plottables[p]
+                if selected_color is None:
+                    selected_color = self.plottables[p]
                 break
-        if  selected_plottable is not None and selected_color is not None:
+        if selected_plottable is not None and selected_color is not None:
             del self.plottables[selected_plottable]
+            plottable.custom_color = selected_color
             self.plottables[plottable] = selected_color
 

src/sas/sasgui/plottools/__init__.py

@@ -1 @@
-import config
 from PlotPanel import PlotPanel
 from plottables import Data1D, Theory1D

src/sas/sasgui/plottools/config.py

@@ -38 +38 @@
     import pkg_resources
     pkg_resources.require("matplotlib>=" + plot_version)
-except:
+except ImportError:
     from distutils.version import LooseVersion as Version
     if Version(matplotlib.__version__) < Version(plot_version):