Changeset 8c85ac1 in sasview for src/sas/qtgui/Calculators/GenericScatteringCalculator.py

Timestamp:

Nov 20, 2018 1:10:03 AM (5 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

File:

• src/sas/qtgui/Calculators/GenericScatteringCalculator.py (modified) (2 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):