Changeset 1042dba in sasview for src/sas/qtgui/Perspectives

Timestamp:

Jun 17, 2016 9:56:01 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.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:

9e426c1

Parents:

a281ab8

Message:

Plottables support in the data object. Additional menu items.

File:

• src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py (modified) (4 diffs)

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

@@ -7 +7 @@
 
 from twisted.internet import threads
+from twisted.internet import reactor
 
 # sas-global
 from sas.sascalc.invariant import invariant
 from sas.sasgui.guiframe.dataFitting import Data1D
-from sas.qtgui.GuiUtils import Communicate
-from sas.qtgui.GuiUtils import updateModelItem
+# from sas.qtgui.GuiUtils import *
+from GuiUtils import *
 
 # local
@@ -262 +263 @@
             self._plotter.plot()
 
+            # Convert the data into plottable
+            extrapolated_data = self._manager.createGuiData(extrapolated_data)
+
             # Add the plot to the model item
-            variant_item = QtCore.QVariant(self._plotter)
-            updateModelItem(self._model_item, variant_item, title)
+            # variant_item = QtCore.QVariant(self._plotter)
+            variant_item = QtCore.QVariant(extrapolated_data)
+
+            # This needs to run in the main thread
+            reactor.callFromThread(updateModelItem, self._model_item, variant_item, title)
 
         if self._high_extrapolate:
@@ -275 +282 @@
             high_out_data = inv.get_extra_data_high(q_end=qmax_plot, npts=500)
 
+            # Convert the data into plottable
+            high_out_data = self._manager.createGuiData(high_out_data)
+
             # find how to add this plot to the existing plot for low_extrapolate
             # Plot the chart
@@ -283 +293 @@
 
             # Add the plot to the model item
-            variant_item = QtCore.QVariant(self._plotter)
-            updateModelItem(self._model_item, variant_item, title)
-
+            # variant_item = QtCore.QVariant(self._plotter)
+            variant_item = QtCore.QVariant(high_out_data)
+            # This needs to run in the main thread
+            reactor.callFromThread(updateModelItem, self._model_item, variant_item, title)
 
         item = QtGui.QStandardItem(str(float('%.5g'% volume_fraction)))