tomwer 1.4.16__tar.gz → 1.4.17__tar.gz

{tomwer-1.4.16/src/tomwer.egg-info → tomwer-1.4.17}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: tomwer
-Version: 1.4.16
+Version: 1.4.17
 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
@@ -231,6 +231,7 @@ Requires-Dist: tomoscan[test]>=2.1.0a18; extra == "test"
 Provides-Extra: setup-requires
 Requires-Dist: setuptools; extra == "setup-requires"
 Requires-Dist: numpy>=1.12; extra == "setup-requires"
+Dynamic: license-file
 
 .. image:: doc/img/tomwer.png
    :alt: Tomwer Logo

{tomwer-1.4.16 → tomwer-1.4.17}/src/tomwer/app/stitching/common.py

@@ -33,6 +33,8 @@ from tomwer.gui.cluster.slurm import SlurmSettingsWidget
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.core.scan.nxtomoscan import NXtomoScan
 from tomwer.core.volume import HDF5Volume
+from tomwer.core.volume.volumebase import TomwerVolumeBase
+from tomwer.core.tomwer_object import TomwerObject
 
 
 class MainWidget(qt.QTabWidget):
@@ -131,6 +133,14 @@ class MainWidget(qt.QTabWidget):
     def loadSettings(self, config_file):
         self._stitchingConfigWindow._loadSettings(config_file)
 
+    def get_available_pre_processing_stitching_mode(self):
+        return self._stitchingConfigWindow.get_available_pre_processing_stitching_mode()
+
+    def get_available_post_processing_stitching_mode(self):
+        return (
+            self._stitchingConfigWindow.get_available_post_processing_stitching_mode()
+        )
+
 
 class _StitcherThread(qt.QThread):
     DEFAULT_OUTPUT_CONFIG_NAME = "stitching_conf_autosave.conf"
@@ -189,6 +199,9 @@ class _StitcherThread(qt.QThread):
 
 
 class MainWindow(qt.QDialog):
+
+    sigTomoObjAdded = qt.Signal(TomwerObject)
+
     def __init__(self, axis: int, parent=None) -> None:
         super().__init__(parent)
         self.setLayout(qt.QVBoxLayout())
@@ -268,7 +281,22 @@ class MainWindow(qt.QDialog):
         self._mainWindow._stitchingConfigWindow._widget._mainWidget.setCurrentWidget(
             orderedListWidget
         )
-        orderedListWidget._callbackAddTomoObj()
+        tomo_objs = orderedListWidget._callbackAddTomoObj()
+        for tomo_obj in tomo_objs:
+            if len(tomo_objs) > 0:
+                self.__updateStitchingTypeFromObjAdded(tomo_obj=tomo_objs[0])
+
+    def __updateStitchingTypeFromObjAdded(self, tomo_obj: TomwerObject):
+        if isinstance(tomo_obj, TomwerScanBase):
+            self.setStitchingType(self.get_available_pre_processing_stitching_mode()[0])
+        elif isinstance(tomo_obj, TomwerVolumeBase):
+            self.setStitchingType(
+                self.get_available_post_processing_stitching_mode()[0]
+            )
+        else:
+            raise TypeError(
+                f"tomo_obj is expected to be an instance of {type(TomwerObject)}. Got {type(tomo_obj)}"
+            )
 
     def close(self):
         self._mainWindow.close()
@@ -330,6 +358,12 @@ class MainWindow(qt.QDialog):
     def setPostProcessingOutput(self, url: DataUrl) -> None:
         self._mainWindow._stitchingConfigWindow.setPostProcessingOutput(url=url)
 
+    def get_available_pre_processing_stitching_mode(self) -> tuple[StitchingType]:
+        return self._mainWindow.get_available_pre_processing_stitching_mode()
+
+    def get_available_post_processing_stitching_mode(self) -> tuple[StitchingType]:
+        return self._mainWindow.get_available_post_processing_stitching_mode()
+
 
 def main(argv, stitcher_name: str, stitching_axis: int, logger):
     parser = argparse.ArgumentParser(description=__doc__)

{tomwer-1.4.16 → tomwer-1.4.17}/src/tomwer/gui/stitching/SingleAxisStitchingWidget.py

@@ -92,6 +92,30 @@ class SingleAxisStitchingWidget(qt.QWidget, _SingleAxisMixIn):
         if idx >= 0:
             self._stitchingTypeCB.setCurrentIndex(idx)
 
+    def get_available_pre_processing_stitching_mode(self):
+        pre_proc_modes: tuple[str] = tuple(
+            filter(
+                lambda mode: "preproc" in mode,
+                [
+                    self._stitchingTypeCB.itemText(i_item)
+                    for i_item in range(self._stitchingTypeCB.count())
+                ],
+            )
+        )
+        return tuple([StitchingType.from_value(mode) for mode in pre_proc_modes])
+
+    def get_available_post_processing_stitching_mode(self):
+        post_proc_modes: tuple[str] = tuple(
+            filter(
+                lambda mode: "postproc" in mode,
+                [
+                    self._stitchingTypeCB.itemText(i_item)
+                    for i_item in range(self._stitchingTypeCB.count())
+                ],
+            )
+        )
+        return tuple([StitchingType.from_value(mode) for mode in post_proc_modes])
+
     def addTomoObj(self, tomo_obj: TomwerObject):
         self._mainWidget.addTomoObj(tomo_obj)
         self._updatePreviewPixelSize()

{tomwer-1.4.16 → tomwer-1.4.17}/src/tomwer/gui/stitching/StitchingWindow.py

