tomwer 1.0.4__py3-none-any.whl → 1.1.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/tutorials/EBS_tomo_listener.ows +39 -0
- orangecontrib/tomwer/tutorials/cast_volume.ows +34 -0
- orangecontrib/tomwer/tutorials/simple_slice_reconstruction.ows +39 -0
- orangecontrib/tomwer/tutorials/simple_volume_local_reconstruction.ows +49 -0
- orangecontrib/tomwer/tutorials/simple_volume_to_slurm_reconstruction.ows +59 -0
- orangecontrib/tomwer/tutorials/using_saaxis_to_find_cor.ows +44 -0
- orangecontrib/tomwer/widgets/cluster/FutureSupervisorOW.py +1 -1
- orangecontrib/tomwer/widgets/cluster/SlurmClusterOW.py +14 -4
- orangecontrib/tomwer/widgets/cluster/__init__.py +1 -1
- orangecontrib/tomwer/widgets/control/DataListOW.py +12 -5
- orangecontrib/tomwer/widgets/control/DataListenerOW.py +18 -9
- orangecontrib/tomwer/widgets/control/DataSelectorOW.py +13 -6
- orangecontrib/tomwer/widgets/control/DataTransfertOW.py +4 -5
- orangecontrib/tomwer/widgets/control/DataValidatorOW.py +8 -4
- orangecontrib/tomwer/widgets/control/DataWatcherOW.py +4 -6
- orangecontrib/tomwer/widgets/control/EDF2NXTomomillOW.py +49 -62
- orangecontrib/tomwer/widgets/control/FilterOW.py +2 -4
- orangecontrib/tomwer/widgets/control/NXTomomillMixIn.py +93 -0
- orangecontrib/tomwer/widgets/control/NXTomomillOW.py +135 -128
- orangecontrib/tomwer/widgets/control/NotifierOW.py +31 -7
- orangecontrib/tomwer/widgets/control/SingleTomoObjOW.py +3 -5
- orangecontrib/tomwer/widgets/control/TomoObjSerieOW.py +85 -0
- orangecontrib/tomwer/widgets/control/VolumeSelector.py +12 -4
- orangecontrib/tomwer/widgets/control/VolumeSymLinkOW.py +11 -7
- orangecontrib/tomwer/widgets/control/icons/notification.svg +4 -4
- orangecontrib/tomwer/widgets/control/icons/nxtomomill.png +0 -0
- orangecontrib/tomwer/widgets/control/icons/nxtomomill.svg +8 -5
- orangecontrib/tomwer/widgets/control/icons/tomoobjserie.png +0 -0
- orangecontrib/tomwer/widgets/control/icons/tomoobjserie.svg +138 -0
- orangecontrib/tomwer/widgets/edit/DarkFlatPatchOW.py +16 -4
- orangecontrib/tomwer/widgets/edit/NXtomoEditorOW.py +100 -0
- orangecontrib/tomwer/widgets/edit/icons/image_key_editor.png +0 -0
- orangecontrib/tomwer/widgets/edit/icons/image_key_upgrader.png +0 -0
- orangecontrib/tomwer/widgets/edit/icons/nx_tomo_editor.png +0 -0
- orangecontrib/tomwer/widgets/edit/icons/nx_tomo_editor.svg +123 -0
- orangecontrib/tomwer/widgets/edit/test/test_dark_flat_patch.py +21 -1
- orangecontrib/tomwer/widgets/edit/test/test_image_key_editor.py +1 -1
- orangecontrib/tomwer/widgets/edit/test/test_image_key_upgrader.py +1 -1
- orangecontrib/tomwer/widgets/edit/test/test_nxtomo_editor.py +25 -0
- orangecontrib/tomwer/widgets/other/PythonScriptOW.py +19 -10
- orangecontrib/tomwer/widgets/reconstruction/AxisOW.py +20 -14
- orangecontrib/tomwer/widgets/reconstruction/CastNabuVolumeOW.py +24 -10
- orangecontrib/tomwer/widgets/reconstruction/DarkRefAndCopyOW.py +26 -21
- orangecontrib/tomwer/widgets/reconstruction/NabuOW.py +29 -12
- orangecontrib/tomwer/widgets/reconstruction/NabuVolumeOW.py +44 -17
- orangecontrib/tomwer/widgets/reconstruction/SAAxisOW.py +28 -18
- orangecontrib/tomwer/widgets/reconstruction/SADeltaBetaOW.py +24 -17
- orangecontrib/tomwer/widgets/reconstruction/SinoNormOW.py +6 -6
- orangecontrib/tomwer/widgets/reconstruction/TofuOW.py +4 -2
- orangecontrib/tomwer/widgets/reconstruction/icons/nabu_2d.png +0 -0
- orangecontrib/tomwer/widgets/reconstruction/icons/nabu_2d.svg +11 -8
- orangecontrib/tomwer/widgets/visualization/DataViewerOW.py +10 -4
- orangecontrib/tomwer/widgets/visualization/DiffViewerOW.py +1 -1
- orangecontrib/tomwer/widgets/visualization/NXtomoMetadataViewerOW.py +69 -0
- orangecontrib/tomwer/widgets/visualization/SampleMovedOW.py +2 -4
- orangecontrib/tomwer/widgets/visualization/icons/nx_tomo_metadata_viewer.png +0 -0
- orangecontrib/tomwer/widgets/visualization/icons/nx_tomo_metadata_viewer.svg +105 -0
- tomwer/__main__.py +10 -5
- tomwer/app/canvas_launcher/config.py +10 -10
- tomwer/app/canvas_launcher/mainwindow.py +68 -6
- tomwer/app/canvas_launcher/widgetsscheme.py +1 -3
- tomwer/app/darkref.py +16 -12
- tomwer/app/imagekeyeditor.py +2 -2
- tomwer/app/imagekeyupgrader.py +104 -0
- tomwer/app/nxtomoeditor.py +103 -0
- tomwer/app/rsync.py +1 -1
- tomwer/core/cluster/cluster.py +1 -1
- tomwer/core/futureobject.py +1 -0
- tomwer/core/process/control/datalistener/datalistener.py +7 -1
- tomwer/core/process/control/datalistener/rpcserver.py +3 -3
- tomwer/core/process/control/datawatcher/datawatcher.py +18 -18
- tomwer/core/process/control/datawatcher/datawatcherobserver.py +5 -8
- tomwer/core/process/control/datawatcher/datawatcherprocess.py +2 -3
- tomwer/core/process/control/datawatcher/edfdwprocess.py +2 -2
- tomwer/core/process/control/nxtomomill.py +33 -58
- tomwer/core/process/control/scanlist.py +2 -1
- tomwer/core/process/control/scanselector.py +7 -0
- tomwer/core/process/control/scantransfer.py +9 -18
- tomwer/core/process/control/scanvalidator.py +6 -5
- tomwer/core/process/control/singletomoobj.py +2 -1
- tomwer/core/process/control/timer.py +2 -1
- tomwer/core/process/control/tomoobjserie.py +8 -0
- tomwer/core/process/control/volumeselector.py +2 -1
- tomwer/core/process/control/volumesymlink.py +2 -1
- tomwer/core/process/edit/darkflatpatch.py +2 -1
- tomwer/core/process/edit/imagekeyeditor.py +4 -3
- tomwer/core/process/reconstruction/axis/axis.py +29 -32
- tomwer/core/process/reconstruction/axis/mode.py +3 -2
- tomwer/core/process/reconstruction/axis/params.py +35 -16
- tomwer/core/process/reconstruction/darkref/darkrefs.py +90 -707
- tomwer/core/process/reconstruction/darkref/darkrefscopy.py +44 -16
- tomwer/core/process/reconstruction/darkref/params.py +62 -67
- tomwer/core/process/reconstruction/lamino/tofu.py +1 -1
- tomwer/core/process/reconstruction/nabu/castvolume.py +21 -26
- tomwer/core/process/reconstruction/nabu/nabucommon.py +36 -38
- tomwer/core/process/reconstruction/nabu/nabuscores.py +28 -13
- tomwer/core/process/reconstruction/nabu/nabuslices.py +41 -14
- tomwer/core/process/reconstruction/nabu/nabuvolume.py +21 -12
- tomwer/core/process/reconstruction/nabu/utils.py +12 -1
- tomwer/core/process/reconstruction/normalization/normalization.py +9 -8
- tomwer/core/process/reconstruction/saaxis/saaxis.py +46 -20
- tomwer/core/process/reconstruction/sadeltabeta/sadeltabeta.py +38 -12
- tomwer/core/process/reconstruction/test/__init__.py +0 -39
- tomwer/core/process/reconstruction/test/test_axis_params.py +25 -3
- tomwer/core/process/reconstruction/test/test_darkref_copy.py +117 -1
- tomwer/core/process/script/python.py +16 -12
- tomwer/core/process/task.py +3 -7
- tomwer/core/process/test/test_axis.py +1 -1
- tomwer/core/process/test/test_dark_and_flat.py +41 -111
- tomwer/core/process/test/test_data_listener.py +0 -29
- tomwer/core/process/test/test_data_transfer.py +10 -14
- tomwer/core/process/test/test_nabu.py +1 -1
- tomwer/core/process/test/test_normalization.py +1 -1
- tomwer/core/process/visualization/liveslice.py +6 -0
- tomwer/core/scan/blissscan.py +37 -2
- tomwer/core/scan/edfscan.py +14 -4
- tomwer/core/scan/hdf5scan.py +10 -4
- tomwer/core/scan/scanbase.py +35 -29
- tomwer/core/scan/scanfactory.py +3 -17
- tomwer/core/scan/test/test_h5.py +1 -1
- tomwer/core/scan/test/test_process_registration.py +0 -11
- tomwer/core/scan/test/test_scan.py +32 -30
- tomwer/core/settings.py +2 -2
- tomwer/core/test/test_utils.py +1 -1
- tomwer/core/tomwer_object.py +19 -0
- tomwer/core/utils/__init__.py +0 -45
- tomwer/core/utils/char.py +2 -0
- tomwer/core/utils/gpu.py +5 -5
- tomwer/core/utils/nxtomoutils.py +2 -2
- tomwer/core/utils/scanutils.py +50 -0
- tomwer/core/utils/volumeutils.py +13 -0
- tomwer/core/volume/edfvolume.py +4 -0
- tomwer/core/volume/hdf5volume.py +4 -0
- tomwer/core/volume/jp2kvolume.py +4 -0
- tomwer/core/volume/rawvolume.py +4 -0
- tomwer/core/volume/tiffvolume.py +4 -0
- tomwer/core/volume/volumebase.py +19 -12
- tomwer/core/volume/volumefactory.py +20 -1
- tomwer/gui/cluster/slurm.py +1 -1
- tomwer/gui/cluster/test/test_cluster.py +2 -2
- tomwer/gui/control/datalist.py +109 -34
- tomwer/gui/control/datatransfert.py +1 -1
- tomwer/gui/control/datawatcher/datawatcher.py +23 -13
- tomwer/gui/control/datawatcher/datawatcherobserver.py +1 -1
- tomwer/gui/control/observations.py +0 -3
- tomwer/gui/control/selectorwidgetbase.py +42 -11
- tomwer/gui/control/serie/seriecreator.py +967 -0
- tomwer/{web/__init__.py → gui/control/serie/seriewaiter.py} +5 -7
- tomwer/gui/control/singletomoobj.py +15 -3
- tomwer/gui/control/test/test_datalist.py +1 -1
- tomwer/gui/control/test/test_datalistener.py +1 -1
- tomwer/gui/control/test/test_inputwidget.py +1 -1
- tomwer/gui/control/test/test_process_manager.py +1 -13
- tomwer/gui/control/test/test_scanselector.py +1 -1
- tomwer/gui/control/test/test_scanvalidator.py +1 -1
- tomwer/gui/control/test/test_single_tomo_obj.py +1 -1
- tomwer/gui/control/test/test_volume_dialog.py +19 -7
- tomwer/gui/control/test/test_volumeselector.py +4 -4
- tomwer/gui/debugtools/datasetgenerator.py +1 -8
- tomwer/gui/edit/dkrfpatch.py +2 -2
- tomwer/gui/edit/imagekeyeditor.py +12 -9
- tomwer/gui/edit/nxtomoeditor.py +475 -0
- tomwer/gui/edit/test/test_dkrf_patch.py +2 -14
- tomwer/gui/edit/test/test_image_key_editor.py +2 -2
- tomwer/gui/edit/test/test_nx_editor.py +155 -0
- tomwer/gui/qfolderdialog.py +11 -0
- tomwer/gui/reconstruction/axis/CompareImages.py +27 -29
- tomwer/gui/reconstruction/axis/axis.py +2 -0
- tomwer/gui/reconstruction/axis/radioaxis.py +67 -11
- tomwer/gui/reconstruction/darkref/darkrefcopywidget.py +7 -9
- tomwer/gui/reconstruction/darkref/darkrefwidget.py +22 -24
- tomwer/gui/reconstruction/lamino/tofu/projections.py +1 -1
- tomwer/gui/reconstruction/lamino/tofu/tofu.py +3 -3
- tomwer/gui/reconstruction/lamino/tofu/tofuexpert.py +4 -4
- tomwer/gui/reconstruction/lamino/tofu/tofuoutput.py +10 -4
- tomwer/gui/reconstruction/nabu/castvolume.py +80 -11
- tomwer/gui/reconstruction/nabu/check.py +1 -1
- tomwer/gui/reconstruction/nabu/nabuconfig/ctf.py +352 -0
- tomwer/gui/reconstruction/nabu/nabuconfig/nabuconfig.py +0 -9
- tomwer/gui/reconstruction/nabu/nabuconfig/output.py +1 -1
- tomwer/gui/reconstruction/nabu/nabuconfig/phase.py +18 -19
- tomwer/gui/reconstruction/nabu/nabuconfig/preprocessing.py +30 -7
- tomwer/gui/reconstruction/nabu/nabuconfig/reconstruction.py +26 -13
- tomwer/gui/reconstruction/nabu/slices.py +10 -2
- tomwer/gui/reconstruction/nabu/slurm.py +1 -1
- tomwer/gui/reconstruction/nabu/volume.py +13 -7
- tomwer/gui/reconstruction/normalization/intensity.py +1 -1
- tomwer/gui/reconstruction/saaxis/corrangeselector.py +10 -34
- tomwer/gui/reconstruction/saaxis/saaxis.py +11 -6
- tomwer/gui/reconstruction/saaxis/sliceselector.py +11 -26
- tomwer/gui/reconstruction/sadeltabeta/saadeltabeta.py +13 -8
- tomwer/gui/reconstruction/scores/scoreplot.py +67 -61
- tomwer/gui/reconstruction/test/test_axis.py +2 -2
- tomwer/gui/reconstruction/test/test_lamino.py +2 -2
- tomwer/gui/reconstruction/test/test_nabu.py +14 -1
- tomwer/gui/reconstruction/test/test_saaxis.py +8 -17
- tomwer/gui/reconstruction/test/test_sadeltabeta.py +7 -13
- tomwer/gui/stackplot.py +11 -28
- tomwer/gui/test/test_axis_gui.py +4 -4
- tomwer/gui/test/test_qfolder_dialog.py +12 -0
- tomwer/gui/utils/inputwidget.py +42 -21
- tomwer/gui/utils/lineselector/lineselector.py +13 -21
- tomwer/gui/utils/scandescription.py +2 -4
- tomwer/gui/utils/slider.py +1 -102
- tomwer/gui/utils/unitsystem.py +48 -11
- tomwer/gui/visualization/dataviewer.py +24 -17
- tomwer/gui/visualization/diffviewer/diffviewer.py +2 -11
- tomwer/gui/visualization/nxtomometadata.py +21 -0
- tomwer/gui/visualization/scanoverview.py +0 -1
- tomwer/gui/visualization/test/test_nx_tomo_metadata_viewer.py +72 -0
- tomwer/gui/visualization/test/test_stacks.py +1 -1
- tomwer/gui/visualization/tomoobjoverview.py +49 -0
- tomwer/gui/visualization/volumeoverview.py +64 -0
- tomwer/gui/visualization/volumeviewer.py +1 -1
- tomwer/resources/gui/icons/multi-document-save.png +0 -0
- tomwer/resources/gui/icons/multi-document-save.svg +101 -0
- tomwer/resources/gui/illustrations/ctf_z1.png +0 -0
- tomwer/resources/gui/illustrations/ctf_z1.svg +471 -0
- tomwer/synctools/datalistener.py +5 -1
- tomwer/synctools/imageloaderthread.py +2 -2
- tomwer/synctools/stacks/edit/imagekeyeditor.py +1 -1
- tomwer/synctools/stacks/processingstack.py +2 -2
- tomwer/synctools/stacks/reconstruction/castvolume.py +1 -0
- tomwer/synctools/stacks/reconstruction/lamino.py +1 -3
- tomwer/synctools/stacks/reconstruction/sadeltabeta.py +0 -2
- tomwer/synctools/test/test_darkRefs.py +32 -149
- tomwer/synctools/test/test_foldertransfer.py +1 -1
- tomwer/synctools/test/test_scanstages.py +2 -2
- tomwer/tests/__init__.py +0 -0
- tomwer/tests/conftest.py +51 -0
- tomwer/{test → tests}/test_scripts.py +1 -1
- tomwer/tests/test_utils.py +10 -0
- tomwer/{test → tests}/utils/utilstest.py +0 -11
- tomwer/version.py +3 -3
- {tomwer-1.0.4.dist-info → tomwer-1.1.0.dist-info}/METADATA +14 -16
- {tomwer-1.0.4.dist-info → tomwer-1.1.0.dist-info}/RECORD +245 -217
- {tomwer-1.0.4.dist-info → tomwer-1.1.0.dist-info}/WHEEL +1 -1
- {tomwer-1.0.4.dist-info → tomwer-1.1.0.dist-info}/entry_points.txt +6 -0
- orangecontrib/tomwer/setup.py +0 -45
- orangecontrib/tomwer/widgets/setup.py +0 -49
- tomwer/app/process.py +0 -153
- tomwer/core/process/reconstruction/nabu/slurm.py +0 -36
- tomwer/core/process/reconstruction/utils/nabu_slice_exec.py +0 -10
- tomwer/core/utils/laminoutils.py +0 -80
- tomwer/gui/utils/lineselector/lineselection.py +0 -76
- tomwer/setup.py +0 -52
- tomwer/web/client.py +0 -43
- tomwer/web/config.py +0 -36
- tomwer/web/test/test_graylog_connection.py +0 -59
- {tomwer/test → orangecontrib/tomwer/tutorials}/__init__.py +0 -0
- /tomwer/{web/test → gui/control/serie}/__init__.py +0 -0
- /tomwer/{test → tests}/utils/__init__.py +0 -0
- /tomwer-1.0.4-py3.8-nspkg.pth → /tomwer-1.1.0-py3.9-nspkg.pth +0 -0
- {tomwer-1.0.4.dist-info → tomwer-1.1.0.dist-info}/LICENSE +0 -0
- {tomwer-1.0.4.dist-info → tomwer-1.1.0.dist-info}/namespace_packages.txt +0 -0
- {tomwer-1.0.4.dist-info → tomwer-1.1.0.dist-info}/top_level.txt +0 -0
@@ -0,0 +1,471 @@
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
2
|
+
<svg
|
3
|
+
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
4
|
+
xmlns:cc="http://creativecommons.org/ns#"
|
5
|
+
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
6
|
+
xmlns:svg="http://www.w3.org/2000/svg"
|
7
|
+
xmlns="http://www.w3.org/2000/svg"
|
8
|
+
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
9
|
+
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
10
|
+
width="200"
|
11
|
+
height="90"
|
12
|
+
viewBox="0 0 52.916667 23.8125"
|
13
|
+
version="1.1"
|
14
|
+
id="svg8"
|
15
|
+
inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
|
16
|
+
sodipodi:docname="ctf_z1.svg"
|
17
|
+
inkscape:export-filename="/home/payno/dev/tomo/tomwer/tomwer/resources/gui/illustrations/ctf_z1.png"
|
18
|
+
inkscape:export-xdpi="134.50999"
|
19
|
+
inkscape:export-ydpi="134.50999">
|
20
|
+
<defs
|
21
|
+
id="defs2">
|
22
|
+
<marker
|
23
|
+
inkscape:isstock="true"
|
24
|
+
style="overflow:visible"
|
25
|
+
id="marker3517"
|
26
|
+
refX="0"
|
27
|
+
refY="0"
|
28
|
+
orient="auto"
|
29
|
+
inkscape:stockid="Arrow1Sstart">
|
30
|
+
<path
|
31
|
+
transform="matrix(0.2,0,0,0.2,1.2,0)"
|
32
|
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
|
33
|
+
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
34
|
+
id="path3515"
|
35
|
+
inkscape:connector-curvature="0" />
|
36
|
+
</marker>
|
37
|
+
<marker
|
38
|
+
inkscape:stockid="Arrow2Send"
|
39
|
+
orient="auto"
|
40
|
+
refY="0"
|
41
|
+
refX="0"
|
42
|
+
id="Arrow2Send"
|
43
|
+
style="overflow:visible"
|
44
|
+
inkscape:isstock="true">
|
45
|
+
<path
|
46
|
+
id="path937"
|
47
|
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
|
48
|
+
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
|
49
|
+
transform="matrix(-0.3,0,0,-0.3,0.69,0)"
|
50
|
+
inkscape:connector-curvature="0" />
|
51
|
+
</marker>
|
52
|
+
<marker
|
53
|
+
inkscape:isstock="true"
|
54
|
+
style="overflow:visible"
|
55
|
+
id="marker1789"
|
56
|
+
refX="0"
|
57
|
+
refY="0"
|
58
|
+
orient="auto"
|
59
|
+
inkscape:stockid="Arrow1Mend">
|
60
|
+
<path
|
61
|
+
transform="matrix(-0.4,0,0,-0.4,-4,0)"
|
62
|
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
|
63
|
+
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
64
|
+
id="path1787"
|
65
|
+
inkscape:connector-curvature="0" />
|
66
|
+
</marker>
|
67
|
+
<marker
|
68
|
+
inkscape:stockid="Arrow1Mstart"
|
69
|
+
orient="auto"
|
70
|
+
refY="0"
|
71
|
+
refX="0"
|
72
|
+
id="Arrow1Mstart"
|
73
|
+
style="overflow:visible"
|
74
|
+
inkscape:isstock="true">
|
75
|
+
<path
|
76
|
+
id="path910"
|
77
|
+
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
78
|
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
|
79
|
+
transform="matrix(0.4,0,0,0.4,4,0)"
|
80
|
+
inkscape:connector-curvature="0" />
|
81
|
+
</marker>
|
82
|
+
<marker
|
83
|
+
inkscape:stockid="Arrow2Mstart"
|
84
|
+
orient="auto"
|
85
|
+
refY="0"
|
86
|
+
refX="0"
|
87
|
+
id="Arrow2Mstart"
|
88
|
+
style="overflow:visible"
|
89
|
+
inkscape:isstock="true">
|
90
|
+
<path
|
91
|
+
id="path928"
|
92
|
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
|
93
|
+
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
|
94
|
+
transform="scale(0.6)"
|
95
|
+
inkscape:connector-curvature="0" />
|
96
|
+
</marker>
|
97
|
+
<marker
|
98
|
+
inkscape:stockid="Arrow2Mend"
|
99
|
+
orient="auto"
|
100
|
+
refY="0"
|
101
|
+
refX="0"
|
102
|
+
id="Arrow2Mend"
|
103
|
+
style="overflow:visible"
|
104
|
+
inkscape:isstock="true">
|
105
|
+
<path
|
106
|
+
id="path931"
|
107
|
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
|
108
|
+
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
|
109
|
+
transform="scale(-0.6)"
|
110
|
+
inkscape:connector-curvature="0" />
|
111
|
+
</marker>
|
112
|
+
<marker
|
113
|
+
inkscape:stockid="Arrow1Mend"
|
114
|
+
orient="auto"
|
115
|
+
refY="0"
|
116
|
+
refX="0"
|
117
|
+
id="Arrow1Mend"
|
118
|
+
style="overflow:visible"
|
119
|
+
inkscape:isstock="true">
|
120
|
+
<path
|
121
|
+
id="path913"
|
122
|
+
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
123
|
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
|
124
|
+
transform="matrix(-0.4,0,0,-0.4,-4,0)"
|
125
|
+
inkscape:connector-curvature="0" />
|
126
|
+
</marker>
|
127
|
+
<inkscape:perspective
|
128
|
+
sodipodi:type="inkscape:persp3d"
|
129
|
+
inkscape:vp_x="0 : 26.458333 : 1"
|
130
|
+
inkscape:vp_y="0 : 999.99999 : 0"
|
131
|
+
inkscape:vp_z="52.916667 : 26.458333 : 1"
|
132
|
+
inkscape:persp3d-origin="26.458333 : 17.638889 : 1"
|
133
|
+
id="perspective823" />
|
134
|
+
<marker
|
135
|
+
inkscape:stockid="Arrow2Send"
|
136
|
+
orient="auto"
|
137
|
+
refY="0"
|
138
|
+
refX="0"
|
139
|
+
id="Arrow2Send-6"
|
140
|
+
style="overflow:visible"
|
141
|
+
inkscape:isstock="true">
|
142
|
+
<path
|
143
|
+
inkscape:connector-curvature="0"
|
144
|
+
id="path937-2"
|
145
|
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
|
146
|
+
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
|
147
|
+
transform="matrix(-0.3,0,0,-0.3,0.69,0)" />
|
148
|
+
</marker>
|
149
|
+
<marker
|
150
|
+
inkscape:stockid="Arrow2Send"
|
151
|
+
orient="auto"
|
152
|
+
refY="0"
|
153
|
+
refX="0"
|
154
|
+
id="Arrow2Send-6-7"
|
155
|
+
style="overflow:visible"
|
156
|
+
inkscape:isstock="true">
|
157
|
+
<path
|
158
|
+
inkscape:connector-curvature="0"
|
159
|
+
id="path937-2-0"
|
160
|
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
|
161
|
+
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
|
162
|
+
transform="matrix(-0.3,0,0,-0.3,0.69,0)" />
|
163
|
+
</marker>
|
164
|
+
</defs>
|
165
|
+
<sodipodi:namedview
|
166
|
+
id="base"
|
167
|
+
pagecolor="#ffffff"
|
168
|
+
bordercolor="#666666"
|
169
|
+
borderopacity="1.0"
|
170
|
+
inkscape:pageopacity="0.0"
|
171
|
+
inkscape:pageshadow="2"
|
172
|
+
inkscape:zoom="3.959798"
|
173
|
+
inkscape:cx="57.456907"
|
174
|
+
inkscape:cy="67.584462"
|
175
|
+
inkscape:document-units="mm"
|
176
|
+
inkscape:current-layer="layer1"
|
177
|
+
showgrid="false"
|
178
|
+
units="px"
|
179
|
+
width="200px"
|
180
|
+
inkscape:window-width="1920"
|
181
|
+
inkscape:window-height="1016"
|
182
|
+
inkscape:window-x="0"
|
183
|
+
inkscape:window-y="27"
|
184
|
+
inkscape:window-maximized="1"
|
185
|
+
inkscape:document-rotation="0" />
|
186
|
+
<metadata
|
187
|
+
id="metadata5">
|
188
|
+
<rdf:RDF>
|
189
|
+
<cc:Work
|
190
|
+
rdf:about="">
|
191
|
+
<dc:format>image/svg+xml</dc:format>
|
192
|
+
<dc:type
|
193
|
+
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
194
|
+
<dc:title />
|
195
|
+
</cc:Work>
|
196
|
+
</rdf:RDF>
|
197
|
+
</metadata>
|
198
|
+
<g
|
199
|
+
inkscape:label="Layer 1"
|
200
|
+
inkscape:groupmode="layer"
|
201
|
+
id="layer1"
|
202
|
+
transform="translate(0,-273.1875)">
|
203
|
+
<g
|
204
|
+
id="g1281"
|
205
|
+
style="opacity:0.76200005;stroke:#919191;stroke-opacity:1"
|
206
|
+
transform="translate(0,14.287503)">
|
207
|
+
<g
|
208
|
+
id="g1271"
|
209
|
+
style="stroke:#919191;stroke-opacity:1">
|
210
|
+
<path
|
211
|
+
style="fill:none;stroke:#919191;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
212
|
+
d="M 22.867559,265.62797 5.1026784,271.10863"
|
213
|
+
id="path815"
|
214
|
+
inkscape:connector-curvature="0"
|
215
|
+
sodipodi:nodetypes="cc" />
|
216
|
+
</g>
|
217
|
+
<g
|
218
|
+
id="g1274"
|
219
|
+
style="stroke:#919191;stroke-opacity:1">
|
220
|
+
<path
|
221
|
+
style="fill:none;stroke:#919191;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
222
|
+
d="m 5.1026784,271.10863 10.5003856,3.27022 7.198367,2.24184 0.06613,-10.99272 3.458489,-0.0321 v 11.09164"
|
223
|
+
id="path817"
|
224
|
+
inkscape:connector-curvature="0"
|
225
|
+
sodipodi:nodetypes="cccccc" />
|
226
|
+
</g>
|
227
|
+
<path
|
228
|
+
sodipodi:nodetypes="cc"
|
229
|
+
inkscape:connector-curvature="0"
|
230
|
+
id="path819"
|
231
|
+
d="m 22.801431,276.62069 3.524617,0.0668"
|
232
|
+
style="fill:none;stroke:#919191;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
|
233
|
+
</g>
|
234
|
+
<g
|
235
|
+
id="g7049"
|
236
|
+
transform="translate(0,14.287503)">
|
237
|
+
<path
|
238
|
+
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.265, 0.265;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
|
239
|
+
d="m 46.048828,271.69336 0.002,0.26562 0.265625,-0.002 -0.002,-0.26367 z m -0.265625,0.002 -0.263672,0.002 0.002,0.26562 0.263672,-0.002 z m -0.794922,0.004 0.002,0.26562 0.265625,-0.002 -0.002,-0.26367 z m -0.263672,0.002 -0.265625,0.002 0.002,0.26563 0.263671,-0.002 z m -0.794921,0.004 v 0.26562 l 0.265624,-0.002 -0.002,-0.26367 z m -0.265626,0.002 -0.265624,0.002 0.002,0.26563 0.265625,-0.002 z m -0.794921,0.004 0.002,0.26562 0.263672,-0.002 v -0.26367 z m -0.265625,0.002 -0.263672,0.002 v 0.26368 h 0.265625 z m -0.794922,0.004 0.002,0.26562 0.265625,-0.002 -0.002,-0.26367 z m -0.263672,0.002 -0.265625,0.002 0.002,0.26368 h 0.263672 z m -0.794922,0.004 v 0.26562 l 0.265625,-0.002 -0.002,-0.26367 z m -0.265625,0.002 -0.265625,0.002 0.002,0.26367 h 0.265625 z m -0.529297,0.002 -0.265625,0.002 0.002,0.26562 0.263672,-0.002 z m -0.53125,0.004 -0.263672,0.002 v 0.26367 h 0.265625 z m -0.529297,0.002 -0.265625,0.002 0.002,0.26562 0.265625,-0.002 z m -0.53125,0.004 -0.263672,0.002 0.002,0.26367 h 0.263672 z m -0.529297,0.002 -0.265625,0.002 0.002,0.26563 0.265626,-0.002 z m -0.529296,0.004 -0.265626,0.002 0.002,0.26367 h 0.265625 z m -0.53125,0.002 -0.263672,0.002 v 0.26563 l 0.265625,-0.002 z m -0.529297,0.004 -0.265625,0.002 0.002,0.26367 h 0.265625 z m -0.529297,0.002 -0.265625,0.002 0.002,0.26563 0.263672,-0.002 z m -0.53125,0.004 -0.263672,0.002 v 0.26367 h 0.265625 z m -0.529297,0.002 -0.265625,0.002 0.002,0.26563 0.265625,-0.002 z m -0.529297,0.004 -0.265625,0.002 0.002,0.26367 H 34.125 Z m -0.53125,0.002 -0.263672,0.002 v 0.26563 l 0.265625,-0.002 z m -0.529297,0.004 -0.265625,0.002 0.002,0.26367 0.265625,-0.002 z m -0.529297,0.002 -0.265625,0.002 0.002,0.26563 0.263672,-0.002 z m -0.53125,0.004 -0.263672,0.002 v 0.26367 l 0.265625,-0.002 z m -0.529297,0.002 -0.265625,0.002 0.002,0.26563 0.265624,-0.002 z m -0.53125,0.004 -0.263671,0.002 0.002,0.26367 0.263671,-0.002 z m -0.529297,0.002 -0.265624,0.002 0.002,0.26563 0.265625,-0.002 z m -0.794921,0.004 0.002,0.26563 0.265625,-0.002 -0.002,-0.26368 z m -0.265625,0.002 -0.263672,0.002 v 0.26562 l 0.265625,-0.002 z m -0.794922,0.004 0.002,0.26563 0.265625,-0.002 -0.002,-0.26367 z m -0.263672,0.002 -0.265625,0.002 0.002,0.26562 0.263672,-0.002 z M 27.5,271.79492 v 0.26563 l 0.265625,-0.002 -0.002,-0.26367 z m -0.265625,0.002 -0.265625,0.002 0.002,0.26562 0.265625,-0.002 z m -0.794922,0.004 0.002,0.26563 0.263672,-0.002 v -0.26367 z"
|
240
|
+
id="path821"
|
241
|
+
inkscape:connector-curvature="0" />
|
242
|
+
<path
|
243
|
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.106pt;stroke-opacity:1"
|
244
|
+
d="m 45.484172,271.82975 -0.527089,0.53289 1.852069,-0.54015 -1.857875,-0.51983 z"
|
245
|
+
id="path7055"
|
246
|
+
inkscape:connector-curvature="0" />
|
247
|
+
</g>
|
248
|
+
<g
|
249
|
+
aria-label="source"
|
250
|
+
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
|
251
|
+
id="text841"
|
252
|
+
transform="translate(0,14.287503)">
|
253
|
+
<path
|
254
|
+
d="m 3.3880368,278.22979 v 0.23978 q -0.107487,-0.0551 -0.2232422,-0.0827 -0.1157552,-0.0276 -0.2397786,-0.0276 -0.1887912,0 -0.2838759,0.0579 -0.093707,0.0579 -0.093707,0.17363 0,0.0882 0.067524,0.13918 0.067524,0.0496 0.2714735,0.0951 l 0.086816,0.0193 q 0.2700955,0.0579 0.3830946,0.16399 0.1143772,0.10473 0.1143772,0.29352 0,0.21497 -0.1708767,0.34037 -0.1694987,0.12541 -0.467155,0.12541 -0.1240234,0 -0.2590712,-0.0248 -0.1336697,-0.0234 -0.2824978,-0.0717 v -0.26182 q 0.1405599,0.073 0.2769857,0.11024 0.1364258,0.0358 0.2700955,0.0358 0.1791449,0 0.2756076,-0.0606 0.096463,-0.062 0.096463,-0.17363 0,-0.10335 -0.07028,-0.15847 -0.068902,-0.0551 -0.3045464,-0.10611 l -0.088194,-0.0207 q -0.2356446,-0.0496 -0.3403755,-0.15159 -0.1047309,-0.10335 -0.1047309,-0.2825 0,-0.21773 0.1543403,-0.33624 0.1543403,-0.11851 0.4382161,-0.11851 0.1405599,0 0.2645834,0.0207 0.1240234,0.0207 0.2287543,0.062 z"
|
255
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
256
|
+
id="path6947"
|
257
|
+
inkscape:connector-curvature="0" />
|
258
|
+
<path
|
259
|
+
d="m 4.4725528,278.36209 q -0.2039496,0 -0.3224609,0.15985 -0.1185113,0.15847 -0.1185113,0.43546 0,0.27698 0.1171333,0.43684 0.1185113,0.15847 0.3238389,0.15847 0.2025717,0 0.3210829,-0.15985 0.1185113,-0.15985 0.1185113,-0.43546 0,-0.27423 -0.1185113,-0.43408 -0.1185112,-0.16123 -0.3210829,-0.16123 z m 0,-0.21498 q 0.3307292,0 0.5195204,0.21498 0.1887913,0.21497 0.1887913,0.59531 0,0.37896 -0.1887913,0.59531 -0.1887912,0.21498 -0.5195204,0.21498 -0.3321072,0 -0.5208984,-0.21498 -0.1874132,-0.21635 -0.1874132,-0.59531 0,-0.38034 0.1874132,-0.59531 0.1887912,-0.21498 0.5208984,-0.21498 z"
|
260
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
261
|
+
id="path6949"
|
262
|
+
inkscape:connector-curvature="0" />
|
263
|
+
<path
|
264
|
+
d="m 5.5749835,279.11863 v -0.93431 h 0.253559 v 0.92466 q 0,0.21911 0.085438,0.32935 0.085438,0.10887 0.2563151,0.10887 0.2053277,0 0.323839,-0.13091 0.1198893,-0.13092 0.1198893,-0.35692 v -0.87505 h 0.253559 v 1.5434 h -0.253559 v -0.23702 q -0.092329,0.14056 -0.214974,0.20946 -0.1212673,0.0675 -0.2824978,0.0675 -0.2659614,0 -0.4037652,-0.16537 -0.1378038,-0.16536 -0.1378038,-0.48369 z m 0.6380317,-0.97152 z"
|
265
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
266
|
+
id="path6951"
|
267
|
+
inkscape:connector-curvature="0" />
|
268
|
+
<path
|
269
|
+
d="m 8.2842064,278.42134 q -0.042719,-0.0248 -0.093707,-0.0358 -0.049609,-0.0124 -0.110243,-0.0124 -0.214974,0 -0.3307292,0.14056 -0.1143772,0.13918 -0.1143772,0.40101 v 0.81304 H 7.380213 v -1.5434 H 7.63515 v 0.23978 q 0.079926,-0.14056 0.2080838,-0.20809 0.1281576,-0.0689 0.3114366,-0.0689 0.026183,0 0.057878,0.004 0.031695,0.003 0.07028,0.01 z"
|
270
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
271
|
+
id="path6953"
|
272
|
+
inkscape:connector-curvature="0" />
|
273
|
+
<path
|
274
|
+
d="m 9.5988551,278.24358 v 0.23702 q -0.107487,-0.0593 -0.216352,-0.0882 -0.107487,-0.0303 -0.2177301,-0.0303 -0.2466688,0 -0.3830946,0.15709 -0.1364258,0.15572 -0.1364258,0.43822 0,0.2825 0.1364258,0.43959 0.1364258,0.15572 0.3830946,0.15572 0.1102431,0 0.2177301,-0.0289 0.108865,-0.0303 0.216352,-0.0896 v 0.23427 q -0.106109,0.0496 -0.2204861,0.0744 -0.1129992,0.0248 -0.2411567,0.0248 -0.3486437,0 -0.5539714,-0.21911 -0.2053277,-0.21911 -0.2053277,-0.59118 0,-0.37758 0.2067058,-0.59394 0.2080837,-0.21635 0.5691297,-0.21635 0.1171333,0 0.2287544,0.0248 0.1116211,0.0234 0.216352,0.0717 z"
|
275
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
276
|
+
id="path6955"
|
277
|
+
inkscape:connector-curvature="0" />
|
278
|
+
<path
|
279
|
+
d="m 11.359988,278.89263 v 0.12402 h -1.16582 q 0.01654,0.26183 0.157096,0.39964 0.141938,0.13642 0.394119,0.13642 0.146072,0 0.282498,-0.0358 0.137804,-0.0358 0.272851,-0.10748 v 0.23977 q -0.136426,0.0579 -0.279741,0.0882 -0.143316,0.0303 -0.290767,0.0303 -0.369314,0 -0.585666,-0.21498 -0.2149737,-0.21497 -0.2149737,-0.58153 0,-0.37896 0.2039497,-0.60083 0.205328,-0.22324 0.552593,-0.22324 0.311437,0 0.49196,0.2012 0.181901,0.19981 0.181901,0.54432 z m -0.253559,-0.0744 q -0.0028,-0.20809 -0.117133,-0.33211 -0.113,-0.12402 -0.300413,-0.12402 -0.212218,0 -0.340375,0.11989 -0.12678,0.11988 -0.146072,0.33761 z"
|
280
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
281
|
+
id="path6957"
|
282
|
+
inkscape:connector-curvature="0" />
|
283
|
+
</g>
|
284
|
+
<g
|
285
|
+
aria-label="z1_h"
|
286
|
+
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#c20000;fill-opacity:1;stroke:none;stroke-width:0.264583"
|
287
|
+
id="text845"
|
288
|
+
transform="translate(-4.118294,14.1495)">
|
289
|
+
<path
|
290
|
+
d="m 11.789953,272.74838 h 1.204405 v 0.23151 l -0.953602,1.10932 h 0.953602 v 0.20257 h -1.238856 v -0.23151 l 0.953602,-1.10932 h -0.919151 z"
|
291
|
+
style="font-size:2.82222px;fill:#c20000;fill-opacity:1;stroke-width:0.264583"
|
292
|
+
id="path6960"
|
293
|
+
inkscape:connector-curvature="0" />
|
294
|
+
<path
|
295
|
+
d="M 13.465647,274.05751 H 13.9204 v -1.56958 l -0.494716,0.0992 v -0.25356 l 0.49196,-0.0992 h 0.278363 v 1.82314 h 0.454753 v 0.23427 h -1.185113 z"
|
296
|
+
style="font-size:2.82222px;fill:#c20000;fill-opacity:1;stroke-width:0.264583"
|
297
|
+
id="path6962"
|
298
|
+
inkscape:connector-curvature="0" />
|
299
|
+
<path
|
300
|
+
d="m 16.349881,274.76031 v 0.19706 h -1.466233 v -0.19706 z"
|
301
|
+
style="font-size:2.82222px;fill:#c20000;fill-opacity:1;stroke-width:0.264583"
|
302
|
+
id="path6964"
|
303
|
+
inkscape:connector-curvature="0" />
|
304
|
+
<path
|
305
|
+
d="m 17.871235,273.36022 v 0.93156 h -0.253559 v -0.92329 q 0,-0.21911 -0.08544,-0.32797 -0.08544,-0.10887 -0.256315,-0.10887 -0.205328,0 -0.323839,0.13092 -0.118511,0.13091 -0.118511,0.35691 v 0.8723 h -0.254937 v -2.14423 h 0.254937 v 0.8406 q 0.09095,-0.13918 0.213596,-0.20808 0.124023,-0.0689 0.285253,-0.0689 0.265962,0 0.402388,0.16536 0.136425,0.16399 0.136425,0.48369 z"
|
306
|
+
style="font-size:2.82222px;fill:#c20000;fill-opacity:1;stroke-width:0.264583"
|
307
|
+
id="path6966"
|
308
|
+
inkscape:connector-curvature="0" />
|
309
|
+
</g>
|
310
|
+
<g
|
311
|
+
aria-label="sample"
|
312
|
+
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
|
313
|
+
id="text841-3"
|
314
|
+
transform="translate(0,14.287503)">
|
315
|
+
<path
|
316
|
+
d="m 20.549924,278.36535 v 0.23978 q -0.107487,-0.0551 -0.223242,-0.0827 -0.115756,-0.0276 -0.239779,-0.0276 -0.188791,0 -0.283876,0.0579 -0.09371,0.0579 -0.09371,0.17363 0,0.0882 0.06752,0.13918 0.06752,0.0496 0.271474,0.0951 l 0.08682,0.0193 q 0.270096,0.0579 0.383095,0.16399 0.114377,0.10473 0.114377,0.29352 0,0.21497 -0.170877,0.34037 -0.169498,0.1254 -0.467155,0.1254 -0.124023,0 -0.259071,-0.0248 -0.13367,-0.0234 -0.282498,-0.0717 v -0.26183 q 0.14056,0.073 0.276986,0.11025 0.136426,0.0358 0.270096,0.0358 0.179144,0 0.275607,-0.0606 0.09646,-0.062 0.09646,-0.17363 0,-0.10335 -0.07028,-0.15847 -0.0689,-0.0551 -0.304547,-0.10611 l -0.08819,-0.0207 q -0.235645,-0.0496 -0.340375,-0.15159 -0.104731,-0.10335 -0.104731,-0.2825 0,-0.21773 0.15434,-0.33624 0.15434,-0.11851 0.438216,-0.11851 0.14056,0 0.264583,0.0207 0.124024,0.0207 0.228755,0.062 z"
|
317
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
318
|
+
id="path6969"
|
319
|
+
inkscape:connector-curvature="0" />
|
320
|
+
<path
|
321
|
+
d="m 21.737793,279.08745 q -0.307303,0 -0.425814,0.0703 -0.118511,0.0703 -0.118511,0.23977 0,0.13505 0.08819,0.21498 0.08957,0.0786 0.242535,0.0786 0.21084,0 0.337619,-0.14883 0.128158,-0.15021 0.128158,-0.39825 v -0.0565 z m 0.50574,-0.10474 v 0.88057 h -0.253559 v -0.23427 q -0.08682,0.14056 -0.216352,0.20809 -0.129536,0.0661 -0.316949,0.0661 -0.237023,0 -0.377583,-0.13229 -0.139181,-0.13367 -0.139181,-0.35691 0,-0.26045 0.173632,-0.39274 0.175011,-0.13229 0.520899,-0.13229 h 0.355534 v -0.0248 q 0,-0.17501 -0.115756,-0.27009 -0.114377,-0.0965 -0.322461,-0.0965 -0.132291,0 -0.257693,0.0317 -0.125401,0.0317 -0.241156,0.0951 v -0.23426 q 0.139182,-0.0537 0.270095,-0.0799 0.130914,-0.0276 0.254937,-0.0276 0.334863,0 0.500228,0.17363 0.165365,0.17364 0.165365,0.52641 z"
|
322
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
323
|
+
id="path6971"
|
324
|
+
inkscape:connector-curvature="0" />
|
325
|
+
<path
|
326
|
+
d="m 23.967459,278.61616 q 0.09508,-0.17088 0.227376,-0.25218 0.132292,-0.0813 0.311437,-0.0813 0.241156,0 0.37207,0.1695 0.130913,0.16812 0.130913,0.47956 v 0.93155 H 24.754318 V 278.94 q 0,-0.22187 -0.07855,-0.32936 -0.07855,-0.10748 -0.239778,-0.10748 -0.19706,0 -0.311437,0.13091 -0.114377,0.13091 -0.114377,0.35691 v 0.8723 H 23.755241 V 278.94 q 0,-0.22325 -0.07855,-0.32936 -0.07855,-0.10748 -0.242535,-0.10748 -0.194304,0 -0.308681,0.13229 -0.114377,0.13091 -0.114377,0.35553 v 0.8723 h -0.254937 v -1.5434 H 23.0111 v 0.23978 q 0.08682,-0.14194 0.208084,-0.20946 0.121267,-0.0675 0.28801,-0.0675 0.16812,0 0.285254,0.0854 0.118511,0.0854 0.175011,0.24805 z"
|
327
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
328
|
+
id="path6973"
|
329
|
+
inkscape:connector-curvature="0" />
|
330
|
+
<path
|
331
|
+
d="m 25.760286,279.63177 v 0.81856 h -0.254937 v -2.13045 h 0.254937 v 0.23426 q 0.07993,-0.1378 0.201194,-0.20394 0.122645,-0.0675 0.292144,-0.0675 0.28112,0 0.45613,0.22324 0.176389,0.22325 0.176389,0.58705 0,0.3638 -0.176389,0.58704 -0.17501,0.22324 -0.45613,0.22324 -0.169499,0 -0.292144,-0.0661 -0.121268,-0.0675 -0.201194,-0.20533 z m 0.862652,-0.53881 q 0,-0.27974 -0.115755,-0.43822 -0.114377,-0.15985 -0.315571,-0.15985 -0.201194,0 -0.316949,0.15985 -0.114377,0.15848 -0.114377,0.43822 0,0.27974 0.114377,0.43959 0.115755,0.15848 0.316949,0.15848 0.201194,0 0.315571,-0.15848 0.115755,-0.15985 0.115755,-0.43959 z"
|
332
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
333
|
+
id="path6975"
|
334
|
+
inkscape:connector-curvature="0" />
|
335
|
+
<path
|
336
|
+
d="m 27.306445,277.71905 h 0.253559 v 2.14423 h -0.253559 z"
|
337
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
338
|
+
id="path6977"
|
339
|
+
inkscape:connector-curvature="0" />
|
340
|
+
<path
|
341
|
+
d="m 29.41071,279.02819 v 0.12402 h -1.165821 q 0.01654,0.26183 0.157097,0.39963 0.141938,0.13643 0.394119,0.13643 0.146072,0 0.282498,-0.0358 0.137803,-0.0358 0.272851,-0.10749 v 0.23978 q -0.136426,0.0579 -0.279742,0.0882 -0.143316,0.0303 -0.290766,0.0303 -0.369314,0 -0.585666,-0.21497 -0.214974,-0.21497 -0.214974,-0.58153 0,-0.37896 0.20395,-0.60083 0.205327,-0.22324 0.552593,-0.22324 0.311437,0 0.49196,0.2012 0.181901,0.19981 0.181901,0.54432 z m -0.253559,-0.0744 q -0.0028,-0.20809 -0.117133,-0.33211 -0.113,-0.12402 -0.300413,-0.12402 -0.212218,0 -0.340375,0.11988 -0.12678,0.11989 -0.146072,0.33762 z"
|
342
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
343
|
+
id="path6979"
|
344
|
+
inkscape:connector-curvature="0" />
|
345
|
+
</g>
|
346
|
+
<g
|
347
|
+
aria-label="detector"
|
348
|
+
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
|
349
|
+
id="text841-3-7"
|
350
|
+
transform="translate(0,14.287503)">
|
351
|
+
<path
|
352
|
+
d="m 40.7982,278.56284 v -0.83509 h 0.253559 v 2.14423 H 40.7982 v -0.23151 q -0.07993,0.1378 -0.202572,0.20533 -0.121267,0.0661 -0.292144,0.0661 -0.279741,0 -0.45613,-0.22324 -0.175011,-0.22324 -0.175011,-0.58704 0,-0.36381 0.175011,-0.58705 0.176389,-0.22324 0.45613,-0.22324 0.170877,0 0.292144,0.0675 0.122646,0.0662 0.202572,0.20395 z m -0.86403,0.53882 q 0,0.27974 0.114377,0.43959 0.115755,0.15847 0.316949,0.15847 0.201194,0 0.316949,-0.15847 0.115755,-0.15985 0.115755,-0.43959 0,-0.27975 -0.115755,-0.43822 -0.115755,-0.15985 -0.316949,-0.15985 -0.201194,0 -0.316949,0.15985 -0.114377,0.15847 -0.114377,0.43822 z"
|
353
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
354
|
+
id="path6982"
|
355
|
+
inkscape:connector-curvature="0" />
|
356
|
+
<path
|
357
|
+
d="m 42.894196,279.03689 v 0.12402 h -1.16582 q 0.01654,0.26183 0.157096,0.39963 0.141938,0.13643 0.394119,0.13643 0.146072,0 0.282498,-0.0358 0.137804,-0.0358 0.272851,-0.10749 v 0.23978 q -0.136425,0.0579 -0.279741,0.0882 -0.143316,0.0303 -0.290766,0.0303 -0.369315,0 -0.585667,-0.21497 -0.214974,-0.21498 -0.214974,-0.58153 0,-0.37896 0.20395,-0.60083 0.205328,-0.22324 0.552593,-0.22324 0.311437,0 0.49196,0.20119 0.181901,0.19982 0.181901,0.54433 z m -0.253559,-0.0744 q -0.0028,-0.20808 -0.117133,-0.3321 -0.112999,-0.12403 -0.300413,-0.12403 -0.212217,0 -0.340375,0.11989 -0.126779,0.11989 -0.146072,0.33762 z"
|
358
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
359
|
+
id="path6984"
|
360
|
+
inkscape:connector-curvature="0" />
|
361
|
+
<path
|
362
|
+
d="m 43.561166,277.89036 v 0.43822 h 0.522277 v 0.19706 h -0.522277 v 0.83784 q 0,0.18879 0.05099,0.24254 0.05237,0.0537 0.21084,0.0537 h 0.260449 v 0.21222 h -0.260449 q -0.293522,0 -0.405144,-0.10887 -0.111621,-0.11024 -0.111621,-0.39963 v -0.83784 h -0.186035 v -0.19706 h 0.186035 v -0.43822 z"
|
363
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
364
|
+
id="path6986"
|
365
|
+
inkscape:connector-curvature="0" />
|
366
|
+
<path
|
367
|
+
d="m 45.737089,279.03689 v 0.12402 h -1.165821 q 0.01654,0.26183 0.157097,0.39963 0.141938,0.13643 0.394119,0.13643 0.146072,0 0.282497,-0.0358 0.137804,-0.0358 0.272852,-0.10749 v 0.23978 q -0.136426,0.0579 -0.279742,0.0882 -0.143316,0.0303 -0.290766,0.0303 -0.369314,0 -0.585666,-0.21497 -0.214974,-0.21498 -0.214974,-0.58153 0,-0.37896 0.20395,-0.60083 0.205327,-0.22324 0.552593,-0.22324 0.311437,0 0.49196,0.20119 0.181901,0.19982 0.181901,0.54433 z m -0.253559,-0.0744 q -0.0028,-0.20808 -0.117134,-0.3321 -0.112999,-0.12403 -0.300412,-0.12403 -0.212218,0 -0.340375,0.11989 -0.12678,0.11989 -0.146072,0.33762 z"
|
368
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
369
|
+
id="path6988"
|
370
|
+
inkscape:connector-curvature="0" />
|
371
|
+
<path
|
372
|
+
d="m 47.263955,278.38783 v 0.23702 q -0.107487,-0.0592 -0.216352,-0.0882 -0.107487,-0.0303 -0.21773,-0.0303 -0.246669,0 -0.383095,0.1571 -0.136426,0.15572 -0.136426,0.43822 0,0.28249 0.136426,0.43959 0.136426,0.15572 0.383095,0.15572 0.110243,0 0.21773,-0.0289 0.108865,-0.0303 0.216352,-0.0896 v 0.23426 q -0.106109,0.0496 -0.220486,0.0744 -0.112999,0.0248 -0.241157,0.0248 -0.348644,0 -0.553971,-0.21911 -0.205328,-0.2191 -0.205328,-0.59117 0,-0.37759 0.206706,-0.59394 0.208084,-0.21635 0.56913,-0.21635 0.117133,0 0.228754,0.0248 0.111621,0.0234 0.216352,0.0717 z"
|
373
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
374
|
+
id="path6990"
|
375
|
+
inkscape:connector-curvature="0" />
|
376
|
+
<path
|
377
|
+
d="m 47.95573,277.89036 v 0.43822 h 0.522277 v 0.19706 H 47.95573 v 0.83784 q 0,0.18879 0.05099,0.24254 0.05237,0.0537 0.210839,0.0537 h 0.26045 v 0.21222 h -0.26045 q -0.293522,0 -0.405143,-0.10887 -0.111621,-0.11024 -0.111621,-0.39963 V 278.5256 H 47.51476 v -0.19706 h 0.186035 v -0.43822 z"
|
378
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
379
|
+
id="path6992"
|
380
|
+
inkscape:connector-curvature="0" />
|
381
|
+
<path
|
382
|
+
d="m 49.40956,278.50634 q -0.203949,0 -0.322461,0.15986 -0.118511,0.15847 -0.118511,0.43546 0,0.27698 0.117133,0.43683 0.118512,0.15848 0.323839,0.15848 0.202572,0 0.321083,-0.15985 0.118511,-0.15986 0.118511,-0.43546 0,-0.27423 -0.118511,-0.43409 -0.118511,-0.16123 -0.321083,-0.16123 z m 0,-0.21497 q 0.330729,0 0.519521,0.21497 0.188791,0.21498 0.188791,0.59532 0,0.37896 -0.188791,0.59531 -0.188792,0.21497 -0.519521,0.21497 -0.332107,0 -0.520898,-0.21497 -0.187413,-0.21635 -0.187413,-0.59531 0,-0.38034 0.187413,-0.59532 0.188791,-0.21497 0.520898,-0.21497 z"
|
383
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
384
|
+
id="path6994"
|
385
|
+
inkscape:connector-curvature="0" />
|
386
|
+
<path
|
387
|
+
d="m 51.432521,278.5656 q -0.04272,-0.0248 -0.09371,-0.0358 -0.04961,-0.0124 -0.110244,-0.0124 -0.214973,0 -0.330729,0.14056 -0.114377,0.13918 -0.114377,0.40101 v 0.81304 h -0.254937 v -1.5434 h 0.254937 v 0.23977 q 0.07993,-0.14056 0.208084,-0.20808 0.128157,-0.0689 0.311437,-0.0689 0.02618,0 0.05788,0.004 0.03169,0.003 0.07028,0.01 z"
|
388
|
+
style="font-size:2.82222223px;stroke-width:0.26458332"
|
389
|
+
id="path6996"
|
390
|
+
inkscape:connector-curvature="0" />
|
391
|
+
</g>
|
392
|
+
<path
|
393
|
+
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
|
394
|
+
d="m 49.222656,276.08251 -5.085937,3.24219 0.002,0.0742 0.335937,12.79297 4.699219,-2.79883 z m -0.265625,0.48438 -0.04687,12.67578 -4.18164,2.49023 -0.324219,-12.26367 z"
|
395
|
+
id="path902"
|
396
|
+
inkscape:connector-curvature="0" />
|
397
|
+
<g
|
398
|
+
aria-label="z2"
|
399
|
+
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#c20000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
|
400
|
+
id="text845-3"
|
401
|
+
transform="translate(0,14.287503)">
|
402
|
+
<path
|
403
|
+
d="m 34.015571,273.09257 h 1.505506 v 0.28938 l -1.192003,1.38666 h 1.192003 v 0.25321 h -1.54857 v -0.28939 l 1.192003,-1.38665 h -1.148939 z"
|
404
|
+
style="font-size:3.52777767px;fill:#c20000;fill-opacity:1;stroke-width:0.26458332"
|
405
|
+
id="path6999"
|
406
|
+
inkscape:connector-curvature="0" />
|
407
|
+
<path
|
408
|
+
d="m 36.349623,274.72899 h 1.214396 v 0.29283 h -1.632975 v -0.29283 q 0.198093,-0.20499 0.539157,-0.5495 0.342787,-0.34623 0.430637,-0.44614 0.167087,-0.18775 0.232544,-0.31694 0.06718,-0.13092 0.06718,-0.25666 0,-0.20499 -0.144694,-0.33418 -0.142971,-0.12919 -0.373792,-0.12919 -0.163642,0 -0.346232,0.0568 -0.180868,0.0568 -0.387574,0.17226 v -0.3514 q 0.210151,-0.0844 0.392741,-0.12747 0.18259,-0.0431 0.334174,-0.0431 0.399631,0 0.637343,0.19981 0.237712,0.19982 0.237712,0.53399 0,0.15848 -0.06029,0.30145 -0.05857,0.14125 -0.215318,0.33417 -0.04306,0.05 -0.273885,0.28939 -0.230821,0.23771 -0.651123,0.66663 z"
|
409
|
+
style="font-size:3.52777767px;fill:#c20000;fill-opacity:1;stroke-width:0.26458332"
|
410
|
+
id="path7001"
|
411
|
+
inkscape:connector-curvature="0" />
|
412
|
+
</g>
|
413
|
+
<g
|
414
|
+
aria-label="z2_h"
|
415
|
+
transform="rotate(0.14442311,-7482.3839,-3692.9939)"
|
416
|
+
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#c20000;fill-opacity:1;stroke:none;stroke-width:0.264583"
|
417
|
+
id="text845-1">
|
418
|
+
<path
|
419
|
+
d="m 25.261291,268.26325 h 0.903304 v 0.17364 l -0.715201,0.83199 h 0.715201 v 0.15193 h -0.929142 v -0.17364 l 0.715202,-0.83199 h -0.689364 z"
|
420
|
+
style="font-size:2.11667px;fill:#c20000;fill-opacity:1;stroke-width:0.264583"
|
421
|
+
id="path7004"
|
422
|
+
inkscape:connector-curvature="0" />
|
423
|
+
<path
|
424
|
+
d="M 28.681237,269.77221 V 269.92 h -1.099674 v -0.14779 z"
|
425
|
+
style="font-size:2.11667px;fill:#c20000;fill-opacity:1;stroke-width:0.264583"
|
426
|
+
id="path7008"
|
427
|
+
inkscape:connector-curvature="0" />
|
428
|
+
<text
|
429
|
+
xml:space="preserve"
|
430
|
+
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#c20000;fill-opacity:1;stroke:none;stroke-width:0.0700043"
|
431
|
+
x="25.452368"
|
432
|
+
y="269.54578"
|
433
|
+
id="text896"
|
434
|
+
transform="rotate(-0.14442311)"><tspan
|
435
|
+
sodipodi:role="line"
|
436
|
+
id="tspan894"
|
437
|
+
x="25.452368"
|
438
|
+
y="269.54578"
|
439
|
+
style="font-size:2.46944px;fill:#c20000;fill-opacity:1;stroke-width:0.0700043">1</tspan></text>
|
440
|
+
<text
|
441
|
+
xml:space="preserve"
|
442
|
+
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#c20000;fill-opacity:1;stroke:none;stroke-width:0.0700043"
|
443
|
+
x="27.967733"
|
444
|
+
y="269.59308"
|
445
|
+
id="text900"
|
446
|
+
transform="rotate(-0.14442311)"><tspan
|
447
|
+
sodipodi:role="line"
|
448
|
+
id="tspan898"
|
449
|
+
x="27.967733"
|
450
|
+
y="269.59308"
|
451
|
+
style="font-size:2.46944px;fill:#c20000;fill-opacity:1;stroke-width:0.0700043">v</tspan></text>
|
452
|
+
</g>
|
453
|
+
<path
|
454
|
+
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.722;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#d3e01c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
|
455
|
+
d="m 46.638672,285.19579 -41.5371095,0.0996 0.00195,0.20117 41.5351565,-0.10156 z"
|
456
|
+
id="path5601"
|
457
|
+
inkscape:connector-curvature="0" />
|
458
|
+
<text
|
459
|
+
xml:space="preserve"
|
460
|
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.15364px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.128841"
|
461
|
+
x="12.465504"
|
462
|
+
y="316.67355"
|
463
|
+
id="text962"
|
464
|
+
transform="scale(1.095049,0.91320115)"><tspan
|
465
|
+
sodipodi:role="line"
|
466
|
+
id="tspan960"
|
467
|
+
x="12.465504"
|
468
|
+
y="316.67355"
|
469
|
+
style="stroke-width:0.128841">/</tspan></text>
|
470
|
+
</g>
|
471
|
+
</svg>
|
tomwer/synctools/datalistener.py
CHANGED
@@ -254,7 +254,11 @@ class MockDataListenerQThread(DataListenerQThread):
|
|
254
254
|
current_acquisition.end(
|
255
255
|
end_time=now.strftime("%H:%M:%S"), succeed=True, error=None
|
256
256
|
)
|
257
|
-
self._rpc_sequence_ended(
|
257
|
+
self._rpc_sequence_ended(
|
258
|
+
saving_file=current_acquisition.sample_file,
|
259
|
+
sequence_scan_number=current_acquisition.entry,
|
260
|
+
success=True,
|
261
|
+
)
|
258
262
|
time.sleep(mock_acqui.waiting_time)
|
259
263
|
|
260
264
|
# wait until stop the thread
|
@@ -48,7 +48,7 @@ class ImageLoaderThread(qt.QThread):
|
|
48
48
|
)
|
49
49
|
)
|
50
50
|
|
51
|
-
def __init__(self, url):
|
51
|
+
def __init__(self, url, *args, **kwargs):
|
52
52
|
"""
|
53
53
|
|
54
54
|
:param index: index of the image on the stackplot
|
@@ -57,7 +57,7 @@ class ImageLoaderThread(qt.QThread):
|
|
57
57
|
vol file then the name is given with the slice z index
|
58
58
|
to be loaded.
|
59
59
|
"""
|
60
|
-
super(
|
60
|
+
super().__init__(*args, **kwargs)
|
61
61
|
self.data = None
|
62
62
|
self.url = url
|
63
63
|
|
@@ -33,7 +33,7 @@ from tomwer.core.settings import get_lbsram_path, isOnLbsram
|
|
33
33
|
from tomwer.core.utils import isLowOnMemory
|
34
34
|
from ..processingstack import FIFO, ProcessingThread
|
35
35
|
from tomwer.core.process.edit import imagekeyeditor
|
36
|
-
from tomoscan.esrf.hdf5scan import ImageKey
|
36
|
+
from tomoscan.esrf.scan.hdf5scan import ImageKey
|
37
37
|
from processview.core.superviseprocess import SuperviseProcess
|
38
38
|
from processview.core.manager import ProcessManager, DatasetState
|
39
39
|
import logging
|
@@ -112,7 +112,7 @@ class FIFO(Queue, SuperviseProcess):
|
|
112
112
|
"""
|
113
113
|
if callback is not None:
|
114
114
|
callback()
|
115
|
-
sender = self.sender()
|
115
|
+
sender = self.sender() # pylint: disable=E1101
|
116
116
|
if hasattr(sender, "future_tomo_obj"):
|
117
117
|
future_tomo_obj = sender.future_tomo_obj
|
118
118
|
else:
|
@@ -142,7 +142,7 @@ class FIFO(Queue, SuperviseProcess):
|
|
142
142
|
self.sigComputationStarted.emit(self._data_currently_computed)
|
143
143
|
|
144
144
|
def _end_threaded_computation(self, callback=None):
|
145
|
-
sender = self.sender()
|
145
|
+
sender = self.sender() # pylint: disable=E1101
|
146
146
|
if hasattr(sender, "future_tomo_obj"):
|
147
147
|
future_tomo_obj = sender.future_tomo_obj
|
148
148
|
else:
|
@@ -189,5 +189,6 @@ class _ProcessingThread(ProcessingThread, SuperviseProcess):
|
|
189
189
|
process=self,
|
190
190
|
state=DatasetState.SUCCEED,
|
191
191
|
)
|
192
|
+
self._scan.cast_volume = self._volume.cast_volume
|
192
193
|
if cast_volume.outputs.future_tomo_obj is not None:
|
193
194
|
self._future_tomo_obj = cast_volume.outputs.future_tomo_obj
|
@@ -38,13 +38,12 @@ from processview.core.superviseprocess import SuperviseProcess
|
|
38
38
|
import copy
|
39
39
|
from tomwer.core.process.reconstruction.lamino.tofu import LaminoReconstruction
|
40
40
|
from tomwer.core.utils.Singleton import singleton
|
41
|
-
from tomwer.web.client import OWClient
|
42
41
|
|
43
42
|
logger = logging.getLogger(__name__)
|
44
43
|
|
45
44
|
|
46
45
|
@singleton
|
47
|
-
class LaminoReconstructionStack(qt.QObject, Queue
|
46
|
+
class LaminoReconstructionStack(qt.QObject, Queue):
|
48
47
|
"""
|
49
48
|
Manage a stack of lamino (tofu) reconstruction
|
50
49
|
"""
|
@@ -61,7 +60,6 @@ class LaminoReconstructionStack(qt.QObject, Queue, OWClient):
|
|
61
60
|
def __init__(self, process_id=None):
|
62
61
|
qt.QObject.__init__(self)
|
63
62
|
Queue.__init__(self)
|
64
|
-
OWClient.__init__(self)
|
65
63
|
self.process_id = process_id
|
66
64
|
self.reconsThread = _LaminoReconsThread(process_id=process_id)
|
67
65
|
self.reconsThread.sigThReconsFinished.connect(self._dealWithFinishedRecons)
|
@@ -175,8 +175,6 @@ class _ProcessingThread(ProcessingThread, SuperviseProcess):
|
|
175
175
|
try:
|
176
176
|
sa_delta_beta.run()
|
177
177
|
except Exception as e:
|
178
|
-
# TODO: for debug slurm update
|
179
|
-
raise e
|
180
178
|
_logger.error(str(e))
|
181
179
|
mess = "SADeltaBeta computation for {} failed.".format(str(self._scan))
|
182
180
|
state = DatasetState.FAILED
|