Changeset 4cdfa17 in sasview for src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

Timestamp:

Dec 12, 2018 1:04:12 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

09b7da68

Parents:

b1626bea

Message:

Moving qt parts to main thread in Invariant perspective

File:

• src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py (modified) (1 diff)

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

@@ -409 +409 @@
                                        self._model_item, high_out_data, title)
 
-        item = QtGui.QStandardItem(str(float('%.3g'% volume_fraction)))
-        self.model.setItem(WIDGETS.W_VOLUME_FRACTION, item)
-        item = QtGui.QStandardItem(str(float('%.3g'% volume_fraction_error)))
-        self.model.setItem(WIDGETS.W_VOLUME_FRACTION_ERR, item)
+        reactor.callFromThread(self.updateModelFromThread, WIDGETS.W_VOLUME_FRACTION, volume_fraction)
+        reactor.callFromThread(self.updateModelFromThread, WIDGETS.W_VOLUME_FRACTION_ERR, volume_fraction_error)
         if surface:
-            item = QtGui.QStandardItem(str(float('%.3g'% surface)))
-            self.model.setItem(WIDGETS.W_SPECIFIC_SURFACE, item)
-            item = QtGui.QStandardItem(str(float('%.3g'% surface_error)))
-            self.model.setItem(WIDGETS.W_SPECIFIC_SURFACE_ERR, item)
-        item = QtGui.QStandardItem(str(float('%.3g'% qstar_total)))
-        self.model.setItem(WIDGETS.W_INVARIANT, item)
-        item = QtGui.QStandardItem(str(float('%.3g'% qstar_total_error)))
-        self.model.setItem(WIDGETS.W_INVARIANT_ERR, item)
-
-        item = QtGui.QStandardItem(str(float('%.3g'% qstar_low)))
-        self.model.setItem(WIDGETS.D_LOW_QSTAR, item)
-        item = QtGui.QStandardItem(str(float('%.3g'% qstar_low_err)))
-        self.model.setItem(WIDGETS.D_LOW_QSTAR_ERR, item)
-        item = QtGui.QStandardItem(str(float('%.3g'% qstar_high)))
-        self.model.setItem(WIDGETS.D_HIGH_QSTAR, item)
-        item = QtGui.QStandardItem(str(float('%.3g'% qstar_high_err)))
-        self.model.setItem(WIDGETS.D_HIGH_QSTAR_ERR, item)
-
+            reactor.callFromThread(self.updateModelFromThread, WIDGETS.W_SPECIFIC_SURFACE, surface)
+            reactor.callFromThread(self.updateModelFromThread, WIDGETS.W_SPECIFIC_SURFACE_ERR,
+                                                    surface_error)
+
+        reactor.callFromThread(self.updateModelFromThread, WIDGETS.W_INVARIANT, qstar_total)
+        reactor.callFromThread(self.updateModelFromThread, WIDGETS.W_INVARIANT_ERR, qstar_total_error)
+        reactor.callFromThread(self.updateModelFromThread, WIDGETS.D_LOW_QSTAR, qstar_low)
+        reactor.callFromThread(self.updateModelFromThread, WIDGETS.D_LOW_QSTAR_ERR, qstar_low_err)
+        reactor.callFromThread(self.updateModelFromThread, WIDGETS.D_HIGH_QSTAR, qstar_high)
+        reactor.callFromThread(self.updateModelFromThread, WIDGETS.D_HIGH_QSTAR_ERR, qstar_high_err)
         return self.model
+
+
+    def updateModelFromThread(self, widget, value):
+        """
+        Update the model in the main thread
+        """
+        item = QtGui.QStandardItem(str(float('%.3g' % value)))
+        self.model.setItem(widget, item)
 
     def title(self):