tomwer 1.4.19__py3-none-any.whl → 1.5.0rc3__py3-none-any.whl

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/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/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/gui/edit/imagekeyeditor.py

@@ -112,9 +112,7 @@ class ImageKeyWindow(qt.QMainWindow):
     def setModifications(self, modifications):
         self._mainWindow.clearModifcations()
         image_keys_set = set(modifications.values())
-        image_keys_set = set(
-            [_ImageKey.from_value(image_key) for image_key in image_keys_set]
-        )
+        image_keys_set = set([_ImageKey(image_key) for image_key in image_keys_set])
         for image_key_type in image_keys_set:
             self._mainWindow.applyModifications(
                 modifications=modifications, new_image_key=image_key_type
@@ -432,7 +430,7 @@ class _ImageKeyList(qt.QTableWidget):
             self.setItem(i_frame, 0, _item)
 
             # current image key
-            current_image_key = _ImageKey.from_value(frame.image_key)
+            current_image_key = _ImageKey(frame.image_key)
             current_image_key = self._IMAGE_KEYS_INV[current_image_key]
             currentImgKeyItem = qt.QLabel(current_image_key, self)
             self.setCellWidget(i_frame, 1, currentImgKeyItem)
@@ -442,7 +440,7 @@ class _ImageKeyList(qt.QTableWidget):
                 new_image_key = frames_new_keys[frame.index]
             else:
                 new_image_key = frame.image_key
-            new_image_key = _ImageKey.from_value(new_image_key)
+            new_image_key = _ImageKey(new_image_key)
             new_image_key = self._IMAGE_KEYS_INV[new_image_key]
             newImgKeyItem = _ImageKeyComboBox(parent=self, image_key=new_image_key)
             self._imageKeyComboboxes[index] = newImgKeyItem
@@ -694,16 +692,16 @@ class ImageKeyUpgraderList(qt.QTableWidget):
             self.setCellWidget(i_operation, 1, remove_button)
 
     def addOperation(self, from_image_key: _ImageKey, to_image_key: _ImageKey):
-        from_image_key = _ImageKey.from_value(from_image_key)
-        to_image_key = _ImageKey.from_value(to_image_key)
+        from_image_key = _ImageKey(from_image_key)
+        to_image_key = _ImageKey(to_image_key)
 
         self._operations[from_image_key] = to_image_key
         self._update()
         self.sigOperationsChanged.emit()
 
     def removeOperation(self, from_image_key: _ImageKey, to_image_key: _ImageKey):
-        from_image_key = _ImageKey.from_value(from_image_key)
-        to_image_key = _ImageKey.from_value(to_image_key)
+        from_image_key = _ImageKey(from_image_key)
+        to_image_key = _ImageKey(to_image_key)
         if (
             from_image_key not in self._operations
             or self._operations[from_image_key] != to_image_key