Changeset 9687d58 in sasview for src/sas/sasgui/plottools

Timestamp:

Apr 10, 2017 4:01:46 AM (8 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:

6c8fb2c

Parents:

9208346 (diff), c6f3aec (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:

• PlotPanel.py (modified) (1 diff)
• plottables.py (modified) (1 diff)
• config.py (modified) (3 diffs)
• toolbar.py (modified) (1 diff)

src/sas/sasgui/plottools/PlotPanel.py

@@ -452 +452 @@
         """
         self.cusor_line(event)
-        if self.gotLegend == 1:
+        if self.gotLegend == 1 and self.leftdown:
             self._on_legend_motion(event)
             return

src/sas/sasgui/plottools/plottables.py

@@ -212 +212 @@
                 self.color += plottable.colors()
                 self.plottables[plottable] = self.color
+                plottable.custom_color = self.color
 
     def changed(self):

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:
-    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

@@ -35 +35 @@
 
     # CRUFT: mpl 1.1 uses save rather than save_figure
-    try: save_figure = NavigationToolbar2WxAgg.save
-    except AttributeError: pass
+    #try: save_figure = NavigationToolbar2WxAgg.save
+    #except AttributeError: pass
     
     def _init_toolbar(self):