From 83d205c745818cdaca3459ac39073442d8c2058d Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <don@thegagnes.com>
Date: Tue, 27 Jun 2017 13:47:48 -0700
Subject: [PATCH] RTK Indicator updates

---
 qgcresources.qrc                           |  1 +
 src/QmlControls/QGroundControlQmlGlobal.cc |  2 +-
 src/Vehicle/GPSRTKFact.json                |  4 +-
 src/ui/toolbar/GPSRTKIndicator.qml         | 10 +--
 src/ui/toolbar/Images/RTK.svg              | 80 ++++++++++++++++++++++
 5 files changed, 86 insertions(+), 11 deletions(-)
 create mode 100644 src/ui/toolbar/Images/RTK.svg

diff --git a/qgcresources.qrc b/qgcresources.qrc
index 4e2602e2c..4abea6ec7 100644
--- a/qgcresources.qrc
+++ b/qgcresources.qrc
@@ -139,6 +139,7 @@
         <file alias="Gears.svg">src/ui/toolbar/Images/Gears.svg</file>
         <file alias="Analyze.svg">src/ui/toolbar/Images/Analyze.svg</file>
         <file alias="Gps.svg">src/ui/toolbar/Images/Gps.svg</file>
+        <file alias="RTK.svg">src/ui/toolbar/Images/RTK.svg</file>
         <file alias="Hamburger.svg">src/ui/toolbar/Images/Hamburger.svg</file>
         <file alias="Megaphone.svg">src/ui/toolbar/Images/Megaphone.svg</file>
         <file alias="PaperPlane.svg">src/ui/toolbar/Images/PaperPlane.svg</file>
diff --git a/src/QmlControls/QGroundControlQmlGlobal.cc b/src/QmlControls/QGroundControlQmlGlobal.cc
index 3fea67ba4..b4875992b 100644
--- a/src/QmlControls/QGroundControlQmlGlobal.cc
+++ b/src/QmlControls/QGroundControlQmlGlobal.cc
@@ -252,7 +252,7 @@ void QGroundControlQmlGlobal::_onGPSDisconnect()
 void QGroundControlQmlGlobal::_GPSSurveyInStatus(float duration, float accuracyMM, bool valid, bool active)
 {
     _gpsRtkFactGroup.currentDuration()->setRawValue(duration);
-    _gpsRtkFactGroup.currentAccuracy()->setRawValue(accuracyMM);
+    _gpsRtkFactGroup.currentAccuracy()->setRawValue(accuracyMM/1000.0);
     _gpsRtkFactGroup.valid()->setRawValue(valid);
     _gpsRtkFactGroup.active()->setRawValue(active);
 }
diff --git a/src/Vehicle/GPSRTKFact.json b/src/Vehicle/GPSRTKFact.json
index 306781373..12b26709a 100644
--- a/src/Vehicle/GPSRTKFact.json
+++ b/src/Vehicle/GPSRTKFact.json
@@ -8,8 +8,8 @@
     "name":             "currentAccuracy",
     "shortDescription": "Current Accuracy",
     "type":             "double",
-    "decimalPlaces":    0,
-    "units":            "mm"
+    "decimalPlaces":    1,
+    "units":            "m"
 },
 {
     "name":             "currentDuration",
diff --git a/src/ui/toolbar/GPSRTKIndicator.qml b/src/ui/toolbar/GPSRTKIndicator.qml
index 5f8dfc765..faf5f827c 100644
--- a/src/ui/toolbar/GPSRTKIndicator.qml
+++ b/src/ui/toolbar/GPSRTKIndicator.qml
@@ -71,7 +71,7 @@ Item {
                         text: QGroundControl.gpsRtk.valid.value ? qsTr("Accuracy:") : qsTr("Current Accuracy:")
                         }
                     QGCLabel {
-                        text: (QGroundControl.gpsRtk.currentAccuracy.value/1000).toFixed(1) + ' m'
+                        text: QGroundControl.gpsRtk.currentAccuracy.valueString + " " + QGroundControl.appSettingsDistanceUnitsString
                         }
                     QGCLabel { text: qsTr("Satellites:") }
                     QGCLabel { text: QGroundControl.gpsRtk.numSatellites.value }
@@ -91,7 +91,7 @@ Item {
         width:              height
         anchors.top:        parent.top
         anchors.bottom:     parent.bottom
-        source:             "/qmlimages/Gps.svg"
+        source:             "/qmlimages/RTK.svg"
         fillMode:           Image.PreserveAspectFit
         sourceSize.height:  height
         opacity:            1
@@ -109,12 +109,6 @@ Item {
             color:                      qgcPal.buttonText
             text:                       QGroundControl.gpsRtk.numSatellites.value
         }
-
-        QGCLabel {
-            id:         numSatValue
-            color:      qgcPal.buttonText
-            text:       qsTr("RTK")
-        }
     }
     
     MouseArea {
diff --git a/src/ui/toolbar/Images/RTK.svg b/src/ui/toolbar/Images/RTK.svg
new file mode 100644
index 000000000..7cd88967f
--- /dev/null
+++ b/src/ui/toolbar/Images/RTK.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="svg3852" inkscape:version="0.91 r13725" sodipodi:docname="gps.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="72px" height="72px"
+	 viewBox="-250 452 72 72" style="enable-background:new -250 452 72 72;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;}
+	.st1{display:inline;}
+	.st2{fill:none;stroke:#EB008B;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
+	.st3{display:inline;fill:none;stroke:#224A80;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
+	.st4{fill:#FFFFFF;}
+</style>
+<title  id="title4758">GPS</title>
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" id="namedview3929" inkscape:current-layer="svg3852" inkscape:cx="55" inkscape:cy="55" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="480" inkscape:window-width="640" inkscape:zoom="11.136364" objecttolerance="10" pagecolor="#808080" showgrid="false">
+	</sodipodi:namedview>
+<g id="Layer_2" class="st0">
+</g>
+<g id="ex_thick" transform="matrix(-1,0,0,-1,111.82126,108.29692)">
+</g>
+<g id="Layer_2_copy_3" class="st0">
+</g>
+<g id="ex_thin" transform="matrix(-1,0,0,-1,111.82126,108.29692)">
+</g>
+<g id="Layer_2_copy" class="st0">
+</g>
+<g id="em_thick" transform="matrix(-1,0,0,-1,111.82126,108.29692)">
+</g>
+<g id="Layer_2_copy_4" class="st0">
+	<g id="g3861" class="st1">
+		<rect id="rect3863" x="-286.1" y="320.7" class="st2" width="56.3" height="56.3"/>
+		<circle id="circle3865" class="st2" cx="-258" cy="348.8" r="28.2"/>
+	</g>
+	<g id="g3867" class="st1">
+		<rect id="rect3869" x="-221.7" y="320.7" class="st2" width="56.3" height="56.3"/>
+		<circle id="circle3871" class="st2" cx="-193.5" cy="348.8" r="28.2"/>
+	</g>
+	<g id="g3873" class="st1">
+		<rect id="rect3875" x="-158.5" y="320.7" class="st2" width="56.3" height="56.3"/>
+		<circle id="circle3877" class="st2" cx="-130.3" cy="348.8" r="28.2"/>
+	</g>
+</g>
+<g id="Layer_2_copy_2" class="st0">
+	<g id="g3905" class="st1">
+		<rect id="rect3907" x="-286.1" y="425.3" class="st2" width="56.3" height="56.3"/>
+		<circle id="circle3909" class="st2" cx="-258" cy="453.5" r="28.2"/>
+	</g>
+	<g id="g3911" class="st1">
+		<rect id="rect3913" x="-221.7" y="425.3" class="st2" width="56.3" height="56.3"/>
+		<circle id="circle3915" class="st2" cx="-193.5" cy="453.5" r="28.2"/>
+	</g>
+	<g id="g3917" class="st1">
+		<rect id="rect3919" x="-158.5" y="425.3" class="st2" width="56.3" height="56.3"/>
+		<circle id="circle3921" class="st2" cx="-130.3" cy="453.5" r="28.2"/>
+	</g>
+</g>
+<g id="hornet" transform="matrix(-1,0,0,-1,111.82126,108.29692)">
+</g>
+<g id="Layer_2_copy_5" class="st0">
+</g>
+<g id="hornet_THIN" transform="matrix(-1,0,0,-1,111.82126,108.29692)">
+</g>
+<g id="Layer_6" class="st0">
+	<polygon id="polygon3927" class="st3" points="-264.6,453.2 -269.5,453.2 -269.5,494.2 -246.6,494.2 -246.6,453.2 -251.5,453.2 
+		-251.5,446.7 -264.6,446.7 	"/>
+</g>
+<g>
+	<path class="st4" d="M-191.329,453.029h-45.342c-6.367,0-11.529,5.162-11.529,11.529v27.036c0,6.367,5.162,11.529,11.529,11.529
+		h8.873l10.29,17.822c1.559,2.701,5.458,2.701,7.017,0l10.29-17.822h8.873c6.367,0,11.529-5.162,11.529-11.529v-27.036
+		C-179.8,458.191-184.962,453.029-191.329,453.029z M-230.905,487.959l-2.984-5.521c-0.378-0.715-0.715-1.179-1.011-1.392
+		c-0.402-0.279-0.858-0.419-1.368-0.419h-0.493v7.332h-5.607v-18.066h9.304c1.725,0,3.044,0.148,3.956,0.444
+		c0.912,0.295,1.647,0.844,2.206,1.645c0.559,0.8,0.838,1.776,0.838,2.926c0,1.002-0.214,1.866-0.641,2.594
+		c-0.427,0.727-1.015,1.317-1.763,1.768c-0.477,0.288-1.13,0.526-1.961,0.715c0.665,0.222,1.15,0.444,1.453,0.666
+		c0.205,0.148,0.503,0.465,0.893,0.95c0.39,0.486,0.65,0.859,0.782,1.123l2.704,5.234H-230.905z M-207.333,474.355h-5.694v13.605
+		h-5.582v-13.605h-5.693v-4.461h16.969V474.355z M-192.508,487.959l-3.808-7.429l-2.885,3.021v4.408h-5.582v-18.066h5.582v6.827
+		l5.847-6.827h7.424l-6.592,6.82l6.889,11.247H-192.508z"/>
+	<path class="st4" d="M-234.308,473.542h-2.452v3.672h2.354c0.255,0,0.747-0.082,1.479-0.246c0.37-0.075,0.672-0.264,0.906-0.567
+		s0.351-0.653,0.351-1.047c0-0.583-0.185-1.031-0.555-1.343C-232.596,473.698-233.29,473.542-234.308,473.542z"/>
+</g>
+</svg>
-- 
2.22.0