tomwer 1.4.11__py3-none-any.whl → 1.4.12__py3-none-any.whl

tomwer/gui/reconstruction/saaxis/saaxis.py

@@ -16,7 +16,6 @@ from tomwer.core.process.reconstruction.saaxis.params import SAAxisParams
 from tomwer.core.process.reconstruction.saaxis.saaxis import SAAxisTask
 from tomwer.gui import icons
 from tomwer.gui.reconstruction.axis.CalculationWidget import CalculationWidget
-from tomwer.gui.reconstruction.nabu.slices import NabuWidget
 from tomwer.gui.reconstruction.nabu.platform import NabuPlatformSettings
 from tomwer.gui.reconstruction.saaxis.corrangeselector import SliceAndCorWidget
 from tomwer.gui.reconstruction.scores.control import ControlWidget
@@ -25,6 +24,8 @@ from tomwer.gui.reconstruction.scores.scoreplot import ScorePlot as _ScorePlot
 from tomwer.gui.utils.buttons import TabBrowsersButtons
 from tomwer.gui.utils.scandescription import ScanNameLabelAndShape
 from tomwer.gui.settings import TAB_LABEL_PLATFORM_SETTINGS
+from tomwer.gui.reconstruction.sacommon import NabuWidgetWithToolbar as NabuWidget
+
 from tomwer.synctools.axis import QAxisRP
 
 _logger = logging.getLogger(__file__)
@@ -128,6 +129,7 @@ class _SAAxisTabWidget(qt.QTabWidget):
         self._nabuSettings.hideSlicesInterface()
         nabu_icon = icons.getQIcon("nabu")
         self.addTab(self._nabuSettings, nabu_icon, "reconstruction settings")
+
         # platform settings
         self._localPlatformSettings = NabuPlatformSettings(self)
         settings_icons = icons.getQIcon("parameters")

tomwer/gui/reconstruction/sacommon.py

