Changeset facf4ca in sasview for src/sas/qtgui/Plotting/Plotter.py

Timestamp:

Sep 3, 2018 3:32:31 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

f4a6f2c

Parents:

c1cfa80

Message:

Fixed erroneous error bars. SASVIEW-994

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, nonposy='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)
 
@@ -183 +199 @@
             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())
+        #self.setRange = SetGraphRange(parent=self,
+        #    x_range=self.ax.get_xlim(), y_range=self.ax.get_ylim())
 
         # refresh canvas