From 8d6190b4870622610b98530581da33bb4da7be6c Mon Sep 17 00:00:00 2001 From: edouard Date: Wed, 23 Jun 2010 15:08:46 +0000 Subject: [PATCH] OP-82: PFD widget now also indicates heading. The PFD-2.svg master is updated accordingly. Note that the location of the indicator can be configured simply by moving the location of the compass on the PFD master SVG. Going from 360 degree to 0 degree still does not look nice, but I'll fix this later. Will update the wiki with notes on how to draw a PFD master, if anyone is interested to contribute? git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@874 ebee16cc-31ac-478f-84a7-5cbb03baadba --- artwork/Dials/PFD-2.svg | 2225 +++++++++++++------- ground/src/plugins/pfd/pfdgadgetwidget.cpp | 134 +- ground/src/plugins/pfd/pfdgadgetwidget.h | 14 +- 3 files changed, 1555 insertions(+), 818 deletions(-) diff --git a/artwork/Dials/PFD-2.svg b/artwork/Dials/PFD-2.svg index e5ae4d325..d4dc5b4ab 100644 --- a/artwork/Dials/PFD-2.svg +++ b/artwork/Dials/PFD-2.svg @@ -10,8 +10,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="600" - height="800" + width="1038.8931" + height="707.56323" id="svg2" version="1.1" inkscape:version="0.47 r22583" @@ -119,7 +119,7 @@ xlink:href="#linearGradient3774" id="linearGradient4284" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,2.0067662,0,-517.34413)" + gradientTransform="matrix(1,0,0,2.0069652,1.0784651e-5,-517.448)" x1="380.38251" y1="512.13574" x2="380.38251" @@ -129,11 +129,25 @@ xlink:href="#linearGradient3758" id="linearGradient4286" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.6720097,0,-513.56761)" + gradientTransform="matrix(1,0,0,1.6738023,1.0784651e-5,-514.72728)" x1="376.34192" y1="484.50259" x2="376.34192" y2="745.59497" /> + + + inkscape:snap-grids="true" + inkscape:snap-to-guides="true"> + + @@ -202,7 +224,7 @@ image/svg+xml - + @@ -210,7 +232,9 @@ inkscape:groupmode="layer" id="layer7" inkscape:label="Background" - style="display:inline"> + style="display:none" + transform="translate(230.4171,-2.5493479)" + sodipodi:insensitive="true"> + transform="translate(230.4171,-254.91153)" + style="display:inline" + sodipodi:insensitive="true"> + style="fill:none;stroke:#ffffff;stroke-width:0.75173599;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 227.84948,512.09626 305,0" + id="path3808" /> + style="display:inline" + transform="translate(230.4171,-2.5493479)"> + + inkscape:label="#g3392"> + + + + + - - - - + style="display:inline" + transform="translate(230.4171,-2.5493479)"> - - - N - S - S - W - E - - - - - - - - 20 - - - - 10 - - - - 30 - - - - 60 - - - - 70 - - - - 80 - - - - 100 - - - - 110 - - - - 120 - - - - 130 - - - - 140 - - - - 150 - - - - 160 - - - - 170 - - - - 280 - - - - 290 - - - - 300 - - - - 310 - - - - 320 - - - - 330 - - - - 340 - - - - 350 - - - - 260 - - - - 250 - - - - 240 - - - - 230 - - - - 220 - - - - 210 - - - - 200 - - - - 190 - - - - 40 - - - - 50 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + style="display:none" + transform="translate(230.4171,-2.5493479)" + sodipodi:insensitive="true"> + inkscape:label="#g5033" + transform="translate(-8.5714286,-24.285714)"> + style="display:none" + transform="translate(230.4171,-2.5493479)" + sodipodi:insensitive="true">