@@ -438,6 +438,11 @@ class _SingleAxisStitchingWindow(
         # update to force overwrite
         config["output"]["overwrite_results"] = True
 
+        # avoid any recalculation of the axis position. So the preview is accurate
+        config["output"]["axis_0_params"] = ""
+        config["output"]["axis_1_params"] = ""
+        config["output"]["axis_2_params"] = ""
+
         # clean current preview to notify some calculation is going on
         preview_plot = self._widget._mainWidget._previewPlot
         preview_plot._waitingOverlay.show()
@@ -583,6 +588,12 @@ class _SingleAxisStitchingWindow(
     def setPostProcessingOutput(self, *args, **kwargs):
         self._outputWidget.setPostProcessingOutput(*args, **kwargs)
 
+    def get_available_pre_processing_stitching_mode(self):
+        return self._widget.get_available_pre_processing_stitching_mode()
+
+    def get_available_post_processing_stitching_mode(self):
+        return self._widget.get_available_post_processing_stitching_mode()
+
 
 class YStitchingWindow(_SingleAxisStitchingWindow, axis=1):
     pass

{tomwer-1.4.16 → tomwer-1.4.17}/src/tomwer/gui/stitching/axisorderedlist.py

@@ -361,7 +361,7 @@ class EditableOrderedTomoObjWidget(AxisOrderedTomoObjWidget):
             [self._tomoObjsTableView.model().getTomoObj(item) for item in selection]
         )
 
-    def _callbackAddTomoObj(self):
+    def _callbackAddTomoObj(self) -> tuple[TomwerObject]:
         dialog = qt.QFileDialog()
         dialog.setFileMode(qt.QFileDialog.ExistingFiles)
         dialog.setNameFilters(
@@ -372,9 +372,9 @@ class EditableOrderedTomoObjWidget(AxisOrderedTomoObjWidget):
 
         if not dialog.exec_():
             dialog.close()
-            return
+            return ()
         elif len(dialog.selectedFiles()) == 0:
-            return
+            return ()
         else:
             tomo_objs = []
             for file in dialog.selectedFiles():
@@ -386,6 +386,7 @@ class EditableOrderedTomoObjWidget(AxisOrderedTomoObjWidget):
                     tomo_objs.extend(new_objs)
             for tomo_obj in tomo_objs:
                 self.addTomoObj(tomo_obj=tomo_obj, trigger_callbacks=True)
+            return tuple(tomo_objs)
 
     def _callbackRemoveSelectedTomoObj(self):
         obj_to_remove = self.getSelectedTomoObjs()

{tomwer-1.4.16 → tomwer-1.4.17}/src/tomwer/gui/stitching/config/positionoveraxis.py

@@ -333,9 +333,15 @@ class _TomoObjPosition(qt.QWidget):
         self.layout().addWidget(self._resetValueQPB)
 
         # connect signal / slot
-        self._spinBox.valueChanged.connect(self._valueChanged)
+        self._spinBox.editingFinished.connect(self._sbEditingFinished)
         self._resetValueQPB.clicked.connect(self.resetOriginalValue)
 
+    def _sbEditingFinished(self):
+        sender = self.sender()
+        assert isinstance(sender, qt.QSpinBox)
+        new_value = sender.value()
+        self._valueChanged(new_value=new_value)
+
     def _valueChanged(self, new_value):
         self.sigValueChanged.emit(
             self.__lastValue,
@@ -354,10 +360,12 @@ class _TomoObjPosition(qt.QWidget):
         self._positionChanged()
 
     def _positionChanged(self):
-        self._valueChanged(new_value=self._spinBox.value())
+        self._valueChanged(self._spinBox.value())
 
-    def setValue(self, value: float) -> None:
+    def setValue(self, value: float, emit_editing_finished: bool = False) -> None:
         self._spinBox.setValue(value)
+        if emit_editing_finished:
+            self._spinBox.editingFinished.emit()
         self.__lastValue = value
 
     def getValue(self) -> float:

{tomwer-1.4.16 → tomwer-1.4.17}/src/tomwer/gui/stitching/tests/test_ZStitchingWindow.py

@@ -69,10 +69,10 @@ def test_ZStitchingWindow(
     )
 
     window._editTomoObjFirstAxisPositionsWidget.setEditionMode("free")
-    widget_tomo_obj_0.setValue(10)
+    widget_tomo_obj_0.setValue(10, emit_editing_finished=True)
     assert window.getConfiguration()["stitching"]["axis_0_pos_px"] == [10, 0, -90]
     window._editTomoObjFirstAxisPositionsWidget.setEditionMode("downstream")
-    widget_tomo_obj_0.setValue(30)
+    widget_tomo_obj_0.setValue(30, emit_editing_finished=True)
     assert window.getConfiguration()["stitching"]["axis_0_pos_px"] == [30, 20, -70]
     window._editTomoObjFirstAxisPositionsWidget.setEditionMode("upstream")
     widget_tomo_obj_2 = (
@@ -80,7 +80,7 @@ def test_ZStitchingWindow(
             scans[2].get_identifier().to_str()
         ]
     )
-    widget_tomo_obj_2.setValue(-120)
+    widget_tomo_obj_2.setValue(-120, emit_editing_finished=True)
     assert window.getConfiguration()["stitching"]["axis_0_pos_px"] == [-20, -30, -120]
 
     # test reset positions to initial positions

{tomwer-1.4.16 → tomwer-1.4.17}/src/tomwer/gui/utils/inputwidget.py

@@ -437,7 +437,13 @@ class OutputVolumeDefinition(qt.QWidget):
         # output file or folder
         self._outputFileLabel = qt.QLabel("", self)
         self.layout().addWidget(self._outputFileLabel, 1, 0, 1, 1)
-        self._outputFileQLE = QLFileSystem("", parent=None)
+        self._outputFileQLE = QLFileSystem(
+            os.path.join(
+                os.getcwd(),
+                "stitched_volume.hdf5",
+            ),
+            parent=None,
+        )
         self.layout().addWidget(self._outputFileQLE, 1, 1, 1, 1)
         self._selectPB = qt.QPushButton("select", self)
         self.layout().addWidget(self._selectPB, 1, 2, 1, 1)

{tomwer-1.4.16 → tomwer-1.4.17}/src/tomwer/version.py

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

{tomwer-1.4.16 → tomwer-1.4.17/src/tomwer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: tomwer
-Version: 1.4.16
+Version: 1.4.17
 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
@@ -231,6 +231,7 @@ Requires-Dist: tomoscan[test]>=2.1.0a18; extra == "test"
 Provides-Extra: setup-requires
 Requires-Dist: setuptools; extra == "setup-requires"
 Requires-Dist: numpy>=1.12; extra == "setup-requires"
+Dynamic: license-file
 
 .. image:: doc/img/tomwer.png
    :alt: Tomwer Logo