rapidtide 3.0a9__tar.gz → 3.0a10__tar.gz

{rapidtide-3.0a9 → rapidtide-3.0a10}/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Release history
 
+## Version 3.0alpha10 (2/28/25)
+* (tidepool) Full support for multiple concurrent datasets.  Dataset loading and selection is now done through the File menu.
+* (tidepool) Load additional informational maps, and somewhat more intelligently.
+* (tidepool) Fixed pane loading to use all available panes.
+* (tidepool) Fixed image saving under pyqt6.
+* (tidepool) For the regressor spectrum, only do FFT of the portion of the regressor used for similarity calculation.
+
 ## Version 3.0alpha9 (2/26/25)
 * (rapidtide) Fixed the calculation of the regressor autocorrelation width (used in estimating MTT).
 * (tidepool) First working version that allows loading multiple files. Use ``--dataset DATASET1 DATASET2...``.

{rapidtide-3.0a9/rapidtide.egg-info → rapidtide-3.0a10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rapidtide
-Version: 3.0a9
+Version: 3.0a10
 Summary: Tools for performing correlation analysis on fMRI data.
 Author: Taylor Salo, Daniel M. Drucker, Ph.D., Jeffrey N Stout, Yaroslav O. Halchenko, Derek Monroe
 Author-email: "Blaise deB. Frederick" <blaise.frederick@gmail.com>

{rapidtide-3.0a9 → rapidtide-3.0a10}/rapidtide/OrthoImageItem.py

@@ -19,8 +19,6 @@
 """
 A widget for orthographically displaying 3 and 4 dimensional data
 """
-
-import copy
 import os
 
 import numpy as np
@@ -34,6 +32,14 @@ try:
 except ImportError:
     PILexists = False
 
+try:
+    from PyQt6.QtCore import QT_VERSION_STR
+except ImportError:
+    pyqtversion = 5
+else:
+    pyqtversion = 6
+print(f"using {pyqtversion=}")
+
 
 def newColorbar(left, top, impixpervoxx, impixpervoxy, imgsize):
     cb_xdim = imgsize // 10
@@ -514,7 +520,10 @@ class OrthoImageItem(QtWidgets.QWidget):
         if self.verbose > 1:
             print("saving main window")
         mydialog = QtWidgets.QFileDialog()
-        options = mydialog.Options()
+        if pyqtversion == 5:
+            options = mydialog.Options()
+        else:
+            options = mydialog.options()
         thedir = str(
             mydialog.getExistingDirectory(options=options, caption="Image output directory")
         )

{rapidtide-3.0a9 → rapidtide-3.0a10}/rapidtide/RapidtideDataset.py

@@ -81,6 +81,7 @@ class Timecourse:
         label=None,
         report=False,
         isbids=False,
+        limits=None,
         verbose=0,
     ):
         self.verbose = verbose
@@ -91,6 +92,7 @@ class Timecourse:
         self.displaysamplerate = displaysamplerate
         self.starttime = starttime
         self.isbids = isbids
+        self.limits = limits
 
         if label is None:
             self.label = name
@@ -117,11 +119,21 @@ class Timecourse:
         self.timeaxis = (
             np.linspace(0.0, self.length, num=self.length, endpoint=False) / self.samplerate
         ) - self.starttime
+        if self.limits is not None:
+            startpoint = np.max((int(np.round(self.limits[0] * self.samplerate, 0)), 0))
+            endpoint = np.min((int(np.round(self.limits[1] * self.samplerate, 0)), self.length))
+        else:
+            startpoint = 0
+            endpoint = self.length
         self.specaxis, self.specdata = tide_filt.spectrum(
-            tide_math.corrnormalize(self.timedata), self.samplerate
+            tide_math.corrnormalize(self.timedata[startpoint:endpoint]), self.samplerate
+        )
+        self.kurtosis, self.kurtosis_z, self.kurtosis_p = tide_stats.kurtosisstats(
+            self.timedata[startpoint:endpoint]
+        )
+        self.skewness, self.skewness_z, self.skewness_p = tide_stats.skewnessstats(
+            self.timedata[startpoint:endpoint]
         )
