Changeset 8548d739 in sasview for src/sas/qtgui/Perspectives

Timestamp:

Nov 29, 2016 6:08:29 AM (8 years ago)

Author:

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

ded2ce3

Parents:

adf81b8

git-author:

Piotr Rozyczko <rozyczko@…> (11/29/16 06:04:46)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/29/16 06:08:29)

Message:

Further work on the main QStandardItemModel

File:

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

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

@@ -275 +275 @@
 
             # This needs to run in the main thread
-            reactor.callFromThread(GuiUtils.updateModelItem, self._model_item, variant_item, title)
+            reactor.callFromThread(GuiUtils.updateModelItemWithPlot,
+                    self._model_item, variant_item, title)
 
         if self._high_extrapolate:
@@ -297 +298 @@
             variant_item = QtCore.QVariant(high_out_data)
             # This needs to run in the main thread
-            reactor.callFromThread(GuiUtils.updateModelItem, self._model_item, variant_item, title)
+            reactor.callFromThread(GuiUtils.updateModelItemWithPlot,
+                    self._model_item, variant_item, title)
 
         item = QtGui.QStandardItem(str(float('%.5g'% volume_fraction)))
@@ -531 +533 @@
 
         # Extract data on 1st child - this is the Data1D/2D component
-        data = self._model_item.child(0).data().toPyObject()
+        data = GuiUtils.dataFromItem(self._model_item)
         self.model.item(WIDGETS.W_FILENAME).setData(QtCore.QVariant(self._model_item.text()))