Changeset f4a1433 in sasview for src/sas/sasgui/plottools

Timestamp:

Oct 24, 2017 2:44:26 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:

fca1f50, d6b234b

Parents:

16afe01 (diff), 5582b078 (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 ESS_GUI

Location:

src/sas/sasgui/plottools

Files:

• LineModel.py (modified) (4 diffs)
• __init__.py (modified) (1 diff)
• plottables.py (modified) (1 diff)
• config.py (modified) (3 diffs)
• toolbar.py (modified) (1 diff)

src/sas/sasgui/plottools/LineModel.py

@@ -2 +2 @@
 """
 Provide Line function (y= Ax + B). Until July 10, 2016 this function provided
-(y= A + Bx).  This however was contrary to all the other code using it which 
+(y= A + Bx).  This however was contrary to all the other code using it which
 assumed (y= mx+b) or in this nomenclature (y=Ax + B). This lead to some
 contortions in the code and worse incorrect calculations until now for at least
@@ -67 +67 @@
         Evaluate the model
 
-        :note: This is the function called by fitDialog to calculate the
-        the y(xmin) and y(xmax), but the only difference between this and
-        runXY is when the if statement is true. I however cannot see what that
-        function is for.  It needs to be documented here or removed.
-        PDB 7/10/16 
-
         :param x: simple value
 
         :return: (Line value)
+
+        .. note::
+            This is the function called by fitDialog to calculate the
+            the y(xmin) and y(xmax), but the only difference between this and
+            runXY is when the if statement is true. I however cannot see what
+            that function is for.  It needs to be documented here or removed.
+            PDB 7/10/16
         """
         if x.__class__.__name__ == 'list':
@@ -89 +90 @@
         """
         Evaluate the model.
-        
-        :note: This is to be what is called by fitDialog for the actual fit
-        but the only difference between this and run is when the if 
-        statement is true. I however cannot see what that function
-        is for.  It needs to be documented here or removed. PDB 7/10/16 
 
         :param x: simple value
@@ -99 +95 @@
         :return: Line value
 
+        .. note::
+            This is to be what is called by fitDialog for the actual fit
+            the only difference between this and run is when the if
+            statement is true. I however cannot see what that function
+            is for.  It needs to be documented here or removed. PDB 7/10/16
         """
         if x.__class__.__name__ == 'list':

src/sas/sasgui/plottools/__init__.py

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

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/config.py

@@ -30 +30 @@
 __all__ = []
 
-plot_version = "0.98"
-plot_backend = "WXAgg"
+#plot_version = "0.98"
+#plot_backend = "WXAgg"
+plot_backend = "Qt4Agg"
 
 # Sort out matplotlib version
 import matplotlib
-try:
-    import pkg_resources
-    pkg_resources.require("matplotlib>=" + plot_version)
-except ImportError:
-    from distutils.version import LooseVersion as Version
-    if Version(matplotlib.__version__) < Version(plot_version):
-        msg = "Matplotlib version must be %s or newer" % (plot_version, )
-        raise ImportError(msg)
+#try:
+#    import pkg_resources
+#    pkg_resources.require("matplotlib>=" + plot_version)
+#except:
+#    from distutils.version import LooseVersion as Version
+#    if Version(matplotlib.__version__) < Version(plot_version):
+#        msg = "Matplotlib version must be %s or newer" % (plot_version, )
+#        raise ImportError(msg)
 
 # Sort out matplotlib backend
@@ -51 +52 @@
 elif matplotlib.get_backend() != plot_backend:
     # if a backend has already been selected, make sure it is the correct one.
-    raise ImportError("Matplotlib not using backend " + plot_backend)
+    #raise ImportError("Matplotlib not using backend " + plot_backend)
+    pass
 
 # set global plot style
@@ -58 +60 @@
 matplotlib.rcParams[param] = 0.05
 matplotlib.rcParams['legend.numpoints'] = 1
+#matplotlib.rcParams['interactive'] = True
+
 
 # this should happen after initial matplotlib configuration
-from .toolbar import NavigationToolBar
-from matplotlib.backends import backend_wxagg
-backend_wxagg.NavigationToolbar2WxAgg = NavigationToolBar
+#from .toolbar import NavigationToolBar
+#from matplotlib.backends import backend_wxagg
+#backend_wxagg.NavigationToolbar2WxAgg = NavigationToolBar
 
 # CRUFT: bumps 0.7.5.6 and older uses wrong toolbar
-backend_wxagg.NavigationToolbar2Wx = NavigationToolBar
+#backend_wxagg.NavigationToolbar2Wx = NavigationToolBar

src/sas/sasgui/plottools/toolbar.py

@@ -171 +171 @@
     wx.TheClipboard.SetData(bmp)
     wx.TheClipboard.Close()
-
-