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

orangecontrib/tomwer/widgets/reconstruction/NabuVolumeOW.py

@@ -1,37 +1,10 @@
 # coding: utf-8
-# /*##########################################################################
-#
-# Copyright (c) 2016-2020 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__ = "14/02/2020"
-
+from __future__ import annotations
 
 import copy
 import functools
 import logging
-from collections.abc import Iterable
+from typing import Iterable
 from contextlib import AbstractContextManager
 
 from orangewidget import gui
@@ -45,10 +18,8 @@ from orangecontrib.tomwer.widgets.utils import WidgetLongProcessing
 from tomwer.core import settings
 from tomwer.core.cluster import SlurmClusterConfiguration
 from tomwer.core.futureobject import FutureTomwerObject
-from tomwer.core.process.icat.gallery import (
-    IcatScreenshots,
-    deduce_dataset_gallery_location,
-    select_screenshot_from_volume,
+from tomwer.core.process.drac.processeddataset import (
+    DracReconstructedVolumeDataset,
 )
 from tomwer.core.process.reconstruction.nabu import utils as nabu_utils
 from tomwer.core.process.reconstruction.nabu.nabuvolume import NabuVolumeTask
@@ -128,14 +99,14 @@ class NabuVolumeOW(WidgetLongProcessing, SuperviseOW):
         volume_urls = Output(
             name="volume urls", type=tuple, doc="url of the volume(s) reconstructed"
         )
-        screenshots = Output(
-            name="screenshots",
-            type=IcatScreenshots,
-            doc="screenshots that can be saved",
+        data_portal_processed_datasets = Output(
+            name="data_portal_processed_datasets",
+            type=tuple,
+            doc="data portal processed data to be saved",
         )
 
     class DialogCM(AbstractContextManager):
-        """Simple context manager to hida / show button dialogs"""
+        """Simple context manager to hide / show button dialogs"""
 
         def __init__(self, dialogButtonsBox):
             self._dialogButtonsBox = dialogButtonsBox
@@ -147,17 +118,6 @@ class NabuVolumeOW(WidgetLongProcessing, SuperviseOW):
             self._dialogButtonsBox.hide()
 
     def __init__(self, parent=None, *args, **kwargs):
-        """
-        Widget which read the .hdf5 generated by octave and modify it.
-        Then run a subprocess to call octave and run ftseries
-
-        :param bool _connect_handler: True if we want to store the modifications
-                                      on the setting. Need for unit test since
-                                      keep alive qt widgets.
-        :param recons_params: reconsparameter to be used by the FTWidget.
-                              If None, some will be created.
-        :type: :class:`QReconsParams`
-        """
         SuperviseOW.__init__(self, parent)
         WidgetLongProcessing.__init__(self)
         self._slurmCluster = None
@@ -222,21 +182,18 @@ class NabuVolumeOW(WidgetLongProcessing, SuperviseOW):
 
         config = scan.nabu_recons_params
         # update output format if requested
-        if self._nabuWidget._mainWidget.redefineNabuFileFormat():
-            config["output"][
-                "file_format"
-            ] = self._nabuWidget._mainWidget.getNabuFileFormat()
+        nabuSettingsWidget = self._nabuWidget._mainWidget._nabuSettingsWidget
+        if nabuSettingsWidget.redefineNabuFileFormat():
+            config["output"]["file_format"] = nabuSettingsWidget.getNabuFileFormat()
         # update output location if requested
-        if self._nabuWidget._mainWidget.redefineOutputLocation():
-            location = self._nabuWidget._mainWidget.getNabuOutputLocation()
+        if nabuSettingsWidget.redefineOutputLocation():
+            location = nabuSettingsWidget.getNabuOutputLocation()
             if location is not None:
                 location = format_output_location(location=location, scan=scan)
             config["output"]["location"] = location
             config["output"][
                 "output_dir_mode"
-            ] = (
-                self._nabuWidget._mainWidget._outputLocationWidget.getOutputDirMode().value
-            )
+            ] = nabuSettingsWidget._outputLocationWidget.getOutputDirMode().value
 
         if "phase" in config and "delta_beta" in config["phase"]:
             pag_dbs = config["phase"]["delta_beta"]
@@ -280,9 +237,7 @@ class NabuVolumeOW(WidgetLongProcessing, SuperviseOW):
 
                 dataset.axis_params = QAxisRP()
             try:
-                dataset.axis_params.set_relative_value(
-                    float(r_cor) - dataset.dim_1 / 2.0
-                )
+                dataset.axis_params.set_relative_value(float(r_cor))
             except Exception:
                 pass
 
@@ -323,43 +278,45 @@ class NabuVolumeOW(WidgetLongProcessing, SuperviseOW):
             # send scan
             self.Outputs.data.send(scan)
             self.sigScanReady.emit(scan)
+
             # send volume urls
             volume_urls = []
             for volume_id in scan.latest_vol_reconstructions:
                 assert isinstance(volume_id, VolumeIdentifier)
                 volume_urls.extend(VolumeFactory.from_identifier_to_vol_urls(volume_id))
             if len(volume_urls) > 0:
-                # send list of reconcstructed volume
                 self.Outputs.volume_urls.send(tuple(volume_urls))
-                # send list of screenshots
-                screenshots = {}
-                [
-                    screenshots.update(
-                        select_screenshot_from_volume(
-                            VolumeFactory.create_tomo_object_from_identifier(volume_id)
-                        )
-                    )
-                    for volume_id in scan.latest_vol_reconstructions
-                ]
-                self.Outputs.screenshots.send(
-                    IcatScreenshots(
-                        data_dir=deduce_dataset_gallery_location(scan),
-                        screenshots=screenshots,
-                        scan=scan,
-                    ),
-                )
 
-            # send volume identifier(s)  # only one expected
+            # send volume identifier(s) and associated IcatDataBase objects
             n_rec_volumes = len(scan.latest_vol_reconstructions)
+            drac_processed_datasets = []
             if n_rec_volumes > 0:
                 if n_rec_volumes > 1:
                     _logger.warning(
                         f"{n_rec_volumes} volume reconstructed when at most one expected"
                     )
-                volume = VolumeFactory.create_tomo_object_from_identifier(
-                    scan.latest_vol_reconstructions[0]
+                try:
+                    volume = VolumeFactory.create_tomo_object_from_identifier(
+                        scan.latest_vol_reconstructions[0]
+                    )
+                except Exception as e:
+                    _logger.error(
+                        f"Failed to retrieve volume from {volume_id}. Error is {e}"
+                    )
+                else:
+                    self.Outputs.volume.send(volume)
+
+                    icatReconstructedDataset = DracReconstructedVolumeDataset(
+                        tomo_obj=volume,
+                        source_scan=scan,
+                    )
+                    drac_processed_datasets.append(icatReconstructedDataset)
+
+            if len(drac_processed_datasets) > 0:
+                self.Outputs.data_portal_processed_datasets.send(
+                    drac_processed_datasets
                 )
-                self.Outputs.volume.send(volume)
+
         if future_tomo_obj is not None:
             self.Outputs.future_out.send(future_tomo_obj)
 
@@ -403,7 +360,7 @@ class _DeltaBetaSelectorDialog(qt.QDialog):
         :param parent:
         :param timeout: if a timeout is provided once reach this will
                         automatically reject the delta / beta selection.
-                        This is needed when on lbsral to avoid 'locking'
+                        This is needed when on lbsram to avoid 'locking'
                         a reconstruction. In sec.
         """
         qt.QDialog.__init__(self, parent)

orangecontrib/tomwer/widgets/reconstruction/SAAxisOW.py

@@ -1,36 +1,7 @@
-# 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__ = "01/02/2021"
-
+from __future__ import annotations
 
 import functools
 import logging
-from typing import Union
 
 from orangewidget import gui
 from orangewidget.settings import Setting
@@ -84,7 +55,7 @@ class SAAxisWindow(_SAAxisWindow):
             )
         self._clusterConfig = cluster_config
 
-    def _computeEstimatedCor(self) -> Union[float, None]:
+    def _computeEstimatedCor(self) -> float | None:
         """callback when calculation of a estimated cor is requested"""
         # TODO: check but should not be needed anymore
         scan = self.getScan()
@@ -250,22 +221,26 @@ class SAAxisOW(SuperviseOW, WidgetLongProcessing):
     Widget for semi-automatic center of rotation calculation
 
     behavior within a workflow:
+
     * when a scan arrived:
+
         * if he already has a center of rotation defined (if the axis widget
           has been defined for example) it will be used as
           'estimated center of rotation'
         * if no cor has been computed yet and if the .nx entry contains
-          information regarding an "estimated_cor_from_motor" this value will
-          be set.
+          information regarding an "x_rotation_axis_pixel_position" this value will
+          be set
+
     * if autofocus option is lock:
-       * launch the series of reconstruction (with research width defined)
-         and the estimated center of rotation if defined. Once the
-         reconstruction is ended and if the autofocus button is still lock
-         it will select the cor with the highest
-         value and mode to workflow downstream.
+        * launch the series of reconstruction (with research width defined)
+          and the estimated center of rotation if defined. Once the
+          reconstruction is ended and if the autofocus button is still lock
+          it will select the cor with the highest
+          value and mode to workflow downstream.
+
     * hint: you can define a "multi-step" half-automatic center of rotation
-       research by creating several "saaxis" widget and reducing the research
-       width.
+      research by creating several "saaxis" widget and reducing the research
+      width.
 
     Details about :ref:`saaxis score calculation`
     """

orangecontrib/tomwer/widgets/reconstruction/SADeltaBetaOW.py

@@ -1,31 +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__ = ["H. Payno"]
-__license__ = "MIT"
-__date__ = "04/05/2021"
+from __future__ import annotations
 
 
 import functools
@@ -183,17 +157,21 @@ class SADeltaBetaOW(SuperviseOW, WidgetLongProcessing):
     Widget for semi-automatic delta / beta calculation
 
     behavior within a workflow:
+
     * no delta / beta value will be loaded even if an "axis" window exists on
-    the upper stream.
+      the upper stream.
+
     * if autofocus option is lock:
-       * launch the series of reconstruction (with research width defined)
-         and the estimated center of rotation if defined. Once the
-         reconstruction is ended and if the autofocus button is still lock
-         it will select the cor with the highest
-         value and mode to workflow downstream.
+
+        * launch the series of reconstruction (with research width defined)
+          and the estimated center of rotation if defined. Once the
+          reconstruction is ended and if the autofocus button is still lock
+          it will select the cor with the highest
+          value and mode to workflow downstream.
+
     * hint: you can define a "multi-step" half-automatic center of rotation
-       research by creating several "sa_delta_beta" widget and reducing the research
-       width.
+      research by creating several "sa_delta_beta" widget and reducing the
+      research width.
 
     Details about :ref:`sadeltabeta score calculation`
     """

orangecontrib/tomwer/widgets/reconstruction/SinoNormOW.py

@@ -1,34 +1,5 @@
 # coding: utf-8
-# /*##########################################################################
-#
-# Copyright (c) 2016-2020 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/2021"
-
+from __future__ import annotations
 
 import functools
 import logging
@@ -66,6 +37,7 @@ class SinoNormWindow(_SinoNormWindow):
     """
 
     sigValidate = qt.Signal()
+    """emit when the sino normalization is validated"""
 
     def __init__(self, parent, process_id=None):
         assert isinstance(parent, SinoNormOW)

orangecontrib/tomwer/widgets/stitching/ZStitchingConfigOW.py

@@ -5,10 +5,10 @@ from silx.gui import qt
 from orangewidget import gui
 from orangewidget.settings import Setting
 from orangewidget.widget import Input, Output, OWBaseWidget
-from tomoscan.serie import Serie
+from tomoscan.series import Series
 
 from tomwer.core.tomwer_object import TomwerObject
-from tomwer.gui.stitching.stitching import ZStitchingWindow
+from tomwer.gui.stitching.StitchingWindow import ZStitchingWindow
 
 _logger = logging.getLogger(__name__)
 
@@ -31,8 +31,8 @@ class ZStitchingConfigOW(OWBaseWidget):
         "NXTomo",
         "stitching",
         "z-stitching",
-        "z-serie",
-        "zserie",
+        "z-series",
+        "zseries",
         "pre-processing",
         "radios",
         "projections",
@@ -53,10 +53,10 @@ class ZStitchingConfigOW(OWBaseWidget):
             multiple=True,
         )
 
-        serie = Input(
-            "serie",
-            type=Serie,
-            doc="serie of scan or volumes to be stitched together",
+        series = Input(
+            "series",
+            type=Series,
+            doc="series of scan or volumes to be stitched together",
             default=False,
             multiple=False,
         )
@@ -94,9 +94,9 @@ class ZStitchingConfigOW(OWBaseWidget):
     def addTomoObj(self, tomo_obj, *args, **kwargs):
         self.widget.addTomoObj(tomo_obj)
 
-    @Inputs.serie
-    def setSerie(self, serie, *args, **kwargs):
-        self.widget.setSerie(serie)
+    @Inputs.series
+    def setSeries(self, series, *args, **kwargs):
+        self.widget.setSeries(series)
         self._storeSettings()
 
     def validate(self):

orangecontrib/tomwer/widgets/utils.py

@@ -1,33 +1,6 @@
-# coding: utf-8
-# /*##########################################################################
-#
-# Copyright (c) 2016-2020 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.
-#
-# ###########################################################################*/
-
 """utils for orange widget"""
 
-__authors__ = ["H. Payno"]
-__license__ = "MIT"
-__date__ = "21/02/2020"
+from __future__ import annotations
 
 
 class WidgetLongProcessing:
@@ -37,7 +10,7 @@ class WidgetLongProcessing:
         """
 
         :param working:
-        :param Union[str, None] info:
+        :param info:
         """
         # default orange version don't have Processing.
         try:

orangecontrib/tomwer/widgets/visualization/DataViewerOW.py

@@ -1,31 +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__ = ["H. Payno"]
-__license__ = "MIT"
-__date__ = "21/07/2020"
+from __future__ import annotations
 
 import logging
 

orangecontrib/tomwer/widgets/visualization/DiffViewerOW.py

@@ -1,31 +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__ = ["H. Payno"]
-__license__ = "MIT"
-__date__ = "07/09/2020"
+from __future__ import annotations
 
 import logging
 

orangecontrib/tomwer/widgets/visualization/NXtomoMetadataViewerOW.py

@@ -14,7 +14,7 @@ class NXtomoMetadataViewerOW(widget.OWBaseWidget, openclass=True):
 
     name = "nxtomo-metadata-viewer"
     id = "orange.widgets.tomwer.visualization.NXtomoMetadataViewerOW.NXtomoMetadataViewerOW"
-    description = "Interface to display some metadata of an NXtomo"
+    description = "Interface to display some metadata of a NXtomo"
     icon = "icons/nx_tomo_metadata_viewer.svg"
     priority = 13
     keywords = [

orangecontrib/tomwer/widgets/visualization/RadioStackOW.py

@@ -1,31 +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__ = "01/08/2018"
+from __future__ import annotations
 
 import logging
 
@@ -82,7 +56,7 @@ class RadioStackOW(widget.OWBaseWidget, openclass=True):
     def addLeafScan(self, scanID, *args, **kwargs):
         if scanID is None:
             return
-        self._viewer.addLeafScan(scanID)
+        self._viewer.addTomoObj(scanID)
 
     def keyPressEvent(self, e):
         # TODO: fixme

orangecontrib/tomwer/widgets/visualization/SampleMovedOW.py

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