sync

[mardrone] / mardrone / ardrone_desktop.qml

diff --git a/mardrone/ardrone_desktop.qml b/mardrone/ardrone_desktop.qml
index ce4f799..407d5b9 100644 (file)
--- a/mardrone/ardrone_desktop.qml
+++ b/mardrone/ardrone_desktop.qml
@@ -2,7 +2,7 @@
 import Drone 1.0
 import QtQuick 1.0
 import QtDesktop 0.1
-//import gauges 1.0
+import Gauges 1.0
 import JoyStick 1.0
 
 Window {
@@ -68,7 +68,7 @@ Window {
         DroneVideo {
             id:droneVideo
             y:0
-                anchors.horizontalCenter: parent
+         //       anchors.horizontalCenter: parent.horizontalCenter
          //   anchors.horizontalCenter:parent.horizontalCenter
             width:drone.confFullScreen? parent.width:640 ;height:width<=640 ?480*width/640:480;
         }
@@ -76,7 +76,7 @@ Window {
         EfisPFD {
             id:hudPDF
             y:0
-            anchors.horizontalCenter: parent
+   //         anchors.horizontalCenter: parent.horizontalCenter
             visible:drone.confShowHorizon
             roll:drone.droneRoll
             pitch:drone.dronePitch
@@ -203,8 +203,9 @@ Window {
 
             EfisPFD {
                 id:pDF
-                width:320
-                height:240
+                width:300
+                height:320
+                showHSI:true
                 roll:drone.droneRoll
                 pitch:drone.dronePitch
                 ias:drone.droneSpeed
@@ -212,31 +213,66 @@ Window {
            //     bezel:"glareshield1.png"
             }
         Grid {
-            columns: 4
+            columns: 3
 
 
         AltGauge {
-            width:150
-            height:150
+            width:120
+            height:120
             id:altGauge
             value:drone.droneAltitude/10
             bezel:"bezel.png"
         }
         AttitudeGauge {
-            width:150
-            height:150
+            width:120
+            height:120
             id:attGauge
             roll:drone.droneRoll
             pitch:drone.dronePitch
             bezel:"bezel.png"
         }
         HeadingGauge {
-            width:150
-            height:150
+            width:120
+            height:120
             id:hdgGauge
             value:drone.droneYaw
             bezel:"bezel.png"
         }
+        GaugeArc {
+            width:120
+            height:120
+            id:fuelGauge
+            anchors.margins:10
+            displayScale:0.85
+            font.pixelSize:10
+            tickIncrement:10
+            tickSpacing:20
+            tickMinor:5
+            lowPosition:220
+            highPosition:120
+            low:0
+            high:100
+            gaugeStyle:2
+            color:"white"
+            value:drone.droneVBat
+            lineWidth:2
+            backColor:"black"
+        }
+        GaugeHSI{
+            anchors.margins:10
+            displayScale:0.7
+            width:120
+            height:120
+            font.pixelSize:10
+            tickIncrement:30
+            tickSpacing:10
+            tickMinor:5
+            gaugeStyle:2
+            color:"white"
+            backColor:"black"
+            id:hsi
+        }
+
         Row {
             spacing: 5
             anchors.rightMargin: 10