tomwer 1.5.0rc0__tar.gz → 1.5.0rc3__tar.gz

{tomwer-1.5.0rc0/src/tomwer.egg-info → tomwer-1.5.0rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tomwer
-Version: 1.5.0rc0
+Version: 1.5.0rc3
 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.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/app/axis.py

@@ -104,7 +104,7 @@ def main(argv):
     parser.add_argument(
         "--mode",
         default=None,
-        help=f"Use a specific mode. Available modes are {AxisMode.values()}",
+        help=f"Use a specific mode. Available modes are {[item.value for item in AxisMode]}",
     )
     parser.add_argument(
         "--full-image",

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/control/datalistener/rpcserver.py

@@ -1,6 +1,7 @@
 # coding: utf-8
 from __future__ import annotations
 
+from enum import Enum as _Enum
 import getpass
 import logging
 import socket
@@ -10,7 +11,6 @@ from multiprocessing import Process
 
 from jsonrpc import JSONRPCResponseManager, dispatcher
 from psutil import process_iter
-from silx.utils.enum import Enum as _Enum
 from werkzeug.serving import run_simple
 from werkzeug.wrappers import Request, Response
 
@@ -26,12 +26,6 @@ class TangoAcquisitionStatus(_Enum):
     ENDED = "ended"
 
 
-class _TangoState:
-    MOVING = "moving"
-    ON = "on"
-    FAULT = "fault"
-
-
 class BlissAcquisition:
     """Define an acquisition made with bliss / tango"""
 
@@ -59,7 +53,7 @@ class BlissAcquisition:
         self.scan_numbers.append(scan_number)
 
     def set_status(self, status):
-        self.status = TangoAcquisitionStatus.from_value(status)
+        self.status = TangoAcquisitionStatus(status)
 
     def end(self, end_time, succeed: bool, error: str | None):
         if succeed is True:

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/drac/binning.py

@@ -1,5 +1,5 @@
 import numpy
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 
 
 class Binning(_Enum):
@@ -18,7 +18,7 @@ class Binning(_Enum):
             raise TypeError("data should be a numpy array")
         if not data.ndim == 2:
             raise ValueError("data is expected to be 2d")
-        binning = Binning.from_value(binning)
+        binning = Binning(binning)
         if binning is Binning.ONE_BY_ONE:
             return data
         elif binning is Binning.TWO_BY_TWO:

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/drac/output.py

@@ -1,4 +1,4 @@
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 
 
 PROPOSAL_GALLERY_DIR_NAME = "GALLERY"

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/reconstruction/axis/mode.py

@@ -1,6 +1,6 @@
 import logging
 
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 from tomwer.core.process.reconstruction.axis.side import Side
 
 _logger = logging.getLogger(__name__)
@@ -120,7 +120,7 @@ class AxisMode(_Enum):
         elif value in ("read", "read from estimated cor"):
             value = AxisMode.read
 
-        return super().from_value(value=value)
+        return AxisMode(value)
 
     def requires_radio_indices(self) -> bool:
         return self in (

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/reconstruction/axis/params.py

@@ -5,7 +5,7 @@ from collections import namedtuple
 
 import numpy
 from silx.io.url import DataUrl
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 from tomoscan.esrf.scan.utils import get_data
 
 from tomwer.core.process.reconstruction.utils.cor import relative_pos_to_absolute
@@ -60,8 +60,8 @@ class AxisCalculationInput(_Enum):
         if type(value) is str and len(value.split("_")) == 2:
             proj_type, pag = value.split("_")
             value_pag = True if pag == _WITH_PAG else False
-            value_proj = ProjectionType.from_value(proj_type)
-            return cls.from_value(_calculation_conf(value_proj, value_pag))
+            value_proj = ProjectionType(proj_type)
+            return cls(_calculation_conf(value_proj, value_pag))
         elif isinstance(value, cls):
             return value
         else:
@@ -348,7 +348,7 @@ class AxisRP:
     @estimated_cor.setter
     def estimated_cor(self, value: Side | float | None):
         try:
-            value = Side.from_value(value)
+            value = Side(value)
         except ValueError:
             pass
         if self.__estimated_cor != value:

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/reconstruction/axis/projectiontype.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 
 
 class ProjectionType(_Enum):

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/reconstruction/axis/side.py

@@ -1,4 +1,4 @@
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 
 
 class Side(_Enum):

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/reconstruction/darkref/params.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 
 import enum
 
-from silx.utils.enum import Enum as _Enum
 from tomoscan.framereducer.method import ReduceMethod
 
 from tomwer.core.process.reconstruction.darkref.settings import (
@@ -17,7 +16,7 @@ from tomwer.core.utils.deprecation import deprecated
 # TODO: those classes (when, method) should be linked / embedded in the DarkRef
 # method
 @enum.unique
-class When(_Enum):
+class When(enum.Enum):
     never = (0,)
     before = (1,)
     after = (2,)

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/reconstruction/nabu/nabucommon.py

@@ -205,7 +205,7 @@ class _NabuBaseReconstructor:
         axis: NabuPlane = NabuPlane.XY,
     ) -> None:
         self._scan = scan
-        self._target = Target.from_value(target)
+        self._target = Target(target)
         self._dry_run = dry_run
         self._process_name = process_name
         self._process = None
@@ -564,7 +564,7 @@ class _NabuBaseReconstructor:
         )
 
         source = extra_infos.get("source", INormSource.NONE)
-        source = INormSource.from_value(source)
+        source = INormSource(source)
 
         if source is INormSource.NONE:
             pass

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/reconstruction/nabu/target.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 
 
 class Target(_Enum):

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/reconstruction/nabu/test/test_nabu_utils.py

@@ -275,3 +275,12 @@ def test_nabu_std_err_has_error():
         )
         is False
     )
+
+    assert (
+        nabu_std_err_has_error(
+            b"""Performing MLEM-WL2 iterations: 0%|     | 0/200[00:00<?, ?its/s]
+            Performing MLEM-WL2 iterations: 82%|     | 163/200[00:00<?, 828.12its/s]
+            """
+        )
+        is False
+    )

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/reconstruction/nabu/utils.py

@@ -409,6 +409,9 @@ def nabu_std_err_has_error(errs: bytes | None):
             or " unable to import 'siphash24.siphash13" in line
             or "_create_built_program_from_source_cached" in line
             or "prg.build(options_bytes," in line
+            or (
+                "Performing MLEM" in line and "iterations" in line
+            )  # corrct usage of tqdm (goes to stderr)
         )
 
     if errs is None:

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/reconstruction/normalization/normalization.py

@@ -140,7 +140,7 @@ class SinoNormalizationTask(
         if calc_fct is None:
             raise ValueError("calc_fct should be provided")
         else:
-            calc_fct = _ValueCalculationFct.from_value(calc_fct)
+            calc_fct = _ValueCalculationFct(calc_fct)
 
         try:
             value = self._cache_compute_from_manual_roi(

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/reconstruction/normalization/params.py

@@ -4,7 +4,7 @@ material for radio and sinogram normalization
 """
 from __future__ import annotations
 
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 from tomoscan.normalization import Method
 
 
@@ -39,7 +39,7 @@ class _DatasetInfos:
 
     @scope.setter
     def scope(self, scope: str | _DatasetScope):
-        self._scope = _DatasetScope.from_value(scope)
+        self._scope = _DatasetScope(scope)
 
     @property
     def file_path(self):
@@ -96,7 +96,7 @@ class SinoNormalizationParams:
     def source(self, source):
         if source is None:
             source = _ValueSource.NONE
-        self._source = _ValueSource.from_value(source)
+        self._source = _ValueSource(source)
 
     @property
     def extra_infos(self):

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/reconstruction/saaxis/params.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 from typing import Iterable
 
 import numpy
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 
 from tomwer.core.process.reconstruction.scores.params import SABaseParams
 
@@ -56,7 +56,7 @@ class SAAxisParams(SABaseParams):
 
     @mode.setter
     def mode(self, mode):
-        mode = ReconstructionMode.from_value(mode)
+        mode = ReconstructionMode(mode)
         self._mode = mode
 
     @property
@@ -91,7 +91,7 @@ class SAAxisParams(SABaseParams):
         if "n_reconstruction" in dict_:
             self.n_reconstruction = dict_["n_reconstruction"]
         if "mode" in dict_:
-            self.mode = ReconstructionMode.from_value(dict_["mode"])
+            self.mode = ReconstructionMode(dict_["mode"])
 
     @staticmethod
     def from_dict(dict_):

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/reconstruction/saaxis/saaxis.py

@@ -430,7 +430,7 @@ class SAAxisTask(
             params.image_width = scan.dim_1
         scan.saaxis_params = params
 
-        mode = ReconstructionMode.from_value(params.mode)
+        mode = ReconstructionMode(params.mode)
         if mode is not ReconstructionMode.VERTICAL:
             raise ValueError(f"{mode} is not handled for now")
 

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/reconstruction/scores/params.py

@@ -102,7 +102,7 @@ class SABaseParams:
 
     @score_method.setter
     def score_method(self, method):
-        self._score_method = ScoreMethod.from_value(method)
+        self._score_method = ScoreMethod(method)
 
     @property
     def scores(self) -> dict | None:
@@ -170,7 +170,7 @@ class SABaseParams:
                 output_dir = None
             self.output_dir = output_dir
         if "score_method" in dict_:
-            self.score_method = ScoreMethod.from_value(dict_["score_method"])
+            self.score_method = ScoreMethod(dict_["score_method"])
         if "cluster_config" in dict_:
             if dict_["cluster_config"] in (None, ""):
                 self.cluster_config = None

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/reconstruction/scores/scores.py

@@ -4,7 +4,7 @@ import logging
 import sys
 
 import numpy
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 
 _logger = logging.getLogger(__name__)
 
@@ -36,7 +36,7 @@ class ComputedScore:
         return self._tomo_consistency
 
     def get(self, method: ScoreMethod):
-        method = ScoreMethod.from_value(method)
+        method = ScoreMethod(method)
         if method is ScoreMethod.TV:
             return self.total_variation / float(10e5)
         elif method is ScoreMethod.TV_INVERSE:
@@ -135,7 +135,7 @@ def compute_score(
     :param method:
     :return: score of the frame
     """
-    method = ScoreMethod.from_value(method)
+    method = ScoreMethod(method)
     if data.ndim == 3:
         if data.shape[0] == 1:
             data = data.reshape(data.shape[1], data.shape[2])

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/process/tests/test_normalization.py

@@ -54,7 +54,8 @@ class TestNormalization(unittest.TestCase):
             "median": numpy.array([800.5, 10800.5]),
         }
 
-        for calc_fct in params._ValueCalculationFct.values():
+        for item in params._ValueCalculationFct:
+            calc_fct = item.value
             with self.subTest(calc_fct=calc_fct):
                 process_params.extra_infos = {
                     "start_x": 0,

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/scan/scanbase.py

@@ -10,7 +10,7 @@ from typing import Iterable
 
 import numpy
 from silx.io.url import DataUrl
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 
 from tomoscan.identifier import VolumeIdentifier
 from tomoscan.normalization import IntensityNormalization

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/scan/scantype.py

@@ -1,4 +1,4 @@
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 
 
 class ScanType(_Enum):

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/core/settings.py

@@ -1,5 +1,5 @@
 import os
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 
 
 __LBSRAM_PATH = "/lbsram"

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/gui/cluster/slurm.py

@@ -94,7 +94,7 @@ class SlurmSettingsWindow(qt.QMainWindow):
 
         self._modeCombox = qt.QComboBox(self)
         self._mainWidget.layout().addRow("configuration: ", self._modeCombox)
-        self._modeCombox.addItems(SlurmSettingsMode.values())
+        self._modeCombox.addItems([item.value for item in SlurmSettingsMode])
         self._modeCombox.setCurrentText(SlurmSettingsMode.GENERIC.value)
 
         self._settingsWidget = SlurmSettingsWidget(self, jobLimitation=None)
@@ -155,10 +155,10 @@ class SlurmSettingsWindow(qt.QMainWindow):
         self._modeCombox.setCurrentText(SlurmSettingsMode.MANUAL.value)
 
     def getCurrentSettingsMode(self) -> SlurmSettingsMode:
-        return SlurmSettingsMode.from_value(self._modeCombox.currentText())
+        return SlurmSettingsMode(self._modeCombox.currentText())
 
     def setCurrentSettingsMode(self, mode: SlurmSettingsMode) -> SlurmSettingsMode:
-        mode = SlurmSettingsMode.from_value(mode)
+        mode = SlurmSettingsMode(mode)
         self._modeCombox.setCurrentText(mode.value)
 
     def setMode(self, mode: SlurmSettingsMode) -> None:

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/gui/configuration/level.py

@@ -1,4 +1,4 @@
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 
 
 class ConfigurationLevel(_Enum):

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/gui/control/actions.py

@@ -86,7 +86,7 @@ class TomoObjDisplayModeToolButton(qt.QToolButton):
         urlDescAction.triggered.connect(partial(self.setDisplayMode, DisplayMode.URL))
 
     def setDisplayMode(self, mode: DisplayMode):
-        mode = DisplayMode.from_value(mode)
+        mode = DisplayMode(mode)
         if mode is DisplayMode.SHORT:
             self.setIcon(self._shortDescIcon)
             self.setToolTip(self._SHORT_DESC_TOOLTIP)

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/gui/control/datalist.py

@@ -616,7 +616,7 @@ class _TomwerObjectList(qt.QTableWidget):
         self.setDisplayMode(DisplayMode.SHORT)
 
     def setDisplayMode(self, mode: DisplayMode) -> None:
-        self._displayMode = DisplayMode.from_value(mode)
+        self._displayMode = DisplayMode(mode)
         self._update()
 
     def n_data(self):

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/gui/control/series/seriescreator.py

@@ -6,7 +6,7 @@ from typing import Iterable
 
 from silx.gui import qt
 from silx.gui.utils import blockSignals
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 from tomoscan.series import Series
 
 from tomwer.core.scan.scanbase import TomwerScanBase
@@ -144,8 +144,8 @@ class SeriesDefinition(qt.QWidget):
         self.layout().addWidget(self._modeLabel, 0, 0, 1, 1)
 
         self._modeCB = qt.QComboBox(self)
-        for mode in _SeriesDefinitionMode.values():
-            self._modeCB.addItem(mode)
+        for mode in _SeriesDefinitionMode:
+            self._modeCB.addItem(mode.value)
         self.layout().addWidget(self._modeCB, 0, 1, 1, 1)
 
         self._manualDefWidget = SeriesManualFromTomoObj(parent=self)
@@ -169,10 +169,10 @@ class SeriesDefinition(qt.QWidget):
             raise ValueError(f"mode {self.getMode()} is not handled yet")
 
     def getMode(self) -> str:
-        return _SeriesDefinitionMode.from_value(self._modeCB.currentText())
+        return _SeriesDefinitionMode(self._modeCB.currentText())
 
     def setMode(self, mode: str):
-        mode = _SeriesDefinitionMode.from_value(mode)
+        mode = _SeriesDefinitionMode(mode)
         idx = self._modeCB.findText(mode.value)
         self._modeCB.setCurrentIndex(idx)
 

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/gui/control/tomoobjdisplaymode.py

@@ -1,4 +1,4 @@
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 
 
 class DisplayMode(_Enum):

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/gui/dataportal/gallery.py

@@ -29,7 +29,7 @@ class GalleryWidget(qt.QWidget):
         self.layout().addRow("precision", self._precisionQCB)
         # binning
         self._binningQCB = qt.QComboBox(self)
-        self._binningQCB.addItems(Binning.values())
+        self._binningQCB.addItems([item.value for item in Binning])
         self.layout().addRow("binning", self._binningQCB)
         self._binningQCB.setCurrentText(Binning.SIXTEEN_BY_SIXTEEN.value)
         self._binningQCB.setToolTip(
@@ -37,7 +37,7 @@ class GalleryWidget(qt.QWidget):
         )  # recommended size: 5ko for the entire gallery
         # output format
         self._outputFormat = qt.QComboBox(self)
-        self._outputFormat.addItems(OutputFormat.values())
+        self._outputFormat.addItems([item.value for item in OutputFormat])
         self.layout().addRow("output format", self._outputFormat)
         # overwrite
         self._overwriteCB = qt.QCheckBox("overwrite", self)
@@ -49,17 +49,17 @@ class GalleryWidget(qt.QWidget):
         self._binningQCB.currentIndexChanged.connect(self._configChanged)
 
     def getOutputFormat(self) -> OutputFormat:
-        return OutputFormat.from_value(self._outputFormat.currentText())
+        return OutputFormat(self._outputFormat.currentText())
 
     def setOutputFormat(self, format: OutputFormat):
-        format = OutputFormat.from_value(format)
+        format = OutputFormat(format)
         self._outputFormat.setCurrentText(format.value)
 
     def getBinning(self) -> Binning:
-        return Binning.from_value(self._binningQCB.currentText())
+        return Binning(self._binningQCB.currentText())
 
     def setBinning(self, binning: Binning):
-        binning = Binning.from_value(binning)
+        binning = Binning(binning)
         self._binningQCB.setCurrentText(binning.value)
 
     def overwrite(self) -> bool:

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/gui/edit/tests/test_nx_editor.py

@@ -29,7 +29,7 @@ _ureg = pint.get_application_registry()
 @pytest.mark.parametrize("detector_y_pixel_size", (None,))
 @pytest.mark.parametrize("sample_x_pixel_size", (None,))
 @pytest.mark.parametrize("sample_y_pixel_size", (None, 0.0066 * _ureg.meter))
-@pytest.mark.parametrize("field_of_view", FOV.values())
+@pytest.mark.parametrize("field_of_view", [item.value for item in FOV])
 @pytest.mark.parametrize("sample_detector_distance", (1.2 * _ureg.meter,))
 @pytest.mark.parametrize("sample_source_distance", (-10.2 * _ureg.meter,))
 @pytest.mark.parametrize("propagation_distance", (1.01 * _ureg.meter,))

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/gui/reconstruction/axis/EstimatedCorComboBox.py

@@ -13,8 +13,8 @@ class _EstimatedCorValidator(qt.QDoubleValidator):
 
     def validate(self, a0: str, a1: int):
         """validate float or string that could be part of the side values..."""
-        for value in Side.values():
-            if value.startswith(a0):
+        for side in Side:
+            if side.value.startswith(a0):
                 return (qt.QDoubleValidator.Acceptable, a0, a1)
         return super().validate(a0, a1)
 

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/gui/reconstruction/axis/InputWidget.py

@@ -153,8 +153,8 @@ class InputWidget(qt.QWidget):
         modes = set(modes)
         for mode in modes:
             try:
-                axis_mode._InputType.from_value(mode)
-            except Exception:
+                axis_mode._InputType(mode)
+            except ValueError:
                 raise ValueError(
                     f"mode {mode} should be an instance of {axis_mode._InputType}"
                 )
@@ -166,7 +166,7 @@ class InputWidget(qt.QWidget):
         elif len(modes) < 0:
             raise ValueError("modes is empty")
         else:
-            mode = axis_mode._InputType.from_value(modes.pop())
+            mode = axis_mode._InputType(modes.pop())
             if mode is axis_mode._InputType.SINOGRAM:
                 self._sinogramGB.setEnabled(True)
                 self._radioGB.setEnabled(False)

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/gui/reconstruction/nabu/nabuconfig/base.py

@@ -49,9 +49,7 @@ class _NabuStageConfigBase:
         :returns: _FilteringObject to use to define widget visibility
         """
         filteringObj = _FilteringObject(widget=widget)
-        self._registeredWidgets[filteringObj] = ConfigurationLevel.from_value(
-            config_level
-        )
+        self._registeredWidgets[filteringObj] = ConfigurationLevel(config_level)
         return filteringObj
 
     def getConfiguration(self) -> dict:

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/gui/reconstruction/nabu/nabuconfig/ctf.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from silx.gui import qt
 from silx.gui.utils import blockSignals
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 
 from tomwer.core.process.reconstruction.nabu.utils import _NabuStages
 from tomwer.gui.reconstruction.nabu.nabuconfig import base
@@ -159,8 +159,8 @@ class CTFGeometry(qt.QGroupBox):
         super().__init__(parent, title=title)
         self.setLayout(qt.QFormLayout())
         self._beamShapeCB = QComboBoxIgnoreWheel(self)
-        for shape in _BeamShape.values():
-            self._beamShapeCB.addItem(shape)
+        for shape in _BeamShape:
+            self._beamShapeCB.addItem(shape.value)
         self.layout().addRow("shape", self._beamShapeCB)
 
         # cone beam settings
@@ -188,10 +188,10 @@ class CTFGeometry(qt.QGroupBox):
         self._beamShapeCB.currentIndexChanged.connect(self._confChanged)
 
     def getBeamShape(self):
-        return _BeamShape.from_value(self._beamShapeCB.currentText())
+        return _BeamShape(self._beamShapeCB.currentText())
 
     def setBeamShape(self, shape: str | _BeamShape):
-        shape = _BeamShape.from_value(shape)
+        shape = _BeamShape(shape)
         self._beamShapeCB.setCurrentText(shape.value)
 
     def _updateView(self, *args, **kwargs):
@@ -228,7 +228,7 @@ class CTFGeometry(qt.QGroupBox):
 
             beam_shape = ddict.get("beam_shape", None)
             if beam_shape is not None:
-                if _BeamShape.from_value(beam_shape) is _BeamShape.CONE:
+                if _BeamShape(beam_shape) is _BeamShape.CONE:
                     self._coneBeamSettings.setGeometry(params)
                 self.setBeamShape(beam_shape)
 

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/gui/reconstruction/nabu/nabuconfig/phase.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import logging
 
 from silx.gui import qt
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 
 from tomwer.core.process.reconstruction.nabu.utils import _NabuPhaseMethod, _NabuStages
 from tomwer.core.utils.char import BETA_CHAR, DELTA_CHAR
@@ -212,10 +212,10 @@ class NabuPaganinConfig(qt.QWidget, base._NabuStageConfigBase):
 
     def getPaddingType(self) -> PaddingMode:
         current_text = self._paddingTypeCB.currentText()
-        return PaddingMode.from_value(current_text)
+        return PaddingMode(current_text)
 
     def setPaddingType(self, padding_type):
-        padding_type = PaddingMode.from_value(padding_type)
+        padding_type = PaddingMode(padding_type)
         item_index = self._paddingTypeCB.findText(padding_type.value)
         self._paddingTypeCB.setCurrentIndex(item_index)
 

{tomwer-1.5.0rc0 → tomwer-1.5.0rc3}/src/tomwer/gui/reconstruction/nabu/nabuconfig/reconstruction.py

@@ -7,7 +7,7 @@ import logging
 
 from silx.gui import qt
 from silx.gui.dialog.DataFileDialog import DataFileDialog
-from silx.utils.enum import Enum as _Enum
+from enum import Enum as _Enum
 
 from nxtomomill.io.utils import convert_str_to_tuple
 from tomwer.core.utils.char import DEGREE_CHAR
@@ -159,9 +159,13 @@ class TranslationMvtFileWidget(qt.QWidget):
         self._grpBox.layout().setContentsMargins(0, 0, 0, 0)
         self._grpBox.layout().setSpacing(0)
 
-        self._hdf5FileRB = qt.QRadioButton(self.Mode.HDF5.value, self)
+        self._hdf5FileRB = qt.QRadioButton(
+            TranslationMvtFileWidget.Mode.HDF5.value, self
+        )
         self._grpBox.layout().addWidget(self._hdf5FileRB)
-        self._textFileRB = qt.QRadioButton(self.Mode.TEXT.value, self)
+        self._textFileRB = qt.QRadioButton(
+            TranslationMvtFileWidget.Mode.TEXT.value, self
+        )
         self._grpBox.layout().addWidget(self._textFileRB)
         self.layout().addWidget(self._grpBox)