diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml index 0907cc49c..d822ba276 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml @@ -86,7 +86,7 @@ Item { y: scaledBounds.y * sceneItem.height width: scaledBounds.width * sceneItem.width height: scaledBounds.height * sceneItem.height - //visible: FlightBatteryState.Voltage > 0 + visible: FlightBatteryState.Voltage > 0 Text { id: battery_volt @@ -109,7 +109,7 @@ Item { y: scaledBounds.y * sceneItem.height width: scaledBounds.width * sceneItem.width height: scaledBounds.height * sceneItem.height - //visible: FlightBatteryState.Current > 0 + visible: FlightBatteryState.Current > 0 Text { id: battery_cur @@ -132,7 +132,7 @@ Item { y: scaledBounds.y * sceneItem.height width: scaledBounds.width * sceneItem.width height: scaledBounds.height * sceneItem.height - //visible: FlightBatteryState.ConsumedEnergy > 0 + visible: FlightBatteryState.ConsumedEnergy > 0 Text { id: battery_conso @@ -165,4 +165,22 @@ Item { elementName: "throttle-mask" sceneSize: info.sceneSize } + + SvgElementImage { + id: mask_SatBar + elementName: "satbar-mask" + sceneSize: info.sceneSize + } + + SvgElementImage { + id: mask_telemetryTx + elementName: "tx-mask" + sceneSize: info.sceneSize + } + + SvgElementImage { + id: mask_telemetryRx + elementName: "rx-mask" + sceneSize: info.sceneSize + } } diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Pfd.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Pfd.qml index 22dd39fc9..cca29f743 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Pfd.qml +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Pfd.qml @@ -97,11 +97,6 @@ Rectangle { sceneSize: sceneItem.viewportSize } -// PfdIndicators { -// anchors.fill: parent -// sceneSize: sceneItem.viewportSize -// } - Info { anchors.fill: parent sceneSize: sceneItem.viewportSize diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/SvgElementImage.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/SvgElementImage.qml index 843886877..6006380f0 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/SvgElementImage.qml +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/SvgElementImage.qml @@ -14,8 +14,8 @@ Image { property int border: 0 property variant scaledBounds: svgRenderer.scaledElementBounds(svgFileName, elementName) - sourceSize.width: sceneSize.width*scaledBounds.width - sourceSize.height: sceneSize.height*scaledBounds.height + sourceSize.width: Math.round(sceneSize.width*scaledBounds.width) + sourceSize.height: Math.round(sceneSize.height*scaledBounds.height) x: Math.floor(scaledBounds.x * sceneSize.width) y: Math.floor(scaledBounds.y * sceneSize.height) diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg index 3644e444b..41393e206 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg @@ -7,6 +7,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="640" @@ -14,12 +15,54 @@ id="svg2" version="1.1" inkscape:version="0.48.4 r9939" - sodipodi:docname="pfd.svg" + sodipodi:docname="pfd.svg.2014_05_25_21_18_35.0.svg" inkscape:export-filename="/Users/muralha/Desktop/new PFD ideas/pfd/test2.png" inkscape:export-xdpi="72" inkscape:export-ydpi="72"> + id="defs4"> + + + + + + + + + + + + + + inkscape:snap-global="true"> image/svg+xml - + @@ -1106,18 +1149,22 @@ id="layer3" inkscape:label="info" style="display:inline" - transform="translate(0,-4)" - sodipodi:insensitive="true"> + transform="translate(0,-4)"> + transform="translate(0,4)"> + + transform="translate(-2,-4)"> + d="m 632.45877,52 0,-5.832 0.71607,0 0,2.092518 c 0.33416,-0.387204 0.75585,-0.580808 1.26506,-0.580813 0.31294,5e-6 0.58479,0.06233 0.81552,0.186974 0.23073,0.122002 0.39516,0.291737 0.4933,0.509206 0.10077,0.217477 0.15116,0.533079 0.15117,0.946805 l 0,2.67731 -0.71607,0 0,-2.67731 c -10e-6,-0.358032 -0.0782,-0.617939 -0.23472,-0.779721 -0.15382,-0.164428 -0.37262,-0.246643 -0.65639,-0.246647 -0.21218,4e-6 -0.41241,0.0557 -0.60071,0.167083 -0.18565,0.10874 -0.31825,0.257259 -0.39782,0.445555 -0.0796,0.188304 -0.11934,0.44821 -0.11934,0.779722 l 0,2.311318 -0.71607,0" + id="path4645" + inkscape:connector-curvature="0" /> + + style="display:inline"> + style="display:inline"> + style="display:inline"> + style="display:inline"> + style="display:inline"> @@ -2102,11 +2148,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx13" - d="m 144,36.095328 0,-11.082914" + d="m 144,36.5 0,-11.082914" style="fill:none;stroke:#008000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> @@ -2114,11 +2160,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx15" - d="m 149,36.095328 0,-11.082914" + d="m 149,36.5 0,-11.082914" style="fill:none;stroke:#ff8000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> @@ -2126,11 +2172,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx17" - d="m 154,36.095328 0,-11.082914" + d="m 154,36.5 0,-11.082914" style="fill:none;stroke:#ff8000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> @@ -2138,11 +2184,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx19" - d="m 159,36.095328 0,-11.082914" + d="m 159,36.5 0,-11.082914" style="fill:none;stroke:#ff8000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> @@ -2150,11 +2196,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx21" - d="m 164,36.095328 0,-11.082914" + d="m 164,36.5 0,-11.082914" style="fill:none;stroke:#ff8000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> @@ -2162,11 +2208,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx23" - d="m 169,36.095328 0,-11.082914" + d="m 169,36.5 0,-11.082914" style="fill:none;stroke:#ff1400;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> @@ -2174,15 +2220,14 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx25" - d="m 174,36.095328 0,-11.082914" + d="m 174,36.5 0,-11.082914" style="fill:none;stroke:#ff1400;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + style="display:inline"> @@ -2455,6 +2500,46 @@ + + + + + + + + + -