Changeset 505357a in sasview

Timestamp:

Oct 25, 2017 6:12:37 AM (6 years ago)

Author:

Adam Washington <adam.washington@…>

Children:

9c1e5628

Parents:

dc57b4f

Message:

Better threadsafety through signals

File:

• src/sas/qtgui/Perspectives/Corfunc/CorfuncPerspective.py (modified) (3 diffs)

src/sas/qtgui/Perspectives/Corfunc/CorfuncPerspective.py

@@ -94 +94 @@
     name = "Corfunc"  # For displaying in the combo box
 
+    trigger = QtCore.pyqtSignal(QtCore.QVariant)
+
 # pylint: disable=unused-argument
     def __init__(self, parent=None):
@@ -133 +135 @@
 
         self.model.itemChanged.connect(self.model_changed)
+
+        self.trigger.connect(self.finish_transform)
 
     def setup_model(self):
@@ -204 +208 @@
         def completefn(transforms):
             """Extract the values from the transforms and plot"""
-            self._realplot.data = transforms
-            self._realplot.draw_real_space()
-            params = self._calculator.extract_parameters(transforms[0])
-            self.model.setItem(W.W_CORETHICK,
-                               QtGui.QStandardItem(str(params['d0'])))
-            self.model.setItem(W.W_INTTHICK,
-                               QtGui.QStandardItem(str(params['dtr'])))
-            self.model.setItem(W.W_HARDBLOCK,
-                               QtGui.QStandardItem(str(params['Lc'])))
-            self.model.setItem(W.W_CRYSTAL,
-                               QtGui.QStandardItem(str(params['fill'])))
-            self.model.setItem(W.W_POLY,
-                               QtGui.QStandardItem(str(params['A'])))
-            self.model.setItem(W.W_PERIOD,
-                               QtGui.QStandardItem(str(params['max'])))
+            self.trigger.emit(transforms)
 
         self._update_calculator()
         self._calculator.compute_transform(extrap, method, background,
                                            completefn, updatefn)
+
+
+    def finish_transform(self, transforms):
+        transforms = transforms.toPyObject()
+        print(transforms)
+        params = self._calculator.extract_parameters(transforms[0])
+        self.model.setItem(W.W_CORETHICK,
+                           QtGui.QStandardItem(str(params['d0'])))
+        self.model.setItem(W.W_INTTHICK,
+                           QtGui.QStandardItem(str(params['dtr'])))
+        self.model.setItem(W.W_HARDBLOCK,
+                           QtGui.QStandardItem(str(params['Lc'])))
+        self.model.setItem(W.W_CRYSTAL,
+                           QtGui.QStandardItem(str(params['fill'])))
+        self.model.setItem(W.W_POLY,
+                           QtGui.QStandardItem(str(params['A'])))
+        self.model.setItem(W.W_PERIOD,
+                           QtGui.QStandardItem(str(params['max'])))
+        self._realplot.data = transforms
+        self._realplot.draw_real_space()
 
     def setup_mapper(self):