tomwer 2.0.0.dev7__tar.gz → 2.0.0.dev8__tar.gz

{tomwer-2.0.0.dev7/src/tomwer.egg-info → tomwer-2.0.0.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tomwer
-Version: 2.0.0.dev7
+Version: 2.0.0.dev8
 Summary: Tomography workflow tools
 Author-email: Henri Payno <henri.payno@esrf.fr>, Pierre Paleo <pierre.paleo@esrf.fr>, Pierre-Olivier Autran <pierre-olivier.autran@esrf.fr>, Jérôme Lesaint <jerome.lesaint@esrf.fr>
 License: MIT

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/orangecontrib/tomwer/widgets/cluster/MonitorOW.py

@@ -87,20 +87,26 @@ class MonitorOW(
         pass
 
     @Inputs.future_tomo_obj
-    def _newFutureRecived(self, future_tomo_obj, *args, **kwargs):
+    def _newFutureReceived(self, future_tomo_obj, *args, **kwargs):
         future_tomo_obj = unpack_variable(future_tomo_obj)
 
         if future_tomo_obj is None:
             future_tomo_obj = MISSING_DATA
         self.set_dynamic_input("future_tomo_obj", future_tomo_obj)
         if future_tomo_obj is not MISSING_DATA:
+            has_already_futures = len(self._widget.futureTomoObjs()) > 0
             self._widget.addFutureTomoObj(future_tomo_obj=future_tomo_obj)
             self.execute_ewoks_task()
+            if not has_already_futures:
+                self._startProcessing()
 
     def _output_changed(self):
-        future_tomo_obj_to_remove = self.get_task_outputs().get("future_tomo_obj", None)
-        if future_tomo_obj_to_remove:
-            self._widget.removeFutureTomoObj(future_tomo_obj_to_remove.value)
+        future_tomo_obj_to_remove = self.get_task_input_value("future_tomo_obj", None)
+        if future_tomo_obj_to_remove is not None:
+            self._widget.removeFutureTomoObj(future_tomo_obj_to_remove)
+        has_remaining_future = len(self._widget.futureTomoObjs()) > 0
+        if not has_remaining_future:
+            self._endProcessing()
         return super()._output_changed()
 
 

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/orangecontrib/tomwer/widgets/reconstruction/CastNabuVolumeOW.py

@@ -17,6 +17,9 @@ from tomwer.tasks.reconstruction.castvolume import CastVolumeTask
 from orangecontrib.tomwer.orange.task_widgets.TomwerWidgetWithStack import (
     TomwerWidgetWithStack,
 )
+from tomwer.gui.reconstruction.nabu.castvolume._check import (
+    check_volume_to_reconstruct as _check_volume_to_reconstruct,
+)
 from orangecontrib.tomwer.orange.ewoks_compatibility import unpack_variable
 from processview.core.manager import DatasetState, ProcessManager
 
@@ -158,7 +161,7 @@ class CastNabuVolumeOW(
         self.set_dynamic_input("cluster_config", cluster_config.to_dict())
 
     def _process(self, data: TomwerScanBase | None, volume: TomwerVolumeBase | None):
-        if data is None and volume is None:
+        if not _check_volume_to_reconstruct(data=data, volume=volume):
             return
         self._last_data = data
         self._last_volume = volume

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/cluster/slurm.py

@@ -9,7 +9,7 @@ from silx.gui import qt
 from sluurp.utils import get_partitions, get_partition_gpus, get_partition_walltime
 
 from tomwer.core.settings import SlurmSettings, SlurmSettingsMode
-from tomwer.gui import icons
+from tomwer.gui.utils._warning import WarningLabel as _WarningLabel
 from tomwer.gui.utils.qt_utils import block_signals
 from tomwer.gui.configuration.action import (
     BasicConfigurationAction,
@@ -186,21 +186,15 @@ class SlurmSettingsWidget(qt.QWidget):
         self._connectSignals()
 
     def _initWarningLabels(self) -> None:
-        warning_icon = icons.getQIcon("warning")
-        self._warning_opd_p9 = qt.QLabel("")
-        self._warning_opd_p9.setPixmap(warning_icon.pixmap(20, state=qt.QIcon.On))
+        self._warning_opd_p9 = _WarningLabel("")
         self._warning_opd_p9.setToolTip(
             f"'{get_login()}' account cannot submit job on p9 architecture"
         )
-        self._warning_opd_export_opts = qt.QLabel("")
-        self._warning_opd_export_opts.setPixmap(
-            warning_icon.pixmap(20, state=qt.QIcon.On)
-        )
+        self._warning_opd_export_opts = _WarningLabel("")
         self._warning_opd_export_opts.setToolTip(
             f"'{get_login()}' account needs to export job with ALL option (advanced settings)"
         )
-        self._warningWallTime = qt.QLabel("")
-        self._warningWallTime.setPixmap(warning_icon.pixmap(20, state=qt.QIcon.On))
+        self._warningWallTime = _WarningLabel("")
 
     def _initInputs(self, n_gpu: int, jobLimitation: int | None) -> None:
         layout = self.layout()

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/conditions/filter.py

@@ -10,9 +10,9 @@ from __future__ import annotations
 
 from silx.gui import qt
 from typing import get_args
+import qtawesome
 
 from tomwer.models.conditions.filters import InputModel
-from tomwer.gui import icons
 from tomwer.gui.utils.sandboxes import (
     RegularExpressionSandBox,
     RegularExpressionSandBoxDialog,
@@ -55,9 +55,8 @@ class FileNameFilterWidget(qt.QWidget):
         self._patternLE.setToolTip(self.getPatternTooltip())
         self.layout().addWidget(self._patternLE, 2, 1)
 
-        icon = icons.getQIcon("information")
+        icon = qtawesome.icon("ei.info-circle")
         self._sandBoxPB = qt.QPushButton(icon=icon, parent=self)
-        # self._sandBoxPB.setPixmap(icon.pixmap(qt.QSize(32, 32)))
         self._sandBoxPB.setToolTip(RegularExpressionSandBox.description())
         self._sandBoxPB.pressed.connect(self._showSandBox)
         self.layout().addWidget(self._sandBoxPB, 2, 2)

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/control/datareacheractions.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 
 from silx.gui import qt
 
+import qtawesome
 from tomwer.gui import icons as tomwericons
 
 
@@ -12,7 +13,7 @@ class HistoryAction(qt.QAction):
     """
 
     def __init__(self, parent):
-        icon = tomwericons.getQIcon("history")
+        icon = qtawesome.icon("mdi.history")
         qt.QAction.__init__(self, icon, "history", parent)
         self.setCheckable(True)
 
@@ -34,7 +35,7 @@ class ObservationAction(qt.QAction):
     """
 
     def __init__(self, parent):
-        icon = tomwericons.getQIcon("loop")
+        icon = qtawesome.icon("ph.magnifying-glass")
         qt.QAction.__init__(self, icon, "observations", parent)
         self.setCheckable(True)
 

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/edit/nxtomowarmer.py

@@ -5,7 +5,7 @@ from silx.gui import qt
 from silx.io.utils import open as open_hdf5
 
 from tomwer.core.scan.nxtomoscan import NXtomoScan
-from tomwer.gui import icons
+from tomwer.gui.utils._warning import WarningLabel as _WarningLabel
 
 
 class NXtomoProxyWarmer(qt.QWidget):
@@ -18,14 +18,12 @@ class NXtomoProxyWarmer(qt.QWidget):
         self.setLayout(qt.QHBoxLayout())
         # icon
         # warning about requires parameters from a nabu slice reconstruction
-        self._warningIcon = qt.QLabel(
+        self._warningIcon = _WarningLabel(
             "It seems this entry points to a soft link. Be carreful. Editing metadata will affect another file",
             parent=self,
         )
         self._warningIcon.setSizePolicy(qt.QSizePolicy.Minimum, qt.QSizePolicy.Minimum)
         self._warningIcon.setAlignment(qt.Qt.AlignRight | qt.Qt.AlignVCenter)
-        warning_icon = icons.getQIcon("warning")
-        self._warningIcon.setPixmap(warning_icon.pixmap(20, 20))
         self.layout().addWidget(self._warningIcon)
         # label
         self._warningLabel = qt.QLabel(

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/reconstruction/multicor/MultiCoRWindow.py

@@ -3,12 +3,12 @@ from __future__ import annotations
 import pint
 import numpy
 import logging
+import qtawesome
 from silx.gui import qt
 
 from tomwer.core.reconstruction.multi.multicor.params import ReconstructionMode
 from tomwer.core.reconstruction.multi.scores.ScoreMethod import ScoreMethod
 from tomwer.core.reconstruction.common.utils import slice_index_to_int
-from tomwer.gui import icons
 from tomwer.gui.reconstruction.multicor.NabuAutoCorDiag import NabuAutoCorDiag
 from tomwer.gui.reconstruction.multicor.MultiCoRTabWidget import MultiCoRTabWidget
 from tomwer.gui.reconstruction.scores.control import ControlWidget
@@ -84,7 +84,7 @@ class MultiCoRWindow(qt.QMainWindow):
             self._automaticCorWidget.setWindowTitle(
                 "compute estimated center of rotation"
             )
-            auto_cor_icon = icons.getQIcon("a")
+            auto_cor_icon = qtawesome.icon("mdi.auto-fix")
             self._automaticCorWidget.setWindowIcon(auto_cor_icon)
             self._automaticCorWidget.sigRequestAutoCor.connect(self.computeEstimatedCor)
         return self._automaticCorWidget

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/reconstruction/multicor/corrangeselector.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 import functools
 import logging
 import weakref
+import qtawesome
 
 import numpy
 from silx.gui import icons as silxicons
@@ -22,7 +23,6 @@ from tomwer.core.reconstruction.utils.cor import (
     relative_pos_to_absolute,
 )
 from tomwer.core.scan.scanbase import TomwerScanBase
-from tomwer.gui import icons
 from tomwer.gui.fonts import FONT_IMPORTANT, FONT_MEDIUM
 from tomwer.gui.reconstruction.multicor.sliceselector import SliceSelector
 from tomwer.gui.utils.lineselector import QSliceSelectorDialog
@@ -482,7 +482,7 @@ class _EstimatedCoRWidget(qt.QGroupBox):
         # auto cor button
         if self.__hasAutoCoROpt:
             self._autoCorPB = qt.QPushButton("auto cor", self)
-            auto_cor_icon = icons.getQIcon("a")
+            auto_cor_icon = qtawesome.icon("mdi.auto-fix")
             self._autoCorPB.setIcon(auto_cor_icon)
             self.layout().addWidget(self._autoCorPB, 3, 1, 1, 1)
 

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/reconstruction/nabu/castvolume/CastVolumeWidget.py

@@ -46,6 +46,9 @@ class CastVolumeWidget(qt.QWidget):
     sigProcessRequested = qt.Signal()
     """Signal emitted when the user requests manual processing in interactive mode"""
 
+    _AUTOMATIC_MODE_TXT = "automatic mode"
+    _INTERACTIVE_MODE_TXT = "interactive mode"
+
     def __init__(self, parent) -> None:
         super().__init__(parent=parent)
         self.setLayout(qt.QVBoxLayout())
@@ -83,15 +86,16 @@ class CastVolumeWidget(qt.QWidget):
         self._bottomBar = qt.QWidget(self)
         self._bottomBar.setLayout(qt.QHBoxLayout())
         self._bottomBar.layout().setContentsMargins(1, 0, 1, 2)
-        self._interactiveLock = PadlockButton(self._bottomBar)
-        self._interactiveLock.setToolTip(
+        self._autoModeLock = PadlockButton(self._bottomBar)
+        self._autoModeLock.setToolTip(
             "Lock to enable interactive mode: processing is paused and you can "
             "adjust min/max values manually before triggering execution."
         )
-        self._bottomBar.layout().addWidget(self._interactiveLock)
-        self._bottomBar.layout().addWidget(
-            qt.QLabel("interactive mode", self._bottomBar)
+        self._bottomBar.layout().addWidget(self._autoModeLock)
+        self._autoOrInteractiveLabel = qt.QLabel(
+            self._AUTOMATIC_MODE_TXT, self._bottomBar
         )
+        self._bottomBar.layout().addWidget(self._autoOrInteractiveLabel)
         self._bottomBar.layout().addStretch()
         self._processBut = qt.QPushButton("Process", self._bottomBar)
         self._processBut.setEnabled(False)
@@ -99,9 +103,12 @@ class CastVolumeWidget(qt.QWidget):
         self._bottomBar.layout().addWidget(self._processBut)
         self.layout().addWidget(self._bottomBar)
 
+        # set up
+        self.setInteractive(False)
+
         # connections
         self._settingsWidget.sigConfigChanged.connect(self._onConfigChanged)
-        self._interactiveLock.sigLockChanged.connect(self._onInteractiveModeChanged)
+        self._autoModeLock.sigLockChanged.connect(self._onInteractiveModeChanged)
         self._processBut.clicked.connect(self.sigProcessRequested)
         self._histogramWidget.sigRangeChanged.connect(self._onHistogramRangeChanged)
 
@@ -110,10 +117,12 @@ class CastVolumeWidget(qt.QWidget):
     # ------------------------------------------------------------------
 
     def isInteractive(self) -> bool:
-        return self._interactiveLock.isLocked()
+        return not self._autoModeLock.isLocked()
 
     def setInteractive(self, interactive: bool) -> None:
-        self._interactiveLock.setLock(interactive)
+        self._autoModeLock.setLock(not interactive)
+        label = self._INTERACTIVE_MODE_TXT if interactive else self._AUTOMATIC_MODE_TXT
+        self._autoOrInteractiveLabel.setText(label)
 
     def setInteractiveControlsVisible(self, visible: bool) -> None:
         """Show or hide the bottom bar (padlock, label, Process button).
@@ -124,7 +133,8 @@ class CastVolumeWidget(qt.QWidget):
         """
         self._bottomBar.setVisible(visible)
 
-    def _onInteractiveModeChanged(self, interactive: bool) -> None:
+    def _onInteractiveModeChanged(self, toogled: bool) -> None:
+        interactive = self.isInteractive()
         self._processBut.setEnabled(interactive)
         self._histogramWidget.setVisible(interactive)
         self._slicePreviewWidget.setVisible(interactive)

tomwer-2.0.0.dev8/src/tomwer/gui/reconstruction/nabu/castvolume/_check.py

@@ -0,0 +1,40 @@
+from __future__ import annotations
+
+from silx.gui import qt
+
+from tomwer.core.scan.scanbase import TomwerScanBase as _TomwerScanBase
+from tomwer.core.volume.volumebase import TomwerVolumeBase as _TomwerVolumeBase
+from tomwer.core.volume.rawvolume import RawVolume
+
+_raw_volume_warning_dialog: qt.QMessageBox | None = None
+
+
+def check_volume_to_reconstruct(
+    data: _TomwerScanBase, volume: _TomwerVolumeBase
+) -> bool:
+    if volume is None and data.latest_vol_reconstructions:
+        volume = data.latest_vol_reconstructions[0]
+
+    if volume is None:
+        return False
+
+    if isinstance(volume, RawVolume):
+        _warn_raw_volume_not_supported(volume=volume)
+        return False
+
+    return True
+
+
+def _warn_raw_volume_not_supported(volume: _TomwerVolumeBase):
+    global _raw_volume_warning_dialog
+    if _raw_volume_warning_dialog is None:
+        _raw_volume_warning_dialog = qt.QMessageBox()
+        _raw_volume_warning_dialog.setWindowTitle("Unsupported volume format")
+        _raw_volume_warning_dialog.setText(
+            "RawVolume format is not supported for cast volume reconstruction.\n"
+            "Please select a different output volume format and reprocess.\n\n"
+            f"As a consequence '{volume.get_identifier()}' will not be cast."
+        )
+        _raw_volume_warning_dialog.setModal(False)
+        _raw_volume_warning_dialog.setIcon(qt.QMessageBox.Warning)
+    _raw_volume_warning_dialog.show()

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/reconstruction/nabu/nabuconfig/phase.py

@@ -14,8 +14,8 @@ from tomwer.gui.reconstruction.nabu.nabuconfig import base
 from tomwer.gui.reconstruction.nabu.nabuconfig.ctf import CTFConfig
 from tomwer.gui.utils.inputwidget import SelectionLineEdit
 from tomwer.gui.utils.scrollarea import QComboBoxIgnoreWheel as QComboBox
-from tomwer.gui import icons
 from tomwer.gui.utils.locale import string_to_float
+from tomwer.gui.utils._warning import WarningLabel as _WarningLabel
 
 from silx.utils.proxy import docstring
 from .paddingmode import PaddingMode
@@ -266,7 +266,6 @@ class NabuUnsharpConfig(qt.QWidget, base._NabuStageConfigBase):
         self.__discourageUnSharpMask = False
         self.setLayout(qt.QGridLayout())
 
-        warning_icon = icons.getQIcon("warning")
         warning_unsharp_no_phase = "Warning: applying unsharp mask without phase retrieval can lead to 'noisy' reconstruction"
 
         # unsharp coeff
@@ -286,9 +285,8 @@ class NabuUnsharpConfig(qt.QWidget, base._NabuStageConfigBase):
         self.registerWidget(self._unsharpCoeffCB, "optional")
         self._unsharpCoeffOpt = self.registerWidget(self._unsharpCoeffQLE, "optional")
         # unsharp coeff warning
-        self._unSharpCoeffWarning = qt.QLabel("")
+        self._unSharpCoeffWarning = _WarningLabel("")
         self._unSharpCoeffWarning.setToolTip(warning_unsharp_no_phase)
-        self._unSharpCoeffWarning.setPixmap(warning_icon.pixmap(20, state=qt.QIcon.On))
         self.layout().addWidget(self._unSharpCoeffWarning, 0, 2, 1, 1)
         self.registerWidget(self._unSharpCoeffWarning, "optional")
 
@@ -309,7 +307,6 @@ class NabuUnsharpConfig(qt.QWidget, base._NabuStageConfigBase):
         # unsharp coeff warning
         self._unSharpSigmaWarning = qt.QLabel("")
         self._unSharpSigmaWarning.setToolTip(warning_unsharp_no_phase)
-        self._unSharpSigmaWarning.setPixmap(warning_icon.pixmap(20, state=qt.QIcon.On))
         self.layout().addWidget(self._unSharpSigmaWarning, 1, 2, 1, 1)
         self.registerWidget(self._unSharpSigmaWarning, "optional")
 

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/reconstruction/nabu/nabuconfig/reconstruction.py

@@ -14,7 +14,6 @@ from tomwer.core.reconstruction.common.filter import NabuFBPFilterType
 from tomwer.core.reconstruction.common.padding import NabuPaddingType
 from tomwer.core.reconstruction.common.method import NabuReconstructionMethods
 from tomwer.core.reconstruction.common.stages import NabuStages
-from tomwer.gui import icons
 from tomwer.gui.reconstruction.nabu.nabuconfig.base import _NabuStageConfigBase
 from tomwer.gui.utils.scrollarea import (
     QComboBoxIgnoreWheel,
@@ -23,6 +22,7 @@ from tomwer.gui.utils.scrollarea import (
 )
 from tomwer.gui.utils.RangeWidget import RangeWidget
 from tomwer.gui.utils.locale import string_to_float
+from tomwer.gui.utils._warning import WarningLabel as _WarningLabel
 from silx.utils.proxy import docstring
 
 
@@ -975,8 +975,7 @@ class _CenteredAxis(qt.QWidget):
         self._warningWidget.setLayout(qt.QHBoxLayout())
         self.layout().addWidget(self._warningWidget)
 
-        warningIcon = icons.getQIcon("warning")
-        self._centeredAxisWarningIcon = qt.QLabel()
+        self._centeredAxisWarningIcon = _WarningLabel("")
         self._centeredAxisWarningLabel = qt.QLabel(
             "Defining a ROI and asking for centered axis are opposing constraints.\nAs FBP_roi(sino) = (FBP_all(sino))[roi] is applied and only works if centered_axis is False.",
             parent=self,
@@ -987,8 +986,6 @@ class _CenteredAxis(qt.QWidget):
         self._centeredAxisWarningIcon.setAlignment(
             qt.Qt.AlignRight | qt.Qt.AlignVCenter
         )
-        self._centeredAxisWarningIcon.setFont(font)
-        self._centeredAxisWarningIcon.setPixmap(warningIcon.pixmap(20, 20))
         self._warningWidget.layout().addWidget(self._centeredAxisWarningIcon)
         self._warningWidget.layout().addWidget(self._centeredAxisWarningLabel)
 

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/reconstruction/nabu/nabuflow.py

@@ -4,11 +4,11 @@ from __future__ import annotations
 
 import functools
 from typing import Iterable
+import qtawesome
 
 from silx.gui import qt
 
 from tomwer.core.reconstruction.common.stages import NabuStages
-from tomwer.gui import icons
 from silx.utils.proxy import docstring
 
 from ...utils.flow import FlowCanvas, FlowDirection
@@ -405,8 +405,8 @@ class _AddRemoveProcessWidget(qt.QWidget):
         else:
             self.setLayout(qt.QHBoxLayout())
             spacer_size_policy = (qt.QSizePolicy.Expanding, qt.QSizePolicy.Minimum)
-        add_icon = icons.getQIcon("add")
-        rm_icon = icons.getQIcon("rm")
+        add_icon = qtawesome.icon("ri.add-circle-fill")
+        rm_icon = qtawesome.icon("ph.minus-circle-fill")
 
         self._addButton = qt.QPushButton(add_icon, "", self)
         self._addButton.setToolTip("add process")

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/reconstruction/nabu/slices/SliceGroupBox.py

@@ -1,11 +1,10 @@
 from __future__ import annotations
 
-
 from silx.gui import qt
 
 from tomwer.gui.utils.scrollarea import QComboBoxIgnoreWheel
 from tomwer.core.reconstruction.slice.NabuSliceMode import NabuSliceMode
-from tomwer.gui import icons
+from tomwer.gui.utils._warning import WarningLabel as _WarningLabel
 from tomwer.gui.utils.inputwidget import SelectionLineEdit
 
 
@@ -31,9 +30,7 @@ class SliceGroupBox(qt.QGroupBox):
         self.layout().addWidget(self._sliceQLE)
 
         # warning icon
-        warningIcon = icons.getQIcon("warning")
-        self._noSliceWarning = qt.QLabel("")
-        self._noSliceWarning.setPixmap(warningIcon.pixmap(20, state=qt.QIcon.On))
+        self._noSliceWarning = _WarningLabel("")
         self._noSliceWarning.setToolTip(
             "no slice defined, No slice reconstruction will be done"
         )

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/stitching/action.py

@@ -1,3 +1,4 @@
+import qtawesome
 from silx.gui import qt
 from silx.gui import icons as silx_icons
 from tomwer.gui import icons as tomwer_icons
@@ -37,7 +38,7 @@ class AddTomoObjectAction(qt.QAction):
         self.setToolTip(
             "Add a NXtomo or a (nabu) reconstructed volume to the stitching"
         )
-        add_icon = tomwer_icons.getQIcon("add")
+        add_icon = qtawesome.icon("ri.add-circle-fill")
         self.setIcon(add_icon)
 
 

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/stitching/config/_linkInfo.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from silx.gui import qt
-from tomwer.gui import icons
+import qtawesome
 
 
 class LinkInfoFrame(qt.QLabel):
@@ -9,8 +9,8 @@ class LinkInfoFrame(qt.QLabel):
     def __init__(self, parent=None):
         super().__init__(parent)
 
-        self._lockedIcon = icons.getQIcon("link")
-        self._unlockedIcon = icons.getQIcon("link-slash")
+        self._lockedIcon = qtawesome.icon("mdi.link-variant")
+        self._unlockedIcon = qtawesome.icon("mdi.link-variant-off")
         self._pixmapSize = qt.QSize(24, 24)
 
         lockIcon = qt.QLabel()

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/stitching/stitching_preview.py

@@ -4,6 +4,7 @@ import logging
 
 import numpy
 import pint
+import qtawesome
 from importlib.metadata import version
 
 from nabu.stitching.frame_composition import FrameComposition
@@ -15,7 +16,6 @@ from tomoscan.scanbase import TomoScanBase
 
 from tomwer.core.scan.scanfactory import ScanFactory
 from tomwer.core.volume.volumefactory import VolumeFactory
-from tomwer.gui import icons as tomwer_icons
 from tomwer.gui import settings
 from tomwer.gui.stitching.stitchandbackground import StitchAndBackgroundAlphaMixIn
 
@@ -98,7 +98,7 @@ class PreviewStitchingPlot(Plot2D, StitchAndBackgroundAlphaMixIn):
         self.setAxesDisplayed(False)
 
         # add an action to plot the url-image 'full size'
-        fullScreenIcon = tomwer_icons.getQIcon("full_screen")
+        fullScreenIcon = qtawesome.icon("ri.fullscreen-fill")
         self._fullScreenAction = qt.QAction(fullScreenIcon, "pop up full screen")
         self.toolBar().addAction(self._fullScreenAction)
         self._fullScreenAction.triggered.connect(self._popCurrentImageFullScreen)

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/stitching/stitching_raw.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import logging
 import weakref
 import numpy
+import qtawesome
 from typing import Any
 from contextlib import AbstractContextManager
 
@@ -556,7 +557,7 @@ class AlphaValueSlider(qt.QTableWidget):
         self.layout().setContentsMargins(0, 0, 0, 0)
         self.layout().setSpacing(0)
         # `invisible` button
-        invisibleIcon = tomwer_icons.getQIcon("invisible")
+        invisibleIcon = qtawesome.icon("mdi.eye-off-outline")
         self._invisibleButton = qt.QPushButton(invisibleIcon, "", self)
         self._invisibleButton.setFlat(True)
         self.layout().addWidget(self._invisibleButton)
@@ -567,7 +568,7 @@ class AlphaValueSlider(qt.QTableWidget):
         self.layout().addWidget(self._slider)
 
         # `visible` button
-        visibleIcon = tomwer_icons.getQIcon("visible")
+        visibleIcon = qtawesome.icon("mdi.eye-outline")
         self._visibleButton = qt.QPushButton(visibleIcon, "", self)
         self._visibleButton.setFlat(True)
         self.layout().addWidget(self._visibleButton)

tomwer-2.0.0.dev8/src/tomwer/gui/utils/_warning.py

@@ -0,0 +1,10 @@
+import qtawesome
+from silx.gui import qt
+
+
+class WarningLabel(qt.QLabel):
+
+    def __init__(self, text, parent=None):
+        super().__init__(text, parent)
+        warning_icon = qtawesome.icon("ph.warning-light", color="red")
+        self.setPixmap(warning_icon.pixmap(20, state=qt.QIcon.On))

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/utils/buttons.py

@@ -13,8 +13,6 @@ from silx.gui.plot.tools.roi import RegionOfInterestManager
 from silx.gui.plot.items.roi import LineROI
 from silx.gui.plot.PlotToolButtons import PlotToolButton
 
-from tomwer.gui import icons
-
 _logger = logging.getLogger(__file__)
 
 _ureg = pint.get_application_registry()
@@ -32,6 +30,15 @@ class PadlockButton(qt.QPushButton):
         self._unlockIcon = qtawesome.icon("fa6s.lock-open")
         self.setIcon(self._unlockIcon)
         self.setCheckable(True)
+        self.setStyleSheet(
+            "QPushButton {"
+            "    border: 2px solid transparent;"
+            "    border-radius: 4px;"
+            "}"
+            "QPushButton:checked {"
+            "    border: 2px solid #FF0000;"
+            "}"
+        )
 
         # connect signals
         self.toggled.connect(self._updateDisplay)
@@ -98,7 +105,7 @@ class TapeMeasureToolButton(PlotToolButton):
                 "'pixel_size' should be None or an instance of pint.Quantity."
             )
         self._pixel_size: pint.Quantity | None = pixel_size
-        self.setIcon(icons.getQIcon("ruler"))
+        self.setIcon(qtawesome.icon("fa5s.ruler"))
         self.setToolTip("measure distance between two pixels")
         self.toggled.connect(self._callback)
         self._connectPlot(plot)

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/visualization/fullscreenplot.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import weakref
 from importlib.metadata import version
+import qtawesome
 
 from silx.gui import qt
 from silx.gui.plot import Plot2D
@@ -57,7 +58,7 @@ class FullScreenPlot2D(Plot2D):
         self.exit_toolbar.addWidget(spacer)
         self.addToolBar(self.exit_toolbar)
         # add exit button wen displayed full screen
-        exit_icon = icons.getQIcon("exit")
+        exit_icon = qtawesome.icon("mdi.exit-to-app")
         self._quitAction = qt.QAction(exit_icon, "exit", self)
         self.exit_toolbar.addAction(self._quitAction)
 

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/visualization/imagestack.py

@@ -4,6 +4,7 @@ import os
 import time
 import logging
 from importlib.metadata import version
+import qtawesome
 
 import numpy
 import numpy.lib.npyio
@@ -14,7 +15,6 @@ from silx.gui.plot.ImageStack import ImageStack as _ImageStack
 from silx.gui.plot.ImageStack import UrlLoader
 from silx.io.url import DataUrl
 from tomwer.core.utils.ftseriesutils import get_vol_file_shape
-from tomwer.gui import icons
 from tomwer.gui.visualization.fullscreenplot import FullScreenPlot2D
 from tomwer.gui.visualization.reconstructionparameters import ReconstructionParameters
 from tomwer.gui.visualization.scanoverview import ScanOverviewWidget
@@ -103,7 +103,7 @@ class ImageStack(_ImageStack):
         # add search
         self._searchWidget = qt.QLineEdit(parent=self)
         self._searchWidget.setPlaceholderText("search")
-        search_icon = icons.getQIcon("search")
+        search_icon = qtawesome.icon("fa5s.search")
         self._searchWidget.addAction(search_icon, qt.QLineEdit.LeadingPosition)
         # reorder urlsTable (include search QLineEdit)
         container = qt.QWidget()
@@ -119,7 +119,7 @@ class ImageStack(_ImageStack):
         self._urlsTable._toggleButton.hide()
 
         # add an action to plot the url-image 'full size'
-        fullScreenIcon = icons.getQIcon("full_screen")
+        fullScreenIcon = qtawesome.icon("ri.fullscreen-fill")
         self._fullScreenAction = qt.QAction(fullScreenIcon, "pop up full screen")
         self.getPlotWidget().toolBar().addAction(self._fullScreenAction)
         self._fullScreenAction.triggered.connect(self._popCurrentImageFullScreen)

{tomwer-2.0.0.dev7 → tomwer-2.0.0.dev8}/src/tomwer/gui/visualization/volume_viewer/VolumeViewerWidget.py

@@ -112,6 +112,13 @@ class VolumeViewerWidget(qt.QWidget):
         For HDF5 and VolumeSingleFrame it will allow users to browse the dataset before the full volume or slices subset are loaded.
         Else we notify the user that some loading is on-going.
         """
+        # Clear old volume references from all plots first to cancel any in-flight
+        # SliceLoader threads that may still reference a previously set (possibly
+        # deleted) volume.
+        self._XYPlot2D.setVolume(None)
+        self._XZPlot2D.setVolume(None)
+        self._YZPlot2D.setVolume(None)
+        # Start initialization
         self._geometryOrMetadataWidget.setVolumeIdentifier(volume.get_identifier())
         if isinstance(volume, (HDF5Volume, VolumeSingleFrameBase)):
             # Z is the fast read axis for most file format. So we allow users to access it directly.