Merge branch 'happycube:main' into vhs_decode

oyvindln · Feb 7, 2025 · 7b47bcf · 7b47bcf
2 parents 56ca756 + 4201a56
commit 7b47bcf
Show file tree

Hide file tree

Showing 8 changed files with 880 additions and 277 deletions.
diff --git a/tools/ld-analyse/mainwindow.cpp b/tools/ld-analyse/mainwindow.cpp
diff --git a/tools/ld-analyse/mainwindow.h b/tools/ld-analyse/mainwindow.h
@@ -88,18 +88,20 @@ private slots:
     // Media control frame handlers
     void on_previousPushButton_clicked();
     void on_nextPushButton_clicked();
-    void on_endFramePushButton_clicked();
-    void on_startFramePushButton_clicked();
-    void on_frameNumberSpinBox_editingFinished();
-    void on_frameHorizontalSlider_valueChanged(int value);
+    void on_endPushButton_clicked();
+    void on_startPushButton_clicked();
+    void on_posNumberSpinBox_editingFinished();
+    void on_posHorizontalSlider_valueChanged(int value);
     void on_videoPushButton_clicked();
     void on_aspectPushButton_clicked();
     void on_dropoutsPushButton_clicked();
     void on_sourcesPushButton_clicked();
+    void on_viewPushButton_clicked();
     void on_fieldOrderPushButton_clicked();
     void on_zoomInPushButton_clicked();
     void on_zoomOutPushButton_clicked();
     void on_originalSizePushButton_clicked();
+    void on_stretchFieldButton_clicked();
     void on_mouseModePushButton_clicked();
 
     // Miscellaneous handlers
@@ -142,24 +144,29 @@ private slots:
     bool displayAspectRatio;
     qint32 lastScopeLine;
     qint32 lastScopeDot;
-    qint32 currentFrameNumber;
+    qint32 currentFieldNumber, currentFrameNumber;
     double scaleFactor;
     QPalette buttonPalette;
     QString lastFilename;
 
     // Update GUI methods
     void setGuiEnabled(bool enabled);
+    void resetGui();
     void updateGuiLoaded();
     void updateGuiUnloaded();
     void updateAspectPushButton();
     void updateSourcesPushButton();
-
-    // Frame display methods
-    void showFrame();
-    void updateFrame();
+    void setViewValues();
+    void setCurrentFrame(qint32 frame);
+    void setCurrentField(qint32 field);
+    void sanitizeCurrentPosition();
+
+    // Image display methods
+    void showImage();
+    void updateImage();
     qint32 getAspectAdjustment();
-    void updateFrameViewer();
-    void hideFrame();
+    void updateImageViewer();
+    void hideImage();
 
     // TBC source signal handlers
     void loadTbcFile(QString inputFileName);

diff --git a/tools/ld-analyse/mainwindow.ui b/tools/ld-analyse/mainwindow.ui
@@ -58,7 +58,7 @@
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
-           <widget class="QLabel" name="frameViewerLabel">
+           <widget class="QLabel" name="imageViewerLabel">
             <property name="text">
              <string>Image goes here</string>
             </property>
@@ -87,7 +87,7 @@
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_3">
          <item>
-          <widget class="QSlider" name="frameHorizontalSlider">
+          <widget class="QSlider" name="posHorizontalSlider">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
@@ -96,14 +96,20 @@
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_3">
            <item>
-            <widget class="QLabel" name="label_17">
+            <widget class="QLabel" name="posNumberSpinBoxLabel">
+             <property name="minimumSize">
+              <size>
+               <width>60</width>
+               <height>0</height>
+              </size>
+             </property>
              <property name="text">
               <string>Frame #:</string>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QSpinBox" name="frameNumberSpinBox">
+            <widget class="QSpinBox" name="posNumberSpinBox">
              <property name="toolTip">
               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter a frame number and press &amp;lt;Enter&amp;gt; to go to a frame&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
@@ -113,10 +119,16 @@
              <property name="value">
               <number>79999</number>
              </property>
+             <property name="maximumSize">
+              <size>
+               <width>120</width>
+               <height>50</height>
+              </size>
+             </property>
             </widget>
            </item>
            <item>
-            <widget class="QPushButton" name="startFramePushButton">
+            <widget class="QPushButton" name="startPushButton">
              <property name="minimumSize">
               <size>
                <width>30</width>
@@ -194,7 +206,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QPushButton" name="endFramePushButton">
+            <widget class="QPushButton" name="endPushButton">
              <property name="minimumSize">
               <size>
                <width>30</width>
@@ -313,6 +325,22 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QPushButton" name="stretchFieldButton">
+             <property name="minimumSize">
+              <size>
+               <width>30</width>
+               <height>30</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stretch field to frame height&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="text">
+              <string>2:1</string>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QPushButton" name="mouseModePushButton">
              <property name="minimumSize">
@@ -419,6 +447,22 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QPushButton" name="viewPushButton">
+             <property name="minimumSize">
+              <size>
+               <width>100</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Toggle views&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="text">
+              <string>Field View</string>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QPushButton" name="fieldOrderPushButton">
              <property name="minimumSize">