Changeset b789967 in sasview for src/sas

Timestamp:

Feb 4, 2017 1:01:26 PM (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:

e712ca5

Parents:

965fbd8

Message:

More minor fixes to plotting

Location:

src/sas/qtgui

Files:

• Perspectives/Invariant/InvariantPerspective.py (modified) (2 diffs)
• Plotter.py (modified) (3 diffs)
• Plotter2D.py (modified) (2 diffs)
• SlicerParameters.py (modified) (2 diffs, 1 prop)

src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

@@ -270 +270 @@
             extrapolated_data = self._manager.createGuiData(extrapolated_data)
             extrapolated_data.name = title
+            extrapolated_data.title = title
 
             # Add the plot to the model item
@@ -288 +289 @@
             high_out_data = inv.get_extra_data_high(q_end=qmax_plot, npts=500)
 
+            # Plot the chart
+            title = "High-Q extrapolation"
+
             # Convert the data into plottable
             high_out_data = self._manager.createGuiData(high_out_data)
             high_out_data.name = title
-
-            # find how to add this plot to the existing plot for low_extrapolate
-            # Plot the chart
-            title = "High-Q extrapolation"
+            high_out_data.title = title
 
             # Add the plot to the model item

src/sas/qtgui/Plotter.py

@@ -82 +82 @@
 
         # Plot name
-        self.title(title=self.data.title)
+        if self.data.title:
+            self.title(title=self.data.title)
+        else:
+            self.title(title=self.data.name)
 
         # Error marker toggle
@@ -134 +137 @@
         # Now add the legend with some customizations.
         self.legend = ax.legend(loc='upper right', shadow=True)
-        self.legend.set_picker(True)
+        if self.legend:
+            self.legend.set_picker(True)
 
         # Current labels for axes
@@ -191 +195 @@
         for id in self.plot_dict.keys():
             plot = self.plot_dict[id]
-            #name = plot.name
-            name = plot.title
+
+            name = plot.name if plot.name else plot.title
             plot_menu = self.contextMenu.addMenu('&%s' % name)
 

src/sas/qtgui/Plotter2D.py

@@ -201 +201 @@
         Remove all sclicers from the chart
         """
-        if self.slicer:
-            self.slicer.clear()
-            self.canvas.draw()
-            self.slicer = None
+        if self.slicer is None:
+            return
+
+        self.slicer.clear()
+        self.canvas.draw()
+        self.slicer = None
 
     def onEditSlicer(self):
@@ -215 +217 @@
          # Pass the model to the Slicer Parameters widget
         self.slicer_widget = SlicerParameters(self, model=self.param_model)
+        self.manager.parent.workspace().addWindow(self.slicer_widget)
+
         self.slicer_widget.show()
 

src/sas/qtgui/SlicerParameters.py

@@ -30 +30 @@
         # Disallow edit of the parameter name column.
         self.lstParams.model().setColumnReadOnly(0, True)
+
+        # Disable row number display
+        self.lstParams.verticalHeader().setVisible(False)
 
         # Specify the validator on the parameter value column.
@@ -68 +71 @@
             editor = QtGui.QLineEdit(widget)
             validator = QtGui.QDoubleValidator()
+            # Don't use the scientific notation, cause 'e'.
+            validator.setNotation(QtGui.QDoubleValidator.StandardNotation)
             editor.setValidator(validator)
             return editor