Added whisky compass, other fixes.

README.md

@@ -70,7 +70,8 @@ See installation instructions at https://github.com/vranki/ExtPlane
 * Turn & Bank indicator
 * Toggle switch (normal & 3-way)
 * Attitude Indicator
-* Compass
+* Compass (basic digital)
+* Whisky compass
 * Airspeed indicator
 * Variometer
 * Altimeter

debian/changelog

@@ -1,3 +1,9 @@
+extplane-panel (2.0.2) UNRELEASED; urgency=low
+
+  * 2.0.2, Fixed more dependencies, better instruments, added whisky compass
+
+ -- Ville Ranki <[email protected]>  Thu, 19 Sep 2019 12:34:56 +0300
+
 extplane-panel (2.0.1) UNRELEASED; urgency=low
 
   * 2.0.1, Fixed dependencies

qmlui/AddItemDialog.qml

@@ -77,6 +77,11 @@ Dialog {
             itemName: "CompassBasic"
             description: "Simple digital compass"
         }
+        ListElement {
+            name: "Whisky Compass"
+            itemName: "CompassWhisky"
+            description: "Wet compass used in GA aircraft"
+        }
         ListElement {
             name: "Airspeed indicator"
             itemName: "needle/AirspeedIndicator"

qmlui/panelitems/CompassWhisky.qml

@@ -0,0 +1,61 @@
+import QtQuick 2.0
+import org.vranki.extplane 1.0
+
+PanelItem {
+    id: compass
+    property var labels: ['N', '', '', '3', '', '', '6', '', '', 'E', '', '', '12', '', '', '15', '', '', 'S', '', '', '21', '', '', '24', '', '', 'W', '', '', '30', '', '', '33', '', '']
+    property int tapeWidth: 500
+    property int tapeHeight: 30
+    Component {
+        id: tape
+        Item {
+            id: compassTape
+            width: tapeWidth
+            height: tapeHeight
+            Repeater {
+                model: 36
+                Item {
+                    width: 1
+                    height: tapeHeight
+                    x: tapeWidth - tapeWidth * (index/36)
+                    Rectangle {
+                        color: "white"
+                        width: 2
+                        height: tapeHeight * 0.2
+                        y: tapeHeight - height
+                    }
+                    Text {
+                        text: labels[index]
+                        color: "white"
+                        font.pixelSize: tapeHeight * 0.7
+                        anchors.horizontalCenter: parent.horizontalCenter
+                    }
+                }
+            }
+        }
+    }
+    Rectangle {
+        x: parent.width / 2
+        scale: parent.height / 30
+        Loader {
+            id: primaryTape
+            sourceComponent: tape
+            x: - (360 - hdgRef.value) * (tapeWidth/360)
+        }
+        Loader {
+            sourceComponent: tape
+            x: primaryTape.x + ((hdgRef.value > 180) ? -tapeWidth : tapeWidth)
+        }
+    }
+    Rectangle {
+        color: "white"
+        width: 3
+        height: parent.height
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+    DataRef {
+        id: hdgRef
+        name: "sim/cockpit/misc/compass_indicated"
+        accuracy: 0.5
+    }
+}

qmlui/panelitems/needle/AirspeedIndicator.qml

@@ -62,10 +62,9 @@ PanelItems.PanelItem {
 
         thickBars: true
         showValue: true
-        fontSizeMultiplier: 0.7
+        fontSizeMultiplier: 0.6
         barValue: settings.thickBarValue
         valueMax: Math.round(vneRef.value) || 200
-        Component.onCompleted: console.log("Thick bars", barCount, barAngle, "values", valueMax, barValue)
 
         GaugeArc { // Vne bar
             anchors.fill: parent

qmlui/panelitems/needle/Altimeter.qml

@@ -23,7 +23,7 @@ PanelItems.PanelItem {
     DataRef {
         id: altitudeRef
         name: "sim/flightmodel/misc/h_ind"
-        accuracy: 10
+        accuracy: 3
         scaleFactor: altitudeConverter.scaleFactor
     }
 

qmlui/panelitems/needle/GMeter.qml

@@ -17,7 +17,7 @@ PanelItems.PanelItem {
     CircularGauge {
         id: gauge
         anchors.fill: parent
-        gaugeValue: parseFloat(gRef.value)
+        gaugeValue: parseFloat(gRef.value) || 1
         barValue: 1
         thinBarValue: 0.5
         barsAngleMin: barAngle * valueMin

qmlui/panelitems/needle/Variometer.qml

@@ -47,7 +47,7 @@ PanelItems.PanelItem {
         thickBars: true
         showValue: true
         absValue: true
-        fontSizeMultiplier: 1.3
+        fontSizeMultiplier: 1.2
         barValue: settings.isMs ? 1 : 200
         valueMax: settings.isMs ? 5 : 1000
         valueMin: -valueMax

qmlui/qml.qrc

@@ -59,5 +59,6 @@
         <file>panelitems/decoration/ImageItem.qml</file>
         <file>panelitems/settingsui/FileSelector.qml</file>
         <file>panelitems/settingsui/ColorSelector.qml</file>
+        <file>panelitems/CompassWhisky.qml</file>
     </qresource>
 </RCC>

scripts/ci-build.sh

@@ -36,10 +36,13 @@ echo "Output dir now:"
 ls output
 make clean distclean
 
-echo "Building snap.."
-rm -rf parts prime stage snap
-snapcraft
-cp *.snap output
+
+# Disabled as some deps not available on bionic
+
+#echo "Building snap.."
+#rm -rf parts prime stage snap
+#snapcraft
+#cp *.snap output
 
 # Build for windows..
 ./scripts/cross-compile-win64-from-lin.sh

snapcraft.yaml

@@ -1,5 +1,5 @@
 name: extplane-panel
-version: "2.0.0-git"
+version: "2.0.2-git"
 summary: External networked panel for flight simulators
 description: |
   External networked panel for flight simulators such
@@ -20,6 +20,14 @@ parts:
     - -r
     qt-version: qt5
     after: [desktop-qt5, extplane]
+    stage-packages:
+      - qml-module-qt-labs-settings
+      - qml-module-qtquick-layouts
+      - qml-module-qtquick-window2
+      - qml-module-qtquick2
+      - qml-module-qtquick-dialogs
+      - qml-module-qtquick-controls
+      - qml-module-qtquick-shapes
 
 apps:
   extplane-panel: