tomwer 1.2.1__py3-none-any.whl → 1.3.12__py3-none-any.whl

orangecontrib/tomwer/widgets/control/NXtomoConcatenate.py

@@ -10,7 +10,7 @@ from silx.gui import qt
 from typing import Optional
 
 from tomwer.core.scan.scanbase import TomwerScanBase
-from tomwer.core.scan.hdf5scan import HDF5TomoScan
+from tomwer.core.scan.nxtomoscan import NXtomoScan
 from tomwer.core.process.control.nxtomoconcatenate import (
     ConcatenateNXtomoTask,
     format_output_location,
@@ -34,7 +34,7 @@ class NXtomoConcatenateOW(
     # note of this widget should be the one registered on the documentation
     name = "NXtomo concatenation"
     id = "orangecontrib.tomwer.widgets.control.NXtomoConcatenate.NXtomoConcatenate"
-    description = "concatenate a serie (of NXtomo / HDF5TomoScan) into a single Nxtomo"
+    description = "concatenate a serie (of NXtomo / NXtomoScan) into a single Nxtomo"
     icon = "icons/concatenate_nxtomos.svg"
     priority = 200
     keywords = [
@@ -44,7 +44,7 @@ class NXtomoConcatenateOW(
         "concatenate",
         "NXtomo",
         "data",
-        "HDF5TomoScan",
+        "NXtomoScan",
     ]
 
     want_main_area = True
@@ -59,6 +59,13 @@ class NXtomoConcatenateOW(
             "overwrite": False,
         }
     )
+    _ewoks_inputs_to_hide_from_orange = (
+        "output_entry",
+        "serialize_output_data",
+        "progress",
+        "output_file",
+        "overwrite",
+    )
 
     TIMEOUT = 30
 
@@ -88,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()
@@ -124,9 +136,9 @@ class NXtomoConcatenateOW(
         # task will be executed only when the user validates the dialog
         data = super().get_task_inputs().get("data", None)
         if data is not None:
-            if not isinstance(data, HDF5TomoScan):
+            if not isinstance(data, NXtomoScan):
                 raise TypeError(
-                    f"data is expected to be an instance of HDF5TomoScan. {type(data)} are not handled"
+                    f"data is expected to be an instance of NXtomoScan. {type(data)} are not handled"
                 )
             self.add(data.path)
 
@@ -136,7 +148,7 @@ class NXtomoConcatenateOW(
     def _newTaskStarted(self):
         try:
             task_executor = self.sender()
-            scan_about_to_be_created = HDF5TomoScan(
+            scan_about_to_be_created = NXtomoScan(
                 scan=format_output_location(
                     file_path=task_executor.current_task.inputs.output_file_path,
                     serie=task_executor.current_task.inputs.serie,
@@ -168,7 +180,7 @@ class NXtomoConcatenateOW(
             return
         else:
             self.__serie = serie
-            scan_about_to_be_created = HDF5TomoScan(
+            scan_about_to_be_created = NXtomoScan(
                 scan=format_output_location(
                     file_path=self.getOutputFilePath(),
                     serie=serie,

orangecontrib/tomwer/widgets/control/NotifierOW.py

@@ -47,6 +47,7 @@ class NotifierWidgetOW(widget.OWBaseWidget):
     keywords = ["control", "notifier", "notification"]
 
     want_main_area = True
+    want_control_area = False
     resizing_enabled = False
 
     _muted = settings.Setting(False)

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)

orangecontrib/tomwer/widgets/control/VolumeSelector.py

@@ -37,7 +37,7 @@ from orangewidget.widget import Input, Output, OWBaseWidget
 from silx.gui import qt
 
 import tomwer.core.process.control.volumeselector
-from tomwer.core.scan.hdf5scan import HDF5TomoScan
+from tomwer.core.scan.nxtomoscan import NXtomoScan
 from tomwer.core.volume.volumebase import TomwerVolumeBase
 from tomwer.gui.control.volumeselectorwidget import VolumeSelectorWidget
 
@@ -88,7 +88,10 @@ class VolumeSelectorOW(OWBaseWidget, openclass=True):
         self.add = self.widget.add
 
     @Inputs.volume
-    def addVolume(self, volume, *args, **kwargs):
+    def _volumeReceived(self, volume, *args, **kwargs):
+        self.addVolume(volume)
+
+    def addVolume(self, volume):
         if volume is not None:
             self.widget.add(volume)
 
@@ -119,8 +122,8 @@ class VolumeSelectorOW(OWBaseWidget, openclass=True):
             # kept for backward compatibility since 0.11. To be removed on the future version.
             if "@" in scan:
                 entry, file_path = scan.split("@")
-                hdf5_tomo_scan = HDF5TomoScan(entry=entry, scan=file_path)
-                self.addVolume(hdf5_tomo_scan)
+                nxtomo_scan = NXtomoScan(entry=entry, scan=file_path)
+                self.addVolume(nxtomo_scan)
             else:
                 self.addVolume(scan)
 

orangecontrib/tomwer/widgets/control/VolumeSymLinkOW.py

@@ -1,182 +1,182 @@
-# coding: utf-8
-# /*##########################################################################
-#
-# Copyright (c) 2016-2017 European Synchrotron Radiation Facility
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# ###########################################################################*/
-
-__authors__ = ["H. Payno"]
-__license__ = "MIT"
-__date__ = "16/11/2020"
-
-
-import logging
-
-from orangewidget import gui
-from orangewidget.settings import Setting
-from orangewidget.widget import Input, Output
-from processview.core.manager import DatasetState, ProcessManager
-from silx.gui import qt
-
-import tomwer.core.process.control.volumesymlink
-from orangecontrib.tomwer.orange.managedprocess import SuperviseOW
-from tomwer.core.process.control.volumesymlink import (
-    OutputType,
-    VolumeSymbolicLinkTask,
-)
-from tomwer.core.scan.scanbase import TomwerScanBase
-
-_logger = logging.getLogger(__name__)
-
-
-class VolumeSymLinkOW(SuperviseOW):
-    """
-    link volume reconstructed at proposal file if possible else under
-    the given folder
-    """
-
-    name = "volume symbolic link"
-    id = "orange.widgets.tomwer.control.VolumeSymLinkOW.VolumeSymLinkOW"
-    description = (
-        "create a symbolic link for the latest volume reconstructed on a "
-        "given folder"
-    )
-    icon = "icons/volumesymlink.svg"
-    priority = 200
-    keywords = [
-        "hdf5",
-        "tomwer",
-        "folder",
-        "volume",
-        "symlink",
-        "tomography",
-        "symbolic link",
-    ]
-
-    want_main_area = True
-    resizing_enabled = True
-
-    ewokstaskclass = tomwer.core.process.control.volumesymlink.VolumeSymbolicLinkTask
-
-    _scans = Setting(list())
-
-    class Inputs:
-        data = Input(name="data", type=TomwerScanBase, doc="scan to be process")
-
-    class Outputs:
-        data = Output(name="data", type=TomwerScanBase, doc="one scan to be process")
-
-    def __init__(self, parent=None):
-        super().__init__(parent)
-        self._mainWidget = _OutputDir(parent=self)
-        layout = gui.vBox(self.mainArea, self.name).layout()
-        layout.addWidget(self._mainWidget)
-
-    @Inputs.data
-    def process(self, scan):
-        if scan is None:
-            return
-        symlink_process = VolumeSymbolicLinkTask(
-            inputs={
-                "data": scan,
-                "output_type": self._mainWidget.getOutputType(),
-                "output_folder": self._mainWidget.getOutputFolder(),
-                "serialize_output_data": False,
-            }
-        )
-        ProcessManager().notify_dataset_state(
-            dataset=self.scan,
-            process=self,
-            state=DatasetState.ON_GOING,
-        )
-        try:
-            symlink_process.run()
-        except Exception:
-            mess = f"Failed to create symbolic link for {scan}"
-            _logger.processFailed(mess)
-            ProcessManager().notify_dataset_state(
-                dataset=self.scan, process=self, state=DatasetState.FAILED, details=mess
-            )
-        else:
-            mess = f"Create symbolic link for {scan}"
-            _logger.processSucceed(mess)
-            ProcessManager().notify_dataset_state(
-                dataset=self.scan,
-                process=self,
-                state=DatasetState.SUCCEED,
-                details=mess,
-            )
-        self.Outputs.data.send(scan)
-
-    def reprocess(self, dataset):
-        self.process(dataset)
-
-
-class _OutputDir(qt.QGroupBox):
-    def __init__(self, parent):
-        qt.QGroupBox.__init__(self, parent)
-        self._button_grp = qt.QButtonGroup(self)
-        self._button_grp.setExclusive(True)
-        self.setLayout(qt.QGridLayout())
-        self._oneLevelCB = qt.QRadioButton(OutputType.ONE_LEVEL_UPPER.value, self)
-        self._button_grp.addButton(self._oneLevelCB)
-        self.layout().addWidget(self._oneLevelCB, 1, 0, 1, 3)
-        self._staticOpt = qt.QRadioButton("", self)
-        self._button_grp.addButton(self._staticOpt)
-        self.layout().addWidget(self._staticOpt, 2, 0, 1, 1)
-        self._qleFolder = qt.QLineEdit("", self)
-        self.layout().addWidget(self._qleFolder, 2, 1, 1, 1)
-        self._selectPB = qt.QPushButton("select", self)
-        self.layout().addWidget(self._selectPB, 2, 2, 1, 1)
-
-        # connect signal / slot
-        self._selectPB.released.connect(self._selectFolder)
-        self._qleFolder.editingFinished.connect(self._activeStaticOpt)
-
-        # set up
-        self._oneLevelCB.setChecked(True)
-
-    def _activeStaticOpt(self, *args, **kwargs):
-        self._staticOpt.setChecked(True)
-
-    def _selectFolder(self):  # pragma: no cover
-        dialog = qt.QFileDialog(self)
-        dialog.setWindowTitle("Select destination folder for symbolic link")
-        dialog.setModal(1)
-        dialog.setFileMode(qt.QFileDialog.DirectoryOnly)
-
-        if not dialog.exec_():
-            dialog.close()
-            return None
-
-        dest_folder = dialog.selectedFiles()[0]
-        self._qleFolder.setText(dest_folder)
-
-    def getOutputType(self) -> OutputType:
-        if self._oneLevelCB.isChecked():
-            return OutputType.ONE_LEVEL_UPPER
-        elif self._staticOpt.isChecked():
-            return OutputType.STATIC
-        else:
-            raise TypeError("Not managed")
-
-    def getOutputFolder(self):
-        return self._qleFolder.text()
+# # coding: utf-8
+# # /*##########################################################################
+# #
+# # Copyright (c) 2016-2017 European Synchrotron Radiation Facility
+# #
+# # Permission is hereby granted, free of charge, to any person obtaining a copy
+# # of this software and associated documentation files (the "Software"), to deal
+# # in the Software without restriction, including without limitation the rights
+# # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# # copies of the Software, and to permit persons to whom the Software is
+# # furnished to do so, subject to the following conditions:
+# #
+# # The above copyright notice and this permission notice shall be included in
+# # all copies or substantial portions of the Software.
+# #
+# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# # THE SOFTWARE.
+# #
+# # ###########################################################################*/
+
+# __authors__ = ["H. Payno"]
+# __license__ = "MIT"
+# __date__ = "16/11/2020"
+
+
+# import logging
+
+# from orangewidget import gui
+# from orangewidget.settings import Setting
+# from orangewidget.widget import Input, Output
+# from processview.core.manager import DatasetState, ProcessManager
+# from silx.gui import qt
+
+# import tomwer.core.process.control.volumesymlink
+# from orangecontrib.tomwer.orange.managedprocess import SuperviseOW
+# from tomwer.core.process.control.volumesymlink import (
+#     OutputType,
+#     VolumeSymbolicLinkTask,
+# )
+# from tomwer.core.scan.scanbase import TomwerScanBase
+
+# _logger = logging.getLogger(__name__)
+
+
+# class VolumeSymLinkOW(SuperviseOW):
+#     """
+#     link volume reconstructed at proposal file if possible else under
+#     the given folder
+#     """
+
+#     name = "volume symbolic link"
+#     id = "orange.widgets.tomwer.control.VolumeSymLinkOW.VolumeSymLinkOW"
+#     description = (
+#         "create a symbolic link for the latest volume reconstructed on a "
+#         "given folder"
+#     )
+#     icon = "icons/volumesymlink.svg"
+#     priority = 200
+#     keywords = [
+#         "hdf5",
+#         "tomwer",
+#         "folder",
+#         "volume",
+#         "symlink",
+#         "tomography",
+#         "symbolic link",
+#     ]
+
+#     want_main_area = True
+#     resizing_enabled = True
+
+#     ewokstaskclass = tomwer.core.process.control.volumesymlink.VolumeSymbolicLinkTask
+
+#     _scans = Setting(list())
+
+#     class Inputs:
+#         data = Input(name="data", type=TomwerScanBase, doc="scan to be process")
+
+#     class Outputs:
+#         data = Output(name="data", type=TomwerScanBase, doc="one scan to be process")
+
+#     def __init__(self, parent=None):
+#         super().__init__(parent)
+#         self._mainWidget = _OutputDir(parent=self)
+#         layout = gui.vBox(self.mainArea, self.name).layout()
+#         layout.addWidget(self._mainWidget)
+
+#     @Inputs.data
+#     def process(self, scan):
+#         if scan is None:
+#             return
+#         symlink_process = VolumeSymbolicLinkTask(
+#             inputs={
+#                 "data": scan,
+#                 "output_type": self._mainWidget.getOutputType(),
+#                 "output_folder": self._mainWidget.getOutputFolder(),
+#                 "serialize_output_data": False,
+#             }
+#         )
+#         ProcessManager().notify_dataset_state(
+#             dataset=self.scan,
+#             process=self,
+#             state=DatasetState.ON_GOING,
+#         )
+#         try:
+#             symlink_process.run()
+#         except Exception:
+#             mess = f"Failed to create symbolic link for {scan}"
+#             _logger.processFailed(mess)
+#             ProcessManager().notify_dataset_state(
+#                 dataset=self.scan, process=self, state=DatasetState.FAILED, details=mess
+#             )
+#         else:
+#             mess = f"Create symbolic link for {scan}"
+#             _logger.processSucceed(mess)
+#             ProcessManager().notify_dataset_state(
+#                 dataset=self.scan,
+#                 process=self,
+#                 state=DatasetState.SUCCEED,
+#                 details=mess,
+#             )
+#         self.Outputs.data.send(scan)
+
+#     def reprocess(self, dataset):
+#         self.process(dataset)
+
+
+# class _OutputDir(qt.QGroupBox):
+#     def __init__(self, parent):
+#         qt.QGroupBox.__init__(self, parent)
+#         self._button_grp = qt.QButtonGroup(self)
+#         self._button_grp.setExclusive(True)
+#         self.setLayout(qt.QGridLayout())
+#         self._oneLevelCB = qt.QRadioButton(OutputType.ONE_LEVEL_UPPER.value, self)
+#         self._button_grp.addButton(self._oneLevelCB)
+#         self.layout().addWidget(self._oneLevelCB, 1, 0, 1, 3)
+#         self._staticOpt = qt.QRadioButton("", self)
+#         self._button_grp.addButton(self._staticOpt)
+#         self.layout().addWidget(self._staticOpt, 2, 0, 1, 1)
+#         self._qleFolder = qt.QLineEdit("", self)
+#         self.layout().addWidget(self._qleFolder, 2, 1, 1, 1)
+#         self._selectPB = qt.QPushButton("select", self)
+#         self.layout().addWidget(self._selectPB, 2, 2, 1, 1)
+
+#         # connect signal / slot
+#         self._selectPB.released.connect(self._selectFolder)
+#         self._qleFolder.editingFinished.connect(self._activeStaticOpt)
+
+#         # set up
+#         self._oneLevelCB.setChecked(True)
+
+#     def _activeStaticOpt(self, *args, **kwargs):
+#         self._staticOpt.setChecked(True)
+
+#     def _selectFolder(self):  # pragma: no cover
+#         dialog = qt.QFileDialog(self)
+#         dialog.setWindowTitle("Select destination folder for symbolic link")
+#         dialog.setModal(1)
+#         dialog.setFileMode(qt.QFileDialog.DirectoryOnly)
+
+#         if not dialog.exec_():
+#             dialog.close()
+#             return None
+
+#         dest_folder = dialog.selectedFiles()[0]
+#         self._qleFolder.setText(dest_folder)
+
+#     def getOutputType(self) -> OutputType:
+#         if self._oneLevelCB.isChecked():
+#             return OutputType.ONE_LEVEL_UPPER
+#         elif self._staticOpt.isChecked():
+#             return OutputType.STATIC
+#         else:
+#             raise TypeError("Not managed")
+
+#     def getOutputFolder(self):
+#         return self._qleFolder.text()

orangecontrib/tomwer/widgets/debugtools/DatasetGeneratorOW.py

@@ -41,8 +41,8 @@ from silx.gui.utils import concurrent
 
 from tomwer.core.scan.blissscan import BlissScan
 from tomwer.core.scan.edfscan import EDFTomoScan
-from tomwer.core.scan.hdf5scan import HDF5TomoScan
-from tomwer.core.utils.scanutils import MockBlissAcquisition, MockEDF, MockHDF5
+from tomwer.core.scan.nxtomoscan import NXtomoScan
+from tomwer.core.utils.scanutils import MockBlissAcquisition, MockEDF, MockNXtomo
 from tomwer.gui.debugtools.datasetgenerator import DatasetGeneratorDialog
 
 
@@ -150,13 +150,13 @@ class _DatasetGeneratorThread(threading.Thread):
             scan = MockEDF.mockScan(
                 scanID=self.scan_path, nRadio=self.n_proj, dim=self.dims[0]
             )
-        elif self.type_to_generate == HDF5TomoScan.__name__:
-            scan = MockHDF5(
+        elif self.type_to_generate == NXtomoScan.__name__:
+            scan = MockNXtomo(
                 scan_path=self.scan_path,
                 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__:

orangecontrib/tomwer/widgets/edit/DarkFlatPatchOW.py

@@ -38,7 +38,7 @@ from orangewidget.widget import Input, Output
 from silx.io.url import DataUrl
 
 import tomwer.core.process.edit.darkflatpatch
-from tomwer.core.scan.hdf5scan import HDF5TomoScan
+from tomwer.core.scan.nxtomoscan import NXtomoScan
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.gui.edit.dkrfpatch import DarkRefPatchWidget
 from tomwer.synctools.stacks.edit.darkflatpatch import DarkFlatPatchProcessStack
@@ -52,7 +52,7 @@ _logger = logging.getLogger(__name__)
 
 class DarkFlatPatchOW(WidgetLongProcessing, SuperviseOW):
     """
-    Widget to define on the fly the image_key of a HDF5TomoScan
+    Widget to define on the fly the image_key of a NXtomoScan
     """
 
     name = "dark-flat-patch"
@@ -110,8 +110,8 @@ class DarkFlatPatchOW(WidgetLongProcessing, SuperviseOW):
     def process(self, scan):
         if scan is None:
             return
-        elif not isinstance(scan, HDF5TomoScan):
-            _logger.error("We can only patch dark and flat for HDF5TomoScan")
+        elif not isinstance(scan, NXtomoScan):
+            _logger.error("We can only patch dark and flat for NXtomoScan")
         else:
             self._processingStack.add(scan, self.getConfiguration())
 

orangecontrib/tomwer/widgets/edit/ImageKeyEditorOW.py

@@ -35,7 +35,7 @@ from orangewidget import gui
 from orangewidget.widget import Input, Output
 
 import tomwer.core.process.edit.imagekeyeditor
-from tomwer.core.scan.hdf5scan import HDF5TomoScan
+from tomwer.core.scan.nxtomoscan import NXtomoScan
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.gui.edit.imagekeyeditor import ImageKeyDialog
 from tomwer.synctools.stacks.edit.imagekeyeditor import ImageKeyEditorProcessStack
@@ -49,7 +49,7 @@ _logger = logging.getLogger(__name__)
 
 class ImageKeyEditorOW(SuperviseOW, WidgetLongProcessing):
     """
-    Widget to define on the fly the image_key of a HDF5TomoScan
+    Widget to define on the fly the image_key of a NXtomoScan
     """
 
     name = "image-key-editor"
@@ -103,7 +103,7 @@ class ImageKeyEditorOW(SuperviseOW, WidgetLongProcessing):
     def process(self, scan):
         if scan is None:
             return
-        elif not isinstance(scan, HDF5TomoScan):
+        elif not isinstance(scan, NXtomoScan):
             _logger.error("You can only edit image keys for the HDF5 scans")
         else:
             self._scan = scan

orangecontrib/tomwer/widgets/edit/ImageKeyUpgraderOW.py

@@ -71,6 +71,8 @@ class ImageKeyUpgraderOW(
     want_main_area = True
     resizing_enabled = True
 
+    _ewoks_inputs_to_hide_from_orange = ("operations", "serialize_output_data")
+
     def __init__(self, parent=None, *args, **kwargs):
         super().__init__(parent=parent, *args, **kwargs)
 
@@ -79,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()

orangecontrib/tomwer/widgets/edit/NXtomoEditorOW.py

@@ -5,7 +5,7 @@ from orangewidget.settings import Setting
 from orangewidget.widget import Input, Output
 from silx.gui import qt
 
-from tomwer.core.scan.hdf5scan import HDF5TomoScan
+from tomwer.core.scan.nxtomoscan import NXtomoScan
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.gui.edit.nxtomoeditor import NXtomoEditorDialog as _NXtomoEditorDialog
 
@@ -104,9 +104,9 @@ class NXtomoEditorOW(SuperviseOW):
     def _setScan(self, scan):
         if scan is None:
             pass
-        elif not isinstance(scan, HDF5TomoScan):
+        elif not isinstance(scan, NXtomoScan):
             raise TypeError(
-                f"expect to have an instance of {HDF5TomoScan}. {type(scan)} provided."
+                f"expect to have an instance of {NXtomoScan}. {type(scan)} provided."
             )
         else:
             self.widget.setScan(scan)