Changes in src/sas/qtgui/Calculators/GenericScatteringCalculator.py [8c85ac1:133812c7] in sasview

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)
@@ -674 +679 @@
             data.title = "GenSAS {}  #{} 2D".format(self.file_name,
                                                     int(self.graph_num))
-            zeros = numpy.ones(data.data.size, dtype=bool)
-            data.mask = zeros
-
+            plot2D = Plotter2D(self, quickplot=True)
+            plot2D.plot(data)
+            plot2D.show()
             self.graph_num += 1
             # TODO
-        new_item = GuiUtils.createModelItemWithPlot(data, name=data.title)
-        self.communicator.updateModelFromPerspectiveSignal.emit(new_item)
-        self.communicator.forcePlotDisplaySignal.emit([new_item, data])
+            print('TRANSFER OF DATA TO MAIN PANEL TO BE IMPLEMENTED')
+            return plot2D
+
 
 class Plotter3DWidget(PlotterBase):