tomwer 1.2.1__py3-none-any.whl → 1.3.12__py3-none-any.whl

tomwer/gui/imagefromfile.py

@@ -34,7 +34,7 @@ import logging
 
 from silx.gui import qt
 from silx.io.url import DataUrl
-from tomoscan.io import HDF5File
+from silx.io.utils import open as open_hdf5
 
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.synctools.imageloaderthread import ImageLoaderThread
@@ -71,7 +71,7 @@ class ImageFromFile(_Image):
 
                 def get_nabu_entry():
                     try:
-                        with HDF5File(_file, mode="r", swmr=True) as h5s:
+                        with open_hdf5(_file) as h5s:
                             for node in h5s:
                                 if "reconstruction" in h5s[node]:
                                     return "/".join(

tomwer/gui/qfolderdialog.py

@@ -78,6 +78,11 @@ class QDataDialog(qt.QFileDialog):
             os.environ["TOMWER_DEFAULT_INPUT_DIR"]
         ):
             self.setDirectory(os.environ["TOMWER_DEFAULT_INPUT_DIR"])
+        elif self.directory() != os.getcwd() or str(self.directory()).startswith(
+            "/data"
+        ):
+            # if the directory as already been set by the user. Avoid redefining it
+            pass
         elif os.path.isdir("/data"):
             self.setDirectory("/data")
 
@@ -279,6 +284,8 @@ class QVolumeDialog(qt.QDialog):
 
     def _selectFileOrFolder(self):
         dialog = QDataDialog(self, multiSelection=True)
