From 8bc4b5e7f3de581ea1ec8a04d6f40013de47c233 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Sun, 25 May 2014 05:46:06 +0200 Subject: [PATCH 01/12] OP-1354 Current voltage fixes and more in PFD First commit Fix Current, Voltage and ConsumedEnergy on Pfd (i hope) Added Throttle bargraph and Telemetry Tx/Rx + Telemetry status Top panel with more space for future information / Compass moved --- .../share/openpilotgcs/pfd/default/Info.qml | 128 +++ .../share/openpilotgcs/pfd/default/Pfd.qml | 8 +- .../openpilotgcs/pfd/default/RollScale.qml | 2 +- .../share/openpilotgcs/pfd/default/pfd.svg | 933 +++++++++++++----- .../src/plugins/pfdqml/pfdqmlgadgetwidget.cpp | 3 +- 5 files changed, 807 insertions(+), 267 deletions(-) diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml index 2697019a6..0907cc49c 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml @@ -31,10 +31,138 @@ Item { Text { text: ["No GPS", "No Fix", "Fix2D", "Fix3D"][GPSPositionSensor.Status] + anchors.centerIn: parent + font.pixelSize: parent.height*1.2 + color: "white" + } + } + + SvgElementPositionItem { + sceneSize: info.sceneSize + elementName: "telemetry-status" + + Text { + text: ["Disconnected","HandshakeReq","HandshakeAck","Connected"][GCSTelemetryStats.Status] anchors.centerIn: parent font.pixelSize: parent.height*1.2 color: "white" } } + + Repeater { + id: txNumberBar + + property int txRateNumber : GCSTelemetryStats.TxDataRate.toFixed()/10 // 250 max + + model: 25 + SvgElementImage { + property int minTxRateNumber : index+1 + elementName: "tx" + minTxRateNumber + sceneSize: info.sceneSize + visible: txNumberBar.txRateNumber >= minTxRateNumber + } + } + + Repeater { + id: rxNumberBar + + property int rxRateNumber : GCSTelemetryStats.RxDataRate.toFixed()/100 // 2500 max + + model: 25 + SvgElementImage { + property int minRxRateNumber : index+1 + elementName: "rx" + minRxRateNumber + sceneSize: info.sceneSize + visible: rxNumberBar.rxRateNumber >= minRxRateNumber + } + } + Item { + id: battery_voltage + + property variant scaledBounds: svgRenderer.scaledElementBounds("pfd.svg", "battery-volt-text") + + x: scaledBounds.x * sceneItem.width + y: scaledBounds.y * sceneItem.height + width: scaledBounds.width * sceneItem.width + height: scaledBounds.height * sceneItem.height + //visible: FlightBatteryState.Voltage > 0 + + Text { + id: battery_volt + text: FlightBatteryState.Voltage.toFixed(2) + color: "white" + font { + family: "Arial" + pixelSize: parent.height * 1.2 + } + anchors.centerIn: parent + } + } + + Item { + id: battery_current + + property variant scaledBounds: svgRenderer.scaledElementBounds("pfd.svg", "battery-amp-text") + + x: scaledBounds.x * sceneItem.width + y: scaledBounds.y * sceneItem.height + width: scaledBounds.width * sceneItem.width + height: scaledBounds.height * sceneItem.height + //visible: FlightBatteryState.Current > 0 + + Text { + id: battery_cur + text: FlightBatteryState.Current.toFixed(2) + color: "white" + font { + family: "Arial" + pixelSize: parent.height * 1.2 + } + anchors.centerIn: parent + } + } + + Item { + id: battery_consumed_energy + + property variant scaledBounds: svgRenderer.scaledElementBounds("pfd.svg", "battery-milliamp-text") + + x: scaledBounds.x * sceneItem.width + y: scaledBounds.y * sceneItem.height + width: scaledBounds.width * sceneItem.width + height: scaledBounds.height * sceneItem.height + //visible: FlightBatteryState.ConsumedEnergy > 0 + + Text { + id: battery_conso + text: FlightBatteryState.ConsumedEnergy.toFixed() + color: "white" + font { + family: "Arial" + pixelSize: parent.height * 1.2 + } + anchors.centerIn: parent + } + } + + Repeater { + id: throttleNumberBar + + property int throttleNumber : ActuatorDesired.Thrust.toFixed(1)*10 + + model: 10 + SvgElementImage { + property int minThrottleNumber : index+1 + elementName: "eng" + minThrottleNumber + sceneSize: info.sceneSize + visible: throttleNumberBar.throttleNumber >= minThrottleNumber + } + } + + SvgElementImage { + id: mask_ThrottleBar + elementName: "throttle-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 0670e1f36..d4cf6f916 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Pfd.qml +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Pfd.qml @@ -89,10 +89,10 @@ Rectangle { sceneSize: sceneItem.viewportSize } - PfdIndicators { - anchors.fill: parent - sceneSize: sceneItem.viewportSize - } +// PfdIndicators { +// anchors.fill: parent +// sceneSize: sceneItem.viewportSize +// } Info { anchors.fill: parent diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/RollScale.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/RollScale.qml index 66263efd6..76482164d 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/RollScale.qml +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/RollScale.qml @@ -21,7 +21,7 @@ Item { //rotate it around the center of horizon transform: Rotation { angle: -AttitudeState.Roll - origin.y : sceneItem.horizontCenter - rollscale.height/2 + origin.y : rollscale.height*2.55 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 2aa980b78..cf3eb69f5 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg @@ -13,8 +13,8 @@ height="480" id="svg2" version="1.1" - inkscape:version="0.48.2 r9819" - sodipodi:docname="pfd-2.svg" + inkscape:version="0.48.4 r9939" + sodipodi:docname="pfd.svg" inkscape:export-filename="/Users/muralha/Desktop/new PFD ideas/pfd/test2.png" inkscape:export-xdpi="72" inkscape:export-ydpi="72"> @@ -27,23 +27,32 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.575" - inkscape:cx="320" - inkscape:cy="240" + inkscape:zoom="8.6236123" + inkscape:cx="635.53212" + inkscape:cy="470.39453" inkscape:document-units="px" - inkscape:current-layer="svg2" - showgrid="false" + inkscape:current-layer="layer48" + showgrid="true" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - inkscape:window-width="1920" - inkscape:window-height="944" - inkscape:window-x="1280" - inkscape:window-y="0" - inkscape:window-maximized="0" - showguides="false" - inkscape:guide-bbox="true"> + inkscape:window-width="1280" + inkscape:window-height="928" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" + showguides="true" + inkscape:guide-bbox="true" + inkscape:object-nodes="false" + inkscape:object-paths="true" + inkscape:snap-bbox="true" + inkscape:bbox-nodes="false" + inkscape:snap-bbox-midpoints="false" + inkscape:snap-grids="true" + inkscape:snap-to-guides="true" + inkscape:snap-nodes="true" + inkscape:bbox-paths="false"> + @@ -87,7 +103,7 @@ + transform="translate(36.589666,99.918684)"> + style="display:inline" + sodipodi:insensitive="true"> + transform="translate(0,52)"> + inkscape:label="home-eta-text" + style="display:inline" + sodipodi:insensitive="true"> @@ -1012,7 +1031,8 @@ inkscape:groupmode="layer" id="layer27" inkscape:label="home-distance-text" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true"> @@ -1057,7 +1077,8 @@ inkscape:groupmode="layer" id="layer28" inkscape:label="home-heading-text" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true"> @@ -1084,48 +1105,49 @@ id="layer3" inkscape:label="info" style="display:inline" - transform="translate(0,-4)" - sodipodi:insensitive="true"> + transform="translate(0,-4)"> + inkscape:label="info-bg" + style="display:inline"> + inkscape:label="#g4460" + transform="matrix(0.9999294,0,0,1,-0.0073471,-1.5021251)"> + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00003541;stroke-miterlimit:4;stroke-dasharray:none;display:inline" /> + d="m 180.91596,54.999999 0,-51.1368821" + style="fill:none;stroke:#ffffff;stroke-width:2.00006986;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="M 459,55.002125 459,4.0201993" + style="fill:none;stroke:#ffffff;stroke-width:2.00007081;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + style="fill:none;stroke:#ffffff;stroke-width:1.00003529px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> @@ -1147,7 +1169,8 @@ + id="gps-sats-label" + transform="translate(0,18)"> + + + + + @@ -1241,40 +1289,38 @@ id="path6472" inkscape:connector-curvature="0" /> - - - - + id="battery-milliamp-label" + transform="translate(-2,0)"> + d="m 632.01025,45.035233 -1.07031,2.902343 2.14453,0 -1.07422,-2.902343 m -0.44531,-0.777344 0.89453,0 2.22266,5.832031 -0.82031,0 -0.53125,-1.496094 -2.62891,0 -0.53125,1.496094 -0.83203,0 2.22656,-5.832031" /> + + + + @@ -1392,20 +1438,28 @@ id="path6806" inkscape:connector-curvature="0" /> + + style="display:inline" + sodipodi:insensitive="true"> + inkscape:label="battery-milliamp-text" + sodipodi:insensitive="true"> + id="battery-milliamp-text" + transform="translate(0,16)"> + + + + + + + + + + inkscape:label="battery-volt-text" + sodipodi:insensitive="true"> @@ -1467,81 +1558,99 @@ inkscape:connector-curvature="0" /> + + style="display:inline" + sodipodi:insensitive="true"> + d="m 469.86993,45.254672 0,-2.5" + style="fill:#008080;stroke:#008000;stroke-width:8.30000019;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + sodipodi:nodetypes="cc" /> + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 484.90956,45.254672 0,-7.500001" + style="fill:none;stroke:#008000;stroke-width:8.30000019;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + sodipodi:nodetypes="cc" /> + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 499.94918,45.254672 0,-12.500001" + style="fill:none;stroke:#008000;stroke-width:8.30000019;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + sodipodi:nodetypes="cc" /> + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 514.98879,45.254672 0,-17.500001" + style="fill:none;stroke:#008000;stroke-width:8.30000019;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + sodipodi:nodetypes="cc" /> + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + d="m 530.02841,45.254672 0,-22.500001" + style="fill:none;stroke:#008000;stroke-width:8.30000019;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + sodipodi:nodetypes="cc" /> + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + inkscape:label="waypoint" + sodipodi:insensitive="true"> + inkscape:label="waypoint-eta-text" + sodipodi:insensitive="true"> @@ -1590,7 +1699,8 @@ + inkscape:label="waypoint-distance-text" + sodipodi:insensitive="true"> @@ -1639,7 +1749,8 @@ + inkscape:label="waypoint-heading-text" + sodipodi:insensitive="true"> @@ -1663,7 +1774,8 @@ + inkscape:label="waypoint-mode-text" + sodipodi:insensitive="true"> @@ -1753,7 +1865,8 @@ inkscape:groupmode="layer" id="layer56" inkscape:label="waypoint-description-text" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true"> @@ -1834,216 +1947,468 @@ inkscape:groupmode="layer" id="layer59" inkscape:label="telemetry" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true"> + + + + + + + + + + + + + style="display:inline" + sodipodi:insensitive="true"> + + + + + + + + + + + + + + + + + style="display:inline" + sodipodi:insensitive="true"> + + d="M 114,17.5 114,6.417086" + 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" /> + d="M 119,17.5 119,6.417086" + 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" /> + d="M 124,17.5 124,6.417086" + 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" /> + d="M 129,17.5 129,6.417086" + 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" /> + d="M 134,17.5 134,6.417086" + 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" /> + + + + + + + + + + + + + + + + style="display:inline" + sodipodi:insensitive="true"> + style="display:inline" + sodipodi:insensitive="true"> + inkscape:label="#path10180" + sodipodi:nodetypes="cc" /> + inkscape:label="#path10211" + sodipodi:nodetypes="cc" /> + inkscape:label="#path10213" + sodipodi:nodetypes="cc" /> + inkscape:label="#path10215" + sodipodi:nodetypes="cc" /> + inkscape:label="#path10217" + sodipodi:nodetypes="cc" /> + inkscape:label="#path10219" + sodipodi:nodetypes="cc" /> + inkscape:label="#path10221" + sodipodi:nodetypes="cc" /> + inkscape:label="#path10223" + sodipodi:nodetypes="cc" /> + inkscape:label="#path10225" + sodipodi:nodetypes="cc" /> + inkscape:label="#path10227" + sodipodi:nodetypes="cc" /> + style="display:inline" + sodipodi:insensitive="true"> @@ -2065,14 +2430,14 @@ inkscape:groupmode="layer" id="layer22" inkscape:label="roll-scale" - sodipodi:insensitive="true" - style="display:inline"> + style="display:inline" + transform="translate(0,38)" + sodipodi:insensitive="true"> + inkscape:transform-center-y="-146.72348"> + inkscape:label="sideslip-fixed" + style="display:inline" + sodipodi:insensitive="true"> + inkscape:label="sideslip_moving" + sodipodi:insensitive="true" + style="display:inline"> + inkscape:label="center-arrows" + style="display:inline"> + transform="matrix(0.82206736,0,0,0.82206736,56.949678,82.0713)"> + inkscape:label="center-plane" + style="display:inline" + sodipodi:insensitive="true" /> + style="display:inline" + sodipodi:insensitive="true"> + style="display:inline" + sodipodi:insensitive="true"> + inkscape:label="#g9078" + transform="translate(0,78)"> @@ -2384,7 +2759,8 @@ height="17.963617" width="38.967232" id="rect5453" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" /> + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" + ry="2.4615386" /> + inkscape:label="#g9628" + transform="translate(0,78)"> + style="display:inline" + sodipodi:insensitive="true"> + id="compass-text" + transform="translate(0,78)"> + style="display:inline"> @@ -3502,10 +3880,12 @@ inkscape:groupmode="layer" id="layer73" inkscape:label="speed-unit" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true"> + id="speed-unit" + transform="translate(0,42)"> + style="display:inline" + sodipodi:insensitive="true"> + style="display:inline" + sodipodi:insensitive="true"> + style="display:inline" + sodipodi:insensitive="true"> + transform="translate(84,52)"> + style="display:inline" + sodipodi:insensitive="true"> + transform="translate(0,52)"> + style="display:inline" + sodipodi:insensitive="true"> @@ -3719,10 +4104,12 @@ inkscape:groupmode="layer" id="layer21" inkscape:label="speed-text" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true"> + id="speed-text" + transform="translate(0,42)"> + style="display:inline" + sodipodi:insensitive="true"> + id="altitude-unit" + transform="translate(0,42)"> + style="display:inline" + sodipodi:insensitive="true"> + style="display:inline" + sodipodi:insensitive="true"> + inkscape:groupmode="layer" + sodipodi:insensitive="true"> @@ -3933,11 +4325,12 @@ inkscape:groupmode="layer" id="layer31" inkscape:label="altitude-box" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true"> + transform="translate(0,52)"> + style="display:inline" + sodipodi:insensitive="true"> + id="altitude-text" + transform="translate(0,42)"> + style="display:inline" + sodipodi:insensitive="true"> + id="vsi-unit" + transform="translate(0.25011024,44)"> + inkscape:label="#g3460" + transform="translate(0.25011024,42)"> @@ -4170,28 +4568,29 @@ inkscape:groupmode="layer" id="layer67" inkscape:label="warnings" - style="display:inline" + style="display:none" sodipodi:insensitive="true"> + style="display:inline" + sodipodi:insensitive="true"> + style="display:inline" + sodipodi:insensitive="true"> @@ -4258,7 +4657,8 @@ inkscape:groupmode="layer" id="layer29" inkscape:label="warning-master-caution" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true"> @@ -4345,7 +4745,8 @@ inkscape:groupmode="layer" id="layer33" inkscape:label="warning-rc-input" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true"> @@ -4402,30 +4803,34 @@ inkscape:groupmode="layer" id="layer34" inkscape:label="warning-attitude" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true"> + inkscape:label="#g4846" + transform="translate(0,42)"> + style="fill:#ff0000;fill-opacity:0.49803922;fill-rule:evenodd;stroke:none" + ry="5.1819358" + rx="5.1819358" /> + d="M 263.58049,88.871256 374.85741,260.61166" + style="fill:none;stroke:#ff0000;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> + - + transform="matrix(0.99951655,0,0,1.532684,551.00855,-5.8636647)"> @@ -4512,7 +4917,7 @@ style="display:inline" id="warning-gps" inkscape:label="#g4313" - transform="matrix(0.99951655,0,0,0.99607681,0.008546,-3.8091684)"> + transform="matrix(0.99951655,0,0,1.532684,0.008546,-5.8636647)"> + transform="translate(0,-4)"> + diff --git a/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp index ae0229ae2..60b391505 100644 --- a/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp @@ -62,7 +62,8 @@ PfdQmlGadgetWidget::PfdQmlGadgetWidget(QWindow *parent) : "GCSTelemetryStats" << "SystemAlarms" << "NedAccel" << - "FlightBatteryState"; + "FlightBatteryState" << + "ActuatorDesired"; ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); UAVObjectManager *objManager = pm->getObject(); From 33bf47bc449f7e7263fafc86e2d88fafb0d7059c Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Sun, 25 May 2014 12:17:37 +0200 Subject: [PATCH 02/12] OP-1354 Current voltage fixes and more in PFD Better rendering, still problems on top (Gps bars, borders) --- .../pfd/default/SvgElementImage.qml | 4 +- .../share/openpilotgcs/pfd/default/pfd.svg | 146 +++++++++--------- 2 files changed, 75 insertions(+), 75 deletions(-) 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"> Date: Sun, 25 May 2014 15:03:53 +0200 Subject: [PATCH 03/12] OP-1354 Current voltage fixes and more in PFD Fix sizes on svg file Sideslip working if needed. --- .../share/openpilotgcs/pfd/default/Pfd.qml | 12 +- .../openpilotgcs/pfd/default/RollScale.qml | 1 + .../share/openpilotgcs/pfd/default/pfd.svg | 190 ++++++++++-------- 3 files changed, 112 insertions(+), 91 deletions(-) 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"> - - - Date: Sun, 25 May 2014 16:16:42 +0200 Subject: [PATCH 04/12] OP-1354 Current voltage fixes and more in PFD Fixes on object position, Warning cross with rounded tips. --- .../share/openpilotgcs/pfd/default/pfd.svg | 336 +++++++++--------- 1 file changed, 177 insertions(+), 159 deletions(-) diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg index f8f6073eb..6e5dbda40 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.1546875" + inkscape:zoom="1.3234375" inkscape:cx="320" inkscape:cy="240" inkscape:document-units="px" - inkscape:current-layer="svg2" + inkscape:current-layer="layer77" showgrid="false" fit-margin-top="0" fit-margin-left="0" @@ -46,13 +46,14 @@ inkscape:guide-bbox="true" inkscape:object-nodes="false" inkscape:object-paths="true" - inkscape:snap-bbox="true" + inkscape:snap-bbox="false" inkscape:bbox-nodes="false" inkscape:snap-bbox-midpoints="false" inkscape:snap-grids="true" inkscape:snap-to-guides="true" inkscape:snap-nodes="true" - inkscape:bbox-paths="false"> + inkscape:bbox-paths="false" + inkscape:snap-global="false"> image/svg+xml - + @@ -103,7 +104,7 @@ + transform="translate(36.589666,51.918684)"> + transform="translate(0,-4)" + sodipodi:insensitive="true"> + style="display:inline" + sodipodi:insensitive="true" + transform="translate(0,4)"> @@ -1150,7 +1154,7 @@ + transform="translate(0,-3.01148)"> + transform="translate(0,6.488519)"> + transform="translate(0,-3.08992)"> + transform="translate(0,-2.08992)"> + transform="translate(0,-3.203204)"> + transform="translate(-2,-2.08992)"> + transform="translate(-5.79738,-2.08992)"> + transform="translate(0,-2.08992)"> + transform="translate(0,1.768481)" + sodipodi:insensitive="true"> + transform="translate(0,16.595328)"> + transform="translate(0,0.768478)" + sodipodi:insensitive="true"> + transform="translate(0,16.595328)"> + transform="translate(0,-1.231522)" + sodipodi:insensitive="true"> + transform="translate(0,1.595328)"> @@ -1571,11 +1575,12 @@ inkscape:groupmode="layer" id="layer63" inkscape:label="throttle" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true"> @@ -1583,13 +1588,13 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="eng1" - d="m 469.86993,45.254672 0,-2.5" + d="m 469.86993,48.85 0,-2.5" style="fill:#008080;stroke:#008000;stroke-width:8.30000019;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" sodipodi:nodetypes="cc" /> @@ -1597,13 +1602,13 @@ inkscape:label="#path10213" inkscape:connector-curvature="0" id="eng3" - d="m 484.90956,45.254672 0,-7.500001" + d="m 484.90956,48.85 0,-7.500001" style="fill:none;stroke:#008000;stroke-width:8.30000019;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" sodipodi:nodetypes="cc" /> @@ -1611,13 +1616,13 @@ inkscape:label="#path10217" inkscape:connector-curvature="0" id="eng5" - d="m 499.94918,45.254672 0,-12.500001" + d="m 499.94918,48.85 0,-12.500001" style="fill:none;stroke:#008000;stroke-width:8.30000019;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" sodipodi:nodetypes="cc" /> @@ -1625,13 +1630,13 @@ inkscape:label="#path10221" inkscape:connector-curvature="0" id="eng7" - d="m 514.98879,45.254672 0,-17.500001" + d="m 514.98879,48.85 0,-17.500001" style="fill:none;stroke:#008000;stroke-width:8.30000019;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" sodipodi:nodetypes="cc" /> @@ -1639,13 +1644,13 @@ inkscape:label="#path10225" inkscape:connector-curvature="0" id="eng9" - d="m 530.02841,45.254672 0,-22.500001" + d="m 530.02841,48.85 0,-22.500001" style="fill:none;stroke:#008000;stroke-width:8.30000019;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" sodipodi:nodetypes="cc" /> @@ -1654,6 +1659,7 @@ inkscape:groupmode="layer" id="layer58" inkscape:label="waypoint" + style="display:inline" sodipodi:insensitive="true"> + id="waypoint-eta-text" + transform="translate(0,3.595328)"> + id="waypoint-distance-text" + transform="translate(0,3.595328)"> + id="waypoint-heading-text" + transform="translate(0,3.595328)"> + id="waypoint-mode-text" + transform="translate(0,3.595328)"> + id="waypoint-description-text" + transform="translate(0,3.595328)"> + transform="translate(0,0.863767)" + sodipodi:insensitive="true"> + style="display:inline" + sodipodi:insensitive="true"> @@ -2090,11 +2102,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx13" - d="m 144,33.1 0,-11.082914" + d="m 144,36.095328 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" /> @@ -2102,11 +2114,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx15" - d="m 149,33.1 0,-11.082914" + d="m 149,36.095328 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" /> @@ -2114,11 +2126,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx17" - d="m 154,33.1 0,-11.082914" + d="m 154,36.095328 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 +2138,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx19" - d="m 159,33.1 0,-11.082914" + d="m 159,36.095328 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 +2150,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx21" - d="m 164,33.1 0,-11.082914" + d="m 164,36.095328 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 +2162,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx23" - d="m 169,33.1 0,-11.082914" + d="m 169,36.095328 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" /> @@ -2162,7 +2174,7 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="rx25" - d="m 174,33.1 0,-11.082914" + d="m 174,36.095328 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" /> @@ -2181,65 +2193,65 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="tx1" - d="M 114,16.6 114,5.517086" + d="M 114,18.095328 114,7.012414" 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" /> @@ -2247,11 +2259,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="tx12" - d="m 141.5,16.6 0,-11.082914" + d="m 141.5,18.095328 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" /> @@ -2259,11 +2271,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="tx14" - d="m 146.5,16.6 0,-11.082914" + d="m 146.5,18.095328 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" /> @@ -2271,11 +2283,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="tx16" - d="m 151.5,16.6 0,-11.082914" + d="m 151.5,18.095328 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" /> @@ -2283,11 +2295,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="tx18" - d="m 156.5,16.6 0,-11.082914" + d="m 156.5,18.095328 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" /> @@ -2295,11 +2307,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="tx20" - d="m 161.5,16.6 0,-11.082914" + d="m 161.5,18.095328 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" /> @@ -2307,11 +2319,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="tx22" - d="m 166.5,16.6 0,-11.082914" + d="m 166.5,18.095328 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" /> @@ -2319,11 +2331,11 @@ inkscape:label="#path10180" inkscape:connector-curvature="0" id="tx24" - d="m 171.5,16.6 0,-11.082914" + d="m 171.5,18.095328 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" /> @@ -2333,7 +2345,8 @@ inkscape:groupmode="layer" id="layer57" inkscape:label="gps" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true"> @@ -2423,12 +2436,12 @@ id="layer52" inkscape:label="gps-mode-text" style="display:inline" - sodipodi:insensitive="true" - transform="translate(0,-0.972157)"> + transform="translate(0,-0.972157)" + sodipodi:insensitive="true"> + transform="translate(0,0.59532805)"> + transform="translate(0,-4)" + sodipodi:insensitive="true"> + inkscape:label="sideslip-moving" + sodipodi:insensitive="true"> + style="display:inline" + sodipodi:insensitive="true">