Changeset b4b8589 in sasview

Timestamp:

Dec 8, 2016 7:53:56 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:

fecfe28

Parents:

cad617b

Message:

Code review from WP. Also, added 1D plots with error bars as default.

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (1 diff)
• Plotter.py (modified) (3 diffs)
• Plotter2D.py (modified) (4 diffs)
• PlotterBase.py (modified) (5 diffs)

src/sas/qtgui/DataExplorer.py

@@ -411 +411 @@
                 raise AttributeError, msg
 
+
         if plots and \
-           hasattr(new_plot, 'data') and \
-           len(new_plot.data.x) > 0:
-            self.plotAdd(new_plot)
+            hasattr(new_plot, 'data') and \
+            isinstance(new_plot.data, Data1D):
+                self.plotAdd(new_plot)
 
     def plotAdd(self, new_plot):

src/sas/qtgui/Plotter.py

@@ -23 +23 @@
         self.title(title=value.title)
 
-    def plot(self, marker=None, linestyle=None):
+    def plot(self, marker=None, linestyle=None, hide_error=False):
         """
         Plot self._data
@@ -34 +34 @@
 
         if linestyle == None:
-            linestyle = '-'
-
-        # plot data with title
-        ax.plot(self._data.view.x,
-                self._data.view.y,
-                marker=marker,
-                linestyle=linestyle,
-                label=self._title)
+            linestyle = ''
+
+        # plot data with/without errorbars
+        if hide_error:
+            ax.plot(self._data.view.x, self._data.view.y,
+                    marker=marker,
+                    linestyle=linestyle,
+                    label=self._title)
+        else:
+            ax.errorbar(self._data.view.x, self._data.view.y,
+                        yerr=self._data.view.dx, xerr=None,
+                        capsize=2, linestyle='',
+                        barsabove=False,
+                        marker=marker,
+                        lolims=False, uplims=False,
+                        xlolims=False, xuplims=False,
+                        label=self._title)
 
         # Now add the legend with some customizations.
@@ -206 +215 @@
         QtGui.QDialog.__init__(self)
         PlotterWidget.__init__(self, manager=parent, quickplot=quickplot)
-
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(":/res/ball.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.setWindowIcon(icon)
+
+

src/sas/qtgui/Plotter2D.py

@@ -154 +154 @@
 
             cbax = self.figure.add_axes([0.84, 0.2, 0.02, 0.7])
+
+            # Current labels for axes
+            self.ax.set_ylabel(self.y_label)
+            self.ax.set_xlabel(self.x_label)
+
+            # Title only for regular charts
+            if not self.quickplot:
+                self.ax.set_title(label=self._title)
+
+
         else:
             # clear the previous 2D from memory
@@ -166 +176 @@
             ax = Axes3D(self.figure)
             cbax = self.figure.add_axes([0.84, 0.1, 0.02, 0.8])
+
             # Disable rotation for large sets.
             # TODO: Define "large" for a dataset
@@ -182 +193 @@
         else:
             cb = self.figure.colorbar(im, cax=cbax)
+
         cb.update_bruteforce(im)
         cb.set_label('$' + self.scale + '$')
@@ -195 +207 @@
         QtGui.QDialog.__init__(self)
         Plotter2DWidget.__init__(self, manager=parent, quickplot=quickplot, dimension=dimension)
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(":/res/ball.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.setWindowIcon(icon)

src/sas/qtgui/PlotterBase.py

@@ -14 +14 @@
 DEFAULT_CMAP = pylab.cm.jet
 from sas.qtgui.ScaleProperties import ScaleProperties
-import sas.qtgui.PlotUtilities as PlotUtilities
 import sas.qtgui.PlotHelper as PlotHelper
 
@@ -50 +49 @@
         self.qx_data = []
         self.qy_data = []
-        self.color=0
-        self.symbol=0
+        self.color = 0
+        self.symbol = 0
         self.grid_on = False
         self.scale = 'linear'
@@ -79 +78 @@
     @property
     def data(self):
+        """ data getter """
         return self._data
 
@@ -158 +158 @@
         Display the context menu
         """
-        self.contextMenu.exec_( self.canvas.mapToGlobal(event.pos()) )
+        self.contextMenu.exec_(self.canvas.mapToGlobal(event.pos()))
 
     def clean(self):
@@ -201 +201 @@
         dialog.setModal(True)
         dialog.setWindowTitle("Print")
-        if(dialog.exec_() != QtGui.QDialog.Accepted):
+        if dialog.exec_() != QtGui.QDialog.Accepted:
             return
 
         painter = QtGui.QPainter(printer)
+        # Grab the widget screenshot
+        pmap = QtGui.QPixmap.grabWidget(self)
         # Create a label with pixmap drawn
-        pmap = QtGui.QPixmap.grabWidget(self)
         printLabel = QtGui.QLabel()
         printLabel.setPixmap(pmap)