tomwer 1.6.0.dev2__tar.gz → 1.6.0.dev3__tar.gz

{tomwer-1.6.0.dev2/src/tomwer.egg-info → tomwer-1.6.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tomwer
-Version: 1.6.0.dev2
+Version: 1.6.0.dev3
 Summary: Tomography workflow tools
 Author-email: Henri Payno <henri.payno@esrf.fr>, Pierre Paleo <pierre.paleo@esrf.fr>, Pierre-Olivier Autran <pierre-olivier.autran@esrf.fr>, Jérôme Lesaint <jerome.lesaint@esrf.fr>, Alessandro Mirone <mirone@esrf.fr>
 License: MIT
@@ -42,7 +42,7 @@ Provides-Extra: full-base
 Requires-Dist: orange-canvas-core; extra == "full-base"
 Requires-Dist: orange-widget-base; extra == "full-base"
 Requires-Dist: ewoks[orange]>=0.1.1; extra == "full-base"
-Requires-Dist: ewoksorange>=0.7.0rc0; extra == "full-base"
+Requires-Dist: ewoksorange<2.0,>=0.7.0rc0; extra == "full-base"
 Requires-Dist: fabio; extra == "full-base"
 Requires-Dist: h5py>=3; extra == "full-base"
 Requires-Dist: lxml; extra == "full-base"
@@ -50,7 +50,6 @@ Requires-Dist: werkzeug; extra == "full-base"
 Requires-Dist: json-rpc; extra == "full-base"
 Requires-Dist: scipy; extra == "full-base"
 Requires-Dist: Pillow; extra == "full-base"
-Requires-Dist: glymur<0.14; extra == "full-base"
 Requires-Dist: resource; extra == "full-base"
 Requires-Dist: tifffile; extra == "full-base"
 Requires-Dist: hdf5plugin; extra == "full-base"
@@ -77,6 +76,7 @@ Requires-Dist: sphinx-design; extra == "doc"
 Requires-Dist: sphinx-autodoc-typehints; extra == "doc"
 Requires-Dist: sphinxcontrib-programoutput; extra == "doc"
 Requires-Dist: sphinxcontrib-youtube; extra == "doc"
+Requires-Dist: myst-parser; extra == "doc"
 Provides-Extra: dev-spec
 Requires-Dist: black; extra == "dev-spec"
 Requires-Dist: flake8; extra == "dev-spec"

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/pyproject.toml

@@ -48,7 +48,7 @@ full_base = [
     "orange-canvas-core",
     "orange-widget-base",
     "ewoks[orange]>=0.1.1",
-    "ewoksorange>=0.7.0rc0",
+    "ewoksorange>=0.7.0rc0,<2.0",
     "fabio",
     "h5py>=3",
     "lxml",
@@ -56,7 +56,6 @@ full_base = [
     "json-rpc",
     "scipy",
     "Pillow",
-    "glymur<0.14",  # for python3.9 until https://github.com/quintusdias/glymur/issues/688 is fixed
     "resource",
     "tifffile",
     "hdf5plugin",
@@ -85,7 +84,8 @@ doc = [
     "sphinx-design",
     "sphinx-autodoc-typehints",
     "sphinxcontrib-programoutput",
-    "sphinxcontrib-youtube"
+    "sphinxcontrib-youtube",
+    "myst-parser",
 ]
 dev_spec = [
     "black",

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/orangecontrib/tomwer/tutorials/drac_publication.ows

@@ -16,7 +16,7 @@
 		<link id="2" source_node_id="2" sink_node_id="3" source_channel="data" sink_channel="data" enabled="true" source_channel_id="data" sink_channel_id="data" />
 		<link id="3" source_node_id="3" sink_node_id="4" source_channel="data" sink_channel="data" enabled="true" source_channel_id="data" sink_channel_id="data" />
 		<link id="4" source_node_id="3" sink_node_id="5" source_channel="data" sink_channel="data" enabled="true" source_channel_id="data" sink_channel_id="data" />
-		<link id="5" source_node_id="5" sink_node_id="6" source_channel="data" sink_channel="data" enabled="true" source_channel_id="data" sink_channel_id="data" />
+		<link id="5" source_node_id="5" sink_node_id="6" source_channel="volume" sink_channel="volume" enabled="true" source_channel_id="volume" sink_channel_id="volume" />
 		<link id="6" source_node_id="5" sink_node_id="7" source_channel="data_portal_processed_datasets" sink_channel="data_portal_processed_datasets" enabled="true" source_channel_id="data_portal_processed_datasets" sink_channel_id="data_portal_processed_datasets" />
 	</links>
 	<annotations>

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/orangecontrib/tomwer/tutorials/simple_volume_local_reconstruction.ows

@@ -16,7 +16,7 @@
 		<link id="2" source_node_id="2" sink_node_id="3" source_channel="data" sink_channel="data" enabled="true" source_channel_id="data" sink_channel_id="data" />
 		<link id="3" source_node_id="3" sink_node_id="4" source_channel="data" sink_channel="data" enabled="true" source_channel_id="data" sink_channel_id="data" />
 		<link id="4" source_node_id="3" sink_node_id="5" source_channel="data" sink_channel="data" enabled="true" source_channel_id="data" sink_channel_id="data" />
-		<link id="5" source_node_id="5" sink_node_id="6" source_channel="data" sink_channel="data" enabled="true" source_channel_id="data" sink_channel_id="data" />
+		<link id="5" source_node_id="5" sink_node_id="6" source_channel="volume" sink_channel="volume" enabled="true" source_channel_id="volume" sink_channel_id="volume" />
 		<link id="6" source_node_id="5" sink_node_id="7" source_channel="data_portal_processed_datasets" sink_channel="data_portal_processed_datasets" enabled="true" source_channel_id="data_portal_processed_datasets" sink_channel_id="data_portal_processed_datasets" />
 	</links>
 	<annotations>

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/orangecontrib/tomwer/tutorials/simple_volume_to_slurm_reconstruction.ows

@@ -19,7 +19,7 @@
 		<link id="2" source_node_id="2" sink_node_id="3" source_channel="data" sink_channel="data" enabled="true" source_channel_id="data" sink_channel_id="data" />
 		<link id="3" source_node_id="7" sink_node_id="5" source_channel="cluster_config" sink_channel="cluster_config" enabled="true" source_channel_id="config_out" sink_channel_id="cluster_in" />
 		<link id="4" source_node_id="5" sink_node_id="8" source_channel="future_tomo_obj" sink_channel="future_tomo_obj" enabled="true" source_channel_id="future_out" sink_channel_id="future_in" />
-		<link id="5" source_node_id="8" sink_node_id="6" source_channel="data" sink_channel="data" enabled="true" source_channel_id="data" sink_channel_id="data" />
+		<link id="5" source_node_id="8" sink_node_id="6" source_channel="volume" sink_channel="volume" enabled="true" source_channel_id="volume" sink_channel_id="volume" />
 		<link id="6" source_node_id="7" sink_node_id="3" source_channel="cluster_config" sink_channel="cluster_config" enabled="true" source_channel_id="config_out" sink_channel_id="cluster_in" />
 		<link id="7" source_node_id="3" sink_node_id="9" source_channel="future_tomo_obj" sink_channel="future_tomo_obj" enabled="true" source_channel_id="future_out" sink_channel_id="future_in" />
 		<link id="8" source_node_id="9" sink_node_id="4" source_channel="data" sink_channel="data" enabled="true" source_channel_id="data" sink_channel_id="data" />

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/orangecontrib/tomwer/widgets/control/DataTransfertOW.py

@@ -93,7 +93,7 @@ class DataTransfertOW(SuperviseOW):
         dialog.setModal(1)
         dialog.setFileMode(qt.QFileDialog.DirectoryOnly)
 
-        if not dialog.exec_():
+        if not dialog.exec():
             dialog.close()
             return None
 

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/orangecontrib/tomwer/widgets/control/NXTomomillOW.py

@@ -202,7 +202,7 @@ class NXTomomillOW(
             msg = OverwriteMessage(self)
             text = "NXtomomill will overwrite \n %s. Do you agree ?" % file_path
             msg.setText(text)
-            if msg.exec_():
+            if msg.exec():
                 self._canOverwriteOutputs = msg.canOverwriteAll()
                 return True
             else:

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/orangecontrib/tomwer/widgets/deprecated/DataListenerOW.py

@@ -107,7 +107,7 @@ class DataListenerOW(DataListenerBaseClass):
                 self._widget.activate(activate=False)
             dialog = PortOccupyDialog(parent=self, port=self.port, host=self.host)
             dialog.setModal(False)
-            if dialog.exec_() == qt.QDialog.Accepted:
+            if dialog.exec() == qt.QDialog.Accepted:
                 if dialog.retry_connection:
                     return self.activate(activate=True, is_using_rpc=is_using_rpc)
             else:

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/orangecontrib/tomwer/widgets/other/PythonScriptOW.py

@@ -46,32 +46,39 @@ class PythonSyntaxHighlighter(qt.QSyntaxHighlighter):
         self.keywords = list(keyword.kwlist)
 
         self.rules = [
-            (qt.QRegExp(r"\b%s\b" % kwd), self.keywordFormat) for kwd in self.keywords
+            (qt.QRegularExpression(r"\b%s\b" % kwd), self.keywordFormat)
+            for kwd in self.keywords
         ] + [
-            (qt.QRegExp(r"\bdef\s+([A-Za-z_]+[A-Za-z0-9_]+)\s*\("), self.defFormat),
-            (qt.QRegExp(r"\bclass\s+([A-Za-z_]+[A-Za-z0-9_]+)\s*\("), self.defFormat),
-            (qt.QRegExp(r"'.*'"), self.stringFormat),
-            (qt.QRegExp(r'".*"'), self.stringFormat),
-            (qt.QRegExp(r"#.*"), self.commentFormat),
-            (qt.QRegExp(r"@[A-Za-z_]+[A-Za-z0-9_]+"), self.decoratorFormat),
+            (
+                qt.QRegularExpression(r"\bdef\s+([A-Za-z_]+[A-Za-z0-9_]+)\s*\("),
+                self.defFormat,
+            ),
+            (
+                qt.QRegularExpression(r"\bclass\s+([A-Za-z_]+[A-Za-z0-9_]+)\s*\("),
+                self.defFormat,
+            ),
+            (qt.QRegularExpression(r"'.*'"), self.stringFormat),
+            (qt.QRegularExpression(r'".*"'), self.stringFormat),
+            (qt.QRegularExpression(r"#.*"), self.commentFormat),
+            (qt.QRegularExpression(r"@[A-Za-z_]+[A-Za-z0-9_]+"), self.decoratorFormat),
         ]
 
-        self.multilineStart = qt.QRegExp(r"(''')|" + r'(""")')
-        self.multilineEnd = qt.QRegExp(r"(''')|" + r'(""")')
+        self.multilineStart = qt.QRegularExpression(r"(''')|" + r'(""")')
+        self.multilineEnd = qt.QRegularExpression(r"(''')|" + r'(""")')
 
         super().__init__(parent)
 
     def highlightBlock(self, text):
         for pattern, format in self.rules:
-            exp = qt.QRegExp(pattern)
-            index = exp.indexIn(text)
+            exp = qt.QRegularExpression(pattern)
+            index = exp.match(text).capturedStart()
             while index >= 0:
-                length = exp.matchedLength()
+                length = exp.match(text).capturedLength()
                 if exp.captureCount() > 0:
                     self.setFormat(exp.pos(1), len(str(exp.cap(1))), format)
                 else:
                     self.setFormat(exp.pos(0), len(str(exp.cap(0))), format)
-                index = exp.indexIn(text, index + length)
+                index = exp.match(text, index + length).capturedStart()
 
         # Multi line strings
         start = self.multilineStart

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/orangecontrib/tomwer/widgets/reconstruction/AxisOW.py

@@ -339,7 +339,7 @@ class AxisOW(SuperviseOW, WidgetLongProcessing):
         )
         text += ", please select them from the `axis input` tab"
         msg.setText(text)
-        msg.exec_()
+        msg.exec()
 
     def _updateSettingsVals(self):
         # remove rp setting to the advantage of 'static_input'

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/orangecontrib/tomwer/widgets/reconstruction/NabuOW.py

@@ -183,7 +183,7 @@ class NabuOW(WidgetLongProcessing, SuperviseOW):
             if self.__exec_for_ci is True:
                 self._ciExec()
             else:
-                if self.exec_():
+                if self.exec():
                     # for now The behavior for reprocessing is the sama as for processing
                     if hasattr(scan, "instance"):
                         self.process(scan.instance)

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/orangecontrib/tomwer/widgets/visualization/DataViewerOW.py

@@ -82,7 +82,7 @@ class DataViewerOW(widget.OWBaseWidget, openclass=True):
                 msg.setIcon(qt.QMessageBox.Warning)
                 msg.setWindowTitle("Unable to open image in imagej")
                 msg.setText(str(e))
-                msg.exec_()
+                msg.exec()
 
     @Inputs.data
     def addScan(self, scan, *args, **kwargs):

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/axis.py

@@ -65,7 +65,7 @@ class _AxisProcessGUI(AxisMainWindow):
                 "from the `axis input` tab"
             )
             msg.setText(text)
-            msg.exec_()
+            msg.exec()
             return None
         else:
             position = scan.axis_params.relative_cor_value
@@ -179,7 +179,7 @@ def main(argv):
     splash.finish(window)
     window.show()
     qt.QApplication.restoreOverrideCursor()
-    app.exec_()
+    app.exec()
 
 
 def getinputinfo():

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/diffframe.py

@@ -99,7 +99,7 @@ def main(argv):
     widget.setWindowIcon(icons.getQIcon("tomwer"))
     splash.finish(widget)
     widget.show()
-    app.exec_()
+    app.exec()
 
 
 if __name__ == "__main__":

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/imagekeyeditor.py

@@ -91,7 +91,7 @@ def main(argv):
     widget.setWindowIcon(icons.getQIcon("tomwer"))
     splash.finish(widget)
     widget.show()
-    app.exec_()
+    app.exec()
 
 
 if __name__ == "__main__":

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/imagekeyupgrader.py

@@ -102,7 +102,7 @@ def main(argv):
     widget.setWindowIcon(icons.getQIcon("tomwer"))
     splash.finish(widget)
     widget.show()
-    app.exec_()
+    app.exec()
 
 
 if __name__ == "__main__":

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/intensitynormalization.py

@@ -179,7 +179,7 @@ def main(argv):
     window.show()
     qt.QApplication.restoreOverrideCursor()
     app.aboutToQuit.connect(window.stop)
-    app.exec_()
+    app.exec()
 
 
 def getinputinfo():

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/multicor.py

@@ -145,7 +145,7 @@ class SAAxisWindow(_SAAxisWindow):
                 "from the `axis input` tab"
             )
             msg.setText(text)
-            msg.exec_()
+            msg.exec()
             return None
         else:
             self.setEstimatedCorPosition(
@@ -259,7 +259,7 @@ def main(argv):
     window.show()
     qt.QApplication.restoreOverrideCursor()
     app.aboutToQuit.connect(window.stop)
-    exit(app.exec_())
+    exit(app.exec())
 
 
 def getinputinfo():

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/multipag.py

@@ -231,7 +231,7 @@ class SADeltaBetaWindow(_SADeltaBetaWindow):
                 "from the `axis input` tab"
             )
             msg.setText(text)
-            msg.exec_()
+            msg.exec()
             return None
         else:
             self.setRelativeCorPosition(
@@ -333,7 +333,7 @@ def main(argv):
     window.show()
     qt.QApplication.restoreOverrideCursor()
     app.aboutToQuit.connect(window.stop)
-    app.exec_()
+    app.exec()
 
 
 def getinputinfo():

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/nabuapp.py

@@ -240,7 +240,7 @@ def main(argv):
     splash.finish(widget)
     widget.show()
 
-    app.exec_()
+    app.exec()
 
 
 if __name__ == "__main__":

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/nxtomoeditor.py

@@ -94,7 +94,7 @@ def main(argv):
     splash.finish(dialog)
 
     qt.QApplication.restoreOverrideCursor()
-    app.exec_()
+    app.exec()
 
 
 def getinputinfo():

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/patchrawdarkflat.py

@@ -113,7 +113,7 @@ def main(argv):
     splash.finish(window)
     window.show()
     qt.QApplication.restoreOverrideCursor()
-    app.exec_()
+    app.exec()
 
 
 def getinputinfo():

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/radiostack.py

@@ -88,7 +88,7 @@ def main(argv):
 
     splash.finish(widget)
     widget.show()
-    app.exec_()
+    app.exec()
 
 
 if __name__ == "__main__":

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/reducedarkflat.py

@@ -125,7 +125,7 @@ def _exec_with_interaction(scan, dark_method, flat_method, overwrite):
     widget.recons_params.flat_calc_method = flat_method
     splash.finish(widget)
     widget.show()
-    return app.exec_()
+    return app.exec()
 
 
 def main(argv):

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/samplemoved.py

@@ -86,7 +86,7 @@ def main(argv):
     # TODO: set back the flat field correction
     splash.finish(widget)
     widget.show()
-    app.exec_()
+    app.exec()
 
 
 if __name__ == "__main__":

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/scanviewer.py

@@ -83,7 +83,7 @@ def main(argv):
 
     qt.QApplication.restoreOverrideCursor()
     app.aboutToQuit.connect(window.close)
-    exit(app.exec_())
+    exit(app.exec())
 
 
 def getinputinfo():

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/sinogramviewer.py

@@ -118,7 +118,7 @@ def main(argv):
     widget.setWindowIcon(icons.getQIcon("tomwer"))
     splash.finish(widget)
     widget.show()
-    app.exec_()
+    app.exec()
 
 
 if __name__ == "__main__":

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/slicestack.py

@@ -83,7 +83,7 @@ def main(argv):
 
     splash.finish(widget)
     widget.show()
-    app.exec_()
+    app.exec()
 
 
 if __name__ == "__main__":

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/stitching/common.py

@@ -164,7 +164,7 @@ class MainWidget(qt.QTabWidget):
             """
         )
         msg.setIcon(qt.QMessageBox.Information)
-        msg.exec_()
+        msg.exec()
 
     # expose API
     def addTomoObj(self, *args, **kwargs):
@@ -631,7 +631,7 @@ def main(argv, stitcher_name: str, stitching_axis: int, logger):
 
     window.setAttribute(qt.Qt.WA_DeleteOnClose)
     splash.finish(window)
-    exit(app.exec_())
+    exit(app.exec())
 
 
 def sigintHandler(*args):

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/app/volume_viewer.py

@@ -146,7 +146,7 @@ def main(argv):
 
     qt.QApplication.restoreOverrideCursor()
     app.aboutToQuit.connect(window.close)
-    exit(app.exec_())
+    exit(app.exec())
 
 
 def getinputinfo():

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/core/scan/blissscan.py

@@ -1,31 +1,21 @@
 from __future__ import annotations
 
+import logging
 import os
 
 import h5py
+from nxtomomill.settings import Tomo
+from silx.io.utils import h5py_read_dataset
+from silx.io.utils import open as open_hdf5
 
-try:
-    # new settings names
-    from nxtomomill.settings import Tomo
-
-    H5_INIT_TITLES = Tomo.H5.INIT_TITLES
-    from nxtomomill.settings import Tomo
-
-    H5_ZSERIE_INIT_TITLES = Tomo.H5.ZSERIE_INIT_TITLES
+H5_INIT_TITLES = Tomo.H5.INIT_TITLES
 
-    H5_PCOTOMO_INIT_TITLES = Tomo.H5.PCOTOMO_INIT_TITLES
+H5_ZSERIE_INIT_TITLES = Tomo.H5.ZSERIE_INIT_TITLES
 
-except ImportError:
-    # old settings names
-    # TODO: remove in 1.1
-    from nxtomomill.settings import H5_INIT_TITLES
-    from nxtomomill.settings import H5_ZSERIE_INIT_TITLES
-    from nxtomomill.settings import H5_PCOTOMO_INIT_TITLES
+H5_PCOTOMO_INIT_TITLES = Tomo.H5.PCOTOMO_INIT_TITLES
 
-import logging
+H5_BACK_AND_FORTH_INIT_TITLES = Tomo.H5.BACK_AND_FORTH_INIT_TITLES
 
-from silx.io.utils import h5py_read_dataset
-from silx.io.utils import open as open_hdf5
 
 _logger = logging.getLogger(__name__)
 
@@ -174,6 +164,12 @@ class BlissScan:
                     return True
             return False
 
+        def is_back_and_forth_tomo(current_title: str):
+            for title in H5_BACK_AND_FORTH_INIT_TITLES:
+                if current_title.startswith(title):
+                    return True
+                return False
+
         with open_hdf5(file_path) as h5s:
             if not isinstance(h5s, h5py.Group) or not isinstance(
                 h5s[entry], h5py.Group
@@ -186,6 +182,7 @@ class BlissScan:
                         is_standard_tomo(title)
                         or is_zseries_tomo(title)
                         or is_pcotmo_tomo(title)
+                        or is_back_and_forth_tomo(title)
                     )
                 except Exception:
                     pass

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/gui/control/datalist.py

@@ -277,7 +277,7 @@ class BlissHDF5DataListDialog(_DataListDialog):
         elif os.path.isdir("/data"):
             dialog.setDirectory("/data")
 
-        if not dialog.exec_():
+        if not dialog.exec():
             dialog.close()
             return
 
@@ -316,7 +316,7 @@ class EDFDataListDialog(_DataListDialog):
         elif os.path.isdir("/data"):
             dialog.setDirectory("/data")
 
-        if not dialog.exec_():
+        if not dialog.exec():
             dialog.close()
             return
 
@@ -480,7 +480,7 @@ class BlissHDF5DataListMainWindow(_RawDataListMainWindow):
 
     def _createNewConfigFile(self):  # pragma: no cover
         file_dialog = self.createNXtomomillConfigFileDialog()
-        if file_dialog.exec_():
+        if file_dialog.exec():
             files_selected = file_dialog.selectedFiles()
             if len(files_selected) > 0:
                 file_path = files_selected[0]
@@ -524,7 +524,7 @@ class EDFDataListMainWindow(_RawDataListMainWindow):
 
     def _createNewConfigFile(self):  # pragma: no cover
         file_dialog = self.createNXtomomillConfigFileDialog()
-        if file_dialog.exec_():
+        if file_dialog.exec():
             files_selected = file_dialog.selectedFiles()
             if len(files_selected) > 0:
                 file_path = files_selected[0]
@@ -554,7 +554,7 @@ class GenericScanListDialog(_DataListDialog):
             ]
         )
 
-        if not dialog.exec_():
+        if not dialog.exec():
             dialog.close()
             return
 
@@ -616,7 +616,7 @@ class VolumeListDialog(_DataListDialog):
         """ """
         dialog = QVolumeDialog(self)
 
-        if not dialog.exec_():
+        if not dialog.exec():
             dialog.close()
             return
         files_or_folders = dialog.files_selected()
@@ -879,7 +879,7 @@ class _TomwerObjectList(qt.QTableWidget):
     def contextMenuEvent(self, event):
         self._copy_target = self._datasetAt(event.pos())
         self._copyAction.setVisible(self._copy_target is not None)
-        self.menu.exec_(event.globalPos())
+        self.menu.exec(event.globalPos())
 
     def _copyRequested(self):
         clipboard = qt.QGuiApplication.clipboard()
@@ -995,7 +995,7 @@ class BlissScanList(_TomwerObjectList):
                         "This is probably not a Bliss file. Do you still want to translate ?"
                     )
                 msg.setText(text)
-                if msg.exec_() != qt.QMessageBox.Ok:
+                if msg.exec() != qt.QMessageBox.Ok:
                     return
 
             try:

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/gui/control/datatransfert.py

@@ -95,7 +95,7 @@ class DataTransfertSelector(qt.QWidget):
         dialog = qt.QFileDialog(self, directory=defaultDirectory)
         dialog.setFileMode(qt.QFileDialog.DirectoryOnly)
 
-        if not dialog.exec_():
+        if not dialog.exec():
             dialog.close()
             return
 

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/gui/control/datavalidator.py

@@ -205,7 +205,7 @@ class DataValidator(qt.QMainWindow, BaseDataValidator):
         """Callback when we want to add a new scan to the scan validator"""
         dialog = QDataDialog(self, multiSelection=True)
 
-        if not dialog.exec_():
+        if not dialog.exec():
             dialog.close()
             return
 

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/gui/control/datawatcher/controlwidget.py

@@ -107,7 +107,7 @@ class ControlWidget(qt.QWidget):
         dialog = qt.QFileDialog(self, directory=defaultDirectory)
         dialog.setFileMode(qt.QFileDialog.DirectoryOnly)
 
-        if not dialog.exec_():
+        if not dialog.exec():
             dialog.close()
             return
 

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/gui/control/datawatcher/datawatcher.py

@@ -377,7 +377,7 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
         dialog = qt.QFileDialog(self, directory=defaultDirectory)
         dialog.setFileMode(qt.QFileDialog.DirectoryOnly)
 
-        if not dialog.exec_():
+        if not dialog.exec():
             dialog.close()
             return
 

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/gui/control/nxtomomill.py

@@ -117,7 +117,7 @@ class NXTomomillInput:
         if field in self._cache:
             return self._cache[field]
         else:
-            if self._dialog.exec_():
+            if self._dialog.exec():
                 answer = self._dialog.getText()
                 if self._dialog.cache_answer():
                     self._cache[field] = answer

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/gui/control/reducedarkflatselector.py

@@ -95,8 +95,8 @@ class ReduceDarkFlatSelectorTableWidget(qt.QWidget):
             # frame index
             indexItem = qt.QLineEdit(self._tree)
             # index can be provided as absolute indexes (integers)
-            validator = qt.QRegExpValidator(
-                qt.QRegExp(r"([+-]?([0-9]*[.])?[0-9]+)*[r]"), self
+            validator = qt.QRegularExpressionValidator(
+                qt.QRegularExpression(r"([+-]?([0-9]*[.])?[0-9]+)*[r]"), self
             )
             indexItem.setValidator(validator)
             indexItem.setText(str(frame_index))
@@ -482,7 +482,7 @@ class ReduceDarkFlatSelectorDialog(qt.QDialog):
     def _addFromFileSelection(self):
         dialog = DataFileDialog()
         dialog.setDirectory(get_default_directory())
-        if dialog.exec_():
+        if dialog.exec():
             url = dialog.selectedUrl()
             reduced_frames_tuple = ReduceDarkFlatSelectorTableWidget.get_reduce_frames(
                 DataUrl(path=url)

{tomwer-1.6.0.dev2 → tomwer-1.6.0.dev3}/src/tomwer/gui/control/scanselectorwidget.py

@@ -25,7 +25,7 @@ class ScanSelectorWidget(_SelectorWidget):
     def _callbackAddData(self):
         dialog = QDataDialog(self, multiSelection=True)
 
-        if not dialog.exec_():
+        if not dialog.exec():
             dialog.close()
             return