diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/SvgElementImage.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/SvgElementImage.qml index 6006380f0..843886877 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: Math.round(sceneSize.width*scaledBounds.width) - sourceSize.height: Math.round(sceneSize.height*scaledBounds.height) + sourceSize.width: sceneSize.width*scaledBounds.width + sourceSize.height: 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 cf3eb69f5..cbf66baa5 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg @@ -27,12 +27,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="8.6236123" - inkscape:cx="635.53212" - inkscape:cy="470.39453" + inkscape:zoom="1.3234375" + inkscape:cx="320" + inkscape:cy="240" inkscape:document-units="px" - inkscape:current-layer="layer48" - showgrid="true" + inkscape:current-layer="layer45" + showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" @@ -42,7 +42,7 @@ inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" - showguides="true" + showguides="false" inkscape:guide-bbox="true" inkscape:object-nodes="false" inkscape:object-paths="true" @@ -1110,7 +1110,8 @@ inkscape:groupmode="layer" id="layer48" inkscape:label="info-bg" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true"> + transform="translate(0,14)"> + transform="translate(0,14)"> + id="battery-volt-text" + transform="translate(0,-2)"> + style="display:inline"> @@ -2081,11 +2082,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx13" - d="m 144,34.7 0,-11.082914" + d="m 144,33.1 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" /> @@ -2093,11 +2094,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx15" - d="m 149,34.7 0,-11.082914" + d="m 149,33.1 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" /> @@ -2105,11 +2106,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx17" - d="m 154,34.7 0,-11.082914" + d="m 154,33.1 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" /> @@ -2117,11 +2118,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx19" - d="m 159,34.7 0,-11.082914" + d="m 159,33.1 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" /> @@ -2129,11 +2130,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx21" - d="m 164,34.7 0,-11.082914" + d="m 164,33.1 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" /> @@ -2141,11 +2142,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx23" - d="m 169,34.7 0,-11.082914" + d="m 169,33.1 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" /> @@ -2153,7 +2154,7 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx25" - d="m 174,34.7 0,-11.082914" + d="m 174,33.1 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" /> @@ -2172,65 +2173,65 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="tx1" - d="M 114,17.5 114,6.417086" + d="M 114,16.6 114,5.517086" 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" /> @@ -2238,11 +2239,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="tx12" - d="m 141.5,17.5 0,-11.082914" + d="m 141.5,16.6 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" /> @@ -2250,11 +2251,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="tx14" - d="m 146.5,17.5 0,-11.082914" + d="m 146.5,16.6 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" /> @@ -2262,11 +2263,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="tx16" - d="m 151.5,17.5 0,-11.082914" + d="m 151.5,16.6 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" /> @@ -2274,11 +2275,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="tx18" - d="m 156.5,17.5 0,-11.082914" + d="m 156.5,16.6 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" /> @@ -2286,11 +2287,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="tx20" - d="m 161.5,17.5 0,-11.082914" + d="m 161.5,16.6 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" /> @@ -2298,11 +2299,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="tx22" - d="m 166.5,17.5 0,-11.082914" + d="m 166.5,16.6 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" /> @@ -2310,11 +2311,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="tx24" - d="m 171.5,17.5 0,-11.082914" + d="m 171.5,16.6 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" /> @@ -2324,8 +2325,7 @@ inkscape:groupmode="layer" id="layer57" inkscape:label="gps" - style="display:inline" - sodipodi:insensitive="true"> + style="display:inline"> + id="gps-mode-text" + transform="translate(0,-2)"> + style="display:none"> + style="display:inline"> + transform="translate(0,-4)" + sodipodi:insensitive="true">