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

tomwer/gui/visualization/scanoverview.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__ = "31/03/2021"
+from __future__ import annotations
 
 
 import logging
@@ -107,7 +81,8 @@ class ScanOverviewWidget(qt.QWidget):
             raise TypeError(f"{scan} is expected to be an instance of {TomwerScanBase}")
         else:
             self._scan = weakref.ref(scan)
-        self.update_tree()
+        if scan is not None:
+            self.update_tree(scan=scan)
 
     def getScan(self):
         if self._scan is None or self._scan() is None:
@@ -115,25 +90,24 @@ class ScanOverviewWidget(qt.QWidget):
         else:
             return self._scan()
 
-    def update_tree(self):
-        if self.getScan() is not None:
-            for fct in (
-                self._updateInstrument,
-                self._updateSample,
-                self._updateTimes,
-                self._updateNames,
-                self._updateScanRange,
-            ):
-                try:
-                    fct()
-                except Exception as e:
-                    _logger.info(e)
-            self._tree.resizeColumnToContents(0)
-
-    def _updateInstrument(self):
-        self._updateFrames()
-        self._updateEnergy()
-        self._updatePixelSize()
+    def update_tree(self, scan: TomwerScanBase):
+        parts = {
+            "instrument": self._updateInstrument,
+            "times": self._updateTimes,
+            "names": self._updateNames,
+            "scan-range": self._updateScanRange,
+        }
+        for part_name, fct in parts.items():
+            try:
+                fct(scan=scan)
+            except Exception:
+                _logger.error(f"Failed to update '{part_name}'.", stack_info=True)
+        self._tree.resizeColumnToContents(0)
+
+    def _updateInstrument(self, scan: TomwerScanBase):
+        self._updateFrames(scan=scan)
+        self._updateEnergy(scan=scan)
+        self._updatePixelSize(scan=scan)
 
     def _setColoredTxt(
         self, item, text, column=1, hightlight_red=False, hightlight_orange=False
@@ -150,16 +124,14 @@ class ScanOverviewWidget(qt.QWidget):
         item.setText(column, text)
         item.setBackground(0, qt.QBrush(bkg_color))
 
-    def _updateSample(self):
+    def _updateSample(self, scan: TomwerScanBase):
         pass
 
-    def _updateTimes(self):
-        scan = self.getScan()
+    def _updateTimes(self, scan: TomwerScanBase):
         self._startTime.setText(1, str(scan.start_time))
         self._endTime.setText(1, str(scan.end_time))
 
-    def _updateFrames(self):
-        scan = self.getScan()
+    def _updateFrames(self, scan: TomwerScanBase):
         assert isinstance(scan, TomwerScanBase)
         # frames
         n_frames = len(scan.frames)
@@ -198,15 +170,14 @@ class ScanOverviewWidget(qt.QWidget):
         )
 
         if scan.field_of_view == FOV.HALF:
-            if scan.estimated_cor_frm_motor is None:
-                self._estimatedCOR.setText("???")
+            if scan.x_rotation_axis_pixel_position is None:
+                self._estimatedCOR.setText(1, "???")
             else:
-                self._estimatedCOR.setText(str(scan.estimated_cor_frm_motor))
+                self._estimatedCOR.setText(1, str(scan.x_rotation_axis_pixel_position))
         else:
-            self._estimatedCOR.setText("only for half")
+            self._estimatedCOR.setText(1, "only for half")
 
-    def _updateEnergy(self):
-        scan = self.getScan()
+    def _updateEnergy(self, scan: TomwerScanBase):
         assert isinstance(scan, TomwerScanBase)
         energy = scan.energy
         self._setColoredTxt(
@@ -215,16 +186,14 @@ class ScanOverviewWidget(qt.QWidget):
             hightlight_red=energy in (0, None),
         )
 
-    def _updateNames(self):
-        scan = self.getScan()
+    def _updateNames(self, scan: TomwerScanBase):
         assert isinstance(scan, TomwerScanBase)
         sample_name = scan.sample_name
         sequence_name = scan.sequence_name
         self._title.setText(1, sequence_name)
         self._sample_name.setText(1, sample_name)
 
-    def _updateTomoN(self):
-        scan = self.getScan()
+    def _updateTomoN(self, scan: TomwerScanBase):
         assert isinstance(scan, TomwerScanBase)
         tomo_n = scan.tomo_n
         self._setColoredTxt(
@@ -232,8 +201,7 @@ class ScanOverviewWidget(qt.QWidget):
             text=str(tomo_n),
         )
 
-    def _updateScanRange(self):
-        scan = self.getScan()
+    def _updateScanRange(self, scan: TomwerScanBase):
         assert isinstance(scan, TomwerScanBase)
         scan_range = scan.scan_range
         if scan_range is None:
@@ -245,8 +213,7 @@ class ScanOverviewWidget(qt.QWidget):
             text=str(scan_range),
         )
 
-    def _updatePixelSize(self):
-        scan = self.getScan()
+    def _updatePixelSize(self, scan: TomwerScanBase):
         assert isinstance(scan, TomwerScanBase)
         if isinstance(scan, EDFTomoScan):
             x_pixel_size = y_pixel_size = scan.pixel_size

tomwer/gui/visualization/sinogramviewer.py

@@ -1,34 +1,8 @@
 # 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.
-#
-# ###########################################################################*/
 """
 contains gui relative to axis calculation using sinogram
 """
-
-__authors__ = ["H. Payno"]
-__license__ = "MIT"
-__date__ = "26/03/2020"
+from __future__ import annotations
 
 
 import logging
@@ -117,7 +91,7 @@ class SinogramViewer(qt.QMainWindow):
     def setLine(self, line: int):
         """
 
-        :param int line: define the line we want to compute
+        :param line: define the line we want to compute
         """
         self._options.setRadioLine(line)
 

tomwer/gui/visualization/test/__init__.py

@@ -1,28 +0,0 @@
-# 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.
-#
-# ###########################################################################*/
-
-__authors__ = ["H.Payno"]
-__license__ = "MIT"
-__date__ = "15/12/2021"

tomwer/gui/visualization/test/test_dataviewer.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__ = "30/07/2020"
-
+from __future__ import annotations
 
 import unittest
 

tomwer/gui/visualization/test/test_diffviewer.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__ = "21/06/2021"
-
+from __future__ import annotations
 
 import logging
 import os

tomwer/gui/visualization/test/test_nx_tomo_metadata_viewer.py

@@ -1,7 +1,6 @@
 import os
 
 import numpy
-import pytest
 from nxtomo.application.nxtomo import NXtomo
 from silx.gui import qt
 from nxtomo.nxobject.nxdetector import ImageKey
@@ -64,10 +63,6 @@ def test_nx_editor(
 
     assert "12.8" == widget._energyEntry.text()
 
-    # make sure saving raises an error (viewer inherit from the editor)
-    with pytest.raises(NotImplementedError):
-        widget.overwriteNXtomo()
-
     # end
     widget.setAttribute(qt.Qt.WA_DeleteOnClose)
     widget.close()

tomwer/gui/visualization/test/test_reconstruction_parameters.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__ = "16/05/2023"
+from __future__ import annotations
 
 
 import pytest

tomwer/gui/visualization/test/test_sinogramviewer.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__ = "22/01/2017"
-
+from __future__ import annotations
 
 import logging
 import os