tomwer 2.0.0.dev0__tar.gz → 2.0.0.dev2__tar.gz

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tomwer
-Version: 2.0.0.dev0
+Version: 2.0.0.dev2
 Summary: Tomography workflow tools
 Author-email: Henri Payno <henri.payno@esrf.fr>, Pierre Paleo <pierre.paleo@esrf.fr>, Pierre-Olivier Autran <pierre-olivier.autran@esrf.fr>, Jérôme Lesaint <jerome.lesaint@esrf.fr>, Alessandro Mirone <mirone@esrf.fr>
 License: MIT

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/orangecontrib/tomwer/__init__.py

@@ -1,5 +1,5 @@
 """
-(Ewoksorange) Orange add-on for tomography
+(Ewoks)Orange add-on for tomography
 """
 
 import logging

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/orangecontrib/tomwer/orange/managedprocess.py

@@ -30,29 +30,29 @@ class _SuperviseBase(SuperviseProcess):
         except Exception as e:
             _logger.warning(f"Fail to update process name. Error is {e}")
 
-    def notify_skip(self, scan, details=None):
+    def notify_skip(self, tomo_obj, details=None):
         ProcessManager().notify_dataset_state(
-            dataset=scan, process=self, state=DatasetState.SKIPPED, details=details
+            dataset=tomo_obj, process=self, state=DatasetState.SKIPPED, details=details
         )
 
-    def notify_pending(self, scan, details=None):
+    def notify_pending(self, tomo_obj, details=None):
         ProcessManager().notify_dataset_state(
-            dataset=scan, process=self, state=DatasetState.PENDING, details=details
+            dataset=tomo_obj, process=self, state=DatasetState.PENDING, details=details
         )
 
-    def notify_succeed(self, scan, details=None):
+    def notify_succeed(self, tomo_obj, details=None):
         ProcessManager().notify_dataset_state(
-            dataset=scan, process=self, state=DatasetState.SUCCEED, details=details
+            dataset=tomo_obj, process=self, state=DatasetState.SUCCEED, details=details
         )
 
-    def notify_failed(self, scan, details=None):
+    def notify_failed(self, tomo_obj, details=None):
         ProcessManager().notify_dataset_state(
-            dataset=scan, process=self, state=DatasetState.FAILED, details=details
+            dataset=tomo_obj, process=self, state=DatasetState.FAILED, details=details
         )
 
-    def notify_on_going(self, scan, details=None):
+    def notify_on_going(self, tomo_obj, details=None):
         ProcessManager().notify_dataset_state(
-            dataset=scan, process=self, state=DatasetState.ON_GOING, details=details
+            dataset=tomo_obj, process=self, state=DatasetState.ON_GOING, details=details
         )
 
     def _startProcessing(self, *args, **kwargs):

tomwer-2.0.0.dev2/src/orangecontrib/tomwer/orange/task_widgets/__init__.py

@@ -0,0 +1 @@
+"""Some generic widgets for Orange Canvas in the use case of tomography."""

tomwer-2.0.0.dev2/src/orangecontrib/tomwer/tutorials/__init__.py

@@ -0,0 +1 @@
+"""Set of tutorials for Orange3-Tomwer."""

tomwer-2.0.0.dev2/src/orangecontrib/tomwer/tutorials/darks and flats copy - method 2.ows