-        self.kurtosis, self.kurtosis_z, self.kurtosis_p = tide_stats.kurtosisstats(self.timedata)
-        self.skewness, self.skewness_z, self.skewness_p = tide_stats.skewnessstats(self.timedata)
 
         if self.verbose > 1:
             print("Timecourse data range:", np.min(self.timedata), np.max(self.timedata))
@@ -163,6 +175,7 @@ class Overlay:
         alpha=128,
         endalpha=0,
         display_state=True,
+        invertonload=False,
         isaMask=False,
         init_LUT=True,
         verbose=1,
@@ -180,6 +193,7 @@ class Overlay:
         self.namebase = namebase
         if self.verbose > 1:
             print("reading map ", self.name, " from ", self.filename, "...")
+        self.invertonload = invertonload
         self.readImageData(isaMask=isaMask)
         self.mask = None
         self.maskeddata = None
@@ -298,6 +312,8 @@ class Overlay:
         self.nim, self.data, self.header, self.dims, self.sizes = tide_io.readfromnifti(
             self.filename
         )
+        if self.invertonload:
+            self.data *= -1.0
         if isaMask:
             if self.filevals is None:
                 self.data[np.where(self.data < 0.5)] = 0.0
@@ -500,7 +516,7 @@ class RapidtideDataset:
         coordinatespace="unspecified",
         offsettime=0.0,
         init_LUT=True,
-        verbose=1,
+        verbose=0,
     ):
         self.verbose = verbose
         self.name = name
@@ -556,6 +572,7 @@ class RapidtideDataset:
                     label=thisregressor[1],
                     starttime=thisregressor[5],
                     isbids=self.bidsformat,
+                    limits=self.regressorsimcalclimits,
                     verbose=self.verbose,
                 )
                 if theregressor.timedata is not None:
@@ -573,6 +590,7 @@ class RapidtideDataset:
                     )
 
     def _loadfuncmaps(self):
+        mapstoinvert = ["varChange"]
         self.loadedfuncmaps = []
         xdim = 0
         ydim = 0
@@ -588,12 +606,17 @@ class RapidtideDataset:
                         " exists - reading...",
                     )
                 thepath, thebase = os.path.split(self.fileroot)
+                if mapname in mapstoinvert:
+                    invertthismap = True
+                else:
+                    invertthismap = False
                 self.overlays[mapname] = Overlay(
                     mapname,
                     self.fileroot + mapfilename + ".nii.gz",
                     thebase,
                     init_LUT=self.init_LUT,
                     report=True,
+                    invertonload=invertthismap,
                     verbose=self.verbose,
                 )
                 if xdim == 0:
@@ -1108,6 +1131,11 @@ class RapidtideDataset:
                 ["lagsigma", "desc-maxwidth_map"],
                 ["MTT", "desc-MTT_map"],
                 ["R2", "desc-lfofilterR2_map"],
+                ["CoV", "desc-CoV_map"],
+                ["confoundR2", "desc-confoundfilterR2_map"],
+                ["varBefore", "desc-lfofilterInbandVarianceBefore_map"],
+                ["varAfter", "desc-lfofilterInbandVarianceAfter_map"],
+                ["varChange", "desc-lfofilterInbandVarianceChange_map"],
                 ["fitNorm", "desc-lfofilterNorm_map"],
                 ["fitcoff", "desc-lfofilterCoeff_map"],
                 ["neglog10p", "desc-neglog10p_map"],
@@ -1200,6 +1228,7 @@ class RapidtideDataset:
                 ["lagmask", "desc-corrfit_mask"],
                 ["refinemask", "desc-refine_mask"],
                 ["meanmask", "desc-globalmean_mask"],
