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

tomwer/gui/cluster/{test → tests}/test_cluster.py

@@ -1,30 +1,5 @@
 # coding: utf-8
-# /*##########################################################################
-# Copyright (C) 2016 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/10/2021"
+from __future__ import annotations
 
 
 import pytest
@@ -33,9 +8,11 @@ from silx.gui.utils.testutils import TestCaseQt
 
 from tomwer.core.settings import SlurmSettings
 from tomwer.gui.cluster.slurm import (
+    is_op_account,
     SlurmSettingsMode,
     SlurmSettingsWidget,
     SlurmSettingsWindow,
+    _WallTime,
 )
 from tomwer.tests.utils import skip_gui_test
 from tomwer.tests.conftest import qtapp  # noqa F401
@@ -63,6 +40,7 @@ class TestSlurmWidget(TestCaseQt):
             "job_name": "tomwer_{scan}_-_{process}_-_{info}",
             "n_jobs": 1,
             "modules": ("tomotools/stable",),
+            "walltime": "01:00:00",
             "sbatch_extra_params": {
                 "export": "NONE",
                 "gpu_card": None,
@@ -104,3 +82,20 @@ def test_SlurmSettingsWindow(qtapp):  # noqa F811
     for mode in SlurmSettingsMode:
         widget.setCurrentSettingsMode(mode)
         widget.getConfiguration()
+
+
+def test_is_op_account():
+    assert is_op_account("opid19")
+    assert not is_op_account("opid0")
+    assert not is_op_account("dopid05")
+    assert not is_op_account("opid")
+    assert is_op_account("opd12")
+
+
+def test__WallTime():
+    assert _WallTime("11:00:02") > _WallTime("10:25:45")
+    assert _WallTime("1-00:00:00") > _WallTime("10:25:45")
+    assert _WallTime("01:00:0") < _WallTime("01:00:01")
+    assert _WallTime("1-00:00:00") == _WallTime(
+        "24:00:0"
+    ), f"{_WallTime('1-00:00:00').value} != {_WallTime('24:00:0').value} "

tomwer/gui/cluster/{test → tests}/test_supervisor.py

@@ -1,31 +1,5 @@
 # coding: utf-8
-# /*##########################################################################
-# Copyright (C) 2016 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__ = "08/11/2021"
-
+from __future__ import annotations
 
 import asyncio
 import os

tomwer/gui/conditions/__init__.py

@@ -0,0 +1,2 @@
+"""Widgets for conditions (filters to let a scan continue processing or not)
+"""

tomwer/gui/conditions/filter.py

@@ -1,35 +1,10 @@
 # coding: utf-8
-# /*##########################################################################
-# Copyright (C) 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.
-#
-#############################################################################*/
 
 """
 This module is used to define the process of the reference creator.
 This is related to the issue #184
 """
-
-__authors__ = ["H.Payno"]
-__license__ = "MIT"
-__date__ = "19/07/2018"
+from __future__ import annotations
 
 
 from silx.gui import qt

tomwer/gui/configuration/__init__.py

@@ -0,0 +1,2 @@
+"""Widgets to define the configuration level we want to display (display only basic configuration/settings, advance...)
+"""

tomwer/gui/control/__init__.py

@@ -0,0 +1,2 @@
+"""Widgets related to 'control' tasks (select a scan, convert a scan with nxtomomill...)
+"""

tomwer/gui/control/actions.py

@@ -1,32 +1,5 @@
 # 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__ = "23/03/2021"
-
+from __future__ import annotations
 
 from silx.gui import qt
 from functools import partial
@@ -79,6 +52,7 @@ class TomoObjDisplayModeToolButton(qt.QToolButton):
     """
 
     sigDisplayModeChanged = qt.Signal(str)
+    """signal emit when the display mode change"""
 
     _SHORT_DESC_TOOLTIP = "Use a short description of the tomo object. Two different scans can have the same short desciption"
     _URL_TOOLTIP = (

tomwer/gui/control/datadiscovery.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from __future__ import annotations
 
 from silx.gui import qt
 
@@ -9,6 +9,7 @@ from tomwer.gui.control.datawatcher.controlwidget import ControlWidget
 
 class ScanDiscoveryConfigWidget(qt.QGroupBox):
     sigScanTypeChanged = qt.Signal()
+    """emit when scan typo change"""
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -86,14 +87,14 @@ class _MainWidget(qt.QWidget):
     def setFolderObserved(self, dir_):
         return self.controlWidget._qteFolderSelected.setText(dir_)
 
-    def getLinuxFilePattern(self) -> Optional[str]:
+    def getLinuxFilePattern(self) -> str | None:
         text = self.controlWidget._filterQLE.text()
         if text.replace(" ", "") == "":
             return None
         else:
             return text
 
-    def setLinuxFilePattern(self, pattern: Optional[str]):
+    def setLinuxFilePattern(self, pattern: str | None):
         if pattern is None:
             pattern = ""
         self.controlWidget._filterQLE.setText(pattern)

tomwer/gui/control/datalist.py

@@ -1,36 +1,9 @@
-# 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__ = "12/07/2022"
+from __future__ import annotations
 
 import logging
 import os
 from collections import OrderedDict
-from typing import Any, Optional, Union
+from typing import Any
 from nxtomomill import converter as nxtomomill_converter
 from nxtomomill.io import generate_default_edf_config, generate_default_h5_config
 from nxtomomill.io.config import TomoEDFConfig as EDFConfig
@@ -49,7 +22,8 @@ from tomwer.core.tomwer_object import TomwerObject
 from tomwer.core.volume.volumefactory import VolumeFactory
 from tomwer.io.utils.tomoobj import DEFAULT_SCHEME_TO_VOL
 from tomwer.gui.control.actions import CFGFileActiveLabel, NXTomomillParamsAction
-from tomwer.gui.qfolderdialog import QDataDialog, QVolumeDialog
+from tomwer.gui.dialog.QDataDialog import QDataDialog
+from tomwer.gui.dialog.QVolumeDialog import QVolumeDialog
 from tomwer.gui.utils.inputwidget import (
     EDFConfigFileSelector,
     HDF5ConfigFileSelector,
@@ -89,8 +63,10 @@ class _DataListDialog(qt.QDialog):
         self._rmAllButton = qt.QPushButton("Remove all", parent=self)
         self._buttons.addButton(self._rmAllButton, qt.QDialogButtonBox.ActionRole)
 
-        self._sendButton = qt.QPushButton("Send", parent=self)
-        self._buttons.addButton(self._sendButton, qt.QDialogButtonBox.AcceptRole)
+        self._sendSelectedButton = qt.QPushButton("Send selected", parent=self)
+        self._buttons.addButton(
+            self._sendSelectedButton, qt.QDialogButtonBox.AcceptRole
+        )
         self.layout().addWidget(self._buttons)
 
         # connect signal / slot
@@ -104,9 +80,6 @@ class _DataListDialog(qt.QDialog):
     def clear(self):
         self.datalist.clear()
 
-    def _sendList(self):
-        return self.datalist._sendList()
-
     def add(self, scan) -> tuple:
         added_objs = self.datalist.add(scan)
         self.datalist.setMySelection(added_objs)
@@ -219,25 +192,29 @@ class _NXtomomillConfigFileDialog(qt.QDialog):
 
 
 class BlissHDF5DataListDialog(_DataListDialog):
-    """Dialog used to load .h5 only (used when for nxtomomillOW when we need)
-    to do a conversion from bliss.h5 to NXtomo"""
+    """Dialog used to load .h5 files only (used for nxtomomillOW when we need to do a conversion from bliss.h5 to NXtomo)"""
 
     def __init__(self, parent):
         assert isinstance(parent, _RawDataListMainWindow)
         _DataListDialog.__init__(self, parent)
-        self._sendButton.setText("Send all")
-        self._sendSelectedButton = qt.QPushButton("Send selected", self)
-        self._buttons.addButton(
-            self._sendSelectedButton, qt.QDialogButtonBox.AcceptRole
-        )
+        self._sendSelectedButton.setText("Send selected")
 
     def createDataList(self):
         return BlissScanList(self)
 
     def _callbackAddPath(self):  # pragma: no cover
-        """ """
+        """Open file dialog to select HDF5 files or directories, allowing multi-selection"""
         dialog = qt.QFileDialog(self)
-        dialog.setNameFilters(["HDF5 file *.h5 *.hdf5 *.nx *.nexus", "nxs"])
+        dialog.setFileMode(qt.QFileDialog.ExistingFiles)
+        dialog.setNameFilters(
+            [
+                "HDF5 files (*.h5 *.hdf5)",
+                "Nexus files (*.h5 *.hdf5 *.nx *.nxs *.nexus)",
+                "Any files (*)",
+            ]
+        )
+
+        # Set default directory if available
         if os.environ.get("TOMWER_DEFAULT_INPUT_DIR", None) and os.path.exists(
             os.environ["TOMWER_DEFAULT_INPUT_DIR"]
         ):
@@ -266,26 +243,29 @@ class BlissHDF5DataListDialog(_DataListDialog):
 
 
 class EDFDataListDialog(_DataListDialog):
-    """Dialog used to load .h5 only (used when for nxtomomillOW when we need)
-    to do a conversion from bliss.h5 to NXtomo"""
+    """Dialog used to load EDF directories and files for conversion"""
 
     def __init__(self, parent):
         assert isinstance(parent, EDFDataListMainWindow)
         _DataListDialog.__init__(self, parent)
-        self._sendButton.setText("Convert and send all")
-        self._sendSelectedButton = qt.QPushButton("Convert and send selected", self)
-        self._buttons.addButton(
-            self._sendSelectedButton, qt.QDialogButtonBox.AcceptRole
-        )
+        self._sendSelectedButton.setText("Convert and send selected")
 
     def createDataList(self):
         return EDFDataList(self)
 
     def _callbackAddPath(self):  # pragma: no cover
-        """ """
+        """Open file dialog to select EDF directories or files"""
         dialog = qt.QFileDialog(self)
         dialog.setFileMode(qt.QFileDialog.DirectoryOnly)
 
+        # Set default directory if available
+        if os.environ.get("TOMWER_DEFAULT_INPUT_DIR", None) and os.path.exists(
+            os.environ["TOMWER_DEFAULT_INPUT_DIR"]
+        ):
+            dialog.setDirectory(os.environ["TOMWER_DEFAULT_INPUT_DIR"])
+        elif os.path.isdir("/data"):
+            dialog.setDirectory("/data")
+
         if not dialog.exec_():
             dialog.close()
             return
@@ -355,7 +335,6 @@ class _RawDataListMainWindow(qt.QMainWindow):
         # expose API
         self.getCFGFilePath = self._dialog.getCFGFilePath
         self.setCFGFilePath = self._dialog.setCFGFilePath
-        self._sendButton = self._widget._sendButton
         self._sendSelectedButton = self._widget._sendSelectedButton
         self.add = self._widget.add
         self.n_scan = self._widget.n_scan
@@ -454,7 +433,16 @@ class BlissHDF5DataListMainWindow(_RawDataListMainWindow):
             files_selected = file_dialog.selectedFiles()
             if len(files_selected) > 0:
                 file_path = files_selected[0]
-                configuration = generate_default_h5_config(config_3dxrd=False)
+                try:
+                    # nxtomomill 1.1.0a5 or higher
+                    configuration = (
+                        generate_default_h5_config()  # pylint: disable=E1123
+                    )
+
+                except TypeError:
+                    configuration = generate_default_h5_config(  # pylint: disable=E1123
+                        config_3dxrd=False
+                    )
                 HDF5Config.dict_to_cfg(file_path=file_path, dict_=configuration)
                 # if we create a configuration file then let consider we want to use it
                 self.setCFGFilePath(file_path)
@@ -499,7 +487,7 @@ class EDFDataListMainWindow(_RawDataListMainWindow):
 
 
 class GenericScanListDialog(_DataListDialog):
-    """Dialog used to load EDFScan or HEDF5 scans"""
+    """Dialog used to load EDFScan or HDF5 scans"""
 
     def createDataList(self):
         return GenericScanList(self)
@@ -564,7 +552,7 @@ class GenericScanListWindow(qt.QMainWindow):
         return self._widget.n_scan()
 
     def add(self, *args, **kwargs):
-        self._widget.add(*args, **kwargs)
+        return self._widget.add(*args, **kwargs)
 
 
 class VolumeListDialog(_DataListDialog):
@@ -644,12 +632,13 @@ class _TomwerObjectList(qt.QTableWidget):
             pass
         self._update()
 
-    def _sendList(self):
+    def _sendSelected(self):
+        raise NotImplementedError
         for _, item in self._myitems.items():
             data = item.data(qt.Qt.UserRole)
             self.dataReady.emit(data)
 
-    def remove(self, data: Union[None, TomwerObject, str]):
+    def remove(self, data: TomwerObject | str | None):
         if data is None:
             return
         if isinstance(data, str):
@@ -688,20 +677,18 @@ class _TomwerObjectList(qt.QTableWidget):
         """
         some rules to return a TomwerObject from an object (probably a path) from children class
 
-        :param bool allow_several: allow returning several objects for one input. This can be the case for example if 'obj' is a file path.
+        :param allow_several: allow returning several objects for one input. This can be the case for example if 'obj' is a file path.
         """
         raise NotImplementedError("Base class")
 
-    def add(
-        self, obj: Union[None, TomwerObject, str, BaseIdentifier]
-    ) -> Optional[tuple]:
+    def add(self, obj: TomwerObject | BaseIdentifier | str | None) -> tuple | None:
         """add a data"""
         if obj is None:
             return
         if isinstance(obj, TomwerObject):
             # remove heavy cache obj. This could bring troubles if some processing is done.
             # but I guess this is better than keeping in memory volumes...
-            # nethertheless processing using volume.data should keep a reference on the data.
+            # nevertheless processing using volume.data should keep a reference on the data.
             obj._clear_heavy_cache()
         elif isinstance(obj, str):
             obj = self._getTomoObject(obj, allow_several=True)
@@ -709,9 +696,10 @@ class _TomwerObjectList(qt.QTableWidget):
                 return
             elif isinstance(obj, (tuple, list)):
                 # in the case it contains in fact several objects. Related to allow_several=True
+                new_objs = []
                 for o in obj:
-                    self.add(o)
-                return
+                    new_objs.extend(list(self.add(o)))
+                return new_objs
             elif not isinstance(obj, TomwerObject):
                 raise TypeError(
                     f"return object from _getTomoObject is not a {TomwerObject} but {type(obj)}"
@@ -760,9 +748,17 @@ class _TomwerObjectList(qt.QTableWidget):
                 f"Requested display mode {self._displayMode} is not handled"
             )
 
-    def setMySelection(self, datasets: tuple):
+    def setMySelection(self, datasets: tuple[str | TomwerObject]):
         if datasets is None:
             datasets = tuple()
+
+        def convert_dataset(dataset: str | TomwerObject):
+            if isinstance(dataset, TomwerObject):
+                return dataset.get_identifier().to_str()
+            else:
+                return dataset
+
+        datasets = tuple([convert_dataset(dataset) for dataset in datasets])
         for row in range(self.rowCount()):
             item = self.item(row, 0)
             select_it = (
@@ -856,7 +852,7 @@ class _TomwerObjectList(qt.QTableWidget):
             try:
                 self.add(identifier)
             except Exception as e:
-                logger.error(f"Failed to add {identifier}. Error is {e}")
+                logger.error(f"Failed to add '{identifier}'. Error is {e}")
 
 
 class GenericScanList(_TomwerObjectList):
@@ -925,8 +921,7 @@ class BlissScanList(_TomwerObjectList):
     def add(self, data) -> tuple:
         """Add the path folder d in the scan list
 
-        :param d: the path of the directory to add
-        :type d: Union[str, TomoBase]
+        :param data: the path of the directory to add
         """
         possible_entries = []
         if os.path.exists(data):

tomwer/gui/control/datalistener.py

@@ -1,36 +1,9 @@
 # coding: utf-8
-# /*##########################################################################
-#
-# Copyright (c) 2016 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/03/2020"
+from __future__ import annotations
 
 
 import os
 import socket
-import weakref
 
 from silx.gui import qt
 
@@ -160,17 +133,6 @@ class DataListenerWidget(qt.QMainWindow):
     def setOutputFolder(self, output_dir):
         self._configWindow.setOutputFolder(output_dir)
 
-    def setListener(self, listener):
-        self._listener = weakref.ref(listener, self._cleanConnection)
-        self._listener().sigAcquisitionStarted.connect(self._acquisitionStarted)
-        self._listener().sigScanAdded.connect(self._acquisitionUpdated)
-        self._listener().sigAcquisitionEnded.connect(self._acquisitionEnded)
-
-    def _cleanConnection(self):
-        self._listener().sigAcquisitionStarted.disconnect(self._acquisitionStarted)
-        self._listener().sigScanAdded.disconnect(self._acquisitionUpdated)
-        self._listener().sigAcquisitionEnded.disconnect(self._acquisitionEnded)
-
     def _updateCentralWidget(self, action_triggered):
         action_to_widget = {
             self._controlAction: self._controlWidget,

tomwer/gui/control/datareacheractions.py

@@ -1,32 +1,5 @@
 # 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__ = "18/02/2018"
-
+from __future__ import annotations
 
 from silx.gui import qt
 

tomwer/gui/control/datatransfert.py

@@ -1,32 +1,5 @@
 # coding: utf-8
-# /*##########################################################################
-#
-# Copyright (c) 2016 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__ = "08/02/2019"
-
+from __future__ import annotations
 
 import logging
 import os
@@ -132,7 +105,7 @@ class DataTransfertSelector(qt.QWidget):
         """
         Define the root folder to move scan
 
-        :param Union[None, str] folder_path: root folder for received scan
+        :param folder_path: root folder for received scan
         """
         assert type(folder_path) is str or folder_path is None
         if folder_path is None: