1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-22 12:54:14 +01:00

OP-1739 Add BeiDou SV display to GCS

This commit is contained in:
Erik Gustavsson 2015-03-01 17:39:05 +01:00
parent 0610262cc3
commit 3a8c13a365
4 changed files with 1285 additions and 1129 deletions

View File

@ -129,7 +129,7 @@ void GpsConstellationWidget::updateSat(int index, int prn, int elevation, int az
-satIcons[index]->boundingRect().center().y()); -satIcons[index]->boundingRect().center().y());
satIcons[index]->setTransform(QTransform::fromTranslate(opd.x(), opd.y()), false); satIcons[index]->setTransform(QTransform::fromTranslate(opd.x(), opd.y()), false);
// Show normal GPS, SBAS (120 - 158 range) or GLONASS (65 - 96, 255 if unidentified) // Show normal GPS, SBAS (120 - 158 range), BeiDou (33 - 64, 159 - 163) or GLONASS (65 - 96, 255 if unidentified)
if (prn > 119 && prn < 159) { if (prn > 119 && prn < 159) {
if (snr) { if (snr) {
satIcons[index]->setElementId("satellite-sbas"); satIcons[index]->setElementId("satellite-sbas");
@ -142,6 +142,12 @@ void GpsConstellationWidget::updateSat(int index, int prn, int elevation, int az
} else { } else {
satIcons[index]->setElementId("sat-glonass-notSeen"); satIcons[index]->setElementId("sat-glonass-notSeen");
} }
} else if ((prn > 32 && prn < 65) || (prn > 158 && prn < 164)) {
if (snr) {
satIcons[index]->setElementId("satellite-beidou");
} else {
satIcons[index]->setElementId("sat-beidou-notSeen");
}
} else { } else {
if (snr) { if (snr) {
satIcons[index]->setElementId("satellite"); satIcons[index]->setElementId("satellite");

View File

@ -127,7 +127,7 @@
</palette> </palette>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Displays the SNR for each detected sat. GPS satellites are shown in green, GLONASS in cyan and SBAS in orange. Satellite number (PRN) is displayed inside the bar. Sat SNR is displayed above (in dBHz)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Displays the SNR for each detected sat. GPS satellites are shown in green, GLONASS in cyan, BeiDou in red and SBAS in orange. Satellite number (PRN) is displayed inside the bar. Sat SNR is displayed above (in dBHz)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>

View File

@ -105,11 +105,13 @@ void GpsSnrWidget::drawSat(int index)
QRectF boxRect = boxes[index]->boundingRect(); QRectF boxRect = boxes[index]->boundingRect();
// Change color for SBAS sat (Egnos, etc..) 120 - 158 range // Change color for SBAS sat (Egnos, etc..) 120 - 158 range
// GLONASS range 65-96 or 255 // GLONASS range 65-96 or 255, BeiDou 33-64 or 159-163
if (prn > 119 && prn < 159) { if (prn > 119 && prn < 159) {
boxes[index]->setBrush(QColor("#fd700b")); boxes[index]->setBrush(QColor("#fd700b"));
} else if ((prn > 64 && prn < 97) || 255 == prn) { } else if ((prn > 64 && prn < 97) || 255 == prn) {
boxes[index]->setBrush(QColor("Cyan")); boxes[index]->setBrush(QColor("Cyan"));
} else if ((prn > 32 && prn < 65) || (prn > 158 && prn < 164)) {
boxes[index]->setBrush(QColor("Red"));
} else { } else {
boxes[index]->setBrush(QColor("Green")); boxes[index]->setBrush(QColor("Green"));
} }

View File

@ -14,8 +14,8 @@
height="691.54303" height="691.54303"
id="svg2" id="svg2"
version="1.1" version="1.1"
inkscape:version="0.48.5 r10040" inkscape:version="0.48.4 r9939"
sodipodi:docname="gpsEarth_work.svg"> sodipodi:docname="gpsEarth.svg">
<defs <defs
id="defs4"> id="defs4">
<linearGradient <linearGradient
@ -907,6 +907,102 @@
y1="353.18066" y1="353.18066"
x2="148.63506" x2="148.63506"
y2="481.89807" /> y2="481.89807" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3815-6-7"
id="radialGradient3937-6-0"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-0.11243486,0.51064271,-0.68854473,-0.15160586,748.65596,-75.556107)"
cx="559.92383"
cy="182.67093"
fx="559.92383"
fy="182.67093"
r="21.496641" />
<linearGradient
id="linearGradient3815-6-7">
<stop
style="stop-color:#f1f4fc;stop-opacity:1;"
offset="0"
id="stop3817-4-6" />
<stop
style="stop-color:#f1f4fc;stop-opacity:0;"
offset="1"
id="stop3819-6-4" />
</linearGradient>
<filter
inkscape:collect="always"
id="filter3985-6-8"
color-interpolation-filters="sRGB">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.8285714"
id="feGaussianBlur3987-7-5" />
</filter>
<radialGradient
r="21.496641"
fy="182.67093"
fx="559.92383"
cy="182.67093"
cx="559.92383"
gradientTransform="matrix(-0.11243486,0.51064271,-0.68854473,-0.15160586,748.65596,-75.556107)"
gradientUnits="userSpaceOnUse"
id="radialGradient3207"
xlink:href="#linearGradient3815-6-7"
inkscape:collect="always" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3815-6-9"
id="radialGradient4015-9-9"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-0.11243486,0.51064271,-0.68854473,-0.15160586,748.65596,-75.556107)"
cx="559.92383"
cy="182.67093"
fx="559.92383"
fy="182.67093"
r="21.496641" />
<linearGradient
inkscape:collect="always"
id="linearGradient3815-6-9">
<stop
style="stop-color:#f1f4fc;stop-opacity:1;"
offset="0"
id="stop3817-4-7" />
<stop
style="stop-color:#f1f4fc;stop-opacity:0;"
offset="1"
id="stop3819-6-3" />
</linearGradient>
<filter
inkscape:collect="always"
id="filter3985-6-6"
color-interpolation-filters="sRGB">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.8285714"
id="feGaussianBlur3987-7-8" />
</filter>
<radialGradient
r="21.496641"
fy="182.67093"
fx="559.92383"
cy="182.67093"
cx="559.92383"
gradientTransform="matrix(-0.11243486,0.51064271,-0.68854473,-0.15160586,748.65596,-75.556107)"
gradientUnits="userSpaceOnUse"
id="radialGradient4023"
xlink:href="#linearGradient3815-6-9"
inkscape:collect="always" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3815-6-7"
id="radialGradient4050"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-0.11243486,0.51064271,-0.68854473,-0.15160586,748.65596,-75.556107)"
cx="559.92383"
cy="182.67093"
fx="559.92383"
fy="182.67093"
r="21.496641" />
</defs> </defs>
<sodipodi:namedview <sodipodi:namedview
id="base" id="base"
@ -915,16 +1011,16 @@
borderopacity="1.0" borderopacity="1.0"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="0.43130409" inkscape:zoom="1.2199122"
inkscape:cx="302.55734" inkscape:cx="597.90072"
inkscape:cy="389.84143" inkscape:cy="457.17106"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="layer10" inkscape:current-layer="layer13"
showgrid="false" showgrid="false"
inkscape:window-width="1280" inkscape:window-width="2560"
inkscape:window-height="928" inkscape:window-height="1414"
inkscape:window-x="0" inkscape:window-x="0"
inkscape:window-y="27" inkscape:window-y="18"
inkscape:window-maximized="1" inkscape:window-maximized="1"
inkscape:snap-object-midpoints="true" inkscape:snap-object-midpoints="true"
inkscape:object-nodes="false" inkscape:object-nodes="false"
@ -943,7 +1039,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
@ -1007,7 +1103,7 @@
style="opacity:0.69172932;color:#000000;fill:#616a60;fill-opacity:1;fill-rule:nonzero;stroke:#6a6c69;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter5048);enable-background:accumulate" /> style="opacity:0.69172932;color:#000000;fill:#616a60;fill-opacity:1;fill-rule:nonzero;stroke:#6a6c69;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter5048);enable-background:accumulate" />
<path <path
transform="translate(-16.439758,-3.266917)" transform="translate(-16.439758,-3.266917)"
d="M 598.0103,404.8544 A 227.28432,227.28432 0 1 1 143.44167,404.8544 A 227.28432,227.28432 0 1 1 598.0103,404.8544 z" d="m 598.0103,404.8544 c 0,125.52566 -101.75866,227.28432 -227.28432,227.28432 -125.52566,0 -227.28431,-101.75866 -227.28431,-227.28432 0,-125.52566 101.75865,-227.28432 227.28431,-227.28432 125.52566,0 227.28432,101.75866 227.28432,227.28432 z"
sodipodi:ry="227.28432" sodipodi:ry="227.28432"
sodipodi:rx="227.28432" sodipodi:rx="227.28432"
sodipodi:cy="404.8544" sodipodi:cy="404.8544"
@ -1017,7 +1113,7 @@
sodipodi:type="arc" /> sodipodi:type="arc" />
<path <path
transform="matrix(1.0229478,0,0,0.27614188,-24.947098,289.79023)" transform="matrix(1.0229478,0,0,0.27614188,-24.947098,289.79023)"
d="M 598.0103,404.8544 A 227.28432,227.28432 0 1 1 143.44167,404.8544 A 227.28432,227.28432 0 1 1 598.0103,404.8544 z" d="m 598.0103,404.8544 c 0,125.52566 -101.75866,227.28432 -227.28432,227.28432 -125.52566,0 -227.28431,-101.75866 -227.28431,-227.28432 0,-125.52566 101.75865,-227.28432 227.28431,-227.28432 125.52566,0 227.28432,101.75866 227.28432,227.28432 z"
sodipodi:ry="227.28432" sodipodi:ry="227.28432"
sodipodi:rx="227.28432" sodipodi:rx="227.28432"
sodipodi:cy="404.8544" sodipodi:cy="404.8544"
@ -1056,14 +1152,14 @@
sodipodi:cy="410.41025" sodipodi:cy="410.41025"
sodipodi:rx="89.398499" sodipodi:rx="89.398499"
sodipodi:ry="89.398499" sodipodi:ry="89.398499"
d="M 451.71402,343.4835 A 89.398499,89.398499 0 1 1 437.72993,333.33041" d="m 451.71402,343.4835 c 36.96262,32.73378 40.39077,89.23387 7.657,126.19649 -32.73378,36.96262 -89.23387,40.39078 -126.19649,7.657 -36.96262,-32.73377 -40.39077,-89.23386 -7.657,-126.19648 28.33719,-31.99805 75.3601,-39.46142 112.2124,-17.8101"
transform="matrix(1.2638612,0,0,1.2638612,-124.40402,-114.71229)" transform="matrix(1.2638612,0,0,1.2638612,-124.40402,-114.71229)"
sodipodi:start="5.4371862" sodipodi:start="5.4371862"
sodipodi:end="11.526764" sodipodi:end="11.526764"
sodipodi:open="true" /> sodipodi:open="true" />
<path <path
transform="matrix(1.9716104,0,0,1.9716104,-399.86707,-407.46887)" transform="matrix(1.9716104,0,0,1.9716104,-399.86707,-407.46887)"
d="M 451.12161,342.96352 A 89.398499,89.398499 0 1 1 442.12815,336.08929" d="m 451.12161,342.96352 c 37.2498,32.4066 41.17599,88.87427 8.76939,126.12407 -32.4066,37.2498 -88.87426,41.17599 -126.12407,8.76939 -37.2498,-32.4066 -41.17598,-88.87427 -8.76938,-126.12407 29.53979,-33.95454 79.71538,-40.65585 117.1306,-15.64362"
sodipodi:ry="89.398499" sodipodi:ry="89.398499"
sodipodi:rx="89.398499" sodipodi:rx="89.398499"
sodipodi:cy="410.41025" sodipodi:cy="410.41025"
@ -1148,7 +1244,7 @@
sodipodi:cy="404.8544" sodipodi:cy="404.8544"
sodipodi:rx="227.28432" sodipodi:rx="227.28432"
sodipodi:ry="227.28432" sodipodi:ry="227.28432"
d="M 598.0103,404.8544 A 227.28432,227.28432 0 1 1 143.44167,404.8544 A 227.28432,227.28432 0 1 1 598.0103,404.8544 z" d="m 598.0103,404.8544 c 0,125.52566 -101.75866,227.28432 -227.28432,227.28432 -125.52566,0 -227.28431,-101.75866 -227.28431,-227.28432 0,-125.52566 101.75865,-227.28432 227.28431,-227.28432 125.52566,0 227.28432,101.75866 227.28432,227.28432 z"
transform="matrix(1.0185,0,0,1.0185,-23.298188,-10.756724)" /> transform="matrix(1.0185,0,0,1.0185,-23.298188,-10.756724)" />
<path <path
style="color:#000000;fill:url(#linearGradient5561);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" style="color:#000000;fill:url(#linearGradient5561);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
@ -1238,7 +1334,7 @@
inkscape:label="#g3722"> inkscape:label="#g3722">
<path <path
transform="translate(0.08444214,2.2540576e-8)" transform="translate(0.08444214,2.2540576e-8)"
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z" d="m 589.99999,195.93361 c 0,11.44018 -9.2741,20.71428 -20.71428,20.71428 -11.44019,0 -20.71429,-9.2741 -20.71429,-20.71428 0,-11.44018 9.2741,-20.71429 20.71429,-20.71429 11.44018,0 20.71428,9.27411 20.71428,20.71429 z"
sodipodi:ry="20.714285" sodipodi:ry="20.714285"
sodipodi:rx="20.714285" sodipodi:rx="20.714285"
sodipodi:cy="195.93361" sodipodi:cy="195.93361"
@ -1254,7 +1350,7 @@
sodipodi:cy="195.93361" sodipodi:cy="195.93361"
sodipodi:rx="20.714285" sodipodi:rx="20.714285"
sodipodi:ry="20.714285" sodipodi:ry="20.714285"
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z" d="m 589.99999,195.93361 c 0,11.44018 -9.2741,20.71428 -20.71428,20.71428 -11.44019,0 -20.71429,-9.2741 -20.71429,-20.71428 0,-11.44018 9.2741,-20.71429 20.71429,-20.71429 11.44018,0 20.71428,9.27411 20.71428,20.71429 z"
transform="translate(0.08444218,2.2540576e-8)" /> transform="translate(0.08444218,2.2540576e-8)" />
</g> </g>
<g <g
@ -1270,11 +1366,11 @@
sodipodi:cy="195.93361" sodipodi:cy="195.93361"
sodipodi:rx="20.714285" sodipodi:rx="20.714285"
sodipodi:ry="20.714285" sodipodi:ry="20.714285"
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z" d="m 589.99999,195.93361 c 0,11.44018 -9.2741,20.71428 -20.71428,20.71428 -11.44019,0 -20.71429,-9.2741 -20.71429,-20.71428 0,-11.44018 9.2741,-20.71429 20.71429,-20.71429 11.44018,0 20.71428,9.27411 20.71428,20.71429 z"
transform="translate(0.08444214,2.2540576e-8)" /> transform="translate(0.08444214,2.2540576e-8)" />
<path <path
transform="translate(0.08444218,2.2540576e-8)" transform="translate(0.08444218,2.2540576e-8)"
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z" d="m 589.99999,195.93361 c 0,11.44018 -9.2741,20.71428 -20.71428,20.71428 -11.44019,0 -20.71429,-9.2741 -20.71429,-20.71428 0,-11.44018 9.2741,-20.71429 20.71429,-20.71429 11.44018,0 20.71428,9.27411 20.71428,20.71429 z"
sodipodi:ry="20.714285" sodipodi:ry="20.714285"
sodipodi:rx="20.714285" sodipodi:rx="20.714285"
sodipodi:cy="195.93361" sodipodi:cy="195.93361"
@ -1295,11 +1391,11 @@
sodipodi:cy="195.93361" sodipodi:cy="195.93361"
sodipodi:rx="20.714285" sodipodi:rx="20.714285"
sodipodi:ry="20.714285" sodipodi:ry="20.714285"
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z" d="m 589.99999,195.93361 c 0,11.44018 -9.2741,20.71428 -20.71428,20.71428 -11.44019,0 -20.71429,-9.2741 -20.71429,-20.71428 0,-11.44018 9.2741,-20.71429 20.71429,-20.71429 11.44018,0 20.71428,9.27411 20.71428,20.71429 z"
transform="translate(0.08444214,2.2540576e-8)" /> transform="translate(0.08444214,2.2540576e-8)" />
<path <path
transform="translate(0.08444218,-2.2540576e-8)" transform="translate(0.08444218,-2.2540576e-8)"
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z" d="m 589.99999,195.93361 c 0,11.44018 -9.2741,20.71428 -20.71428,20.71428 -11.44019,0 -20.71429,-9.2741 -20.71429,-20.71428 0,-11.44018 9.2741,-20.71429 20.71429,-20.71429 11.44018,0 20.71428,9.27411 20.71428,20.71429 z"
sodipodi:ry="20.714285" sodipodi:ry="20.714285"
sodipodi:rx="20.714285" sodipodi:rx="20.714285"
sodipodi:cy="195.93361" sodipodi:cy="195.93361"
@ -1315,7 +1411,7 @@
style="opacity:0.4"> style="opacity:0.4">
<path <path
transform="translate(0.08444214,2.2540576e-8)" transform="translate(0.08444214,2.2540576e-8)"
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z" d="m 589.99999,195.93361 c 0,11.44018 -9.2741,20.71428 -20.71428,20.71428 -11.44019,0 -20.71429,-9.2741 -20.71429,-20.71428 0,-11.44018 9.2741,-20.71429 20.71429,-20.71429 11.44018,0 20.71428,9.27411 20.71428,20.71429 z"
sodipodi:ry="20.714285" sodipodi:ry="20.714285"
sodipodi:rx="20.714285" sodipodi:rx="20.714285"
sodipodi:cy="195.93361" sodipodi:cy="195.93361"
@ -1331,7 +1427,7 @@
sodipodi:cy="195.93361" sodipodi:cy="195.93361"
sodipodi:rx="20.714285" sodipodi:rx="20.714285"
sodipodi:ry="20.714285" sodipodi:ry="20.714285"
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z" d="m 589.99999,195.93361 c 0,11.44018 -9.2741,20.71428 -20.71428,20.71428 -11.44019,0 -20.71429,-9.2741 -20.71429,-20.71428 0,-11.44018 9.2741,-20.71429 20.71429,-20.71429 11.44018,0 20.71428,9.27411 20.71428,20.71429 z"
transform="translate(0.08444218,-2.2540576e-8)" /> transform="translate(0.08444218,-2.2540576e-8)" />
</g> </g>
<g <g
@ -1340,7 +1436,7 @@
inkscape:label="#g3722"> inkscape:label="#g3722">
<path <path
transform="translate(0.08444214,2.2540576e-8)" transform="translate(0.08444214,2.2540576e-8)"
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z" d="m 589.99999,195.93361 c 0,11.44018 -9.2741,20.71428 -20.71428,20.71428 -11.44019,0 -20.71429,-9.2741 -20.71429,-20.71428 0,-11.44018 9.2741,-20.71429 20.71429,-20.71429 11.44018,0 20.71428,9.27411 20.71428,20.71429 z"
sodipodi:ry="20.714285" sodipodi:ry="20.714285"
sodipodi:rx="20.714285" sodipodi:rx="20.714285"
sodipodi:cy="195.93361" sodipodi:cy="195.93361"
@ -1356,7 +1452,7 @@
sodipodi:cy="195.93361" sodipodi:cy="195.93361"
sodipodi:rx="20.714285" sodipodi:rx="20.714285"
sodipodi:ry="20.714285" sodipodi:ry="20.714285"
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z" d="m 589.99999,195.93361 c 0,11.44018 -9.2741,20.71428 -20.71428,20.71428 -11.44019,0 -20.71429,-9.2741 -20.71429,-20.71428 0,-11.44018 9.2741,-20.71429 20.71429,-20.71429 11.44018,0 20.71428,9.27411 20.71428,20.71429 z"
transform="translate(0.08444218,2.2540576e-8)" /> transform="translate(0.08444218,2.2540576e-8)" />
</g> </g>
<g <g
@ -1372,11 +1468,11 @@
sodipodi:cy="195.93361" sodipodi:cy="195.93361"
sodipodi:rx="20.714285" sodipodi:rx="20.714285"
sodipodi:ry="20.714285" sodipodi:ry="20.714285"
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z" d="m 589.99999,195.93361 c 0,11.44018 -9.2741,20.71428 -20.71428,20.71428 -11.44019,0 -20.71429,-9.2741 -20.71429,-20.71428 0,-11.44018 9.2741,-20.71429 20.71429,-20.71429 11.44018,0 20.71428,9.27411 20.71428,20.71429 z"
transform="translate(0.08444214,2.2540576e-8)" /> transform="translate(0.08444214,2.2540576e-8)" />
<path <path
transform="translate(0.08444218,2.2540576e-8)" transform="translate(0.08444218,2.2540576e-8)"
d="M 589.99999,195.93361 C 589.99999,207.37379 580.72589,216.64789 569.28571,216.64789 C 557.84552,216.64789 548.57142,207.37379 548.57142,195.93361 C 548.57142,184.49343 557.84552,175.21932 569.28571,175.21932 C 580.72589,175.21932 589.99999,184.49343 589.99999,195.93361 z" d="m 589.99999,195.93361 c 0,11.44018 -9.2741,20.71428 -20.71428,20.71428 -11.44019,0 -20.71429,-9.2741 -20.71429,-20.71428 0,-11.44018 9.2741,-20.71429 20.71429,-20.71429 11.44018,0 20.71428,9.27411 20.71428,20.71429 z"
sodipodi:ry="20.714285" sodipodi:ry="20.714285"
sodipodi:rx="20.714285" sodipodi:rx="20.714285"
sodipodi:cy="195.93361" sodipodi:cy="195.93361"
@ -1385,6 +1481,58 @@
style="fill:url(#radialGradient4055-2);fill-opacity:1;stroke:none;filter:url(#filter3985-6)" style="fill:url(#radialGradient4055-2);fill-opacity:1;stroke:none;filter:url(#filter3985-6)"
sodipodi:type="arc" /> sodipodi:type="arc" />
</g> </g>
<g
style="display:inline"
inkscape:label="#g3722"
transform="matrix(0.93879118,0,0,0.93879118,-73.44061,-70.698335)"
id="satellite-beidou">
<path
sodipodi:type="arc"
style="fill:#ff0000;fill-opacity:1;stroke:#ff5721;stroke-width:1.56471384;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path3915-7"
sodipodi:cx="569.28571"
sodipodi:cy="195.93361"
sodipodi:rx="20.714285"
sodipodi:ry="20.714285"
d="m 589.99999,195.93361 c 0,11.44018 -9.2741,20.71428 -20.71428,20.71428 -11.44019,0 -20.71429,-9.2741 -20.71429,-20.71428 0,-11.44018 9.2741,-20.71429 20.71429,-20.71429 11.44018,0 20.71428,9.27411 20.71428,20.71429 z"
transform="translate(0.08444214,2.2540576e-8)" />
<path
transform="translate(0.08444218,-2.2540576e-8)"
d="m 589.99999,195.93361 c 0,11.44018 -9.2741,20.71428 -20.71428,20.71428 -11.44019,0 -20.71429,-9.2741 -20.71429,-20.71428 0,-11.44018 9.2741,-20.71429 20.71429,-20.71429 11.44018,0 20.71428,9.27411 20.71428,20.71429 z"
sodipodi:ry="20.714285"
sodipodi:rx="20.714285"
sodipodi:cy="195.93361"
sodipodi:cx="569.28571"
id="path3921-2"
style="fill:url(#radialGradient4050);fill-opacity:1;stroke:none;filter:url(#filter3985-6-8)"
sodipodi:type="arc" />
</g>
<g
id="sat-beidou-notSeen"
transform="matrix(0.93879118,0,0,0.93879118,-10.549949,-69.249241)"
inkscape:label="#g3722"
style="opacity:0.4;display:inline">
<path
transform="translate(0.08444214,2.2540576e-8)"
d="m 589.99999,195.93361 c 0,11.44018 -9.2741,20.71428 -20.71428,20.71428 -11.44019,0 -20.71429,-9.2741 -20.71429,-20.71428 0,-11.44018 9.2741,-20.71429 20.71429,-20.71429 11.44018,0 20.71428,9.27411 20.71428,20.71429 z"
sodipodi:ry="20.714285"
sodipodi:rx="20.714285"
sodipodi:cy="195.93361"
sodipodi:cx="569.28571"
id="path4003-9"
style="fill:#ff0000;fill-opacity:1;stroke:#ff5721;stroke-width:1.56471384;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="fill:url(#radialGradient4023);fill-opacity:1;stroke:none;filter:url(#filter3985-6-6)"
id="path4009-9"
sodipodi:cx="569.28571"
sodipodi:cy="195.93361"
sodipodi:rx="20.714285"
sodipodi:ry="20.714285"
d="m 589.99999,195.93361 c 0,11.44018 -9.2741,20.71428 -20.71428,20.71428 -11.44019,0 -20.71429,-9.2741 -20.71429,-20.71428 0,-11.44018 9.2741,-20.71429 20.71429,-20.71429 11.44018,0 20.71428,9.27411 20.71428,20.71429 z"
transform="translate(0.08444218,-2.2540576e-8)" />
</g>
</g> </g>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 85 KiB