tomwer 1.3.16__py3-none-any.whl → 1.3.18__py3-none-any.whl

tomwer/gui/visualization/dataviewer.py

@@ -34,7 +34,6 @@ from silx.gui import qt
 from silx.gui.dialog.ColormapDialog import DisplayMode
 from silx.gui.plot.ImageStack import ImageStack as _ImageStack
 from silx.gui.plot.ImageStack import UrlLoader
-from silx.gui.utils.signal import SignalProxy
 from silx.io.url import DataUrl
 from silx.utils.enum import Enum as _Enum
 
@@ -86,17 +85,6 @@ class DataViewer(qt.QMainWindow):
         self._viewer.getPlotWidget().setKeepDataAspectRatio(True)
         self.setCentralWidget(self._viewer)
 
-        # signal / slot
-        # add a signal proxy on the QSlider
-        self._viewer._slider.sigCurrentUrlIndexChanged.disconnect(
-            self._viewer.setCurrentUrlIndex
-        )
-        self._proxySig = SignalProxy(
-            self._viewer._slider.sigCurrentUrlIndexChanged,
-            delay=0.3,
-            slot=self._urlIndexDelayed,
-        )
-
         # display control
         self._controls = DisplayControl(parent=self)
         self._controlsDW = qt.QDockWidget(self)
@@ -110,6 +98,33 @@ class DataViewer(qt.QMainWindow):
         self._controls.sigDisplayModeChanged.connect(self._updateDisplay)
         self._controls.sigDisplayModeChanged.connect(self.sigConfigChanged)
 
+        # upgrade of the slider (see details in '__sliderPressed' docstring).
+        horizontal_slider = self._viewer._slider
+        horizontal_slider._slider.sliderReleased.connect(self.__sliderReleased)
+        horizontal_slider._slider.sliderPressed.connect(self.__sliderPressed)
+
+    def __sliderPressed(self):
+        """
+        today each time the slider value is modified it will load the frame and display it
+        but in our case we cannot afford it as it will take too much memory.
+        So we will disconnect the callback (self._viewer.setCurrentUrlIndex) until the slider is active
+        and reactivate it afterwards
+        """
+        self._viewer._slider.sigCurrentUrlIndexChanged.disconnect(
+            self._viewer.setCurrentUrlIndex
+        )
+
+    def __sliderReleased(self):
+        """
+        See details in '__sliderPressed'
+        """
+        horizontal_slider = self._viewer._slider
+        self._viewer._slider.sigCurrentUrlIndexChanged.connect(
+            self._viewer.setCurrentUrlIndex
+        )
+        # set the url with the latest value to display the requested frame
+        self._viewer.setCurrentUrlIndex(horizontal_slider.value())
+
     def getPlotWidget(self):
         return self._viewer.getPlotWidget()
 
@@ -134,9 +149,6 @@ class DataViewer(qt.QMainWindow):
         self._viewer = None
         super().close()
 
-    def _urlIndexDelayed(self, *args, **kwargs):
-        self._viewer.setCurrentUrlIndex(args[0][0])
-
     def getScan(self):
         if self._scan:
             return self._scan()

tomwer/gui/visualization/diffviewer/diffviewer.py

@@ -25,6 +25,7 @@
 """
 contains gui relative frame difference display
 """
+from __future__ import annotations
 
 __authors__ = ["H. Payno"]
 __license__ = "MIT"
@@ -148,7 +149,7 @@ class _FrameSelector(qt.QWidget):
             return
 
         urls = []
-        angles = []
+        urls_to_angles: dict[str, float] = {}
         self._currentFrameUrlsText.clear()
         self._frameUrlCB.clear()
         if type_selected == self.FrameType.DARKS:
@@ -162,7 +163,7 @@ class _FrameSelector(qt.QWidget):
                 angles_and_urls = self._scan.get_proj_angle_url(with_alignment=False)
                 for angle, url in angles_and_urls.items():
                     urls.append(url)
