Changeset 8c85ac1 in sasview

Timestamp:

Nov 20, 2018 3:10:03 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

c4c4957

Parents:

87ca467

Message:

Fixed plot generation and handling in the generic scattering calc.
SASVIEW-1216

Location:

src/sas/qtgui

Files:

• Calculators/GenericScatteringCalculator.py (modified) (2 diffs)
• Plotting/Plotter2D.py (modified) (3 diffs)

src/sas/qtgui/Calculators/GenericScatteringCalculator.py

@@ -661 +661 @@
             data.xaxis('\\rm{Q_{x}}', '\AA^{-1}')
             data.yaxis('\\rm{Intensity}', 'cm^{-1}')
-            plot1D = Plotter(self, quickplot=True)
-            plot1D.plot(data)
-            plot1D.show()
+
             self.graph_num += 1
-            # TODO
-            print('TRANSFER OF DATA TO MAIN PANEL TO BE IMPLEMENTED')
-            return plot1D
         else:
             numpy.nan_to_num(self.data_to_plot)
@@ -679 +674 @@
             data.title = "GenSAS {}  #{} 2D".format(self.file_name,
                                                     int(self.graph_num))
-            plot2D = Plotter2D(self, quickplot=True)
-            plot2D.plot(data)
-            plot2D.show()
+            zeros = numpy.ones(data.data.size, dtype=bool)
+            data.mask = zeros
+
             self.graph_num += 1
             # TODO
-            print('TRANSFER OF DATA TO MAIN PANEL TO BE IMPLEMENTED')
-            return plot2D
-
+        new_item = GuiUtils.createModelItemWithPlot(data, name=data.title)
+        self.communicator.updateModelFromPerspectiveSignal.emit(new_item)
+        self.communicator.forcePlotDisplaySignal.emit([new_item, data])
 
 class Plotter3DWidget(PlotterBase):

src/sas/qtgui/Plotting/Plotter2D.py

@@ -299 +299 @@
 
         self.manager.communicator.plotUpdateSignal.emit([new_plot])
-
         self.manager.communicator.forcePlotDisplaySignal.emit([item, new_plot])
 
@@ -306 +305 @@
         Update circular averaging plot on Data2D change
         """
+        if not hasattr(self,'_item'): return
         item = self._item
         if self._item.parent() is not None:
@@ -312 +312 @@
         # Get all plots for current item
         plots = GuiUtils.plotsFromModel("", item)
+        if plots is None: return
         ca_caption = '2daverage'+self.data.name
         # See if current item plots contain 2D average plot
-        test = [ca_caption in plot.group_id for plot in plots]
+        has_plot = False
+        for plot in plots:
+            if plot.group_id is None: continue
+            if ca_caption in plot.group_id: has_plot=True
         # return prematurely if no circular average plot found
-        if not any(test): return
+        if not has_plot: return
 
         # Create a new plot