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

Timestamp:

Dec 8, 2016 3:46:27 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:

b4b8589, d1fb22ee

Parents:

416fa8f

Message:

Code review issues, fixing matplotlib behaviour in unit testing, minor fixes.

Location:

src/sas/sasgui/plottools

Files:

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

src/sas/sasgui/plottools/PlotPanel.py

@@ -10 +10 @@
 matplotlib.interactive(False)
 #Use the WxAgg back end. The Wx one takes too long to render
-matplotlib.use('WXAgg')
+#matplotlib.use('WXAgg')
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg
 from matplotlib.figure import Figure

src/sas/sasgui/plottools/config.py

@@ -31 +31 @@
 
 plot_version = "0.98"
-plot_backend = "WXAgg"
+#plot_backend = "WXAgg"
+plot_backend = "Qt4Agg"
 
 # Sort out matplotlib version

src/sas/sasgui/plottools/plottables.py

@@ -676 +676 @@
         # Sanity check
         # Do the transofrmation only when x and y are empty
-        has_err_x = not (dx == None or len(dx) == 0)
-        has_err_y = not (dy == None or len(dy) == 0)
-
-        if(x != None) and (y != None):
-            if not dx == None and not len(dx) == 0 and not len(x) == len(dx):
+        has_err_x = not (dx is None or len(dx) == 0)
+        has_err_y = not (dy is None or len(dy) == 0)
+
+        if(x is not None) and (y is not None):
+            if not dx is None and not len(dx) == 0 and not len(x) == len(dx):
                 msg = "Plottable.View: Given x and dx are not"
                 msg += " of the same length"
@@ -690 +690 @@
                 raise ValueError, msg
 
-            if not dy == None and not len(dy) == 0 and not len(y) == len(dy):
+            if not dy is None and not len(dy) == 0 and not len(y) == len(dy):
                 msg = "Plottable.View: Given y and dy are not of the same "
                 msg += "length: len(y)=%s, len(dy)=%s" % (len(y), len(dy))