tomwer 1.3.26__py3-none-any.whl → 1.4.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- orangecontrib/tomwer/orange/managedprocess.py +1 -29
- orangecontrib/tomwer/orange/settings.py +2 -28
- orangecontrib/tomwer/tests/TestAcquisition.py +220 -0
- orangecontrib/tomwer/tutorials/append_raw_darks_and_flats_frames_to_NXtomos.ows +2 -2
- orangecontrib/tomwer/tutorials/copy_reduced_darks_and_flats_meth1.ows +1 -1
- orangecontrib/tomwer/tutorials/{icat_publication.ows → drac_publication.ows} +7 -21
- orangecontrib/tomwer/tutorials/id16b/ID16b_full_volume.ows +22 -0
- orangecontrib/tomwer/tutorials/id16b/ID16b_insitu.ows +302 -0
- orangecontrib/tomwer/tutorials/id16b/ID16b_normalization.ows +218 -0
- orangecontrib/tomwer/tutorials/simple_volume_to_slurm_reconstruction.ows +29 -24
- orangecontrib/tomwer/tutorials/test_cor.ows +19 -0
- orangecontrib/tomwer/tutorials/volume_casting_on_slurm.ows +54 -0
- orangecontrib/tomwer/widgets/__init__.py +3 -5
- orangecontrib/tomwer/widgets/cluster/FutureSupervisorOW.py +35 -54
- orangecontrib/tomwer/widgets/cluster/SlurmClusterOW.py +1 -31
- orangecontrib/tomwer/widgets/control/AdvancementOW.py +1 -29
- orangecontrib/tomwer/widgets/control/DataDiscoveryOW.py +5 -4
- orangecontrib/tomwer/widgets/control/DataListenerOW.py +1 -29
- orangecontrib/tomwer/widgets/control/DataSelectorOW.py +11 -30
- orangecontrib/tomwer/widgets/control/DataTransfertOW.py +2 -28
- orangecontrib/tomwer/widgets/control/DataValidatorOW.py +1 -28
- orangecontrib/tomwer/widgets/control/DataWatcherOW.py +1 -28
- orangecontrib/tomwer/widgets/control/EDF2NXTomomillOW.py +48 -51
- orangecontrib/tomwer/widgets/control/EmailOW.py +12 -2
- orangecontrib/tomwer/widgets/control/FilterOW.py +1 -28
- orangecontrib/tomwer/widgets/control/NXTomomillOW.py +37 -53
- orangecontrib/tomwer/widgets/control/NXtomoConcatenate.py +21 -20
- orangecontrib/tomwer/widgets/control/NotifierOW.py +9 -28
- orangecontrib/tomwer/widgets/control/ReduceDarkFlatSelectorOW.py +3 -2
- orangecontrib/tomwer/widgets/control/SingleTomoObjOW.py +1 -27
- orangecontrib/tomwer/widgets/control/TimerOW.py +9 -28
- orangecontrib/tomwer/widgets/control/TomoObjSeriesOW.py +58 -0
- orangecontrib/tomwer/widgets/control/VolumeSelector.py +8 -30
- orangecontrib/tomwer/widgets/control/icons/nxtomomill.svg +173 -119
- orangecontrib/tomwer/widgets/control/icons/reduced_darkflat_selector.png +0 -0
- orangecontrib/tomwer/widgets/control/icons/reduced_darkflat_selector.svg +55 -195
- orangecontrib/tomwer/widgets/control/icons/{tomoobjserie.svg → tomoobjseries.svg} +2 -2
- orangecontrib/tomwer/widgets/dataportal/PublishProcessedDataOW.py +172 -0
- orangecontrib/tomwer/widgets/{icat → dataportal}/__init__.py +2 -2
- orangecontrib/tomwer/widgets/debugtools/DatasetGeneratorOW.py +2 -29
- orangecontrib/tomwer/widgets/debugtools/ObjectInspectorOW.py +1 -29
- orangecontrib/tomwer/widgets/edit/DarkFlatPatchOW.py +48 -73
- orangecontrib/tomwer/widgets/edit/ImageKeyEditorOW.py +48 -75
- orangecontrib/tomwer/widgets/edit/ImageKeyUpgraderOW.py +5 -30
- orangecontrib/tomwer/widgets/edit/NXtomoEditorOW.py +51 -52
- orangecontrib/tomwer/widgets/other/PythonScriptOW.py +22 -10
- orangecontrib/tomwer/widgets/reconstruction/AxisOW.py +51 -60
- orangecontrib/tomwer/widgets/reconstruction/CastNabuVolumeOW.py +22 -68
- orangecontrib/tomwer/widgets/reconstruction/DarkRefAndCopyOW.py +3 -30
- orangecontrib/tomwer/widgets/reconstruction/NabuHelicalPrepareWeightsDoubleOW.py +21 -19
- orangecontrib/tomwer/widgets/reconstruction/NabuOW.py +7 -70
- orangecontrib/tomwer/widgets/reconstruction/NabuVolumeOW.py +41 -84
- orangecontrib/tomwer/widgets/reconstruction/SAAxisOW.py +15 -40
- orangecontrib/tomwer/widgets/reconstruction/SADeltaBetaOW.py +13 -35
- orangecontrib/tomwer/widgets/reconstruction/SinoNormOW.py +2 -30
- orangecontrib/tomwer/widgets/stitching/ZStitchingConfigOW.py +11 -11
- orangecontrib/tomwer/widgets/utils.py +2 -29
- orangecontrib/tomwer/widgets/visualization/DataViewerOW.py +1 -27
- orangecontrib/tomwer/widgets/visualization/DiffViewerOW.py +1 -27
- orangecontrib/tomwer/widgets/visualization/NXtomoMetadataViewerOW.py +1 -1
- orangecontrib/tomwer/widgets/visualization/RadioStackOW.py +2 -28
- orangecontrib/tomwer/widgets/visualization/SampleMovedOW.py +1 -27
- orangecontrib/tomwer/widgets/visualization/SinogramViewerOW.py +1 -27
- orangecontrib/tomwer/widgets/visualization/SliceStackOW.py +2 -28
- tomwer/__init__.py +3 -28
- tomwer/__main__.py +8 -4
- tomwer/app/__init__.py +2 -0
- tomwer/app/axis.py +8 -10
- tomwer/app/canvas.py +23 -29
- tomwer/app/canvas_launcher/config.py +14 -102
- tomwer/app/canvas_launcher/environ.py +5 -8
- tomwer/app/canvas_launcher/mainwindow.py +175 -69
- tomwer/app/canvas_launcher/splash.py +1 -3
- tomwer/app/canvas_launcher/utils.py +47 -0
- tomwer/app/canvas_launcher/widgetsscheme.py +3 -10
- tomwer/app/diffframe.py +2 -0
- tomwer/app/imagekeyeditor.py +2 -1
- tomwer/app/imagekeyupgrader.py +2 -0
- tomwer/app/multicor.py +5 -2
- tomwer/app/multipag.py +16 -5
- tomwer/app/nabuapp.py +2 -1
- tomwer/app/nxtomoeditor.py +17 -12
- tomwer/app/patchrawdarkflat.py +2 -0
- tomwer/app/radiostack.py +3 -2
- tomwer/app/reducedarkflat.py +3 -0
- tomwer/app/samplemoved.py +2 -0
- tomwer/app/scanviewer.py +2 -0
- tomwer/app/sinogramviewer.py +2 -0
- tomwer/app/slicestack.py +11 -13
- tomwer/app/stitching/common.py +431 -0
- tomwer/app/stopdatalistener.py +3 -0
- tomwer/app/ystitching.py +26 -0
- tomwer/app/zstitching.py +8 -363
- tomwer/core/__init__.py +2 -28
- tomwer/core/cluster/__init__.py +3 -0
- tomwer/core/cluster/cluster.py +10 -26
- tomwer/core/futureobject.py +17 -43
- tomwer/core/log/__init__.py +2 -0
- tomwer/core/log/processlog.py +0 -28
- tomwer/core/process/cluster/supervisor.py +52 -34
- tomwer/core/process/conditions/filters.py +3 -28
- tomwer/core/process/control/datalistener/datalistener.py +7 -75
- tomwer/core/process/control/datalistener/rpcserver.py +8 -38
- tomwer/core/process/control/datawatcher/datawatcher.py +11 -40
- tomwer/core/process/control/datawatcher/datawatcherobserver.py +30 -64
- tomwer/core/process/control/datawatcher/datawatcherprocess.py +11 -32
- tomwer/core/process/control/datawatcher/edfdwprocess.py +2 -27
- tomwer/core/process/control/datawatcher/hdf5dwprocess.py +1 -26
- tomwer/core/process/control/datawatcher/status.py +1 -26
- tomwer/core/process/control/emailnotifier.py +11 -23
- tomwer/core/process/control/nxtomoconcatenate.py +20 -18
- tomwer/core/process/control/nxtomomill.py +9 -44
- tomwer/core/process/control/scanlist.py +0 -27
- tomwer/core/process/control/scantransfer.py +15 -13
- tomwer/core/process/control/scanvalidator.py +4 -30
- tomwer/core/process/control/{test → tests}/test_concatenate_nxtomos.py +5 -5
- tomwer/core/process/control/timer.py +1 -27
- tomwer/core/process/control/tomoobjseries.py +12 -0
- tomwer/core/process/drac/binning.py +37 -0
- tomwer/core/process/drac/dracbase.py +170 -0
- tomwer/core/process/drac/gallery.py +109 -0
- tomwer/core/process/drac/output.py +12 -0
- tomwer/core/process/drac/processeddataset.py +147 -0
- tomwer/core/process/drac/publish.py +118 -0
- tomwer/core/process/drac/rawdataset.py +142 -0
- tomwer/core/process/drac/tests/test_gallery.py +71 -0
- tomwer/core/process/drac/tests/test_icat_processed_dataset.py +80 -0
- tomwer/core/process/drac/tests/test_icat_raw_dataset.py +90 -0
- tomwer/core/process/edit/darkflatpatch.py +1 -28
- tomwer/core/process/edit/imagekeyeditor.py +4 -32
- tomwer/core/process/edit/nxtomoeditor.py +307 -0
- tomwer/core/process/edit/tests/test_darkflatpatch.py +243 -0
- tomwer/core/process/edit/tests/test_imagekey_editor.py +99 -0
- tomwer/core/process/output.py +9 -2
- tomwer/core/process/reconstruction/__init__.py +0 -26
- tomwer/core/process/reconstruction/axis/anglemode.py +1 -29
- tomwer/core/process/reconstruction/axis/axis.py +47 -804
- tomwer/core/process/reconstruction/axis/mode.py +89 -25
- tomwer/core/process/reconstruction/axis/params.py +131 -283
- tomwer/core/process/reconstruction/axis/projectiontype.py +0 -28
- tomwer/core/process/reconstruction/axis/side.py +8 -0
- tomwer/core/process/reconstruction/darkref/darkrefs.py +14 -39
- tomwer/core/process/reconstruction/darkref/darkrefscopy.py +7 -39
- tomwer/core/process/reconstruction/darkref/params.py +1 -28
- tomwer/core/process/reconstruction/nabu/castvolume.py +19 -34
- tomwer/core/process/reconstruction/nabu/nabucommon.py +18 -43
- tomwer/core/process/reconstruction/nabu/nabuscores.py +64 -68
- tomwer/core/process/reconstruction/nabu/nabuslices.py +63 -105
- tomwer/core/process/reconstruction/nabu/nabuvolume.py +44 -70
- tomwer/core/process/reconstruction/nabu/plane.py +10 -0
- tomwer/core/process/reconstruction/nabu/settings.py +1 -28
- tomwer/core/process/reconstruction/nabu/target.py +0 -28
- tomwer/core/process/reconstruction/nabu/test/test_castvolume.py +116 -0
- tomwer/core/process/reconstruction/nabu/test/test_nabu_utils.py +277 -0
- tomwer/core/process/reconstruction/nabu/test/test_nabunormalization.py +199 -0
- tomwer/core/process/reconstruction/nabu/utils.py +11 -60
- tomwer/core/process/reconstruction/normalization/normalization.py +2 -32
- tomwer/core/process/reconstruction/normalization/params.py +3 -35
- tomwer/core/process/reconstruction/output.py +14 -19
- tomwer/core/process/reconstruction/paramsbase.py +4 -33
- tomwer/core/process/reconstruction/saaxis/params.py +5 -33
- tomwer/core/process/reconstruction/saaxis/saaxis.py +22 -51
- tomwer/core/process/reconstruction/sadeltabeta/params.py +2 -31
- tomwer/core/process/reconstruction/sadeltabeta/sadeltabeta.py +18 -46
- tomwer/core/process/reconstruction/scores/params.py +9 -39
- tomwer/core/process/reconstruction/scores/scores.py +10 -42
- tomwer/core/process/reconstruction/tests/__init__.py +0 -0
- tomwer/core/process/reconstruction/tests/test_axis.py +46 -0
- tomwer/core/process/reconstruction/tests/test_darkref.py +33 -0
- tomwer/core/process/reconstruction/{test → tests}/test_saaxis.py +1 -27
- tomwer/core/process/reconstruction/tests/test_sadeltabeta.py +48 -0
- tomwer/core/process/reconstruction/{test → tests}/test_utils.py +4 -4
- tomwer/core/process/reconstruction/utils/cor.py +8 -4
- tomwer/core/process/script/python.py +1 -27
- tomwer/core/process/script/tests/test_script.py +41 -0
- tomwer/core/process/stitching/metadataholder.py +5 -4
- tomwer/core/process/stitching/nabustitcher.py +35 -5
- tomwer/core/process/stitching/tests/test_metadataholder.py +17 -0
- tomwer/core/process/task.py +20 -63
- tomwer/core/process/tests/__init__.py +0 -0
- tomwer/core/process/{test → tests}/test_conditions.py +1 -28
- tomwer/core/process/{test → tests}/test_dark_and_flat.py +1 -27
- tomwer/core/process/{test → tests}/test_data_listener.py +1 -27
- tomwer/core/process/{test → tests}/test_data_transfer.py +2 -28
- tomwer/core/process/{test → tests}/test_data_watcher.py +1 -27
- tomwer/core/process/{test → tests}/test_nabu.py +2 -33
- tomwer/core/process/{test → tests}/test_normalization.py +1 -26
- tomwer/core/process/{test → tests}/test_timer.py +1 -27
- tomwer/core/process/utils.py +2 -31
- tomwer/core/process/visualization/dataviewer.py +1 -26
- tomwer/core/process/visualization/diffviewer.py +1 -26
- tomwer/core/process/visualization/imagestackviewer.py +0 -26
- tomwer/core/process/visualization/radiostack.py +0 -26
- tomwer/core/process/visualization/samplemoved.py +0 -28
- tomwer/core/process/visualization/sinogramviewer.py +0 -27
- tomwer/core/process/visualization/slicestack.py +0 -28
- tomwer/core/process/visualization/tests/test_data_viewer.py +12 -0
- tomwer/core/process/visualization/tests/test_diff_viewer.py +12 -0
- tomwer/core/process/visualization/tests/test_image_stack_viewer.py +14 -0
- tomwer/core/process/visualization/tests/test_radio_stack.py +12 -0
- tomwer/core/process/visualization/tests/test_sample_moved.py +14 -0
- tomwer/core/process/visualization/tests/test_sinogram_viewer.py +13 -0
- tomwer/core/process/visualization/tests/test_slice_stack.py +13 -0
- tomwer/core/process/visualization/tests/test_volume_viewer.py +12 -0
- tomwer/core/process/visualization/volumeviewer.py +0 -29
- tomwer/core/scan/__init__.py +3 -27
- tomwer/core/scan/blissscan.py +5 -34
- tomwer/core/scan/edfscan.py +19 -53
- tomwer/core/scan/hdf5scan.py +2 -2
- tomwer/core/scan/nxtomoscan.py +48 -54
- tomwer/core/scan/scanbase.py +107 -203
- tomwer/core/scan/scanfactory.py +11 -41
- tomwer/core/scan/tests/__init__.py +0 -0
- tomwer/core/scan/tests/test_edf.py +25 -0
- tomwer/core/scan/tests/test_future_scan.py +35 -0
- tomwer/core/scan/tests/test_nxtomoscan.py +143 -0
- tomwer/core/scan/tests/test_process_registration.py +64 -0
- tomwer/core/settings.py +18 -40
- tomwer/core/tests/__init__.py +0 -0
- tomwer/core/tests/test_scanutils.py +26 -0
- tomwer/core/{test → tests}/test_utils.py +1 -28
- tomwer/core/tomwer_object.py +4 -0
- tomwer/core/utils/__init__.py +2 -0
- tomwer/core/utils/char.py +0 -28
- tomwer/core/utils/deprecation.py +12 -38
- tomwer/core/utils/dictutils.py +1 -3
- tomwer/core/utils/ftseriesutils.py +1 -27
- tomwer/core/utils/gpu.py +0 -28
- tomwer/core/utils/image.py +8 -39
- tomwer/core/utils/locker.py +1 -28
- tomwer/core/utils/logconfig.py +0 -27
- tomwer/core/utils/normalization.py +4 -31
- tomwer/core/utils/nxtomoutils.py +8 -38
- tomwer/core/utils/resource.py +0 -26
- tomwer/core/utils/scanutils.py +23 -52
- tomwer/core/utils/slurm.py +7 -30
- tomwer/core/utils/spec.py +6 -6
- tomwer/core/utils/tests/__init__.py +0 -0
- tomwer/core/utils/tests/test_image.py +30 -0
- tomwer/core/utils/tests/test_nxtomo.py +38 -0
- tomwer/core/utils/tests/test_scan_utils.py +46 -0
- tomwer/core/utils/tests/test_time.py +6 -0
- tomwer/core/utils/threads.py +0 -26
- tomwer/core/utils/time.py +0 -27
- tomwer/core/volume/__init__.py +4 -0
- tomwer/core/volume/edfvolume.py +1 -28
- tomwer/core/volume/hdf5volume.py +1 -28
- tomwer/core/volume/jp2kvolume.py +1 -27
- tomwer/core/volume/rawvolume.py +1 -28
- tomwer/core/volume/tests/test_volumes.py +21 -0
- tomwer/core/volume/tiffvolume.py +1 -28
- tomwer/core/volume/volumebase.py +5 -0
- tomwer/core/volume/volumefactory.py +7 -33
- tomwer/gui/__init__.py +0 -28
- tomwer/gui/cluster/__init__.py +2 -0
- tomwer/gui/cluster/slurm.py +297 -95
- tomwer/gui/cluster/supervisor.py +1 -27
- tomwer/gui/cluster/tests/__init__.py +0 -0
- tomwer/gui/cluster/{test → tests}/test_cluster.py +21 -26
- tomwer/gui/cluster/{test → tests}/test_supervisor.py +1 -27
- tomwer/gui/conditions/__init__.py +2 -0
- tomwer/gui/conditions/filter.py +1 -26
- tomwer/gui/configuration/__init__.py +2 -0
- tomwer/gui/control/__init__.py +2 -0
- tomwer/gui/control/actions.py +2 -28
- tomwer/gui/control/datadiscovery.py +4 -3
- tomwer/gui/control/datalist.py +64 -69
- tomwer/gui/control/datalistener.py +1 -39
- tomwer/gui/control/datareacheractions.py +1 -28
- tomwer/gui/control/datatransfert.py +2 -29
- tomwer/gui/control/datavalidator.py +3 -37
- tomwer/gui/control/datawatcher/__init__.py +0 -28
- tomwer/gui/control/datawatcher/configuration.py +1 -28
- tomwer/gui/control/datawatcher/datawatcher.py +3 -32
- tomwer/gui/control/datawatcher/datawatcherobserver.py +2 -28
- tomwer/gui/control/history.py +5 -35
- tomwer/gui/control/nxtomomill.py +3 -30
- tomwer/gui/control/observations.py +61 -55
- tomwer/gui/control/reducedarkflatselector.py +24 -20
- tomwer/gui/control/scanselectorwidget.py +2 -28
- tomwer/gui/control/selectorwidgetbase.py +17 -17
- tomwer/gui/control/series/__init__.py +0 -0
- tomwer/gui/control/{serie/seriecreator.py → series/seriescreator.py} +214 -235
- tomwer/gui/control/series/serieswaiter.py +0 -0
- tomwer/gui/control/series/test/test_creator.py +424 -0
- tomwer/gui/control/series/test/test_nxtomo_concatenate.py +21 -0
- tomwer/gui/control/singletomoobj.py +1 -1
- tomwer/gui/control/tests/__init__.py +0 -0
- tomwer/gui/control/tests/test_datalist.py +47 -0
- tomwer/gui/control/{test → tests}/test_datalistener.py +1 -28
- tomwer/gui/control/tests/test_datavalidator.py +27 -0
- tomwer/gui/control/{test → tests}/test_inputwidget.py +1 -27
- tomwer/gui/control/tests/test_process_manager.py +38 -0
- tomwer/gui/control/tests/test_scan_observations.py +23 -0
- tomwer/gui/control/tests/test_scanselector.py +42 -0
- tomwer/gui/control/{test → tests}/test_scanvalidator.py +1 -27
- tomwer/gui/control/{test → tests}/test_volume_dialog.py +2 -30
- tomwer/gui/control/{test → tests}/test_volumeselector.py +1 -27
- tomwer/gui/control/volumeselectorwidget.py +2 -30
- tomwer/gui/dataportal/__init__.py +2 -0
- tomwer/gui/{icat → dataportal}/createscreenshots.py +3 -2
- tomwer/gui/dataportal/gallery.py +133 -0
- tomwer/gui/dataportal/outputformat.py +0 -0
- tomwer/gui/dataportal/publish.py +96 -0
- tomwer/gui/dataportal/tests/test_create_screenshots_gui.py +23 -0
- tomwer/gui/dataportal/tests/test_gallery_gui.py +21 -0
- tomwer/gui/debugtools/__init__.py +2 -0
- tomwer/gui/debugtools/datasetgenerator.py +1 -30
- tomwer/gui/debugtools/objectinspector.py +1 -29
- tomwer/gui/dialog/QDataDialog.py +89 -0
- tomwer/gui/{qfolderdialog.py → dialog/QVolumeDialog.py} +8 -107
- tomwer/gui/dialog/__init__.py +1 -0
- tomwer/gui/edit/__init__.py +2 -0
- tomwer/gui/edit/dkrfpatch.py +52 -87
- tomwer/gui/edit/imagekeyeditor.py +18 -54
- tomwer/gui/edit/nxtomoeditor.py +113 -300
- tomwer/gui/edit/nxtomowarmer.py +3 -2
- tomwer/gui/edit/tests/__init__.py +0 -0
- tomwer/gui/edit/{test → tests}/test_dkrf_patch.py +3 -29
- tomwer/gui/edit/{test → tests}/test_image_key_editor.py +1 -27
- tomwer/gui/edit/{test → tests}/test_nx_editor.py +45 -23
- tomwer/gui/fonts.py +5 -0
- tomwer/gui/icons.py +28 -66
- tomwer/gui/illustrations.py +4 -34
- tomwer/gui/imagefromfile.py +5 -30
- tomwer/gui/metadataloader.py +36 -0
- tomwer/gui/qconfigfile.py +3 -0
- tomwer/gui/qlefilesystem.py +3 -0
- tomwer/gui/reconstruction/__init__.py +2 -0
- tomwer/gui/reconstruction/axis/AxisMainWindow.py +275 -0
- tomwer/gui/reconstruction/axis/AxisOptionsWidget.py +313 -0
- tomwer/gui/reconstruction/axis/AxisSettingsWidget.py +797 -0
- tomwer/gui/reconstruction/axis/AxisWidget.py +534 -0
- tomwer/gui/reconstruction/axis/CalculationWidget.py +218 -0
- tomwer/gui/reconstruction/axis/CompareImages.py +11 -44
- tomwer/gui/reconstruction/axis/ControlWidget.py +285 -0
- tomwer/gui/reconstruction/axis/EstimatedCORWidget.py +394 -0
- tomwer/gui/reconstruction/axis/EstimatedCorComboBox.py +118 -0
- tomwer/gui/reconstruction/axis/InputWidget.py +347 -0
- tomwer/gui/reconstruction/axis/ManualFramesSelection.py +168 -0
- tomwer/gui/reconstruction/axis/__init__.py +2 -2
- tomwer/gui/reconstruction/darkref/__init__.py +0 -27
- tomwer/gui/reconstruction/darkref/darkrefcopywidget.py +5 -34
- tomwer/gui/reconstruction/darkref/darkrefwidget.py +1 -27
- tomwer/gui/reconstruction/nabu/castvolume.py +40 -59
- tomwer/gui/reconstruction/nabu/check.py +7 -33
- tomwer/gui/reconstruction/nabu/nabuconfig/base.py +7 -34
- tomwer/gui/reconstruction/nabu/nabuconfig/ctf.py +6 -5
- tomwer/gui/reconstruction/nabu/nabuconfig/nabuconfig.py +10 -69
- tomwer/gui/reconstruction/nabu/nabuconfig/output.py +3 -47
- tomwer/gui/reconstruction/nabu/nabuconfig/phase.py +54 -36
- tomwer/gui/reconstruction/nabu/nabuconfig/preprocessing.py +103 -54
- tomwer/gui/reconstruction/nabu/nabuconfig/reconstruction.py +116 -65
- tomwer/gui/reconstruction/nabu/nabuflow.py +31 -61
- tomwer/gui/reconstruction/nabu/platform.py +94 -0
- tomwer/gui/reconstruction/nabu/slices.py +81 -45
- tomwer/gui/reconstruction/nabu/slurm.py +1 -27
- tomwer/gui/reconstruction/nabu/test/test_cast_volume.py +82 -0
- tomwer/gui/reconstruction/nabu/test/test_check.py +66 -0
- tomwer/gui/reconstruction/nabu/test/test_ctf.py +46 -0
- tomwer/gui/reconstruction/nabu/test/test_helical.py +21 -0
- tomwer/gui/reconstruction/nabu/test/test_nabu_preprocessing.py +81 -0
- tomwer/gui/reconstruction/nabu/volume.py +62 -90
- tomwer/gui/reconstruction/normalization/intensity.py +5 -32
- tomwer/gui/reconstruction/normalization/test/test_intensity.py +89 -0
- tomwer/gui/reconstruction/saaxis/corrangeselector.py +32 -56
- tomwer/gui/reconstruction/saaxis/dimensionwidget.py +56 -96
- tomwer/gui/reconstruction/saaxis/saaxis.py +17 -38
- tomwer/gui/reconstruction/saaxis/sliceselector.py +8 -39
- tomwer/gui/reconstruction/sadeltabeta/saadeltabeta.py +19 -37
- tomwer/gui/reconstruction/scores/control.py +2 -30
- tomwer/gui/reconstruction/scores/scoreplot.py +23 -49
- tomwer/gui/reconstruction/tests/__init__.py +0 -0
- tomwer/gui/reconstruction/{test → tests}/test_axis.py +23 -49
- tomwer/gui/reconstruction/{test → tests}/test_nabu.py +16 -31
- tomwer/gui/reconstruction/{test → tests}/test_saaxis.py +10 -37
- tomwer/gui/reconstruction/{test → tests}/test_sadeltabeta.py +1 -26
- tomwer/gui/samplemoved/__init__.py +2 -30
- tomwer/gui/samplemoved/selectiontable.py +3 -33
- tomwer/gui/settings.py +7 -0
- tomwer/gui/stackplot.py +33 -661
- tomwer/gui/stacks.py +261 -135
- tomwer/gui/stitching/SingleAxisStitchingWidget.py +326 -0
- tomwer/gui/stitching/StitchingOptionsWidget.py +438 -0
- tomwer/gui/stitching/StitchingWindow.py +586 -0
- tomwer/gui/stitching/__init__.py +2 -0
- tomwer/gui/stitching/alignment.py +90 -0
- tomwer/gui/stitching/axisorderedlist.py +44 -34
- tomwer/gui/stitching/config/axisparams.py +25 -11
- tomwer/gui/stitching/config/output.py +6 -5
- tomwer/gui/stitching/config/positionoveraxis.py +313 -51
- tomwer/gui/stitching/config/stitchingstrategies.py +22 -16
- tomwer/gui/stitching/config/tests/test_axisparams.py +25 -0
- tomwer/gui/stitching/config/tomoobjdetails.py +3 -5
- tomwer/gui/stitching/normalization.py +1 -0
- tomwer/gui/stitching/preview.py +59 -0
- tomwer/gui/stitching/singleaxis.py +57 -0
- tomwer/gui/stitching/stitchandbackground.py +3 -2
- tomwer/gui/stitching/stitching_preview.py +44 -36
- tomwer/gui/stitching/stitching_raw.py +5 -3
- tomwer/gui/stitching/tests/test_ZStitchingWindow.py +88 -0
- tomwer/gui/stitching/tests/test_axis_ordered_list.py +21 -0
- tomwer/gui/stitching/tests/test_normalization.py +27 -0
- tomwer/gui/stitching/tests/test_preview.py +68 -0
- tomwer/gui/stitching/tests/test_stitching_raw.py +110 -0
- tomwer/gui/stitching/tests/utils.py +92 -0
- tomwer/gui/stitching/utils.py +14 -0
- tomwer/gui/stitching/z_stitching/fineestimation.py +5 -33
- tomwer/gui/stitching/z_stitching/tests/test_fine_estimation.py +35 -0
- tomwer/gui/stitching/z_stitching/tests/test_raw_estimation.py +215 -0
- tomwer/gui/stitching/z_stitching/tests/test_stitching_window.py +51 -0
- tomwer/gui/tests/__init__.py +0 -0
- tomwer/gui/tests/test_axis_gui.py +43 -0
- tomwer/gui/{test → tests}/test_qfolder_dialog.py +1 -1
- tomwer/gui/utils/RangeWidget.py +44 -0
- tomwer/gui/utils/buttons.py +4 -3
- tomwer/gui/utils/completer.py +2 -33
- tomwer/gui/utils/flow.py +11 -40
- tomwer/gui/utils/gpu.py +60 -0
- tomwer/gui/utils/illustrations.py +1 -26
- tomwer/gui/utils/inputwidget.py +35 -73
- tomwer/gui/utils/lineselector/lineselector.py +9 -46
- tomwer/gui/utils/loadingmode.py +81 -0
- tomwer/gui/utils/qt_utils.py +9 -0
- tomwer/gui/utils/sandboxes.py +1 -26
- tomwer/gui/utils/scandescription.py +2 -31
- tomwer/gui/utils/scrollarea.py +6 -55
- tomwer/gui/utils/slider.py +4 -28
- tomwer/gui/utils/splashscreen.py +0 -28
- tomwer/gui/utils/step.py +14 -13
- tomwer/gui/utils/tests/test_completer.py +41 -0
- tomwer/gui/utils/tests/test_line_selector.py +21 -0
- tomwer/gui/utils/tests/test_splashscreen.py +8 -0
- tomwer/gui/utils/tests/test_vignettes.py +68 -0
- tomwer/gui/utils/unitsystem.py +15 -69
- tomwer/gui/utils/utils.py +4 -5
- tomwer/gui/utils/vignettes.py +10 -41
- tomwer/gui/utils/waiterthread.py +0 -26
- tomwer/gui/visualization/__init__.py +2 -0
- tomwer/gui/visualization/dataviewer.py +68 -421
- tomwer/gui/visualization/diffviewer/diffviewer.py +2 -30
- tomwer/gui/visualization/diffviewer/shiftwidget.py +4 -29
- tomwer/gui/visualization/fullscreenplot.py +5 -5
- tomwer/gui/visualization/imagestack.py +403 -0
- tomwer/gui/visualization/nxtomometadata.py +0 -4
- tomwer/gui/visualization/reconstructionparameters.py +14 -32
- tomwer/gui/visualization/scanoverview.py +33 -66
- tomwer/gui/visualization/sinogramviewer.py +2 -28
- tomwer/gui/visualization/test/__init__.py +0 -28
- tomwer/gui/visualization/test/test_dataviewer.py +1 -28
- tomwer/gui/visualization/test/test_diffviewer.py +1 -28
- tomwer/gui/visualization/test/test_nx_tomo_metadata_viewer.py +0 -5
- tomwer/gui/visualization/test/test_reconstruction_parameters.py +1 -27
- tomwer/gui/visualization/test/test_sinogramviewer.py +1 -28
- tomwer/gui/visualization/test/test_stacks.py +184 -115
- tomwer/gui/visualization/test/test_volumeviewer.py +3 -2
- tomwer/gui/visualization/tomoobjoverview.py +2 -2
- tomwer/gui/visualization/volumeoverview.py +3 -2
- tomwer/gui/visualization/volumeviewer.py +47 -43
- tomwer/io/__init__.py +2 -0
- tomwer/io/utils/h5pyutils.py +1 -27
- tomwer/io/utils/test/test_raw_and_processed_data.py +10 -0
- tomwer/io/utils/test/test_utils.py +67 -0
- tomwer/io/utils/utils.py +2 -31
- tomwer/resources/__init__.py +13 -33
- tomwer/resources/gui/icons/edit_downstream.svg +114 -0
- tomwer/resources/gui/icons/edit_upstream.svg +112 -0
- tomwer/resources/gui/icons/free_edition.svg +23 -0
- tomwer/resources/gui/icons/icat_gallery_opts.png +0 -0
- tomwer/resources/gui/icons/icat_gallery_opts.svg +80 -0
- tomwer/resources/gui/icons/search.png +0 -0
- tomwer/resources/gui/icons/search.svg +23 -0
- tomwer/resources/gui/icons/warning.png +0 -0
- tomwer/synctools/__init__.py +2 -0
- tomwer/synctools/axis.py +1 -27
- tomwer/synctools/darkref.py +1 -26
- tomwer/synctools/datalistener.py +1 -27
- tomwer/synctools/datatransfert.py +2 -27
- tomwer/synctools/imageloaderthread.py +1 -28
- tomwer/synctools/rsyncmanager.py +1 -25
- tomwer/synctools/saaxis.py +1 -26
- tomwer/synctools/sadeltabeta.py +1 -26
- tomwer/synctools/stacks/control/datalistener.py +1 -26
- tomwer/synctools/stacks/processingstack.py +4 -33
- tomwer/synctools/stacks/reconstruction/axis.py +6 -53
- tomwer/synctools/stacks/reconstruction/castvolume.py +12 -43
- tomwer/synctools/stacks/reconstruction/dkrefcopy.py +4 -27
- tomwer/synctools/stacks/reconstruction/nabu.py +3 -28
- tomwer/synctools/stacks/reconstruction/normalization.py +2 -27
- tomwer/synctools/stacks/reconstruction/saaxis.py +2 -27
- tomwer/synctools/stacks/reconstruction/sadeltabeta.py +2 -27
- tomwer/synctools/tests/__init__.py +0 -0
- tomwer/synctools/{test → tests}/test_darkRefs.py +16 -40
- tomwer/synctools/{test → tests}/test_foldertransfer.py +2 -33
- tomwer/synctools/utils/scanstages.py +2 -31
- tomwer/tests/__init__.py +1 -0
- tomwer/tests/app/test_stitching.py +95 -0
- tomwer/tests/datasets.py +1 -5
- tomwer/tests/orangecontrib/tomwer/widgets/cluster/tests/test_future_supervisorow.py +48 -0
- tomwer/tests/orangecontrib/tomwer/widgets/cluster/tests/test_slurm_clusterow.py +40 -0
- tomwer/tests/orangecontrib/tomwer/widgets/control/tests/test_advancement.py +8 -0
- tomwer/tests/orangecontrib/tomwer/widgets/control/tests/test_data_validator.py +55 -0
- tomwer/tests/orangecontrib/tomwer/widgets/control/tests/test_datadiscovery.py +129 -0
- tomwer/tests/orangecontrib/tomwer/widgets/control/tests/test_datalistener.py +111 -0
- tomwer/tests/orangecontrib/tomwer/widgets/control/tests/test_dataselector.py +69 -0
- tomwer/tests/orangecontrib/tomwer/widgets/control/tests/test_datawatcher.py +411 -0
- tomwer/tests/orangecontrib/tomwer/widgets/control/tests/test_emailow.py +29 -0
- tomwer/tests/orangecontrib/tomwer/widgets/control/tests/test_notifier.py +24 -0
- tomwer/tests/orangecontrib/tomwer/widgets/control/tests/test_nxtomo_concatenate_ow.py +64 -0
- tomwer/tests/orangecontrib/tomwer/widgets/control/tests/test_nxtomomill.py +133 -0
- tomwer/tests/orangecontrib/tomwer/widgets/control/tests/test_reduce_dark_flat_selector.py +40 -0
- tomwer/tests/orangecontrib/tomwer/widgets/control/tests/test_singletomoobj.py +40 -0
- tomwer/tests/orangecontrib/tomwer/widgets/control/tests/test_timerow.py +25 -0
- tomwer/tests/orangecontrib/tomwer/widgets/control/tests/test_tomoobj_series.py +96 -0
- tomwer/tests/orangecontrib/tomwer/widgets/control/tests/test_volume_selector.py +69 -0
- orangecontrib/tomwer/widgets/edit/test/test_image_key_editor.py → tomwer/tests/orangecontrib/tomwer/widgets/debugtools/tests/test_dataset_generator.py +17 -16
- tomwer/tests/orangecontrib/tomwer/widgets/debugtools/tests/test_object_inspector.py +36 -0
- {orangecontrib/tomwer/widgets/edit/test → tomwer/tests/orangecontrib/tomwer/widgets/edit/tests}/test_dark_flat_patch.py +1 -27
- tomwer/tests/orangecontrib/tomwer/widgets/edit/tests/test_image_key_editor.py +30 -0
- tomwer/tests/orangecontrib/tomwer/widgets/edit/tests/test_nxtomo_editor.py +138 -0
- tomwer/tests/orangecontrib/tomwer/widgets/other/tests/test_pythonscript.py +31 -0
- tomwer/tests/orangecontrib/tomwer/widgets/reconstruction/tests/test_axis.py +199 -0
- tomwer/tests/orangecontrib/tomwer/widgets/reconstruction/tests/test_cast_volumeow.py +58 -0
- tomwer/tests/orangecontrib/tomwer/widgets/reconstruction/tests/test_dark_refs_widget.py +136 -0
- tomwer/tests/orangecontrib/tomwer/widgets/reconstruction/tests/test_delta_beta_selector.py +15 -0
- tomwer/tests/orangecontrib/tomwer/widgets/reconstruction/tests/test_i_norm.py +200 -0
- tomwer/tests/orangecontrib/tomwer/widgets/reconstruction/tests/test_nabu_helical_prepare_weights_double.py +20 -0
- tomwer/tests/orangecontrib/tomwer/widgets/reconstruction/tests/test_nabu_volume.py +74 -0
- tomwer/tests/orangecontrib/tomwer/widgets/reconstruction/tests/test_nabu_widget.py +107 -0
- tomwer/tests/orangecontrib/tomwer/widgets/reconstruction/tests/test_sa_delta_beta.py +194 -0
- tomwer/tests/orangecontrib/tomwer/widgets/reconstruction/tests/test_saaxis.py +194 -0
- tomwer/tests/orangecontrib/tomwer/widgets/stitching/tests/test_zstitching.py +313 -0
- tomwer/tests/orangecontrib/tomwer/widgets/tests/test_conditions.py +85 -0
- tomwer/tests/orangecontrib/tomwer/widgets/tests/test_darkref.py +225 -0
- tomwer/tests/orangecontrib/tomwer/widgets/tests/test_foldertransfert.py +105 -0
- tomwer/tests/orangecontrib/tomwer/widgets/visualization/tests/test_dataviewerow.py +57 -0
- tomwer/tests/orangecontrib/tomwer/widgets/visualization/tests/test_diffviewerow.py +39 -0
- tomwer/tests/orangecontrib/tomwer/widgets/visualization/tests/test_nxtomo_metadata_viewer.py +29 -0
- tomwer/tests/orangecontrib/tomwer/widgets/visualization/tests/test_radio_stackow.py +31 -0
- tomwer/tests/orangecontrib/tomwer/widgets/visualization/tests/test_sample_movedow.py +46 -0
- tomwer/tests/orangecontrib/tomwer/widgets/visualization/tests/test_sinogram_viewerow.py +31 -0
- tomwer/tests/orangecontrib/tomwer/widgets/visualization/tests/test_slice_stackow.py +31 -0
- tomwer/tests/orangecontrib/tomwer/widgets/visualization/tests/test_volume_viewerow.py +32 -0
- tomwer/tests/test_ewoks/test_conversion.py +104 -0
- tomwer/tests/test_ewoks/test_single_node_execution.py +87 -0
- tomwer/tests/test_ewoks/test_workflows.py +138 -0
- tomwer/utils.py +11 -39
- tomwer/version.py +2 -2
- {tomwer-1.3.26.dist-info → tomwer-1.4.0.dist-info}/LICENSE +3 -3
- tomwer-1.4.0.dist-info/METADATA +337 -0
- tomwer-1.4.0.dist-info/RECORD +912 -0
- {tomwer-1.3.26.dist-info → tomwer-1.4.0.dist-info}/WHEEL +1 -1
- {tomwer-1.3.26.dist-info → tomwer-1.4.0.dist-info}/entry_points.txt +1 -0
- orangecontrib/tomwer/widgets/control/DataListOW.py +0 -129
- orangecontrib/tomwer/widgets/control/TomoObjSerieOW.py +0 -86
- orangecontrib/tomwer/widgets/control/VolumeSymLinkOW.py +0 -182
- orangecontrib/tomwer/widgets/edit/test/test_nxtomo_editor.py +0 -141
- orangecontrib/tomwer/widgets/icat/PublishProcessedDataOW.py +0 -115
- orangecontrib/tomwer/widgets/icat/RawDataScreenshotCreatorOW.py +0 -98
- orangecontrib/tomwer/widgets/icat/SaveToGalleryAndPublishOW.py +0 -129
- orangecontrib/tomwer/widgets/icat/icons/add_gallery.png +0 -0
- orangecontrib/tomwer/widgets/icat/icons/add_gallery.svg +0 -82
- orangecontrib/tomwer/widgets/icat/icons/raw_screenshots.png +0 -0
- orangecontrib/tomwer/widgets/icat/icons/raw_screenshots.svg +0 -143
- orangecontrib/tomwer/widgets/visualization/LivesliceOW.py +0 -87
- orangecontrib/tomwer/widgets/visualization/icons/liveslice.png +0 -0
- orangecontrib/tomwer/widgets/visualization/icons/liveslice.svg +0 -110
- tomwer/core/log/logger.py +0 -130
- tomwer/core/process/control/test/test_volume_link.py +0 -74
- tomwer/core/process/control/tomoobjserie.py +0 -12
- tomwer/core/process/control/volumesymlink.py +0 -200
- tomwer/core/process/icat/createscreenshots.py +0 -100
- tomwer/core/process/icat/gallery.py +0 -377
- tomwer/core/process/icat/icatbase.py +0 -36
- tomwer/core/process/icat/publish.py +0 -228
- tomwer/core/process/icat/screenshots.py +0 -27
- tomwer/core/process/reconstruction/test/test_darkref.py +0 -60
- tomwer/core/process/reconstruction/test/test_sadeltabeta.py +0 -74
- tomwer/core/process/test/test_axis.py +0 -309
- tomwer/core/process/visualization/liveslice.py +0 -6
- tomwer/core/progress.py +0 -100
- tomwer/core/scan/test/test_edf.py +0 -53
- tomwer/core/scan/test/test_future_scan.py +0 -61
- tomwer/core/scan/test/test_h5.py +0 -96
- tomwer/core/scan/test/test_process_registration.py +0 -109
- tomwer/core/test/test_scanutils.py +0 -53
- tomwer/gui/control/emailnotifier.py +0 -174
- tomwer/gui/control/serie/seriewaiter.py +0 -28
- tomwer/gui/control/test/__init__.py +0 -28
- tomwer/gui/control/test/test_datalist.py +0 -96
- tomwer/gui/control/test/test_datavalidator.py +0 -54
- tomwer/gui/control/test/test_email.py +0 -35
- tomwer/gui/control/test/test_process_manager.py +0 -65
- tomwer/gui/control/test/test_scanselector.py +0 -67
- tomwer/gui/edit/test/__init__.py +0 -28
- tomwer/gui/icat/gallery.py +0 -214
- tomwer/gui/icat/publish.py +0 -187
- tomwer/gui/reconstruction/axis/axis.py +0 -733
- tomwer/gui/reconstruction/axis/radioaxis.py +0 -2467
- tomwer/gui/stitching/stitching.py +0 -1392
- tomwer/gui/test/__init__.py +0 -28
- tomwer/gui/test/test_axis_gui.py +0 -34
- tomwer/synctools/stacks/edit/darkflatpatch.py +0 -169
- tomwer/synctools/stacks/edit/imagekeyeditor.py +0 -135
- tomwer/third_part/WaitingOverlay.py +0 -110
- tomwer-1.3.26-py3.11-nspkg.pth +0 -1
- tomwer-1.3.26.dist-info/METADATA +0 -292
- tomwer-1.3.26.dist-info/RECORD +0 -785
- tomwer-1.3.26.dist-info/namespace_packages.txt +0 -1
- /orangecontrib/tomwer/{widgets/edit/test → tests}/__init__.py +0 -0
- {tomwer/core/process/control/test → orangecontrib/tomwer/tutorials/id16b}/__init__.py +0 -0
- {tomwer/core/process/icat → orangecontrib/tomwer/widgets/cluster/tests}/__init__.py +0 -0
- /orangecontrib/tomwer/widgets/control/icons/{tomoobjserie.png → tomoobjseries.png} +0 -0
- {tomwer/core/process/reconstruction/test → orangecontrib/tomwer/widgets/control/tests}/__init__.py +0 -0
- /orangecontrib/tomwer/widgets/{icat → dataportal}/icons/publish_processed_data.png +0 -0
- /orangecontrib/tomwer/widgets/{icat → dataportal}/icons/publish_processed_data.svg +0 -0
- {tomwer/core/process/test → orangecontrib/tomwer/widgets/debugtools/tests}/__init__.py +0 -0
- {tomwer/core/scan/test → orangecontrib/tomwer/widgets/edit/tests}/__init__.py +0 -0
- {tomwer/core/test → orangecontrib/tomwer/widgets/other/tests}/__init__.py +0 -0
- {tomwer/gui/cluster/test → orangecontrib/tomwer/widgets/reconstruction/tests}/__init__.py +0 -0
- {tomwer/gui/control/serie → orangecontrib/tomwer/widgets/stitching/tests}/__init__.py +0 -0
- {tomwer/gui/icat → orangecontrib/tomwer/widgets/tests}/__init__.py +0 -0
- {tomwer/gui/reconstruction/test → orangecontrib/tomwer/widgets/visualization/tests}/__init__.py +0 -0
- /tomwer/{synctools/stacks/edit → app/stitching}/__init__.py +0 -0
- /tomwer/{synctools/test → core/process/control/tests}/__init__.py +0 -0
- /tomwer/core/process/control/{test → tests}/test_email.py +0 -0
- /tomwer/core/process/control/{test → tests}/test_h52nx_process.py +0 -0
- /tomwer/{third_part → core/process/drac}/__init__.py +0 -0
- /tomwer/core/process/reconstruction/{test → tests}/test_axis_params.py +0 -0
- /tomwer/core/process/reconstruction/{test → tests}/test_darkref_copy.py +0 -0
- /tomwer/core/process/reconstruction/{test → tests}/test_paramsbase.py +0 -0
- /tomwer/core/scan/{test → tests}/test_scan.py +0 -0
- /tomwer/gui/control/{serie → series}/nxtomoconcatenate.py +0 -0
- /tomwer/gui/control/{test → tests}/test_datadiscovery.py +0 -0
- /tomwer/gui/control/{test → tests}/test_reducedarkflat_selector.py +0 -0
- /tomwer/gui/control/{test → tests}/test_single_tomo_obj.py +0 -0
- {orangecontrib/tomwer/widgets/edit/test → tomwer/tests/orangecontrib/tomwer/widgets/edit/tests}/test_image_key_upgrader.py +0 -0
- {tomwer-1.3.26.dist-info → tomwer-1.4.0.dist-info}/top_level.txt +0 -0
tomwer/app/samplemoved.py
CHANGED
tomwer/app/scanviewer.py
CHANGED
tomwer/app/sinogramviewer.py
CHANGED
tomwer/app/slicestack.py
CHANGED
@@ -1,11 +1,14 @@
|
|
1
1
|
#!/usr/bin/env python
|
2
2
|
# -*- coding: utf-8 -*-
|
3
|
+
"""Application to display findable reconstructed slice of a scan (as a stack).
|
4
|
+
reconstructed slices can be added by hand or as input(s) of the command line.
|
5
|
+
"""
|
3
6
|
|
4
7
|
import argparse
|
5
8
|
import logging
|
6
|
-
import os
|
7
9
|
import signal
|
8
10
|
import sys
|
11
|
+
import os
|
9
12
|
|
10
13
|
import silx
|
11
14
|
from silx.gui import qt
|
@@ -20,7 +23,7 @@ _logger = logging.getLogger(__name__)
|
|
20
23
|
|
21
24
|
|
22
25
|
def getinputinfo():
|
23
|
-
return "tomwer
|
26
|
+
return "tomwer slice-stack [scanDir]"
|
24
27
|
|
25
28
|
|
26
29
|
def sigintHandler(*args):
|
@@ -28,18 +31,12 @@ def sigintHandler(*args):
|
|
28
31
|
qt.QApplication.quit()
|
29
32
|
|
30
33
|
|
31
|
-
def addFolderAndSubFolder(stack, path):
|
32
|
-
stack.addLeafScan(path)
|
33
|
-
for f in os.listdir(path):
|
34
|
-
_path = os.path.join(path, f)
|
35
|
-
if os.path.isdir(_path) is True:
|
36
|
-
addFolderAndSubFolder(stack, _path)
|
37
|
-
|
38
|
-
|
39
34
|
def main(argv):
|
40
35
|
parser = argparse.ArgumentParser(description=__doc__)
|
41
36
|
parser.add_argument(
|
42
|
-
"
|
37
|
+
"volume_paths",
|
38
|
+
help="Volumes to be added to the slice stack visualization. Warning: volumes should be single slice volumes.",
|
39
|
+
nargs="*",
|
43
40
|
)
|
44
41
|
parser.add_argument(
|
45
42
|
"--use-opengl-plot",
|
@@ -80,8 +77,9 @@ def main(argv):
|
|
80
77
|
splash = getMainSplashScreen()
|
81
78
|
widget = SliceStack()
|
82
79
|
widget.setWindowIcon(icons.getQIcon("tomwer"))
|
83
|
-
|
84
|
-
|
80
|
+
widget._addTomoObjectsFromStrList(
|
81
|
+
[os.path.abspath(volume_path) for volume_path in options.volume_paths]
|
82
|
+
)
|
85
83
|
|
86
84
|
splash.finish(widget)
|
87
85
|
widget.show()
|
@@ -0,0 +1,431 @@
|
|
1
|
+
"""Common module for y and z stitcher"""
|
2
|
+
|
3
|
+
from __future__ import annotations
|
4
|
+
|
5
|
+
import argparse
|
6
|
+
import logging
|
7
|
+
import signal
|
8
|
+
import sys
|
9
|
+
import functools
|
10
|
+
|
11
|
+
from tqdm import tqdm
|
12
|
+
|
13
|
+
import silx
|
14
|
+
from silx.gui import qt
|
15
|
+
|
16
|
+
from nabu.pipeline.config import generate_nabu_configfile
|
17
|
+
from nabu.stitching.config import get_default_stitching_config, SECTIONS_COMMENTS
|
18
|
+
import os
|
19
|
+
from nabu.stitching.config import StitchingType
|
20
|
+
|
21
|
+
from tomwer.core.volume.volumefactory import VolumeFactory
|
22
|
+
from tomwer.core.settings import SlurmSettingsMode
|
23
|
+
from tomwer.core.utils.resource import increase_max_number_file
|
24
|
+
from tomwer.gui import icons
|
25
|
+
from tomwer.core.process.stitching.nabustitcher import StitcherTask
|
26
|
+
from tomwer.io.utils.tomoobj import get_tomo_objs_instances
|
27
|
+
from tomwer.gui.utils.splashscreen import getMainSplashScreen
|
28
|
+
from tomwer.gui.stitching.StitchingWindow import ZStitchingWindow as _ZStitchingWindow
|
29
|
+
from tomwer.gui.stitching.StitchingWindow import YStitchingWindow as _YStitchingWindow
|
30
|
+
from tomwer.gui.stitching import action as stitching_action
|
31
|
+
from tomwer.gui.cluster.slurm import SlurmSettingsWidget
|
32
|
+
from tomwer.core.scan.scanbase import TomwerScanBase
|
33
|
+
|
34
|
+
|
35
|
+
class MainWidget(qt.QTabWidget):
|
36
|
+
DEFAULT_NB_WORKERS = 10
|
37
|
+
|
38
|
+
def __init__(
|
39
|
+
self,
|
40
|
+
axis: int,
|
41
|
+
parent=None,
|
42
|
+
) -> None:
|
43
|
+
super().__init__(parent)
|
44
|
+
if axis == 0:
|
45
|
+
self._stitchingConfigWindow = _ZStitchingWindow(
|
46
|
+
parent=self,
|
47
|
+
with_configuration_action=False,
|
48
|
+
)
|
49
|
+
elif axis == 1:
|
50
|
+
self._stitchingConfigWindow = _YStitchingWindow(
|
51
|
+
parent=self, with_configuration_action=False
|
52
|
+
)
|
53
|
+
else:
|
54
|
+
raise ValueError("stitching is only available along axis 0 and 1")
|
55
|
+
|
56
|
+
self.addTab(self._stitchingConfigWindow, "stitching config")
|
57
|
+
settingsClass = SlurmSettingsMode.get_settings_class(
|
58
|
+
SlurmSettingsMode.STITCHING
|
59
|
+
)
|
60
|
+
self._slurmConfig = SlurmSettingsWidget(
|
61
|
+
parent=self, n_gpu=settingsClass.N_GPUS_PER_WORKER, jobLimitation=None
|
62
|
+
)
|
63
|
+
self._slurmConfig.setConfiguration(
|
64
|
+
{
|
65
|
+
"cpu-per-task": settingsClass.N_CORES_PER_TASK,
|
66
|
+
"n_tasks": settingsClass.N_TASKS,
|
67
|
+
"n_jobs": settingsClass.N_JOBS,
|
68
|
+
"memory": settingsClass.MEMORY_PER_WORKER,
|
69
|
+
"partition": settingsClass.PARTITION,
|
70
|
+
"n_gpus": settingsClass.N_GPUS_PER_WORKER,
|
71
|
+
"job_name": settingsClass.PROJECT_NAME,
|
72
|
+
"python_venv": settingsClass.PYTHON_VENV,
|
73
|
+
}
|
74
|
+
)
|
75
|
+
|
76
|
+
self._stitchingConfigWindow.setCallbackToGetSlurmConfig(
|
77
|
+
self._slurmConfig.getConfiguration
|
78
|
+
)
|
79
|
+
self._stitchingConfigWindow.setCallbackToSetSlurmConfig(
|
80
|
+
self._slurmConfig.setConfiguration
|
81
|
+
)
|
82
|
+
self.addTab(self._slurmConfig, "slurm config")
|
83
|
+
# add an option to clearly activate / deactivate slurm config
|
84
|
+
slurm_config_idx = self.indexOf(self._slurmConfig)
|
85
|
+
self._slurmCB = qt.QCheckBox(self)
|
86
|
+
self.tabBar().setTabButton(
|
87
|
+
slurm_config_idx,
|
88
|
+
qt.QTabBar.LeftSide,
|
89
|
+
self._slurmCB,
|
90
|
+
)
|
91
|
+
self._slurmCB.setChecked(True)
|
92
|
+
|
93
|
+
# set up
|
94
|
+
self._slurmConfig.setNWorkers(self.DEFAULT_NB_WORKERS)
|
95
|
+
|
96
|
+
def close(self):
|
97
|
+
self._stitchingConfigWindow.close()
|
98
|
+
# requested for the waiting plot update
|
99
|
+
super().close()
|
100
|
+
|
101
|
+
def keyPressEvent(self, event):
|
102
|
+
"""
|
103
|
+
To shortcut orange and make sure the `F5` <=> refresh stitching preview
|
104
|
+
"""
|
105
|
+
modifiers = event.modifiers()
|
106
|
+
key = event.key()
|
107
|
+
|
108
|
+
if key == qt.Qt.Key_F5:
|
109
|
+
self._stitchingConfigWindow._trigger_update_preview()
|
110
|
+
elif key == qt.Qt.Key_O and modifiers == qt.Qt.KeyboardModifier.ControlModifier:
|
111
|
+
self._stitchingConfigWindow._loadSettings()
|
112
|
+
elif key == qt.Qt.Key_S and modifiers == qt.Qt.KeyboardModifier.ControlModifier:
|
113
|
+
self._stitchingConfigWindow._saveSettings()
|
114
|
+
|
115
|
+
def getStitchingConfiguration(self) -> dict:
|
116
|
+
return self._stitchingConfigWindow.getConfiguration()
|
117
|
+
|
118
|
+
def getClusterConfig(self) -> dict:
|
119
|
+
return self._slurmConfig.getConfiguration()
|
120
|
+
|
121
|
+
# expose API
|
122
|
+
def addTomoObj(self, *args, **kwargs):
|
123
|
+
self._stitchingConfigWindow.addTomoObj(*args, **kwargs)
|
124
|
+
|
125
|
+
def setStitchingType(self, stitching_type):
|
126
|
+
self._stitchingConfigWindow.setStitchingType(stitching_type)
|
127
|
+
|
128
|
+
def loadSettings(self, config_file):
|
129
|
+
self._stitchingConfigWindow._loadSettings(config_file)
|
130
|
+
|
131
|
+
|
132
|
+
class _StitcherThread(qt.QThread):
|
133
|
+
DEFAULT_OUTPUT_CONFIG_NAME = "stitching_conf_autosave.conf"
|
134
|
+
|
135
|
+
def __init__(self, parent, stitching_config, cluster_config) -> None:
|
136
|
+
super().__init__(parent)
|
137
|
+
assert isinstance(stitching_config, dict)
|
138
|
+
assert isinstance(cluster_config, dict)
|
139
|
+
self._stitching_config = stitching_config
|
140
|
+
self._cluster_config = cluster_config
|
141
|
+
|
142
|
+
def save_configuration(self):
|
143
|
+
stitching_type = self._stitching_config["stitching"]["type"]
|
144
|
+
if "preproc" in stitching_type:
|
145
|
+
output_file = self._stitching_config.get("preproc", {}).get("location", "")
|
146
|
+
output_folder = os.path.dirname(output_file)
|
147
|
+
else:
|
148
|
+
output_volume = self._stitching_config.get("postproc", {}).get(
|
149
|
+
"output_volume", None
|
150
|
+
)
|
151
|
+
if output_volume is None:
|
152
|
+
output_folder = ""
|
153
|
+
else:
|
154
|
+
volume = VolumeFactory.create_tomo_object_from_identifier(output_volume)
|
155
|
+
output_folder = os.path.dirname(volume.data_url.file_path())
|
156
|
+
|
157
|
+
os.makedirs(output_folder, exist_ok=True)
|
158
|
+
generate_nabu_configfile(
|
159
|
+
fname=os.path.join(
|
160
|
+
output_folder,
|
161
|
+
_StitcherThread.DEFAULT_OUTPUT_CONFIG_NAME,
|
162
|
+
),
|
163
|
+
default_config=get_default_stitching_config(
|
164
|
+
self._stitching_config["stitching"]["type"]
|
165
|
+
),
|
166
|
+
comments=True,
|
167
|
+
sections_comments=SECTIONS_COMMENTS,
|
168
|
+
options_level="advanced",
|
169
|
+
prefilled_values=self._stitching_config,
|
170
|
+
)
|
171
|
+
|
172
|
+
def run(self):
|
173
|
+
self.save_configuration()
|
174
|
+
|
175
|
+
task = StitcherTask(
|
176
|
+
inputs={
|
177
|
+
"stitching_config": self._stitching_config,
|
178
|
+
"cluster_config": self._cluster_config,
|
179
|
+
"progress": tqdm(desc="stitching"),
|
180
|
+
"serialize_output_data": False,
|
181
|
+
},
|
182
|
+
)
|
183
|
+
|
184
|
+
if self._cluster_config in (None, {}):
|
185
|
+
self._runLocally(task)
|
186
|
+
else:
|
187
|
+
self._runRemotely(task)
|
188
|
+
|
189
|
+
def _runLocally(self, task):
|
190
|
+
task.run()
|
191
|
+
|
192
|
+
def _runRemotely(self, task):
|
193
|
+
task.run()
|
194
|
+
# wait for processing to be finished
|
195
|
+
for future in task.outputs.future_tomo_obj.futures:
|
196
|
+
future.result()
|
197
|
+
# note: there is also a callback to aggregate result once all are finished.
|
198
|
+
# so at this stage the final "nxtomo" or "volume" might not exists yet
|
199
|
+
|
200
|
+
|
201
|
+
class MainWindow(qt.QDialog):
|
202
|
+
def __init__(self, axis: int, parent=None) -> None:
|
203
|
+
super().__init__(parent)
|
204
|
+
self.setLayout(qt.QVBoxLayout())
|
205
|
+
# menu
|
206
|
+
self._menuBar = qt.QMenuBar(self)
|
207
|
+
self.layout().addWidget(self._menuBar)
|
208
|
+
self._menu = qt.QMenu("&Stitching")
|
209
|
+
self._menuBar.addMenu(self._menu)
|
210
|
+
# save / load configuration
|
211
|
+
self._loadConfigurationAction = stitching_action.LoadConfigurationAction(
|
212
|
+
self, "&Load configuration"
|
213
|
+
)
|
214
|
+
self._menu.addAction(self._loadConfigurationAction)
|
215
|
+
self._saveConfigurationAction = stitching_action.SaveConfigurationAction(
|
216
|
+
self, "&Save configuration"
|
217
|
+
)
|
218
|
+
self._menu.addAction(self._saveConfigurationAction)
|
219
|
+
# separator
|
220
|
+
self._menu.addSeparator()
|
221
|
+
# add tomo object
|
222
|
+
self._addTomoObjectAction = stitching_action.AddTomoObjectAction(
|
223
|
+
self, "&Add tomo object (volume or NXtomo)"
|
224
|
+
)
|
225
|
+
self._menu.addAction(self._addTomoObjectAction)
|
226
|
+
|
227
|
+
# main window
|
228
|
+
self.setWindowTitle("tomwer z-stitching")
|
229
|
+
self._mainWindow = MainWidget(parent=self, axis=axis)
|
230
|
+
self.layout().addWidget(self._mainWindow)
|
231
|
+
|
232
|
+
# button
|
233
|
+
types = qt.QDialogButtonBox.Apply
|
234
|
+
self._buttons = qt.QDialogButtonBox(self)
|
235
|
+
self._buttons.setStandardButtons(types)
|
236
|
+
self.layout().addWidget(self._buttons)
|
237
|
+
self._buttons.button(qt.QDialogButtonBox.Apply).setText("Launch stitching")
|
238
|
+
|
239
|
+
# connect signal / slot
|
240
|
+
self._buttons.button(qt.QDialogButtonBox.Apply).clicked.connect(self.accept)
|
241
|
+
self._loadConfigurationAction.triggered.connect(
|
242
|
+
functools.partial(
|
243
|
+
self._mainWindow._stitchingConfigWindow._loadSettings, file_path=None
|
244
|
+
)
|
245
|
+
)
|
246
|
+
self._saveConfigurationAction.triggered.connect(
|
247
|
+
functools.partial(
|
248
|
+
self._mainWindow._stitchingConfigWindow._saveSettings, file_path=None
|
249
|
+
)
|
250
|
+
)
|
251
|
+
self._addTomoObjectAction.triggered.connect(self._callbackAddTomoObj)
|
252
|
+
|
253
|
+
def _callbackAddTomoObj(self, *args, **kwargs):
|
254
|
+
"""move interface to the z-ordered list and call the 'add tomo obj' callback"""
|
255
|
+
orderedListWidget = (
|
256
|
+
self._mainWindow._stitchingConfigWindow._widget._mainWidget._axisOrderedList
|
257
|
+
)
|
258
|
+
self._mainWindow._stitchingConfigWindow._widget._mainWidget.setCurrentWidget(
|
259
|
+
orderedListWidget
|
260
|
+
)
|
261
|
+
orderedListWidget._callbackAddTomoObj()
|
262
|
+
|
263
|
+
def close(self):
|
264
|
+
self._mainWindow.close()
|
265
|
+
# requested for the waiting plot update
|
266
|
+
super().close()
|
267
|
+
|
268
|
+
def reject(self):
|
269
|
+
self.close()
|
270
|
+
super().reject()
|
271
|
+
|
272
|
+
def accept(self):
|
273
|
+
self.process_stitching()
|
274
|
+
|
275
|
+
def process_stitching(self):
|
276
|
+
self._processingThread = _StitcherThread(
|
277
|
+
parent=self,
|
278
|
+
stitching_config=self.getStitchingConfiguration(),
|
279
|
+
cluster_config=self.getClusterConfig(),
|
280
|
+
)
|
281
|
+
self._processingThread.start()
|
282
|
+
|
283
|
+
def disableSlurmconfig(self):
|
284
|
+
self._mainWindow._slurmCB.setChecked(False)
|
285
|
+
self._mainWindow._slurmCB.setCheckable(False)
|
286
|
+
|
287
|
+
slurm_config_idx = self._mainWindow.indexOf(self._mainWindow._slurmConfig)
|
288
|
+
|
289
|
+
self._mainWindow.setTabEnabled(
|
290
|
+
slurm_config_idx,
|
291
|
+
False,
|
292
|
+
)
|
293
|
+
self._mainWindow.setTabToolTip(
|
294
|
+
slurm_config_idx,
|
295
|
+
"not available because unable to find slurm command (computer is probably not a slurm client ?",
|
296
|
+
)
|
297
|
+
|
298
|
+
# expose API
|
299
|
+
def addTomoObj(self, *args, **kwargs):
|
300
|
+
self._mainWindow.addTomoObj(*args, **kwargs)
|
301
|
+
|
302
|
+
def getClusterConfig(self) -> dict:
|
303
|
+
if self._mainWindow._slurmCB.isChecked():
|
304
|
+
return self._mainWindow.getClusterConfig()
|
305
|
+
else:
|
306
|
+
return {}
|
307
|
+
|
308
|
+
def getStitchingConfiguration(self) -> dict:
|
309
|
+
return self._mainWindow.getStitchingConfiguration()
|
310
|
+
|
311
|
+
def setStitchingType(self, stitching_type):
|
312
|
+
self._mainWindow.setStitchingType(stitching_type)
|
313
|
+
|
314
|
+
def loadSettings(self, config_file: str):
|
315
|
+
self._mainWindow.loadSettings(config_file)
|
316
|
+
|
317
|
+
|
318
|
+
def main(argv, stitcher_name: str, stitching_axis: int, logger):
|
319
|
+
parser = argparse.ArgumentParser(description=__doc__)
|
320
|
+
parser.add_argument(
|
321
|
+
"tomo_objs",
|
322
|
+
help="All tomo objects to be stitched together",
|
323
|
+
nargs="*",
|
324
|
+
)
|
325
|
+
parser.add_argument(
|
326
|
+
"--debug",
|
327
|
+
dest="debug",
|
328
|
+
action="store_true",
|
329
|
+
default=False,
|
330
|
+
help="Set logging system in debug mode",
|
331
|
+
)
|
332
|
+
|
333
|
+
parser.add_argument(
|
334
|
+
"--config",
|
335
|
+
"--config-file",
|
336
|
+
dest="config_file",
|
337
|
+
default=None,
|
338
|
+
help="Provide stitching configuration file to load parameters from it",
|
339
|
+
)
|
340
|
+
parser.add_argument(
|
341
|
+
"--use-opengl-plot",
|
342
|
+
help="Use OpenGL for plots (instead of matplotlib)",
|
343
|
+
action="store_true",
|
344
|
+
default=False,
|
345
|
+
)
|
346
|
+
parser.add_argument(
|
347
|
+
"--check-scans",
|
348
|
+
help="If True will check scans before adding them. This check scan validity (virtual dataset contains data...)",
|
349
|
+
action="store_true",
|
350
|
+
default=False,
|
351
|
+
)
|
352
|
+
options = parser.parse_args(argv[1:])
|
353
|
+
|
354
|
+
if options.use_opengl_plot:
|
355
|
+
silx.config.DEFAULT_PLOT_BACKEND = "gl"
|
356
|
+
else:
|
357
|
+
silx.config.DEFAULT_PLOT_BACKEND = "matplotlib"
|
358
|
+
|
359
|
+
if options.debug:
|
360
|
+
logging.root.setLevel(logging.DEBUG)
|
361
|
+
|
362
|
+
increase_max_number_file()
|
363
|
+
|
364
|
+
global app # QApplication must be global to avoid seg fault on quit
|
365
|
+
app = qt.QApplication.instance() or qt.QApplication(["tomwer"])
|
366
|
+
splash = getMainSplashScreen()
|
367
|
+
qt.QApplication.processEvents()
|
368
|
+
|
369
|
+
qt.QLocale.setDefault(qt.QLocale(qt.QLocale.English))
|
370
|
+
qt.QLocale.setDefault(qt.QLocale.c())
|
371
|
+
signal.signal(signal.SIGINT, sigintHandler)
|
372
|
+
sys.excepthook = qt.exceptionHandler
|
373
|
+
|
374
|
+
timer = qt.QTimer()
|
375
|
+
timer.start(500)
|
376
|
+
# Application have to wake up Python interpreter, else SIGINT is not
|
377
|
+
# catch
|
378
|
+
timer.timeout.connect(lambda: None)
|
379
|
+
|
380
|
+
window = MainWindow(axis=stitching_axis)
|
381
|
+
window.setWindowFlags(qt.Qt.Window)
|
382
|
+
window.setWindowTitle(stitcher_name)
|
383
|
+
window.setWindowIcon(icons.getQIcon("tomwer"))
|
384
|
+
|
385
|
+
window.show()
|
386
|
+
from sluurp.utils import has_sbatch_available
|
387
|
+
|
388
|
+
# load configuration is some provided
|
389
|
+
if options.config_file is not None:
|
390
|
+
window.loadSettings(options.config_file)
|
391
|
+
|
392
|
+
if not has_sbatch_available():
|
393
|
+
window.disableSlurmconfig()
|
394
|
+
|
395
|
+
tomo_objs, (has_scans, has_vols) = get_tomo_objs_instances(options.tomo_objs)
|
396
|
+
for tomo_obj in tomo_objs:
|
397
|
+
if isinstance(tomo_obj, TomwerScanBase):
|
398
|
+
tomo_obj.set_check_behavior(
|
399
|
+
run_check=options.check_scans
|
400
|
+
) # speed up processing
|
401
|
+
window.addTomoObj(tomo_obj=tomo_obj)
|
402
|
+
if has_scans and has_vols:
|
403
|
+
logger.warning(
|
404
|
+
"seems like you have both volumes and scan on your inputs. Unable to stitch the two at the same time"
|
405
|
+
)
|
406
|
+
elif has_scans:
|
407
|
+
if stitching_axis == 0:
|
408
|
+
window.setStitchingType(StitchingType.Z_PREPROC)
|
409
|
+
elif stitching_axis == 1:
|
410
|
+
window.setStitchingType(StitchingType.Y_PREPROC)
|
411
|
+
else:
|
412
|
+
raise ValueError(
|
413
|
+
f"stitching on scans is not possible along the axis {stitching_axis} (must be 0 or 1)"
|
414
|
+
)
|
415
|
+
elif has_vols:
|
416
|
+
if stitching_axis == 0:
|
417
|
+
window.setStitchingType(StitchingType.Z_POSTPROC)
|
418
|
+
else:
|
419
|
+
raise ValueError(
|
420
|
+
f"stitching on volumes is not possible along the axis {stitching_axis} (must be 0). Should be possible in theory. Please contact us so we can have a dataset and test it"
|
421
|
+
)
|
422
|
+
|
423
|
+
window.setAttribute(qt.Qt.WA_DeleteOnClose)
|
424
|
+
splash.finish(window)
|
425
|
+
exit(app.exec_())
|
426
|
+
|
427
|
+
|
428
|
+
def sigintHandler(*args):
|
429
|
+
"""Handler for the SIGINT signal."""
|
430
|
+
qt.QApplication.closeAllWindows() # needed because get a waiting thread behind
|
431
|
+
qt.QApplication.quit()
|
tomwer/app/stopdatalistener.py
CHANGED
tomwer/app/ystitching.py
ADDED
@@ -0,0 +1,26 @@
|
|
1
|
+
#!/usr/bin/env python
|
2
|
+
# -*- coding: utf-8 -*-
|
3
|
+
"""
|
4
|
+
Application to stitch along y (aka axis 0) a set of scans or reconstructed volumes
|
5
|
+
"""
|
6
|
+
from __future__ import annotations
|
7
|
+
|
8
|
+
import sys
|
9
|
+
import logging
|
10
|
+
from tomwer.app.stitching.common import main as common_main
|
11
|
+
|
12
|
+
logging.basicConfig(level=logging.WARNING)
|
13
|
+
|
14
|
+
_logger = logging.getLogger(__name__)
|
15
|
+
|
16
|
+
|
17
|
+
def getinputinfo():
|
18
|
+
return "tomwer y-stitching [tomo objects]"
|
19
|
+
|
20
|
+
|
21
|
+
def main(argv):
|
22
|
+
common_main(argv, stitcher_name="y-stitching", stitching_axis=1, logger=_logger)
|
23
|
+
|
24
|
+
|
25
|
+
if __name__ == "__main__":
|
26
|
+
main(sys.argv)
|