Keep rotation and scale when toggling stabilization

gyroflow · Jun 7, 2022 · c076468 · c076468
1 parent 3c62671
commit c076468
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/ui/VideoArea.qml b/src/ui/VideoArea.qml
@@ -202,6 +202,7 @@ Item {
             height: (w / ratio) > h? h : (w / ratio);
             anchors.centerIn: parent;
             opacity: da.containsDrag? 0.5 : 1.0;
+            clip: !vid.stabEnabled;
 
             /*Image {
                 // Transparency grid
@@ -218,6 +219,19 @@ Item {
                 anchors.fill: parent;
                 property bool loaded: false;
 
+                property bool stabEnabled: true;
+                transform: [
+                    Scale { 
+                        origin.x: vid.width / 2; origin.y: vid.height / 2; 
+                        xScale: vid.stabEnabled? 1 : vid.videoWidth  / Math.max(1, root.outWidth); 
+                        yScale: vid.stabEnabled? 1 : vid.videoHeight / Math.max(1, root.outHeight);
+                    },
+                    Rotation {
+                        origin.x: vid.width / 2; origin.y: vid.height / 2;
+                        angle: vid.stabEnabled? 0 : -vidInfo.videoRotation;
+                    }
+                ]
+
                 function fovChanged() {
                     const fov = controller.get_current_fov();
                     // const ratio = controller.get_scaling_ratio(); // this shouldn't be called every frame because it locks the params mutex
@@ -485,7 +499,7 @@ Item {
                 SmallLinkButton {
                     id: stabEnabledBtn;
                     icon.name: "gyroflow";
-                    onCheckedChanged: { controller.stab_enabled = checked; vid.forceRedraw(); vid.fovChanged(); }
+                    onCheckedChanged: { vid.stabEnabled = checked; controller.stab_enabled = checked; vid.forceRedraw(); vid.fovChanged(); }
                     tooltip: qsTr("Toggle stabilization");
                 }
 

diff --git a/src/ui/menu/Stabilization.qml b/src/ui/menu/Stabilization.qml
@@ -396,6 +396,10 @@ MenuItem {
                 case 1: controller.adaptive_zoom = adaptiveZoom.value; break;
                 case 2: controller.adaptive_zoom = -1.0; break;
             }
+            if (currentIndex == 0) {
+                zoomingCenterX.value = 0;
+                zoomingCenterY.value = 0;
+            }
         }
     }
     Label {