tomwer 1.3.6__py3-none-any.whl → 1.3.8__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.
- tomwer/core/process/reconstruction/nabu/utils.py +2 -0
- tomwer/gui/control/datawatcher/datawatcher.py +1 -24
- tomwer/synctools/stacks/reconstruction/castvolume.py +20 -5
- tomwer/version.py +1 -1
- {tomwer-1.3.6.dist-info → tomwer-1.3.8.dist-info}/METADATA +1 -1
- {tomwer-1.3.6.dist-info → tomwer-1.3.8.dist-info}/RECORD +12 -12
- /tomwer-1.3.6-py3.11-nspkg.pth → /tomwer-1.3.8-py3.11-nspkg.pth +0 -0
- {tomwer-1.3.6.dist-info → tomwer-1.3.8.dist-info}/LICENSE +0 -0
- {tomwer-1.3.6.dist-info → tomwer-1.3.8.dist-info}/WHEEL +0 -0
- {tomwer-1.3.6.dist-info → tomwer-1.3.8.dist-info}/entry_points.txt +0 -0
- {tomwer-1.3.6.dist-info → tomwer-1.3.8.dist-info}/namespace_packages.txt +0 -0
- {tomwer-1.3.6.dist-info → tomwer-1.3.8.dist-info}/top_level.txt +0 -0
@@ -461,6 +461,8 @@ def nabu_std_err_has_error(errs: typing.Optional[bytes]):
|
|
461
461
|
in line
|
462
462
|
or "return SourceModule(" in line
|
463
463
|
or "CUBLAS" in line
|
464
|
+
or "Not supported for EDF"
|
465
|
+
in line # debatable but very disturbing from the gui side... anyway EDF days are coming to an end
|
464
466
|
)
|
465
467
|
|
466
468
|
if errs is None:
|
@@ -148,7 +148,6 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
|
|
148
148
|
|
149
149
|
# set initial path to observe
|
150
150
|
self.setFolderObserved(self._getInitPath())
|
151
|
-
self._initStatusView()
|
152
151
|
|
153
152
|
# hide all windows by default
|
154
153
|
for widget in (
|
@@ -475,20 +474,10 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
|
|
475
474
|
self.observationThread.sigScanReady.disconnect(self._signalScanReady)
|
476
475
|
self.obsThIsConnected = False
|
477
476
|
|
478
|
-
def _initStatusView(self):
|
479
|
-
"""
|
480
|
-
The status view need a thread to update the animated icon when scanning
|
481
|
-
"""
|
482
|
-
self.__threadAnimation = QWaiterThread(0.1)
|
483
|
-
self.__threadAnimation.finished.connect(self._updateAnimatedIcon)
|
484
|
-
|
485
477
|
def _updateStatusView(self):
|
486
478
|
"""Update the processing state"""
|
487
479
|
if self.currentStatus in self._animatedStates:
|
488
|
-
|
489
|
-
self.__threadAnimation.start()
|
490
|
-
elif self.__threadAnimation is not None:
|
491
|
-
self.__threadAnimation.wait(4000)
|
480
|
+
pass
|
492
481
|
elif self.currentStatus == "acquisition ended":
|
493
482
|
self._setStateIcon(silxicons.getQIcon("selected"))
|
494
483
|
elif self.currentStatus == "failure":
|
@@ -506,18 +495,6 @@ class DataWatcherWidget(_DataWatcher, qt.QMainWindow):
|
|
506
495
|
else:
|
507
496
|
self._stateLabel.setPixmap(icon.pixmap(30, state=qt.QIcon.On))
|
508
497
|
|
509
|
-
def _updateAnimatedIcon(self):
|
510
|
-
"""Simple function which manage the waiting icon"""
|
511
|
-
if self.currentStatus in self._animatedStates:
|
512
|
-
icon = self.animated_icon.currentIcon()
|
513
|
-
if icon is None:
|
514
|
-
icon = qt.QIcon()
|
515
|
-
self.animated_icon._updateState()
|
516
|
-
self._setStateIcon(icon)
|
517
|
-
|
518
|
-
# get ready for the next animation
|
519
|
-
self.__threadAnimation.start()
|
520
|
-
|
521
498
|
def _signalScanReady(self, scan):
|
522
499
|
if type(scan) is str:
|
523
500
|
try:
|
@@ -94,11 +94,26 @@ class CastVolumeProcessStack(FIFO, qt.QObject):
|
|
94
94
|
self.scan_ready(scan=data)
|
95
95
|
else:
|
96
96
|
self._data_currently_computed = data
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
97
|
+
try:
|
98
|
+
self._computationThread.init(data=data, configuration=configuration)
|
99
|
+
except ValueError as e:
|
100
|
+
# initialization can fail (for example for cast volume is there is no volume or be case this will raise an error)
|
101
|
+
# then we want to keep the thread active
|
102
|
+
self._data_currently_computed = None
|
103
|
+
ProcessManager().notify_dataset_state(
|
104
|
+
dataset=data, process=self._process_id, state=DatasetState.SKIPPED
|
105
|
+
)
|
106
|
+
_logger.processSkipped(f"thread initialization failed. Error is {e}")
|
107
|
+
if callback is not None:
|
108
|
+
callback()
|
109
|
+
self.scan_ready(scan=data)
|
110
|
+
else:
|
111
|
+
# need to manage connect before starting it because
|
112
|
+
fct_callback = functools.partial(
|
113
|
+
self._end_threaded_computation, callback
|
114
|
+
)
|
115
|
+
self._computationThread.finished.connect(fct_callback)
|
116
|
+
self._computationThread.start()
|
102
117
|
|
103
118
|
def _end_computation(self, data, future_tomo_obj, callback):
|
104
119
|
"""
|
tomwer/version.py
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
tomwer-1.3.
|
1
|
+
tomwer-1.3.8-py3.11-nspkg.pth,sha256=xeeGR3TjdoVxdFeF6T-zSwZWh6Et--EYuPWu67LxL_c,574
|
2
2
|
orangecontrib/tomwer/__init__.py,sha256=B4DXy1gY_wXmNYa2aOfapmJb2mEuCAjoaNEGnpBs70g,148
|
3
3
|
orangecontrib/tomwer/state_summary.py,sha256=5_dPzweL3r0ye4ZfJo6IV2ThJI8fQhWoO2ySdJJajj8,1711
|
4
4
|
orangecontrib/tomwer/orange/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
@@ -220,7 +220,7 @@ orangecontrib/tomwer/widgets/visualization/icons/volumeviewer.svg,sha256=2uT9_px
|
|
220
220
|
tomwer/__init__.py,sha256=82Jp1abyG4UWdGuT4nNU7LxaUV6xxkOte5pIz3w69Do,1745
|
221
221
|
tomwer/__main__.py,sha256=jsDfWA2yl5am0dHQVkYwlKLxxqKNont6VDF-LusuawE,8575
|
222
222
|
tomwer/utils.py,sha256=EgVwJ5CQVjoBvcKNwyVoXv_P4ciI11oxb8fNyy82Lck,8465
|
223
|
-
tomwer/version.py,sha256=
|
223
|
+
tomwer/version.py,sha256=vS6XATV3d0rAAs4Uky7DLHRQoHjiaPVQC7dmaEz9nJA,4386
|
224
224
|
tomwer/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
225
225
|
tomwer/app/axis.py,sha256=Ax0wlTp9u0Ll_3ax23QP5Ck16_M9Kop7wx0hAbXrXyM,6004
|
226
226
|
tomwer/app/canvas.py,sha256=RbQqgE7DuNjv4nGG6BNfnSevQO5_lCl7N71hGcLoxwE,1561
|
@@ -331,7 +331,7 @@ tomwer/core/process/reconstruction/nabu/nabuvolume.py,sha256=z7nyfXhMrp0Q3hAN3NY
|
|
331
331
|
tomwer/core/process/reconstruction/nabu/plane.py,sha256=Cgzth77M0pFgLDULmvmPj4bqFm5MvIMJ7Ien8mRqLsE,134
|
332
332
|
tomwer/core/process/reconstruction/nabu/settings.py,sha256=JpHKf0smiXeWC8i9Mj7h3g67teJ3Gqycd-Uwg2yzGOQ,2279
|
333
333
|
tomwer/core/process/reconstruction/nabu/target.py,sha256=_Z4gViprjR3Vm4KASqsASStLA9GM1wTyoi3Pg0PUSeg,1481
|
334
|
-
tomwer/core/process/reconstruction/nabu/utils.py,sha256=
|
334
|
+
tomwer/core/process/reconstruction/nabu/utils.py,sha256=SOU3DzYpzm4YwxVU1FwkHj0aJGfN7utWKtuFhe3HezA,18100
|
335
335
|
tomwer/core/process/reconstruction/normalization/__init__.py,sha256=TDtATpMVFkEOT93wLXLpW0A_TOeiQDiM7AWAqX4FIB0,119
|
336
336
|
tomwer/core/process/reconstruction/normalization/normalization.py,sha256=G-eAZIct47RvzvHNMbKsG4Dt58vTSKhvH-NnIMzxzOs,13210
|
337
337
|
tomwer/core/process/reconstruction/normalization/params.py,sha256=porWC6G5lQWF-4JB03B56uGmuMxjx3u0ZMums-Bh2p8,4790
|
@@ -468,7 +468,7 @@ tomwer/gui/control/volumeselectorwidget.py,sha256=mpbofAawBpzdc46IEkucTuiFJRDP18
|
|
468
468
|
tomwer/gui/control/datawatcher/__init__.py,sha256=4MnBP53SmxMTRpeM8NApgSsbh6HRKshwLdhpJt078jQ,1444
|
469
469
|
tomwer/gui/control/datawatcher/configuration.py,sha256=E9RTx2hgF7JJKg8zOq6vFwWZYcKAWyvZkLR5g5TiBsw,10193
|
470
470
|
tomwer/gui/control/datawatcher/controlwidget.py,sha256=qaT_QJCiMnmp21LnzGomnkBGX6Rvuxf3V_tktyEcSLI,3857
|
471
|
-
tomwer/gui/control/datawatcher/datawatcher.py,sha256=
|
471
|
+
tomwer/gui/control/datawatcher/datawatcher.py,sha256=vfU04qzSioOAEo-Htb_R3peZuPGJAP1RytxlKH0evvs,21671
|
472
472
|
tomwer/gui/control/datawatcher/datawatcherobserver.py,sha256=wm4uuFeBxyUrb_1Wfw4WASWhlKl0DKud5eihIh4Brt0,10543
|
473
473
|
tomwer/gui/control/serie/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
474
474
|
tomwer/gui/control/serie/nxtomoconcatenate.py,sha256=YyJssAnQauRhQ1jBg63uj1pXcdo2IsktebaQvpgx8YA,3131
|
@@ -757,7 +757,7 @@ tomwer/synctools/stacks/edit/darkflatpatch.py,sha256=dCP8Zk6f-toFUFzcnJHbF2bkTS0
|
|
757
757
|
tomwer/synctools/stacks/edit/imagekeyeditor.py,sha256=NNDQWMJEuE50zBk_2zJAWbf6hC8J3QKV42YpPQAmV0U,5259
|
758
758
|
tomwer/synctools/stacks/reconstruction/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
759
759
|
tomwer/synctools/stacks/reconstruction/axis.py,sha256=9Gqh0isvLYupypOq3P7XM_lU4Hcni4l3V2aUZsAVLrc,8876
|
760
|
-
tomwer/synctools/stacks/reconstruction/castvolume.py,sha256=
|
760
|
+
tomwer/synctools/stacks/reconstruction/castvolume.py,sha256=PaoMuTxcj4Ms6N2MFnrCzmaCCC3wEZItYAwQ8NApe_o,8282
|
761
761
|
tomwer/synctools/stacks/reconstruction/dkrefcopy.py,sha256=LlEtCh-nbftFo77s1QXnoISDQKQOBR-4AKfurgUj7zI,7040
|
762
762
|
tomwer/synctools/stacks/reconstruction/nabu.py,sha256=dDqw74kobhkawquJIwLDQH--PN6LbbthlqZ9MQUBJi4,7816
|
763
763
|
tomwer/synctools/stacks/reconstruction/normalization.py,sha256=wcw-tHjKUQMcija0bCExDl0InYsKHZNTeTk4w_hnaDI,5362
|
@@ -776,10 +776,10 @@ tomwer/tests/test_utils.py,sha256=D0rNDSK6csEOYBY_7gD-4A3jp8rYAm8L1_Xg34A9I2s,30
|
|
776
776
|
tomwer/tests/utils.py,sha256=RAXx5A99WD4Vyuv_wjHBdr-Xu7UiThHRKw2eiB5GX10,107
|
777
777
|
tomwer/third_part/WaitingOverlay.py,sha256=GnqiytcJDp_24Cmz_2nZAP5HfpL3Yh7AzR2ATIusGsg,3906
|
778
778
|
tomwer/third_part/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
779
|
-
tomwer-1.3.
|
780
|
-
tomwer-1.3.
|
781
|
-
tomwer-1.3.
|
782
|
-
tomwer-1.3.
|
783
|
-
tomwer-1.3.
|
784
|
-
tomwer-1.3.
|
785
|
-
tomwer-1.3.
|
779
|
+
tomwer-1.3.8.dist-info/LICENSE,sha256=yR_hIZ1MfDh9x2_s23uFqBH7m5DgrBl9nJKkE37YChM,1877
|
780
|
+
tomwer-1.3.8.dist-info/METADATA,sha256=jIXT7YZdgdVywrCwSaUS1rdSSwb-KCFx60Luxk2c8zw,11459
|
781
|
+
tomwer-1.3.8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
|
782
|
+
tomwer-1.3.8.dist-info/entry_points.txt,sha256=fIcDnCxjgwzfIylLYhUsFyiNZjZMxsfRQBxi4f-cJg8,440
|
783
|
+
tomwer-1.3.8.dist-info/namespace_packages.txt,sha256=Iut-JTfT11SZHHm77_ZeszD7pZDWXcTweCbvrJpqDyQ,14
|
784
|
+
tomwer-1.3.8.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
|
785
|
+
tomwer-1.3.8.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|