improved desktop UI

[mardrone] / mardrone / gauges / EfisPFD.qml

diff --git a/mardrone/gauges/EfisPFD.qml b/mardrone/gauges/EfisPFD.qml
index b45e916..71b7d5c 100644 (file)
--- a/mardrone/gauges/EfisPFD.qml
+++ b/mardrone/gauges/EfisPFD.qml
@@ -10,6 +10,7 @@ Item {
     property real ias
     property real tapeMargin:60
     property color indicatorColor:"white"
+    property bool showHSI:false
     property alias groundColor:horizon.horizonGroundColor
     property alias skyColor:horizon.horizonSkyColor
     property url bezel:""
@@ -19,6 +20,7 @@ Item {
         anchors.fill:parent
         value:roll
         value2:pitch
+        yPosition:showHSI?120:height/2
         color:indicatorColor
         horizonSkyColor:"blue"
         horizonGroundColor:"#ff702010"
@@ -34,8 +36,8 @@ Item {
       color:indicatorColor
       backColor:"#40000000"
       value:ias
-      x:20;y:tapeMargin
-      height:(pfd.height-tapeMargin*2)/pfd.displayScale;width:60
+      x:20;y:tapeMargin*pfd.displayScale
+      height:((showHSI?0.5:0.7)*pfd.height)/pfd.displayScale;width:60
     }
     GaugeLabel {
       id: iasValue
@@ -63,10 +65,11 @@ Item {
       color:indicatorColor
       backColor:"#40000000"
       value:alt
-      x:pfd.width-80;y:tapeMargin
-      height:(pfd.height-tapeMargin*2)/pfd.displayScale;width:60
+      x:pfd.width-80;y:tapeMargin*pfd.displayScale
+      height:((showHSI?0.5:0.7)*pfd.height)/pfd.displayScale;width:60
 
     }
+
     GaugeLabel {
       id: altValue
       displayScale:pfd.displayScale
@@ -82,6 +85,40 @@ Item {
       backColor:"#c0000000"
       name: "alt"
       }
+    GaugeTape {
+      id:compassTape
+      displayScale:pfd.displayScale
+      visible:!showHSI
+      font.pixelSize:20
+      tickIncrement:10
+      tickSpacing:50
+      tickMinor:5
+      gaugeStyle:5
+      color:indicatorColor
+      backColor:"#40000000"
+      value:alt
+//      x:90;
+      anchors.horizontalCenter: parent.horizontalCenter
+      y:tapeMargin/2-10
+      width:(pfd.width-tapeMargin*2-50)*pfd.displayScale;height:60
+    }
+    GaugeHSI {
+        id:hsi
+//        displayScale:pfd.displayScale
+//        displayScale:0.9
+        visible:showHSI
+        font.pixelSize:10
+        tickIncrement:30
+        tickMinor:5
+        color:indicatorColor
+        backColor:"#40000000"
+        value:alt
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.bottom:parent.bottom
+        anchors.bottomMargin: 20
+        width:(pfd.width/2.8);height:(pfd.width/2.8)
+    }
+
     BorderImage {
         id:bezelImg
         anchors.fill:parent