Prepare release

PyMca5/PyMcaPlugins/ImageAlignmentStackPlugin.py

@@ -156,9 +156,10 @@ def _fftAlignment(self):
                 # result[0] contains the string "Exception" in case
                 # of error. However, direct comparison will raise an
                 # error
-                if type(result[0]) == type('Exception'):
-                    # exception occurred
-                    raise Exception(result[1], result[2], result[3])
+                if isinstance(result[0], str):
+                    if result[0] == 'Exception':
+                        # exception occurred
+                        raise Exception(result[1], result[2], result[3])
                 else:
                     shifts = result
                 result = self.__shiftStack(stack,
@@ -306,9 +307,10 @@ def _siftAlignment(self):
                                                     crop=crop, filename=filename)
                 if result is not None:
                     if len(result):
-                        if result[0] == 'Exception':
-                            # exception occurred
-                            raise Exception(result[1], result[2], result[3])
+                        if isinstance(result[0], str):
+                            if result[0] == 'Exception':
+                                # exception occurred
+                                raise Exception(result[1], result[2], result[3])
             if filename is None:
                 self.setStack(stack)
 

PyMca5/PyMcaPlugins/NNMAStackPlugin.py

@@ -251,9 +251,7 @@ def threadFinished(self):
         if type(result) == type((1,)):
             #if we receive a tuple there was an error
             if len(result):
-                if type(result[0]) == type("Exception"):
-                    if result[0] == "Exception":
-                        self._status.setText("Ready after calculation error")
+                if isinstance(result[0], str) and result[0] == "Exception":                        self._status.setText("Ready after calculation error")
                         self.configurationWidget.setEnabled(True)
                         raise Exception(result[1], result[2])
                         return

PyMca5/PyMcaPlugins/PCAStackPlugin.py

@@ -259,7 +259,7 @@ def threadFinished(self):
         if type(result) == type((1,)):
             #if we receive a tuple there was an error
             if len(result):
-                if result[0] == "Exception":
+                if isinstance(result[0], str) and result[0] == "Exception":
                     self._status.setText("Ready after calculation error")
                     self.configurationWidget.setEnabled(True)
                     raise Exception(result[1], result[2])

PyMca5/PyMcaPlugins/StackROIBatchPlugin.py

@@ -209,7 +209,7 @@ def _threadFinished(self):
         if type(result) == type((1,)):
             #if we receive a tuple there was an error
             if len(result):
-                if result[0] == "Exception":
+                if isinstance(result[0], str) and result[0] == "Exception":
                     # somehow this exception is not caught
                     raise Exception(result[1], result[2])#, result[3])
                     return

PyMca5/PyMcaPlugins/XASStackBatchPlugin.py

@@ -209,7 +209,7 @@ def _threadFinished(self):
         if type(result) == type((1,)):
             #if we receive a tuple there was an error
             if len(result):
-                if result[0] == "Exception":
+                if isinstance(result[0], str) and result[0] == "Exception":
                     # somehow this exception is not caught
                     raise Exception(result[1], result[2])#, result[3])
                     return

PyMca5/PyMcaPlugins/XASStackNormalizationPlugin.py

@@ -187,8 +187,8 @@ def XASNormalize(self):
                                             post_edge_regions=post_edge_regions,
                                             algorithm=algorithm,
                                             algorithm_parameters=algorithm_parameters)
-            if result[0] == 'Exception':
-                # exception occurred
+            if isinstance(result[0], str) and result[0] == 'Exception':
+                # handled exception occurred
                 raise Exception(result[1], result[2], result[3])
             else:
                 edges, jumps, errors = result

PyMca5/__init__.py

@@ -27,7 +27,7 @@
 __contact__ = "[email protected]"
 __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
-__version__ = "5.9.1"
+__version__ = "5.9.2"
 
 import os
 import sys

changelog.txt

@@ -1,3 +1,16 @@
+VERSION 5.9.2
+-------------
+
+- XRF. Prevent considering twice the same element when using the SingleLayerStrategy.
+
+- Packaging. Compatibility with PyInstaller 6.x
+
+- GUI. Improved PyQt6 compatibility.
+
+- GUI. Compatibility with current silx master branch.
+
+- GUI. Add histogram of pixel intensities to image views (requires silx).
+
 VERSION 5.9.1
 -------------