+                ["brainmask", "desc-brainmask_mask"],
                 ["preselectmask", "desc-globalmeanpreselect_mask"],
             ]
             if not ("neglog10p" in self.loadedfuncmaps):

{rapidtide-3.0a9 → rapidtide-3.0a10}/rapidtide/tidepoolTemplate.py

@@ -136,9 +136,6 @@ class Ui_MainWindow(object):
         self.setMask_Button = QtWidgets.QPushButton(self.layoutWidget)
         self.setMask_Button.setObjectName("setMask_Button")
         self.verticalLayout_3.addWidget(self.setMask_Button)
-        self.nextFile_Button = QtWidgets.QPushButton(self.layoutWidget)
-        self.nextFile_Button.setObjectName("nextFile_Button")
-        self.verticalLayout_3.addWidget(self.nextFile_Button)
         spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
         self.verticalLayout_3.addItem(spacerItem1)
         self.transparency_checkBox = QtWidgets.QCheckBox(self.layoutWidget)
@@ -635,7 +632,6 @@ class Ui_MainWindow(object):
         self.resetDispSmart_Button.setText(_translate("MainWindow", "Smart"))
         self.saveDisp_Button.setText(_translate("MainWindow", "Save"))
         self.setMask_Button.setText(_translate("MainWindow", "No mask"))
-        self.nextFile_Button.setText(_translate("MainWindow", "Next file"))
         self.transparency_checkBox.setToolTip(_translate("MainWindow", "With transparency on, map values outside the range limits are not displayed."))
         self.transparency_checkBox.setText(_translate("MainWindow", "Transparency"))
         self.label_2.setText(_translate("MainWindow", "Colormap"))

{rapidtide-3.0a9 → rapidtide-3.0a10}/rapidtide/tidepoolTemplate.ui

@@ -341,13 +341,6 @@
           </property>
          </widget>
         </item>
-        <item>
-         <widget class="QPushButton" name="nextFile_Button">
-          <property name="text">
-           <string>Next file</string>
-          </property>
-         </widget>
-        </item>
         <item>
          <spacer name="verticalSpacer_2">
           <property name="orientation">

{rapidtide-3.0a9 → rapidtide-3.0a10}/rapidtide/tidepoolTemplate_alt.py

@@ -14,14 +14,14 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(1373, 815)
+        MainWindow.resize(1380, 810)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(1)
         sizePolicy.setVerticalStretch(1)
         sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth())
         MainWindow.setSizePolicy(sizePolicy)
-        MainWindow.setMinimumSize(QtCore.QSize(256, 256))
-        MainWindow.setMaximumSize(QtCore.QSize(1400, 16777215))
+        MainWindow.setMinimumSize(QtCore.QSize(1380, 810))
+        MainWindow.setMaximumSize(QtCore.QSize(1380, 810))
         MainWindow.setSizeIncrement(QtCore.QSize(1, 1))
         self.centralwidget = QtWidgets.QWidget(MainWindow)
         self.centralwidget.setObjectName("centralwidget")
@@ -66,9 +66,6 @@ class Ui_MainWindow(object):
         self.setMask_Button = QtWidgets.QPushButton(self.imageData_groupBox)
         self.setMask_Button.setObjectName("setMask_Button")
         self.verticalLayout_3.addWidget(self.setMask_Button)
-        self.nextFile_Button = QtWidgets.QPushButton(self.imageData_groupBox)
-        self.nextFile_Button.setObjectName("nextFile_Button")
-        self.verticalLayout_3.addWidget(self.nextFile_Button)
         self.dispmin_doubleSpinBox = QtWidgets.QDoubleSpinBox(self.imageData_groupBox)
         self.dispmin_doubleSpinBox.setAlignment(QtCore.Qt.Qt::AlignmentFlag::AlignRight|QtCore.Qt.Qt::AlignmentFlag::AlignTrailing|QtCore.Qt.Qt::AlignmentFlag::AlignVCenter)
         self.dispmin_doubleSpinBox.setDecimals(3)
