tomwer 1.3.1__py3-none-any.whl → 1.3.3__py3-none-any.whl

tomwer/app/axis.py

@@ -6,7 +6,7 @@ import functools
 import logging
 import signal
 import sys
-
+import silx
 from silx.gui import qt
 
 from tomwer.core.process.reconstruction.axis.axis import (
@@ -124,9 +124,9 @@ def main(argv):
         logging.root.setLevel(logging.DEBUG)
 
     if options.use_opengl_plot:
-        import silx
-
         silx.config.DEFAULT_PLOT_BACKEND = "gl"
+    else:
+        silx.config.DEFAULT_PLOT_BACKEND = "matplotlib"
 
     increase_max_number_file()
 

tomwer/app/canvas_launcher/mainwindow.py

@@ -4,6 +4,7 @@ import os
 import shutil
 import signal
 import sys
+import silx
 from typing import List
 from contextlib import closing
 from logging.handlers import RotatingFileHandler
@@ -299,13 +300,15 @@ class _OMain(ocMain):
         # define an environment variable.
         # this way we should also be able to let the user define it
         # on it's own later...
+
         if self.options.use_opengl_plot:
-            import silx
 
             # other standalones are not passing by the silx.config
             # but for the canvas this is way simpler to use it.
             # then all plot which have backend==None will pick the default plot backend
             silx.config.DEFAULT_PLOT_BACKEND = "gl"
+        else:
+            silx.config.DEFAULT_PLOT_BACKEND = "matplotlib"
 
     def setup_logging(self):
         super().setup_logging()

tomwer/app/diffframe.py

@@ -5,7 +5,7 @@ import argparse
 import logging
 import signal
 import sys
-
+import silx
 from silx.gui import qt
 
 from tomwer.core.scan.scanfactory import ScanFactory
@@ -82,9 +82,9 @@ def main(argv):
         scan_2 = None
 
     if options.use_opengl_plot:
-        import silx
-
         silx.config.DEFAULT_PLOT_BACKEND = "gl"
+    else:
+        silx.config.DEFAULT_PLOT_BACKEND = "matplotlib"
 
     # handle gui
     widget = DiffFrameViewer(parent=None)

tomwer/app/multicor.py

@@ -8,6 +8,7 @@ import sys
 import time
 from typing import Union
 
+import silx
 from silx.gui import qt
 from silx.io.utils import h5py_read_dataset
 
@@ -233,9 +234,9 @@ def main(argv):
     requires_reduced_dark_and_flat(scan=scan, logger_=_logger)
 
     if options.use_opengl_plot:
-        import silx
-
         silx.config.DEFAULT_PLOT_BACKEND = "gl"
+    else:
+        silx.config.DEFAULT_PLOT_BACKEND = "matplotlib"
 
     window = SAAxisWindow(dump_roi=options.dump_roi)
     window.setWindowTitle("saaxis")

tomwer/app/multipag.py

@@ -8,6 +8,7 @@ import sys
 import time
 from typing import Union
 
+import silx
 from silx.gui import qt
 from silx.io.utils import h5py_read_dataset
 
@@ -282,9 +283,9 @@ def main(argv):
         logging.root.setLevel(logging.DEBUG)
 
     if options.use_opengl_plot:
-        import silx
-
         silx.config.DEFAULT_PLOT_BACKEND = "gl"
+    else:
+        silx.config.DEFAULT_PLOT_BACKEND = "matplotlib"
 
     increase_max_number_file()
     scan = ScanFactory.create_scan_object(

tomwer/app/radiostack.py

@@ -7,6 +7,7 @@ import os
 import signal
 import sys
 
+import silx
 from silx.gui import qt
 
 from tomwer.core.scan.nxtomoscan import NXtomoScan
@@ -60,10 +61,11 @@ def main(argv):
     increase_max_number_file()
 
     options = parser.parse_args(argv[1:])
-    if options.use_opengl_plot:
-        import silx
 
+    if options.use_opengl_plot:
         silx.config.DEFAULT_PLOT_BACKEND = "gl"
+    else:
+        silx.config.DEFAULT_PLOT_BACKEND = "matplotlib"
 
     global app  # QApplication must be global to avoid seg fault on quit
     app = qt.QApplication.instance() or qt.QApplication(["tomwer"])

tomwer/app/samplemoved.py

@@ -7,6 +7,7 @@ import os
 import signal
 import sys
 
+import silx
 from silx.gui import qt
 
 from tomwer.core.scan.scanfactory import ScanFactory
@@ -54,9 +55,9 @@ def main(argv):
     options = parser.parse_args(argv[1:])
 
     if options.use_opengl_plot:
-        import silx
-
         silx.config.DEFAULT_PLOT_BACKEND = "gl"
+    else:
+        silx.config.DEFAULT_PLOT_BACKEND = "matplotlib"
 
     increase_max_number_file()
 

tomwer/app/scanviewer.py

@@ -45,10 +45,12 @@ def main(argv):
         scan_path=options.scan_path, entry=options.entry
     )
 
-    if options.use_opengl_plot:
-        import silx
+    import silx
 
+    if options.use_opengl_plot:
         silx.config.DEFAULT_PLOT_BACKEND = "gl"
+    else:
+        silx.config.DEFAULT_PLOT_BACKEND = "matplotlib"
 
     increase_max_number_file()
 

tomwer/app/sinogramviewer.py

@@ -7,6 +7,7 @@ import signal
 import sys
 import weakref
 
+import silx
 from silx.gui import qt
 
 from tomwer.core.scan.scanfactory import ScanFactory
@@ -72,9 +73,9 @@ def main(argv):
     options = parser.parse_args(argv[1:])
 
     if options.use_opengl_plot:
-        import silx
-
         silx.config.DEFAULT_PLOT_BACKEND = "gl"
+    else:
+        silx.config.DEFAULT_PLOT_BACKEND = "matplotlib"
 
     scan = ScanFactory.create_scan_object(options.scan_path, entry=options.entry)
     increase_max_number_file()

tomwer/app/slicestack.py

@@ -7,6 +7,7 @@ import os
 import signal
 import sys
 
+import silx
 from silx.gui import qt
 
 from tomwer.core.utils.resource import increase_max_number_file
@@ -57,9 +58,9 @@ def main(argv):
     options = parser.parse_args(argv[1:])
 
     if options.use_opengl_plot:
-        import silx
-
         silx.config.DEFAULT_PLOT_BACKEND = "gl"
+    else:
+        silx.config.DEFAULT_PLOT_BACKEND = "matplotlib"
 
     increase_max_number_file()
 

tomwer/app/zstitching.py

@@ -7,6 +7,7 @@ import signal
 import sys
 import functools
 
+import silx
 from silx.gui import qt
 
 from nabu.utils import Progress
@@ -306,9 +307,9 @@ def main(argv):
     options = parser.parse_args(argv[1:])
 
     if options.use_opengl_plot:
-        import silx
-
         silx.config.DEFAULT_PLOT_BACKEND = "gl"
+    else:
+        silx.config.DEFAULT_PLOT_BACKEND = "matplotlib"
 
     if options.debug:
         logging.root.setLevel(logging.DEBUG)

tomwer/gui/visualization/volumeviewer.py

@@ -334,11 +334,11 @@ class VolumeViewer(qt.QMainWindow):
         if not isinstance(sender, VolumeLoader):
             raise TypeError("sender is expected to be a VolumeLoader")
 
+        self._stopExistingLoaderThread()
         if sender.volume.data is None:
             _logger.error(f"Failed to load volume {sender.volume.get_identifier()}")
-
-        self._stopExistingLoaderThread()
-        self.setVolume(sender.volume)
+        else:
+            self.setVolume(sender.volume)
 
     def _loadAndDisplay(self, volume):
         """Load a thread and add a callback when loading is done"""

tomwer/version.py

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

{tomwer-1.3.1.dist-info → tomwer-1.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.3.1
+Version: 1.3.3
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit

{tomwer-1.3.1.dist-info → tomwer-1.3.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tomwer-1.3.1-py3.11-nspkg.pth,sha256=xeeGR3TjdoVxdFeF6T-zSwZWh6Et--EYuPWu67LxL_c,574
+tomwer-1.3.3-py3.11-nspkg.pth,sha256=xeeGR3TjdoVxdFeF6T-zSwZWh6Et--EYuPWu67LxL_c,574
 orangecontrib/tomwer/__init__.py,sha256=B4DXy1gY_wXmNYa2aOfapmJb2mEuCAjoaNEGnpBs70g,148
 orangecontrib/tomwer/state_summary.py,sha256=5_dPzweL3r0ye4ZfJo6IV2ThJI8fQhWoO2ySdJJajj8,1711
 orangecontrib/tomwer/orange/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -220,34 +220,34 @@ orangecontrib/tomwer/widgets/visualization/icons/volumeviewer.svg,sha256=2uT9_px
 tomwer/__init__.py,sha256=82Jp1abyG4UWdGuT4nNU7LxaUV6xxkOte5pIz3w69Do,1745
 tomwer/__main__.py,sha256=jsDfWA2yl5am0dHQVkYwlKLxxqKNont6VDF-LusuawE,8575
 tomwer/utils.py,sha256=EgVwJ5CQVjoBvcKNwyVoXv_P4ciI11oxb8fNyy82Lck,8465
-tomwer/version.py,sha256=kDrxJnxbxg27U1aGoh30qbr7QrrDLzCgk6J3AtIf6oA,4386
+tomwer/version.py,sha256=Of7W2gtojP8CR7O28Q4ig2cZ4t8bwPGWfskssk36Nss,4386
 tomwer/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tomwer/app/axis.py,sha256=UQNxYpHzxnGdNpkV6sJoO_0tPGCxJkylghwbA7ENsM0,5948
+tomwer/app/axis.py,sha256=Ax0wlTp9u0Ll_3ax23QP5Ck16_M9Kop7wx0hAbXrXyM,6004
 tomwer/app/canvas.py,sha256=RbQqgE7DuNjv4nGG6BNfnSevQO5_lCl7N71hGcLoxwE,1561
 tomwer/app/darkref.py,sha256=SnSKtLa6K1jmHfyqQfsuhJ7EC4g04ejTrhJa9pzC4S8,276
 tomwer/app/darkrefpatch.py,sha256=Zzl1zdBHEDgAPd5J7agaaK1GN3uQjxePRRCaLpXL6A8,285
-tomwer/app/diffframe.py,sha256=QYFPh4ZrcXayzBgsounw-5bOW92OqLLRnyUGqK3ETo8,3110
+tomwer/app/diffframe.py,sha256=ldYQtKYkpKf98Q33ULK3Q--MGII26bsYtP5KYoHQ1Pw,3166
 tomwer/app/imagekeyeditor.py,sha256=G5a8AvaRQW4VmCxszt9V73i0-JXnX67xHex4iFzl0lI,2821
 tomwer/app/imagekeyupgrader.py,sha256=ffbhjdt8p8ykpQOxJhe3ygVKFBLd3EetTAnJNfxiBUk,3217
 tomwer/app/intensitynormalization.py,sha256=Q22HRWJ4SuuUvAr7Et9h8IKILT-Yh-PY-yp3q6CTkpI,6660
-tomwer/app/multicor.py,sha256=4jS6quAcOvW1H-ZfLKJW_FUxOs8c9oCBhqhHfJ2kv0E,9883
-tomwer/app/multipag.py,sha256=jwU_wKLDYzc37MF2GqH8SZl1fB_ESuJq22P2A49glsQ,12742
+tomwer/app/multicor.py,sha256=lAqRKNTn3IzFc2zngfKzvx2d7TGoYJyxFeJ-bgVyiUA,9940
+tomwer/app/multipag.py,sha256=Q9CuNr1p_lLZWkZDmxAx0gVUsxB3EYn-Tqx20cygMdI,12799
 tomwer/app/nabuapp.py,sha256=RPCnXeDL9GWN9wXywF0xpzARs02o38BAwScwRBta9pI,7646
 tomwer/app/nxtomoeditor.py,sha256=BabQ8lSBzMqZLyoKN8k2ubDj6dxYApp_Ipi1SjSN1So,2837
 tomwer/app/patchrawdarkflat.py,sha256=HsWKKyFpUwO2Pig06nMYWa9RYXeUzdkE2MQeIkhCRl4,3827
-tomwer/app/radiostack.py,sha256=DUpvThVyfvGHrS00Vn5s-JZfpkf6u_Z2jrOlBf_L7s4,2529
+tomwer/app/radiostack.py,sha256=CYAg9Gxo1HXn7I0DxdlyzNNbdd4Evg91x1HXiYHvyFw,2587
 tomwer/app/reducedarkflat.py,sha256=QK_RAszzNDHCOTgqi28DydmnUnAPBRJHnONUF_Hy0lU,6520
 tomwer/app/rsync.py,sha256=eT8HoSOp56SqbjKKm3DQ0tl5wfGaDhE3O5XzZBlzkx0,4081
-tomwer/app/samplemoved.py,sha256=jyhOIC4qH8PfWES5Y_vJmzJCJvU-wOYd3qYXLaxoVKA,2470
-tomwer/app/scanviewer.py,sha256=0HI7uV7zRiK-2MyLlAE6vCMdgmiFfMbsF33CNoxKlLw,2646
-tomwer/app/sinogramviewer.py,sha256=9V5o2OiHOyYxiWOdjZjjQuC8hRdrsOQCbpQ0QYPfSbc,3620
-tomwer/app/slicestack.py,sha256=OpvgRgXj62ThovS1wAaCTFoneJkIOwRT5BMV75hEf2M,2371
+tomwer/app/samplemoved.py,sha256=ntO7EeoSfAVMaC66RR1m_mWUTfFJrOJ_QaQUxLCB8Is,2527
+tomwer/app/scanviewer.py,sha256=yEaJ78p0ZaDVmk9pdKrEC7UqbabT59hzmAudy44jaiU,2708
+tomwer/app/sinogramviewer.py,sha256=EnjcgeRM7-3j8j8tFEWIGL-bRM3lVq8wlGWvBV3uDuI,3677
+tomwer/app/slicestack.py,sha256=YIH4bcOuFri_dHc2EkvYeBL_xv5N9rS8TwLFHaYsYV4,2428
 tomwer/app/stopdatalistener.py,sha256=p5G6sP2DUXEREZzFf0QGowU9C7hX7nexWZHmC0bTIM4,957
-tomwer/app/zstitching.py,sha256=88zqI_RU3IuLzy6_tmzETllStk2OFj6Po8U6zVgJmE8,12820
+tomwer/app/zstitching.py,sha256=rOc-bwX7A-eMHo0x0dyMsQhzLgcAcyavJlZ3I_D0m5E,12877
 tomwer/app/canvas_launcher/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/app/canvas_launcher/config.py,sha256=vGvyskE-mOLV4PPUverFhx7lQbGuE6E9747ctGcLodY,7164
 tomwer/app/canvas_launcher/environ.py,sha256=t_sgLAugHUA8d9SR6CZ6HfUHmAjS7ZcSf8I5KiwRayA,2501
-tomwer/app/canvas_launcher/mainwindow.py,sha256=y25sk88dDFDNNrzjjvUcIsYGiIskglDjEtyXKfb3CAI,19083
+tomwer/app/canvas_launcher/mainwindow.py,sha256=OBd1_FQ9u-vwUPE2PuD6jVuyGEwDSqBPnbOLEowICm0,19146
 tomwer/app/canvas_launcher/splash.py,sha256=2z3q5QwoQ_ad-a2UI0R8hR3252MWG7DggXPOgDZfgBA,560
 tomwer/app/canvas_launcher/widgetsscheme.py,sha256=S4x1LO798fOxL3-g2WDuAh0T2Y_Kbg79DbH3siwKPiM,2859
 tomwer/core/__init__.py,sha256=lLfviCLw9VdT6SQ_9eYhqFe8QtUA-Dv-JDGpgxQ8Yzs,1373
@@ -595,7 +595,7 @@ tomwer/gui/visualization/scanoverview.py,sha256=xmq_nhbnGcedDreqIrZ8ZXXtRhC6KI4q
 tomwer/gui/visualization/sinogramviewer.py,sha256=mBfB77ywfyj4vYkb7lYhEcn9-gZVjqzlTvMCngB9CyI,9707
 tomwer/gui/visualization/tomoobjoverview.py,sha256=YzocBQXhgnzI8IsJg5junE7218WcJdvSNH4r6DQgo74,1991
 tomwer/gui/visualization/volumeoverview.py,sha256=6Hv1TtsDlaGQPCJKW-IkGy_r5Buue-O95tl1KkpMD-0,2491
-tomwer/gui/visualization/volumeviewer.py,sha256=gcq35WaZ2U0LmcYKp9WcOkDMYlG5VGLzA7BKDz2H4H4,16168
+tomwer/gui/visualization/volumeviewer.py,sha256=LZWJuiiA4nnaCCKKM_izTKGei6M5i1GEqKPstYm2j94,16185
 tomwer/gui/visualization/diffviewer/__init__.py,sha256=rZ7qOTfAChU3FouCdkZllXT9ZZqTdo1XhLZMfmOqUAE,39
 tomwer/gui/visualization/diffviewer/diffviewer.py,sha256=Y8tDT1l-AkBSpTkBes31r_bhjbBeAlO__3OAc0Ob6Io,21812
 tomwer/gui/visualization/diffviewer/shiftwidget.py,sha256=2hpGo6BvubcSbw2QOT823sL74AEWyU32UxnvVZ4bDok,20928
@@ -776,10 +776,10 @@ tomwer/tests/test_utils.py,sha256=D0rNDSK6csEOYBY_7gD-4A3jp8rYAm8L1_Xg34A9I2s,30
 tomwer/tests/utils.py,sha256=RAXx5A99WD4Vyuv_wjHBdr-Xu7UiThHRKw2eiB5GX10,107
 tomwer/third_part/WaitingOverlay.py,sha256=GnqiytcJDp_24Cmz_2nZAP5HfpL3Yh7AzR2ATIusGsg,3906
 tomwer/third_part/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tomwer-1.3.1.dist-info/LICENSE,sha256=yR_hIZ1MfDh9x2_s23uFqBH7m5DgrBl9nJKkE37YChM,1877
-tomwer-1.3.1.dist-info/METADATA,sha256=6Ob6q-Ga9JdkyfC9IXH2UDWsveoPZp202CRoxSWWml4,11426
-tomwer-1.3.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-tomwer-1.3.1.dist-info/entry_points.txt,sha256=fIcDnCxjgwzfIylLYhUsFyiNZjZMxsfRQBxi4f-cJg8,440
-tomwer-1.3.1.dist-info/namespace_packages.txt,sha256=Iut-JTfT11SZHHm77_ZeszD7pZDWXcTweCbvrJpqDyQ,14
-tomwer-1.3.1.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
-tomwer-1.3.1.dist-info/RECORD,,
+tomwer-1.3.3.dist-info/LICENSE,sha256=yR_hIZ1MfDh9x2_s23uFqBH7m5DgrBl9nJKkE37YChM,1877
+tomwer-1.3.3.dist-info/METADATA,sha256=ozipWiY9Oq_dTCyW4j2haDZ_14pujNMkqbjBk7HPMMU,11426
+tomwer-1.3.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+tomwer-1.3.3.dist-info/entry_points.txt,sha256=fIcDnCxjgwzfIylLYhUsFyiNZjZMxsfRQBxi4f-cJg8,440
+tomwer-1.3.3.dist-info/namespace_packages.txt,sha256=Iut-JTfT11SZHHm77_ZeszD7pZDWXcTweCbvrJpqDyQ,14
+tomwer-1.3.3.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
+tomwer-1.3.3.dist-info/RECORD,,