+        # AnyFile because for HDF5 a file is expected, for .edf... a folder is expected
+        dialog.setFileMode(qt.QFileDialog.AnyFile)
         dialog.setNameFilters(
             [
                 "Any files (*)",
@@ -291,7 +298,19 @@ class QVolumeDialog(qt.QDialog):
         if dialog.exec_() == qt.QDialog.Accepted:
             selected_files = dialog.selectedFiles()
             if len(selected_files) > 0:
-                self.setFilePath(selected_files[0])
+                file_or_folder = selected_files[0]
+                # in case the user provided a .edf, .tiff... file try to make is life simpler.
+                if file_or_folder.endswith(
+                    (
+                        f".{EDFVolume.DEFAULT_DATA_EXTENSION}",
+                        f".{TIFFVolume.DEFAULT_DATA_EXTENSION}",
+                        f".{JP2KVolume.DEFAULT_DATA_EXTENSION}",
+                        f".{JP2KVolume.DEFAULT_DATA_EXTENSION}",
+                    )
+                ):
+                    file_or_folder = os.path.dirname(file_or_folder)
+
+                self.setFilePath(file_or_folder)
 
     def _selectDataPath(self):
         self._guessDataPathAuto.setChecked(False)
@@ -525,6 +544,10 @@ class QVolumeDialog(qt.QDialog):
                 constructor = TIFFVolume
             elif file_extension in self._JP2K_EXTENSIONS:
                 constructor = JP2KVolume
+            else:
+                raise NotImplementedError(
+                    f"unhandled file extension ({file_extension})"
+                )
             volume = constructor(
                 folder=file_path,
                 volume_basename=None if basename in ("", None) else basename,

tomwer/gui/reconstruction/axis/CompareImages.py

@@ -33,75 +33,24 @@ import weakref
 import numpy
 from silx.gui import icons as silx_icons
 from silx.gui import qt
-from silx.gui.plot import CompareImages as _CompareImages
+from silx.gui.plot.CompareImages import (
+    CompareImages as _CompareImages,
+    VisualizationMode,
+)
+
+from silx.gui.plot.tools.compare.toolbar import VisualizationModeToolButton
 from silx.gui.plot import tools
 
-from tomwer.gui import icons as tomwer_icons
 
 _logger = logging.getLogger(__name__)
 
 
-class CompareImagesToolBar(qt.QToolBar):
-    """ToolBar containing specific tools to custom the configuration of a
-    :class:`CompareImages` widget
-
-    Use :meth:`setCompareWidget` to connect this toolbar to a specific
-    :class:`CompareImages` widget.
-
-    :param Union[qt.QWidget,None] parent: Parent of this widget.
-    """
-
-    def __init__(self, parent=None):
-        qt.QToolBar.__init__(self, parent)
-
-        self.__compareWidget = None
-
-        menu = qt.QMenu(self)
-        self.__visualizationAction = qt.QAction(self)
-        self.__visualizationAction.setMenu(menu)
-        self.__visualizationAction.setCheckable(False)
-        self.addAction(self.__visualizationAction)
-        self.__visualizationGroup = qt.QActionGroup(self)
-        self.__visualizationGroup.setExclusive(True)
-        self.__visualizationGroup.triggered.connect(self.__visualizationModeChanged)
-
-        icon = silx_icons.getQIcon("compare-mode-a")
-        action = qt.QAction(icon, "Display frame 1", self)
-        action.setIconVisibleInMenu(True)
-        action.setCheckable(True)
-        action.setShortcut(qt.QKeySequence(qt.Qt.Key_A))
-        action.setProperty("mode", CompareImages.VisualizationMode.ONLY_A)
-        menu.addAction(action)
-        self.__visualizationGroup.addAction(action)
-
-        icon = silx_icons.getQIcon("compare-mode-b")
-        action = qt.QAction(icon, "Display frame 2", self)
-        action.setIconVisibleInMenu(True)
-        action.setCheckable(True)
-        action.setShortcut(qt.QKeySequence(qt.Qt.Key_B))
-        action.setProperty("mode", CompareImages.VisualizationMode.ONLY_B)
-        menu.addAction(action)
-        self.__visualizationGroup.addAction(action)
-
-        icon = silx_icons.getQIcon("compare-mode-rbneg-channel")
-        action = qt.QAction(icon, "Subtract in color mode", self)
-        action.setIconVisibleInMenu(True)
-        action.setCheckable(True)
-        action.setShortcut(qt.QKeySequence(qt.Qt.Key_C))
-        action.setProperty(
-            "mode", _CompareImages.VisualizationMode.COMPOSITE_RED_BLUE_GRAY_NEG
-        )
-        menu.addAction(action)
-        self.__visualizationGroup.addAction(action)
+class CompareImages(_CompareImages):
+    sigCropImagesChanged = qt.Signal()
+    """Emit when cropping of the compared images has changed"""
 
-        icon = tomwer_icons.getQIcon("compare_mode_a_minus_b")
-        action = qt.QAction(icon, "Subtract in BW mode", self)
-        action.setIconVisibleInMenu(True)
-        action.setCheckable(True)
-        action.setShortcut(qt.QKeySequence(qt.Qt.Key_S))
-        action.setProperty("mode", _CompareImages.VisualizationMode.COMPOSITE_A_MINUS_B)
-        menu.addAction(action)
-        self.__visualizationGroup.addAction(action)
+    def __init__(self, parent=None, backend=None):
+        super().__init__(parent, backend)
 
         # create crop images action
         icon = silx_icons.getQIcon("crop")
@@ -110,126 +59,39 @@ class CompareImagesToolBar(qt.QToolBar):
         action.setChecked(True)
         action.triggered.connect(self.__cropComparedImagesChanged)
         self.__cropComparedImages = action
-        self.addAction(action)
-
-    def setCompareWidget(self, widget):
-        """
-        Connect this tool bar to a specific :class:`CompareImages` widget.
-
-        :param Union[None,CompareImages] widget: The widget to connect with.
-        """
-        compareWidget = self.getCompareWidget()
-        if compareWidget is not None:
-            compareWidget.sigConfigurationChanged.disconnect(
-                self.__updateSelectedActions
-            )
-        compareWidget = widget
-        if compareWidget is None:
-            self.__compareWidget = None
-        else:
-            self.__compareWidget = weakref.ref(compareWidget)
-        if compareWidget is not None:
-            widget.sigConfigurationChanged.connect(self.__updateSelectedActions)
-        self.__updateSelectedActions()
-
-    def getCompareWidget(self):
-        """Returns the connected widget.
-
-        :rtype: CompareImages
-        """
-        if self.__compareWidget is None:
-            return None
-        else:
-            return self.__compareWidget()
-
-    def __updateSelectedActions(self):
-        """
-        Update the state of this tool bar according to the state of the
-        connected :class:`CompareImages` widget.
-        """
-        widget = self.getCompareWidget()
-        if widget is None:
-            return
-
-        mode = widget.getVisualizationMode()
-        action = None
-        for a in self.__visualizationGroup.actions():
-            actionMode = a.property("mode")
-            if mode == actionMode:
-                action = a
-                break
-        old = self.__visualizationGroup.blockSignals(True)
-        if action is not None:
-            # Check this action
-            action.setChecked(True)
-        else:
-            action = self.__visualizationGroup.checkedAction()
-            if action is not None:
-                # Uncheck this action
-                action.setChecked(False)
-        self.__updateVisualizationMenu()
-        self.__visualizationGroup.blockSignals(old)
-
-    def __visualizationModeChanged(self, selectedAction):
-        """Called when user requesting changes of the visualization mode."""
-        self.__updateVisualizationMenu()
-        widget = self.getCompareWidget()
-        if widget is not None:
-            mode = selectedAction.property("mode")
-            widget.setVisualizationMode(mode)
+        self._compareToolBar.addAction(action)
+
+        # define visible compare mode
+        self._compareToolBar._visualizationToolButton.setVisibleModes(
+            [
+                VisualizationMode.ONLY_A,
+                VisualizationMode.ONLY_B,
+                VisualizationMode.COMPOSITE_RED_BLUE_GRAY_NEG,
+                VisualizationMode.COMPOSITE_A_MINUS_B,
+            ]
+        )
 
     def __cropComparedImagesChanged(self):
-        widget = self.getCompareWidget()
-        if widget is not None:
-            cropCompositeImage = self.__cropComparedImages.isChecked()
-            widget.setCropComparedImages(cropCompositeImage)
-
-    def __updateVisualizationMenu(self):
-        """Update the state of the action containing visualization menu."""
-        selectedAction = self.__visualizationGroup.checkedAction()
-        if selectedAction is not None:
-            self.__visualizationAction.setText(selectedAction.text())
-            self.__visualizationAction.setIcon(selectedAction.icon())
-            self.__visualizationAction.setToolTip(selectedAction.toolTip())
-        else:
-            self.__visualizationAction.setText("")
-            self.__visualizationAction.setIcon(qt.QIcon())
-            self.__visualizationAction.setToolTip("")
-
-
-class CompareImages(_CompareImages.CompareImages):
-    sigCropImagesChanged = qt.Signal()
-    """Emit when cropping of the compared images has changed"""
-
-    def __init__(self, parent=None, backend=None):
-        super().__init__(parent, backend=backend)
-        self.__cropComparedImages = True
+        cropCompositeImage = self.__cropComparedImages.isChecked()
+        self.setCropComparedImages(cropCompositeImage)
 
     def cropComparedImages(self) -> bool:
-        return self.__cropComparedImages
+        return self.__cropComparedImages.isChecked()
 
     def setCropComparedImages(self, crop):
-        self.__cropComparedImages = crop
+        self.__cropComparedImages.setChecked(crop)
         self.sigCropImagesChanged.emit()
 
     def _createToolBars(self, plot):
         """Create tool bars displayed by the widget"""
-        self._interactiveModeToolBar = tools.InteractiveModeToolBar(
-            parent=self, plot=plot
-        )
-        self._imageToolBar = tools.ImageToolBar(parent=self, plot=plot)
-
+        toolBar = tools.InteractiveModeToolBar(parent=self, plot=plot)
+        self._interactiveModeToolBar = toolBar
+        toolBar = tools.ImageToolBar(parent=self, plot=plot)
+        self._imageToolBar = toolBar
         toolBar = CompareImagesToolBar(self)
         toolBar.setCompareWidget(self)
         self._compareToolBar = toolBar
 
-    def _createStatusBar(self, plot):
-        self._statusBar = CompareImagesStatusBar(self)
-        self._statusBar.setCompareWidget(self)
-
-    def getCompareToolBar(self):
-        return self._compareToolBar
-
 
 class CompareImagesStatusBar(qt.QStatusBar):
     """StatusBar containing specific information contained in a
@@ -407,3 +269,61 @@ class CompareImagesStatusBar(qt.QStatusBar):
                     text2 = self._formatData(data2)
                 self._label1.setText("Frame 1: %s" % text1)
                 self._label2.setText("Frame 2: %s" % text2)
+
+
+class CompareImagesToolBar(qt.QToolBar):
+    def __init__(self, parent=None):
+        qt.QToolBar.__init__(self, parent)
+
+        self.__compareWidget = None
+
+        self._visualizationToolButton = VisualizationModeToolButton(self)
+        self._visualizationToolButton.setPopupMode(qt.QToolButton.InstantPopup)
+        self._visualizationToolButton.sigSelected.connect(self.__visualizationChanged)
+        self.addWidget(self._visualizationToolButton)
+
+    def __visualizationChanged(self, mode: VisualizationMode):
+        widget = self.getCompareWidget()
+        if widget is not None:
+            widget.setVisualizationMode(mode)
+
+    def setCompareWidget(self, widget):
+        """
+        Connect this tool bar to a specific :class:`CompareImages` widget.
+
+        :param Union[None,CompareImages] widget: The widget to connect with.
+        """
+        compareWidget = self.getCompareWidget()
+        if compareWidget is not None:
+            compareWidget.sigConfigurationChanged.disconnect(
+                self.__updateSelectedActions
+            )
+        compareWidget = widget
+        self.setEnabled(compareWidget is not None)
+        if compareWidget is None:
+            self.__compareWidget = None
+        else:
+            self.__compareWidget = weakref.ref(compareWidget)
+        if compareWidget is not None:
+            widget.sigConfigurationChanged.connect(self.__updateSelectedActions)
+        self.__updateSelectedActions()
+
+    def getCompareWidget(self):
+        """Returns the connected widget.
+
+        :rtype: CompareImages
+        """
+        if self.__compareWidget is None:
+            return None
+        else:
+            return self.__compareWidget()
+
+    def __updateSelectedActions(self):
+        """
+        Update the state of this tool bar according to the state of the
+        connected :class:`CompareImages` widget.
+        """
+        widget = self.getCompareWidget()
+        if widget is None:
+            return
+        self._visualizationToolButton.setSelected(widget.getVisualizationMode())