Changeset facf4ca in sasview

Timestamp:

Sep 3, 2018 5: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

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (1 diff)
• Plotting/PlotProperties.py (modified) (1 diff)
• Plotting/Plottables.py (modified) (2 diffs)
• Plotting/Plotter.py (modified) (5 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -544 +544 @@
                 # 'sophisticated' test to generate standalone plot for residuals
                 if 'esiduals' in plot.title:
-                    self.plotData([(item, plot)], transform=False)
+                    plot.yscale='linear'
+                    self.plotData([(item, plot)])
                 else:
                     new_plots.append((item, plot))

src/sas/qtgui/Plotting/PlotProperties.py

@@ -24 +24 @@
         self._color = color if color else 0
         self._legend = legend
-        self._markersize = marker_size if marker_size else 5
+        self._markersize = marker_size if marker_size else 3
         self.custom_color = False if isinstance(self._color, int) else True
 

src/sas/qtgui/Plotting/Plottables.py

@@ -438 +438 @@
     interactive = True
     custom_color = None
-    markersize = 5  # default marker size is 'size 5'
+    markersize = 3  # default marker size is 'size 3'
 
     def __init__(self):
@@ -1046 +1046 @@
         self.symbol = 0
         self.custom_color = None
-        self.markersize = 5
+        self.markersize = 3
         self.id = None
         self.zorder = 1

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