From d706f1dc7b5d4f1cd95e6568978314b8d8fc2b16 Mon Sep 17 00:00:00 2001 From: dankers Date: Tue, 13 Jul 2010 23:53:51 +0000 Subject: [PATCH] Add Easystar blue version from Ed's SVG. Easier to see on the map and matches modelview. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1089 ebee16cc-31ac-478f-84a7-5cbb03baadba --- artwork/Misc/EasystarBlue.svg | 289 ++++++++++++++++++ .../src/mapwidget/images/EasystarBlue.png | Bin 0 -> 1511 bytes .../src/mapwidget/mapresources.qrc | 25 +- .../opmapcontrol/src/mapwidget/uavitem.cpp | 7 +- 4 files changed, 305 insertions(+), 16 deletions(-) create mode 100644 artwork/Misc/EasystarBlue.svg create mode 100644 ground/src/libs/opmapcontrol/src/mapwidget/images/EasystarBlue.png diff --git a/artwork/Misc/EasystarBlue.svg b/artwork/Misc/EasystarBlue.svg new file mode 100644 index 000000000..23918a394 --- /dev/null +++ b/artwork/Misc/EasystarBlue.svg @@ -0,0 +1,289 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + (c) Edouard Lafargue + + + + + CC-BY-SA + + + 13.07.2010 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ground/src/libs/opmapcontrol/src/mapwidget/images/EasystarBlue.png b/ground/src/libs/opmapcontrol/src/mapwidget/images/EasystarBlue.png new file mode 100644 index 0000000000000000000000000000000000000000..aa0968b5c61ed10167768db763d2eb201a4701f3 GIT binary patch literal 1511 zcmVJdz;?3Q=pJHZZ%9mwoVgT5?ckjmb_V$fhYwX#xX9IvUrhExg69Yg?OH1pW`ts$= z+f4d03X(`9TJEX;cR@m-P%NEJqp!aowrxjE`ZBsl&YnH{$hmXp@Z|dSAR!_qeHmSm z-rn9C0statt<4>eFbo1f->E2N?BoSt7$lWS4LObj&+}m0wowu)fA2kUa=7QK@fkrX6V1-j4e!2QoqX(#aC}kYUqX6t&@&8i$J5u| zd){l(T4Ud_@Q_o}wrHk+OTd~wZ+2+#kKvy_`sLgA58N8>D*(5T--eE^+Lg~8Iu);9 zkpcjvypjR#Cq>~p*Udr*fdJtJGVmU3bYB&L?8>^vy4Fqmomle4hK{bMf9p9uW)TrR z{=$*Nm33{YDFC26h@!0qOW*e)rGy4crTl3D%}-Odm33{YtJrSaS7_ zAeem>=CUvDwbxpaQVK)_t(BPmqDqIE`SUAw#*(Xdw0G{`Wrbq(>*l)>(*gf(r*$Ak zM@L~<7PL;#bU)JrnmypzG&MLBt6yh9+N&mS_7AJTO|$Z^0i;1>0gyyw0VDykK#%}g z1djYuc%0<4%3p!jbRFjxV6w+*lc-`kI3 z30BM;08n5K02UnjGkM(~2$>exnxjXT$h{$eOxUee{4!2&8Z`voN z6xs8q4i{WEJv=gUyp(&PR8=IJL$%8`zf#hLIA0Nw{pHc48QZpFc@I24+02EC6GMdH%0Bi00S_=UF0|%EO^B{oF%z{mR!*~cFVD`XVUW!nH%&!Qu z$Nw9Ua+9_a^icK)m`(qQng>xq5HPbe?Z-IC_3PKc<)ynN$vBAC+6T=of1Z#2krai9 z16-_ N002ovPDHLkV1jyjsYL() literal 0 HcmV?d00001 diff --git a/ground/src/libs/opmapcontrol/src/mapwidget/mapresources.qrc b/ground/src/libs/opmapcontrol/src/mapwidget/mapresources.qrc index 36db8b87d..a5589c372 100644 --- a/ground/src/libs/opmapcontrol/src/mapwidget/mapresources.qrc +++ b/ground/src/libs/opmapcontrol/src/mapwidget/mapresources.qrc @@ -1,12 +1,13 @@ - - - images/bigMarkerGreen.png - images/marker.png - images/compas.svg - images/airplane.svg - images/home.png - images/home.svg - images/home2.svg - images/airplanepip.png - - + + + images/bigMarkerGreen.png + images/marker.png + images/compas.svg + images/airplane.svg + images/home.png + images/home.svg + images/home2.svg + images/airplanepip.png + images/EasystarBlue.png + + diff --git a/ground/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp b/ground/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp index 09a727598..a62b6da98 100644 --- a/ground/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp +++ b/ground/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp @@ -3,7 +3,6 @@ * * @file uavitem.cpp * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. -* Parts by Nokia Corporation (qt-info@nokia.com) Copyright (C) 2009. * @brief A graphicsItem representing a UAV * @see The GNU Public License (GPL) Version 3 * @defgroup OPMapWidget @@ -29,11 +28,11 @@ #include "uavitem.h" namespace mapcontrol { - UAVItem::UAVItem(MapGraphicItem* map,OPMapWidget* parent):map(map),mapwidget(parent),showtrail(true),trailtime(5),traildistance(100),autosetreached(true) + UAVItem::UAVItem(MapGraphicItem* map,OPMapWidget* parent):map(map),mapwidget(parent),showtrail(true),trailtime(5),traildistance(50),autosetreached(true) ,autosetdistance(100) { - pic.load(QString::fromUtf8(":/markers/images/airplanepip.png")); - pic=pic.scaled(45,45,Qt::IgnoreAspectRatio); + pic.load(QString::fromUtf8(":/markers/images/EasystarBlue.png")); + pic=pic.scaled(50,33,Qt::IgnoreAspectRatio); localposition=map->FromLatLngToLocal(mapwidget->CurrentPosition()); this->setPos(localposition.X(),localposition.Y()); this->setZValue(4);