tomwer 1.3.6__tar.gz → 1.3.8__tar.gz

{tomwer-1.3.6/tomwer.egg-info → tomwer-1.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.3.6
+Version: 1.3.8
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit

{tomwer-1.3.6 → tomwer-1.3.8}/tomwer/core/process/reconstruction/nabu/utils.py

@@ -461,6 +461,8 @@ def nabu_std_err_has_error(errs: typing.Optional[bytes]):
             in line
             or "return SourceModule(" in line
             or "CUBLAS" in line
+            or "Not supported for EDF"
+            in line  # debatable but very disturbing from the gui side... anyway EDF days are coming to an end
         )
 
     if errs is None:

{tomwer-1.3.6 → tomwer-1.3.8}/tomwer/gui/control/datawatcher/datawatcher.py

@@ -148,7 +148,6 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
 
         # set initial path to observe
         self.setFolderObserved(self._getInitPath())
-        self._initStatusView()
 
         # hide all windows by default
         for widget in (
@@ -475,20 +474,10 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
             self.observationThread.sigScanReady.disconnect(self._signalScanReady)
             self.obsThIsConnected = False
 
-    def _initStatusView(self):
-        """
-        The status view need a thread to update the animated icon when scanning
-        """
-        self.__threadAnimation = QWaiterThread(0.1)
-        self.__threadAnimation.finished.connect(self._updateAnimatedIcon)
-
     def _updateStatusView(self):
         """Update the processing state"""
         if self.currentStatus in self._animatedStates:
-            if not self.__threadAnimation.isRunning():
-                self.__threadAnimation.start()
-            elif self.__threadAnimation is not None:
-                self.__threadAnimation.wait(4000)
+            pass
         elif self.currentStatus == "acquisition ended":
             self._setStateIcon(silxicons.getQIcon("selected"))
         elif self.currentStatus == "failure":
@@ -506,18 +495,6 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
         else:
             self._stateLabel.setPixmap(icon.pixmap(30, state=qt.QIcon.On))
 
-    def _updateAnimatedIcon(self):
-        """Simple function which manage the waiting icon"""
-        if self.currentStatus in self._animatedStates:
-            icon = self.animated_icon.currentIcon()
-            if icon is None:
-                icon = qt.QIcon()
-            self.animated_icon._updateState()
-            self._setStateIcon(icon)
-
-            # get ready for the next animation
-            self.__threadAnimation.start()
-
     def _signalScanReady(self, scan):
         if type(scan) is str:
             try:

{tomwer-1.3.6 → tomwer-1.3.8}/tomwer/synctools/stacks/reconstruction/castvolume.py

@@ -94,11 +94,26 @@ class CastVolumeProcessStack(FIFO, qt.QObject):
             self.scan_ready(scan=data)
         else:
             self._data_currently_computed = data
-            self._computationThread.init(data=data, configuration=configuration)
-            # need to manage connect before starting it because
-            fct_callback = functools.partial(self._end_threaded_computation, callback)
-            self._computationThread.finished.connect(fct_callback)
-            self._computationThread.start()
+            try:
+                self._computationThread.init(data=data, configuration=configuration)
+            except ValueError as e:
+                # initialization can fail (for example for cast volume is there is no volume or be case this will raise an error)
+                # then we want to keep the thread active
+                self._data_currently_computed = None
+                ProcessManager().notify_dataset_state(
+                    dataset=data, process=self._process_id, state=DatasetState.SKIPPED
+                )
+                _logger.processSkipped(f"thread initialization failed. Error is {e}")
+                if callback is not None:
+                    callback()
+                self.scan_ready(scan=data)
+            else:
+                # need to manage connect before starting it because
+                fct_callback = functools.partial(
+                    self._end_threaded_computation, callback
+                )
+                self._computationThread.finished.connect(fct_callback)
+                self._computationThread.start()
 
     def _end_computation(self, data, future_tomo_obj, callback):
         """

{tomwer-1.3.6 → tomwer-1.3.8}/tomwer/version.py

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

{tomwer-1.3.6 → tomwer-1.3.8/tomwer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.3.6
+Version: 1.3.8
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit