From 5a18205f3679492f4329306eedc7d55eb1f56cfa Mon Sep 17 00:00:00 2001 From: Laurent Lalanne 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 zcmV;P24VTr4ZsZ{iBL{Q4GJ0x0000DNk~Le0000o0000h2nGNE06ON|;*lW}5(#if zS#tmY4c7nw4c7reD4TeZV<>+;NklhhnVmoIPwcf9rvZ{sI{~Mr zsVEguq6i{2O<&R^YecDNkn++$+NiDa=-G#;Rn(?MRi)CTrE1h}*s*~$A&pcbxrtDv z2nDFZrmb3pe*y#tjJ-dzvomu~AM7|7uOZl;;#B^md6>EPo^!r?&OLwU-aEh&mav4Y zf#MXNPUn=ZTlIBB+{sMu?Azy`blvVK4qZwdLIJ>W9I<)x&EFjw9>^Uza^z9NOgyo1 zQ)8iX?VWG+_xE#LdKVnoY_{#!&;7Pw7={GErfJH(zx(~zo;`b-%0HJAy>$-xO!$W`V0|TdHt@?Ap8-ML50zFWx zZ3dAb!16+&u;@qtK&e!sFbtb&wbiI2`g^UdDS25sTr_BIPO>7@p;~PRaF5b$;{aEwkqB|0PnX75sxAJ{4`*^1y2{ ztnRMWXSRR%pvIoyA zQ>9Xw)}|;5Ow)vA+id7MRCRhiHVgxbs-eEFj_Vs5(Av_<>pDB-%3D_c2f#CD&kp}_ z*REau^$_`xj0ghdQ>LljA4PmKNHznw2_O?h0?dDPR}NyZO`tjgnhza%CAD|&ZwLTx zS-Fy*eRj7;z%UaoL9z#;=|&Niz#Iso_al}cC`5x%B>r~z@VQfMZD%9Lab}H>tL?S8 zySqCAFyJ`O3jom5(*xIaubBldj*g0(lBtIc)68P>%wt;?i0Jh*?+vC?sZ==0x+We; zr#XL<$p8Qx$Kly~#tdereZ9S3{N9t_4=0V_&))qx>GmFYA(zX=a+sUz?)Tb)Nh_MB zIW?1(Wif%q9!sZVncY~9f(6rL!9M#kWd^u1|lxPk2O*_4M?7vew9Lw>6ec)0(=&vMdWy z%1@q03WWmeMq;Y8+qTWBniz{q-+~fhW^x=yIF2JmMn;6HC`DD(005?CBMif$>q0n= zBPOqe7Ho^XAcB}#WV6|%rkR}()B%a*OmaDq_~y>9f32}tEaE3W{h3^~`qt+Fc|m_N z-Un!qq;evke|yMrobZMdVP>Uw|AD73jgEcipZ|DQKXc{`O63wwUQE!NZ@vNF_i59n zd)TsVR)j!9LnAjQlW1@6;1z9cFO>>-V&~4UT$-;f^C3ZfeJ|bjqaQz0)imw8&-g^d zJ9a!Cx$gd_nR#AeKCi)QkzHH?psQ51dj3*^;9FDn-= zT;Lr$9+y{I+S1a(Yd+n6xLPTFb^G@1qw}$2L9&+PIAZPEwU(-?w}&B`h)7XTI#hn3;z2`Q!gu6j|$XT=~1ebzPw-#)goq^>=r5^{-j8 oraDde#7)hjyX08H68<0YUnQvl@xr?^)c^nh07*qoM6N<$f+!|FAOHXW delta 1713 zcmV;i22T0F4bu%FiBL{Q4GJ0x0000DNk~Le0001E0000|2nGNE06-mTosl6EF9CB> zM?wIu&K&6g000DMK}|sb0I`n?{9y$E000SaNLh0L01m_e01m_fl`9S#kwz$gGf6~2 zRCr$PT{%lEOBgLjz3v;hgCGiuE24pl2nvE47#V9M7zmmO8W=n?F*5Q8n3;%*3kaI1 zf!n=-xN9IN2=4oCy*mAF%Q*H-_ssO`>XIs`sh;kyYdNR(s;`<*!OiOGDs5V~_1{Q;kB*MgkdP2c2>D_I0s`p3z<_W`3qXunVuUmI_xB__ zJDVIIA8W=vA|iqu92}6Oq$FX|<`5>PE)g9b9(GFvL_yZj(2!8c6PAp*xj9{+7Z(?G zW$Yv%EE&Il|JKEEb8}Ny#!dpll5uu+rigL5cw}~ zb#+DF-`{mTl4R&Y`Sxw#D-5JL2?d{F5EN?*}$?zt( z2L=Z6#@KN9LXzRlq=6*Ea9;3D&}hkUIK;|pV#W3^cSgww3JUU#ZBB3f?-PYjPfz6W z@sX%5u3<5Egs!JA?&alwB{@1eG6Y$AdOC@Vi~C|@V`IPFi;RpUp`oE}trgXsCK>3% zV=4g&hQ-Y2&CQJ_sLmj}UgN(v^}8W-ISHYZc_K^e88Sg)Vxls0th$+*nItMIN;?(K zlm0BH(!s$&nvs$5ZH<7vE$^9tL0DKAZEkL+^YioH)>}RomlhU(7ARv+0&W7}Ml)_s zP7dAP-u@&-A%j&#G&wn05@8_`Dq&e!S(HuhD1@M4rKP2%k_Zk&sD#wl*HhL`Q!+U@ zDT&}ngh~ioETfLKwKY!t6B(>C0xK&kM3P~XJh8mIOaj@U>mQ6Eq~VJI2EPuBhNa<; z0A?c`d3kyKViyu7?z62gIy&d$!S6NUJ@2OS zs-j>|0`42&uDC&~suQ3da5kHO5+&;DC(r7 zq$u50mZ=qs@f@phJih4lhJ=@w7ljn;0*9+w{KuL%cJN^h9ag<|b+Nkx&sEp?8uwT| zN^Wm&72;ukagD8-{+jUcaAo~DIyzc$nF<=gMgv!iEk3x1b#K_<;9yOQ_p!ds7UmT2 zRTrBZd@){=;Y%Q9yn{@jk^{H8x|(1Ev^&$()I_?vx;}vi_*U%j@F%Up?3?=a>lb15 zE@7J`NKsLd0dsR5T{my<1S z{vv39;`_2>mZ;bV*G`2j2)03k54G_nn0R01LZGL_t(&-o06Ea~#KU ze!6FN_Vx~UIJ}b*08$buiE*SzCCmAc#EB|ZDdi8O{3ZDn`91j!`IIjye@LZVPGrlG zoY+)MTBi5{5CnL@z3uBvcRuVcd4M3t1R>2;*WB&x?({SLbkB4T;eQfa2;qgFF~(fV z*!D7kEHql^dEvUAkxL)&Qd(mX24Db03&M@!)q;2c0$h$&F3lnh2x>qi0G0qOH@#~V zp944nFa?k`fG)){mrX5dlpX-M0$_)Twuq>sK&c{!0PX|WM{SMJ$hQOJB2L@1)*5R7 z-T={i#WeliZ0~3o^?y2PXLER4RlCNRV2sHD6!ma__;}w$!&5+B0s!!wRy_b)AbKn0 z#b50G$FIJ>_sQ)zl$F2vqmOp5+O-UtuB@yaJLhJq`a<+t)Nv7%J@1A_sk4GJeH)P$ z@96?qM@^|)*=Txe^5`&5M`KJM9@_QaJba`3{Bh1Mp6j6~lZoM>d_KC<;hk#)JOg zjfsrkA)?34vlBe`l~!Z{l%Nh2CB7ca0&A@8 z5BfI%ED`Y^Hwu=G6o5Vlqo@?fp?U(~34lESj{qDr6MvAkU=}T6n;E?d;1-D91@K2w zR=c6}%MyZBQKKTPszz0fiWu>MLKP@f6^RcVLSPkzsNl(+`xu{$G0js{zQFxo-$D0Z ze~Rv~?>bA}T^qY?HYTuPC1zpfK!!ar2{8*X2R5cO&Yo~&zfzUkQ2dgJc)?nJ(IVW; z?hwE=5P!Yzv*NEtcOKk4{_;^L9ZgVXIeg_2f?3S~l2K{ih@ zJ{)0^P7x}P+n;=fM|baGu)2bz-$N8d%pfKZm71K0bJ|!kEK;ilvZEoqd-y+JzJGo2`Q2!GIKpf+MpcyX5+JG&G!g>5 z_Xys@iy%lqP(@Hdv3;V2HsW zP*C_;PWOKNY4^td(XChi_QNvGv!}gY@A1mY%8@ZW( zn139OP?jYs3GlL@bg0FL051VS1YYXzRq(ZV4^aUVqY{szDlwZ`L~LQ1VcFDC$Cw&~ zF^G(XWm5|=Pzg8)_J8(;9e!}*+Q_GGPN&oV?smJs?e%(eY8`nNjfgrvFFX116#2;v z>1cv%JVWWLS~2mcBp|f(YAkRHh}PiR`+rmwOm(lK5Dp0JVadRn8jNqOV%Wfvfio77 zv543pVgqJ_YM!H-XGtpQ+I%KUMNx3C*TY#LQag_pCborC0p&DBC@Me~7hZb)A*xqG zB`^_$>YkOstT0eO0EL2xYPt~D_cTJp3-6*+tM93mK^3mwg~nFWqq#z%-uq{YwSPd` zE%sbR592{^Z?LnuyZ2xJ8-=0-6TvV;)jZ=ND?!1vMOYAoVMq{|VMJhrVTch}00oE$ zmKlc3b4syku5s%_BW}*IEO2LdP`ai`Onib#2O9g)WSPXIh5V}7;$ z=kLBUKRUU7@85o5bUcHq0ALUShJOj70#QJzp%(;!1VIe~2|PGB$()wf@VSa z=aym^5DW;G7%p~LzOsRxAO4BBTUTdae0g_oHk*B!B*}quu4r^WWs#x*av!Rnx#eE` z*57@UU;V+YYoj|4y6Mv~7xNs&JVlk45D8EbNNB>aNbUIEqs()ZMTsKIF@K-TAl}1R zi>1|N#BmJQi4i#mYidVd2(vJeMchl!>GzNf`xxwQNwhI2ry(Ez?yIlvpBx{5>YV%e z*4EaerKP3ftVOh0SZ1hm1tuUT!%vcH8*g9TS-VD{6^JI{eWW4`1t|ciLbairVH4TN zF|&mz-T(C0_~}3WGv>z=tbguY!C(L5KcK(43IOUQRKD`1s0dI~4@5OPm{bX&D9a+t zvgzT;;nSx_PamdfdV6_!`LoT<&D%F_+!#6MDiJva1Pzc3zzBe6=9zQuv8vwA%Ir!} z6l<0D17B5L5s5(H)-9=t0Z|miJ-f8l?SAJ8jTLJG=KX^k|dwR&h0h6+2Q~IQPm(Km8urj+L?21X04sYahx`OQ8gfx zYAe=2j4|z2zNJ`b2ABaD8Dk=2jO}zf?d})n03lWF0ytFFhzPHl$Zk0o8_Nc9r-LeZ ze{^`XPei}m+S>ZhBuVz0aTeRz?Ym#lDbz-*5fjnreB>N3x_|JZvVBff7nMJ+0@H2e z5Wq1TYrdgn z37}-d(k^mQ62p7%0Zg59(4|R^e31AC#uKyZ`!nAcVS5F>EaGCNaGY&>Jf9 zIuzRg`XGRvh3zW;DYXjVI#fSQ zpN#)({(t!CPI@#>$}}fcMW{Tc`$vFb{N`VNf`iZRpfl)Mx759AW4Dp44Q>uzzj~dL zs6(LKIX5%L%yEI@_RCnr0q7I+mD%3W`w##9^EapaBT7eORCxh~LV}=}XYfUdr*|G; z`tT60o4^=GHOno0*x35Pt=`7R@6QVH2gBv%M}M1}n}^K&!V0|%5C&igaOvU6V07mp zrAH@7M-xTy3O_HvM1Uwr6ytmQvFu&h8Ksl$jrEP*>gp=Tar~VD zQPeyxRCU_hT6q)?mv$x(o;U)*MiE36tO8#sK!PZVK~3^RZIab-So`3n9Hi6e@&4lu z6n_*#kc%jEQ6PdQ5mVKNosHqoZvN;axAQmOzd@n{0xYynC-43E=NR36hMpdDzLPSDDq49(E z=s-|sh1zT=0lfIe@xsT`|Iabqsgo@t0#RG5sN3&*_#(UCmp*5I$#cg`0RaI22YWG< zq%vgcAOHXWC3HntbYx+4WjbSWWnN))WdJfTF*hwSGA%MVR536*H8eUiI4dwQIxsLv zGmswu001R)MObuXVRU6WZEs|0W_bWIFflbPFgPtSH&ih(IxsalG&3tOGCD9YibxS# P00000NkvXXu0mjf!)xxK literal 13242 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 images/bigMarkerGreen.png - images/marker.png + images/wp_marker_green.png + images/wp_marker_orange.png + images/wp_marker_red.png images/compas.svg - images/airplane.svg + images/home2.svg + images/nav.svg images/home.png images/home.svg - images/nav.svg - images/home2.svg - images/airplanepip.png - images/EasystarBlue.png - images/mapquad.png images/dragons1.jpg images/dragons2.jpeg - images/waypoint_marker1.png - images/waypoint_marker2.png - images/waypoint_marker3.png - images/airplanepip.png - images/EasystarBlue.png images/mapquad.png + images/airplanepip.png + images/airplane.png + images/EasystarBlue.png 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 zcmV;o21xmdP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00006VoOIv0RI600RN!9r;`8x z010qNS#tmY3ljhU3ljkVnw%H_00t{bL_t(Y$CZ^`Y#dh^hM#k0_GiZS+D^PSb^@(Q zltyU~NfD(|BLoyFH@zXWNL(N!P?5MpAb}8+p9^}$T_r987eOG@q=Aa6iV6}+L`f?O zsc3#2CvluOn|0UT-Ps-Q%$%9oIdiy}Br<8!koRWhV)V@WedqnYBMu!p#I9Ytn46oU zQmGI{5$$%HX0!Rw%F46`#Bq#L z%9T?7pjv`QFH-##u&4B2YBMd2}-3B zaUAcA2(+fJb5`12et7ClPB&ZYz*EMU^8nIu z9Hf*^sZ=`l(A1XgpWn5Us^bXKA;b!j1at-hWT`||2uAXp`q&7+_`;JsF*h>}yex#M z0Z0HL#P`P>XaBzK+l;gBlhs?;@CEhkW7p?;_0390ACkE%-czl ze6DQUAFaC%Br$CG&}~D{EPE`~KEER*)veA;eMPRA+abZPv?|t`_k?+!gsREb| zL2I~c0`8WpCkYqcB|F;_gYiae|V0GYPHCmWr1b$+`dNv-ghWjo)c#oK{{kG%;-dsSqmcp zoEHZV9^5t<4Br0kuerLq`s){7d!2rxVTe`H>2euLrNXTccVLOu4APX2Qgo7pwT;01{YDeuh%shK zhG9sr*Zbu=OIH`Z@w=l!`+bAfVB1ixfL$tp#xTrt!eK^N#jHh&b`+bV3ztPNNtSPI z9;DWqEXxAm&?}d&u72$ge-xw%NLc{O6_65b3~{FMlZ5q1(NYP&J-Z+-bi5AmC1Z>S zU`B0DL0kR?%q|n6avzOBuVj;lvWtgh-3b=aD`JhnlbRSG3H;l zQy`5ojE;`tx-P&wz_)&K>NIaHUx!K=DisitG}rW#g!Lrl?0f6x_2m_S?-^s>*c>Yv z$1#rMP_Ne+8yiCiaa3B??|*diG-)z4*fs!hRscJZ;+4fEG0gLmz_0GksZ>f~jA3$e zl5N|zF*7qmtyX*fN`J#Ye(|!vwjtLfTH|LqZ{1wwO3w%Q@dr(ijG~A*jwzK&)a!L- zXJ^^Eb?bG$=R$%rHGYO|4dY zaa|?B=|)o++ad*)y*|r@yBF^@<1))Klu`sifH8(zt;W>U6cZB@jcT>}>R+xkFvg&z z;GfMkOmU6=^`1b0G))PDfH;mRm&;5{OfWe)iR-$@FLe9#1|cTTIoIw2y!v5V$Tr5H zwI+%p!Z1V#!RY8HwrwMXc*FBN|K0V@xDnVs!uvV| z$n%^yj!B9|Nx596TCGy8Rxhlk8Bx#Ue(wGUc)RR4j?r3Uj3Li+wAL#(`h9v{AK>Eu z4FnhthbW~;(-h0Hh@uGJ_dAO>o9Ijf+;|}1=1gW;Mz7bS-EI$5Iy4k(cjJM8x8vjc zK2a3WYPD!I8a@yKBS80ofW{btAfVIfV2q*BXt27v>I18Q1GMi4{4bnRnHe0^_YVL7 N002ovPDHLkV1lo;H9P004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00006VoOIv0RI600RN!9r;`8x z010qNS#tmY3ljhU3ljkVnw%H_00uotL_t(Y$CZ^`h@4j$$A9O{yz|byvpYMx+0ACx zZ9;02*0j}V5ygg*wu(1}Vzq(=5nHN=2!f!9)+l1V@vc}QDnw9d(_l*|#kMwCEwQP( ziP>zj`JBz}Y-Z~xC871o&l`ufnvXUnGr@wh;gvDTEW`E z)N(&|&xpa@Qd7f((CY}6nz$WTU0ht{z~OV^H-~0v^qkYc7nD+GuK{0G$I!^(<8AZt zjtnEG?qj3M6AS17ZLqsg?~tx^u%nn>l(JZ9@%`tfIXYKs0uL#r<^W^?1BonXXa}}1 zI`sf|lE)Ab0xl3h9Dx9t*T_pjF-aL48{lW(dVo*fHL($RQ3z22kN^Vl-9e0x?&3Bj z$p8+}f~XG54Orow~^ zuLGvTzJoLT__s%|MdBw5Z2tQbm-cI9|-E>Cx!Aw7Q;p;f*t*Yx|Y;$%9OyggA(8;L(?+&)2^E z%|8fSA2Je*JQzA;BuSd$hY6l1laGb%h z5<-d>q?Y;p4}N)s&*pA}J(9s!>F-<(R%bWy2dcxnS5xMwrt z+b1ZEm!G~+GtGm4o)_p@ND_i5#tc&4o~?3Wxd-sW_j*Cn?K$|ChnCkEyM3IAol|Vs zGIqHzWbAwX@L2*oR743ukYKq!(8Q(s^#%-G@jSoHB zG=2N%$t9um3?WddcB%B;J$s`!F5@u9GhOV}HB_o7jh7kSx{>naNHt$79D41Y%cxY5 zWCZV=s-gPd=<7EG0)$?G-L~*8kDQUCJUPtp)Cfkoc<}UMmu|~OB`K#WEr3Hen?hNY zDv~I{?K(Ie8zBV)qb0JshLGZ|&eE!R@|R4;eY)B(2lG@(m@gZsH)q?K*^BKsKjQC>a>#B1XA5bFt$xx6lGO zMSl|C+#x`kr1+LcUr&nF z+(^+MyKA=uOrjXK=U}dMal1L{=dMsaxp?*WDgvvw1XQWQZd8c6T ffCA8ZKj6Os`Z#W=>+z`f00000NkvXXu0mjfIsHE{ 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 @@ images/hold.png images/go.png images/combobox_down_arrow.png - images/waypoint_marker2.png - images/waypoint_marker1.png images/uav_heading.png images/uav_trail.png images/uav_trail_clear.png images/minus.png images/plus.png - images/waypoint_marker3.png images/home_wp.png images/move_to_wp.png images/center_wp.png 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();