Merge pull request #1014 from vasole/fast

Stack Plugins compatibility with CalculationThread
vasole · Jun 16, 2023 · 5803249 · 5803249
2 parents 047a6ea + f1e901f
commit 5803249
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 39 deletions.
diff --git a/PyMca5/PyMcaPlugins/CalculationThread.py b/PyMca5/PyMcaPlugins/CalculationThread.py
diff --git a/PyMca5/PyMcaPlugins/FastXRFLinearFitStackPlugin.py b/PyMca5/PyMcaPlugins/FastXRFLinearFitStackPlugin.py
@@ -146,16 +146,15 @@ def _executeFunctionAndParameters(self):
             self.thread = CalculationThread.CalculationThread(\
                             calculation_method=self.actualCalculation)
             self.thread.result = self.actualCalculation()
-            self.threadFinished()
         else:
             self.thread = CalculationThread.CalculationThread(\
                             calculation_method=self.actualCalculation)
-            self.thread.finished.connect(self.threadFinished)
             self.thread.start()
             message = "Please wait. Calculation going on."
             CalculationThread.waitingMessageDialog(self.thread,
                                 parent=self.configurationWidget,
                                 message=message)
+        self.threadFinished()
 
     def actualCalculation(self):
         activeCurve = self.getActiveCurve()

diff --git a/PyMca5/PyMcaPlugins/StackROIBatchPlugin.py b/PyMca5/PyMcaPlugins/StackROIBatchPlugin.py
@@ -160,16 +160,15 @@ def _executeFunctionAndParameters(self):
             self.thread = CalculationThread.CalculationThread(\
                             calculation_method=self.actualCalculation)
             self.thread.result = self.actualCalculation()
-            self.threadFinished()
         else:
             self.thread = CalculationThread.CalculationThread(\
                             calculation_method=self.actualCalculation)
-            self.thread.finished.connect(self.threadFinished)
             self.thread.start()
             message = "Please wait. Calculation going on."
             CalculationThread.waitingMessageDialog(self.thread,
                                 parent=self.configurationWidget,
                                 message=message)
+        self.threadFinished()
 
     def actualCalculation(self):
         activeCurve = self.getActiveCurve()

diff --git a/PyMca5/PyMcaPlugins/XASStackBatchPlugin.py b/PyMca5/PyMcaPlugins/XASStackBatchPlugin.py
@@ -150,16 +150,15 @@ def _executeFunctionAndParameters(self):
             self.thread = CalculationThread.CalculationThread(\
                             calculation_method=self.actualCalculation)
             self.thread.result = self.actualCalculation()
-            self.threadFinished()
         else:
             self.thread = CalculationThread.CalculationThread(\
                             calculation_method=self.actualCalculation)
-            self.thread.finished.connect(self.threadFinished)
             self.thread.start()
             message = "Please wait. Calculation going on."
             CalculationThread.waitingMessageDialog(self.thread,
                                 parent=self.configurationWidget,
                                 message=message)
+        self.threadFinished()
 
     def actualCalculation(self):
         activeCurve = self.getActiveCurve()

diff --git a/PyMca5/__init__.py b/PyMca5/__init__.py
@@ -27,7 +27,7 @@
 __contact__ = "sole@esrf.fr"
 __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
-__version__ = "5.8.6"
+__version__ = "5.8.7"
 
 import os
 import sys

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+VERSION 5.8.7
+-------------
+
+- ROI Imaging. Correct plugin threading issues introduced in version 5.8.2
+
 VERSION 5.8.6
 -------------