@@ -745,8 +742,6 @@ class Ui_MainWindow(object):
         self.saveDisp_Button.setText(_translate("MainWindow", "Save"))
         self.setMask_Button.setToolTip(_translate("MainWindow", "Right click to select the mask used to display the current map"))
         self.setMask_Button.setText(_translate("MainWindow", "No mask"))
-        self.nextFile_Button.setToolTip(_translate("MainWindow", "Right click to select the mask used to display the current map"))
-        self.nextFile_Button.setText(_translate("MainWindow", "Next file"))
         self.transparency_checkBox.setToolTip(_translate("MainWindow", "With transparency on, map values outside the range limits are not displayed."))
         self.transparency_checkBox.setText(_translate("MainWindow", "Transparency"))
         self.label_2.setText(_translate("MainWindow", "Colormap"))

{rapidtide-3.0a9 → rapidtide-3.0a10}/rapidtide/tidepoolTemplate_alt.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1373</width>
-    <height>815</height>
+    <width>1375</width>
+    <height>805</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -18,14 +18,14 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>256</width>
-    <height>256</height>
+    <width>1375</width>
+    <height>805</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
-    <width>1400</width>
-    <height>16777215</height>
+    <width>1375</width>
+    <height>805</height>
    </size>
   </property>
   <property name="sizeIncrement">
@@ -149,16 +149,6 @@
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QPushButton" name="nextFile_Button">
-           <property name="toolTip">
-            <string>Right click to select the mask used to display the current map</string>
-           </property>
-           <property name="text">
-            <string>Next file</string>
-           </property>
-          </widget>
-         </item>
          <item>
           <widget class="QDoubleSpinBox" name="dispmin_doubleSpinBox">
            <property name="alignment">

{rapidtide-3.0a9 → rapidtide-3.0a10}/rapidtide/tidepoolTemplate_alt_qt6.py

@@ -12,14 +12,14 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(1373, 815)
+        MainWindow.resize(1380, 810)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(1)
         sizePolicy.setVerticalStretch(1)
         sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth())
         MainWindow.setSizePolicy(sizePolicy)
-        MainWindow.setMinimumSize(QtCore.QSize(256, 256))
-        MainWindow.setMaximumSize(QtCore.QSize(1400, 16777215))
+        MainWindow.setMinimumSize(QtCore.QSize(1380, 810))
+        MainWindow.setMaximumSize(QtCore.QSize(1380, 810))
         MainWindow.setSizeIncrement(QtCore.QSize(1, 1))
         self.centralwidget = QtWidgets.QWidget(parent=MainWindow)
         self.centralwidget.setObjectName("centralwidget")
@@ -64,9 +64,6 @@ class Ui_MainWindow(object):
         self.setMask_Button = QtWidgets.QPushButton(parent=self.imageData_groupBox)
         self.setMask_Button.setObjectName("setMask_Button")
         self.verticalLayout_3.addWidget(self.setMask_Button)
-        self.nextFile_Button = QtWidgets.QPushButton(parent=self.imageData_groupBox)
-        self.nextFile_Button.setObjectName("nextFile_Button")
-        self.verticalLayout_3.addWidget(self.nextFile_Button)
         self.dispmin_doubleSpinBox = QtWidgets.QDoubleSpinBox(parent=self.imageData_groupBox)
         self.dispmin_doubleSpinBox.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter)
         self.dispmin_doubleSpinBox.setDecimals(3)
@@ -743,8 +740,6 @@ class Ui_MainWindow(object):
         self.saveDisp_Button.setText(_translate("MainWindow", "Save"))
         self.setMask_Button.setToolTip(_translate("MainWindow", "Right click to select the mask used to display the current map"))
         self.setMask_Button.setText(_translate("MainWindow", "No mask"))
