diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Warnings.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Warnings.qml index 9144e66ff..70b177b1e 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Warnings.qml +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Warnings.qml @@ -96,7 +96,7 @@ Item { text: ["DISARMED","ARMING","ARMED"][FlightStatus.Armed] font { family: "Arial" - pixelSize: Math.floor(parent.height * 0.8) + pixelSize: Math.floor(parent.height * 0.74) weight: Font.DemiBold } } @@ -121,7 +121,7 @@ Item { text: "RC INPUT" font { family: "Arial" - pixelSize: Math.floor(parent.height * 0.8) + pixelSize: Math.floor(parent.height * 0.74) weight: Font.DemiBold } } @@ -152,7 +152,7 @@ Item { text: "MASTER CAUTION" font { family: "Arial" - pixelSize: Math.floor(parent.height * 0.8) + pixelSize: Math.floor(parent.height * 0.74) weight: Font.DemiBold } } @@ -177,7 +177,7 @@ Item { text: "AUTOPILOT" font { family: "Arial" - pixelSize: Math.floor(parent.height * 0.8) + pixelSize: Math.floor(parent.height * 0.74) weight: Font.DemiBold } } @@ -203,7 +203,7 @@ Item { "POS VLOS", "POS VNSEW", "RTB", "LAND", "PATHPLAN", "POI", "AUTOCRUISE"][FlightStatus.FlightMode] font { family: "Arial" - pixelSize: Math.floor(parent.height * 0.8) + pixelSize: Math.floor(parent.height * 0.74) weight: Font.DemiBold } } @@ -232,7 +232,7 @@ Item { "ALT HOLD", "ALT VARIO", "CRUISECTRL", "AUTO"][thrust_mode.toString()] font { family: "Arial" - pixelSize: Math.floor(parent.height * 0.8) + pixelSize: Math.floor(parent.height * 0.74) weight: Font.DemiBold } } @@ -247,14 +247,6 @@ Item { visible: SystemAlarms.Alarm_GPS > 1 } - SvgElementImage { - id: warning_telemetry - elementName: "warning-telemetry" - sceneSize: warnings.sceneSize - - visible: SystemAlarms.Alarm_Telemetry > 1 - } - SvgElementImage { id: warning_attitude elementName: "warning-attitude" diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg index 03ec7c74b..7afaa1861 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg @@ -199,11 +199,11 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.8284271" - inkscape:cx="191.50345" - inkscape:cy="391.04965" + inkscape:zoom="1" + inkscape:cx="485.36821" + inkscape:cy="163.50228" inkscape:document-units="px" - inkscape:current-layer="layer75" + inkscape:current-layer="g3935" showgrid="true" fit-margin-top="0" fit-margin-left="0" @@ -216,12 +216,12 @@ inkscape:window-maximized="1" showguides="true" inkscape:guide-bbox="true" - inkscape:object-nodes="true" - inkscape:object-paths="true" + inkscape:object-nodes="false" + inkscape:object-paths="false" inkscape:snap-bbox="true" inkscape:bbox-nodes="false" - inkscape:snap-bbox-midpoints="false" - inkscape:snap-grids="true" + inkscape:snap-bbox-midpoints="true" + inkscape:snap-grids="false" inkscape:snap-to-guides="false" inkscape:snap-nodes="true" inkscape:bbox-paths="false" @@ -312,8 +312,7 @@ inkscape:groupmode="layer" id="layer69" inkscape:label="foreground_layer" - style="display:inline" - sodipodi:insensitive="true"> + style="display:inline"> + style="display:inline"> + style="display:inline"> + id="g8289" + transform="translate(0,-2)"> @@ -1395,9 +1393,10 @@ + id="rc-input-labels" + transform="translate(0,-2)"> + style="display:inline"> @@ -1523,12 +1521,11 @@ inkscape:groupmode="layer" id="layer87" inkscape:label="rc-stick" - style="display:inline" - sodipodi:insensitive="true"> + style="display:inline"> + transform="matrix(1.1599442,0,0,1.1601679,-0.06770889,-75.769595)"> @@ -1571,17 +1567,15 @@ inkscape:groupmode="layer" id="layer84" inkscape:label="battery-panel" - style="display:inline" - sodipodi:insensitive="true"> + style="display:inline"> + style="display:inline"> + inkscape:label="battery-labels"> + id="battery-labels" + transform="translate(0,-2)"> + inkscape:label="battery-panel-mousearea"> @@ -1726,11 +1719,10 @@ inkscape:groupmode="layer" id="layer91" inkscape:label="battery-text" - style="display:inline" - sodipodi:insensitive="true"> + style="display:inline"> + transform="matrix(0.95,0,0,0.95,-1.4,17.75)"> + transform="matrix(0.95,0,0,0.95,-1.4,13.75)"> + transform="matrix(0.95,0,0,0.95,-1.4,9.75)"> @@ -2964,12 +2956,12 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path6065" - d="m 241.40244,372.02206 -8.50092,0" + d="m 241.40244,372.02206 l -8.50092,0" style="fill:none;stroke:#ffffff;stroke-width:1.69943166;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" /> @@ -3028,11 +3020,11 @@ inkscape:transform-center-y="-85.40481" inkscape:connector-curvature="0" id="path4980" - d="m 319.99877,294.64611 0.16778,9.61226" + d="m 319.99877,294.64611 l 0.16778,9.61226" style="fill:none;stroke:#ffffff;stroke-width:1.69943166;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" /> @@ -3798,12 +3790,12 @@ id="compass330" inkscape:label="#compass330"> @@ -3816,12 +3808,12 @@ id="compass300" inkscape:label="#compass300"> @@ -3833,7 +3825,7 @@ id="compass270" inkscape:label="#compass270"> @@ -3846,12 +3838,12 @@ id="compass240" inkscape:label="#compass240"> @@ -3864,12 +3856,12 @@ id="compass210" inkscape:label="#compass210"> @@ -3881,7 +3873,7 @@ id="compass180" inkscape:label="#compass180"> @@ -3893,12 +3885,12 @@ style="font-size:33.9886322px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans" id="compass150"> @@ -3911,12 +3903,12 @@ id="compass120" inkscape:label="#compass120"> @@ -3928,7 +3920,7 @@ id="compass90" inkscape:label="#compass90"> @@ -3940,7 +3932,7 @@ style="font-size:33.9886322px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans" id="compass60"> @@ -3953,7 +3945,7 @@ id="compass30" inkscape:label="#compass-30"> @@ -3973,7 +3965,7 @@ inkscape:label="#g4651"> @@ -4001,11 +3993,11 @@ sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" id="path5472" - d="m 319.99619,305.5318 -8.52371,8.73614 6.87739,-0.0531 -4.3e-4,27.16436 3.29307,0 0,-27.16436 6.85084,0.0531 z" + d="m 319.99619,305.5318 l -8.52371,8.73614 l 6.87739,-0.0531 l -4.3e-4,27.16436 l 3.29307,0 l 0,-27.16436 l 6.85084,0.0531 z" style="fill:#bf00bf;fill-opacity:1;stroke:none" /> @@ -4022,17 +4014,17 @@ id="compass-text" transform="translate(0,78)"> @@ -4051,13 +4043,13 @@ inkscape:transform-center-y="-72.71875" inkscape:connector-curvature="0" id="path4626" - d="m 320,372.78125 -3.78125,4.5 3.78125,4.5 3.78125,-4.5 -3.78125,-4.5 z" + d="m 320,372.78125 l -3.78125,4.5 l 3.78125,4.5 l 3.78125,-4.5 l -3.78125,-4.5 z" style="fill:#00ffff;stroke:none" /> @@ -4069,7 +4061,7 @@ @@ -4702,7 +4694,7 @@ sodipodi:cy="205" sodipodi:rx="46.352551" sodipodi:ry="75" - d="m 582.79539,230.65151 c -3.7272,-16.56932 -3.7272,-34.7337 0,-51.30302" + d="m 582.79539,230.65151 a 46.352551,75 0 0 1 0,-51.30302" transform="matrix(6.4484046,0,0,3.9853333,-3146.0425,-599.99333)" sodipodi:start="2.7925268" sodipodi:end="3.4906585" @@ -4929,7 +4921,7 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4644" - d="M -0.49703765,463 L 640.50299,463" + d="M -0.49703765,461 L 640.50299,461" style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> @@ -4952,12 +4944,12 @@ style="fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke:none" id="rect3937" width="85" - height="16" + height="18" x="383.5" - y="464" /> + y="462" /> + transform="matrix(1.1018082,0,0,1.1018082,-40.242844,-48.999476)"> + transform="matrix(1.1017863,0,0,1.1017863,-42.744908,-48.294497)"> @@ -5132,7 +5124,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="warning-master-caution-label" inkscape:label="#warning-master-caution-label" - transform="translate(-0.37041,0.11598)"> + transform="matrix(1.1017863,0,0,1.1017863,-33.088618,-48.971446)"> + id="warning-rc-input-label" + transform="matrix(1.1017863,0,0,1.1017863,-23.124025,-49.099088)"> + y="462" /> + style="font-size:12.67915916px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + transform="matrix(1.1018021,0,0,1.1018021,-12.863012,-49.713865)"> 00.00.00 @@ -5373,7 +5367,8 @@ inkscape:groupmode="layer" id="layer75" inkscape:label="warning-gps" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true">