rapidtide 3.0a9__py3-none-any.whl → 3.0a11__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.
- rapidtide/Colortables.py +45 -10
- rapidtide/OrthoImageItem.py +12 -3
- rapidtide/RapidtideDataset.py +54 -7
- rapidtide/__init__.py +1 -2
- rapidtide/_version.py +63 -93
- rapidtide/data/examples/src/testfmri +10 -4
- rapidtide/data/examples/src/testhappy +1 -6
- rapidtide/tests/test_fastresampler.py +6 -2
- rapidtide/tests/test_fullrunhappy_v1.py +0 -1
- rapidtide/tests/test_fullrunhappy_v4.py +1 -0
- rapidtide/tests/test_runmisc.py +4 -4
- rapidtide/tidepoolTemplate.py +0 -4
- rapidtide/tidepoolTemplate.ui +0 -7
- rapidtide/tidepoolTemplate_alt.py +3 -8
- rapidtide/tidepoolTemplate_alt.ui +6 -16
- rapidtide/tidepoolTemplate_alt_qt6.py +3 -8
- rapidtide/tidepoolTemplate_big.py +10 -15
- rapidtide/tidepoolTemplate_big.ui +14 -24
- rapidtide/tidepoolTemplate_big_qt6.py +10 -15
- rapidtide/tidepoolTemplate_qt6.py +0 -4
- rapidtide/workflows/tidepool.py +343 -199
- {rapidtide-3.0a9.dist-info → rapidtide-3.0a11.dist-info}/METADATA +1 -1
- {rapidtide-3.0a9.dist-info → rapidtide-3.0a11.dist-info}/RECORD +27 -28
- {rapidtide-3.0a9.dist-info → rapidtide-3.0a11.dist-info}/WHEEL +1 -1
- rapidtide/tidepoolTemplate_alt2.ui +0 -1965
- {rapidtide-3.0a9.dist-info → rapidtide-3.0a11.dist-info}/LICENSE +0 -0
- {rapidtide-3.0a9.dist-info → rapidtide-3.0a11.dist-info}/entry_points.txt +0 -0
- {rapidtide-3.0a9.dist-info → rapidtide-3.0a11.dist-info}/top_level.txt +0 -0
rapidtide/_version.py
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
|
|
1
2
|
# This file helps to compute a version number in source trees obtained from
|
|
2
3
|
# git-archive tarball (such as those provided by githubs download-from-tag
|
|
3
4
|
# feature). Distribution tarballs (built by setup.py sdist) and build
|
|
@@ -11,12 +12,12 @@
|
|
|
11
12
|
"""Git implementation of _version.py."""
|
|
12
13
|
|
|
13
14
|
import errno
|
|
14
|
-
import functools
|
|
15
15
|
import os
|
|
16
16
|
import re
|
|
17
17
|
import subprocess
|
|
18
18
|
import sys
|
|
19
19
|
from typing import Any, Callable, Dict, List, Optional, Tuple
|
|
20
|
+
import functools
|
|
20
21
|
|
|
21
22
|
|
|
22
23
|
def get_keywords() -> Dict[str, str]:
|
|
@@ -67,14 +68,12 @@ HANDLERS: Dict[str, Dict[str, Callable]] = {}
|
|
|
67
68
|
|
|
68
69
|
def register_vcs_handler(vcs: str, method: str) -> Callable: # decorator
|
|
69
70
|
"""Create decorator to mark a method as the handler of a VCS."""
|
|
70
|
-
|
|
71
71
|
def decorate(f: Callable) -> Callable:
|
|
72
72
|
"""Store f in HANDLERS[vcs][method]."""
|
|
73
73
|
if vcs not in HANDLERS:
|
|
74
74
|
HANDLERS[vcs] = {}
|
|
75
75
|
HANDLERS[vcs][method] = f
|
|
76
76
|
return f
|
|
77
|
-
|
|
78
77
|
return decorate
|
|
79
78
|
|
|
80
79
|
|
|
@@ -101,14 +100,10 @@ def run_command(
|
|
|
101
100
|
try:
|
|
102
101
|
dispcmd = str([command] + args)
|
|
103
102
|
# remember shell=False, so use git.cmd on windows, not just git
|
|
104
|
-
process = subprocess.Popen(
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
stdout=subprocess.PIPE,
|
|
109
|
-
stderr=(subprocess.PIPE if hide_stderr else None),
|
|
110
|
-
**popen_kwargs,
|
|
111
|
-
)
|
|
103
|
+
process = subprocess.Popen([command] + args, cwd=cwd, env=env,
|
|
104
|
+
stdout=subprocess.PIPE,
|
|
105
|
+
stderr=(subprocess.PIPE if hide_stderr
|
|
106
|
+
else None), **popen_kwargs)
|
|
112
107
|
break
|
|
113
108
|
except OSError as e:
|
|
114
109
|
if e.errno == errno.ENOENT:
|
|
@@ -146,21 +141,15 @@ def versions_from_parentdir(
|
|
|
146
141
|
for _ in range(3):
|
|
147
142
|
dirname = os.path.basename(root)
|
|
148
143
|
if dirname.startswith(parentdir_prefix):
|
|
149
|
-
return {
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
"dirty": False,
|
|
153
|
-
"error": None,
|
|
154
|
-
"date": None,
|
|
155
|
-
}
|
|
144
|
+
return {"version": dirname[len(parentdir_prefix):],
|
|
145
|
+
"full-revisionid": None,
|
|
146
|
+
"dirty": False, "error": None, "date": None}
|
|
156
147
|
rootdirs.append(root)
|
|
157
148
|
root = os.path.dirname(root) # up a level
|
|
158
149
|
|
|
159
150
|
if verbose:
|
|
160
|
-
print(
|
|
161
|
-
|
|
162
|
-
% (str(rootdirs), parentdir_prefix)
|
|
163
|
-
)
|
|
151
|
+
print("Tried directories %s but none started with prefix %s" %
|
|
152
|
+
(str(rootdirs), parentdir_prefix))
|
|
164
153
|
raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
|
|
165
154
|
|
|
166
155
|
|
|
@@ -223,7 +212,7 @@ def git_versions_from_keywords(
|
|
|
223
212
|
# starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of
|
|
224
213
|
# just "foo-1.0". If we see a "tag: " prefix, prefer those.
|
|
225
214
|
TAG = "tag: "
|
|
226
|
-
tags = {r[len(TAG)
|
|
215
|
+
tags = {r[len(TAG):] for r in refs if r.startswith(TAG)}
|
|
227
216
|
if not tags:
|
|
228
217
|
# Either we're using git < 1.8.3, or there really are no tags. We use
|
|
229
218
|
# a heuristic: assume all version tags have a digit. The old git %d
|
|
@@ -232,7 +221,7 @@ def git_versions_from_keywords(
|
|
|
232
221
|
# between branches and tags. By ignoring refnames without digits, we
|
|
233
222
|
# filter out many common branch names like "release" and
|
|
234
223
|
# "stabilization", as well as "HEAD" and "master".
|
|
235
|
-
tags = {r for r in refs if re.search(r
|
|
224
|
+
tags = {r for r in refs if re.search(r'\d', r)}
|
|
236
225
|
if verbose:
|
|
237
226
|
print("discarding '%s', no digits" % ",".join(refs - tags))
|
|
238
227
|
if verbose:
|
|
@@ -240,36 +229,32 @@ def git_versions_from_keywords(
|
|
|
240
229
|
for ref in sorted(tags):
|
|
241
230
|
# sorting will prefer e.g. "2.0" over "2.0rc1"
|
|
242
231
|
if ref.startswith(tag_prefix):
|
|
243
|
-
r = ref[len(tag_prefix)
|
|
232
|
+
r = ref[len(tag_prefix):]
|
|
244
233
|
# Filter out refs that exactly match prefix or that don't start
|
|
245
234
|
# with a number once the prefix is stripped (mostly a concern
|
|
246
235
|
# when prefix is '')
|
|
247
|
-
if not re.match(r
|
|
236
|
+
if not re.match(r'\d', r):
|
|
248
237
|
continue
|
|
249
238
|
if verbose:
|
|
250
239
|
print("picking %s" % r)
|
|
251
|
-
return {
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
"error": None,
|
|
256
|
-
"date": date,
|
|
257
|
-
}
|
|
240
|
+
return {"version": r,
|
|
241
|
+
"full-revisionid": keywords["full"].strip(),
|
|
242
|
+
"dirty": False, "error": None,
|
|
243
|
+
"date": date}
|
|
258
244
|
# no suitable tags, so version is "0+unknown", but full hex is still there
|
|
259
245
|
if verbose:
|
|
260
246
|
print("no suitable tags, using unknown + full revision id")
|
|
261
|
-
return {
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
"dirty": False,
|
|
265
|
-
"error": "no suitable tags",
|
|
266
|
-
"date": None,
|
|
267
|
-
}
|
|
247
|
+
return {"version": "0+unknown",
|
|
248
|
+
"full-revisionid": keywords["full"].strip(),
|
|
249
|
+
"dirty": False, "error": "no suitable tags", "date": None}
|
|
268
250
|
|
|
269
251
|
|
|
270
252
|
@register_vcs_handler("git", "pieces_from_vcs")
|
|
271
253
|
def git_pieces_from_vcs(
|
|
272
|
-
tag_prefix: str,
|
|
254
|
+
tag_prefix: str,
|
|
255
|
+
root: str,
|
|
256
|
+
verbose: bool,
|
|
257
|
+
runner: Callable = run_command
|
|
273
258
|
) -> Dict[str, Any]:
|
|
274
259
|
"""Get version from 'git describe' in the root of the source tree.
|
|
275
260
|
|
|
@@ -288,7 +273,8 @@ def git_pieces_from_vcs(
|
|
|
288
273
|
env.pop("GIT_DIR", None)
|
|
289
274
|
runner = functools.partial(runner, env=env)
|
|
290
275
|
|
|
291
|
-
_, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root,
|
|
276
|
+
_, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root,
|
|
277
|
+
hide_stderr=not verbose)
|
|
292
278
|
if rc != 0:
|
|
293
279
|
if verbose:
|
|
294
280
|
print("Directory %s not under git control" % root)
|
|
@@ -296,19 +282,10 @@ def git_pieces_from_vcs(
|
|
|
296
282
|
|
|
297
283
|
# if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty]
|
|
298
284
|
# if there isn't one, this yields HEX[-dirty] (no NUM)
|
|
299
|
-
describe_out, rc = runner(
|
|
300
|
-
|
|
301
|
-
[
|
|
302
|
-
|
|
303
|
-
"--tags",
|
|
304
|
-
"--dirty",
|
|
305
|
-
"--always",
|
|
306
|
-
"--long",
|
|
307
|
-
"--match",
|
|
308
|
-
f"{tag_prefix}[[:digit:]]*",
|
|
309
|
-
],
|
|
310
|
-
cwd=root,
|
|
311
|
-
)
|
|
285
|
+
describe_out, rc = runner(GITS, [
|
|
286
|
+
"describe", "--tags", "--dirty", "--always", "--long",
|
|
287
|
+
"--match", f"{tag_prefix}[[:digit:]]*"
|
|
288
|
+
], cwd=root)
|
|
312
289
|
# --long was added in git-1.5.5
|
|
313
290
|
if describe_out is None:
|
|
314
291
|
raise NotThisMethod("'git describe' failed")
|
|
@@ -323,7 +300,8 @@ def git_pieces_from_vcs(
|
|
|
323
300
|
pieces["short"] = full_out[:7] # maybe improved later
|
|
324
301
|
pieces["error"] = None
|
|
325
302
|
|
|
326
|
-
branch_name, rc = runner(GITS, ["rev-parse", "--abbrev-ref", "HEAD"],
|
|
303
|
+
branch_name, rc = runner(GITS, ["rev-parse", "--abbrev-ref", "HEAD"],
|
|
304
|
+
cwd=root)
|
|
327
305
|
# --abbrev-ref was added in git-1.6.3
|
|
328
306
|
if rc != 0 or branch_name is None:
|
|
329
307
|
raise NotThisMethod("'git rev-parse --abbrev-ref' returned error")
|
|
@@ -363,16 +341,17 @@ def git_pieces_from_vcs(
|
|
|
363
341
|
dirty = git_describe.endswith("-dirty")
|
|
364
342
|
pieces["dirty"] = dirty
|
|
365
343
|
if dirty:
|
|
366
|
-
git_describe = git_describe[:
|
|
344
|
+
git_describe = git_describe[:git_describe.rindex("-dirty")]
|
|
367
345
|
|
|
368
346
|
# now we have TAG-NUM-gHEX or HEX
|
|
369
347
|
|
|
370
348
|
if "-" in git_describe:
|
|
371
349
|
# TAG-NUM-gHEX
|
|
372
|
-
mo = re.search(r
|
|
350
|
+
mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe)
|
|
373
351
|
if not mo:
|
|
374
352
|
# unparsable. Maybe git-describe is misbehaving?
|
|
375
|
-
pieces["error"] = "unable to parse git-describe output: '%s'"
|
|
353
|
+
pieces["error"] = ("unable to parse git-describe output: '%s'"
|
|
354
|
+
% describe_out)
|
|
376
355
|
return pieces
|
|
377
356
|
|
|
378
357
|
# tag
|
|
@@ -381,9 +360,10 @@ def git_pieces_from_vcs(
|
|
|
381
360
|
if verbose:
|
|
382
361
|
fmt = "tag '%s' doesn't start with prefix '%s'"
|
|
383
362
|
print(fmt % (full_tag, tag_prefix))
|
|
384
|
-
pieces["error"] = "tag '%s' doesn't start with prefix '%s'"
|
|
363
|
+
pieces["error"] = ("tag '%s' doesn't start with prefix '%s'"
|
|
364
|
+
% (full_tag, tag_prefix))
|
|
385
365
|
return pieces
|
|
386
|
-
pieces["closest-tag"] = full_tag[len(tag_prefix)
|
|
366
|
+
pieces["closest-tag"] = full_tag[len(tag_prefix):]
|
|
387
367
|
|
|
388
368
|
# distance: number of commits since tag
|
|
389
369
|
pieces["distance"] = int(mo.group(2))
|
|
@@ -432,7 +412,8 @@ def render_pep440(pieces: Dict[str, Any]) -> str:
|
|
|
432
412
|
rendered += ".dirty"
|
|
433
413
|
else:
|
|
434
414
|
# exception #1
|
|
435
|
-
rendered = "0+untagged.%d.g%s" % (pieces["distance"],
|
|
415
|
+
rendered = "0+untagged.%d.g%s" % (pieces["distance"],
|
|
416
|
+
pieces["short"])
|
|
436
417
|
if pieces["dirty"]:
|
|
437
418
|
rendered += ".dirty"
|
|
438
419
|
return rendered
|
|
@@ -461,7 +442,8 @@ def render_pep440_branch(pieces: Dict[str, Any]) -> str:
|
|
|
461
442
|
rendered = "0"
|
|
462
443
|
if pieces["branch"] != "master":
|
|
463
444
|
rendered += ".dev0"
|
|
464
|
-
rendered += "+untagged.%d.g%s" % (pieces["distance"],
|
|
445
|
+
rendered += "+untagged.%d.g%s" % (pieces["distance"],
|
|
446
|
+
pieces["short"])
|
|
465
447
|
if pieces["dirty"]:
|
|
466
448
|
rendered += ".dirty"
|
|
467
449
|
return rendered
|
|
@@ -622,13 +604,11 @@ def render_git_describe_long(pieces: Dict[str, Any]) -> str:
|
|
|
622
604
|
def render(pieces: Dict[str, Any], style: str) -> Dict[str, Any]:
|
|
623
605
|
"""Render the given version pieces into the requested style."""
|
|
624
606
|
if pieces["error"]:
|
|
625
|
-
return {
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
"date": None,
|
|
631
|
-
}
|
|
607
|
+
return {"version": "unknown",
|
|
608
|
+
"full-revisionid": pieces.get("long"),
|
|
609
|
+
"dirty": None,
|
|
610
|
+
"error": pieces["error"],
|
|
611
|
+
"date": None}
|
|
632
612
|
|
|
633
613
|
if not style or style == "default":
|
|
634
614
|
style = "pep440" # the default
|
|
@@ -652,13 +632,9 @@ def render(pieces: Dict[str, Any], style: str) -> Dict[str, Any]:
|
|
|
652
632
|
else:
|
|
653
633
|
raise ValueError("unknown style '%s'" % style)
|
|
654
634
|
|
|
655
|
-
return {
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
"dirty": pieces["dirty"],
|
|
659
|
-
"error": None,
|
|
660
|
-
"date": pieces.get("date"),
|
|
661
|
-
}
|
|
635
|
+
return {"version": rendered, "full-revisionid": pieces["long"],
|
|
636
|
+
"dirty": pieces["dirty"], "error": None,
|
|
637
|
+
"date": pieces.get("date")}
|
|
662
638
|
|
|
663
639
|
|
|
664
640
|
def get_versions() -> Dict[str, Any]:
|
|
@@ -672,7 +648,8 @@ def get_versions() -> Dict[str, Any]:
|
|
|
672
648
|
verbose = cfg.verbose
|
|
673
649
|
|
|
674
650
|
try:
|
|
675
|
-
return git_versions_from_keywords(get_keywords(), cfg.tag_prefix,
|
|
651
|
+
return git_versions_from_keywords(get_keywords(), cfg.tag_prefix,
|
|
652
|
+
verbose)
|
|
676
653
|
except NotThisMethod:
|
|
677
654
|
pass
|
|
678
655
|
|
|
@@ -681,16 +658,13 @@ def get_versions() -> Dict[str, Any]:
|
|
|
681
658
|
# versionfile_source is the relative path from the top of the source
|
|
682
659
|
# tree (where the .git directory might live) to this file. Invert
|
|
683
660
|
# this to find the root from __file__.
|
|
684
|
-
for _ in cfg.versionfile_source.split(
|
|
661
|
+
for _ in cfg.versionfile_source.split('/'):
|
|
685
662
|
root = os.path.dirname(root)
|
|
686
663
|
except NameError:
|
|
687
|
-
return {
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
"error": "unable to find root of source tree",
|
|
692
|
-
"date": None,
|
|
693
|
-
}
|
|
664
|
+
return {"version": "0+unknown", "full-revisionid": None,
|
|
665
|
+
"dirty": None,
|
|
666
|
+
"error": "unable to find root of source tree",
|
|
667
|
+
"date": None}
|
|
694
668
|
|
|
695
669
|
try:
|
|
696
670
|
pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose)
|
|
@@ -704,10 +678,6 @@ def get_versions() -> Dict[str, Any]:
|
|
|
704
678
|
except NotThisMethod:
|
|
705
679
|
pass
|
|
706
680
|
|
|
707
|
-
return {
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
"dirty": None,
|
|
711
|
-
"error": "unable to compute version",
|
|
712
|
-
"date": None,
|
|
713
|
-
}
|
|
681
|
+
return {"version": "0+unknown", "full-revisionid": None,
|
|
682
|
+
"dirty": None,
|
|
683
|
+
"error": "unable to compute version", "date": None}
|
|
@@ -9,23 +9,29 @@
|
|
|
9
9
|
# sub-RAPIDTIDETEST.nii.gz \
|
|
10
10
|
# ../dst/sub-RAPIDTIDETEST_norefine
|
|
11
11
|
|
|
12
|
+
rapidtide \
|
|
13
|
+
--spatialfilt -1 \
|
|
14
|
+
--nprocs -1 \
|
|
15
|
+
--searchrange -5 20 \
|
|
16
|
+
--simcalcrange 50 -1 \
|
|
17
|
+
sub-RAPIDTIDETEST.nii.gz \
|
|
18
|
+
../dst/sub-RAPIDTIDETEST_defaultfilt
|
|
19
|
+
|
|
12
20
|
rapidtide \
|
|
13
21
|
--spatialfilt 5 \
|
|
14
22
|
--nprocs -1 \
|
|
15
23
|
--searchrange -5 20 \
|
|
16
24
|
--simcalcrange 50 -1 \
|
|
17
|
-
--refinedelay \
|
|
18
25
|
sub-RAPIDTIDETEST.nii.gz \
|
|
19
|
-
../dst/sub-
|
|
26
|
+
../dst/sub-RAPIDTIDETEST_5mmfilt
|
|
20
27
|
|
|
21
28
|
rapidtide \
|
|
22
29
|
--spatialfilt 0 \
|
|
23
30
|
--nprocs -1 \
|
|
24
31
|
--searchrange -5 20 \
|
|
25
32
|
--simcalcrange 50 -1 \
|
|
26
|
-
--refinedelay \
|
|
27
33
|
sub-RAPIDTIDETEST.nii.gz \
|
|
28
|
-
../dst/sub-
|
|
34
|
+
../dst/sub-RAPIDTIDETEST_nospatialfilt
|
|
29
35
|
|
|
30
36
|
#rapidtide \
|
|
31
37
|
# --spatialfilt 5 \
|
|
@@ -16,12 +16,15 @@
|
|
|
16
16
|
# limitations under the License.
|
|
17
17
|
#
|
|
18
18
|
#
|
|
19
|
+
import os
|
|
20
|
+
|
|
19
21
|
import matplotlib as mpl
|
|
20
22
|
import matplotlib.pyplot as plt
|
|
21
23
|
import numpy as np
|
|
22
24
|
|
|
23
25
|
from rapidtide.resample import FastResampler, FastResamplerFromFile
|
|
24
26
|
from rapidtide.tests.utils import mse
|
|
27
|
+
from rapidtide.tests.utils import get_test_temp_path
|
|
25
28
|
|
|
26
29
|
|
|
27
30
|
def test_FastResampler(debug=False):
|
|
@@ -45,8 +48,9 @@ def test_FastResampler(debug=False):
|
|
|
45
48
|
print(f"{genlaggedtc.hiresstart=}, {genlaggedtc.hiresend=}, {genlaggedtc.hiresstep=}")
|
|
46
49
|
|
|
47
50
|
# save and reload with another name
|
|
48
|
-
|
|
49
|
-
|
|
51
|
+
resamplername = os.path.join(get_test_temp_path(), "savedresampler")
|
|
52
|
+
genlaggedtc.save(resamplername)
|
|
53
|
+
genlaggedtc2 = FastResamplerFromFile(resamplername, padtime=padtime, debug=debug)
|
|
50
54
|
if debug:
|
|
51
55
|
print(f"{genlaggedtc2.initstart=}, {genlaggedtc2.initend=}, {genlaggedtc2.initstep=}")
|
|
52
56
|
print(f"{genlaggedtc2.hiresstart=}, {genlaggedtc2.hiresend=}, {genlaggedtc2.hiresstep=}")
|
|
@@ -41,6 +41,7 @@ def test_fullrunhappy_v4(debug=False, displayplots=False):
|
|
|
41
41
|
"model_revised",
|
|
42
42
|
"--motionfile",
|
|
43
43
|
os.path.join(get_examples_path(), "sub-HAPPYTEST_mcf.par"),
|
|
44
|
+
"--aliasedcorrelation",
|
|
44
45
|
]
|
|
45
46
|
happy_workflow.happy_main(happy_parser.process_args(inputargs=inputargs))
|
|
46
47
|
|
rapidtide/tests/test_runmisc.py
CHANGED
|
@@ -22,7 +22,7 @@ import matplotlib as mpl
|
|
|
22
22
|
|
|
23
23
|
import rapidtide.workflows.parser_funcs as pf
|
|
24
24
|
import rapidtide.workflows.showtc as showtc
|
|
25
|
-
from rapidtide.tests.utils import get_examples_path
|
|
25
|
+
from rapidtide.tests.utils import get_examples_path, get_test_temp_path
|
|
26
26
|
|
|
27
27
|
|
|
28
28
|
def test_runmisc(debug=False, displayplots=False):
|
|
@@ -35,7 +35,7 @@ def test_runmisc(debug=False, displayplots=False):
|
|
|
35
35
|
"--sampletime",
|
|
36
36
|
"12.5",
|
|
37
37
|
"--tofile",
|
|
38
|
-
"showtcout1.jpg",
|
|
38
|
+
os.path.join(get_test_temp_path(), "showtcout1.jpg"),
|
|
39
39
|
"--starttime",
|
|
40
40
|
"100",
|
|
41
41
|
"--endtime",
|
|
@@ -55,7 +55,7 @@ def test_runmisc(debug=False, displayplots=False):
|
|
|
55
55
|
"--displaytype",
|
|
56
56
|
"power",
|
|
57
57
|
"--tofile",
|
|
58
|
-
"showtcout2.jpg",
|
|
58
|
+
os.path.join(get_test_temp_path(), "showtcout2.jpg"),
|
|
59
59
|
"--noxax",
|
|
60
60
|
"--noyax",
|
|
61
61
|
"--nolegend",
|
|
@@ -90,7 +90,7 @@ def test_runmisc(debug=False, displayplots=False):
|
|
|
90
90
|
"--displaytype",
|
|
91
91
|
"phase",
|
|
92
92
|
"--tofile",
|
|
93
|
-
"showtcout3.jpg",
|
|
93
|
+
os.path.join(get_test_temp_path(), "showtcout3.jpg"),
|
|
94
94
|
]
|
|
95
95
|
pf.generic_init(showtc._get_parser, showtc.showtc, inputargs=inputargs)
|
|
96
96
|
|
rapidtide/tidepoolTemplate.py
CHANGED
|
@@ -136,9 +136,6 @@ class Ui_MainWindow(object):
|
|
|
136
136
|
self.setMask_Button = QtWidgets.QPushButton(self.layoutWidget)
|
|
137
137
|
self.setMask_Button.setObjectName("setMask_Button")
|
|
138
138
|
self.verticalLayout_3.addWidget(self.setMask_Button)
|
|
139
|
-
self.nextFile_Button = QtWidgets.QPushButton(self.layoutWidget)
|
|
140
|
-
self.nextFile_Button.setObjectName("nextFile_Button")
|
|
141
|
-
self.verticalLayout_3.addWidget(self.nextFile_Button)
|
|
142
139
|
spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
|
|
143
140
|
self.verticalLayout_3.addItem(spacerItem1)
|
|
144
141
|
self.transparency_checkBox = QtWidgets.QCheckBox(self.layoutWidget)
|
|
@@ -635,7 +632,6 @@ class Ui_MainWindow(object):
|
|
|
635
632
|
self.resetDispSmart_Button.setText(_translate("MainWindow", "Smart"))
|
|
636
633
|
self.saveDisp_Button.setText(_translate("MainWindow", "Save"))
|
|
637
634
|
self.setMask_Button.setText(_translate("MainWindow", "No mask"))
|
|
638
|
-
self.nextFile_Button.setText(_translate("MainWindow", "Next file"))
|
|
639
635
|
self.transparency_checkBox.setToolTip(_translate("MainWindow", "With transparency on, map values outside the range limits are not displayed."))
|
|
640
636
|
self.transparency_checkBox.setText(_translate("MainWindow", "Transparency"))
|
|
641
637
|
self.label_2.setText(_translate("MainWindow", "Colormap"))
|
rapidtide/tidepoolTemplate.ui
CHANGED
|
@@ -341,13 +341,6 @@
|
|
|
341
341
|
</property>
|
|
342
342
|
</widget>
|
|
343
343
|
</item>
|
|
344
|
-
<item>
|
|
345
|
-
<widget class="QPushButton" name="nextFile_Button">
|
|
346
|
-
<property name="text">
|
|
347
|
-
<string>Next file</string>
|
|
348
|
-
</property>
|
|
349
|
-
</widget>
|
|
350
|
-
</item>
|
|
351
344
|
<item>
|
|
352
345
|
<spacer name="verticalSpacer_2">
|
|
353
346
|
<property name="orientation">
|
|
@@ -14,14 +14,14 @@ from PyQt5 import QtCore, QtGui, QtWidgets
|
|
|
14
14
|
class Ui_MainWindow(object):
|
|
15
15
|
def setupUi(self, MainWindow):
|
|
16
16
|
MainWindow.setObjectName("MainWindow")
|
|
17
|
-
MainWindow.resize(
|
|
17
|
+
MainWindow.resize(1380, 810)
|
|
18
18
|
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
|
|
19
19
|
sizePolicy.setHorizontalStretch(1)
|
|
20
20
|
sizePolicy.setVerticalStretch(1)
|
|
21
21
|
sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth())
|
|
22
22
|
MainWindow.setSizePolicy(sizePolicy)
|
|
23
|
-
MainWindow.setMinimumSize(QtCore.QSize(
|
|
24
|
-
MainWindow.setMaximumSize(QtCore.QSize(
|
|
23
|
+
MainWindow.setMinimumSize(QtCore.QSize(1380, 810))
|
|
24
|
+
MainWindow.setMaximumSize(QtCore.QSize(1380, 810))
|
|
25
25
|
MainWindow.setSizeIncrement(QtCore.QSize(1, 1))
|
|
26
26
|
self.centralwidget = QtWidgets.QWidget(MainWindow)
|
|
27
27
|
self.centralwidget.setObjectName("centralwidget")
|
|
@@ -66,9 +66,6 @@ class Ui_MainWindow(object):
|
|
|
66
66
|
self.setMask_Button = QtWidgets.QPushButton(self.imageData_groupBox)
|
|
67
67
|
self.setMask_Button.setObjectName("setMask_Button")
|
|
68
68
|
self.verticalLayout_3.addWidget(self.setMask_Button)
|
|
69
|
-
self.nextFile_Button = QtWidgets.QPushButton(self.imageData_groupBox)
|
|
70
|
-
self.nextFile_Button.setObjectName("nextFile_Button")
|
|
71
|
-
self.verticalLayout_3.addWidget(self.nextFile_Button)
|
|
72
69
|
self.dispmin_doubleSpinBox = QtWidgets.QDoubleSpinBox(self.imageData_groupBox)
|
|
73
70
|
self.dispmin_doubleSpinBox.setAlignment(QtCore.Qt.Qt::AlignmentFlag::AlignRight|QtCore.Qt.Qt::AlignmentFlag::AlignTrailing|QtCore.Qt.Qt::AlignmentFlag::AlignVCenter)
|
|
74
71
|
self.dispmin_doubleSpinBox.setDecimals(3)
|
|
@@ -745,8 +742,6 @@ class Ui_MainWindow(object):
|
|
|
745
742
|
self.saveDisp_Button.setText(_translate("MainWindow", "Save"))
|
|
746
743
|
self.setMask_Button.setToolTip(_translate("MainWindow", "Right click to select the mask used to display the current map"))
|
|
747
744
|
self.setMask_Button.setText(_translate("MainWindow", "No mask"))
|
|
748
|
-
self.nextFile_Button.setToolTip(_translate("MainWindow", "Right click to select the mask used to display the current map"))
|
|
749
|
-
self.nextFile_Button.setText(_translate("MainWindow", "Next file"))
|
|
750
745
|
self.transparency_checkBox.setToolTip(_translate("MainWindow", "With transparency on, map values outside the range limits are not displayed."))
|
|
751
746
|
self.transparency_checkBox.setText(_translate("MainWindow", "Transparency"))
|
|
752
747
|
self.label_2.setText(_translate("MainWindow", "Colormap"))
|
|
@@ -6,8 +6,8 @@
|
|
|
6
6
|
<rect>
|
|
7
7
|
<x>0</x>
|
|
8
8
|
<y>0</y>
|
|
9
|
-
<width>
|
|
10
|
-
<height>
|
|
9
|
+
<width>1375</width>
|
|
10
|
+
<height>805</height>
|
|
11
11
|
</rect>
|
|
12
12
|
</property>
|
|
13
13
|
<property name="sizePolicy">
|
|
@@ -18,14 +18,14 @@
|
|
|
18
18
|
</property>
|
|
19
19
|
<property name="minimumSize">
|
|
20
20
|
<size>
|
|
21
|
-
<width>
|
|
22
|
-
<height>
|
|
21
|
+
<width>1375</width>
|
|
22
|
+
<height>805</height>
|
|
23
23
|
</size>
|
|
24
24
|
</property>
|
|
25
25
|
<property name="maximumSize">
|
|
26
26
|
<size>
|
|
27
|
-
<width>
|
|
28
|
-
<height>
|
|
27
|
+
<width>1375</width>
|
|
28
|
+
<height>805</height>
|
|
29
29
|
</size>
|
|
30
30
|
</property>
|
|
31
31
|
<property name="sizeIncrement">
|
|
@@ -149,16 +149,6 @@
|
|
|
149
149
|
</property>
|
|
150
150
|
</widget>
|
|
151
151
|
</item>
|
|
152
|
-
<item>
|
|
153
|
-
<widget class="QPushButton" name="nextFile_Button">
|
|
154
|
-
<property name="toolTip">
|
|
155
|
-
<string>Right click to select the mask used to display the current map</string>
|
|
156
|
-
</property>
|
|
157
|
-
<property name="text">
|
|
158
|
-
<string>Next file</string>
|
|
159
|
-
</property>
|
|
160
|
-
</widget>
|
|
161
|
-
</item>
|
|
162
152
|
<item>
|
|
163
153
|
<widget class="QDoubleSpinBox" name="dispmin_doubleSpinBox">
|
|
164
154
|
<property name="alignment">
|
|
@@ -12,14 +12,14 @@ from PyQt6 import QtCore, QtGui, QtWidgets
|
|
|
12
12
|
class Ui_MainWindow(object):
|
|
13
13
|
def setupUi(self, MainWindow):
|
|
14
14
|
MainWindow.setObjectName("MainWindow")
|
|
15
|
-
MainWindow.resize(
|
|
15
|
+
MainWindow.resize(1380, 810)
|
|
16
16
|
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
|
|
17
17
|
sizePolicy.setHorizontalStretch(1)
|
|
18
18
|
sizePolicy.setVerticalStretch(1)
|
|
19
19
|
sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth())
|
|
20
20
|
MainWindow.setSizePolicy(sizePolicy)
|
|
21
|
-
MainWindow.setMinimumSize(QtCore.QSize(
|
|
22
|
-
MainWindow.setMaximumSize(QtCore.QSize(
|
|
21
|
+
MainWindow.setMinimumSize(QtCore.QSize(1380, 810))
|
|
22
|
+
MainWindow.setMaximumSize(QtCore.QSize(1380, 810))
|
|
23
23
|
MainWindow.setSizeIncrement(QtCore.QSize(1, 1))
|
|
24
24
|
self.centralwidget = QtWidgets.QWidget(parent=MainWindow)
|
|
25
25
|
self.centralwidget.setObjectName("centralwidget")
|
|
@@ -64,9 +64,6 @@ class Ui_MainWindow(object):
|
|
|
64
64
|
self.setMask_Button = QtWidgets.QPushButton(parent=self.imageData_groupBox)
|
|
65
65
|
self.setMask_Button.setObjectName("setMask_Button")
|
|
66
66
|
self.verticalLayout_3.addWidget(self.setMask_Button)
|
|
67
|
-
self.nextFile_Button = QtWidgets.QPushButton(parent=self.imageData_groupBox)
|
|
68
|
-
self.nextFile_Button.setObjectName("nextFile_Button")
|
|
69
|
-
self.verticalLayout_3.addWidget(self.nextFile_Button)
|
|
70
67
|
self.dispmin_doubleSpinBox = QtWidgets.QDoubleSpinBox(parent=self.imageData_groupBox)
|
|
71
68
|
self.dispmin_doubleSpinBox.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter)
|
|
72
69
|
self.dispmin_doubleSpinBox.setDecimals(3)
|
|
@@ -743,8 +740,6 @@ class Ui_MainWindow(object):
|
|
|
743
740
|
self.saveDisp_Button.setText(_translate("MainWindow", "Save"))
|
|
744
741
|
self.setMask_Button.setToolTip(_translate("MainWindow", "Right click to select the mask used to display the current map"))
|
|
745
742
|
self.setMask_Button.setText(_translate("MainWindow", "No mask"))
|
|
746
|
-
self.nextFile_Button.setToolTip(_translate("MainWindow", "Right click to select the mask used to display the current map"))
|
|
747
|
-
self.nextFile_Button.setText(_translate("MainWindow", "Next file"))
|
|
748
743
|
self.transparency_checkBox.setToolTip(_translate("MainWindow", "With transparency on, map values outside the range limits are not displayed."))
|
|
749
744
|
self.transparency_checkBox.setText(_translate("MainWindow", "Transparency"))
|
|
750
745
|
self.label_2.setText(_translate("MainWindow", "Colormap"))
|