tomwer 1.3.26__py3-none-any.whl → 1.4.0__py3-none-any.whl

orangecontrib/tomwer/widgets/control/DataWatcherOW.py

@@ -1,31 +1,4 @@
-# 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__ = ["C. Nemoz", "H. Payno"]
-__license__ = "MIT"
-__date__ = "25/10/2016"
+from __future__ import annotations
 
 import functools
 import logging

orangecontrib/tomwer/widgets/control/EDF2NXTomomillOW.py

@@ -1,31 +1,4 @@
-# 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__ = "11/03/2020"
+from __future__ import annotations
 
 import logging
 from copy import copy
@@ -33,10 +6,12 @@ from copy import copy
 from nxtomomill.io.config import TomoEDFConfig as EDFConfig
 from orangewidget import gui
 from silx.gui import qt
+from silx.gui.utils import blockSignals
 
 from orangecontrib.tomwer.orange.managedprocess import TomwerWithStackStack
 from orangecontrib.tomwer.widgets.control.NXTomomillMixIn import NXTomomillMixIn
 from tomwer.core.process.control.nxtomomill import EDFToNxProcess
+from tomwer.core.process.output import ProcessDataOutputDirMode
 from tomwer.core.scan.edfscan import EDFTomoScan
 from tomwer.core.scan.nxtomoscan import NXtomoScan
 from tomwer.gui.control.datalist import EDFDataListMainWindow
