tomwer 1.0.3__py3-none-any.whl → 1.1.0__py3-none-any.whl

tomwer/gui/control/datawatcher/datawatcher.py

@@ -173,11 +173,14 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
         if self.loopObservationThread is not None:
             self.loopObservationThread.blockSignals(True)
             self._disconnectObserverThread()
-            self.loopObservationThread.wait()
+            self.loopObservationThread.wait(4000)
             self.loopObservationThread = None
-        if self.observationThread is not None and self.observationThread.isRunning():
-            self.observationThread.blockSignals(True)
-            self.observationThread.wait()
+        if (
+            self.observationThread is not None
+            and self.observationThread.isRunning()  # pylint: disable=E1101
+        ):
+            self.observationThread.blockSignals(True)  # pylint: disable=E1101
+            self.observationThread.wait(4000)
             self.observationThread = None
         super(DataWatcherWidget, self).close()
 
@@ -266,6 +269,7 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
         self._filterQLE.setToolTip(
             "You can provide a Linux Regular Expression that will insure only file fitting the expression will be discovered"
         )
+        self._filterQLE.setPlaceholderText("*file_pattern*")
         widget.layout().addWidget(self._filterQLE)
         self._filterQLE.editingFinished.connect(self._restartObservation)
         self._filterQLE.editingFinished.connect(self._filterChanged)
@@ -375,8 +379,8 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
         if self.observationThread is not None:
             # remove connection
             self._disconnectObserverThread()
-            self.observationThread.blockSignals(True)
-            self.observationThread.wait()
+            self.observationThread.blockSignals(True)  # pylint: disable=E1101
+            self.observationThread.wait(4000)
 
         if sucess is False:
             self._setCurrentStatus(str("not processing"))
@@ -410,7 +414,7 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
 
     def _setIsObserving(self, b):
         _DataWatcher._setIsObserving(self, b)
-        if _DataWatcher.isObserving(self) is True:
+        if self.isObserving is True:  # pylint: disable=E1101
             self._qpbstartstop.setText(self._textStopObservation)
         else:
             self._qpbstartstop.setText(self._textStartObservation)
@@ -447,7 +451,7 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
         widget.setLayout(layout)
         return widget
 
-    def _setFolderPath(self):
+    def _setFolderPath(self):  # pragma: no cover
         """
         Ask the user the path to the folder to observe
         """
@@ -542,7 +546,7 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
             if not self.__threadAnimation.isRunning():
                 self.__threadAnimation.start()
             elif self.__threadAnimation is not None:
-                self.__threadAnimation.wait()
+                self.__threadAnimation.wait(4000)
         elif self.currentStatus == "acquisition ended":
             self._setStateIcon(silxicons.getQIcon("selected"))
         elif self.currentStatus == "failure":
@@ -578,7 +582,7 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
                 _scan = ScanFactory.create_scan_object(scan_path=scan)
             except Exception as e:
                 logger.error(
-                    "Fail to create a TomoBase instance from", scan, "Reason is", e
+                    f"Fail to create a TomoBase instance from {scan} Reason is {e}"
                 )
                 return
         else:
@@ -624,9 +628,12 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
             return
 
         # manage data watcher observation
-        if self.observationThread is None or not self.observationThread.isRunning():
+        if (
+            self.observationThread is None
+            or not self.observationThread.isRunning()  # pylint: disable=E1101
+        ):
             if self._initObservation() is False:
-                self.currentStatus = self._setCurrentStatus("failure")
+                self._setCurrentStatus("failure")
                 logger.info(
                     "failed on observation",
                     extra={logconfig.DOC_TITLE: self._scheme_title},
@@ -648,4 +655,7 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
             self.loopObservationThread.start()
 
     def _observation_thread_running(self):
-        return self.observationThread is not None and self.observationThread.isRunning()
+        return (
+            self.observationThread is not None
+            and self.observationThread.isRunning()  # pylint: disable=E1101
+        )

tomwer/gui/control/datawatcher/datawatcherobserver.py

@@ -179,7 +179,7 @@ class _QOngoingObservation(_OngoingObservation, qt.QObject):
                 scan_path=scanID, accept_bliss_scan=True
             )
         except Exception as e:
-            logger.error("Fail to create TomoBase instance from", scanID, "Error is", e)
+            logger.error(f"Fail to create TomoBase instance from {scanID} Error is {e}")
         else:
             for scan in scans:
                 self.sigScanReady.emit(scan)

tomwer/gui/control/observations.py

@@ -197,9 +197,6 @@ class _ObservedScanModel(qt.QAbstractTableModel):
                 return "(at least) {} over {}".format(
                     obs.n_acquired or "?", obs.tomo_n or "?"
                 )
