From 5a18205f3679492f4329306eedc7d55eb1f56cfa Mon Sep 17 00:00:00 2001
From: Laurent Lalanne <f5soh@free.fr>
Date: Thu, 28 Dec 2017 12:57:39 +0100
Subject: [PATCH] LP-572 Ressource cleannup lib/opmap - Fix UAV markers size
 and WP marker names

---
 .../src/mapwidget/images/airplane.png         | Bin 1747 -> 1728 bytes
 .../src/mapwidget/images/airplanepip.png      | Bin 13242 -> 3276 bytes
 .../src/mapwidget/images/marker.png           | Bin 858 -> 0 bytes
 .../src/mapwidget/images/waypoint_marker3.png | Bin 1613 -> 0 bytes
 .../src/mapwidget/images/wp_marker_green.png} | Bin
 ...point_marker2.png => wp_marker_orange.png} | Bin
 ...waypoint_marker1.png => wp_marker_red.png} | Bin
 .../src/mapwidget/mapresources.qrc            |  20 +++++++-----------
 .../src/mapwidget/waypointitem.cpp            |  20 +++++++++---------
 .../plugins/opmap/images/waypoint_marker1.png | Bin 1719 -> 0 bytes
 .../plugins/opmap/images/waypoint_marker2.png | Bin 1737 -> 0 bytes
 ground/gcs/src/plugins/opmap/opmap.qrc        |   3 ---
 .../src/plugins/opmap/opmapgadgetwidget.cpp   |   4 ++--
 13 files changed, 20 insertions(+), 27 deletions(-)
 delete mode 100644 ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/marker.png
 delete mode 100644 ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/waypoint_marker3.png
 rename ground/gcs/src/{plugins/opmap/images/waypoint_marker3.png => libs/opmapcontrol/src/mapwidget/images/wp_marker_green.png} (100%)
 rename ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/{waypoint_marker2.png => wp_marker_orange.png} (100%)
 rename ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/{waypoint_marker1.png => wp_marker_red.png} (100%)
 delete mode 100644 ground/gcs/src/plugins/opmap/images/waypoint_marker1.png
 delete mode 100644 ground/gcs/src/plugins/opmap/images/waypoint_marker2.png

diff --git a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/airplane.png b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/airplane.png
index 81c73a7c4c64b6cd051923f31a1f552ea262d79d..bbf8ea43dc29f38b5ac67867df4d5b81b8118869 100644
GIT binary patch
delta 1694
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

delta 1713
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
Hu0mjfH;f_N

diff --git a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/airplanepip.png b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/airplanepip.png
index d9b2279fc6e0e54a2e98d0b18349f5731f1afbdb..ede869985f3525d653297a8ef9e066561ff558c4 100644
GIT binary patch
delta 3229
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
P00000NkvXXu0mjf!)xxK

literal 13242
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

