Changeset 42787fb in sasview for src/sas/qtgui

Timestamp:

May 7, 2018 7:34:50 AM (6 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:

fa05c6c1

Parents:

3c6ecd9

Message:

Fixing issues with DataOperationUtility? calculator

Location:

src/sas/qtgui

Files:

• Calculators/DataOperationUtilityPanel.py (modified) (3 diffs)
• Plotting/Plotter.py (modified) (1 diff)
• Plotting/PlotterBase.py (modified) (2 diffs)

src/sas/qtgui/Calculators/DataOperationUtilityPanel.py

@@ -181 +181 @@
         self.cbOperator.setCurrentIndex(0)
 
-        self.output = None
-        self.data1 = None
-        self.data2 = None
-        self.filenames = None
-        self.list_data_items = []
-
         self.data1OK = False
         self.data2OK = False
@@ -428 +422 @@
             # plot 1D data
             plotter = PlotterWidget(self, quickplot=True)
+            data.scale = 'linear'
             plotter.data = data
-
+            plotter.showLegend = False
             graph.setLayout(layout)
             layout.addWidget(plotter)
@@ -437 +432 @@
 
             plotter.plot(hide_error=True, marker='.')
-            # plotter.legend = None
 
             plotter.show()

src/sas/qtgui/Plotting/Plotter.py

@@ -166 +166 @@
         # Now add the legend with some customizations.
 
-        self.legend = ax.legend(loc='upper right', shadow=True)
-        if self.legend:
-            self.legend.set_picker(True)
+        if self.showLegend:
+            self.legend = ax.legend(loc='upper right', shadow=True)
+            if self.legend:
+                self.legend.set_picker(True)
 
         # Current labels for axes

src/sas/qtgui/Plotting/PlotterBase.py

@@ -76 +76 @@
         self.gotLegend = 0
 
+        self.show_legend = True
+
         # Annotations
         self.selectedText = None
@@ -174 +176 @@
         self.ax.set_xscale(scale)
         self._xscale = scale
+
+    @property
+    def showLegend(self):
+        """ Legend visibility getter """
+        return self.show_legend
+
+    @showLegend.setter
+    def showLegend(self, show=True):
+        """ Legend visibility setter """
+        self.show_legend = show
 
     def upatePlotHelper(self):