Joinig to video broadcast group on OSX improved

[mardrone] / mardrone / ardrone_desktop.qml

diff --git a/mardrone/ardrone_desktop.qml b/mardrone/ardrone_desktop.qml
index d5bf0b8..8fe14df 100644 (file)
--- a/mardrone/ardrone_desktop.qml
+++ b/mardrone/ardrone_desktop.qml
@@ -92,37 +92,13 @@ Window {
             pitch:drone.dronePitch
             ias:drone.droneSpeed
             alt:drone.droneAltitude/10
+            heading:drone.droneYaw
             indicatorColor:"green"
             skyColor:"#00000000"
             groundColor:"#00000000"
             width:640;height:480;
         }
-        Text {
-            y:100
-            visible:drone.confShowDebug
-            color: "#00FF00"
-            id: droneCtrlValues
-            font.pixelSize:20
-            text: "cmd:pitch=" + drone.pitch.toFixed(2) + " roll= " +  drone.roll.toFixed(2) + " yaw=" + drone.yaw.toFixed(2) + " vv= " + drone.vVelocity.toFixed(2)
-        }
-
-        Text {
-            y:115
-            visible:drone.confShowDebug
-            color: "#00FF00"
-            id: droneNavData
-            font.pixelSize:20
-            text: "pitch=" + Math.round(drone.dronePitch) + " roll= " +  Math.round(drone.droneRoll) + "yaw=" + Math.round(drone.droneYaw) + " alt= " +  Math.round(drone.droneAltitude)
-        }
 
-        Text {
-            y:130
-            visible:drone.confShowDebug
-            color: "#00FF00"
-            id: droneStatus
-            font.pixelSize:20
-            text: drone.decodedStatus
-        }
    /*     Button {
             y:150;x:0
             height: 50
@@ -179,6 +155,45 @@ Window {
                 text:"Elevator"
             }
         }
+        Text {
+           x:0
+              anchors.top:parent.top
+            visible:drone.confShowDebug
+            color: "#00FF00"
+            id: droneCtrlValues
+            font.pixelSize:10
+            text: "cmd:pitch=" + drone.pitch.toFixed(2) + " roll= " +  drone.roll.toFixed(2) + " yaw=" + drone.yaw.toFixed(2) + " vv= " + drone.vVelocity.toFixed(2)
+        }
+
+        Text {
+            x:400
+            anchors.top:parent.top
+            visible:drone.confShowDebug
+            color: "#00FF00"
+            id: droneNavData
+            font.pixelSize:10
+            text: "pitch=" + Math.round(drone.dronePitch) + " roll= " +  Math.round(drone.droneRoll) + "yaw=" + Math.round(drone.droneYaw) + " alt= " +  Math.round(drone.droneAltitude)
+        }
+
+        Text {
+            x:400
+            anchors.bottom:parent.bottom
+            visible:drone.confShowDebug
+            color: "#00FF00"
+            id: droneStatus
+            font.pixelSize:10
+            text: drone.decodedStatus
+        }
+        Text {
+            x:00
+            anchors.bottom:parent.bottom
+            visible:drone.confShowDebug
+       //     visible:droneVideo.recVideo
+            color: "#00FF00"
+            id: droneFrameSeq
+            font.pixelSize:10
+            text: droneVideo.videoFileName+ " "+droneVideo.frameSeq
+        }
 
             JoyStickTouch {
                 id:lj
@@ -232,6 +247,7 @@ Window {
                 pitch:drone.dronePitch
                 ias:drone.droneSpeed
                 alt:drone.droneAltitude/10
+                heading:drone.droneYaw
            //     bezel:"glareshield1.png"
             }
         Grid {