diff --git a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/marker.png b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/marker.png
deleted file mode 100644
index d3770dd74a3a88cfbc6c870530c0283bec7fdf5c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 858
zcmV-g1Eu_lP)<h;3K|Lk000e1NJLTq000yK001Hg1^@s6U#j`N00004XF*Lt006JZ
zHwB960009KNkl<ZNXM;~OH31C5XYBC1))5w2ox+(Xh9G)K?Okyico__p=vax2SF$i
zXlaWN6dy=DkO(56Coh;7PacgI4|wpbiBV!=;zd9s6oZdQOvsM^DJ{|$kCsV(NweSX
zuRA;6%&s8#k95!ohQT8z4?r`>64nq=pa)DvOC(e%Pok4KS#%2QOGzf_1_@zp2K0iM
zm1IirS}u*IzJnz+(Rx;-t7egISjho?e`%{1hYo2-5hG>sd$7%)Oa;cZ849vn8b#{v
zAnIx->TGkT%S^mBYip(&m6E03K)$DJBY1OIsi41|CZcOTM4sTBdB}C@OqPBCu}g*B
zsYr9mY7|!`TfEzLn!Rvd%#4p^X`f3b2cHKjOC71KTIK@RJglx@;gqumf<8(TP7|gE
ze&}u|Pqx)l_x`<<mmqV%zxkM(5ZBm|*`~+{mNv1le|K`C&jPRj>u&Hdue-c%p)y4Z
zuMe_t<hWXiZDI2|k?+b=$j7{dH*Hjxm(A-V4q*){#Rr2C8n)*w3J3PcgH72=<!PzB
zKE%R0Zm~)8xd4k|q8Zy_QH(511(Wx+<$-M*q&sr7l4W*hw>je0R%~p$ty%QhZhkkm
znSNeu5moVVEbL#}DN-<2i)zpFFz`s-CrA~4E;_6G3CKMAIfql%=c>`C7NRSr<%KAO
zaaSJ8rom2s6Q=<D=qWA2v*}p2-G-~mST+YVE6v0+A=n--4JQ_6px2bK&^x0+j0z8D
zVe4wA_T&65n`!QHtLT+Fghw*dSvI<s*FXlCy;rGm?;t$4=ckXkHhGD##<-)zocnXB
z<^Nq`2xygQEPEyd5DM_?sjhnASz>>V84VN~62d~Q5MVrU3=S3|^&U+T%ian>giaP2
zN#CtTN4kY6Ni4h_j4*+VGpetpX-gADgoUxNSO_v+-K{94QN503UqN)R!oh|exzu~0
zn1wHdbqJ#d?+gAM@ti1uhBiGehO%Yx<otLFItn&~g}Mq-wH`t>5S{H-v>w7l@Y^X=
kt%ooId<5elZl#m|0Vk{&vLebb#Q*>R07*qoM6N<$f<X&<VgLXD

diff --git a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/waypoint_marker3.png b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/waypoint_marker3.png
deleted file mode 100644
index bd86af025460b0a36bdb8265d57eda59a3fc6b86..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1613
zcmV-T2D15yP)<h;3K|Lk000e1NJLTq000yK001Hg1^@s6U#j`N00007bV*G`2igh;
z1}_>z<p@*&000SaNLh0L01EH`01EH{Laa2H00004XF*Lt006O%3;baP000HtNkl<Z
zc-oa#TWl0%6h8m#%-*_f7ur%v0Vy{DQ4|w{2@xU+iN*&EPsW5qBN3xdCZYxsAB+Km
zF$M#qgm{TQh&&OYq+SStNPx<%EiKX(XkoYA?sfJ)SI_r%TdUkBJ-gePf4=`a-#Ooz
z5l`-DrfI7~G`p^a0-h?$T4{=AZc)0k_(-y&@IvBrei?t)(AbgVxWw^0M?X%uu1k{-
zb^5w$dMv!0!s=AY+gZwqOi-w_MGY#OgEPGifkurQo(qwgvMJkNru6wDnOQr@_qK9;
z#*v*2C_cQgk(#`-$#P9fTgjHB6+2jVO3N1p9;dnfMQ%U|QqIl_-A)mQ`**REI*wct
zJv&CIaMS2!j1A1PcLH$F@TcTc{9reqZ#-6`hG(t_J@0yiM}TqG&QQ+LY4YzJfA^Ix
z)A4t^DB7;a7-tQGb^%bS_SBMx)PPs<AD9<dJab)m1MxXwyEYkaSu)3OsgKaeF9MQ4
zqt;BTzFta=YpSR5rJscmQfEcd6yk%hr|zj|s#dug-&AsoNDmTF+D=fOS>c>Z4l#4`
zF=$W;$ym01h8t+o7BS2=3Fwg1#NThu@hu=t@e0;YRyt+HC1~Es5zc`ruO)>6y~0O9
z?g%igs;&}qUY`oAjZCaXE!g?hd|_6D)<mXbP=Nu!3VQXId#LSj8}+xwWy*8ks-v|p
zzer8mEYcVh>4PzMf!nt`-eBhKH45MSw8EL=0yG047e}TDu(NLuQu16uM#ttMYCrs|
zWC>|FBYB^9ibn)yY1nhAGHOQaicWzHW(N?YXELzEg&1cx`54%j7;BF)`Q_m{1W^2}
zRinnBZ0a(DA!W0o)%^|>2rj{T*LEeSEJ`dMOLZ5{$yCdgN-CAz=WVLL4G21p13@BL
zu$)6iLbjH!W_!vVx_gsuuD?c8)Oy)-NC!Htduc7v-uByyf{K?|CKS%hSyYUgZZTpA
zUeYBNZ)t2U$E-8Ye!OJHYxVEQov|2<p{pwe_*VjeL37rg21>n@8r12=k14wLT>|2+
zP>Mt5txQ*G-yiQ?r0eCYF47ox1u7}oRwMuzQiSyq<_P6dc`6JVZsc$Vm%n8x`jm3g
zg2{JAkLs7d_~<LaP3?ja+i?PPd`tll%;O9;VnnDkV!C~M<Dwk51}c+>onmrQWfybq
z)q!skk?o&+E>Lamdf8`cg{4iFOf|!Hj9C#X-ZH6oXH4*{guv^0!{mgQwQAWzS2$j|
zx@T11)AprI6D$D=aBPB!GinV}HkqUA-zRDGWUd4v40dT;V+DG98@SuUD*ivmvFY?1
zgLGU!BGUy!fJ0mOJ7L5qek$({9Y|yS`wVtsa$6}peMzhJP-woF{0$n|{G@oq4{cjd
z!Z|K0DHkGLc)S#`XkdRr*oJeAPw)PJpDJdWDe@nWd#ZiHPt}jI>8GpPxbm3;@m7I;
zM3K<+=)2+HbjoxWaqreUIY=?m7M>C0@hcRX=cAe>ehSX<URT3P>y`ac^rQ=4qg}8z
za!AL0zi|9{M?h(tQJd_7BMn}&kXbJ95kH)Eu>*1^^rHe*M$71zOQiRr4z%lT9#^<!
z$jC5*xFu8PbSc!rfX&(vSO3t3vll1aGIA_Sm5R3C6%Zd_2SAy6Pyv|KRGZ>Ch&dSN
zRzYJY&lIry(7mRRiiM6zWbktr6GQM8zIv4upTKq}*jky3`O~#%o!m8P%Om#$9JiHZ
z$u@)pYDgIawAf`CyEA$rzLMGU#_lkUy*b<)P^N7-^6kK4V1V(Pg9PV7{gu61URjwB
zogDcG0(7}1rtZjLi33`yH41Fm&48GBbU$|g1+1iv!eC&?5s1Q@?v3n~GR72^^*k`3
zOuNK@+(J&CN4#dsLNT*=;#7WY6QaR~0)%F;B3j5c6wFD=^_R2!yagIYy#8>2%mVg;
zUP@X>SESAtF^<uIRUC<j0)&pRA^HuEMZ630AOK*5Bfv3wKfr$g@$Rda|AhR!00000
LNkvXXu0mjfdyezZ

diff --git a/ground/gcs/src/plugins/opmap/images/waypoint_marker3.png b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/wp_marker_green.png
similarity index 100%
rename from ground/gcs/src/plugins/opmap/images/waypoint_marker3.png
rename to ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/wp_marker_green.png
diff --git a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/waypoint_marker2.png b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/wp_marker_orange.png
similarity index 100%
rename from ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/waypoint_marker2.png
rename to ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/wp_marker_orange.png
diff --git a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/waypoint_marker1.png b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/wp_marker_red.png
similarity index 100%
rename from ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/waypoint_marker1.png
rename to ground/gcs/src/libs/opmapcontrol/src/mapwidget/images/wp_marker_red.png
diff --git a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/mapresources.qrc b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/mapresources.qrc
index 3e0c53a0e..1bb14fffd 100644
--- a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/mapresources.qrc
+++ b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/mapresources.qrc
@@ -1,25 +1,21 @@
 <RCC>
     <qresource prefix="/markers">
         <file>images/bigMarkerGreen.png</file>
-        <file>images/marker.png</file>
+        <file>images/wp_marker_green.png</file>
+        <file>images/wp_marker_orange.png</file>
+        <file>images/wp_marker_red.png</file>
         <file>images/compas.svg</file>
-        <file>images/airplane.svg</file>
+        <file>images/home2.svg</file>
+        <file>images/nav.svg</file>
         <file>images/home.png</file>
         <file>images/home.svg</file>
-        <file>images/nav.svg</file>
-        <file>images/home2.svg</file>
-        <file>images/airplanepip.png</file>
-        <file>images/EasystarBlue.png</file>
-        <file>images/mapquad.png</file>
         <file>images/dragons1.jpg</file>
         <file>images/dragons2.jpeg</file>
-        <file>images/waypoint_marker1.png</file>
-        <file>images/waypoint_marker2.png</file>
-        <file>images/waypoint_marker3.png</file>
     </qresource>
     <qresource prefix="/uavs">
-        <file>images/airplanepip.png</file>
-        <file>images/EasystarBlue.png</file>
         <file>images/mapquad.png</file>
+        <file>images/airplanepip.png</file>
+        <file>images/airplane.png</file>
+        <file>images/EasystarBlue.png</file>
     </qresource>
 </RCC>
diff --git a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
index 010a5c393..c256f56b2 100644
--- a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
+++ b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
@@ -35,7 +35,7 @@ WayPointItem::WayPointItem(const internals::PointLatLng &coord, int const & alti
     text    = 0;
     numberI = 0;
     isMagic = false;
-    picture.load(QString::fromUtf8(":/markers/images/marker.png"));
+    picture.load(":/markers/images/wp_marker_red.png");
     number  = WayPointItem::snumber;
     ++WayPointItem::snumber;
     this->setFlag(QGraphicsItem::ItemIsMovable, true);
@@ -64,7 +64,7 @@ WayPointItem::WayPointItem(MapGraphicItem *map, bool magicwaypoint) : reached(fa
     myType = relative;
     if (magicwaypoint) {
         isMagic = true;
-        picture.load(QString::fromUtf8(":/opmap/images/waypoint_marker3.png"));
+        picture.load(":/markers/images/wp_marker_green.png");
         number  = -1;
     } else {
         isMagic = false;
@@ -95,7 +95,7 @@ WayPointItem::WayPointItem(const internals::PointLatLng &coord, int const & alti
     text    = 0;
     numberI = 0;
     isMagic = false;
-    picture.load(QString::fromUtf8(":/markers/images/marker.png"));
+    picture.load(":/markers/images/wp_marker_red.png");
     number  = WayPointItem::snumber;
     ++WayPointItem::snumber;
     this->setFlag(QGraphicsItem::ItemIsMovable, true);
@@ -128,7 +128,7 @@ WayPointItem::WayPointItem(const distBearingAltitude &relativeCoordenate, const
     text    = 0;
     numberI = 0;
     isMagic = false;
-    picture.load(QString::fromUtf8(":/markers/images/marker.png"));
+    picture.load(":/markers/images/wp_marker_red.png");
     number  = WayPointItem::snumber;
     ++WayPointItem::snumber;
     this->setFlag(QGraphicsItem::ItemIsMovable, true);
@@ -301,16 +301,16 @@ void WayPointItem::SetReached(const bool &value)
     reached = value;
     emit WPValuesChanged(this);
     if (value) {
-        picture.load(QString::fromUtf8(":/markers/images/bigMarkerGreen.png"));
+        picture.load(":/markers/images/bigMarkerGreen.png");
     } else {
         if (!isMagic) {
             if ((this->flags() & QGraphicsItem::ItemIsMovable) == QGraphicsItem::ItemIsMovable) {
-                picture.load(QString::fromUtf8(":/markers/images/marker.png"));
+                picture.load(":/markers/images/wp_marker_red.png");
             } else {
-                picture.load(QString::fromUtf8(":/markers/images/waypoint_marker2.png"));
+                picture.load(":/markers/images/wp_marker_orange.png");
             }
         } else {
-            picture.load(QString::fromUtf8(":/opmap/images/waypoint_marker3.png"));
+            picture.load(":/markers/images/wp_marker_green.png");
         }
     }
     this->update();
@@ -436,9 +436,9 @@ void WayPointItem::setFlag(QGraphicsItem::GraphicsItemFlag flag, bool enabled)
         return;
     } else if (flag == QGraphicsItem::ItemIsMovable) {
         if (enabled) {
-            picture.load(QString::fromUtf8(":/markers/images/marker.png"));
+            picture.load(":/markers/images/wp_marker_red.png");
         } else {
-            picture.load(QString::fromUtf8(":/markers/images/waypoint_marker2.png"));
+            picture.load(":/markers/images/wp_marker_orange.png");
         }
     }
     QGraphicsItem::setFlag(flag, enabled);
diff --git a/ground/gcs/src/plugins/opmap/images/waypoint_marker1.png b/ground/gcs/src/plugins/opmap/images/waypoint_marker1.png
deleted file mode 100644
index bc58687409ccce2fbc8eeea11be50e2aa60778f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1719
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
N002ovPDHLkV1lo;H9P<S

diff --git a/ground/gcs/src/plugins/opmap/images/waypoint_marker2.png b/ground/gcs/src/plugins/opmap/images/waypoint_marker2.png
deleted file mode 100644
index 8a0629a26fe13bc1ad673a79c3d5ee26408c06f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1737
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

diff --git a/ground/gcs/src/plugins/opmap/opmap.qrc b/ground/gcs/src/plugins/opmap/opmap.qrc
index 10073e59e..348351c6c 100644
--- a/ground/gcs/src/plugins/opmap/opmap.qrc
+++ b/ground/gcs/src/plugins/opmap/opmap.qrc
@@ -14,14 +14,11 @@
         <file>images/hold.png</file>
         <file>images/go.png</file>
         <file>images/combobox_down_arrow.png</file>
-        <file>images/waypoint_marker2.png</file>
-        <file>images/waypoint_marker1.png</file>
         <file>images/uav_heading.png</file>
         <file>images/uav_trail.png</file>
         <file>images/uav_trail_clear.png</file>
         <file>images/minus.png</file>
         <file>images/plus.png</file>
-        <file>images/waypoint_marker3.png</file>
         <file>images/home_wp.png</file>
         <file>images/move_to_wp.png</file>
         <file>images/center_wp.png</file>
diff --git a/ground/gcs/src/plugins/opmap/opmapgadgetwidget.cpp b/ground/gcs/src/plugins/opmap/opmapgadgetwidget.cpp
index 8db51bbda..01071b9e8 100644
--- a/ground/gcs/src/plugins/opmap/opmapgadgetwidget.cpp
+++ b/ground/gcs/src/plugins/opmap/opmapgadgetwidget.cpp
@@ -1984,9 +1984,9 @@ void OPMapGadgetWidget::onLockWayPointAct_triggered()
     m_mouse_waypoint->setFlag(QGraphicsItem::ItemIsMovable, locked);
 
     if (!locked) {
-        m_mouse_waypoint->picture.load(QString::fromUtf8(":/opmap/images/waypoint_marker2.png"));
+        m_mouse_waypoint->picture.load(":/markers/images/wp_marker_orange.png");
     } else {
-        m_mouse_waypoint->picture.load(QString::fromUtf8(":/opmap/images/waypoint_marker1.png"));
+        m_mouse_waypoint->picture.load(":/markers/images/wp_marker_red.png");
     }
     m_mouse_waypoint->update();