Changes in src/sas/qtgui/Plotting/Plotter.py [0231f93:b764ae5] in sasview

File:

• src/sas/qtgui/Plotting/Plotter.py (modified) (5 diffs)

src/sas/qtgui/Plotting/Plotter.py

@@ -6 +6 @@
 import copy
 import matplotlib as mpl
+import numpy as np
 from matplotlib.font_manager import FontProperties
 from sas.qtgui.Plotting.PlotterData import Data1D
@@ -130 +131 @@
         markersize = self._data.markersize
 
+        # Include scaling (log vs. linear)
+        ax.set_xscale(self.xscale, nonposx='clip')
+        ax.set_yscale(self.yscale, nonposy='clip')
+
+        # define the ranges
+        self.setRange = SetGraphRange(parent=self,
+            x_range=self.ax.get_xlim(), y_range=self.ax.get_ylim())
+
         # Draw non-standard markers
         l_width = markersize * 0.4
@@ -151 +160 @@
                         linestyle='', label=self._title, picker=True)
             else:
+                dy = self._data.view.dy
+                # Convert tuple (lo,hi) to array [(x-lo),(hi-x)]
+                if dy is not None and type(dy) == type(()):
+                    dy = np.vstack((y - dy[0], dy[1] - y)).transpose()
+
                 line = ax.errorbar(x, y,
-                            yerr=self._data.view.dy, xerr=None,
+                            yerr=dy,
+                            xerr=None,
                             capsize=2, linestyle='',
                             barsabove=False,
@@ -161 +176 @@
                             xlolims=False, xuplims=False,
                             label=self._title,
+                            zorder=1,
                             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
@@ -183 +195 @@
             ax.set_xlabel(self.x_label)
 
-        # Include scaling (log vs. linear)
-        ax.set_xscale(self.xscale)
-        ax.set_yscale(self.yscale)
-
-        # define the ranges
-        self.setRange = SetGraphRange(parent=self,
-            x_range=self.ax.get_xlim(), y_range=self.ax.get_ylim())
-
         # refresh canvas
         self.canvas.draw_idle()
+        # This is an important processEvent.
+        # This allows charts to be properly updated in order
+        # of plots being applied.
+        QtWidgets.QApplication.processEvents()
 
     def createContextMenu(self):