@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='utf-8'?>
+<scheme version="2.0" title="darks and flats copy - method 2" description="">
+	<nodes>
+		<node id="0" name="scan selector" qualified_name="orangecontrib.tomwer.widgets.control.DataSelectorOW.DataSelectorOW" project_name="tomwer" version="" title="scan selector" position="(-519.0, -209.0)" />
+		<node id="1" name="image-key-upgrader" qualified_name="orangecontrib.tomwer.widgets.edit.ImageKeyUpgraderOW.ImageKeyUpgraderOW" project_name="tomwer" version="" title="image-key-upgrader" position="(-293.0, -209.0)" />
+		<node id="2" name="scan selector" qualified_name="orangecontrib.tomwer.widgets.control.DataSelectorOW.DataSelectorOW" project_name="tomwer" version="" title="scan selector (1)" position="(291.0, -211.0)" />
+		<node id="3" name="copy reduced darks and flats" qualified_name="orangecontrib.tomwer.widgets.reconstruction.CopyReducedDarkAndFlatOW.CopyReducedDarkAndFlatOW" project_name="tomwer" version="" title="copy reduced darks and flats" position="(61.0, -213.0)" />
+	</nodes>
+	<links>
+		<link id="0" source_node_id="0" sink_node_id="1" source_channel="data" sink_channel="data" enabled="true" source_channel_id="data" sink_channel_id="data" />
+		<link id="1" source_node_id="1" sink_node_id="3" source_channel="data" sink_channel="data" enabled="true" source_channel_id="data" sink_channel_id="data" />
+		<link id="2" source_node_id="3" sink_node_id="2" source_channel="data" sink_channel="data" enabled="true" source_channel_id="data" sink_channel_id="data" />
+	</links>
+	<annotations>
+		<text id="0" type="text/plain" rect="(-597.0, -79.0, 150.0, 126.0)" font-family="Sans" font-size="16">step2: provide scans for which we need to copy reduced darks and flats</text>
+		<arrow id="1" start="(-522.0, -87.0)" end="(-523.0, -151.0)" fill="#C1272D" />
+		<text id="2" type="text/plain" rect="(-379.0, -87.0, 236.0, 111.0)" font-family="Sans" font-size="16">invalid any existing darks or flats frames (else reduced darks and flats will use them instead of making the copy)</text>
+		<arrow id="3" start="(-293.0, -97.0)" end="(-290.0, -158.0)" fill="#C1272D" />
+		<text id="4" type="text/plain" rect="(-70.0, -81.0, 270.0, 80.0)" font-family="Sans" font-size="16">will copy reduced darks / flats to `dataset_{darks|flats}.hdf5` to be used for reconstruction</text>
+		<arrow id="5" start="(61.99999999999998, -91.0)" end="(61.99999999999998, -142.0)" fill="#C1272D" />
+		<text id="6" type="text/plain" rect="(-141.0, -427.0, 464.0, 85.0)" font-family="Sans" font-size="16">step1: provide reduced darks and flats from the 'copy' tab,
+unselecting auto and setting them through `select darks url` and `select flats url`</text>
+		<arrow id="7" start="(57.0, -334.0)" end="(58.99999999999997, -259.00000000000006)" fill="#C1272D" />
+		<text id="8" type="text/plain" rect="(241.0, -94.0, 150.0, 88.0)" font-family="Sans" font-size="16">result: scans with copied reduced darks / flats</text>
+		<text id="9" type="text/plain" rect="(-601.0, -590.0, 932.0, 68.0)" font-family="Sans" font-size="16">Context: on this workflow we want to copy reduced flats / darks from a dataset to others.
+This one of the various way to do this.
+</text>
+		<text id="10" type="text/plain" rect="(-593.0, 94.0, 919.0, 84.0)" font-family="Sans" font-size="16">Note: reduced darks / flats can be saved to disk from another python script using the `silx.io.dictdump` dicttoh5 function.
+Reduced darks and flats are dictionary with index in the sequence as key (so index==0 if the dark / flat serie is done at the beginning) and the reduced darks / flats as value (2D numpy array) </text>
+		<arrow id="11" start="(291.0, -109.0)" end="(290.0, -158.0)" fill="#C1272D" />
+	</annotations>
+	<thumbnail />
+	<node_properties>
+		<properties node_id="0" format="literal">{'_scanIDs': [], 'controlAreaVisible': True, 'savedWidgetGeometry': None, '__version__': 1}</properties>
+		<properties node_id="1" format="literal">{'_ewoks_default_inputs': {'operations': {}}, '_ewoks_execinfo': {}, '_ewoks_task_options': {}, '_ewoks_varinfo': {}, 'controlAreaVisible': True, 'default_inputs': {}, 'savedWidgetGeometry': None, '__version__': 1}</properties>
+		<properties node_id="2" format="literal">{'_scanIDs': [], 'controlAreaVisible': True, 'savedWidgetGeometry': None, '__version__': 1}</properties>
+		<properties node_id="3" format="literal">{'_auto_mode': True, '_ewoks_default_inputs': {}, '_ewoks_execinfo': {}, '_ewoks_task_options': {}, '_ewoks_varinfo': {}, 'controlAreaVisible': True, 'default_inputs': {}, 'savedWidgetGeometry': None, '__version__': 1}</properties>
+	</node_properties>
+	<session_state>
+		<window_groups />
+	</session_state>
+</scheme>

tomwer-2.0.0.dev2/src/orangecontrib/tomwer/tutorials/untitled.ows

@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='utf-8'?>
+<scheme version="2.0" title="" description="">
+	<nodes>
+		<node id="0" name="nabu volume reconstruction" qualified_name="orangecontrib.tomwer.widgets.reconstruction.NabuVolumeOW.NabuVolumeOW" project_name="tomwer" version="" title="nabu volume reconstruction" position="(440.0, 214.0)" />
+	</nodes>
+	<links />
+	<annotations />
+	<thumbnail />
+	<node_properties>
+		<properties node_id="0" format="literal">{'_ewoks_default_inputs': {'data': None, 'nabu_volume_params': None, 'nabu_params': None}, 'controlAreaVisible': True, 'savedWidgetGeometry': b'\x01\xd9\xd0\xcb\x00\x03\x00\x00\x00\x00\x03\x08\x00\x00\x01o\x00\x00\x04\xd1\x00\x00\x03\xe5\x00\x00\x03\x08\x00\x00\x01\x94\x00\x00\x04\xd1\x00\x00\x03\xe5\x00\x00\x00\x00\x00\x00\x00\x00\x07\x80\x00\x00\x03\x08\x00\x00\x01\x94\x00\x00\x04\xd1\x00\x00\x03\xe5', '__version__': 1}</properties>
+	</node_properties>
+	<session_state>
+		<window_groups />
+	</session_state>
+</scheme>

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/orangecontrib/tomwer/widgets/control/EDF2NXTomomillOW.py

@@ -171,7 +171,7 @@ class EDF2NXOW(
             edf_to_nx_configuration=self.__configuration_cache.to_nested_model().model_dump()
         )
 
