Changeset 593b5790 in sasview

Timestamp:

Jul 27, 2018 6:35:23 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

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:

3067196

Parents:

ee7e423 (diff), fce6c55 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (2 diffs)
• Plotting/Plotter2D.py (modified) (1 diff)
• Perspectives/Fitting/ViewDelegate.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -965 +965 @@
             method_name='Plotter2D'
 
-        new_plot = globals()[method_name](self, quickplot=True)
-        new_plot.data = data
+        self.new_plot = globals()[method_name](self, quickplot=True)
+        self.new_plot.data = data
         #new_plot.plot(marker='o')
-        new_plot.plot()
+        self.new_plot.plot()
 
         # Update the global plot counter
         title = "Plot " + data.name
-        new_plot.setWindowTitle(title)
+        self.new_plot.setWindowTitle(title)
 
         # Show the plot
-        new_plot.show()
+        self.new_plot.show()
 
     def quickData3DPlot(self):
@@ -988 +988 @@
         data = GuiUtils.dataFromItem(model_item)
 
-        new_plot = Plotter2D(self, quickplot=True, dimension=3)
-        new_plot.data = data
-        new_plot.plot()
+        self.new_plot = Plotter2D(self, quickplot=True, dimension=3)
+        self.new_plot.data = data
+        self.new_plot.plot()
 
         # Update the global plot counter
         title = "Plot " + data.name
-        new_plot.setWindowTitle(title)
+        self.new_plot.setWindowTitle(title)
 
         # Show the plot
-        new_plot.show()
+        self.new_plot.show()
 
     def showEditDataMask(self, data=None):

src/sas/qtgui/Plotting/Plotter2D.py

@@ -402 +402 @@
             output = copy.deepcopy(data)
 
+        # get the x and y_bin arrays.
+        x_bins, y_bins = PlotUtilities.get_bins(self.qx_data, self.qy_data)
+        self._data.x_bins = x_bins
+        self._data.y_bins = y_bins
+
         zmin_temp = self.zmin
         # check scale

src/sas/qtgui/Perspectives/Fitting/ViewDelegate.py

@@ -55 +55 @@
             text_html = GuiUtils.convertUnitToHTML(str(options.text))
             doc.setHtml(text_html)
+            doc.setDocumentMargin(1)
 
             # delete the original content