rapidtide 3.0.9__py3-none-any.whl → 3.0.10__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/OrthoImageItem.py +15 -6
- rapidtide/RapidtideDataset.py +21 -6
- rapidtide/_version.py +3 -3
- rapidtide/data/examples/src/testfmri +24 -24
- rapidtide/data/examples/src/testhappy +0 -1
- rapidtide/filter.py +60 -111
- rapidtide/fit.py +501 -108
- rapidtide/io.py +19 -8
- rapidtide/simFuncClasses.py +13 -7
- rapidtide/tests/.coveragerc +17 -11
- rapidtide/tests/test_findmaxlag.py +31 -16
- rapidtide/tests/test_padvec.py +19 -1
- rapidtide/tests/test_simroundtrip.py +124 -0
- rapidtide/tidepoolTemplate.py +37 -37
- rapidtide/tidepoolTemplate_alt.py +40 -40
- rapidtide/tidepoolTemplate_big.py +56 -56
- rapidtide/workflows/happy.py +1 -1
- rapidtide/workflows/parser_funcs.py +1 -1
- rapidtide/workflows/rapidtide.py +27 -10
- rapidtide/workflows/tidepool.py +51 -15
- {rapidtide-3.0.9.dist-info → rapidtide-3.0.10.dist-info}/METADATA +3 -3
- {rapidtide-3.0.9.dist-info → rapidtide-3.0.10.dist-info}/RECORD +26 -25
- {rapidtide-3.0.9.dist-info → rapidtide-3.0.10.dist-info}/WHEEL +0 -0
- {rapidtide-3.0.9.dist-info → rapidtide-3.0.10.dist-info}/entry_points.txt +0 -0
- {rapidtide-3.0.9.dist-info → rapidtide-3.0.10.dist-info}/licenses/LICENSE +0 -0
- {rapidtide-3.0.9.dist-info → rapidtide-3.0.10.dist-info}/top_level.txt +0 -0
|
@@ -42,15 +42,15 @@ class Ui_MainWindow(object):
|
|
|
42
42
|
self.gridLayout = QtWidgets.QGridLayout(self.imageData_groupBox)
|
|
43
43
|
self.gridLayout.setObjectName("gridLayout")
|
|
44
44
|
self.gridLayout_2 = QtWidgets.QGridLayout()
|
|
45
|
-
self.gridLayout_2.setSizeConstraint(QtCore.Qt.QLayout
|
|
45
|
+
self.gridLayout_2.setSizeConstraint(QtCore.Qt.QLayout.SizeConstraint.SetMaximumSize)
|
|
46
46
|
self.gridLayout_2.setObjectName("gridLayout_2")
|
|
47
47
|
self.verticalLayout_3 = QtWidgets.QVBoxLayout()
|
|
48
|
-
self.verticalLayout_3.setSizeConstraint(QtCore.Qt.QLayout
|
|
48
|
+
self.verticalLayout_3.setSizeConstraint(QtCore.Qt.QLayout.SizeConstraint.SetFixedSize)
|
|
49
49
|
self.verticalLayout_3.setContentsMargins(-1, 5, -1, 5)
|
|
50
50
|
self.verticalLayout_3.setSpacing(0)
|
|
51
51
|
self.verticalLayout_3.setObjectName("verticalLayout_3")
|
|
52
52
|
self.dispmax_doubleSpinBox = QtWidgets.QDoubleSpinBox(self.imageData_groupBox)
|
|
53
|
-
self.dispmax_doubleSpinBox.setAlignment(QtCore.Qt.Qt
|
|
53
|
+
self.dispmax_doubleSpinBox.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignRight|QtCore.Qt.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.Qt.AlignmentFlag.AlignVCenter)
|
|
54
54
|
self.dispmax_doubleSpinBox.setDecimals(3)
|
|
55
55
|
self.dispmax_doubleSpinBox.setObjectName("dispmax_doubleSpinBox")
|
|
56
56
|
self.verticalLayout_3.addWidget(self.dispmax_doubleSpinBox)
|
|
@@ -67,7 +67,7 @@ class Ui_MainWindow(object):
|
|
|
67
67
|
self.setMask_Button.setObjectName("setMask_Button")
|
|
68
68
|
self.verticalLayout_3.addWidget(self.setMask_Button)
|
|
69
69
|
self.dispmin_doubleSpinBox = QtWidgets.QDoubleSpinBox(self.imageData_groupBox)
|
|
70
|
-
self.dispmin_doubleSpinBox.setAlignment(QtCore.Qt.Qt
|
|
70
|
+
self.dispmin_doubleSpinBox.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignRight|QtCore.Qt.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.Qt.AlignmentFlag.AlignVCenter)
|
|
71
71
|
self.dispmin_doubleSpinBox.setDecimals(3)
|
|
72
72
|
self.dispmin_doubleSpinBox.setObjectName("dispmin_doubleSpinBox")
|
|
73
73
|
self.verticalLayout_3.addWidget(self.dispmin_doubleSpinBox)
|
|
@@ -85,11 +85,11 @@ class Ui_MainWindow(object):
|
|
|
85
85
|
self.graphicsView_colorbar.setMinimumSize(QtCore.QSize(25, 128))
|
|
86
86
|
self.graphicsView_colorbar.setMaximumSize(QtCore.QSize(25, 256))
|
|
87
87
|
self.graphicsView_colorbar.setSizeIncrement(QtCore.QSize(0, 1))
|
|
88
|
-
self.graphicsView_colorbar.setResizeAnchor(QtCore.Qt.QGraphicsView
|
|
88
|
+
self.graphicsView_colorbar.setResizeAnchor(QtCore.Qt.QGraphicsView.ViewportAnchor.AnchorViewCenter)
|
|
89
89
|
self.graphicsView_colorbar.setObjectName("graphicsView_colorbar")
|
|
90
90
|
self.gridLayout_2.addWidget(self.graphicsView_colorbar, 0, 0, 1, 1)
|
|
91
91
|
self.aspects_verticalLayout = QtWidgets.QVBoxLayout()
|
|
92
|
-
self.aspects_verticalLayout.setSizeConstraint(QtCore.Qt.QLayout
|
|
92
|
+
self.aspects_verticalLayout.setSizeConstraint(QtCore.Qt.QLayout.SizeConstraint.SetMinimumSize)
|
|
93
93
|
self.aspects_verticalLayout.setSpacing(0)
|
|
94
94
|
self.aspects_verticalLayout.setObjectName("aspects_verticalLayout")
|
|
95
95
|
self.verticalLayout_4 = QtWidgets.QVBoxLayout()
|
|
@@ -222,8 +222,8 @@ class Ui_MainWindow(object):
|
|
|
222
222
|
self.main_graphicsView_cor.setMinimumSize(QtCore.QSize(256, 128))
|
|
223
223
|
self.main_graphicsView_cor.setMaximumSize(QtCore.QSize(256, 256))
|
|
224
224
|
self.main_graphicsView_cor.setSizeIncrement(QtCore.QSize(1, 1))
|
|
225
|
-
self.main_graphicsView_cor.setFrameShape(QtCore.Qt.QFrame
|
|
226
|
-
self.main_graphicsView_cor.setAlignment(QtCore.Qt.Qt
|
|
225
|
+
self.main_graphicsView_cor.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
226
|
+
self.main_graphicsView_cor.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
227
227
|
self.main_graphicsView_cor.setObjectName("main_graphicsView_cor")
|
|
228
228
|
self.gridLayout.addWidget(self.main_graphicsView_cor, 1, 2, 1, 1)
|
|
229
229
|
self.main_graphicsView_sag = GraphicsLayoutWidget(self.imageData_groupBox)
|
|
@@ -235,8 +235,8 @@ class Ui_MainWindow(object):
|
|
|
235
235
|
self.main_graphicsView_sag.setMinimumSize(QtCore.QSize(256, 256))
|
|
236
236
|
self.main_graphicsView_sag.setMaximumSize(QtCore.QSize(256, 256))
|
|
237
237
|
self.main_graphicsView_sag.setSizeIncrement(QtCore.QSize(1, 1))
|
|
238
|
-
self.main_graphicsView_sag.setFrameShape(QtCore.Qt.QFrame
|
|
239
|
-
self.main_graphicsView_sag.setAlignment(QtCore.Qt.Qt
|
|
238
|
+
self.main_graphicsView_sag.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
239
|
+
self.main_graphicsView_sag.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
240
240
|
self.main_graphicsView_sag.setObjectName("main_graphicsView_sag")
|
|
241
241
|
self.gridLayout.addWidget(self.main_graphicsView_sag, 2, 1, 1, 1)
|
|
242
242
|
self.main_graphicsView_ax = GraphicsLayoutWidget(self.imageData_groupBox)
|
|
@@ -248,9 +248,9 @@ class Ui_MainWindow(object):
|
|
|
248
248
|
self.main_graphicsView_ax.setMinimumSize(QtCore.QSize(256, 256))
|
|
249
249
|
self.main_graphicsView_ax.setMaximumSize(QtCore.QSize(256, 256))
|
|
250
250
|
self.main_graphicsView_ax.setSizeIncrement(QtCore.QSize(1, 1))
|
|
251
|
-
self.main_graphicsView_ax.setFrameShape(QtCore.Qt.QFrame
|
|
252
|
-
self.main_graphicsView_ax.setAlignment(QtCore.Qt.Qt
|
|
253
|
-
self.main_graphicsView_ax.setViewportUpdateMode(QtCore.Qt.QGraphicsView
|
|
251
|
+
self.main_graphicsView_ax.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
252
|
+
self.main_graphicsView_ax.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
253
|
+
self.main_graphicsView_ax.setViewportUpdateMode(QtCore.Qt.QGraphicsView.ViewportUpdateMode.SmartViewportUpdate)
|
|
254
254
|
self.main_graphicsView_ax.setObjectName("main_graphicsView_ax")
|
|
255
255
|
self.gridLayout.addWidget(self.main_graphicsView_ax, 1, 1, 1, 1)
|
|
256
256
|
self.overlays_groupBox = QtWidgets.QGroupBox(self.centralwidget)
|
|
@@ -283,8 +283,8 @@ class Ui_MainWindow(object):
|
|
|
283
283
|
self.overlay_graphicsView_01.setSizePolicy(sizePolicy)
|
|
284
284
|
self.overlay_graphicsView_01.setMinimumSize(QtCore.QSize(192, 64))
|
|
285
285
|
self.overlay_graphicsView_01.setMaximumSize(QtCore.QSize(192, 64))
|
|
286
|
-
self.overlay_graphicsView_01.setFrameShape(QtCore.Qt.QFrame
|
|
287
|
-
self.overlay_graphicsView_01.setAlignment(QtCore.Qt.Qt
|
|
286
|
+
self.overlay_graphicsView_01.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
287
|
+
self.overlay_graphicsView_01.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
288
288
|
self.overlay_graphicsView_01.setObjectName("overlay_graphicsView_01")
|
|
289
289
|
self.overlay_radioButton_01 = QtWidgets.QRadioButton(self.overlays_groupBox)
|
|
290
290
|
self.overlay_radioButton_01.setGeometry(QtCore.QRect(10, 71, 151, 20))
|
|
@@ -360,8 +360,8 @@ class Ui_MainWindow(object):
|
|
|
360
360
|
self.overlay_graphicsView_04.setSizePolicy(sizePolicy)
|
|
361
361
|
self.overlay_graphicsView_04.setMinimumSize(QtCore.QSize(192, 64))
|
|
362
362
|
self.overlay_graphicsView_04.setMaximumSize(QtCore.QSize(192, 64))
|
|
363
|
-
self.overlay_graphicsView_04.setFrameShape(QtCore.Qt.QFrame
|
|
364
|
-
self.overlay_graphicsView_04.setAlignment(QtCore.Qt.Qt
|
|
363
|
+
self.overlay_graphicsView_04.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
364
|
+
self.overlay_graphicsView_04.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
365
365
|
self.overlay_graphicsView_04.setObjectName("overlay_graphicsView_04")
|
|
366
366
|
self.overlay_graphicsView_06 = GraphicsLayoutWidget(self.overlays_groupBox)
|
|
367
367
|
self.overlay_graphicsView_06.setGeometry(QtCore.QRect(10, 375, 192, 64))
|
|
@@ -372,8 +372,8 @@ class Ui_MainWindow(object):
|
|
|
372
372
|
self.overlay_graphicsView_06.setSizePolicy(sizePolicy)
|
|
373
373
|
self.overlay_graphicsView_06.setMinimumSize(QtCore.QSize(192, 64))
|
|
374
374
|
self.overlay_graphicsView_06.setMaximumSize(QtCore.QSize(192, 64))
|
|
375
|
-
self.overlay_graphicsView_06.setFrameShape(QtCore.Qt.QFrame
|
|
376
|
-
self.overlay_graphicsView_06.setAlignment(QtCore.Qt.Qt
|
|
375
|
+
self.overlay_graphicsView_06.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
376
|
+
self.overlay_graphicsView_06.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
377
377
|
self.overlay_graphicsView_06.setObjectName("overlay_graphicsView_06")
|
|
378
378
|
self.overlay_graphicsView_03 = GraphicsLayoutWidget(self.overlays_groupBox)
|
|
379
379
|
self.overlay_graphicsView_03.setGeometry(QtCore.QRect(10, 165, 192, 64))
|
|
@@ -384,8 +384,8 @@ class Ui_MainWindow(object):
|
|
|
384
384
|
self.overlay_graphicsView_03.setSizePolicy(sizePolicy)
|
|
385
385
|
self.overlay_graphicsView_03.setMinimumSize(QtCore.QSize(192, 64))
|
|
386
386
|
self.overlay_graphicsView_03.setMaximumSize(QtCore.QSize(192, 64))
|
|
387
|
-
self.overlay_graphicsView_03.setFrameShape(QtCore.Qt.QFrame
|
|
388
|
-
self.overlay_graphicsView_03.setAlignment(QtCore.Qt.Qt
|
|
387
|
+
self.overlay_graphicsView_03.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
388
|
+
self.overlay_graphicsView_03.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
389
389
|
self.overlay_graphicsView_03.setObjectName("overlay_graphicsView_03")
|
|
390
390
|
self.overlay_graphicsView_08 = GraphicsLayoutWidget(self.overlays_groupBox)
|
|
391
391
|
self.overlay_graphicsView_08.setGeometry(QtCore.QRect(10, 515, 192, 64))
|
|
@@ -396,8 +396,8 @@ class Ui_MainWindow(object):
|
|
|
396
396
|
self.overlay_graphicsView_08.setSizePolicy(sizePolicy)
|
|
397
397
|
self.overlay_graphicsView_08.setMinimumSize(QtCore.QSize(192, 64))
|
|
398
398
|
self.overlay_graphicsView_08.setMaximumSize(QtCore.QSize(192, 64))
|
|
399
|
-
self.overlay_graphicsView_08.setFrameShape(QtCore.Qt.QFrame
|
|
400
|
-
self.overlay_graphicsView_08.setAlignment(QtCore.Qt.Qt
|
|
399
|
+
self.overlay_graphicsView_08.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
400
|
+
self.overlay_graphicsView_08.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
401
401
|
self.overlay_graphicsView_08.setObjectName("overlay_graphicsView_08")
|
|
402
402
|
self.overlay_graphicsView_05 = GraphicsLayoutWidget(self.overlays_groupBox)
|
|
403
403
|
self.overlay_graphicsView_05.setGeometry(QtCore.QRect(10, 305, 192, 64))
|
|
@@ -408,8 +408,8 @@ class Ui_MainWindow(object):
|
|
|
408
408
|
self.overlay_graphicsView_05.setSizePolicy(sizePolicy)
|
|
409
409
|
self.overlay_graphicsView_05.setMinimumSize(QtCore.QSize(192, 64))
|
|
410
410
|
self.overlay_graphicsView_05.setMaximumSize(QtCore.QSize(192, 64))
|
|
411
|
-
self.overlay_graphicsView_05.setFrameShape(QtCore.Qt.QFrame
|
|
412
|
-
self.overlay_graphicsView_05.setAlignment(QtCore.Qt.Qt
|
|
411
|
+
self.overlay_graphicsView_05.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
412
|
+
self.overlay_graphicsView_05.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
413
413
|
self.overlay_graphicsView_05.setObjectName("overlay_graphicsView_05")
|
|
414
414
|
self.overlay_graphicsView_02 = GraphicsLayoutWidget(self.overlays_groupBox)
|
|
415
415
|
self.overlay_graphicsView_02.setGeometry(QtCore.QRect(10, 95, 192, 64))
|
|
@@ -420,8 +420,8 @@ class Ui_MainWindow(object):
|
|
|
420
420
|
self.overlay_graphicsView_02.setSizePolicy(sizePolicy)
|
|
421
421
|
self.overlay_graphicsView_02.setMinimumSize(QtCore.QSize(192, 64))
|
|
422
422
|
self.overlay_graphicsView_02.setMaximumSize(QtCore.QSize(192, 64))
|
|
423
|
-
self.overlay_graphicsView_02.setFrameShape(QtCore.Qt.QFrame
|
|
424
|
-
self.overlay_graphicsView_02.setAlignment(QtCore.Qt.Qt
|
|
423
|
+
self.overlay_graphicsView_02.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
424
|
+
self.overlay_graphicsView_02.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
425
425
|
self.overlay_graphicsView_02.setObjectName("overlay_graphicsView_02")
|
|
426
426
|
self.overlay_graphicsView_07 = GraphicsLayoutWidget(self.overlays_groupBox)
|
|
427
427
|
self.overlay_graphicsView_07.setGeometry(QtCore.QRect(10, 445, 192, 64))
|
|
@@ -432,8 +432,8 @@ class Ui_MainWindow(object):
|
|
|
432
432
|
self.overlay_graphicsView_07.setSizePolicy(sizePolicy)
|
|
433
433
|
self.overlay_graphicsView_07.setMinimumSize(QtCore.QSize(192, 64))
|
|
434
434
|
self.overlay_graphicsView_07.setMaximumSize(QtCore.QSize(192, 64))
|
|
435
|
-
self.overlay_graphicsView_07.setFrameShape(QtCore.Qt.QFrame
|
|
436
|
-
self.overlay_graphicsView_07.setAlignment(QtCore.Qt.Qt
|
|
435
|
+
self.overlay_graphicsView_07.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
436
|
+
self.overlay_graphicsView_07.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
437
437
|
self.overlay_graphicsView_07.setObjectName("overlay_graphicsView_07")
|
|
438
438
|
self.overlay_graphicsView_09 = GraphicsLayoutWidget(self.overlays_groupBox)
|
|
439
439
|
self.overlay_graphicsView_09.setGeometry(QtCore.QRect(210, 25, 192, 64))
|
|
@@ -444,8 +444,8 @@ class Ui_MainWindow(object):
|
|
|
444
444
|
self.overlay_graphicsView_09.setSizePolicy(sizePolicy)
|
|
445
445
|
self.overlay_graphicsView_09.setMinimumSize(QtCore.QSize(192, 64))
|
|
446
446
|
self.overlay_graphicsView_09.setMaximumSize(QtCore.QSize(192, 64))
|
|
447
|
-
self.overlay_graphicsView_09.setFrameShape(QtCore.Qt.QFrame
|
|
448
|
-
self.overlay_graphicsView_09.setAlignment(QtCore.Qt.Qt
|
|
447
|
+
self.overlay_graphicsView_09.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
448
|
+
self.overlay_graphicsView_09.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
449
449
|
self.overlay_graphicsView_09.setObjectName("overlay_graphicsView_09")
|
|
450
450
|
self.overlay_graphicsView_11 = GraphicsLayoutWidget(self.overlays_groupBox)
|
|
451
451
|
self.overlay_graphicsView_11.setGeometry(QtCore.QRect(210, 165, 192, 64))
|
|
@@ -456,8 +456,8 @@ class Ui_MainWindow(object):
|
|
|
456
456
|
self.overlay_graphicsView_11.setSizePolicy(sizePolicy)
|
|
457
457
|
self.overlay_graphicsView_11.setMinimumSize(QtCore.QSize(192, 64))
|
|
458
458
|
self.overlay_graphicsView_11.setMaximumSize(QtCore.QSize(192, 64))
|
|
459
|
-
self.overlay_graphicsView_11.setFrameShape(QtCore.Qt.QFrame
|
|
460
|
-
self.overlay_graphicsView_11.setAlignment(QtCore.Qt.Qt
|
|
459
|
+
self.overlay_graphicsView_11.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
460
|
+
self.overlay_graphicsView_11.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
461
461
|
self.overlay_graphicsView_11.setObjectName("overlay_graphicsView_11")
|
|
462
462
|
self.overlay_graphicsView_10 = GraphicsLayoutWidget(self.overlays_groupBox)
|
|
463
463
|
self.overlay_graphicsView_10.setGeometry(QtCore.QRect(210, 95, 192, 64))
|
|
@@ -468,8 +468,8 @@ class Ui_MainWindow(object):
|
|
|
468
468
|
self.overlay_graphicsView_10.setSizePolicy(sizePolicy)
|
|
469
469
|
self.overlay_graphicsView_10.setMinimumSize(QtCore.QSize(192, 64))
|
|
470
470
|
self.overlay_graphicsView_10.setMaximumSize(QtCore.QSize(192, 64))
|
|
471
|
-
self.overlay_graphicsView_10.setFrameShape(QtCore.Qt.QFrame
|
|
472
|
-
self.overlay_graphicsView_10.setAlignment(QtCore.Qt.Qt
|
|
471
|
+
self.overlay_graphicsView_10.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
472
|
+
self.overlay_graphicsView_10.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
473
473
|
self.overlay_graphicsView_10.setObjectName("overlay_graphicsView_10")
|
|
474
474
|
self.overlay_graphicsView_12 = GraphicsLayoutWidget(self.overlays_groupBox)
|
|
475
475
|
self.overlay_graphicsView_12.setGeometry(QtCore.QRect(210, 235, 192, 64))
|
|
@@ -480,8 +480,8 @@ class Ui_MainWindow(object):
|
|
|
480
480
|
self.overlay_graphicsView_12.setSizePolicy(sizePolicy)
|
|
481
481
|
self.overlay_graphicsView_12.setMinimumSize(QtCore.QSize(192, 64))
|
|
482
482
|
self.overlay_graphicsView_12.setMaximumSize(QtCore.QSize(192, 64))
|
|
483
|
-
self.overlay_graphicsView_12.setFrameShape(QtCore.Qt.QFrame
|
|
484
|
-
self.overlay_graphicsView_12.setAlignment(QtCore.Qt.Qt
|
|
483
|
+
self.overlay_graphicsView_12.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
484
|
+
self.overlay_graphicsView_12.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
485
485
|
self.overlay_graphicsView_12.setObjectName("overlay_graphicsView_12")
|
|
486
486
|
self.overlay_graphicsView_13 = GraphicsLayoutWidget(self.overlays_groupBox)
|
|
487
487
|
self.overlay_graphicsView_13.setGeometry(QtCore.QRect(210, 305, 192, 64))
|
|
@@ -492,8 +492,8 @@ class Ui_MainWindow(object):
|
|
|
492
492
|
self.overlay_graphicsView_13.setSizePolicy(sizePolicy)
|
|
493
493
|
self.overlay_graphicsView_13.setMinimumSize(QtCore.QSize(192, 64))
|
|
494
494
|
self.overlay_graphicsView_13.setMaximumSize(QtCore.QSize(192, 64))
|
|
495
|
-
self.overlay_graphicsView_13.setFrameShape(QtCore.Qt.QFrame
|
|
496
|
-
self.overlay_graphicsView_13.setAlignment(QtCore.Qt.Qt
|
|
495
|
+
self.overlay_graphicsView_13.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
496
|
+
self.overlay_graphicsView_13.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
497
497
|
self.overlay_graphicsView_13.setObjectName("overlay_graphicsView_13")
|
|
498
498
|
self.overlay_graphicsView_14 = GraphicsLayoutWidget(self.overlays_groupBox)
|
|
499
499
|
self.overlay_graphicsView_14.setGeometry(QtCore.QRect(210, 375, 192, 64))
|
|
@@ -504,8 +504,8 @@ class Ui_MainWindow(object):
|
|
|
504
504
|
self.overlay_graphicsView_14.setSizePolicy(sizePolicy)
|
|
505
505
|
self.overlay_graphicsView_14.setMinimumSize(QtCore.QSize(192, 64))
|
|
506
506
|
self.overlay_graphicsView_14.setMaximumSize(QtCore.QSize(192, 64))
|
|
507
|
-
self.overlay_graphicsView_14.setFrameShape(QtCore.Qt.QFrame
|
|
508
|
-
self.overlay_graphicsView_14.setAlignment(QtCore.Qt.Qt
|
|
507
|
+
self.overlay_graphicsView_14.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
508
|
+
self.overlay_graphicsView_14.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
509
509
|
self.overlay_graphicsView_14.setObjectName("overlay_graphicsView_14")
|
|
510
510
|
self.overlay_graphicsView_15 = GraphicsLayoutWidget(self.overlays_groupBox)
|
|
511
511
|
self.overlay_graphicsView_15.setGeometry(QtCore.QRect(210, 445, 192, 64))
|
|
@@ -516,8 +516,8 @@ class Ui_MainWindow(object):
|
|
|
516
516
|
self.overlay_graphicsView_15.setSizePolicy(sizePolicy)
|
|
517
517
|
self.overlay_graphicsView_15.setMinimumSize(QtCore.QSize(192, 64))
|
|
518
518
|
self.overlay_graphicsView_15.setMaximumSize(QtCore.QSize(192, 64))
|
|
519
|
-
self.overlay_graphicsView_15.setFrameShape(QtCore.Qt.QFrame
|
|
520
|
-
self.overlay_graphicsView_15.setAlignment(QtCore.Qt.Qt
|
|
519
|
+
self.overlay_graphicsView_15.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
520
|
+
self.overlay_graphicsView_15.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
521
521
|
self.overlay_graphicsView_15.setObjectName("overlay_graphicsView_15")
|
|
522
522
|
self.overlay_graphicsView_16 = GraphicsLayoutWidget(self.overlays_groupBox)
|
|
523
523
|
self.overlay_graphicsView_16.setGeometry(QtCore.QRect(210, 515, 192, 64))
|
|
@@ -528,8 +528,8 @@ class Ui_MainWindow(object):
|
|
|
528
528
|
self.overlay_graphicsView_16.setSizePolicy(sizePolicy)
|
|
529
529
|
self.overlay_graphicsView_16.setMinimumSize(QtCore.QSize(192, 64))
|
|
530
530
|
self.overlay_graphicsView_16.setMaximumSize(QtCore.QSize(192, 64))
|
|
531
|
-
self.overlay_graphicsView_16.setFrameShape(QtCore.Qt.QFrame
|
|
532
|
-
self.overlay_graphicsView_16.setAlignment(QtCore.Qt.Qt
|
|
531
|
+
self.overlay_graphicsView_16.setFrameShape(QtCore.Qt.QFrame.Shape.NoFrame)
|
|
532
|
+
self.overlay_graphicsView_16.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
533
533
|
self.overlay_graphicsView_16.setObjectName("overlay_graphicsView_16")
|
|
534
534
|
self.overlay_radioButton_09 = QtWidgets.QRadioButton(self.overlays_groupBox)
|
|
535
535
|
self.overlay_radioButton_09.setGeometry(QtCore.QRect(210, 70, 151, 20))
|
|
@@ -670,7 +670,7 @@ class Ui_MainWindow(object):
|
|
|
670
670
|
self.label_4.setObjectName("label_4")
|
|
671
671
|
self.pixnumX_doubleSpinBox = QtWidgets.QDoubleSpinBox(self.mainimagedata_groupBox)
|
|
672
672
|
self.pixnumX_doubleSpinBox.setGeometry(QtCore.QRect(30, 30, 67, 24))
|
|
673
|
-
self.pixnumX_doubleSpinBox.setAlignment(QtCore.Qt.Qt
|
|
673
|
+
self.pixnumX_doubleSpinBox.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignRight|QtCore.Qt.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.Qt.AlignmentFlag.AlignVCenter)
|
|
674
674
|
self.pixnumX_doubleSpinBox.setDecimals(0)
|
|
675
675
|
self.pixnumX_doubleSpinBox.setObjectName("pixnumX_doubleSpinBox")
|
|
676
676
|
self.label_7 = QtWidgets.QLabel(self.mainimagedata_groupBox)
|
|
@@ -681,7 +681,7 @@ class Ui_MainWindow(object):
|
|
|
681
681
|
self.label_7.setObjectName("label_7")
|
|
682
682
|
self.coordX_doubleSpinBox = QtWidgets.QDoubleSpinBox(self.mainimagedata_groupBox)
|
|
683
683
|
self.coordX_doubleSpinBox.setGeometry(QtCore.QRect(100, 30, 67, 24))
|
|
684
|
-
self.coordX_doubleSpinBox.setAlignment(QtCore.Qt.Qt
|
|
684
|
+
self.coordX_doubleSpinBox.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignRight|QtCore.Qt.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.Qt.AlignmentFlag.AlignVCenter)
|
|
685
685
|
self.coordX_doubleSpinBox.setDecimals(3)
|
|
686
686
|
self.coordX_doubleSpinBox.setObjectName("coordX_doubleSpinBox")
|
|
687
687
|
self.label_9 = QtWidgets.QLabel(self.mainimagedata_groupBox)
|
|
@@ -692,22 +692,22 @@ class Ui_MainWindow(object):
|
|
|
692
692
|
self.label_9.setObjectName("label_9")
|
|
693
693
|
self.pixnumY_doubleSpinBox = QtWidgets.QDoubleSpinBox(self.mainimagedata_groupBox)
|
|
694
694
|
self.pixnumY_doubleSpinBox.setGeometry(QtCore.QRect(30, 55, 67, 24))
|
|
695
|
-
self.pixnumY_doubleSpinBox.setAlignment(QtCore.Qt.Qt
|
|
695
|
+
self.pixnumY_doubleSpinBox.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignRight|QtCore.Qt.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.Qt.AlignmentFlag.AlignVCenter)
|
|
696
696
|
self.pixnumY_doubleSpinBox.setDecimals(0)
|
|
697
697
|
self.pixnumY_doubleSpinBox.setObjectName("pixnumY_doubleSpinBox")
|
|
698
698
|
self.coordY_doubleSpinBox = QtWidgets.QDoubleSpinBox(self.mainimagedata_groupBox)
|
|
699
699
|
self.coordY_doubleSpinBox.setGeometry(QtCore.QRect(100, 55, 67, 24))
|
|
700
|
-
self.coordY_doubleSpinBox.setAlignment(QtCore.Qt.Qt
|
|
700
|
+
self.coordY_doubleSpinBox.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignRight|QtCore.Qt.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.Qt.AlignmentFlag.AlignVCenter)
|
|
701
701
|
self.coordY_doubleSpinBox.setDecimals(3)
|
|
702
702
|
self.coordY_doubleSpinBox.setObjectName("coordY_doubleSpinBox")
|
|
703
703
|
self.pixnumZ_doubleSpinBox = QtWidgets.QDoubleSpinBox(self.mainimagedata_groupBox)
|
|
704
704
|
self.pixnumZ_doubleSpinBox.setGeometry(QtCore.QRect(30, 80, 67, 24))
|
|
705
|
-
self.pixnumZ_doubleSpinBox.setAlignment(QtCore.Qt.Qt
|
|
705
|
+
self.pixnumZ_doubleSpinBox.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignRight|QtCore.Qt.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.Qt.AlignmentFlag.AlignVCenter)
|
|
706
706
|
self.pixnumZ_doubleSpinBox.setDecimals(0)
|
|
707
707
|
self.pixnumZ_doubleSpinBox.setObjectName("pixnumZ_doubleSpinBox")
|
|
708
708
|
self.coordZ_doubleSpinBox = QtWidgets.QDoubleSpinBox(self.mainimagedata_groupBox)
|
|
709
709
|
self.coordZ_doubleSpinBox.setGeometry(QtCore.QRect(100, 80, 67, 24))
|
|
710
|
-
self.coordZ_doubleSpinBox.setAlignment(QtCore.Qt.Qt
|
|
710
|
+
self.coordZ_doubleSpinBox.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignRight|QtCore.Qt.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.Qt.AlignmentFlag.AlignVCenter)
|
|
711
711
|
self.coordZ_doubleSpinBox.setDecimals(3)
|
|
712
712
|
self.coordZ_doubleSpinBox.setObjectName("coordZ_doubleSpinBox")
|
|
713
713
|
self.label_6 = QtWidgets.QLabel(self.mainimagedata_groupBox)
|
|
@@ -718,12 +718,12 @@ class Ui_MainWindow(object):
|
|
|
718
718
|
self.label_8.setObjectName("label_8")
|
|
719
719
|
self.coordT_doubleSpinBox = QtWidgets.QDoubleSpinBox(self.mainimagedata_groupBox)
|
|
720
720
|
self.coordT_doubleSpinBox.setGeometry(QtCore.QRect(100, 130, 67, 24))
|
|
721
|
-
self.coordT_doubleSpinBox.setAlignment(QtCore.Qt.Qt
|
|
721
|
+
self.coordT_doubleSpinBox.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignRight|QtCore.Qt.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.Qt.AlignmentFlag.AlignVCenter)
|
|
722
722
|
self.coordT_doubleSpinBox.setDecimals(3)
|
|
723
723
|
self.coordT_doubleSpinBox.setObjectName("coordT_doubleSpinBox")
|
|
724
724
|
self.pixnumT_doubleSpinBox = QtWidgets.QDoubleSpinBox(self.mainimagedata_groupBox)
|
|
725
725
|
self.pixnumT_doubleSpinBox.setGeometry(QtCore.QRect(30, 130, 67, 24))
|
|
726
|
-
self.pixnumT_doubleSpinBox.setAlignment(QtCore.Qt.Qt
|
|
726
|
+
self.pixnumT_doubleSpinBox.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignRight|QtCore.Qt.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.Qt.AlignmentFlag.AlignVCenter)
|
|
727
727
|
self.pixnumT_doubleSpinBox.setDecimals(0)
|
|
728
728
|
self.pixnumT_doubleSpinBox.setObjectName("pixnumT_doubleSpinBox")
|
|
729
729
|
self.label_3 = QtWidgets.QLabel(self.mainimagedata_groupBox)
|
|
@@ -731,7 +731,7 @@ class Ui_MainWindow(object):
|
|
|
731
731
|
self.label_3.setObjectName("label_3")
|
|
732
732
|
self.TimeSlider = QtWidgets.QSlider(self.mainimagedata_groupBox)
|
|
733
733
|
self.TimeSlider.setGeometry(QtCore.QRect(10, 195, 151, 22))
|
|
734
|
-
self.TimeSlider.setOrientation(QtCore.Qt.Qt
|
|
734
|
+
self.TimeSlider.setOrientation(QtCore.Qt.Qt.Orientation.Horizontal)
|
|
735
735
|
self.TimeSlider.setObjectName("TimeSlider")
|
|
736
736
|
self.label_10 = QtWidgets.QLabel(self.mainimagedata_groupBox)
|
|
737
737
|
self.label_10.setGeometry(QtCore.QRect(30, 120, 56, 13))
|
|
@@ -841,14 +841,14 @@ class Ui_MainWindow(object):
|
|
|
841
841
|
font = QtGui.QFont()
|
|
842
842
|
font.setFamily("Arial Narrow")
|
|
843
843
|
self.label_5.setFont(font)
|
|
844
|
-
self.label_5.setAlignment(QtCore.Qt.Qt
|
|
844
|
+
self.label_5.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
845
845
|
self.label_5.setObjectName("label_5")
|
|
846
846
|
self.label_12 = QtWidgets.QLabel(self.regressor_groupBox)
|
|
847
847
|
self.label_12.setGeometry(QtCore.QRect(1040, 155, 131, 16))
|
|
848
848
|
font = QtGui.QFont()
|
|
849
849
|
font.setFamily("Arial Narrow")
|
|
850
850
|
self.label_12.setFont(font)
|
|
851
|
-
self.label_12.setAlignment(QtCore.Qt.Qt
|
|
851
|
+
self.label_12.setAlignment(QtCore.Qt.Qt.AlignmentFlag.AlignCenter)
|
|
852
852
|
self.label_12.setObjectName("label_12")
|
|
853
853
|
self.logOutput_groupBox = QtWidgets.QGroupBox(self.centralwidget)
|
|
854
854
|
self.logOutput_groupBox.setGeometry(QtCore.QRect(1200, 7, 381, 221))
|
rapidtide/workflows/happy.py
CHANGED
|
@@ -1421,7 +1421,7 @@ def happy_main(argparsingfunc):
|
|
|
1421
1421
|
# make a lowpass filter for the projected data. Limit frequency to 3 cycles per 2pi (1/6th Fs)
|
|
1422
1422
|
phaseFs = 1.0 / phasestep
|
|
1423
1423
|
phaseFc = phaseFs / 6.0
|
|
1424
|
-
appsmoothingfilter = tide_filt.NoncausalFilter("arb",
|
|
1424
|
+
appsmoothingfilter = tide_filt.NoncausalFilter("arb", padtime=0.0)
|
|
1425
1425
|
appsmoothingfilter.setfreqs(0.0, 0.0, phaseFc, phaseFc)
|
|
1426
1426
|
|
|
1427
1427
|
# setup for aliased correlation if we're going to do it
|
|
@@ -444,7 +444,7 @@ def addfilteropts(
|
|
|
444
444
|
dest="ncfiltpadtype",
|
|
445
445
|
action="store",
|
|
446
446
|
type=str,
|
|
447
|
-
choices=["reflect", "zero", "constant", "constant+"],
|
|
447
|
+
choices=["reflect", "zero", "cyclic", "constant", "constant+"],
|
|
448
448
|
help=(
|
|
449
449
|
f"The type of padding at each end of a "
|
|
450
450
|
"timecourse to be filtered "
|
rapidtide/workflows/rapidtide.py
CHANGED
|
@@ -114,6 +114,10 @@ def echocancel(thetimecourse, echooffset, thetimestep, outputname, padtimepoints
|
|
|
114
114
|
)
|
|
115
115
|
return outputtimecourse, echofit, echoR2
|
|
116
116
|
|
|
117
|
+
def setpassoptions(passdict, optiondict):
|
|
118
|
+
for key, value in passdict.items():
|
|
119
|
+
optiondict[key] = value
|
|
120
|
+
|
|
117
121
|
|
|
118
122
|
def rapidtide_main(argparsingfunc):
|
|
119
123
|
optiondict, theprefilter = argparsingfunc
|
|
@@ -1490,7 +1494,12 @@ def rapidtide_main(argparsingfunc):
|
|
|
1490
1494
|
)
|
|
1491
1495
|
|
|
1492
1496
|
# now do the arrays for delay refinement
|
|
1493
|
-
if
|
|
1497
|
+
if (
|
|
1498
|
+
optiondict["dolinfitfilt"]
|
|
1499
|
+
or optiondict["docvrmap"]
|
|
1500
|
+
or optiondict["refinedelay"]
|
|
1501
|
+
or (optiondict["similaritymetric"] == "riptide")
|
|
1502
|
+
):
|
|
1494
1503
|
if optiondict["refinedelay"]:
|
|
1495
1504
|
derivaxissize = np.max([2, optiondict["regressderivs"] + 1])
|
|
1496
1505
|
else:
|
|
@@ -1718,6 +1727,19 @@ def rapidtide_main(argparsingfunc):
|
|
|
1718
1727
|
optiondict["currentstage"] = "preprocessingdone"
|
|
1719
1728
|
tide_io.writedicttojson(optiondict, f"{outputname}_desc-runoptions_info.json")
|
|
1720
1729
|
|
|
1730
|
+
# set up the pass options array
|
|
1731
|
+
optiondict["passoptions"] = []
|
|
1732
|
+
"""optiondict["passoptions"].append(
|
|
1733
|
+
{
|
|
1734
|
+
"similaritymetric": "riptide"
|
|
1735
|
+
}
|
|
1736
|
+
)
|
|
1737
|
+
optiondict["passoptions"].append(
|
|
1738
|
+
{
|
|
1739
|
+
"similaritymetric": optiondict["similaritymetric"]
|
|
1740
|
+
}
|
|
1741
|
+
)"""
|
|
1742
|
+
|
|
1721
1743
|
####################################################
|
|
1722
1744
|
# Start the iterative fit and refinement
|
|
1723
1745
|
####################################################
|
|
@@ -1730,6 +1752,10 @@ def rapidtide_main(argparsingfunc):
|
|
|
1730
1752
|
LGR.info("\n\n*********************")
|
|
1731
1753
|
LGR.info(f"Pass number {thepass}")
|
|
1732
1754
|
|
|
1755
|
+
# fetch the pass options
|
|
1756
|
+
if len(optiondict["passoptions"]) >= thepass:
|
|
1757
|
+
setpassoptions(optiondict["passoptions"][thepass - 1], optiondict)
|
|
1758
|
+
|
|
1733
1759
|
referencetc = tide_math.corrnormalize(
|
|
1734
1760
|
resampref_y[osvalidsimcalcstart : osvalidsimcalcend + 1],
|
|
1735
1761
|
detrendorder=optiondict["detrendorder"],
|
|
@@ -1788,13 +1814,6 @@ def rapidtide_main(argparsingfunc):
|
|
|
1788
1814
|
LGR.info(f"\n\nSignificance estimation, pass {thepass}")
|
|
1789
1815
|
if optiondict["checkpoint"]:
|
|
1790
1816
|
# bidsify
|
|
1791
|
-
"""tide_io.writebidstsv(
|
|
1792
|
-
f"{outputname}_desc-movingregressor_timeseries",
|
|
1793
|
-
tide_math.stdnormalize(resampnonosref_y),
|
|
1794
|
-
1.0 / fmritr,
|
|
1795
|
-
columns=["pass1"],
|
|
1796
|
-
append=False,
|
|
1797
|
-
)"""
|
|
1798
1817
|
tide_io.writenpvecs(
|
|
1799
1818
|
cleaned_referencetc,
|
|
1800
1819
|
f"{outputname}_cleanedreference_pass" + str(thepass) + ".txt",
|
|
@@ -2010,8 +2029,6 @@ def rapidtide_main(argparsingfunc):
|
|
|
2010
2029
|
cifti_hdr=theinputdata.cifti_hdr,
|
|
2011
2030
|
)
|
|
2012
2031
|
|
|
2013
|
-
|
|
2014
|
-
|
|
2015
2032
|
# Step 2a - fit the delay function
|
|
2016
2033
|
internaldespeckleincludemask = tide_fitSimFuncMap.fitSimFunc(
|
|
2017
2034
|
fmri_data_valid,
|
rapidtide/workflows/tidepool.py
CHANGED
|
@@ -39,12 +39,17 @@ from rapidtide.simFuncClasses import SimilarityFunctionFitter
|
|
|
39
39
|
from rapidtide.workflows.atlasaverage import summarizevoxels
|
|
40
40
|
|
|
41
41
|
try:
|
|
42
|
-
from
|
|
42
|
+
from PySide6.QtCore import __version__
|
|
43
43
|
except ImportError:
|
|
44
|
-
|
|
44
|
+
try:
|
|
45
|
+
from PyQt6.QtCore import QT_VERSION_STR
|
|
46
|
+
except ImportError:
|
|
47
|
+
pyqtbinding = "pyqt5"
|
|
48
|
+
else:
|
|
49
|
+
pyqtbinding = "pyqt6"
|
|
45
50
|
else:
|
|
46
|
-
|
|
47
|
-
print(f"using {
|
|
51
|
+
pyqtbinding = "pyside6"
|
|
52
|
+
print(f"using {pyqtbinding=}")
|
|
48
53
|
|
|
49
54
|
os.environ["QT_MAC_WANTS_LAYER"] = "1"
|
|
50
55
|
|
|
@@ -184,10 +189,14 @@ def updateFileMenu():
|
|
|
184
189
|
global fileMenu, sel_open
|
|
185
190
|
global sel_files
|
|
186
191
|
|
|
187
|
-
if
|
|
192
|
+
if pyqtbinding == "pyqt5":
|
|
188
193
|
qactionfunc = QtWidgets.QAction
|
|
189
|
-
|
|
194
|
+
elif pyqtbinding == "pyqt6":
|
|
190
195
|
qactionfunc = QtGui.QAction
|
|
196
|
+
elif pyqtbinding == "pyside6":
|
|
197
|
+
qactionfunc = QtGui.QAction
|
|
198
|
+
else:
|
|
199
|
+
print("unsupported")
|
|
191
200
|
|
|
192
201
|
# scrub file menu
|
|
193
202
|
if sel_files is not None:
|
|
@@ -214,10 +223,14 @@ def datasetPicker():
|
|
|
214
223
|
global verbosity
|
|
215
224
|
|
|
216
225
|
mydialog = QtWidgets.QFileDialog()
|
|
217
|
-
if
|
|
226
|
+
if pyqtbinding == "pyqt5":
|
|
218
227
|
options = mydialog.Options()
|
|
219
|
-
|
|
228
|
+
elif pyqtbinding == "pyqt6":
|
|
220
229
|
options = mydialog.options()
|
|
230
|
+
elif pyqtbinding == "pyside6":
|
|
231
|
+
options = mydialog.options()
|
|
232
|
+
else:
|
|
233
|
+
print("unsupported")
|
|
221
234
|
lagfilename = mydialog.getOpenFileName(
|
|
222
235
|
options=options,
|
|
223
236
|
filter="Lag time files (*_lagtimes.nii.gz *_desc-maxtime_map.nii.gz)",
|
|
@@ -591,8 +604,14 @@ class xyztlocation(QtWidgets.QWidget):
|
|
|
591
604
|
|
|
592
605
|
|
|
593
606
|
def logStatus(thetextbox, thetext):
|
|
594
|
-
if
|
|
607
|
+
if pyqtbinding == "pyqt5":
|
|
595
608
|
thetextbox.moveCursor(QtGui.QTextCursor.End)
|
|
609
|
+
elif pyqtbinding == "pyqt6":
|
|
610
|
+
pass
|
|
611
|
+
elif pyqtbinding == "pyside6":
|
|
612
|
+
pass
|
|
613
|
+
else:
|
|
614
|
+
print("unsupported")
|
|
596
615
|
thetextbox.insertPlainText(thetext + "\n")
|
|
597
616
|
sb = thetextbox.verticalScrollBar()
|
|
598
617
|
sb.setValue(sb.maximum())
|
|
@@ -1773,20 +1792,29 @@ def tidepool(args):
|
|
|
1773
1792
|
uiinitialized = False
|
|
1774
1793
|
sel_files = None
|
|
1775
1794
|
|
|
1776
|
-
if
|
|
1795
|
+
if pyqtbinding == "pyqt5":
|
|
1777
1796
|
if args.uistyle == "normal":
|
|
1778
1797
|
import rapidtide.tidepoolTemplate_alt as uiTemplate
|
|
1779
1798
|
elif args.uistyle == "big":
|
|
1780
1799
|
import rapidtide.tidepoolTemplate_big as uiTemplate
|
|
1781
1800
|
else:
|
|
1782
1801
|
import rapidtide.tidepoolTemplate as uiTemplate
|
|
1783
|
-
|
|
1802
|
+
elif pyqtbinding == "pyqt6":
|
|
1784
1803
|
if args.uistyle == "normal":
|
|
1785
1804
|
import rapidtide.tidepoolTemplate_alt_qt6 as uiTemplate
|
|
1786
1805
|
elif args.uistyle == "big":
|
|
1787
1806
|
import rapidtide.tidepoolTemplate_big_qt6 as uiTemplate
|
|
1788
1807
|
else:
|
|
1789
1808
|
import rapidtide.tidepoolTemplate_qt6 as uiTemplate
|
|
1809
|
+
elif pyqtbinding == "pyside6":
|
|
1810
|
+
if args.uistyle == "normal":
|
|
1811
|
+
import rapidtide.tidepoolTemplate_alt_qt6 as uiTemplate
|
|
1812
|
+
elif args.uistyle == "big":
|
|
1813
|
+
import rapidtide.tidepoolTemplate_big_qt6 as uiTemplate
|
|
1814
|
+
else:
|
|
1815
|
+
import rapidtide.tidepoolTemplate_qt6 as uiTemplate
|
|
1816
|
+
else:
|
|
1817
|
+
print("unsupported")
|
|
1790
1818
|
|
|
1791
1819
|
verbosity = args.verbose
|
|
1792
1820
|
print(f"verbosity: {verbosity}")
|
|
@@ -1839,10 +1867,14 @@ def tidepool(args):
|
|
|
1839
1867
|
print("creating menu bar")
|
|
1840
1868
|
menuBar = win.menuBar()
|
|
1841
1869
|
fileMenu = menuBar.addMenu("File")
|
|
1842
|
-
if
|
|
1870
|
+
if pyqtbinding == "pyqt5":
|
|
1843
1871
|
qactionfunc = QtWidgets.QAction
|
|
1844
|
-
|
|
1872
|
+
elif pyqtbinding == "pyqt6":
|
|
1845
1873
|
qactionfunc = QtGui.QAction
|
|
1874
|
+
elif pyqtbinding == "pyside6":
|
|
1875
|
+
qactionfunc = QtGui.QAction
|
|
1876
|
+
else:
|
|
1877
|
+
print("unsupported")
|
|
1846
1878
|
sel_open = qactionfunc("Add dataset...", win)
|
|
1847
1879
|
sel_open.triggered.connect(datasetPicker)
|
|
1848
1880
|
fileMenu.addAction(sel_open)
|
|
@@ -2196,10 +2228,14 @@ def tidepool(args):
|
|
|
2196
2228
|
|
|
2197
2229
|
# define things for the popup mask menu
|
|
2198
2230
|
popMaskMenu = QtWidgets.QMenu(win)
|
|
2199
|
-
if
|
|
2231
|
+
if pyqtbinding == "pyqt5":
|
|
2200
2232
|
qactionfunc = QtWidgets.QAction
|
|
2201
|
-
|
|
2233
|
+
elif pyqtbinding == "pyqt6":
|
|
2202
2234
|
qactionfunc = QtGui.QAction
|
|
2235
|
+
elif pyqtbinding == "pyside6":
|
|
2236
|
+
qactionfunc = QtGui.QAction
|
|
2237
|
+
else:
|
|
2238
|
+
print("unsupported")
|
|
2203
2239
|
sel_nomask = qactionfunc("No mask", win)
|
|
2204
2240
|
sel_lagmask = qactionfunc("Valid fit", win)
|
|
2205
2241
|
sel_brainmask = qactionfunc("Externally provided brain mask", win)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: rapidtide
|
|
3
|
-
Version: 3.0.
|
|
3
|
+
Version: 3.0.10
|
|
4
4
|
Summary: Tools for performing correlation analysis on fMRI data.
|
|
5
5
|
Author: Taylor Salo, Daniel M. Drucker, Ph.D., Jeffrey N Stout, Yaroslav O. Halchenko, Derek Monroe
|
|
6
6
|
Author-email: "Blaise deB. Frederick" <blaise.frederick@gmail.com>
|
|
@@ -38,8 +38,8 @@ Requires-Dist: pyqt6
|
|
|
38
38
|
Requires-Dist: requests
|
|
39
39
|
Requires-Dist: statsmodels
|
|
40
40
|
Requires-Dist: pywavelets
|
|
41
|
-
Requires-Dist: tensorflow>=2.
|
|
42
|
-
Requires-Dist: tf-keras
|
|
41
|
+
Requires-Dist: tensorflow>=2.18.0
|
|
42
|
+
Requires-Dist: tf-keras>=2.18.0
|
|
43
43
|
Requires-Dist: tqdm
|
|
44
44
|
Requires-Dist: versioneer
|
|
45
45
|
Provides-Extra: tests
|