-            elif HDF5TomoScan.directory_contains_scan(directory=obs):
-                scan = HDF5TomoScan(scan=obs)
-                return str(len(scan.projections))
             elif os.path.exists(obs) and os.path.isdir(obs):
                 return str(len(os.listdir(obs)))
             else:

tomwer/gui/control/selectorwidgetbase.py

@@ -1,5 +1,6 @@
 from silx.gui import qt
 import logging
+from tomwer.gui.utils.qt_utils import block_signals
 
 _logger = logging.getLogger(__name__)
 
@@ -8,22 +9,28 @@ class _SelectorWidget(qt.QWidget):
     """widget used to select a dataset on a list (a scan or a volume for now)"""
 
     sigSelectionChanged = qt.Signal(list)
-    """Signal emitted when the selection changed"""
+    """Signal emitted when the selection changed. List elements are tomo object identifier as str"""
 
     sigUpdated = qt.Signal()
     """signal emitted when the scan list change"""
 
     def __init__(self, parent=None):
-
         qt.QWidget.__init__(self, parent)
         self.setLayout(qt.QVBoxLayout())
         self.dataList = self._buildDataList()
         self.dataList.setSelectionMode(qt.QAbstractItemView.ExtendedSelection)
         self.layout().addWidget(self.dataList)
         self.layout().addWidget(self._getAddAndRmButtons())
-        self.layout().addWidget(self._getSendButton())
+        self.layout().addWidget(self._getSendButtons())
         self.setAcceptDrops(True)
 
+        # connect signal / slot
+        # for drag / drop we need to have an indirect call to the sigUpdated
+        self.dataList.listChanged.connect(self._updatedFromDragDrop)
+
+    def _updatedFromDragDrop(self, *args, **kwargs):
+        self.sigUpdated.emit()
+
     def add(self, scan):
         added_scans = self.dataList.add(scan)
         self.sigUpdated.emit()
@@ -46,7 +53,7 @@ class _SelectorWidget(qt.QWidget):
         self._addButton = qt.QPushButton("Add")
         self._addButton.clicked.connect(self._callbackAddData)
         self._rmButton = qt.QPushButton("Remove")
-        self._rmButton.clicked.connect(self._callbackRemoveData)
+        self._rmButton.clicked.connect(self._callbackRemoveSelectedDatasets)
 
         spacer = qt.QWidget(self)
         spacer.setSizePolicy(qt.QSizePolicy.Expanding, qt.QSizePolicy.Minimum)
@@ -56,16 +63,24 @@ class _SelectorWidget(qt.QWidget):
 
         return w
 
-    def _getSendButton(self):
+    def _getSendButtons(self):
         lLayout = qt.QHBoxLayout()
         widget = qt.QWidget(self)
         widget.setLayout(lLayout)
-        self._sendButton = qt.QPushButton("Select")
-        self._sendButton.clicked.connect(self._selectActiveData)
 
+        # spacer
         spacer = qt.QWidget(self)
         spacer.setSizePolicy(qt.QSizePolicy.Expanding, qt.QSizePolicy.Minimum)
         lLayout.addWidget(spacer)
+
+        # send all button
+        self._sendAllButton = qt.QPushButton("Send all")
+        self._sendAllButton.clicked.connect(self._sendAll)
+        lLayout.addWidget(self._sendAllButton)
+
+        # send selected button
+        self._sendButton = qt.QPushButton("Send selected")
+        self._sendButton.clicked.connect(self._selectActiveData)
         lLayout.addWidget(self._sendButton)
 
         return widget
@@ -87,12 +102,17 @@ class _SelectorWidget(qt.QWidget):
         else:
             _logger.warning("No active scan detected")
 
-    def _callbackRemoveData(self):
+    def _sendAll(self):
+        allItems = list(self.dataList._myitems.keys())
+        if len(allItems) > 0:
+            self.sigSelectionChanged.emit(allItems)
+
+    def _callbackRemoveSelectedDatasets(self):
         """ """
-        selectedItems = self.dataList.selectedItems()
-        if selectedItems is not None:
-            for item in selectedItems:
-                self.dataList.remove_item(item)
+        selected_items = self.dataList.selectedItems()
+        tomwer_objs_to_remove = [item.data(qt.Qt.UserRole) for item in selected_items]
+        for tomwer_obj in tomwer_objs_to_remove:
+            self.remove(tomwer_obj)
         self.sigUpdated.emit()
 
     def setActiveData(self, data):
@@ -104,3 +124,13 @@ class _SelectorWidget(qt.QWidget):
         """
         data_id = data
         self.dataList.setCurrentItem(self.dataList.items[data_id])
+
+    def removeSelectedDatasets(self):
+        sItem = self.dataList.selectedItems()
+        selection = [_item.text() for _item in sItem]
+
+        with block_signals(self):
+            # make sure sigUpdated is called only once.
+            for identifier in selection:
+                self.remove(identifier)
+        self.sigUpdated.emit()