-        self.nextFile_Button.setToolTip(_translate("MainWindow", "Right click to select the mask used to display the current map"))
-        self.nextFile_Button.setText(_translate("MainWindow", "Next file"))
         self.transparency_checkBox.setToolTip(_translate("MainWindow", "With transparency on, map values outside the range limits are not displayed."))
         self.transparency_checkBox.setText(_translate("MainWindow", "Transparency"))
         self.label_2.setText(_translate("MainWindow", "Colormap"))

{rapidtide-3.0a9 → rapidtide-3.0a10}/rapidtide/tidepoolTemplate_big.py

@@ -14,19 +14,19 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(1600, 815)
+        MainWindow.resize(1595, 810)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(1)
         sizePolicy.setVerticalStretch(1)
         sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth())
         MainWindow.setSizePolicy(sizePolicy)
-        MainWindow.setMinimumSize(QtCore.QSize(256, 256))
-        MainWindow.setMaximumSize(QtCore.QSize(1600, 16777215))
+        MainWindow.setMinimumSize(QtCore.QSize(1595, 810))
+        MainWindow.setMaximumSize(QtCore.QSize(1595, 810))
         MainWindow.setSizeIncrement(QtCore.QSize(1, 1))
         self.centralwidget = QtWidgets.QWidget(MainWindow)
         self.centralwidget.setObjectName("centralwidget")
         self.imageData_groupBox = QtWidgets.QGroupBox(self.centralwidget)
-        self.imageData_groupBox.setGeometry(QtCore.QRect(450, 7, 561, 591))
+        self.imageData_groupBox.setGeometry(QtCore.QRect(440, 7, 561, 591))
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Maximum)
         sizePolicy.setHorizontalStretch(1)
         sizePolicy.setVerticalStretch(1)
@@ -66,9 +66,6 @@ class Ui_MainWindow(object):
         self.setMask_Button = QtWidgets.QPushButton(self.imageData_groupBox)
         self.setMask_Button.setObjectName("setMask_Button")
         self.verticalLayout_3.addWidget(self.setMask_Button)
-        self.nextFile_Button = QtWidgets.QPushButton(self.imageData_groupBox)
-        self.nextFile_Button.setObjectName("nextFile_Button")
-        self.verticalLayout_3.addWidget(self.nextFile_Button)
         self.dispmin_doubleSpinBox = QtWidgets.QDoubleSpinBox(self.imageData_groupBox)
         self.dispmin_doubleSpinBox.setAlignment(QtCore.Qt.Qt::AlignmentFlag::AlignRight|QtCore.Qt.Qt::AlignmentFlag::AlignTrailing|QtCore.Qt.Qt::AlignmentFlag::AlignVCenter)
         self.dispmin_doubleSpinBox.setDecimals(3)
@@ -257,7 +254,7 @@ class Ui_MainWindow(object):
         self.main_graphicsView_ax.setObjectName("main_graphicsView_ax")
         self.gridLayout.addWidget(self.main_graphicsView_ax, 1, 1, 1, 1)
         self.overlays_groupBox = QtWidgets.QGroupBox(self.centralwidget)
-        self.overlays_groupBox.setGeometry(QtCore.QRect(20, 7, 421, 591))
+        self.overlays_groupBox.setGeometry(QtCore.QRect(10, 7, 421, 591))
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -640,7 +637,7 @@ class Ui_MainWindow(object):
         self.overlay_radioButton_15.raise_()
         self.overlay_radioButton_16.raise_()
         self.histogram_groupBox = QtWidgets.QGroupBox(self.centralwidget)
-        self.histogram_groupBox.setGeometry(QtCore.QRect(1020, 225, 571, 186))
+        self.histogram_groupBox.setGeometry(QtCore.QRect(1010, 225, 571, 186))
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -663,7 +660,7 @@ class Ui_MainWindow(object):
         self.histogram_graphicsView.setMaximumSize(QtCore.QSize(1000, 1000))
         self.histogram_graphicsView.setObjectName("histogram_graphicsView")
         self.mainimagedata_groupBox = QtWidgets.QGroupBox(self.centralwidget)
