tomwer 1.4.16__py3-none-any.whl → 1.4.17__py3-none-any.whl

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/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/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/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/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/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/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/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.dist-info → tomwer-1.4.17.dist-info}/METADATA

@@ -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.dist-info → tomwer-1.4.17.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=alEn949jQ3mVKKhR8I9K3oqXSOu85M72-Ldd5-fyb7I,4387
+tomwer/version.py,sha256=bLV36WJKGROMwVXzqAZ8PSBx-f4ml945UwWkG4kKaug,4387
 tomwer/app/__init__.py,sha256=h1FKED7Tw5f99yikygt7ruXsdrxQhcJxO7kagLGxhJg,84
 tomwer/app/axis.py,sha256=lB-IZx1o6KTWLIelITvYCIu2flFTB9NhuIfD2MhUZZA,5826
 tomwer/app/canvas.py,sha256=y8rYOiwmv6ug7JcjgkOzEiGQnNXjKWNNmKofT0n8TFg,1538
@@ -252,7 +252,7 @@ tomwer/app/canvas_launcher/splash.py,sha256=cpUuZVKwlQbeAWfAqjpjP4q1v1MmkfxU6WWl
 tomwer/app/canvas_launcher/utils.py,sha256=WfsCHAhiiv4-TUNodgyKJenVvmFWnxsy5OBwTBK2jKE,1279
 tomwer/app/canvas_launcher/widgetsscheme.py,sha256=9Or1KMmSxIs_dJmJGV0Xhjg9HH4m8aPGbtiEuK2i6q0,2744
 tomwer/app/stitching/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tomwer/app/stitching/common.py,sha256=-DNsE3XbBBCvm-NqSTCyJMiYY5GoGHkdzC0y66jZ6Po,15779
+tomwer/app/stitching/common.py,sha256=unFHRuJdzKMLlBM6znQx-KPcbJ7H__EKKe8CUw_Apfs,17293
 tomwer/core/__init__.py,sha256=-EtD8J-a7WVnCgYS7WHkisYn61iM2PpHWcXwE5BetJ8,71
 tomwer/core/futureobject.py,sha256=8Sd9gOrdhYc0PvzPeZPBNOmaHuwB5epG6RJyABRsCmQ,5113
 tomwer/core/resourcemanager.py,sha256=VLNnVodMa-HOMZhN2qpUR_L6phJ8IHPUEPYMxuW6VHg,1067
@@ -598,13 +598,13 @@ tomwer/gui/reconstruction/tests/test_saaxis.py,sha256=6lXKa5yY8pYkcBap7hyzLwhp8W
 tomwer/gui/reconstruction/tests/test_sadeltabeta.py,sha256=96tE_gxIcmp0qDXQmIwSEkYl3Js7dT2CyUH1doyjGc0,4491
 tomwer/gui/samplemoved/__init__.py,sha256=jNA03mYWfP3_S1MRet6ijYe5DNCTK3Br7-5yrW3oEG4,8240
 tomwer/gui/samplemoved/selectiontable.py,sha256=CzQnJBxfIeoZSw8aR0VvrsaIg6fozREI8YRXdzQbA7Q,7968
-tomwer/gui/stitching/SingleAxisStitchingWidget.py,sha256=syBzSf8yRE9poZh0UKqZcyD8ZmEt-vama8bVRsGBuDw,13023
+tomwer/gui/stitching/SingleAxisStitchingWidget.py,sha256=KSAEUVpSkZ56XjnpF2RlrgenjIkfJct367kbZaYQlXA,13917
 tomwer/gui/stitching/StitchingOptionsWidget.py,sha256=c5kRZOMuGKK_CgK28IkBawaVvK2cmczbWF4TcVUZxq4,18186
-tomwer/gui/stitching/StitchingWindow.py,sha256=g5lurZ3rZ010PBvU4oOWqDgcF3SbDzIqgIOyBHZ-Lyw,24608
+tomwer/gui/stitching/StitchingWindow.py,sha256=tm7aadWGUcmHnVXws1ifJtbb835U3dF4mLZGiP3VQSM,25103
 tomwer/gui/stitching/__init__.py,sha256=jYSG4DSAtMGm9Yuf4MVdlSdMO8JKOp_t-8NKsnR92LU,45
 tomwer/gui/stitching/action.py,sha256=7CkACYKsRt3c_6PgrmQVZwSi9UwvGrQVUymJytHbqcE,1659
 tomwer/gui/stitching/alignment.py,sha256=QGWnogvBSbx3kk8lrFDoipmhqbVHEe46WGAeOorlHQ8,4001
-tomwer/gui/stitching/axisorderedlist.py,sha256=2Os8cjZM9B-LCYB9p6JW7MpqXWaVd6oeWSqP4ZbSlBM,17980
+tomwer/gui/stitching/axisorderedlist.py,sha256=IEJoOXlf8wpWkJijLjF-jGRMHOpQ8lGVuajvIqc670s,18045
 tomwer/gui/stitching/metadataholder.py,sha256=jeR6_DM529aEmxQLeLM3CB-49GHq6KLY2Nc24kSC-HA,913
 tomwer/gui/stitching/normalization.py,sha256=sECW3S83-eQJut2RodfxCRsTnTV4XLCL-z-pVtD1U5Y,4492
 tomwer/gui/stitching/preview.py,sha256=no74hLS4d_mDVwMXkO7k5aNn-B3Y4h-Jx0dlM20rhbE,2292
@@ -616,11 +616,11 @@ tomwer/gui/stitching/utils.py,sha256=ZgfKHLyH7l81Ry-4M5ajdwqdeos_J4g4Ee3j3yoXcJo
 tomwer/gui/stitching/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/gui/stitching/config/axisparams.py,sha256=1cRa9ukPvVK7AGePJsJx2M_i_5TMLJocVwrotz7uxXk,8026
 tomwer/gui/stitching/config/output.py,sha256=2kOKV5vTt1scIkmEUyhSvERRs8UvEHojRazCC0RzeE8,6176
-tomwer/gui/stitching/config/positionoveraxis.py,sha256=NGgjxzhxCXa3fBtHP9O9oiqLw8lpUqV_NNbhrnRGrdY,16328
+tomwer/gui/stitching/config/positionoveraxis.py,sha256=3vKasddv6d--qO5Izjg6JBE1HXhgYI-RBNFBuLF-BUU,16642
 tomwer/gui/stitching/config/stitchingstrategies.py,sha256=BI5KYs0qeEp-hfFI7M9MJN8EHmoC7iaJqQ7Hf902v6Y,4598
 tomwer/gui/stitching/config/tomoobjdetails.py,sha256=GkQIqE2ArXFJFtmjrwc0txbZldNKJK-fpMEF_68S1qQ,14667
 tomwer/gui/stitching/config/tests/test_axisparams.py,sha256=btumHdTFr2xmiFZ-GbWAuRy6kjwYUilMrluhiE0repM,738
-tomwer/gui/stitching/tests/test_ZStitchingWindow.py,sha256=NEfL8fjcYreiAKyfojiUdhAmoQx0bPjFLZUklS2xQkk,3007
+tomwer/gui/stitching/tests/test_ZStitchingWindow.py,sha256=_qywMShdazk7WekGCUA2rv8ZN-WGuQJ-v8zqCGuWYN0,3091
 tomwer/gui/stitching/tests/test_axis_ordered_list.py,sha256=ueXQ-YrP0S325PrJiPLdsM4GdzhZm8lTzb-P9hJ3TEY,700
 tomwer/gui/stitching/tests/test_normalization.py,sha256=m4anggtaZ32JSfZ5yHgis5CD0HYpjLvS6bpDitQv9ec,643
 tomwer/gui/stitching/tests/test_preview.py,sha256=sQ0fh07e1oYgWwlB4tqHlOv9Qsf_-bZS39GfsolGW3s,2349
@@ -641,7 +641,7 @@ tomwer/gui/utils/completer.py,sha256=XQGVSiUdLa1MfgXPDY5qfcTxtjVerxmVKXmWDb-kQ-I
 tomwer/gui/utils/flow.py,sha256=p9KoaXSK_YhyFrpUTXr-HI1pAoDRiCPW1F9tVgjSIbA,10668
 tomwer/gui/utils/gpu.py,sha256=R2sRA77zyxdy5bVYGNltQpKS_9wuaj9eIn6rglsWGWg,2223
 tomwer/gui/utils/illustrations.py,sha256=SoLAGBIrdYAu44qIZM8kvC74naOTJzUyAxSUkpblyEw,3134
-tomwer/gui/utils/inputwidget.py,sha256=s1siEQ6nBOTVRF7v8wlgCISS0bYiVmWYpFnWCqM5ueY,22376
+tomwer/gui/utils/inputwidget.py,sha256=E8S4XwuIFxdm7ylBzqQVcJtEYif5CgMx5RTAyQ9Vs8E,22505
 tomwer/gui/utils/loadingmode.py,sha256=A9FeNacgnDFqhyrq5-qybCvV_NwGdXU-Skr_5vwoTZM,2928
 tomwer/gui/utils/qt_utils.py,sha256=QMXte_vdCEwr4Vybt5sopczQ_OuRd1W5h6SydqFH0F8,538
 tomwer/gui/utils/sandboxes.py,sha256=QfSRhL1KrFhS2Wr734Tzvp1OjTp82Ozc0ULr-JycFlI,6145
@@ -906,9 +906,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.16.dist-info/LICENSE,sha256=62p1wL0n9WMTu8x2YDv0odYgTqeSvTd9mQ0v6Mq7lzE,1876
-tomwer-1.4.16.dist-info/METADATA,sha256=GWby5-pOa4v9WTqx5SUKnrMkx0vYn0IGgoKLin6Q-CM,13416
-tomwer-1.4.16.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-tomwer-1.4.16.dist-info/entry_points.txt,sha256=py3ZUWvGnWGc5c7Yhw_uBTm8Fmew0BDw3aQZnWMBNZI,500
-tomwer-1.4.16.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
-tomwer-1.4.16.dist-info/RECORD,,
+tomwer-1.4.17.dist-info/licenses/LICENSE,sha256=62p1wL0n9WMTu8x2YDv0odYgTqeSvTd9mQ0v6Mq7lzE,1876
+tomwer-1.4.17.dist-info/METADATA,sha256=XwIaehtXQw8A82CKM2JkllfIOo_lKcvLJ5HFrsSCPpA,13438
+tomwer-1.4.17.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+tomwer-1.4.17.dist-info/entry_points.txt,sha256=py3ZUWvGnWGc5c7Yhw_uBTm8Fmew0BDw3aQZnWMBNZI,500
+tomwer-1.4.17.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
+tomwer-1.4.17.dist-info/RECORD,,

{tomwer-1.4.16.dist-info → tomwer-1.4.17.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.1.0)
+Generator: setuptools (77.0.3)
 Root-Is-Purelib: true
 Tag: py3-none-any