-                    angles.append(angle)
+                    urls_to_angles[url.path()] = angle
             else:
                 urls = self._scan.projections.values()
         elif type_selected == self.FrameType.ALIGN_PROJ:
@@ -174,14 +175,14 @@ class _FrameSelector(qt.QWidget):
             raise ValueError(f"Type {type_selected} not managed")
         urls = sorted(urls, key=lambda url: url.path())
 
-        # if thre is some angles missing, avoiding setting any angle because they are probably wrong
+        # if there is some angles missing, avoiding setting any angle because they are probably wrong
         # this will probably fail with EDF but this is legacy
-        if len(angles) != len(urls):
-            angles = []
+        if len(urls_to_angles) != len(urls):
+            urls_to_angles.clear()
 
-        for i_url, url in enumerate(urls):
-            if len(angles) > 0:
-                text = f"angle={angles[i_url]}&"
+        for url in urls:
+            if len(urls_to_angles) > 0:
+                text = f"angle={urls_to_angles[url.path()]}&"
             else:
                 text = ""
             if url.data_slice() is not None:

tomwer/version.py

@@ -77,7 +77,7 @@ RELEASE_LEVEL_VALUE = {
 
 MAJOR = 1
 MINOR = 3
-MICRO = 16
+MICRO = 18
 RELEV = "final"  # <16
 SERIAL = 0  # <16
 

tomwer-1.3.18-py3.11-nspkg.pth

@@ -0,0 +1 @@
+import sys, types, os;has_mfs = sys.version_info > (3, 5);p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('orangecontrib',));importlib = has_mfs and __import__('importlib.util');has_mfs and __import__('importlib.machinery');m = has_mfs and sys.modules.setdefault('orangecontrib', importlib.util.module_from_spec(importlib.machinery.PathFinder.find_spec('orangecontrib', [os.path.dirname(p)])));m = m or sys.modules.setdefault('orangecontrib', types.ModuleType('orangecontrib'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p)

{tomwer-1.3.16.dist-info → tomwer-1.3.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.3.16
+Version: 1.3.18
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit
@@ -34,7 +34,7 @@ Requires-Dist: ewoksorange <0.7,>=0.6
 Requires-Dist: sluurp >=0.3.3
 Requires-Dist: packaging
 Requires-Dist: flufl-lock
-Requires-Dist: pyunitsystem >=1.1.0
+Requires-Dist: pyunitsystem <2.0,>=1.1.0
 Provides-Extra: _dev_spec
 Requires-Dist: black ; extra == '_dev_spec'
 Requires-Dist: flake8 ; extra == '_dev_spec'
@@ -77,7 +77,7 @@ Requires-Dist: tifffile ; extra == 'dev'
 Requires-Dist: hdf5plugin ; extra == 'dev'
 Requires-Dist: pyicat-plus ; extra == 'dev'
 Requires-Dist: nabu[full] >=2023.3.1dev ; extra == 'dev'
-Requires-Dist: pycuda ; extra == 'dev'
+Requires-Dist: pycuda <2024.1.1 ; extra == 'dev'
 Requires-Dist: scikit-cuda ; extra == 'dev'
 Requires-Dist: black ; extra == 'dev'
 Requires-Dist: flake8 ; extra == 'dev'
@@ -151,7 +151,7 @@ Requires-Dist: tifffile ; extra == 'full'
 Requires-Dist: hdf5plugin ; extra == 'full'
 Requires-Dist: pyicat-plus ; extra == 'full'
 Requires-Dist: nabu[full] >=2023.3.1dev ; extra == 'full'
-Requires-Dist: pycuda ; extra == 'full'
+Requires-Dist: pycuda <2024.1.1 ; extra == 'full'
 Requires-Dist: scikit-cuda ; extra == 'full'
 Provides-Extra: full_no_cuda
 Requires-Dist: orange-canvas-core ; extra == 'full_no_cuda'

{tomwer-1.3.16.dist-info → tomwer-1.3.18.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tomwer-1.3.16-py3.11-nspkg.pth,sha256=UYCZtLWueceGiAlmXKRJUZ0TWQEubpPoQ1pVnAAsME0,502
+tomwer-1.3.18-py3.11-nspkg.pth,sha256=xeeGR3TjdoVxdFeF6T-zSwZWh6Et--EYuPWu67LxL_c,574
 orangecontrib/tomwer/__init__.py,sha256=B4DXy1gY_wXmNYa2aOfapmJb2mEuCAjoaNEGnpBs70g,148
 orangecontrib/tomwer/state_summary.py,sha256=5_dPzweL3r0ye4ZfJo6IV2ThJI8fQhWoO2ySdJJajj8,1711
 orangecontrib/tomwer/orange/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -220,7 +220,7 @@ orangecontrib/tomwer/widgets/visualization/icons/volumeviewer.svg,sha256=2uT9_px
 tomwer/__init__.py,sha256=82Jp1abyG4UWdGuT4nNU7LxaUV6xxkOte5pIz3w69Do,1745
 tomwer/__main__.py,sha256=jsDfWA2yl5am0dHQVkYwlKLxxqKNont6VDF-LusuawE,8575
 tomwer/utils.py,sha256=EgVwJ5CQVjoBvcKNwyVoXv_P4ciI11oxb8fNyy82Lck,8465
-tomwer/version.py,sha256=tdxCOIwn5mKxt6KhNwxT5w6DB1JmpWNjqHF4HxajG5s,4387
+tomwer/version.py,sha256=H4Y_5_SwDCCqNGu7TA9h039XASYEMV-YWRRCBHr2lKQ,4387
 tomwer/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/app/axis.py,sha256=Ax0wlTp9u0Ll_3ax23QP5Ck16_M9Kop7wx0hAbXrXyM,6004
 tomwer/app/canvas.py,sha256=RbQqgE7DuNjv4nGG6BNfnSevQO5_lCl7N71hGcLoxwE,1561
@@ -587,7 +587,7 @@ tomwer/gui/utils/waiterthread.py,sha256=XEp6CRQt4aHCuyS2C6ZeQIMWESGilbuhaJjm9CzQ
 tomwer/gui/utils/lineselector/__init__.py,sha256=GZ847ef5X2wk_sAHxg6h24TarPYmb4NZjQI3jjkc7jE,75
 tomwer/gui/utils/lineselector/lineselector.py,sha256=R-RhrTQj1wTPylD0D9MKNzM6voJx-O-z4nhIVwMqj5M,8179
 tomwer/gui/visualization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tomwer/gui/visualization/dataviewer.py,sha256=X632o237-0cW4gWTIXajA_vkOW9STchEbEY8VEZdM-A,27024
+tomwer/gui/visualization/dataviewer.py,sha256=Hh76ttfOeZzJUQVaT5F5AGJONK6DdMu46A8OBkWIpGg,27694
 tomwer/gui/visualization/fullscreenplot.py,sha256=ptLrhF8DUsYNMj-KDioe9Y-KxnOzqepGlS8K2A2hjck,3639
 tomwer/gui/visualization/nxtomometadata.py,sha256=uR2bHPnMp66mOJkE9WscTcQaiasr01pt3IbLUPP1F5M,683
 tomwer/gui/visualization/reconstructionparameters.py,sha256=19W0uAdkda8kzp9rWj4gbMuG4t16kBc3j6RwM_1hogk,10230
@@ -597,7 +597,7 @@ tomwer/gui/visualization/tomoobjoverview.py,sha256=YzocBQXhgnzI8IsJg5junE7218WcJ
 tomwer/gui/visualization/volumeoverview.py,sha256=6Hv1TtsDlaGQPCJKW-IkGy_r5Buue-O95tl1KkpMD-0,2491
 tomwer/gui/visualization/volumeviewer.py,sha256=LZq0sHlxpkPvBT5D4l7fbMj7jdwRBRylqswQy1bJD_c,16335
 tomwer/gui/visualization/diffviewer/__init__.py,sha256=rZ7qOTfAChU3FouCdkZllXT9ZZqTdo1XhLZMfmOqUAE,39
-tomwer/gui/visualization/diffviewer/diffviewer.py,sha256=Y8tDT1l-AkBSpTkBes31r_bhjbBeAlO__3OAc0Ob6Io,21812
+tomwer/gui/visualization/diffviewer/diffviewer.py,sha256=OZp3e8Fc8AkAKHIkfZI7wxLy9vmT8r40VXV1HPqQs5o,21910
 tomwer/gui/visualization/diffviewer/shiftwidget.py,sha256=2hpGo6BvubcSbw2QOT823sL74AEWyU32UxnvVZ4bDok,20928
 tomwer/gui/visualization/test/__init__.py,sha256=nRVmFmNtdzN5PElEurDCb9pDulWIha-fLu-VX8hNn5A,1368
 tomwer/gui/visualization/test/test_dataviewer.py,sha256=uiF4_tYUsP2w9-R9JrpecerUj7XIQbv0AgRSYPV_itQ,2446
@@ -776,10 +776,10 @@ tomwer/tests/test_utils.py,sha256=D0rNDSK6csEOYBY_7gD-4A3jp8rYAm8L1_Xg34A9I2s,30
 tomwer/tests/utils.py,sha256=RAXx5A99WD4Vyuv_wjHBdr-Xu7UiThHRKw2eiB5GX10,107
 tomwer/third_part/WaitingOverlay.py,sha256=GnqiytcJDp_24Cmz_2nZAP5HfpL3Yh7AzR2ATIusGsg,3906
 tomwer/third_part/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tomwer-1.3.16.dist-info/LICENSE,sha256=yR_hIZ1MfDh9x2_s23uFqBH7m5DgrBl9nJKkE37YChM,1877
-tomwer-1.3.16.dist-info/METADATA,sha256=ek1FtwMJWefeaq4GwgLvgVCai6K7df4dFJ2UtA1dINI,11462
-tomwer-1.3.16.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-tomwer-1.3.16.dist-info/entry_points.txt,sha256=fIcDnCxjgwzfIylLYhUsFyiNZjZMxsfRQBxi4f-cJg8,440
-tomwer-1.3.16.dist-info/namespace_packages.txt,sha256=Iut-JTfT11SZHHm77_ZeszD7pZDWXcTweCbvrJpqDyQ,14
-tomwer-1.3.16.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
-tomwer-1.3.16.dist-info/RECORD,,
+tomwer-1.3.18.dist-info/LICENSE,sha256=yR_hIZ1MfDh9x2_s23uFqBH7m5DgrBl9nJKkE37YChM,1877
+tomwer-1.3.18.dist-info/METADATA,sha256=Mub_NcjFAEJu2z-puw6RZ8r_7aU5dNWoCMraoQdqXe8,11487
+tomwer-1.3.18.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+tomwer-1.3.18.dist-info/entry_points.txt,sha256=fIcDnCxjgwzfIylLYhUsFyiNZjZMxsfRQBxi4f-cJg8,440
+tomwer-1.3.18.dist-info/namespace_packages.txt,sha256=Iut-JTfT11SZHHm77_ZeszD7pZDWXcTweCbvrJpqDyQ,14
+tomwer-1.3.18.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
+tomwer-1.3.18.dist-info/RECORD,,

{tomwer-1.3.16.dist-info → tomwer-1.3.18.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.1.0)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tomwer-1.3.16-py3.11-nspkg.pth

@@ -1 +0,0 @@
-import sys, types, os;p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('orangecontrib',));importlib = __import__('importlib.util');__import__('importlib.machinery');m = sys.modules.setdefault('orangecontrib', importlib.util.module_from_spec(importlib.machinery.PathFinder.find_spec('orangecontrib', [os.path.dirname(p)])));m = m or sys.modules.setdefault('orangecontrib', types.ModuleType('orangecontrib'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p)