-        self.mainimagedata_groupBox.setGeometry(QtCore.QRect(1020, 7, 181, 221))
+        self.mainimagedata_groupBox.setGeometry(QtCore.QRect(1010, 7, 181, 221))
         font = QtGui.QFont()
         font.setFamily("Arial Narrow")
         self.mainimagedata_groupBox.setFont(font)
@@ -752,7 +749,7 @@ class Ui_MainWindow(object):
         self.runMovieButton.setGeometry(QtCore.QRect(20, 160, 151, 32))
         self.runMovieButton.setObjectName("runMovieButton")
         self.regressor_groupBox = QtWidgets.QGroupBox(self.centralwidget)
-        self.regressor_groupBox.setGeometry(QtCore.QRect(20, 595, 1571, 181))
+        self.regressor_groupBox.setGeometry(QtCore.QRect(10, 595, 1571, 181))
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -854,7 +851,7 @@ class Ui_MainWindow(object):
         self.label_12.setAlignment(QtCore.Qt.Qt::AlignmentFlag::AlignCenter)
         self.label_12.setObjectName("label_12")
         self.logOutput_groupBox = QtWidgets.QGroupBox(self.centralwidget)
-        self.logOutput_groupBox.setGeometry(QtCore.QRect(1210, 7, 381, 221))
+        self.logOutput_groupBox.setGeometry(QtCore.QRect(1200, 7, 381, 221))
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -874,7 +871,7 @@ class Ui_MainWindow(object):
         self.logOutput.setFont(font)
         self.logOutput.setObjectName("logOutput")
         self.simfunc_groupBox = QtWidgets.QGroupBox(self.centralwidget)
-        self.simfunc_groupBox.setGeometry(QtCore.QRect(1020, 407, 571, 186))
+        self.simfunc_groupBox.setGeometry(QtCore.QRect(1010, 407, 571, 186))
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -929,8 +926,6 @@ class Ui_MainWindow(object):
         self.saveDisp_Button.setText(_translate("MainWindow", "Save"))
         self.setMask_Button.setToolTip(_translate("MainWindow", "Right click to select the mask used to display the current map"))
         self.setMask_Button.setText(_translate("MainWindow", "No mask"))
-        self.nextFile_Button.setToolTip(_translate("MainWindow", "Right click to select the mask used to display the current map"))
-        self.nextFile_Button.setText(_translate("MainWindow", "Next file"))
         self.transparency_checkBox.setToolTip(_translate("MainWindow", "With transparency on, map values outside the range limits are not displayed."))
         self.transparency_checkBox.setText(_translate("MainWindow", "Transparency"))
         self.label_2.setText(_translate("MainWindow", "Colormap"))

{rapidtide-3.0a9 → rapidtide-3.0a10}/rapidtide/tidepoolTemplate_big.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1600</width>
-    <height>815</height>
+    <width>1595</width>
+    <height>810</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -18,14 +18,14 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>256</width>
-    <height>256</height>
+    <width>1595</width>
+    <height>810</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
-    <width>1600</width>
-    <height>16777215</height>
+    <width>1595</width>
+    <height>810</height>
    </size>
   </property>
   <property name="sizeIncrement">
@@ -41,7 +41,7 @@
    <widget class="QGroupBox" name="imageData_groupBox">
     <property name="geometry">
      <rect>
-      <x>450</x>
+      <x>440</x>
       <y>7</y>
       <width>561</width>
       <height>591</height>
@@ -149,16 +149,6 @@
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QPushButton" name="nextFile_Button">
-           <property name="toolTip">
-            <string>Right click to select the mask used to display the current map</string>
-           </property>
-           <property name="text">
-            <string>Next file</string>
-           </property>
-          </widget>
-         </item>
          <item>
           <widget class="QDoubleSpinBox" name="dispmin_doubleSpinBox">
            <property name="alignment">
@@ -575,7 +565,7 @@
    <widget class="QGroupBox" name="overlays_groupBox">
     <property name="geometry">
      <rect>