@@ -104,7 +79,6 @@ class EDF2NXOW(
         _layout.addWidget(self._convertAutoCB)
 
         # connect signal / slot
-        self.widget._sendButton.clicked.connect(self._sendAll)
         self.widget._sendSelectedButton.clicked.connect(self._sendSelected)
         self.widget.sigNXTomoCFGFileChanged.connect(self._saveNXTomoCfgFile)
         self.widget.sigUpdated.connect(self._updateSettings)
@@ -126,9 +100,19 @@ class EDF2NXOW(
         self._loadSettings()
 
     def _updateSettings(self):
+        # keep auto conversion setting
         self._ewoks_default_inputs[  # pylint: disable=E1137
             "convert_auto_edfscan_channel"
         ] = self.convertAutoEDFScanReceivedFromChannel()
+        # store scans
+        self._scans = []
+        for scan in self.widget.datalist._myitems:
+            self._scans.append(scan)
+        # store output folder
+        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
 
     def convertAutoEDFScanReceivedFromChannel(self) -> bool:
         return self._convertAutoCB.isChecked()
@@ -137,26 +121,31 @@ class EDF2NXOW(
         self._convertAutoCB.setChecked(checked)
 
     def _loadSettings(self):
-        for scan in self._scans:  # pylint: disable=E1133
-            self.widget.add(scan)
-        if "nxtomomill_cfg_file" in self._ewoks_default_inputs:  # pylint: disable=E1135
-            self._nxtomo_cfg_file = self._ewoks_default_inputs[  # pylint: disable=E1136
-                "nxtomomill_cfg_file"
-            ]
-            self.widget.setCFGFilePath(self._nxtomo_cfg_file)
-        if "output_dir" in self._ewoks_default_inputs:  # pylint: disable=E1135
-            self.widget.setOutputFolder(
-                self._ewoks_default_inputs["output_dir"]  # pylint: disable=E1136
-            )
-        if (
-            "convert_auto_edfscan_channel"
-            in self._ewoks_default_inputs  # pylint: disable=E1135
-        ):
-            self.setConvertAutoEDFScanReceivedFromChannel(
-                self._ewoks_default_inputs[  # pylint: disable=E1136
-                    "convert_auto_edfscan_channel"
-                ]
-            )
+        with blockSignals(self.widget):
+            for scan in self._scans:  # pylint: disable=E1133
+                self.widget.add(scan)
+            if (
+                "nxtomomill_cfg_file" in self._ewoks_default_inputs
+            ):  # pylint: disable=E1135
+                self._nxtomo_cfg_file = (
+                    self._ewoks_default_inputs[  # pylint: disable=E1136
+                        "nxtomomill_cfg_file"
+                    ]
+                )
+                self.widget.setCFGFilePath(self._nxtomo_cfg_file)
+            if "output_dir" in self._ewoks_default_inputs:  # pylint: disable=E1135
+                self.widget.setOutputFolder(
+                    self._ewoks_default_inputs["output_dir"]  # pylint: disable=E1136
+                )
+            if (
+                "convert_auto_edfscan_channel"
+                in self._ewoks_default_inputs  # pylint: disable=E1135
+            ):
+                self.setConvertAutoEDFScanReceivedFromChannel(
+                    self._ewoks_default_inputs[  # pylint: disable=E1136
+                        "convert_auto_edfscan_channel"
+                    ]
+                )
 
     def _convertAndSend(self, edf_scan: EDFTomoScan):
         # cache updated for each folder in order to match `_execute_ewoks_task` design
@@ -193,7 +182,7 @@ class EDF2NXOW(
                 log_missing_inputs=False,
             )
         except Exception:
-            self._execute_ewoks_task(propagate=True)  # pylint: disable=E1123
+            self._execute_ewoks_task(propagate=True)  # pylint: disable=E1123, E1120
 
     def get_task_inputs(self):
         return {
@@ -230,7 +219,7 @@ class EDF2NXOW(
             else:
                 self.notify_failed(scan=scan)
         except Exception as e:
-            logger.error(f"failed to handle task finished callback. Raiseon is {e}")
+            logger.error(f"failed to handle task finished callback. Reason is {e}")
 
     def _saveNXTomoCfgFile(self, cfg_file):
         super()._saveNXTomoCfgFile(cfg_file, keyword="edf_to_nx_configuration")
@@ -250,3 +239,11 @@ class EDF2NXOW(
             tomo_obj = self.widget.datalist.getEDFTomoScan(scan_id, None)
             if tomo_obj:
                 self._convertAndSend(tomo_obj)
+
+    def keyPressEvent(self, event):
+        # forward Ctrl+A to the list as the shift ease selection of all
+        modifiers = event.modifiers()
+        key = event.key()
+        if key == qt.Qt.Key_A and modifiers == qt.Qt.KeyboardModifier.ControlModifier:
+            self.widget._widget.datalist.keyPressEvent(event)
+        super().keyPressEvent(event)

orangecontrib/tomwer/widgets/control/EmailOW.py

@@ -5,9 +5,15 @@ from silx.gui import qt
 from ewoksorange.bindings.owwidgets import OWEwoksWidgetNoThread
 
 import tomwer.core.process.control.emailnotifier
-from tomwer.gui.control.emailnotifier import Emailwidget
 from tomwer.core.utils.dictutils import concatenate_dict
 
+try:
+    from ewoksnotify.gui.email import EmailWidget
+except ImportError:
+    has_ewoksnotify = False
+else:
+    has_ewoksnotify = True
+
 
 class EmailOW(
     OWEwoksWidgetNoThread,
@@ -42,7 +48,11 @@ class EmailOW(
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self._widget = Emailwidget(parent=self)
+        if not has_ewoksnotify:
+            raise ImportError(
+                "ewoksnotify not install but required. Please run 'pip install ewoksnotify[full]'"
+            )
+        self._widget = EmailWidget(parent=self)
 
         self._box = gui.vBox(self.mainArea, self.name)
         layout = self._box.layout()

orangecontrib/tomwer/widgets/control/FilterOW.py

@@ -1,31 +1,4 @@
-# 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__ = "19/07/2018"
+from __future__ import annotations
 
 import logging
 

orangecontrib/tomwer/widgets/control/NXTomomillOW.py

@@ -1,31 +1,4 @@
-# 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__ = "11/03/2020"
+from __future__ import annotations
 
 import logging
 import os
@@ -34,6 +7,7 @@ from copy import copy
 from nxtomomill.io.config import TomoHDF5Config as HDF5Config
 from orangewidget import gui
 from silx.gui import qt
+from silx.gui.utils import blockSignals
 
 from orangecontrib.tomwer.orange.managedprocess import TomwerWithStackStack
 from orangecontrib.tomwer.widgets.control.NXTomomillMixIn import NXTomomillMixIn
@@ -114,7 +88,6 @@ class NXTomomillOW(
         self.start = self._sendAll
 
         # connect signal / slot
-        self.widget._sendButton.clicked.connect(self._sendAll)
         self.widget._sendSelectedButton.clicked.connect(self._sendSelected)
         self.widget.sigNXTomoCFGFileChanged.connect(self._saveNXTomoCfgFile)
         self.widget.sigUpdated.connect(self._updateSettings)
@@ -177,7 +150,7 @@ class NXTomomillOW(
     def _convertAndSend(self, bliss_url: str):
         """
 
-        :param str bliss_url: string at entry@file format
+        :param bliss_url: string at entry@file format
         """
         logger.processStarted(f"Start translate {bliss_url} to NXTomo")
         self.__configuration_cache = HDF5Config.from_dict(
@@ -255,26 +228,29 @@ class NXTomomillOW(
                 log_missing_inputs=False,
             )
         except Exception:
-            self._execute_ewoks_task(propagate=True)  # pylint: disable=E1123
+            self._execute_ewoks_task(propagate=True)  # pylint: disable=E1123, E1120
 
     def _loadSettings(self):
-        for scan in self._scans:
-            assert isinstance(scan, str)
-            try:
-                self.widget.add(scan)
-            except Exception as e:
-                logger.error(f"Fail to add {scan}. Error is {e}")
-            else:
-                logger.warning(f"{scan} is an invalid link to a file")
-        if "nxtomomill_cfg_file" in self._ewoks_default_inputs:  # pylint: disable=E1135
-            nxtomo_cfg_file = self._ewoks_default_inputs[  # pylint: disable=E1136
-                "nxtomomill_cfg_file"
-            ]
-            self.widget.setCFGFilePath(nxtomo_cfg_file)
-        if "output_dir" in self._ewoks_default_inputs:  # pylint: disable=E1135
-            self.widget.setOutputFolder(
-                self._ewoks_default_inputs["output_dir"]  # pylint: disable=E1136
-            )
+        with blockSignals(self.widget):
+            for scan in self._scans:
+                assert isinstance(scan, str)
+                try:
+                    self.widget.add(scan)
+                except Exception as e:
+                    logger.error(f"Fail to add {scan}. Error is {e}")
+                else:
+                    logger.warning(f"{scan} is an invalid link to a file")
+            if (
+                "nxtomomill_cfg_file" in self._ewoks_default_inputs
+            ):  # pylint: disable=E1135
+                nxtomo_cfg_file = self._ewoks_default_inputs[  # pylint: disable=E1136
+                    "nxtomomill_cfg_file"
+                ]
+                self.widget.setCFGFilePath(nxtomo_cfg_file)
+            if "output_dir" in self._ewoks_default_inputs:  # pylint: disable=E1135
+                self.widget.setOutputFolder(
+                    self._ewoks_default_inputs["output_dir"]  # pylint: disable=E1136
+                )
 
     def getHDF5Config(self):
         configuration_file = self.widget.getCFGFilePath()
@@ -333,21 +309,29 @@ class NXTomomillOW(
             else:
                 self.notify_failed(scan=scan)
         except Exception as e:
-            logger.error(f"failed to handle task finished callback. Raiseon is {e}")
+            logger.error(f"failed to handle task finished callback. Reason is {e}")
 
     def trigger_downstream(self) -> None:
         for ewoksname, var in self.get_task_outputs().items():
             # note: for now we want to trigger 'data' for each items of 'datas'
-            if ewoksname == "serie" and not (
+            if ewoksname == "series" and not (
                 invalid_data.is_invalid_data(var.value) or var.value is None
             ):
                 for data in var.value:
                     data_channel = self._get_output_signal("data")
                     data_channel.send(data)
-                serie_channel = self._get_output_signal("serie")
-                # then send the list of value / serie (also know as datas)
+                serie_channel = self._get_output_signal("series")
+                # then send the list of value / series (also know as datas)
                 serie_channel.send(var.value)
             elif ewoksname == "data" and not (
                 invalid_data.is_invalid_data(var.value) or var.value is None
             ):
-                pass  # handle by 'serie' in this case
+                pass  # handle by 'series' in this case
+
+    def keyPressEvent(self, event):
+        # forward Ctrl+A to the list as the shift ease selection of all
+        modifiers = event.modifiers()
+        key = event.key()
+        if key == qt.Qt.Key_A and modifiers == qt.Qt.KeyboardModifier.ControlModifier:
+            self.widget._widget.datalist.keyPressEvent(event)
+        super().keyPressEvent(event)

orangecontrib/tomwer/widgets/control/NXtomoConcatenate.py

@@ -1,13 +1,14 @@
+from __future__ import annotations
+
 import logging
 
-from tomoscan.serie import Serie
+from tomoscan.series import Series
 
 from orangewidget import gui
 from orangewidget.settings import Setting
 from orangewidget.widget import Input, Output
 from orangecontrib.tomwer.orange.managedprocess import TomwerWithStackStack
 from silx.gui import qt
-from typing import Optional
 
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.core.scan.nxtomoscan import NXtomoScan
@@ -16,7 +17,7 @@ from tomwer.core.process.control.nxtomoconcatenate import (
     format_output_location,
 )
 
-from tomwer.gui.control.serie.nxtomoconcatenate import NXtomoConcatenateWidget
+from tomwer.gui.control.series.nxtomoconcatenate import NXtomoConcatenateWidget
 
 _logger = logging.getLogger(__name__)
 
@@ -53,7 +54,7 @@ class NXtomoConcatenateOW(
 
     _ewoks_default_inputs = Setting(
         {
-            "serie": None,
+            "series": None,
             "output_file": "{common_path}/concatenate.nx",
             "output_entry": "entry0000",
             "overwrite": False,
@@ -70,10 +71,10 @@ class NXtomoConcatenateOW(
     TIMEOUT = 30
 
     class Inputs:
-        serie = Input(
-            name="serie",
-            type=Serie,
-            doc="serie to concatenate",
+        series = Input(
+            name="series",
+            type=Series,
+            doc="series to concatenate",
             default=True,
             multiple=False,
         )
@@ -85,7 +86,7 @@ class NXtomoConcatenateOW(
 
     def __init__(self, parent=None):
         super().__init__(parent)
-        self.__serie = None
+        self.__series = None
 
         # gui definition
         _layout = gui.vBox(self.mainArea, self.name).layout()
@@ -120,9 +121,9 @@ class NXtomoConcatenateOW(
         self.__request_input = request
 
     def get_task_inputs(self):
-        assert self.__serie is not None
+        assert self.__series is not None
         return {
-            "serie": self.__serie,
+            "series": self.__series,
             "output_file": self.widget.getConfiguration()["output_file"],
             "output_entry": self.widget.getConfiguration()["output_entry"],
             "overwrite": self.widget.getConfiguration()["overwrite"],
@@ -151,7 +152,7 @@ class NXtomoConcatenateOW(
             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,
+                    series=task_executor.current_task.inputs.series,
                 ),
                 entry=task_executor.current_task.inputs.output_entry,
             )
@@ -169,21 +170,21 @@ class NXtomoConcatenateOW(
             else:
                 self.notify_failed(scan=scan)
         except Exception as e:
-            _logger.error(f"failed to handle task finished callback. Raiseon is {e}")
+            _logger.error(f"failed to handle task finished callback. Reason is {e}")
 
-    @Inputs.serie
-    def process_serie(self, serie: Optional[Serie]):
-        self._process_serie(serie=serie)
+    @Inputs.series
+    def process_series(self, series: Series | None):
+        self._process_series(series=series)
 
-    def _process_serie(self, serie: Optional[Serie]):
-        if serie is None:
+    def _process_series(self, series: Series | None):
+        if series is None:
             return
         else:
-            self.__serie = serie
+            self.__series = series
             scan_about_to_be_created = NXtomoScan(
                 scan=format_output_location(
                     file_path=self.getOutputFilePath(),
-                    serie=serie,
+                    series=series,
                 ),
                 entry=self.getOutputEntry(),
             )

orangecontrib/tomwer/widgets/control/NotifierOW.py

@@ -1,37 +1,11 @@
-# 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__ = "19/07/2018"
+from __future__ import annotations
 
 from orangewidget import gui, settings, widget
 from orangewidget.widget import Input, Output
 from silx.gui import qt
 
 from tomwer.core.tomwer_object import TomwerObject
+from tomwer.core.utils.deprecation import deprecated_warning
 
 
 class NotifierWidgetOW(widget.OWBaseWidget):
@@ -60,6 +34,13 @@ class NotifierWidgetOW(widget.OWBaseWidget):
 
     def __init__(self, parent=None):
         super().__init__(parent)
+        deprecated_warning(
+            type_="class",
+            name="orangecontrib.tomwer.widgets.control.NotifierOW",
+            replacement="orangecontrib.ewoksnotify.ToneNotifierOW",
+            reason="moved to ewoksnotify (pip install ewoksnotify[full] to get the orange widget)",
+            since_version="1.4",
+        )
         self.pop_up = None
         layout = gui.vBox(self.mainArea, self.name).layout()
         self._soundButton = qt.QPushButton(parent=self)

orangecontrib/tomwer/widgets/control/ReduceDarkFlatSelectorOW.py

@@ -1,5 +1,6 @@
+from __future__ import annotations
+
 import logging
-from typing import Optional
 
 from orangewidget import gui
 from orangewidget.settings import Setting
@@ -79,7 +80,7 @@ class ReduceDarkFlatSelectorOW(OWBaseWidget, openclass=True):
         self.Outputs.out_reduced_flats.send(flats)
 
     @Inputs.in_reduced_frames
-    def addReduceFrames(self, reduce_frames: Optional[dict], *args, **kwargs):
+    def addReduceFrames(self, reduce_frames: dict | None, *args, **kwargs):
         if reduce_frames is not None:
             self._dialog.addReduceFrames(reduce_frames)
 

orangecontrib/tomwer/widgets/control/SingleTomoObjOW.py

@@ -1,31 +1,5 @@
 # coding: utf-8
-# /*##########################################################################
-#
-# Copyright (c) 2016-2021 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__ = ["C. Nemoz", "H. Payno"]
-__license__ = "MIT"
-__date__ = "25/08/2022"
+from __future__ import annotations
 
 import logging
 

orangecontrib/tomwer/widgets/control/TimerOW.py

@@ -1,31 +1,4 @@
-# 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__ = "19/07/2018"
+from __future__ import annotations
 
 import functools
 import logging
@@ -40,6 +13,7 @@ import tomwer.core.process.control.timer
 from orangecontrib.tomwer.orange.managedprocess import SuperviseOW
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.utils import docstring
+from tomwer.core.utils.deprecation import deprecated_warning
 
 _logger = logging.getLogger(__name__)
 
@@ -90,6 +64,13 @@ class TimerOW(SuperviseOW):
     def __init__(self, parent=None):
         """ """
         SuperviseOW.__init__(self, parent)
+        deprecated_warning(
+            type_="class",
+            name="orangecontrib.tomwer.widgets.control.TimerOW",
+            replacement="orangecontrib.ewoksnotify.WaiterOW",
+            reason="moved to ewoksnotify (pip install ewoksnotify[full] to get the orange widget)",
+            since_version="1.4",
+        )
         self._widget = _TimerWidget(parent=self, _time=self._waiting_time)
         self._widget.setContentsMargins(0, 0, 0, 0)