-        self.notify_on_going(scan=NXtomoScan(output_file, output_entry))
+        self.notify_on_going(tomo_obj=NXtomoScan(output_file, output_entry))
         try:
             self._execute_ewoks_task(  # pylint: disable=E1123
                 propagate=True,
@@ -210,9 +210,9 @@ class EDF2NXOW(
                 "entry",
             )
             if task_suceeded:
-                self.notify_succeed(scan=scan)
+                self.notify_succeed(tomo_obj=scan)
             else:
-                self.notify_failed(scan=scan)
+                self.notify_failed(tomo_obj=scan)
         except Exception as e:
             logger.error(f"failed to handle task finished callback. Reason is {e}")
 

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/orangecontrib/tomwer/widgets/control/NXTomomillOW.py

@@ -303,9 +303,9 @@ class NXTomomillOW(
             config = H52nxModel.from_dict(config)
             scan = task_executor.current_task.outputs.data
             if task_suceeded:
-                self.notify_succeed(scan=scan)
+                self.notify_succeed(tomo_obj=scan)
             else:
-                self.notify_failed(scan=scan)
+                self.notify_failed(tomo_obj=scan)
         except Exception as e:
             logger.error(f"failed to handle task finished callback. Reason is {e}")
 

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/orangecontrib/tomwer/widgets/control/NXtomoConcatenate.py

@@ -164,9 +164,9 @@ class NXtomoConcatenateOW(
             task_suceeded = task_executor.succeeded
             scan = task_executor.current_task.outputs.data
             if task_suceeded:
-                self.notify_succeed(scan=scan)
+                self.notify_succeed(tomo_obj=scan)
             else:
-                self.notify_failed(scan=scan)
+                self.notify_failed(tomo_obj=scan)
         except Exception as e:
             _logger.error(f"failed to handle task finished callback. Reason is {e}")
 
@@ -186,7 +186,7 @@ class NXtomoConcatenateOW(
                 ),
                 entry=self.getOutputEntry(),
             )
-            self.notify_pending(scan=scan_about_to_be_created)
+            self.notify_pending(tomo_obj=scan_about_to_be_created)
             self.execute_ewoks_task()
 
     def sizeHint(self) -> qt.QSize:

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/orangecontrib/tomwer/widgets/control/SingleTomoObjOW.py

@@ -13,7 +13,7 @@ from tomwer.core.scan.scanfactory import ScanFactory
 from tomwer.core.tomwer_object import TomwerObject
 from tomwer.core.volume.volumefactory import VolumeFactory
 from tomwer.gui.control.singletomoobj import SingleTomoObj
-from tomwer.model.reconstruction.reduced_frames import ReducedFrames
+from tomwer.models.reconstruction.reduced_frames import ReducedFrames
 from tomwer.core.utils.scanutils import create_scan_reduced_darks_and_flats_models
 
 _logger = logging.getLogger(__name__)

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/orangecontrib/tomwer/widgets/control/__init__.py

@@ -1,6 +1,5 @@
 """
 (Ewoks)Orange Widgets to 'control' the flow. Like defining input / output, stacking scans...
-Those widget are not doing any 'core' processing.
 """
 
 NAME = "control"

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/orangecontrib/tomwer/widgets/dataportal/__init__.py

@@ -1,6 +1,5 @@
 """
-(Ewoks)Orange Widgets to 'control' the flow. Like defining input / output, stacking scans...
-Those widget are not doing any 'core' processing.
+(Ewoks)Orange Widgets for publishing processed dataset to the data-portal.
 """
 
 NAME = "data portal"

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/orangecontrib/tomwer/widgets/edit/DarkFlatPatchOW.py

@@ -146,8 +146,8 @@ class DarkFlatPatchOW(
             task_suceeded = task_executor.succeeded
             scan = task_executor.current_task.inputs.data
             if task_suceeded:
-                self.notify_succeed(scan=scan)
+                self.notify_succeed(tomo_obj=scan)
             else:
-                self.notify_failed(scan=scan)
+                self.notify_failed(tomo_obj=scan)
         except Exception as e:
             _logger.error(f"failed to handle task finished callback. Reason is {e}")

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/orangecontrib/tomwer/widgets/edit/ImageKeyEditorOW.py

@@ -64,7 +64,7 @@ class ImageKeyEditorOW(
             if scan is not self._scan:
                 self._scan = scan
                 self.widget.setScan(scan)
-                self.notify_pending(scan=scan)
+                self.notify_pending(tomo_obj=scan)
             self.activateWindow()
             self.raise_()
             self.show()
@@ -93,8 +93,8 @@ class ImageKeyEditorOW(
             task_suceeded = task_executor.succeeded
             scan = task_executor.current_task.inputs.data
             if task_suceeded:
-                self.notify_succeed(scan=scan)
+                self.notify_succeed(tomo_obj=scan)
             else:
-                self.notify_failed(scan=scan)
+                self.notify_failed(tomo_obj=scan)
         except Exception as e:
             _logger.error(f"failed to handle task finished callback. Reason is {e}")

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/orangecontrib/tomwer/widgets/edit/ImageKeyUpgraderOW.py

@@ -80,14 +80,14 @@ class ImageKeyUpgraderOW(
         except KeyError:
             pass
         else:
-            self.notify_pending(scan=scan)
+            self.notify_pending(tomo_obj=scan)
         return task_inputs
 
     def _execute_ewoks_task(self, propagate, log_missing_inputs=False):
         task_arguments = self._get_task_arguments()
         scan = task_arguments.get("inputs", {}).get("data", None)
         if scan is not None:
-            self.notify_pending(scan=scan)
+            self.notify_pending(tomo_obj=scan)
             super()._execute_ewoks_task(  # pylint: disable=E1123
                 propagate=propagate, log_missing_inputs=log_missing_inputs
             )
@@ -98,8 +98,8 @@ class ImageKeyUpgraderOW(
             task_suceeded = task_executor.succeeded
             scan = task_executor.current_task.inputs.data
             if task_suceeded:
-                self.notify_succeed(scan=scan)
+                self.notify_succeed(tomo_obj=scan)
             else:
-                self.notify_failed(scan=scan)
+                self.notify_failed(tomo_obj=scan)
         except Exception as e:
             _logger.error(f"failed to handle task finished callback. Reason is {e}")

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/orangecontrib/tomwer/widgets/reconstruction/CopyReducedDarkAndFlatOW.py

@@ -21,7 +21,7 @@ from tomwer.gui.reconstruction.darkflat.darkflatcopywidget import (
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.core.utils.scanutils import create_scan_reduced_darks_and_flats_models
 from tomwer.tasks.reconstruction.copydarkflat import CopyReducedDarkFlatTask
-from tomwer.model.reconstruction.reduced_frames import ReducedFrames
+from tomwer.models.reconstruction.reduced_frames import ReducedFrames
 from orangecontrib.tomwer.orange.ewoks_compatibility import unpack_variable
 
 _logger = logging.getLogger(__name__)

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/orangecontrib/tomwer/widgets/reconstruction/MultiCoROW.py

@@ -209,22 +209,6 @@ class MultiCoROW(
             self.raise_()
             self.show()
 
-    def cancel(self, scan):
-        # function call when we want to cancel the given scan
-        if scan is None:
-            return
-        if scan in self._widget._processing_stack:
-            self._widget._processing_stack.remove(scan)
-        if (
-            self._widget._processing_stack._data_currently_computed.get_identifier().to_str()
-            == scan.get_identifier().to_str()
-        ):
-            # stop current processing
-            self._widget._processing_stack.cancel()
-            # if possible process next
-            if self._widget._processing_stack.can_process_next():
-                self._widget._processing_stack._process_next()
-
     def computeEstimatedCor(self) -> float | None:
         """callback when calculation of a estimated cor is requested"""
         scan = self.get_task_input_value("data", None)

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/orangecontrib/tomwer/widgets/reconstruction/MultiPagOW.py

@@ -202,7 +202,7 @@ class MultiPagOW(SuperviseOW, openclass=True):
             DatasetState.WAIT_USER_VALIDATION,
         ):
             details = "Was pending and has been replaced by another scan."
-            self.notify_skip(scan=scan, details=details)
+            self.notify_skip(tomo_obj=scan, details=details)
             self.Outputs.nabu_params.send(
                 scan.nabu_recons_params,
             )

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/orangecontrib/tomwer/widgets/reconstruction/__init__.py

@@ -1,5 +1,5 @@
 """
-(Ewoks)Orange Widgets for tomography core processing
+(Ewoks)Orange Widgets for reconstructing tomography datasets.
 """
 
 NAME = "reconstruction"

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/tomwer/core/reconstruction/multi/multicor/multicor.py

@@ -64,7 +64,6 @@ class PostProcessing:
             score = ComputedScore(
                 tv=compute_score(data=data_roi_int, method=ScoreMethod.TV),
                 std=compute_score(data=data_roi_int, method=ScoreMethod.STD),
-                tomo_consistency=None,
             )
         return {cor: (url, score)}, {cor: data_roi}
 

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/tomwer/core/reconstruction/multi/scores/ComputedScore.py

@@ -10,10 +10,9 @@ class ComputedScore:
     Will all result of the different score calculation method and getter on those and their inverse
     """
 
-    def __init__(self, tv, std, tomo_consistency=None):
+    def __init__(self, tv, std):
         self._tv = tv
         self._std = std
-        self._tomo_consistency = tomo_consistency
 
     @property
     def total_variation(self):
@@ -23,10 +22,6 @@ class ComputedScore:
     def std(self):
         return self._std
 
-    @property
-    def tomo_consistency(self):
-        return self._tomo_consistency
-
     def get(self, method: ScoreMethod):
         method = ScoreMethod(method)
         if method is ScoreMethod.TV:
@@ -37,8 +32,6 @@ class ComputedScore:
             return self.std
         elif method is ScoreMethod.STD_INVERSE:
             return 1.0 / self.std
-        elif method is ScoreMethod.TOMO_CONSISTENCY:
-            return self.tomo_consistency
         else:
             raise ValueError(f"{method} is an unrecognized method")
 
@@ -49,8 +42,7 @@ class ComputedScore:
             return (
                 self.total_variation == __value.total_variation
                 and self.std == __value.std
-                and self.tomo_consistency == __value.tomo_consistency
             )
 
     def __str__(self) -> str:
-        return f"std: {self.std} - tv: {self.total_variation} - tomo-consistency: {self.tomo_consistency}"
+        return f"std: {self.std} - tv: {self.total_variation}"

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/tomwer/core/reconstruction/multi/scores/ScoreMethod.py

@@ -6,4 +6,3 @@ class ScoreMethod(Enum):
     TV = "total variation"
     TV_INVERSE = "1 / (total variation)"
     STD_INVERSE = "1 / std"
-    TOMO_CONSISTENCY = "tomo consistency"

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/tomwer/core/reconstruction/multi/scores/compute.py

@@ -10,29 +10,6 @@ from tomwer.core.reconstruction.multi.scores.ScoreMethod import ScoreMethod
 _logger = logging.getLogger(__name__)
 
 
-def compute_tomo_consistency(
-    data: numpy.ndarray,
-    original_sinogram,
-    angles,
-    original_axis_position,
-    detector_width,
-):
-    from silx.opencl.projection import Projection
-
-    projector = Projection(
-        slice_shape=data.shape,
-        angles=angles,
-        detector_width=detector_width,
-        axis_position=original_axis_position,
-    )
-    sinogram = projector.projection(data)
-    sinogram_n = (sinogram - sinogram.min()) / (sinogram.max() - sinogram.min())
-    original_sinogram_n = (original_sinogram - original_sinogram.min()) / (
-        original_sinogram.max() - original_sinogram.min()
-    )
-    return 1.0 / (numpy.sum(numpy.abs(sinogram_n - original_sinogram_n)) + 1)
-
-
 def compute_score_contrast_std(data: numpy.ndarray):
     """
     Compute a contrast score by simply computing the standard deviation of
@@ -93,22 +70,8 @@ def compute_score(
         pass
     else:
         raise ValueError(f"Data is expected to be 2D. Not {data.ndim}D")
-    if method is ScoreMethod.TOMO_CONSISTENCY:
-        try:
-            return compute_tomo_consistency(
-                data=data,
-                angles=angles,
-                original_sinogram=original_sinogram,
-                original_axis_position=original_axis_position,
-                detector_width=detector_width,
-            )
-        except ImportError:
-            return None
-        except Exception as e:
-            _logger.warning(f"Fail to compute 'tomo consistency' score. Reason is {e}")
-            return None
-    else:
-        fct = METHOD_TO_FCT.get(method, None)
+
+    fct = METHOD_TO_FCT.get(method, None)
 
     if fct is not None:
         return fct(data)

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/tomwer/core/utils/scanutils.py

@@ -25,7 +25,10 @@ from tomwer.core.scan.nxtomoscan import NXtomoScan
 from tomwer.core.scan.edfscan import EDFTomoScan
 from tomwer.core.scan.scanfactory import ScanFactory
 from tomwer.core.scan.scanbase import TomwerScanBase
-from tomwer.model.reconstruction.reduced_frames import ReducedFrames, ReducedFramesInfos
+from tomwer.models.reconstruction.reduced_frames import (
+    ReducedFrames,
+    ReducedFramesInfos,
+)
 
 _logger = logging.getLogger(__name__)
 

tomwer-2.0.0.dev2/src/tomwer/gui/__init__.py

@@ -0,0 +1 @@
+"""This package contains all the Graphical User Interface classes & functions."""

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/tomwer/gui/conditions/filter.py

@@ -11,7 +11,7 @@ from __future__ import annotations
 from silx.gui import qt
 from typing import get_args
 
-from tomwer.model.conditions.filters import InputModel
+from tomwer.models.conditions.filters import InputModel
 from tomwer.gui import icons
 from tomwer.gui.utils.sandboxes import (
     RegularExpressionSandBox,

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/tomwer/gui/reconstruction/darkflat/darkflatwidget.py

@@ -7,7 +7,7 @@ from silx.gui import qt
 
 from tomoscan.framereducer.method import ReduceMethod
 
-from tomwer.model.reconstruction.compute_dark_flat import (
+from tomwer.models.reconstruction.compute_dark_flat import (
     DEFAULT_EDF_SPEC_FLAT_PATTERN,
     DEFAULT_EDF_SPEC_DARK_PATTERN,
 )

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/tomwer/gui/reconstruction/multicor/MultiCoRTabWidget.py

@@ -36,7 +36,7 @@ class MultiCoRTabWidget(qt.QTabWidget):
             self._localPlatformSettings, settings_icons, TAB_LABEL_PLATFORM_SETTINGS
         )
         # results
-        self._resultsViewer = CoRScorePlot(self, variable_name="cor", backend=backend)
+        self._resultsViewer = CoRScorePlot(self, variable_name="CoR", backend=backend)
         results_icon = icons.getQIcon("results")
         self.addTab(self._resultsViewer, results_icon, "reconstructed slices")
 

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/tomwer/gui/reconstruction/multicor/MultiCoRWindow.py

@@ -13,7 +13,6 @@ from tomwer.gui.reconstruction.multicor.NabuAutoCorDiag import NabuAutoCorDiag
 from tomwer.gui.reconstruction.multicor.MultiCoRTabWidget import MultiCoRTabWidget
 from tomwer.gui.reconstruction.scores.control import ControlWidget
 from tomwer.gui.utils.buttons import TabBrowsersButtons
-from tomwer.gui.utils.scandescription import ScanNameLabelAndShape
 from tomwer.gui.reconstruction.cor.QCoRParams import QCoRParams as _QCoRParams
 
 _logger = logging.getLogger(__name__)
@@ -39,23 +38,26 @@ class MultiCoRWindow(qt.QMainWindow):
         self._mainWidget = qt.QWidget(self)
         self._mainWidget.setLayout(qt.QVBoxLayout())
 
-        self._scanInfo = ScanNameLabelAndShape(self)
-        self._mainWidget.layout().addWidget(self._scanInfo)
         self._tabWidget = MultiCoRTabWidget(self, backend=backend)
         self._mainWidget.layout().addWidget(self._tabWidget)
         self.setCentralWidget(self._mainWidget)
+
         # next and previous buttons for browsing the tab widget
+        self._buttonsWidget = qt.QWidget()
+        self._buttonsWidget.setLayout(qt.QHBoxLayout())
+        # Note: avoid using a DockWidget to avoid having a QSplitter :(
+        self._mainWidget.layout().addWidget(self._buttonsWidget)
+        self._buttonsWidget.layout().setSpacing(0)
+        self._buttonsWidget.layout().setContentsMargins(0, 0, 0, 0)
+
         self._browserButtons = TabBrowsersButtons(self)
-        self._dockWidgetBrwButtons = qt.QDockWidget(self)
-        self._dockWidgetBrwButtons.setWidget(self._browserButtons)
-        self.addDockWidget(qt.Qt.BottomDockWidgetArea, self._dockWidgetBrwButtons)
-        self._dockWidgetBrwButtons.setFeatures(qt.QDockWidget.DockWidgetMovable)
-        # control widget (validate, compute, cor positions)
+        self._buttonsWidget.layout().addWidget(self._browserButtons)
+        self._browserButtons.layout().setSpacing(2)
+        self._browserButtons.layout().setContentsMargins(0, 0, 0, 0)
         self._multicorControl = ControlWidget(self)
-        self._dockWidgetCtrl = qt.QDockWidget(self)
-        self._dockWidgetCtrl.setWidget(self._multicorControl)
-        self.addDockWidget(qt.Qt.BottomDockWidgetArea, self._dockWidgetCtrl)
-        self._dockWidgetCtrl.setFeatures(qt.QDockWidget.DockWidgetMovable)
+        self._buttonsWidget.layout().addWidget(self._multicorControl)
+        self._multicorControl.layout().setSpacing(2)
+        self._multicorControl.layout().setContentsMargins(0, 0, 0, 0)
 
         # connect signal / slot
         self._multicorControl.sigValidateRequest.connect(self.sigValidated)
@@ -103,7 +105,6 @@ class MultiCoRWindow(qt.QMainWindow):
     def setScan(self, scan):
         self._scan = scan
         self._tabWidget.setScan(scan)
-        self._scanInfo.setScan(scan)
         self._updateSinogramLine()
         self._loadEstimatedCorFromScan(scan)
 

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/tomwer/gui/reconstruction/multipag/DBScorePlot.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
 from tomwer.core.scan.scanbase import TomwerScanBase
-from tomwer.gui.reconstruction.scores.scoreplot import DelaBetaSelection
+from tomwer.gui.reconstruction.scores.scoreplot import DeltaBetaSelection
 from tomwer.gui.reconstruction.scores.scoreplot import ScorePlot as _ScorePlot
 from tomwer.tasks.reconstruction.nabu.multipag import MultiPagTask
 
 
-class DBScorePlot(_ScorePlot, constructor=DelaBetaSelection):
+class DBScorePlot(_ScorePlot, constructor=DeltaBetaSelection):
     """Score plot dedicated to center delta / beta values."""
 
     def _updateScores(self) -> None:

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/tomwer/gui/reconstruction/multipag/MultiPagWindowBase.py

@@ -6,7 +6,6 @@ from tomwer.core.reconstruction.multi.scores.ScoreMethod import ScoreMethod
 from tomwer.gui.reconstruction.multipag.MultiPagTabWidget import MultiPagTabWidget
 from tomwer.gui.reconstruction.scores.control import ControlWidget
 from tomwer.gui.utils.buttons import TabBrowsersButtons
-from tomwer.gui.utils.scandescription import ScanNameLabelAndShape
 from tomwer.gui.reconstruction.multipag.QMultiPagParams import (
     QMultiPagParams as _QMultiPagParams,
 )
@@ -28,23 +27,28 @@ class MultiPagWindowBase(qt.QMainWindow):
         # central widget
         self._mainWidget = qt.QWidget(self)
         self._mainWidget.setLayout(qt.QVBoxLayout())
-        self._scanInfo = ScanNameLabelAndShape(self)
-        self._mainWidget.layout().addWidget(self._scanInfo)
         self._tabWidget = MultiPagTabWidget(self, backend=backend)
         self._mainWidget.layout().addWidget(self._tabWidget)
         self.setCentralWidget(self._mainWidget)
+
         # next and previous buttons for browsing the tab widget
+        # Note: avoid using a DockWidget to avoid having a QSplitter :(
+        self._buttonsWidget = qt.QWidget()
+        self._buttonsWidget.setLayout(qt.QHBoxLayout())
+        self._mainWidget.layout().addWidget(self._buttonsWidget)
+        self._buttonsWidget.layout().setSpacing(0)
+        self._buttonsWidget.layout().setContentsMargins(0, 0, 0, 0)
+
         self._browserButtons = TabBrowsersButtons(self)
-        self._dockWidgetBrwButtons = qt.QDockWidget(self)
-        self._dockWidgetBrwButtons.setWidget(self._browserButtons)
-        self.addDockWidget(qt.Qt.BottomDockWidgetArea, self._dockWidgetBrwButtons)
-        self._dockWidgetBrwButtons.setFeatures(qt.QDockWidget.DockWidgetMovable)
+        self._buttonsWidget.layout().addWidget(self._browserButtons)
+        self._browserButtons.layout().setSpacing(2)
+        self._browserButtons.layout().setContentsMargins(0, 0, 0, 0)
+
         # control widget (validate, compute, cor positions)
         self._sadbControl = ControlWidget(self)
-        self._dockWidgetCtrl = qt.QDockWidget(self)
-        self._dockWidgetCtrl.setWidget(self._sadbControl)
-        self.addDockWidget(qt.Qt.BottomDockWidgetArea, self._dockWidgetCtrl)
-        self._dockWidgetCtrl.setFeatures(qt.QDockWidget.DockWidgetMovable)
+        self._buttonsWidget.layout().addWidget(self._sadbControl)
+        self._sadbControl.layout().setSpacing(2)
+        self._sadbControl.layout().setContentsMargins(0, 0, 0, 0)
 
         # expose signals
         self.sigConfigurationChanged = self._tabWidget.sigConfigurationChanged
@@ -75,7 +79,6 @@ class MultiPagWindowBase(qt.QMainWindow):
     def setScan(self, scan):
         self._scan = scan
         self._tabWidget.setScan(scan)
-        self._scanInfo.setScan(scan)
 
     def getScan(self):
         return self._scan

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/tomwer/gui/reconstruction/nabu/castvolume.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from silx.gui import qt
 from silx.gui.utils import blockSignals
 
-from tomwer.model.reconstruction.cast_volume import InputModel
+from tomwer.models.reconstruction.cast_volume import InputModel
 from tomwer.core.reconstruction.output import NabuOutputFileFormat
 from tomwer.gui.reconstruction.nabu.nabuconfig.output import QNabuFileFormatComboBox
 from nxtomomill.models.utils import convert_str_to_tuple

{tomwer-2.0.0.dev0 → tomwer-2.0.0.dev2}/src/tomwer/gui/reconstruction/nabu/volume/NabuVolumeWidget.py

@@ -6,7 +6,7 @@ from tomwer.core.reconstruction.nabu.stages import NabuStages
 from tomwer.gui import icons
 from tomwer.gui.reconstruction.nabu.nabuconfig.base import _NabuStageConfigBase
 from tomwer.gui.utils._outputdir import OutputDirWidget as _OutputDirWidget
-from tomwer.model.reconstruction.nabu_volume import InputModel
+from tomwer.models.reconstruction.nabu_volume import InputModel
 
 from .SliceSelector import SliceSelector