processview 1.3.2__tar.gz → 1.4.0__tar.gz

{processview-1.3.2 → processview-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: processview
-Version: 1.3.2
+Version: 1.4.0
 Summary: Simple helper to provide user feedback about dataset processing
 Author: data analysis unit
 Author-email: henri.payno@esrf.fr

{processview-1.3.2 → processview-1.4.0}/processview/core/manager/manager.py

@@ -176,6 +176,15 @@ class ProcessManager:
             [res.add(dataset) for dataset in dataset_states]
         return tuple(res)
 
+    def remove_dataset(self, dataset: Dataset):
+        """
+        Remove a dataset from the list of registered dataset
+        """
+        dataset_id = self._find_dataset_id(dataset)
+        for process_id in self._dataset_process_states:
+            if dataset_id in self._dataset_process_states[process_id]:
+                self._dataset_process_states[process_id].pop(dataset_id)
+
     def notify_dataset_state(self, dataset, process, state, details=None) -> None:
         """
         Update dataset state

processview-1.4.0/processview/gui/DropDownWidget.py

@@ -0,0 +1,49 @@
+from silx.gui import qt
+
+
+class DropDownWidget(qt.QWidget):
+    """Simple 'dropdown' widget"""
+
+    _BUTTON_ICON = qt.QStyle.SP_ToolBarVerticalExtensionButton  # noqa
+
+    def __init__(self, parent):
+        super().__init__(parent)
+
+        self.setLayout(qt.QVBoxLayout())
+        # toggable button
+        self._toggleButton = qt.QPushButton("", self)
+        self._toggleButton.setCheckable(True)
+        self._toggleButton.setSizePolicy(qt.QSizePolicy.Fixed, qt.QSizePolicy.Fixed)
+        self.layout().addWidget(self._toggleButton)
+
+        self._mainWidget = None
+
+        # set up interface
+        self.layout().setContentsMargins(2, 2, 2, 2)
+        self.layout().setSpacing(0)
+
+        self._setButtonIcon(show=True)
+        self._toggleButton.setChecked(True)
+
+        # connect signal / slot
+        self._toggleButton.toggled.connect(self._toggleVisibility)
+
+    def setWidget(self, widget: qt.QWidget):
+        if self._mainWidget is not None:
+            self.layout().removeWidget(self._mainWidget)
+
+        self._mainWidget = widget
+        self.layout().addWidget(self._mainWidget)
+
+    def _setButtonIcon(self, show):
+        style = qt.QApplication.instance().style()
+        # return a QIcon
+        icon = style.standardIcon(self._BUTTON_ICON)
+        if show is True:
+            pixmap = icon.pixmap(32, 32).transformed(qt.QTransform().scale(1, -1))
+            icon = qt.QIcon(pixmap)
+        self._toggleButton.setIcon(icon)
+
+    def _toggleVisibility(self, visible):
+        self._setButtonIcon(show=visible)
+        self._mainWidget.setVisible(visible)

{processview-1.3.2 → processview-1.4.0}/processview/gui/processmanager.py

@@ -41,6 +41,7 @@ from processview.core.manager import DatasetState
 from processview.core.manager import ProcessManager as _ProcessManager
 from processview.core.sorting import SortType, tooltips
 from processview.core.superviseprocess import SuperviseProcess
+from processview.gui.DropDownWidget import DropDownWidget
 from processview.gui import icons as icons
 from processview.gui.messagebox import MessageBox
 from processview.utils import docstring
@@ -171,6 +172,7 @@ class ObservationTable(qt.QTableView):
             )
 
         datasets = [get_dataset_at(index.row()) for index in self.selectedIndexes()]
+        [ProcessManager().remove_dataset(dataset) for dataset in datasets]
         self.model().remove_datasets(datasets)
 
     def _requestInfo(self, *args, **kwargs):
@@ -198,7 +200,7 @@ class ObservationTable(qt.QTableView):
 
 class ProcessManagerWidget(qt.QWidget):
     """
-    Main widget to dispaly dataset vs process metadata
+    Main widget to display dataset vs process metadata
     """
 
     def __init__(self, parent):
@@ -207,14 +209,17 @@ class ProcessManagerWidget(qt.QWidget):
 
         self._manager = ProcessManager()
 
-        self._optionsWidget = _ToggleableOptionsWidget(parent=self)
-        self._optionsWidget.setSizePolicy(
+        self._optionsWidget = OptionsWidget(parent=self)
+        self._dropDownOptionsWidget = DropDownWidget(parent=self)
+        self._dropDownOptionsWidget.setWidget(self._optionsWidget)
+
+        self._dropDownOptionsWidget.setSizePolicy(
             qt.QSizePolicy.Minimum, qt.QSizePolicy.Minimum
         )
         self.setContentsMargins(0, 0, 0, 0)
         self.layout().setContentsMargins(0, 0, 0, 0)
         self.layout().setSpacing(2)
-        self.layout().addWidget(self._optionsWidget)
+        self.layout().addWidget(self._dropDownOptionsWidget)
 
         self.observationTable = ObservationTable(self)
 
@@ -251,11 +256,11 @@ class ProcessManagerWidget(qt.QWidget):
 
     def _filterUpdated(self):
         self.observationTable.model().process_patterns = (
-            self._optionsWidget.getProcessPatterns()
+            self._dropDownOptionsWidget.getProcessPatterns()
         )
         self._updateProcesses()
         self.observationTable.model().dataset_patterns = (
-            self._optionsWidget.getDatasetPatterns()
+            self._dropDownOptionsWidget.getDatasetPatterns()
         )
         self._updateDatasetStates()
 
@@ -381,6 +386,7 @@ class _DatasetProcessModel(qt.QAbstractTableModel):
         # sort datasets
         datasets = self.sort_datasets(datasets=datasets, sort_type=self._sort_type)
 
+        self._sorted_datasets.clear()
         for i_dataset, dataset in enumerate(datasets):
             self._sorted_datasets[i_dataset] = dataset
         self.endResetModel()
@@ -449,15 +455,11 @@ class _DatasetProcessModel(qt.QAbstractTableModel):
             self.layoutChanged.emit()
 
 
-class _ToggleableOptionsWidget(qt.QWidget):
-    _BUTTON_ICON = qt.QStyle.SP_ToolBarVerticalExtensionButton  # noqa
+class OptionsWidget(qt.QWidget):
 
     def __init__(self, parent):
         super().__init__(parent)
         self.setLayout(qt.QGridLayout())
-        # toggable button
-        self._toggleButton = qt.QPushButton("", self)
-        self.layout().addWidget(self._toggleButton, 0, 0, 1, 1)
 
         # dataset ordering
         self._orderingWidget = _OrderingWidget(parent=self)
@@ -471,34 +473,16 @@ class _ToggleableOptionsWidget(qt.QWidget):
         self.layout().setSpacing(0)
         self.layout().addWidget(self._filterWidget, 4, 1, 3, 3)
 
-        self._toggleButton.setSizePolicy(qt.QSizePolicy.Fixed, qt.QSizePolicy.Fixed)
-        self._setButtonIcon(show=True)
-
-        # connect signal / slot
-        self._toggleButton.clicked.connect(self._toggleFilterWidget)
-
-        # expose API
-        self.getProcessPatterns = self._filterWidget.getProcessPatterns
-        self.getDatasetPatterns = self._filterWidget.getDatasetPatterns
-
     @property
     def filterWidget(self):
         return self._filterWidget
 
-    def _setButtonIcon(self, show):
-        style = qt.QApplication.instance().style()
-        # return a QIcon
-        icon = style.standardIcon(self._BUTTON_ICON)
-        if show is True:
-            pixmap = icon.pixmap(32, 32).transformed(qt.QTransform().scale(1, -1))
-            icon = qt.QIcon(pixmap)
-        self._toggleButton.setIcon(icon)
+    # expose API
+    def getProcessPatterns(self):
+        return self._filterWidget.getProcessPatterns()
 
-    def _toggleFilterWidget(self):
-        visible = not self._filterWidget.isVisible()
-        self._setButtonIcon(show=visible)
-        self._filterWidget.setVisible(visible)
-        self._orderingWidget.setVisible(visible)
+    def getDatasetPatterns(self):
+        return self._filterWidget.getDatasetPatterns()
 
 
 class _FilterWidget(qt.QWidget):
@@ -700,3 +684,6 @@ class ProcessManager(qt.QObject):
     @docstring(_ProcessManager)
     def get_datasets(self):
         return self.manager.get_datasets()
+
+    def remove_dataset(self, *args, **kwargs):
+        return self.manager.remove_dataset(*args, **kwargs)

{processview-1.3.2 → processview-1.4.0}/processview/gui/test/test_process_manager.py

@@ -32,7 +32,7 @@ import unittest
 from processview.core.superviseprocess import SuperviseProcess
 from processview.core.dataset import Dataset
 from processview.core.dataset import DatasetIdentifier
-from processview.gui.processmanager import ProcessManager
+from processview.gui.processmanager import ProcessManager, ProcessManagerWindow
 from processview.core.manager import DatasetState
 from silx.gui.utils.testutils import SignalListener
 from silx.gui.utils.testutils import TestCaseQt
@@ -73,6 +73,34 @@ class TestProcessManager(TestCaseQt):
         )
         self.assertEqual(self.signalListener.callCount(), 3)
 
+    def testClearItems(self):
+        window = ProcessManagerWindow(parent=None)
+        p1 = SuperviseProcess(name="process1")
+        p2 = SuperviseProcess(name="process2")
+        scan_1 = _DummyScan("scan1")
+        scan_2 = _DummyScan("scan2 with a very long name ... really long")
+
+        manager = ProcessManager()
+        manager.notify_dataset_state(
+            dataset=scan_1, state=DatasetState.PENDING, process=p1
+        )
+        manager.notify_dataset_state(
+            dataset=scan_2, state=DatasetState.SUCCEED, process=p1
+        )
+        manager.notify_dataset_state(
+            dataset=scan_2, state=DatasetState.FAILED, process=p2
+        )
+
+        window._centralWidget.observationTable.selectAll()
+        window._centralWidget.observationTable._requestClearDataset()
+        self.qapp.processEvents()
+        assert len(manager.manager._dataset_process_states[p1.process_id]) == 0
+        manager.notify_dataset_state(
+            dataset=scan_2, state=DatasetState.FAILED, process=p2
+        )
+        assert len(manager.manager._dataset_process_states[p1.process_id]) == 0
+        assert len(manager.manager._dataset_process_states[p2.process_id]) == 1
+
 
 class _DummyScan(Dataset):
     def __init__(self, name):

{processview-1.3.2 → processview-1.4.0}/processview/version.py

@@ -76,8 +76,8 @@ RELEASE_LEVEL_VALUE = {
 }
 
 MAJOR = 1
-MINOR = 3
-MICRO = 2
+MINOR = 4
+MICRO = 0
 RELEV = "final"  # <16
 SERIAL = 0  # <16
 

{processview-1.3.2 → processview-1.4.0}/processview.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: processview
-Version: 1.3.2
+Version: 1.4.0
 Summary: Simple helper to provide user feedback about dataset processing
 Author: data analysis unit
 Author-email: henri.payno@esrf.fr

{processview-1.3.2 → processview-1.4.0}/processview.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ processview/core/manager/manager.py
 processview/core/manager/test/__init__.py
 processview/core/manager/test/test_manager.py
 processview/core/test/__init__.py
+processview/gui/DropDownWidget.py
 processview/gui/__init__.py
 processview/gui/icons.py
 processview/gui/messagebox.py