diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/font/digital-7.ttf b/ground/openpilotgcs/src/plugins/gpsdisplay/font/digital-7.ttf new file mode 100644 index 000000000..5dbe6f908 Binary files /dev/null and b/ground/openpilotgcs/src/plugins/gpsdisplay/font/digital-7.ttf differ diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/font/readme.txt b/ground/openpilotgcs/src/plugins/gpsdisplay/font/readme.txt new file mode 100644 index 000000000..1c04fdc32 --- /dev/null +++ b/ground/openpilotgcs/src/plugins/gpsdisplay/font/readme.txt @@ -0,0 +1,73 @@ +True Type Fonts: DIGITAL-7 version 1.02 + + +EULA +-==- +The fonts Digital-7 is freeware for home using. + + +DESCRIPTION +-=========- + +This font created specially for program Calculator-7 (download shareware version: http://www.styleseven.com/ and use 7 days fo free). + +The program Calculator-7 offers you the following possibilities: +* calculate using seven operator: addition, subtraction, multiply, divide, percent, square root, 1 divide to X; +* set decimal position (0, 2, 3, float) and round type (up, mathematical, down); +* customize an appearance of work window: scale, fonts for digital panel and buttons, background color; +* customize an appearance of number in digital panel: leading zero for decimal, thousand separator, decimal separator, digit grouping; +* calculate total from clipboard (copy data to clipboard from table or text and press one button). + + +Files in digital-7_font.zip: + readme.txt this file; + digital-7.ttf digital-7 regular font; + digital-7 (italic).ttf digital-7 italic font; + digital-7 (mono).ttf digital-7 mono font; + digital-7 (mono italic).ttf digital-7 mono font. + +Please visit http://www.styleseven.com/ for download our other products as freeware as shareware. +We will welcome any useful suggestions and comments; please send them to ms-7@styleseven.com + + +FREEWARE USE (NOTES) +-=================- +Also you may: + * Use the font in freeware software (credit needed); + * Use the font for your education process. + + +COMMERCIAL OR BUSINESS USE +-========================- + +You can buy font for commercial use here ($24.95): http://store.esellerate.net/s.aspx?s=STR0331655240 +You may: + * Include the font to your installation; + * Use one license up to 100 computers in your office. +Please contact us for any questions. + + +WHAT IS NEW? +-==========- + + Version 1.01 April 05 2009 + -------------------------- + * Change Typeface name for fonts "Digital-7 (mono)" and "Digital-7 (italic)" (now available all fonts for select in application, for example Word Pad). + * Corrected symbol ':'. + + Version 1.01 April 07 2011 + -------------------------- + * Embedding is allowed. + + Version 1.1 June 07 2013 + -------------------------- + * Mono Italic font is added. + + +AUTHOR +-====- + +Sizenko Alexander +Style-7 +http://www.styleseven.com +Created: October 7 2008 \ No newline at end of file diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp index 34cc67e4e..d65fddfa0 100644 --- a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp +++ b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp @@ -62,6 +62,8 @@ GpsConstellationWidget::GpsConstellationWidget(QWidget *parent) : QGraphicsView( scene->setSceneRect(world->boundingRect()); setScene(scene); + QFontDatabase::addApplicationFont(":/gpsgadget/font/digital-7_mono.ttf"); + // Now create 'maxSatellites' satellite icons which we will move around on the map: for (int i = 0; i < MAX_SATTELITES; i++) { satellites[i][0] = 0; @@ -76,7 +78,7 @@ GpsConstellationWidget::GpsConstellationWidget(QWidget *parent) : QGraphicsView( satTexts[i] = new QGraphicsSimpleTextItem("##", satIcons[i]); satTexts[i]->setBrush(QColor("Black")); - satTexts[i]->setFont(QFont("Mono")); + satTexts[i]->setFont(QFont("Digital-7")); } } @@ -126,8 +128,8 @@ void GpsConstellationWidget::updateSat(int index, int prn, int elevation, int az opd += QPointF(-satIcons[index]->boundingRect().center().x(), -satIcons[index]->boundingRect().center().y()); satIcons[index]->setTransform(QTransform::fromTranslate(opd.x(), opd.y()), false); - - //Show normal GPS or SBAS + + // Show normal GPS or SBAS if (prn > 120 && prn < 158) { if (snr) { satIcons[index]->setElementId("satellite-sbas"); @@ -151,8 +153,10 @@ void GpsConstellationWidget::updateSat(int index, int prn, int elevation, int az satTexts[index]->setText(prnString); QRectF textRect = satTexts[index]->boundingRect(); + // Fixed scale, looks better for numbers 01,11,126... + qreal scale = 1.40; + QTransform matrix; - qreal scale = 0.70 * (iconRect.width() / textRect.width()); matrix.translate(iconRect.width() / 2, iconRect.height() / 2); matrix.scale(scale, scale); matrix.translate(-textRect.width() / 2, -textRect.height() / 2); @@ -174,8 +178,8 @@ QPointF GpsConstellationWidget::polarToCoord(int elevation, int azimuth) double rad_azimuth; // Vector modulus scaled to circle and angle (azimut) - vect_elevation = 0.93 - (elevation / 90.00f) * 0.93; - rad_azimuth = M_PI * azimuth / 180; + vect_elevation = 0.79 - (elevation / 90.00f) * 0.79; + rad_azimuth = M_PI * azimuth / 180; // Cartesian coordinates x = ((world->boundingRect().width() * vect_elevation) / 2) * sin(rad_azimuth); diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui index 1b8428329..be3316829 100644 --- a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui +++ b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui @@ -590,12 +590,82 @@ + + + 100 + 0 + + 400 95 + + + + + + + 236 + 236 + 236 + + + + + + + 237 + 237 + 237 + + + + + + + + + 236 + 236 + 236 + + + + + + + 237 + 237 + 237 + + + + + + + + + 236 + 236 + 236 + + + + + + + 236 + 236 + 236 + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -704,6 +774,9 @@ p, li { white-space: pre-wrap; } 50 + + 0 + Qt::ScrollBarAlwaysOn diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp b/ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp index c6ba78bb8..1dadfbbab 100644 --- a/ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp +++ b/ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp @@ -102,9 +102,9 @@ void GpsSnrWidget::drawSat(int index) boxes[index]->setRect(0, 0, width - 1, height - 1); boxes[index]->setPos(x, y); - QRectF boxRect = boxes[index]->boundingRect(); - - //Change color for SBAS sat (Egnos, etc..) + QRectF boxRect = boxes[index]->boundingRect(); + + // Change color for SBAS sat (Egnos, etc..) if (prn > 120 && prn < 158) { boxes[index]->setBrush(QColor("#fd700b")); } else { diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/images/gpsEarth.svg b/ground/openpilotgcs/src/plugins/gpsdisplay/images/gpsEarth.svg index c15767664..d784fa95c 100644 --- a/ground/openpilotgcs/src/plugins/gpsdisplay/images/gpsEarth.svg +++ b/ground/openpilotgcs/src/plugins/gpsdisplay/images/gpsEarth.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="492.01529" - height="495.57877" + width="691.54303" + height="691.54303" id="svg2" version="1.1" inkscape:version="0.48.5 r10040" @@ -19,16 +19,27 @@ + inkscape:collect="always" + id="linearGradient4431"> + id="stop4433" /> + id="stop4435" /> + + + + @@ -161,108 +172,6 @@ inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + gradientTransform="translate(4.9058353,-3.3906445)" + cx="369.21075" + cy="404.8544" + fx="369.21075" + fy="404.8544" + r="225.88098" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="filter4439" + color-interpolation-filters="sRGB"> + id="feGaussianBlur4441" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:window-maximized="1" + inkscape:snap-object-midpoints="true" + inkscape:object-nodes="false" + inkscape:snap-nodes="false" + inkscape:snap-bbox="true" + inkscape:snap-bbox-midpoints="true" + fit-margin-top="40" + fit-margin-right="40" + fit-margin-bottom="40" + fit-margin-left="40" /> @@ -525,7 +943,7 @@ image/svg+xml - + @@ -533,554 +951,692 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-123.98479,-154.29596)"> + transform="translate(-24.322249,-70.603499)"> + inkscape:groupmode="layer" + id="layer11" + inkscape:label="shadow" + style="display:inline"> + inkscape:connector-curvature="0" + id="path5056" + d="M -317.92145,125.56624 C -354.79559,125.56624 -384.7677,154.91794 -385.8277,191.53499 C -460.904,214.17941 -520.1115,273.36895 -542.7652,348.44124 C -579.3688,349.51846 -608.734,379.51507 -608.734,416.37874 C -608.734,453.24241 -579.3688,483.20886 -542.7652,484.28499 C -520.1179,559.36489 -460.9135,618.54987 -385.8277,641.19124 C -384.7677,677.80944 -354.79559,707.19124 -317.92145,707.19124 C -281.04731,707.19124 -251.04502,677.80944 -249.98395,641.19124 C -174.91166,618.54347 -115.72212,559.35537 -93.0777,484.28499 C -56.46065,483.22499 -27.10895,453.25288 -27.10895,416.37874 C -27.10895,379.5046 -56.46065,349.50231 -93.0777,348.44124 C -115.72852,273.37847 -174.92118,214.18581 -249.98395,191.53499 C -251.04502,154.91794 -281.04731,125.56624 -317.92145,125.56624 z M -317.92145,188.31624 C -191.96865,188.31624 -89.85895,290.42594 -89.85895,416.37874 C -89.85895,542.33151 -191.96865,644.44124 -317.92145,644.44124 C -443.8743,644.44124 -545.984,542.33151 -545.984,416.37874 C -545.984,290.42594 -443.8743,188.31624 -317.92145,188.31624 z" + 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" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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" + transform="matrix(1.0185,0,0,1.0185,-693.50589,2.034528)" /> + style="color:#000000;fill:url(#linearGradient5148);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M -538.73398,346.40014 C -576.27864,346.40014 -606.73398,376.85548 -606.73398,414.40014 C -606.73398,451.9448 -576.27864,482.36889 -538.73398,482.36889 C -539.66341,479.2916 -540.55387,476.21683 -541.35898,473.08764 C -542.32425,469.33595 -543.20193,465.53442 -543.98398,461.71264 C -544.76603,457.89086 -545.45257,454.0371 -546.04648,450.15014 C -546.64039,446.26318 -547.14562,442.34735 -547.54648,438.40014 C -547.94734,434.45293 -548.24984,430.46519 -548.45273,426.46264 C -548.65562,422.46009 -548.73398,418.45311 -548.73398,414.40014 C -548.73398,410.34717 -548.65562,406.30894 -548.45273,402.30639 C -548.24984,398.30384 -547.94734,394.3161 -547.54648,390.36889 C -547.14562,386.42168 -546.64039,382.50585 -546.04648,378.61889 C -545.45257,374.73193 -544.76603,370.87817 -543.98398,367.05639 C -543.20193,363.23461 -542.32425,359.46433 -541.35898,355.71264 C -540.55346,352.58183 -539.66395,349.479 -538.73398,346.40014 z" + id="path5104" + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" + id="path5106" + d="M -93.10898,346.40014 C -55.56432,346.40014 -25.10898,376.85548 -25.10898,414.40014 C -25.10898,451.9448 -55.56432,482.36889 -93.10898,482.36889 C -92.17955,479.2916 -91.28909,476.21683 -90.48398,473.08764 C -89.51871,469.33595 -88.64103,465.53442 -87.85898,461.71264 C -87.07693,457.89086 -86.39039,454.0371 -85.79648,450.15014 C -85.20257,446.26318 -84.69734,442.34735 -84.29648,438.40014 C -83.89562,434.45293 -83.59312,430.46519 -83.39023,426.46264 C -83.18734,422.46009 -83.10898,418.45311 -83.10898,414.40014 C -83.10898,410.34717 -83.18734,406.30894 -83.39023,402.30639 C -83.59312,398.30384 -83.89562,394.3161 -84.29648,390.36889 C -84.69734,386.42168 -85.20257,382.50585 -85.79648,378.61889 C -86.39039,374.73193 -87.07693,370.87817 -87.85898,367.05639 C -88.64103,363.23461 -89.51871,359.46433 -90.48398,355.71264 C -91.2895,352.58183 -92.17901,349.479 -93.10898,346.40014 z" + style="color:#000000;fill:url(#linearGradient5150);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + + + + + - - N - + transform="matrix(1.6846723,0,0,1.6846723,-763.69298,532.62267)" + style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#515153;fill-opacity:1;stroke:none;font-family:WRC Clean Bold;-inkscape-font-specification:'WRC Clean Bold,'" + id="g5122" /> - - E - - - - S - - - - W - - - - + id="g5310" + style="opacity:0.76315792000000005;fill:#353434;fill-opacity:0.75416666;stroke:#353434;stroke-opacity:0.77500000000000002;filter:url(#filter5338)" + transform="translate(-0.19970867,0.199512)"> + style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#353434;fill-opacity:0.75416666;stroke:#353434;stroke-width:0.84838879000000000;stroke-miterlimit:4;stroke-opacity:0.77500000000000002;stroke-dasharray:none;font-family:WRC Clean Bold;-inkscape-font-specification:'WRC Clean Bold,'" + id="g5312" + transform="matrix(1.1787049,0,0,1.1787049,376.32226,334.65436)"> - - + + + + + + transform="matrix(1.1787049,0,0,1.1787049,376.32226,334.65436)" + id="text5226" + style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#353434;fill-opacity:1;stroke:#353434;font-family:WRC Clean Bold;-inkscape-font-specification:'WRC Clean Bold,';stroke-width:0.84838877;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + inkscape:groupmode="layer" + id="layer13" + inkscape:label="Sats" + style="display:inline"> + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/images/marker.svg b/ground/openpilotgcs/src/plugins/gpsdisplay/images/marker.svg index e57b1ebd9..bdd7cfbf4 100644 --- a/ground/openpilotgcs/src/plugins/gpsdisplay/images/marker.svg +++ b/ground/openpilotgcs/src/plugins/gpsdisplay/images/marker.svg @@ -13,7 +13,7 @@ height="266.91373" id="svg2" version="1.1" - inkscape:version="0.47 r22583" + inkscape:version="0.48.5 r10040" sodipodi:docname="marker.svg"> @@ -32,17 +32,19 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.49497475" - inkscape:cx="-190.24238" + inkscape:zoom="1.4481878" + inkscape:cx="88.375982" inkscape:cy="166.06585" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1366" - inkscape:window-height="693" + inkscape:window-width="1280" + inkscape:window-height="928" inkscape:window-x="0" - inkscape:window-y="24" - inkscape:window-maximized="1" /> + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:snap-page="true" + inkscape:snap-object-midpoints="true" /> @@ -61,24 +63,24 @@ id="layer1" transform="translate(-81.1701,-431.51432)"> + sodipodi:type="arc" + style="color:#000000;fill:none;stroke:#ff0405;stroke-width:62.96201527;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path2987" + sodipodi:cx="132.45686" + sodipodi:cy="133.45686" + sodipodi:rx="132.45686" + sodipodi:ry="133.45686" + d="M 264.91373,133.45686 A 132.45686,133.45686 0 1 1 0,133.45686 A 132.45686,133.45686 0 1 1 264.91373,133.45686 z" + transform="matrix(0.63530368,0,0,0.63530368,130.16715,480.18555)" /> + style="fill:none;stroke:#ff0405;stroke-width:40;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="M 214.31748,698.42805 L 214.31748,431.51432" + id="path3757" + inkscape:connector-curvature="0" /> - + inkscape:connector-curvature="0" + id="path3759" + d="M 347.77435,564.97118 L 80.860621,564.97118" + style="fill:none;stroke:#ff0405;stroke-width:40;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/widgetresources.qrc b/ground/openpilotgcs/src/plugins/gpsdisplay/widgetresources.qrc index 6cd5b5343..1d33cce9b 100644 --- a/ground/openpilotgcs/src/plugins/gpsdisplay/widgetresources.qrc +++ b/ground/openpilotgcs/src/plugins/gpsdisplay/widgetresources.qrc @@ -3,5 +3,6 @@ images/gpsEarth.svg images/flatEarth.png images/marker.svg + font/digital-7.ttf