Changeset dfd8233 in sasview

Timestamp:

Oct 28, 2017 11:17:49 AM (7 years ago)

Author:

krzywon

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:

c00a28ff

Parents:

26f42b1

Message:

Properly switch between data sets in P(r) view. Send all data to thread.

File:

• src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py (modified) (7 diffs)

src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

@@ -120 +120 @@
         self.enableButtons()
         self.dataList.currentIndexChanged.connect(self.displayChange)
-        self.calculateButton.clicked.connect(self._calculation)
+        self.calculateButton.clicked.connect(self.startThread)
         self.helpButton.clicked.connect(self.help)
         self.estimateBgd.toggled.connect(self.toggleBgd)
@@ -272 +272 @@
 
     def displayChange(self):
-        variant_ref = self.currentWidget()
-        self.setCurrentData(variant_ref.toPyObject()[0])
+        variant_ref = self.dataList.itemData(self.dataList.currentIndex())
+        self.setCurrentData(variant_ref.toPyObject())
 
     ######################################################################
@@ -283 +283 @@
         self._calculator.set_y(self._data_set.y)
         self._calculator.set_err(self._data_set.dy)
-
-    def _calculation(self):
-        """
-        Calculate the P(r) for every data set in the data list
-        """
-        for data_ref, pr in self._data_list.items():
-            self._data_set = GuiUtils.dataFromItem(data_ref)
-            self._calculator = pr
-            # Set data before running the calculations
-            self.update_calculator()
-            # Run
-            self.startThread()
 
     def model_changed(self):
@@ -358 +346 @@
         for data in data_item:
             self.setCurrentData(data)
+            ref_var = QtCore.QVariant(data)
+            self.populateDataComboBox(self._data_set.filename, ref_var)
 
     def setCurrentData(self, data_ref):
@@ -369 +359 @@
         self._data = data_ref
         self._data_set = GuiUtils.dataFromItem(data_ref)
-        ref = QtCore.QVariant(self._data)
-        self.populateDataComboBox(self._data_set.filename, ref)
         self._data_list[self._data] = self._calculator
 
@@ -395 +383 @@
         from Thread import CalcPr
 
-        # If a thread is already started, stop it
-        if self.calc_thread is not None and self.calc_thread.isrunning():
-            self.calc_thread.stop()
-        pr = self._calculator.clone()
-        nfunc = int(UI.TabbedInversionUI._fromUtf8(
-            self.noOfTermsInput.text()))
-        self.calc_thread = CalcPr(pr, nfunc,
-                                  error_func=self._threadError,
-                                  completefn=self._completed, updatefn=None)
-        self.calc_thread.queue()
-        self.calc_thread.ready(2.5)
+        for data_ref, pr in self._data_list.items():
+            self._data_set = GuiUtils.dataFromItem(data_ref)
+            self._calculator = pr
+            # Set data before running the calculations
+            self.update_calculator()
+
+            # If a thread is already started, stop it
+            if self.calc_thread is not None and self.calc_thread.isrunning():
+                self.calc_thread.stop()
+            pr = self._calculator.clone()
+            nfunc = int(UI.TabbedInversionUI._fromUtf8(
+                self.noOfTermsInput.text()))
+            self.calc_thread = CalcPr(pr, nfunc,
+                                      error_func=self._threadError,
+                                      completefn=self._completed, updatefn=None)
+            self.calc_thread.queue()
+            self.calc_thread.ready(2.5)
 
     def performEstimateNT(self):
@@ -437 +431 @@
         from Thread import EstimatePr
 
-        self._calculation()
+        self.startThread()
 
         # If a thread is already started, stop it