-      <x>20</x>
+      <x>10</x>
       <y>7</y>
       <width>421</width>
       <height>591</height>
@@ -1589,7 +1579,7 @@
    <widget class="QGroupBox" name="histogram_groupBox">
     <property name="geometry">
      <rect>
-      <x>1020</x>
+      <x>1010</x>
       <y>225</y>
       <width>571</width>
       <height>186</height>
@@ -1653,7 +1643,7 @@
    <widget class="QGroupBox" name="mainimagedata_groupBox">
     <property name="geometry">
      <rect>
-      <x>1020</x>
+      <x>1010</x>
       <y>7</y>
       <width>181</width>
       <height>221</height>
@@ -1949,7 +1939,7 @@
    <widget class="QGroupBox" name="regressor_groupBox">
     <property name="geometry">
      <rect>
-      <x>20</x>
+      <x>10</x>
       <y>595</y>
       <width>1571</width>
       <height>181</height>
@@ -2219,7 +2209,7 @@
    <widget class="QGroupBox" name="logOutput_groupBox">
     <property name="geometry">
      <rect>
-      <x>1210</x>
+      <x>1200</x>
       <y>7</y>
       <width>381</width>
       <height>221</height>
@@ -2271,7 +2261,7 @@
    <widget class="QGroupBox" name="simfunc_groupBox">
     <property name="geometry">
      <rect>
-      <x>1020</x>
+      <x>1010</x>
       <y>407</y>
       <width>571</width>
       <height>186</height>
@@ -2389,7 +2379,7 @@
   </property>
  </designerdata>
  <buttongroups>
-  <buttongroup name="stats_buttonGroup"/>
   <buttongroup name="colormap_buttonGroup"/>
+  <buttongroup name="stats_buttonGroup"/>
  </buttongroups>
 </ui>

{rapidtide-3.0a9 → rapidtide-3.0a10}/rapidtide/tidepoolTemplate_big_qt6.py

@@ -12,19 +12,19 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(1600, 815)
+        MainWindow.resize(1595, 810)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(1)
         sizePolicy.setVerticalStretch(1)
         sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth())
         MainWindow.setSizePolicy(sizePolicy)
-        MainWindow.setMinimumSize(QtCore.QSize(256, 256))
-        MainWindow.setMaximumSize(QtCore.QSize(1600, 16777215))
+        MainWindow.setMinimumSize(QtCore.QSize(1595, 810))
+        MainWindow.setMaximumSize(QtCore.QSize(1595, 810))
         MainWindow.setSizeIncrement(QtCore.QSize(1, 1))
         self.centralwidget = QtWidgets.QWidget(parent=MainWindow)
         self.centralwidget.setObjectName("centralwidget")
         self.imageData_groupBox = QtWidgets.QGroupBox(parent=self.centralwidget)
-        self.imageData_groupBox.setGeometry(QtCore.QRect(450, 7, 561, 591))
+        self.imageData_groupBox.setGeometry(QtCore.QRect(440, 7, 561, 591))
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Maximum)
         sizePolicy.setHorizontalStretch(1)
         sizePolicy.setVerticalStretch(1)
@@ -64,9 +64,6 @@ class Ui_MainWindow(object):
         self.setMask_Button = QtWidgets.QPushButton(parent=self.imageData_groupBox)
         self.setMask_Button.setObjectName("setMask_Button")
         self.verticalLayout_3.addWidget(self.setMask_Button)
-        self.nextFile_Button = QtWidgets.QPushButton(parent=self.imageData_groupBox)
-        self.nextFile_Button.setObjectName("nextFile_Button")
-        self.verticalLayout_3.addWidget(self.nextFile_Button)
         self.dispmin_doubleSpinBox = QtWidgets.QDoubleSpinBox(parent=self.imageData_groupBox)
         self.dispmin_doubleSpinBox.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter)
         self.dispmin_doubleSpinBox.setDecimals(3)
