From 6a9f588082133523b01f0ff2866456864a3efa2c Mon Sep 17 00:00:00 2001
From: Laurent Lalanne <f5soh>
Date: Mon, 26 May 2014 16:56:18 +0200
Subject: [PATCH] OP-1354 Updates battery values : Fixes blinking pfd

---
 .../share/openpilotgcs/pfd/default/Info.qml   | 58 +++++++------------
 1 file changed, 20 insertions(+), 38 deletions(-)

diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml
index d822ba276..6494eb0d8 100644
--- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml
+++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml
@@ -77,72 +77,52 @@ Item {
             visible: rxNumberBar.rxRateNumber >= minRxRateNumber
         }
     }
-    Item {
-        id: battery_voltage
 
-        property variant scaledBounds: svgRenderer.scaledElementBounds("pfd.svg", "battery-volt-text")
-
-        x: scaledBounds.x * sceneItem.width
-        y: scaledBounds.y * sceneItem.height
-        width: scaledBounds.width * sceneItem.width
-        height: scaledBounds.height * sceneItem.height
+    SvgElementPositionItem {
+        sceneSize: info.sceneSize
+        elementName: "battery-volt-text"
         visible: FlightBatteryState.Voltage > 0
 
         Text {
-            id: battery_volt
-            text:  FlightBatteryState.Voltage.toFixed(2)
+            text: FlightBatteryState.Voltage.toFixed(2)
+            anchors.centerIn: parent
             color: "white"
             font {
                 family: "Arial"
-                pixelSize: parent.height * 1.2
+                pixelSize: parent.height * 1.3
             }
-            anchors.centerIn: parent
         }
     }
 
-   Item {
-        id: battery_current
-
-        property variant scaledBounds: svgRenderer.scaledElementBounds("pfd.svg", "battery-amp-text")
-
-        x: scaledBounds.x * sceneItem.width
-        y: scaledBounds.y * sceneItem.height
-        width: scaledBounds.width * sceneItem.width
-        height: scaledBounds.height * sceneItem.height
+    SvgElementPositionItem {
+        sceneSize: info.sceneSize
+        elementName: "battery-amp-text"
         visible: FlightBatteryState.Current > 0
 
         Text {
-            id: battery_cur
-            text:  FlightBatteryState.Current.toFixed(2)
+            text: FlightBatteryState.Current.toFixed(2)
+            anchors.centerIn: parent
             color: "white"
             font {
                 family: "Arial"
-                pixelSize: parent.height * 1.2
+                pixelSize: parent.height * 1.3
             }
-            anchors.centerIn: parent
         }
     }
 
-   Item {
-        id: battery_consumed_energy
-
-        property variant scaledBounds: svgRenderer.scaledElementBounds("pfd.svg", "battery-milliamp-text")
-
-        x: scaledBounds.x * sceneItem.width
-        y: scaledBounds.y * sceneItem.height
-        width: scaledBounds.width * sceneItem.width
-        height: scaledBounds.height * sceneItem.height
+    SvgElementPositionItem {
+        sceneSize: info.sceneSize
+        elementName: "battery-milliamp-text"
         visible: FlightBatteryState.ConsumedEnergy > 0
 
         Text {
-            id: battery_conso
-            text:  FlightBatteryState.ConsumedEnergy.toFixed()
+            text: FlightBatteryState.ConsumedEnergy.toFixed()
+            anchors.centerIn: parent
             color: "white"
             font {
                 family: "Arial"
-                pixelSize: parent.height * 1.2
+                pixelSize: parent.height * 1.3
             }
-            anchors.centerIn: parent
         }
     }
 
@@ -160,6 +140,8 @@ Item {
         }
     }
 
+
+
     SvgElementImage {
         id: mask_ThrottleBar
         elementName: "throttle-mask"