@@ -0,0 +1,151 @@
+from __future__ import annotations
+
+import os
+from nabu.pipeline.config import parse_nabu_config_file
+from tomwer.gui.configuration.action import (
+    BasicConfigurationAction,
+    ExpertConfigurationAction,
+    MinimalisticConfigurationAction,
+)
+from silx.gui import qt
+from nabu.pipeline.config import get_default_nabu_config
+from nabu.pipeline.fullfield.nabu_config import (
+    nabu_config as nabu_fullfield_default_config,
+)
+from tomwer.gui.reconstruction.nabu.slices import NabuWidget
+from tomwer.gui.configuration.level import ConfigurationLevel
+
+
+class NabuWidgetWithToolbar(qt.QMainWindow):
+    sigConfigChanged = qt.Signal()
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.setWindowFlags(qt.Qt.Widget)
+
+        self._nabuSettings = NabuWidget(parent=self)
+        self.setCentralWidget(self._nabuSettings)
+
+        self._createNabuSettingsToolbar()
+        # connect signal / slot
+        self._nabuSettings.sigConfigChanged.connect(self.sigConfigChanged)
+
+    def _createNabuSettingsToolbar(self):
+        style = qt.QApplication.style()
+
+        # add toolbar
+        toolbar = qt.QToolBar(self)
+        toolbar.setMovable(False)
+        toolbar.setFloatable(False)
+        self.addToolBar(qt.Qt.TopToolBarArea, toolbar)
+
+        # add configuration mode
+        self.__configurationModesAction = qt.QAction(self)
+        self.__configurationModesAction.setCheckable(False)
+        menu = qt.QMenu(self)
+        self.__configurationModesAction.setMenu(menu)
+        toolbar.addAction(self.__configurationModesAction)
+
+        self.__configurationModesGroup = qt.QActionGroup(self)
+        self.__configurationModesGroup.setExclusive(True)
+        self.__configurationModesGroup.triggered.connect(self._userModeChanged)
+
+        self._minimalisticAction = MinimalisticConfigurationAction(toolbar)
+        menu.addAction(self._minimalisticAction)
+        self.__configurationModesGroup.addAction(self._minimalisticAction)
+        self._basicConfigAction = BasicConfigurationAction(toolbar)
+        menu.addAction(self._basicConfigAction)
+        self.__configurationModesGroup.addAction(self._basicConfigAction)
+        self._expertConfiguration = ExpertConfigurationAction(toolbar)
+        menu.addAction(self._expertConfiguration)
+        self.__configurationModesGroup.addAction(self._expertConfiguration)
+
+        # reset configuration option
+        self.__resetAction = qt.QAction(self)
+        self.__resetAction.setToolTip("reset nabu configuration")
+        reset_icon = style.standardIcon(qt.QStyle.SP_DialogResetButton)
+        self.__resetAction.setIcon(reset_icon)
+        toolbar.addAction(self.__resetAction)
+        self.__resetAction.triggered.connect(self._resetParameters)
+
+        # toolbar spacer
+        self.__tSpacer = qt.QWidget(toolbar)
+        self.__tSpacer.setSizePolicy(qt.QSizePolicy.Expanding, qt.QSizePolicy.Preferred)
+        toolbar.addWidget(self.__tSpacer)
+
+        # connect signal / slot
+        self._nabuSettings.sigConfigChanged.connect(self.sigConfigChanged)
+
+        # set up
+        self._resetParameters()
+        self._basicConfigAction.setChecked(True)
+        self._userModeChanged()
+
+    def _resetParameters(self):
+        # reset nabu settings
+        default_config = get_default_nabu_config(nabu_fullfield_default_config)
+        self._nabuSettings._configuration._preProcessingWidget._sinoRingsOpts.resetConfiguration()
+        default_config["tomwer_slices"] = "middle"
+        default_config["preproc"]["ccd_filter_enabled"] = False
+        default_config["preproc"]["double_flatfield_enabled"] = False
+        default_config["preproc"]["flatfield"] = True
+        default_config["preproc"]["take_logarithm"] = True
+        self._nabuSettings.setConfiguration(default_config)
+
+    def _userModeChanged(self, *args, **kwargs):
+        selectedAction = self.__configurationModesGroup.checkedAction()
+        self.__configurationModesAction.setIcon(selectedAction.icon())
+        self.__configurationModesAction.setToolTip(selectedAction.tooltip())
+        self._nabuSettings.setConfigurationLevel(self.getConfigurationLevel())
+        self.sigConfigChanged.emit()
+
+    def _loadParameters(self):
+        inputFile = self.askForNabuconfigFile(acceptMode=qt.QFileDialog.AcceptOpen)
+
+        if inputFile and os.path.exists(inputFile):
+            config = parse_nabu_config_file(inputFile)
+            self._nabuSettings.setConfiguration(config)
+
+    def setConfigurationLevel(self, level):
+        level = ConfigurationLevel.from_value(level)
+        if level == ConfigurationLevel.REQUIRED:
+            self._minimalisticAction.setChecked(True)
+        elif level == ConfigurationLevel.ADVANCED:
+            self._expertConfiguration.setChecked(True)
+        elif level == ConfigurationLevel.OPTIONAL:
+            self._basicConfigAction.setChecked(True)
+        else:
+            raise ValueError("Level not recognize")
+        self._userModeChanged()
+
+    def getConfigurationLevel(self):
+        if self._basicConfigAction.isChecked():
+            return ConfigurationLevel.OPTIONAL
+        elif self._expertConfiguration.isChecked():
+            return ConfigurationLevel.ADVANCED
+        elif self._minimalisticAction.isChecked():
+            return ConfigurationLevel.REQUIRED
+        else:
+            raise ValueError("Level not recognize")
+
+    # expose API
+    def hideSlicesInterface(self):
+        return self._nabuSettings.hideSlicesInterface()
+
+    def hidePaganinInterface(self):
+        return self._nabuSettings.hidePaganinInterface()
+
+    def setConfiguration(self, *args, **kwargs):
+        self._nabuSettings.setConfiguration(*args, **kwargs)
+
+    def getConfiguration(self):
+        return self._nabuSettings.getConfiguration()
+
+    def getMode(self):
+        return self._nabuSettings.getMode()
+
+    def setMode(self, *args, **kwargs):
+        self._nabuSettings.setMode(*args, **kwargs)
+
+    def setScan(self, scan):
+        self._nabuSettings.setScan(scan=scan)

tomwer/gui/reconstruction/sadeltabeta/saadeltabeta.py

@@ -25,7 +25,6 @@ from tomwer.core.process.reconstruction.scores.params import ScoreMethod
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.gui import icons
 from tomwer.gui.reconstruction.nabu.nabuconfig.phase import _NabuPhaseConfig
-from tomwer.gui.reconstruction.nabu.slices import NabuWidget
 from tomwer.gui.reconstruction.nabu.platform import NabuPlatformSettings
 from tomwer.gui.reconstruction.saaxis.sliceselector import SliceSelector
 from tomwer.gui.reconstruction.scores.control import ControlWidget
@@ -35,6 +34,7 @@ from tomwer.gui.utils.buttons import TabBrowsersButtons
 from tomwer.gui.utils.scandescription import ScanNameLabelAndShape
 from tomwer.gui.settings import TAB_LABEL_PLATFORM_SETTINGS
 from tomwer.synctools.sadeltabeta import QSADeltaBetaParams
+from tomwer.gui.reconstruction.sacommon import NabuWidgetWithToolbar as NabuWidget
 
 _logger = logging.getLogger(__name__)
 

tomwer/version.py

@@ -77,7 +77,7 @@ RELEASE_LEVEL_VALUE = {
 
 MAJOR = 1
 MINOR = 4
-MICRO = 11
+MICRO = 12
 RELEV = "final"  # <16
 SERIAL = 0  # <16
 

{tomwer-1.4.11.dist-info → tomwer-1.4.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tomwer
-Version: 1.4.11
+Version: 1.4.12
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: Henri Payno, Pierre Paleo, Pierre-Olivier Autran, Jérôme Lesaint, Alessandro Mirone

{tomwer-1.4.11.dist-info → tomwer-1.4.12.dist-info}/RECORD

@@ -219,7 +219,7 @@ orangecontrib/tomwer/widgets/visualization/tests/__init__.py,sha256=47DEQpj8HBSa
 tomwer/__init__.py,sha256=cMIyH-uRxpa9WVnAuWjiBD7k9TK57WO21RzP_S-Mb8I,460
 tomwer/__main__.py,sha256=7tCADiS4u7k1PCxFhlRAcYSIOpxQTGUTx8sCEQ-hi1E,8707
 tomwer/utils.py,sha256=7h7dEgKAEUmQ43jkULvC1B9Adl55nkCty-SEKUKCl4U,7008
-tomwer/version.py,sha256=n3CqDxj5kf_QPmQ3-LqwLdY1J9aJiQgW9_dN0vfGnJg,4387
+tomwer/version.py,sha256=xsTKVPFvtqACqhXHiD0tTzx8xp1ha3Ub1lds0X_Y-o0,4387
 tomwer/app/__init__.py,sha256=h1FKED7Tw5f99yikygt7ruXsdrxQhcJxO7kagLGxhJg,84
 tomwer/app/axis.py,sha256=lB-IZx1o6KTWLIelITvYCIu2flFTB9NhuIfD2MhUZZA,5826
 tomwer/app/canvas.py,sha256=y8rYOiwmv6ug7JcjgkOzEiGQnNXjKWNNmKofT0n8TFg,1538
@@ -539,6 +539,7 @@ tomwer/gui/edit/tests/test_dkrf_patch.py,sha256=L0fO2nqqK74EOIZTPQKjO03qsAiXbqjj
 tomwer/gui/edit/tests/test_image_key_editor.py,sha256=6sIGM_DjU_KjspnVKB2UDhWh_BLDhYP8rS6U1fAZXkk,4647
 tomwer/gui/edit/tests/test_nx_editor.py,sha256=iEm8th1ahclnLhNHVHtdvQQvazX2znteYTJUGeEfXpw,13865
 tomwer/gui/reconstruction/__init__.py,sha256=Ozf9bYay5hVhe1clExeM_MLhcAuu624i5BP1xonWlB0,95
+tomwer/gui/reconstruction/sacommon.py,sha256=X_xaEiaUDsoebYuIvEPWDM3bWJjd29cdya6s9QAuRsI,6001
 tomwer/gui/reconstruction/axis/AxisMainWindow.py,sha256=7w2LhdQ1pa8vU9U-XTA3ohGQfYKk5ETZ79s_xl4Zxx8,9641
 tomwer/gui/reconstruction/axis/AxisOptionsWidget.py,sha256=M47xflZ68KkTDg8tksFt8n7ZFVIr8tJxstlPyG4Odq0,12168
 tomwer/gui/reconstruction/axis/AxisSettingsWidget.py,sha256=7GpHteE2j9RUo-jUQoJdXJ-GnIi9VnY13Lveq3mvd1M,28120
@@ -582,10 +583,10 @@ tomwer/gui/reconstruction/normalization/test/test_intensity.py,sha256=CP9GxvaR7Q
 tomwer/gui/reconstruction/saaxis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/gui/reconstruction/saaxis/corrangeselector.py,sha256=v-3JDRNrvhuq1t_qrOqSj1KkFsvld3Z831IDQeCE888,31797
 tomwer/gui/reconstruction/saaxis/dimensionwidget.py,sha256=JXokxJxUlMVug5UxZVoXgP8J902V-ahkoDvrq2q_X4Q,7905
-tomwer/gui/reconstruction/saaxis/saaxis.py,sha256=dIZ2MTj4CqhipqjR8663DK7Ft70r0U0xSnLC4OPrCkc,20098
+tomwer/gui/reconstruction/saaxis/saaxis.py,sha256=oKHoJ7Z8xZS4BIQ8A6Cn5SijPNH7C7S56Z0zPSEZ2Fo,20122
 tomwer/gui/reconstruction/saaxis/sliceselector.py,sha256=NMKCVc2x2cMrPxm801M3hl2qCXtxuvIWTjxyUx1mRxE,10883
 tomwer/gui/reconstruction/sadeltabeta/__init__.py,sha256=74VkZ1KfTqXmfQReLkjJenvuEZFkhHDqK6BZJHhOeS4,57
-tomwer/gui/reconstruction/sadeltabeta/saadeltabeta.py,sha256=xSdfITKB8gtOMwhQ5Rpeg-bre9vqt-arRdWt9jsrxbM,19448
+tomwer/gui/reconstruction/sadeltabeta/saadeltabeta.py,sha256=r2zDJPnRyiJ8ZX-iO0WbXcsNSlzH3xLp-5S4L3noCRc,19470
 tomwer/gui/reconstruction/scores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/gui/reconstruction/scores/control.py,sha256=SVWMruB--sa_LSM1oZhjoFM5ci1oQTe9XqXOyI8iR0U,1496
 tomwer/gui/reconstruction/scores/scoreplot.py,sha256=TCVG29UDq3w-5oo5QMXJ9IIx2-vMGVCLVJJpE7HAvS8,30917
@@ -903,9 +904,9 @@ tomwer/tests/orangecontrib/tomwer/widgets/visualization/tests/test_volume_viewer
 tomwer/tests/test_ewoks/test_conversion.py,sha256=a8cEWbErXiFCAkaapi0jeEoRKYxcFQCoa-Jr_u77_OM,3656
 tomwer/tests/test_ewoks/test_single_node_execution.py,sha256=YBUHfiAnkciv_kjj7biC5fOs7c7ofNImM_azGMn4LZM,2813
 tomwer/tests/test_ewoks/test_workflows.py,sha256=Eq80eexf5NVL7SzvwctLOaUeuQ8V3vDiFiHgbJA4Yb8,4871
-tomwer-1.4.11.dist-info/LICENSE,sha256=62p1wL0n9WMTu8x2YDv0odYgTqeSvTd9mQ0v6Mq7lzE,1876
-tomwer-1.4.11.dist-info/METADATA,sha256=M84LcLUCPsi1bQDUkRE6EOZww_25wETf53Gff3lwUhI,13416
-tomwer-1.4.11.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-tomwer-1.4.11.dist-info/entry_points.txt,sha256=py3ZUWvGnWGc5c7Yhw_uBTm8Fmew0BDw3aQZnWMBNZI,500
-tomwer-1.4.11.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
-tomwer-1.4.11.dist-info/RECORD,,
+tomwer-1.4.12.dist-info/LICENSE,sha256=62p1wL0n9WMTu8x2YDv0odYgTqeSvTd9mQ0v6Mq7lzE,1876
+tomwer-1.4.12.dist-info/METADATA,sha256=FzYqqbXucsYFj1tqTy66078IJkTfI4VzkEeIpBth6J0,13416
+tomwer-1.4.12.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+tomwer-1.4.12.dist-info/entry_points.txt,sha256=py3ZUWvGnWGc5c7Yhw_uBTm8Fmew0BDw3aQZnWMBNZI,500
+tomwer-1.4.12.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
+tomwer-1.4.12.dist-info/RECORD,,