@@ -255,7 +252,7 @@ class Ui_MainWindow(object):
         self.main_graphicsView_ax.setObjectName("main_graphicsView_ax")
         self.gridLayout.addWidget(self.main_graphicsView_ax, 1, 1, 1, 1)
         self.overlays_groupBox = QtWidgets.QGroupBox(parent=self.centralwidget)
-        self.overlays_groupBox.setGeometry(QtCore.QRect(20, 7, 421, 591))
+        self.overlays_groupBox.setGeometry(QtCore.QRect(10, 7, 421, 591))
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -638,7 +635,7 @@ class Ui_MainWindow(object):
         self.overlay_radioButton_15.raise_()
         self.overlay_radioButton_16.raise_()
         self.histogram_groupBox = QtWidgets.QGroupBox(parent=self.centralwidget)
-        self.histogram_groupBox.setGeometry(QtCore.QRect(1020, 225, 571, 186))
+        self.histogram_groupBox.setGeometry(QtCore.QRect(1010, 225, 571, 186))
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -661,7 +658,7 @@ class Ui_MainWindow(object):
         self.histogram_graphicsView.setMaximumSize(QtCore.QSize(1000, 1000))
         self.histogram_graphicsView.setObjectName("histogram_graphicsView")
         self.mainimagedata_groupBox = QtWidgets.QGroupBox(parent=self.centralwidget)
-        self.mainimagedata_groupBox.setGeometry(QtCore.QRect(1020, 7, 181, 221))
+        self.mainimagedata_groupBox.setGeometry(QtCore.QRect(1010, 7, 181, 221))
         font = QtGui.QFont()
         font.setFamily("Arial Narrow")
         self.mainimagedata_groupBox.setFont(font)
@@ -750,7 +747,7 @@ class Ui_MainWindow(object):
         self.runMovieButton.setGeometry(QtCore.QRect(20, 160, 151, 32))
         self.runMovieButton.setObjectName("runMovieButton")
         self.regressor_groupBox = QtWidgets.QGroupBox(parent=self.centralwidget)
-        self.regressor_groupBox.setGeometry(QtCore.QRect(20, 595, 1571, 181))
+        self.regressor_groupBox.setGeometry(QtCore.QRect(10, 595, 1571, 181))
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -852,7 +849,7 @@ class Ui_MainWindow(object):
         self.label_12.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
         self.label_12.setObjectName("label_12")
         self.logOutput_groupBox = QtWidgets.QGroupBox(parent=self.centralwidget)
-        self.logOutput_groupBox.setGeometry(QtCore.QRect(1210, 7, 381, 221))
+        self.logOutput_groupBox.setGeometry(QtCore.QRect(1200, 7, 381, 221))
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -872,7 +869,7 @@ class Ui_MainWindow(object):
         self.logOutput.setFont(font)
         self.logOutput.setObjectName("logOutput")
         self.simfunc_groupBox = QtWidgets.QGroupBox(parent=self.centralwidget)
-        self.simfunc_groupBox.setGeometry(QtCore.QRect(1020, 407, 571, 186))
+        self.simfunc_groupBox.setGeometry(QtCore.QRect(1010, 407, 571, 186))
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -927,8 +924,6 @@ class Ui_MainWindow(object):
         self.saveDisp_Button.setText(_translate("MainWindow", "Save"))
         self.setMask_Button.setToolTip(_translate("MainWindow", "Right click to select the mask used to display the current map"))
         self.setMask_Button.setText(_translate("MainWindow", "No mask"))
-        self.nextFile_Button.setToolTip(_translate("MainWindow", "Right click to select the mask used to display the current map"))
-        self.nextFile_Button.setText(_translate("MainWindow", "Next file"))
         self.transparency_checkBox.setToolTip(_translate("MainWindow", "With transparency on, map values outside the range limits are not displayed."))
         self.transparency_checkBox.setText(_translate("MainWindow", "Transparency"))
         self.label_2.setText(_translate("MainWindow", "Colormap"))