tomwer 1.3.17__tar.gz → 1.3.19__tar.gz

{tomwer-1.3.17/tomwer.egg-info → tomwer-1.3.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.3.17
+Version: 1.3.19
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit
@@ -109,7 +109,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: doc
 Requires-Dist: orange-canvas-core; extra == "doc"
@@ -161,7 +161,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"

{tomwer-1.3.17 → tomwer-1.3.19}/setup.cfg

@@ -116,7 +116,7 @@ full_no_cuda =
 full = 
 	%(_full_base)s
 	nabu[full]>=2023.3.1dev
-	pycuda
+	pycuda<2024.1.1
 	scikit-cuda
 doc = 
 	%(full_no_cuda)s

{tomwer-1.3.17 → tomwer-1.3.19}/tomwer/core/process/reconstruction/nabu/utils.py

@@ -467,6 +467,7 @@ def nabu_std_err_has_error(errs: typing.Optional[bytes]):
             in line  # debatable but very disturbing from the gui side... anyway EDF days are coming to an end
             or "PerformanceWarning" in line
             or "jitify._init_module()" in line
+            or " unable to import 'siphash24.siphash13" in line
         )
 
     if errs is None:

{tomwer-1.3.17 → tomwer-1.3.19}/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-1.3.17 → tomwer-1.3.19}/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-1.3.17 → tomwer-1.3.19}/tomwer/version.py

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

{tomwer-1.3.17 → tomwer-1.3.19/tomwer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.3.17
+Version: 1.3.19
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit
@@ -109,7 +109,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: doc
 Requires-Dist: orange-canvas-core; extra == "doc"
@@ -161,7 +161,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"

{tomwer-1.3.17 → tomwer-1.3.19}/tomwer.egg-info/requires.txt

@@ -57,7 +57,7 @@ tifffile
 hdf5plugin
 pyicat_plus
 nabu[full]>=2023.3.1dev
-pycuda
+pycuda<2024.1.1
 scikit-cuda
 black
 flake8
@@ -134,7 +134,7 @@ tifffile
 hdf5plugin
 pyicat_plus
 nabu[full]>=2023.3.1dev
-pycuda
+pycuda<2024.1.1
 scikit-cuda
 
 [full_no_cuda]