diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Pfd.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Pfd.qml index d4cf6f916..22dd39fc9 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Pfd.qml +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Pfd.qml @@ -47,9 +47,17 @@ Rectangle { anchors.centerIn: parent } + SvgElementImage { + id: side_slip_fixed + elementName: "sideslip-fixed" + sceneSize: sceneItem.viewportSize + + x: scaledBounds.x * sceneItem.width + } + SvgElementImage { id: side_slip - elementName: "sideslip" + elementName: "sideslip-moving" sceneSize: sceneItem.viewportSize smooth: true @@ -65,7 +73,7 @@ Rectangle { anchors.horizontalCenter: foreground.horizontalCenter //0.5 coefficient is empirical to limit indicator movement - anchors.horizontalCenterOffset: -sideSlip*width*0.5 + anchors.horizontalCenterOffset: sideSlip*width*0.1 //was 0.5 y: scaledBounds.y * sceneItem.height } diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/RollScale.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/RollScale.qml index 76482164d..daa1ea926 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/RollScale.qml +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/RollScale.qml @@ -25,4 +25,5 @@ Item { origin.x : rollscale.width/2 } } + } diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg index cbf66baa5..f8f6073eb 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg @@ -27,11 +27,11 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.3234375" + inkscape:zoom="1.1546875" inkscape:cx="320" inkscape:cy="240" inkscape:document-units="px" - inkscape:current-layer="layer45" + inkscape:current-layer="svg2" showgrid="false" fit-margin-top="0" fit-margin-left="0" @@ -1110,48 +1110,47 @@ inkscape:groupmode="layer" id="layer48" inkscape:label="info-bg" - style="display:inline" - sodipodi:insensitive="true"> + style="display:inline"> + inkscape:label="#g4460"> + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;display:inline" /> + d="M 180,54 180,0" + style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="M 460,54 460,0" + style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="m -0.5,18 180,0" + style="fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="gps-label" + transform="translate(0,-2.01148)"> + transform="translate(0,16.988519)"> + id="telemetry-tx-label" + transform="translate(0,-2.08992)"> + id="telemetry-rx-label" + transform="translate(0,-1.08992)"> @@ -1235,20 +1236,21 @@ style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none" id="rect3814" width="89" - height="16" + height="17" x="551" - y="21.234089" /> + y="18" /> + id="throttle-label" + transform="translate(0,-2.203204)"> + transform="translate(-2,-1.08992)"> + d="m 550,35.5 90,0" + style="fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + transform="translate(-5.79738,-1.08992)"> + id="battery-volt-label" + transform="translate(0,-1.08992)"> @@ -1456,7 +1459,8 @@ inkscape:groupmode="layer" id="layer66" inkscape:label="battery-milliamp-text" - sodipodi:insensitive="true"> + sodipodi:insensitive="true" + transform="translate(0,1.768481)"> + sodipodi:insensitive="true" + transform="translate(0,0.768478)"> + sodipodi:insensitive="true" + transform="translate(0,-1.231522)"> - + style="display:inline"> + + sodipodi:insensitive="true" + transform="translate(0,0.863767)"> + @@ -2408,7 +2423,8 @@ id="layer52" inkscape:label="gps-mode-text" style="display:inline" - sodipodi:insensitive="true"> + sodipodi:insensitive="true" + transform="translate(0,-0.972157)"> + transform="translate(0,-4)"> + + + + style="display:inline"> - - -