diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml index 7f8270a98..c6cc2fa5f 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml @@ -479,7 +479,7 @@ Item { states: State { name: "fading" when: hide_display_rc !== true - PropertyChanges { target: rc_input_bg; x: Math.floor(scaledBounds.x * sceneItem.width) - (rc_input_bg.width * 0.91); } + PropertyChanges { target: rc_input_bg; x: Math.floor(scaledBounds.x * sceneItem.width) - (rc_input_bg.width * 0.85); } } transitions: Transition { @@ -498,7 +498,7 @@ Item { states: State { name: "fading" when: hide_display_rc !== true - PropertyChanges { target: rc_input_labels; x: Math.floor(scaledBounds.x * sceneItem.width) - (rc_input_bg.width * 0.91); } + PropertyChanges { target: rc_input_labels; x: Math.floor(scaledBounds.x * sceneItem.width) - (rc_input_bg.width * 0.85); } } transitions: Transition { @@ -519,7 +519,7 @@ Item { states: State { name: "fading" when: hide_display_rc !== true - PropertyChanges { target: rc_input_icon; x: Math.floor(scaledBounds.x * sceneItem.width) - (rc_input_bg.width * 0.91); } + PropertyChanges { target: rc_input_icon; x: Math.floor(scaledBounds.x * sceneItem.width) - (rc_input_bg.width * 0.85); } } transitions: Transition { @@ -552,7 +552,7 @@ Item { states: State { name: "fading" when: hide_display_rc !== true - PropertyChanges { target: rc_stick; x: Math.floor(scaledBounds.x * sceneItem.width) - (rc_input_bg.width * 0.91); } + PropertyChanges { target: rc_stick; x: Math.floor(scaledBounds.x * sceneItem.width) - (rc_input_bg.width * 0.85); } } transitions: Transition { diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg index c59921c0a..2fb698ff8 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg @@ -22,6 +22,17 @@ inkscape:export-ydpi="72"> + + + + @@ -139,13 +150,13 @@ id="linearGradient5006-2" xlink:href="#linearGradient4983-7" inkscape:collect="always" - gradientTransform="matrix(1.0909091,0,0,1,-7.2727273,0)" /> + gradientTransform="matrix(1.2653937,0,0,1.1601679,-8.5036667,-73.769595)" /> + + id="rc-input-bg" + transform="matrix(1.1599442,0,0,1.1601679,-0.06770889,-73.769595)"> + d="m -1.8968835,311 c -2.77,0 -5,2.23 -5,5 l 0,140 c 0,2.77 2.23,5 5,5 L 145,461 l 19,0 c 2.77,0 5,-2.23 5,-5 l 0,-30 c 0,-2.77 -2.23,-5 -5,-5 l -14,0 l 0,-105 c 0,-2.77 -2.23,-5 -5,-5 z" + style="fill:#2c2929;fill-opacity:1;stroke:#ffffff;stroke-width:0.86202729;stroke-opacity:1" + sodipodi:nodetypes="sssscsssscsss" /> + style="fill:none;stroke:#ffffff;stroke-width:0.86202729;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + transform="matrix(1.7211673,0,0,1.526957,-84.861643,-237.54055)"> + style="fill:#464646;fill-opacity:1;stroke:#ffffff;stroke-width:0.43179047;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + transform="matrix(0.25,0,0,0.25,114.18623,329.53888)" /> + transform="matrix(-0.625,0,0,-0.625,253.625,715.23272)" /> + width="4.352685" + height="2.0068226" + x="152.5251" + y="442.32941" + rx="0.29050052" + ry="0.32744864" /> + d="m 154.54064,436.85572 l 0,-1.69713 l 5,-3" + style="fill:none;stroke:#ffffff;stroke-width:0.80189669;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none" /> + + d="m 140,385 a 65,65 0 1 1 -130,0 a 65,65 0 1 1 130,0 z" + transform="matrix(1.1599442,0,0,1.1601679,-0.06770889,-73.769595)" /> + width="69.610069" + height="11.599442" + x="-367.09421" + y="81.12838" /> PITCH ROLL + width="69.596649" + height="11.601679" + x="-81.12838" + y="-378.69589" /> @@ -1447,31 +1480,33 @@ sodipodi:cy="385" sodipodi:cx="75" id="path5029" - style="fill:#1e1e1e;fill-opacity:1;stroke:#5555e6;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-rule:nonzero" - sodipodi:type="arc" /> + style="fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:#5555e6;stroke-width:3.44810915;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:type="arc" + transform="matrix(1.1599442,0,0,1.1601679,-0.06770889,-73.769595)" />