tomwer 1.3.0a1__tar.gz → 1.3.16__tar.gz

{tomwer-1.3.0a1/tomwer.egg-info → tomwer-1.3.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.3.0a1
+Version: 1.3.16
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit
@@ -18,18 +18,19 @@ Classifier: Operating System :: POSIX
 Classifier: Natural Language :: English
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.6
-Description-Content-Type: text/markdown
+Requires-Python: >=3.8
+Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: setuptools
 Requires-Dist: psutil
-Requires-Dist: silx<2.0,>=1.0
+Requires-Dist: silx[full]>=2.0
 Requires-Dist: tomoscan>=2.0.0a11
-Requires-Dist: nxtomo>=1.0.4
+Requires-Dist: nxtomo>=1.2.3rc1
 Requires-Dist: nxtomomill>=1.0dev
 Requires-Dist: processview>=1.3
 Requires-Dist: ewoks>=0.1.1
+Requires-Dist: ewoksorange<0.7,>=0.6
 Requires-Dist: sluurp>=0.3.3
 Requires-Dist: packaging
 Requires-Dist: flufl-lock
@@ -52,6 +53,24 @@ Requires-Dist: resource; extra == "full-base"
 Requires-Dist: tifffile; extra == "full-base"
 Requires-Dist: hdf5plugin; extra == "full-base"
 Requires-Dist: pyicat_plus; extra == "full-base"
+Provides-Extra: full-no-nabu
+Requires-Dist: orange-canvas-core; extra == "full-no-nabu"
+Requires-Dist: orange-widget-base; extra == "full-no-nabu"
+Requires-Dist: ewoks[orange]>=0.1.1; extra == "full-no-nabu"
+Requires-Dist: rsyncmanager; extra == "full-no-nabu"
+Requires-Dist: graypy; extra == "full-no-nabu"
+Requires-Dist: fabio; extra == "full-no-nabu"
+Requires-Dist: h5py>=3; extra == "full-no-nabu"
+Requires-Dist: lxml; extra == "full-no-nabu"
+Requires-Dist: werkzeug; extra == "full-no-nabu"
+Requires-Dist: json-rpc; extra == "full-no-nabu"
+Requires-Dist: scipy; extra == "full-no-nabu"
+Requires-Dist: Pillow; extra == "full-no-nabu"
+Requires-Dist: glymur; extra == "full-no-nabu"
+Requires-Dist: resource; extra == "full-no-nabu"
+Requires-Dist: tifffile; extra == "full-no-nabu"
+Requires-Dist: hdf5plugin; extra == "full-no-nabu"
+Requires-Dist: pyicat_plus; extra == "full-no-nabu"
 Provides-Extra: full-no-cuda
 Requires-Dist: orange-canvas-core; extra == "full-no-cuda"
 Requires-Dist: orange-widget-base; extra == "full-no-cuda"
@@ -70,7 +89,7 @@ Requires-Dist: resource; extra == "full-no-cuda"
 Requires-Dist: tifffile; extra == "full-no-cuda"
 Requires-Dist: hdf5plugin; extra == "full-no-cuda"
 Requires-Dist: pyicat_plus; extra == "full-no-cuda"
-Requires-Dist: nabu>=2023.3.0dev; extra == "full-no-cuda"
+Requires-Dist: nabu>=2023.3.1dev; extra == "full-no-cuda"
 Provides-Extra: full
 Requires-Dist: orange-canvas-core; extra == "full"
 Requires-Dist: orange-widget-base; extra == "full"
@@ -89,7 +108,7 @@ Requires-Dist: resource; extra == "full"
 Requires-Dist: tifffile; extra == "full"
 Requires-Dist: hdf5plugin; extra == "full"
 Requires-Dist: pyicat_plus; extra == "full"
-Requires-Dist: nabu[full]>=2023.3.0dev; extra == "full"
+Requires-Dist: nabu[full]>=2023.3.1dev; extra == "full"
 Requires-Dist: pycuda; extra == "full"
 Requires-Dist: scikit-cuda; extra == "full"
 Provides-Extra: doc
@@ -110,13 +129,14 @@ Requires-Dist: resource; extra == "doc"
 Requires-Dist: tifffile; extra == "doc"
 Requires-Dist: hdf5plugin; extra == "doc"
 Requires-Dist: pyicat_plus; extra == "doc"
-Requires-Dist: nabu>=2023.3.0dev; extra == "doc"
+Requires-Dist: nabu>=2023.3.1dev; extra == "doc"
 Requires-Dist: Sphinx>=4.0.0; extra == "doc"
 Requires-Dist: nbsphinx; extra == "doc"
 Requires-Dist: pandoc; extra == "doc"
 Requires-Dist: jupyterlab; extra == "doc"
 Requires-Dist: pydata_sphinx_theme; extra == "doc"
 Requires-Dist: sphinx-design; extra == "doc"
+Requires-Dist: sphinx-autodoc-typehints; extra == "doc"
 Provides-Extra: dev-spec
 Requires-Dist: black; extra == "dev-spec"
 Requires-Dist: flake8; extra == "dev-spec"
@@ -140,7 +160,7 @@ Requires-Dist: resource; extra == "dev"
 Requires-Dist: tifffile; extra == "dev"
 Requires-Dist: hdf5plugin; extra == "dev"
 Requires-Dist: pyicat_plus; extra == "dev"
-Requires-Dist: nabu[full]>=2023.3.0dev; extra == "dev"
+Requires-Dist: nabu[full]>=2023.3.1dev; extra == "dev"
 Requires-Dist: pycuda; extra == "dev"
 Requires-Dist: scikit-cuda; extra == "dev"
 Requires-Dist: black; extra == "dev"
@@ -165,14 +185,14 @@ Requires-Dist: resource; extra == "dev-no-cuda"
 Requires-Dist: tifffile; extra == "dev-no-cuda"
 Requires-Dist: hdf5plugin; extra == "dev-no-cuda"
 Requires-Dist: pyicat_plus; extra == "dev-no-cuda"
-Requires-Dist: nabu>=2023.3.0dev; extra == "dev-no-cuda"
+Requires-Dist: nabu>=2023.3.1dev; extra == "dev-no-cuda"
 Requires-Dist: black; extra == "dev-no-cuda"
 Requires-Dist: flake8; extra == "dev-no-cuda"
 Requires-Dist: timeout-decorator; extra == "dev-no-cuda"
 Requires-Dist: pyopencl; extra == "dev-no-cuda"
 Provides-Extra: test
 Requires-Dist: pytest-asyncio; extra == "test"
-Requires-Dist: tomoscan[test]>=2.0.0a11; extra == "test"
+Requires-Dist: tomoscan[test]>=2.0.2rc17; extra == "test"
 Provides-Extra: setup-requires
 Requires-Dist: setuptools; extra == "setup-requires"
 Requires-Dist: numpy>=1.12; extra == "setup-requires"

{tomwer-1.3.0a1 → tomwer-1.3.16}/orangecontrib/tomwer/widgets/__init__.py

@@ -22,9 +22,10 @@
 #
 #############################################################################
 
-import sysconfig
-
-import pkg_resources
+try:
+    from orangecanvas.utils.pkgmeta import get_distribution
+except ImportError:
+    from pkg_resources import get_distribution
 
 ICON = "../widgets/icons/tomwer.png"
 
@@ -33,13 +34,13 @@ BACKGROUND = "#C0CCFF"
 
 # Entry point for main Orange categories/widgets discovery
 def widget_discovery(discovery):
-    dist = pkg_resources.get_distribution("tomwer")
+    dist = get_distribution("tomwer")
     pkgs = [
         "orangecontrib.tomwer.widgets.cluster",
         "orangecontrib.tomwer.widgets.control",
         "orangecontrib.tomwer.widgets.debugtools",
         "orangecontrib.tomwer.widgets.edit",
-        "orangecontrib.tomwer.widgets.icat",
+        # "orangecontrib.tomwer.widgets.icat",
         "orangecontrib.tomwer.widgets.reconstruction",
         # "orangecontrib.tomwer.widgets.stitching",
         "orangecontrib.tomwer.widgets.visualization",
@@ -54,11 +55,9 @@ WIDGET_HELP_PATH = (
     # You still need to build help pages using
     # make htmlhelp
     # inside doc folder
-    ("/build/sphinx/htmlhelp/index.html", None),
-    #
-    # Documentation included in wheel
-    # Correct DATA_FILES entry is needed in setup.py and documentation has to be built
-    # # before the wheel is created.
-    (f"{sysconfig.get_path('data')}/help/tomwer/index.html", None),
-    ("http://www.silx.org/pub/doc/tomwer/htmlhelp/0.9/", None),
+    # (
+    #     "/home/payno/Documents/dev/tomography/tomwer/build/html/canvas/widgets/widgets.html",
+    #     None,
+    # ),
+    ("https://tomwer.readthedocs.io/en/latest/canvas/widgets/widgets.html", None),
 )

{tomwer-1.3.0a1 → tomwer-1.3.16}/orangecontrib/tomwer/widgets/control/DataListenerOW.py

@@ -258,12 +258,12 @@ class DataListenerOW(
 
     def _jsonRPCConfigChanged(self):
         self._blissConfiguration = self._widget.getBlissServerConfiguration()
-        self._static_input[  # pylint: disable=E1137
-            "bliss_server_configuration"
-        ] = self._widget.getBlissServerConfiguration()
-        self._static_input[  # pylint: disable=E1137
-            "output_dir"
-        ] = self._widget.getOutputFolder()
+        self._static_input["bliss_server_configuration"] = (  # pylint: disable=E1137
+            self._widget.getBlissServerConfiguration()
+        )
+        self._static_input["output_dir"] = (  # pylint: disable=E1137
+            self._widget.getOutputFolder()
+        )
         if self.is_active():
             self.activate(False)
             self.activate(True)

{tomwer-1.3.0a1 → tomwer-1.3.16}/orangecontrib/tomwer/widgets/control/DataValidatorOW.py

@@ -166,12 +166,12 @@ class DataValidatorOW(SuperviseOW):
     def _updateSettings(self):
         viewer = self._widget._centralWidget
         self._viewer_config["mode"] = viewer.getDisplayMode()  # pylint: disable=E1137
-        self._viewer_config[  # pylint: disable=E1137
-            "slice_opt"
-        ] = viewer.getSliceOption()
-        self._viewer_config[  # pylint: disable=E1137
-            "radio_opt"
-        ] = viewer.getRadioOption()
+        self._viewer_config["slice_opt"] = (  # pylint: disable=E1137
+            viewer.getSliceOption()
+        )
+        self._viewer_config["radio_opt"] = (  # pylint: disable=E1137
+            viewer.getRadioOption()
+        )
 
     def _setSettings(self, settings):
         viewer = self._widget._centralWidget

{tomwer-1.3.0a1 → tomwer-1.3.16}/orangecontrib/tomwer/widgets/control/EDF2NXTomomillOW.py

@@ -115,7 +115,12 @@ class EDF2NXOW(
             edf_to_nx_configuration=EDFConfig().to_dict(),
         )
 
-        self.task_output_changed_callbacks.add(self._notify_state)
+        if isinstance(self.task_output_changed_callbacks, set):
+            self.task_output_changed_callbacks.add(self._notify_state)
+        elif isinstance(self.task_output_changed_callbacks, list):
+            self.task_output_changed_callbacks.append(self._notify_state)
+        else:
+            raise NotImplementedError
 
         # handle settings
         self._loadSettings()
@@ -182,7 +187,13 @@ class EDF2NXOW(
         )
 
         self.notify_on_going(scan=NXtomoScan(output_file, output_entry))
-        self._execute_ewoks_task(propagate=True)
+        try:
+            self._execute_ewoks_task(  # pylint: disable=E1123
+                propagate=True,
+                log_missing_inputs=False,
+            )
+        except Exception:
+            self._execute_ewoks_task(propagate=True)  # pylint: disable=E1123
 
     def get_task_inputs(self):
         return {

{tomwer-1.3.0a1 → tomwer-1.3.16}/orangecontrib/tomwer/widgets/control/NXTomomillMixIn.py

@@ -36,9 +36,9 @@ class NXTomomillMixIn:
         assert (
             self.CONFIG_CLS is not None
         ), "inheriting classes are expected to redefine CONFIG_CLS"
-        self._ewoks_default_inputs[
-            "nxtomomill_cfg_file"
-        ] = cfg_file  # pylint: disable=E1137
+        self._ewoks_default_inputs["nxtomomill_cfg_file"] = (
+            cfg_file  # pylint: disable=E1137
+        )
 
         if os.path.exists(cfg_file):
             try:

{tomwer-1.3.0a1 → tomwer-1.3.16}/orangecontrib/tomwer/widgets/control/NXTomomillOW.py

@@ -42,6 +42,7 @@ from tomwer.core.scan.blissscan import BlissScan
 from tomwer.core.scan.nxtomoscan import NXtomoScan, NXtomoScanIdentifier
 from tomwer.gui.control.datalist import BlissHDF5DataListMainWindow
 from tomwer.gui.control.nxtomomill import NXTomomillInput, OverwriteMessage
+from tomwer.core.process.output import ProcessDataOutputDirMode
 from ewoksorange.bindings.owwidgets import invalid_data
 
 
@@ -122,7 +123,12 @@ class NXTomomillOW(
         self.update_default_inputs(
             h5_to_nx_configuration=HDF5Config().to_dict(),
         )
-        self.task_output_changed_callbacks.add(self._notify_state)
+        if isinstance(self.task_output_changed_callbacks, set):
+            self.task_output_changed_callbacks.add(self._notify_state)
+        elif isinstance(self.task_output_changed_callbacks, list):
+            self.task_output_changed_callbacks.append(self._notify_state)
+        else:
+            raise NotImplementedError
 
         # handle settings
         self._loadSettings()
@@ -137,9 +143,10 @@ class NXTomomillOW(
                 self.add(nxtomo_scan)
             else:
                 self._scans.append(scan)
-        self._ewoks_default_inputs[  # pylint: disable=E1137
-            "output_dir"
-        ] = self.widget.getOutputFolder()
+        output_dir = self.widget.getOutputFolder()
+        if isinstance(output_dir, ProcessDataOutputDirMode):
+            output_dir = output_dir.value
+        self._ewoks_default_inputs["output_dir"] = output_dir  # pylint: disable=E1137
 
     @property
     def request_input(self):
@@ -161,11 +168,11 @@ class NXTomomillOW(
         """
         # for now we want to avoid propagation any processing.
         # task will be executed only when the user validates the dialog
-        h5_scan = super().get_task_inputs().get("hdf5_scan", None)
-        if h5_scan is not None:
-            if not isinstance(h5_scan, H5ToNxProcess):
-                raise TypeError("hdf5_scan is expected to be an instance of NXtomoScan")
-            self.add(h5_scan.path)
+        bliss_scan = super().get_task_inputs().get("bliss_scan", None)
+        if bliss_scan is not None:
+            if not isinstance(bliss_scan, BlissScan):
+                raise TypeError("bliss_scan is expected to be an instance of BlissScan")
+            self.add(bliss_scan.master_file)
 
     def _convertAndSend(self, bliss_url: str):
         """
@@ -242,7 +249,13 @@ class NXTomomillOW(
         self.update_default_inputs(
             h5_to_nx_configuration=self.__configuration_cache.to_dict()
         )
-        self._execute_ewoks_task(propagate=True)
+        try:
+            self._execute_ewoks_task(  # pylint: disable=E1123
+                propagate=True,
+                log_missing_inputs=False,
+            )
+        except Exception:
+            self._execute_ewoks_task(propagate=True)  # pylint: disable=E1123
 
     def _loadSettings(self):
         for scan in self._scans:

{tomwer-1.3.0a1 → tomwer-1.3.16}/orangecontrib/tomwer/widgets/control/NXtomoConcatenate.py

@@ -95,7 +95,12 @@ class NXtomoConcatenateOW(
         ## connect signal / slot
         self.widget.sigConfigChanged.connect(self._updateSettings)
 
-        self.task_output_changed_callbacks.add(self._notify_state)
+        if isinstance(self.task_output_changed_callbacks, set):
+            self.task_output_changed_callbacks.add(self._notify_state)
+        elif isinstance(self.task_output_changed_callbacks, list):
+            self.task_output_changed_callbacks.append(self._notify_state)
+        else:
+            raise NotImplementedError
 
         ## handle settings
         self._loadSettings()

{tomwer-1.3.0a1 → tomwer-1.3.16}/orangecontrib/tomwer/widgets/control/SingleTomoObjOW.py

@@ -147,9 +147,9 @@ class SingleTomoObjOW(OWBaseWidget, openclass=True):
                         reduced_frames=data.reduced_darks, scan=data
                     )
                 )
-                reduced_darks[
-                    "reduce_frames_name"
-                ] = f"darks from {data.get_identifier().short_description()}"
+                reduced_darks["reduce_frames_name"] = (
+                    f"darks from {data.get_identifier().short_description()}"
+                )
                 self.Outputs.relative_reduced_darks.send(reduced_darks)
 
             if data.reduced_flats not in (None, {}):
@@ -162,7 +162,7 @@ class SingleTomoObjOW(OWBaseWidget, openclass=True):
                         reduced_frames=data.reduced_flats, scan=data
                     )
                 )
-                reduced_flats[
-                    "reduce_frames_name"
-                ] = f"flats from {data.get_identifier().short_description()}"
+                reduced_flats["reduce_frames_name"] = (
+                    f"flats from {data.get_identifier().short_description()}"
+                )
                 self.Outputs.relative_reduced_flats.send(reduced_flats)

{tomwer-1.3.0a1 → tomwer-1.3.16}/orangecontrib/tomwer/widgets/debugtools/DatasetGeneratorOW.py

@@ -156,7 +156,7 @@ class _DatasetGeneratorThread(threading.Thread):
                 n_proj=self.n_proj,
                 n_ini_proj=self.n_proj,
                 create_ini_dark=self.create_ini_dark,
-                create_ini_ref=self.create_ini_flat,
+                create_ini_flat=self.create_ini_flat,
                 dim=self.dims[0],
             ).scan
         elif self.type_to_generate == BlissScan.__name__:

{tomwer-1.3.0a1 → tomwer-1.3.16}/orangecontrib/tomwer/widgets/edit/ImageKeyUpgraderOW.py

@@ -81,7 +81,12 @@ class ImageKeyUpgraderOW(
         _layout.addWidget(self.widget)
 
         # connect signal / slot
-        self.task_output_changed_callbacks.add(self._notify_state)
+        if isinstance(self.task_output_changed_callbacks, set):
+            self.task_output_changed_callbacks.add(self._notify_state)
+        elif isinstance(self.task_output_changed_callbacks, list):
+            self.task_output_changed_callbacks.append(self._notify_state)
+        else:
+            raise NotImplementedError
         self.widget.sigOperationsChanged.connect(self._update_operations_to_ewoks)
 
         self._updateGUIFromDefaultValues()

tomwer-1.3.16/orangecontrib/tomwer/widgets/icat/RawDataScreenshotCreatorOW.py

@@ -0,0 +1,98 @@
+# from orangewidget import gui
+# from orangewidget.settings import Setting
+
+# from silx.gui import qt
+# import weakref
+# from ewoksorange.bindings.owwidgets import OWEwoksWidgetOneThreadPerRun
+
+# import tomwer.core.process.icat.createscreenshots
+# from tomwer.gui.icat.createscreenshots import CreateRawDataScreenshotsWidget
+# from processview.core.superviseprocess import SuperviseProcess
+
+
+# class RawDataScreenshotCreatorOW(
+#     OWEwoksWidgetOneThreadPerRun,
+#     SuperviseProcess,
+#     ewokstaskclass=tomwer.core.process.icat.createscreenshots.CreateRawDataScreenshotsTask,
+# ):
+#     """
+#     This widget can receive 'data' (scan) and but some screenshot to be pushed on GALLERY.
+#     """
+
+#     name = "Create raw data screenshots"
+#     id = "orangecontrib.widgets.tomwer.icat.RawDataScreenshotCreatorOW.RawDataScreenshotCreatorOW"
+#     description = "Create screenshot of the raw data from user wishes. \n"
+#     icon = "icons/raw_screenshots.svg"
+#     priority = 63
+#     keywords = [
+#         "tomography",
+#         "tomwer",
+#         "tomo_obj",
+#         "screenshot",
+#         "raw data",
+#     ]
+
+#     want_main_area = True
+#     want_control_area = False
+#     resizing_enabled = True
+
+#     _ewoks_default_inputs = Setting(
+#         {
+#             "raw_projections_required": True,
+#             "raw_projections_each": 90,
+#             "raw_darks_required": True,
+#             "raw_flats_required": True,
+#         }
+#     )
+
+#     _ewoks_inputs_to_hide_from_orange = (
+#         "__process__",
+#         "raw_projections_required",
+#         "raw_projections_each",
+#         "raw_darks_required",
+#         "raw_flats_required",
+#     )
+
+#     def __init__(self, *args, **kwargs):
+#         super().__init__(*args, **kwargs)
+#         SuperviseProcess.__init__(self)
+#         self._widget = CreateRawDataScreenshotsWidget(parent=self)
+
+#         self._box = gui.vBox(self.mainArea, self.name)
+#         layout = self._box.layout()
+#         layout.addWidget(self._widget)
+
+#         # load settings
+#         self._widget.setConfiguration(self._ewoks_default_inputs)
+
+#         # connect signal / slot
+#         self._widget.sigConfigChanged.connect(self._updateSettings)
+
+#     def _updateSettings(self):
+#         self._ewoks_default_inputs = self._widget.getConfiguration()
+
+#     def handleNewSignals(self) -> None:
+#         """Invoked by the workflow signal propagation manager after all
+#         signals handlers have been called.
+#         """
+#         # for now we want to avoid propagation any processing.
+#         # task will be executed only when the user validates the dialog
+#         if self.get_task_input_value("data", None) is None:
+#             return
+#         else:
+#             super().handleNewSignals()
+
+#     def get_task_inputs(self):
+#         task_inputs = super().get_task_inputs()
+#         configuration = self._widget.getConfiguration()
+#         task_inputs["raw_projections_required"] = configuration[
+#             "raw_projections_required"
+#         ]
+#         task_inputs["raw_projections_each"] = configuration["raw_projections_each"]
+#         task_inputs["raw_darks_required"] = configuration["raw_darks_required"]
+#         task_inputs["raw_flats_required"] = configuration["raw_flats_required"]
+#         task_inputs["__process__"] = weakref.ref(self)
+#         return task_inputs
+
+#     def sizeHint(self):
+#         return qt.QSize(500, 200)

tomwer-1.3.16/orangecontrib/tomwer/widgets/icat/SaveToGalleryAndPublishOW.py

@@ -0,0 +1,129 @@
+# from typing import Optional
+# from orangewidget import gui
+# from orangewidget.settings import Setting
+
+# from silx.gui import qt
+# import weakref
+# from ewoksorange.bindings.owwidgets import OWEwoksWidgetOneThreadPerRun
+
+# from tomwer.core.scan.scanbase import TomwerScanBase
+# import tomwer.core.process.icat.gallery
+# from tomwer.gui.icat.gallery import GalleryWidget, _GalleryOutputDir
+# from processview.core.superviseprocess import SuperviseProcess
+
+
+# class SaveToGalleryAndPublishOW(
+#     OWEwoksWidgetOneThreadPerRun,
+#     SuperviseProcess,
+#     ewokstaskclass=tomwer.core.process.icat.gallery.SaveToGalleryAndPublishTask,
+# ):
+#     """
+#     This widget can receive 'screenshots' signal (expected as a tuple (source, screenshots_dict)
+#     source is the tomo obj associated (so we can automate deduction of the output dir)
+#     screenshots_dict is a dict of str: DataUrl
+#     """
+
+#     name = "Save to gallery and publish"
+#     id = "orangecontrib.widgets.tomwer.icat.MoveToGalleryOW.SaveToGalleryAndPublishOW"
+#     description = "This widget will save screenshot of reconstruction to a specific location (acquisition gallery as the default end point) \n"
+#     icon = "icons/add_gallery.svg"
+#     priority = 63
+#     keywords = [
+#         "tomography",
+#         "tomwer",
+#         "tomo_obj",
+#         "screenshot",
+#         "acquisition",
+#         "gallery",
+#     ]
+
+#     want_main_area = True
+#     want_control_area = False
+#     resizing_enabled = True
+
+#     _ewoks_default_inputs = Setting(
+#         {
+#             "format": "png",
+#             "output_location_mode": "default",
+#             "custom_output": None,
+#             "screenshots": None,
+#             "overwrite": False,
+#         }
+#     )
+
+#     _ewoks_inputs_to_hide_from_orange = (
+#         "proposal",
+#         "dataset",
+#         "beamline",
+#         "dry_run",
+#         "__process__",
+#     )
+
+#     def __init__(self, *args, **kwargs):
+#         super().__init__(*args, **kwargs)
+#         SuperviseProcess.__init__(self)
+#         self._scan = None
+#         self._widget = GalleryWidget(parent=self)
+
+#         self._box = gui.vBox(self.mainArea, self.name)
+#         layout = self._box.layout()
+#         layout.addWidget(self._widget)
+
+#         # load settings
+#         self._widget.setConfiguration(self._ewoks_default_inputs)
+
+#         # connect signal / slot
+#         self._widget.sigConfigChanged.connect(self._updateSettings)
+
+#     def _updateSettings(self):
+#         self._ewoks_default_inputs = self._widget.getConfiguration()
+
+#     def setScan(self, scan: TomwerScanBase):
+#         self._scan = weakref.ref(scan)
+#         self._widget._publishConfig.setScan(scan=scan)
+
+#     def getScan(self) -> Optional[TomwerScanBase]:
+#         if self._scan is None:
+#             return None
+#         else:
+#             return self._scan()
+
+#     def handleNewSignals(self) -> None:
+#         """Invoked by the workflow signal propagation manager after all
+#         signals handlers have been called.
+#         """
+#         # update the widget when receive the scan (proposal, dataset...)
+#         screenshots = self.get_task_input_value("screenshots", None)
+#         if screenshots is None:
+#             return
+#         else:
+#             scan = screenshots.scan
+#             if scan != self.getScan():
+#                 self.setScan(scan)
+
+#         if self.get_task_input_value("screenshots", None) is None:
+#             return
+#         else:
+#             super().handleNewSignals()
+
+#     def get_task_inputs(self):
+#         task_inputs = super().get_task_inputs()
+#         configuration = self._widget.getConfiguration()
+
+#         use_custom_output_dir = _GalleryOutputDir.OutputDirMode.from_value(
+#             configuration.get("output_location_mode", "default")
+#         )
+#         # if user requested to overwrite the output directory
+#         if use_custom_output_dir is _GalleryOutputDir.OutputDirMode.PROPOSAL_GALLERY:
+#             task_inputs["screenshots"]["output_dir"] = configuration["custom_output"]
+
+#         task_inputs["overwrite"] = configuration["overwrite"]
+#         task_inputs["format"] = configuration["output_format"]
+#         task_inputs["beamline"] = configuration["beamline"]
+#         task_inputs["dataset"] = configuration["dataset"]
+#         task_inputs["proposal"] = configuration["proposal"]
+#         task_inputs["__process__"] = weakref.ref(self)
+#         return task_inputs
+
+#     def sizeHint(self):
+#         return qt.QSize(500, 200)

{tomwer-1.3.0a1 → tomwer-1.3.16}/orangecontrib/tomwer/widgets/reconstruction/AxisOW.py

@@ -495,18 +495,19 @@ class AxisOW(SuperviseOW, WidgetLongProcessing):
             cor = self._axis_params.relative_cor_value
             scan.axis_params.set_relative_value(cor)
             scan._axis_params.mode = "manual"
-            try:
-                AxisTask._register_process(
-                    process_file=scan.process_file,
-                    entry=entry,
-                    process=AxisTask,
-                    results={"center_of_rotation": cor if cor is not None else "-"},
-                    configuration=self._axis_params.to_dict(),
-                    process_index=scan.pop_process_index(),
-                    overwrite=True,
-                )
-            except Exception as e:
-                logger.warning(f"Fail to register Axis process. Error is {e}")
+            with scan.acquire_process_file_lock():
+                try:
+                    AxisTask._register_process(
+                        process_file=scan.process_file,
+                        entry=entry,
+                        process=AxisTask,
+                        results={"center_of_rotation": cor if cor is not None else "-"},
+                        configuration=self._axis_params.to_dict(),
+                        process_index=scan.pop_process_index(),
+                        overwrite=True,
+                    )
+                except Exception as e:
+                    logger.warning(f"Fail to register Axis process. Error is {e}")
             ProcessManager().notify_dataset_state(
                 dataset=scan,
                 process=AxisTask(

{tomwer-1.3.0a1 → tomwer-1.3.16}/orangecontrib/tomwer/widgets/reconstruction/DarkRefAndCopyOW.py

@@ -152,6 +152,7 @@ class DarkRefAndCopyOW(SuperviseOW, WidgetLongProcessing):
         self.widget.recons_params.sigChanged.connect(self._updateSettingsVals)
         self.widget.sigModeAutoChanged.connect(self._updateSettingsVals)
         self.widget.sigCopyActivationChanged.connect(self._updateSettingsVals)
+        self.widget.sigClearCache.connect(self._processing_stack.clear_cache)
         self._processing_stack.sigComputationStarted.connect(self._startProcessing)
         self._processing_stack.sigComputationEnded.connect(self._endProcessing)
         self._processing_stack.sigRefSetted.connect(self.widget.setRefSetBy)

{tomwer-1.3.0a1 → tomwer-1.3.16}/orangecontrib/tomwer/widgets/reconstruction/NabuHelicalPrepareWeightsDoubleOW.py

@@ -102,7 +102,12 @@ class NabuHelicalPrepareWeightsDoubleOW(
         ## connect signal / slot
         self.widget.sigConfigChanged.connect(self._updateSettings)
 
-        self.task_output_changed_callbacks.add(self._notify_state)
+        if isinstance(self.task_output_changed_callbacks, set):
+            self.task_output_changed_callbacks.add(self._notify_state)
+        elif isinstance(self.task_output_changed_callbacks, list):
+            self.task_output_changed_callbacks.append(self._notify_state)
+        else:
+            raise NotImplementedError
 
         ## handle settings
         self._loadSettings()