From 580962c194a652df7242a0f12c7aa457a6018691 Mon Sep 17 00:00:00 2001
From: Ethan Halsall <ethanhalsall11@augustana.edu>
Date: Sun, 30 Jun 2024 13:47:22 -0500
Subject: [PATCH 1/2] fix: set lower and upper bounds for video width

---
 tools/ld-analyse/videoparametersdialog.cpp | 7 +++++++
 tools/ld-analyse/videoparametersdialog.ui  | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/tools/ld-analyse/videoparametersdialog.cpp b/tools/ld-analyse/videoparametersdialog.cpp
index 80a4818be..638a0c669 100644
--- a/tools/ld-analyse/videoparametersdialog.cpp
+++ b/tools/ld-analyse/videoparametersdialog.cpp
@@ -50,8 +50,13 @@ void VideoParametersDialog::setVideoParameters(const LdDecodeMetaData::VideoPara
     // Transfer values to the dialogue
     ui->blackLevelSpinBox->setValue(videoParameters.black16bIre);
     ui->whiteLevelSpinBox->setValue(videoParameters.white16bIre);
+
     ui->activeVideoWidthSpinBox->setValue(videoParameters.activeVideoEnd - videoParameters.activeVideoStart);
     ui->activeVideoStartSpinBox->setValue(videoParameters.activeVideoStart);
+    ui->activeVideoWidthSpinBox->setMaximum(videoParameters.fieldWidth - videoParameters.activeVideoStart);
+    ui->activeVideoStartSpinBox->setMaximum(videoParameters.fieldWidth - 1);
+    ui->activeVideoStartSpinBox->setMinimum(videoParameters.colourBurstEnd);
+
     if (videoParameters.isWidescreen) ui->aspectRatio169RadioButton->setChecked(true);
     else ui->aspectRatio43RadioButton->setChecked(true);
 
@@ -104,6 +109,8 @@ void VideoParametersDialog::on_activeVideoStartSpinBox_valueChanged(int value)
 {
     int adjustAmount = videoParameters.activeVideoStart - value;
     videoParameters.activeVideoStart = value;
+    // prevent the width from going over the actual field width
+    ui->activeVideoWidthSpinBox->setMaximum(videoParameters.fieldWidth - value - 1);
     videoParameters.activeVideoEnd = value + ui->activeVideoWidthSpinBox->value();
     updateDialog();
     emit videoParametersChanged(videoParameters);
diff --git a/tools/ld-analyse/videoparametersdialog.ui b/tools/ld-analyse/videoparametersdialog.ui
index b6501cf87..8c3ccfe06 100644
--- a/tools/ld-analyse/videoparametersdialog.ui
+++ b/tools/ld-analyse/videoparametersdialog.ui
@@ -136,10 +136,10 @@
       <string></string>
      </property>
      <property name="minimum">
-      <number>16</number>
+      <number>0</number>
      </property>
      <property name="maximum">
-      <number>200</number>
+      <number>1134</number>
      </property>
      <property name="singleStep">
       <number>1</number>
@@ -173,7 +173,7 @@
       <number>1</number>
      </property>
      <property name="maximum">
-      <number>1000</number>
+      <number>1135</number>
      </property>
      <property name="singleStep">
       <number>1</number>

From 7a741dd219d28eb5f68a3f5246ccbf588a2f316e Mon Sep 17 00:00:00 2001
From: Ethan Halsall <ethanhalsall11@augustana.edu>
Date: Sun, 30 Jun 2024 12:29:33 -0500
Subject: [PATCH 2/2] fix video parameters tab ordering

---
 tools/ld-analyse/videoparametersdialog.ui | 182 +++++++++++-----------
 1 file changed, 91 insertions(+), 91 deletions(-)

diff --git a/tools/ld-analyse/videoparametersdialog.ui b/tools/ld-analyse/videoparametersdialog.ui
index 8c3ccfe06..fdf738406 100644
--- a/tools/ld-analyse/videoparametersdialog.ui
+++ b/tools/ld-analyse/videoparametersdialog.ui
@@ -20,19 +20,6 @@
    <property name="horizontalSpacing">
     <number>12</number>
    </property>
-   <item row="0" column="2">
-    <widget class="QPushButton" name="blackLevelResetButton">
-     <property name="minimumSize">
-      <size>
-       <width>100</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Reset NTSC</string>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="0">
     <widget class="QLabel" name="blackLevelLabel">
      <property name="text">
@@ -43,8 +30,8 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
-    <widget class="QSpinBox" name="whiteLevelSpinBox">
+   <item row="0" column="1">
+    <widget class="QSpinBox" name="blackLevelSpinBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -60,35 +47,58 @@
      <property name="prefix">
       <string>0x</string>
      </property>
-     <property name="minimum">
-      <number>32768</number>
-     </property>
      <property name="maximum">
-      <number>65535</number>
+      <number>32767</number>
      </property>
      <property name="singleStep">
       <number>256</number>
      </property>
      <property name="value">
-      <number>54016</number>
+      <number>16384</number>
      </property>
      <property name="displayIntegerBase">
       <number>16</number>
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="aspectRatioLabel">
+   <item row="0" column="2">
+    <widget class="QPushButton" name="blackLevelResetButton">
+     <property name="minimumSize">
+      <size>
+       <width>100</width>
+       <height>0</height>
+      </size>
+     </property>
      <property name="text">
-      <string>Display aspect ratio:</string>
+      <string>Reset NTSC</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="3">
+    <widget class="QPushButton" name="blackLevelAltResetButton">
+     <property name="minimumSize">
+      <size>
+       <width>100</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>Reset NTSC-J</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="whiteLevelLabel">
+     <property name="text">
+      <string>White level:</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
-    <widget class="QSpinBox" name="blackLevelSpinBox">
+   <item row="1" column="1">
+    <widget class="QSpinBox" name="whiteLevelSpinBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -104,20 +114,46 @@
      <property name="prefix">
       <string>0x</string>
      </property>
+     <property name="minimum">
+      <number>32768</number>
+     </property>
      <property name="maximum">
-      <number>32767</number>
+      <number>65535</number>
      </property>
      <property name="singleStep">
       <number>256</number>
      </property>
      <property name="value">
-      <number>16384</number>
+      <number>54016</number>
      </property>
      <property name="displayIntegerBase">
       <number>16</number>
      </property>
     </widget>
    </item>
+   <item row="1" column="2">
+    <widget class="QPushButton" name="whiteLevelResetButton">
+     <property name="minimumSize">
+      <size>
+       <width>100</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>Reset</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="activeVideoStartlLabel">
+     <property name="text">
+      <string>Active video start:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
    <item row="2" column="1">
     <widget class="QSpinBox" name="activeVideoStartSpinBox">
      <property name="sizePolicy">
@@ -152,6 +188,29 @@
      </property>
     </widget>
    </item>
+   <item row="2" column="2">
+    <widget class="QPushButton" name="activeVideoStartResetButton">
+     <property name="minimumSize">
+      <size>
+       <width>100</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>Reset</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="activeVideoWidthlLabel">
+     <property name="text">
+      <string>Active video width:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
    <item row="3" column="1">
     <widget class="QSpinBox" name="activeVideoWidthSpinBox">
      <property name="sizePolicy">
@@ -186,65 +245,6 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="2">
-    <widget class="QPushButton" name="whiteLevelResetButton">
-     <property name="minimumSize">
-      <size>
-       <width>100</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Reset</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="3">
-    <widget class="QPushButton" name="blackLevelAltResetButton">
-     <property name="minimumSize">
-      <size>
-       <width>100</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Reset NTSC-J</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="whiteLevelLabel">
-     <property name="text">
-      <string>White level:</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2">
-    <widget class="QPushButton" name="activeVideoStartResetButton">
-     <property name="minimumSize">
-      <size>
-       <width>100</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Reset</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="activeVideoStartlLabel">
-     <property name="text">
-      <string>Active video start:</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
    <item row="3" column="2">
     <widget class="QPushButton" name="activeVideoWidthResetButton">
      <property name="minimumSize">
@@ -258,13 +258,13 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="activeVideoWidthlLabel">
+   <item row="4" column="0">
+    <widget class="QLabel" name="aspectRatioLabel">
      <property name="text">
-      <string>Active video width:</string>
+      <string>Display aspect ratio:</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>