From 0593bfb5110b82042e1a524a4339410b3fd42a1d Mon Sep 17 00:00:00 2001 From: Jussi Laitinen Date: Mon, 16 Aug 2010 10:30:07 +0300 Subject: [PATCH] Added new turn type images. --- images.qrc | 3 ++ res/images/arrow_turn_continue.png | Bin 0 -> 10238 bytes res/images/arrow_turn_left.png | Bin 0 -> 2072 bytes res/images/arrow_turn_right.png | Bin 0 -> 1928 bytes res/images/arrow_turn_roundabout.png | Bin 0 -> 3005 bytes res/images/arrow_turn_sharp_left.png | Bin 0 -> 1919 bytes res/images/arrow_turn_sharp_right.png | Bin 0 -> 1818 bytes res/images/arrow_turn_slight_left.png | Bin 0 -> 1876 bytes res/images/arrow_turn_slight_right.png | Bin 0 -> 1960 bytes res/images/arrow_turn_start.png | Bin 0 -> 4405 bytes res/images/arrow_turn_u_turn.png | Bin 0 -> 2309 bytes src/ui/friendlistpanel.cpp | 2 -- src/ui/listview.cpp | 1 + src/ui/routewaypointlistitem.cpp | 47 ++++++++++++++++++++------------ src/ui/routewaypointlistitem.h | 3 ++ src/ui/routingpanel.cpp | 5 ++-- 16 files changed, 39 insertions(+), 22 deletions(-) create mode 100644 res/images/arrow_turn_continue.png create mode 100644 res/images/arrow_turn_left.png create mode 100644 res/images/arrow_turn_right.png create mode 100644 res/images/arrow_turn_roundabout.png create mode 100644 res/images/arrow_turn_sharp_left.png create mode 100644 res/images/arrow_turn_sharp_right.png create mode 100644 res/images/arrow_turn_slight_left.png create mode 100644 res/images/arrow_turn_slight_right.png create mode 100644 res/images/arrow_turn_start.png create mode 100644 res/images/arrow_turn_u_turn.png diff --git a/images.qrc b/images.qrc index 28d33f3..64b2a4d 100644 --- a/images.qrc +++ b/images.qrc @@ -35,13 +35,16 @@ res/images/walk_icon_gray.png res/images/zoom_in.png res/images/zoom_out.png + res/images/distance_icon.png res/images/arrow_turn_continue.png res/images/arrow_turn_left.png res/images/arrow_turn_right.png + res/images/arrow_turn_roundabout.png res/images/arrow_turn_sharp_left.png res/images/arrow_turn_sharp_right.png res/images/arrow_turn_slight_left.png res/images/arrow_turn_slight_right.png res/images/arrow_turn_start.png + res/images/arrow_turn_u_turn.png diff --git a/res/images/arrow_turn_continue.png b/res/images/arrow_turn_continue.png new file mode 100644 index 0000000000000000000000000000000000000000..b9189a64d5f429d96e6de5842497251f5456d700 GIT binary patch literal 10238 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 literal 0 HcmV?d00001 diff --git a/res/images/arrow_turn_sharp_left.png b/res/images/arrow_turn_sharp_left.png new file mode 100644 index 0000000000000000000000000000000000000000..21036a1e3554ae2ee91c58d103f1fe62c5c2c11e GIT binary patch literal 1919 zcmV-_2Y~pAP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igb_ z2Nx|`3rEoa000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000KsNkl2Dj?6~%w|Ewhl+8Yy1d#>s~O28#aw|3rZ{MI97z-NZq>XqPB*I5ThShc~2T zG%+d(RNX{F5FiN>Gv}Ri&pq!BC8d=36 R$?*W>0muW8-v|)%zc^`(iKXWYpp^W7 z0f{l;VxsdA7c&&AgwiOik~;yqGmz{3R75@sV(tRdHgLM|G%g^($ZB>+hRxD2vg+1g z%v}J)1R-7lF$zTf6HthW%Pw#@?|FUJ@$Rzcvh!#qY*&V-n+4CdD;U{ZgE6<2NEafV zPc$xM*AQV`C7z2eGmw-r6K4z0>$8@ZCkxJ7Pt!+sYQv*R!Pk2=N(p1DX?^5i z*7NOQ!#D5d{N?S8mnRDjW|1+ULr=6$}9(gVnkj^~b9A4v(U76e%M z$id8Uy70We?D^@UxCB3yP^24@RD zoH$Zw$qv;AemHBYADa^89_x-6AGBm}T3gV?SNyCX|V17M$}mJ-C2ShzSak_fjL zBiyi$WEsp|2I2>8#Kh|Tk{y7`C~B+O8yTK#lrgmSUV05YV6Q9??&(bZP-cw+f-r{at4lAYRe(m38<_AA%Q^|Gv)>j89) zjEG2HF~F!?xJy0fuz2-(X%riUW_M)S8(W@il#Hxm;X-z~U%1lS&ZcghwPavM1O!1O z4W9{G<(eo>W}`4dOo`S-=6#OsA?Dwy0rZmTY|FBWi))qE!UaZFQJI`imvT_U83iGc z$bmQzV#0-7$Sx+HZWMIOrkMD^oz#%KjFJ_*Yh%QP#CC1i8(TI?&2;eorQSs#253{n z21TzEvp#UqdIYGALJu{xy5K>kT4hF;tglsCAtv@lmfvlbe7RHMW8$Ro%=K@C#X1HiQcF)n*t=`N>ReN|363`cQX9>qiRF)<=N(;b6`Q5uXzrMH ze#lRmxn=PeIyb{d6U(^J9L*hl$Wf#V5g8<#5@>-^t5uU-DQ>*oM{Oa*c1FDZc=Qt|beqlX$XTBwa$Io~HcGF{rL zAG*B@=>ztx67F&j@Ls0zGSpR}1*`JvFPmUYSJRm|M4sE+)w~xVOAv+5R$Li{)v{vB zg)Bce$nKM5WEt(pg=VKV?9{oam)R{Q(CTU^@kvW-31n|2RTH22imZ$-Q0;P_;t zp!Xw;5}xnZAIyyZuvM~InIYcGrwK$vD79jzHV75tLjUX(e^TgM_Yt|zzi{MRZ;{?7 z+7MS!pt8&RDz{_f-huqm4jQQM%=*KhY94?*0QqeI`8OThC$8;@?5_X-002ovPDHLk FV1mXdj;R0u literal 0 HcmV?d00001 diff --git a/res/images/arrow_turn_sharp_right.png b/res/images/arrow_turn_sharp_right.png new file mode 100644 index 0000000000000000000000000000000000000000..19171bf06bc47e8465bc6f1cb9e59281762494db GIT binary patch literal 1818 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 literal 0 HcmV?d00001 diff --git a/res/images/arrow_turn_u_turn.png b/res/images/arrow_turn_u_turn.png new file mode 100644 index 0000000000000000000000000000000000000000..b2ad7a2f094f5f5cfefbf34f11d86ff6c29c016b GIT binary patch literal 2309 zcmV+g3HtVlP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igb_ z2N^0_?Em}#000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000PJNklTl2U;I!T)=vdb&*4y z4@e;p0+bYJDNsU?DS?s#DL@GEX#nv)ux&ky+A-a>%(gA7#$&yw^`H_6BL!8aD79pe zD@r4&j3U<&oRs2!2c!dWy=gg{)x4V4{IqPCZd+E3LkNNMfm}v_Zb;}#D{QJ^bB{;`3$04wXbSX;ik+VHolO?QR#9p*eg$eC0ct<=W>;(TCj9n($An|aOkre$qC zHbuQOlB1sC$uMJ(D?)%p?YLZ9t~V{St)p=f)NJc`GjDjeY&c(9PWl1r zFs~i2=M8V?4c8ls^I<1=gIw`+l=JdY#gkEnmV)V~<@>8GKU{C|q2_Aishww0w_L6* z?-mUgE6coY8RY6tO@B`yux&l_+Of8dt4+&v>rz=kl}V0MHvVu@@%xh=m65z#G>i&O zfRvRMh(TF3j`Nk}?V@42X*sG4M(!_?`mUJ(2uVMhB!sghe%scQDM_XzlgjX7T=2W2 zk}t*uy-adYXncUnwdK{UX1Z;0>7L8RalW)%tfH81TTf-w-eyqmtKKezoi;ch8+~Iv zF6o4pBB^(5^nRuo6`Fn)X|*&G*%Le-W}FT(jw-|3dBdW1)U8KYxZYUiwPT*L>qG3f zeQ0gv5f43oL8L zCf(PE2WG9yb*$a%P0Pmm^Zb1ujGouVyt6Y4>{5^8BDc zN-#>0D~Xl@A7a0`5J@Ebo4$Oo(t5L~`RltC-(IXaUs{H_;&hPlc$l-S9U-ubZp?<~ z-Lj!^fwO7N*|g@%Nr4Y=+&2V3t5{ZDDGEe#1L^nlejfr7LhJ|RVr4m-)_ixl<#KHq zPNoE{OaCWgCXI@(&Qx{)f3CE4EE>Xo zKx!9K14fowHIAQ_4L$@)6G3$#e2B)-H$E|)CjgInhKrTuurf5addUZH9-N4u86}ZI z5RzW~r_$;^-y4XQf}WA|GsPxlV%a#P5cIQv^-GASfDch~Vum2sl3|((rHHeL z4RwU;6S%2Z@NnJD=|>G#D!&TP~2ZqYE?I-G~Ajb&p!5F6fyB#Pli z7_}7iGRaY;c|OiL?i;F15<=9O&d%4)lj~T5N{HQjf0yOTUO*<5;j6=vS>1jxt6OJx z5$#@`7n2AIEqT;4JRase9p#+#voynZU}Fa0rmT#LfbO~?+6zcOQ=Ie-FCSG{7kyUi zW7#Yk$Hqo))ID4vkZZwF3c$th*}Mlz}NZibj{V(;i=y+^s?#kk<*amCk1CBGSD3=74!^%yC3UaU>lCbC%s6_Q62 zcTo4eZM;!}aj6lLf?Nv@E5nmv&X3nyUe9Z;k`Ge?N~3r@%=ltl@Tb!rUmccAN{x|m zlcJJS)-tk{lRg3nU|pbYldBE^5%vSK7m$!>GEkq92Dru1QQFuFXeQ?v*-An+v0+q)_TDN4I*Dh&EERkMX>l{{b z9;u8%D}nQ|{xdBp)1E7YSXxrVOw?_hbLwQ{AJjDdGbp1#OG%+6qe64!{0DVzR1~ya z-IP)nh;9dLRMd%%={m304Qx#+uYJ4z-dhwQ#0Sf1%q{8_|C-I4zeSKn2{J8qpk=Zz zwe!1y?ZF4DpFL#R(-cV&eN?Vvwv3Dh(FgD@31sS#&hC8l^O1e8cs3Fz#6riiyWIk< zXSZhk=oz^akVL(?mJ~*kr)ja9Pr6>|TyhBeS(T4|^d{0+P#MW6*W_9vM9jkN9&(-! zMuSfdh)O%*gFL~`AapQ ffqVw?{{iG5k!=aAEsetMargin(0); friendListPanelLayout->setSpacing(0); -///< @todo magic - friendListPanelLayout->setContentsMargins(PANEL_MARGIN_LEFT, 0, PANEL_MARGIN_RIGHT, 0); setLayout(friendListPanelLayout); QHBoxLayout *filterLayout = new QHBoxLayout(); diff --git a/src/ui/listview.cpp b/src/ui/listview.cpp index e2dfbee..1538f0c 100644 --- a/src/ui/listview.cpp +++ b/src/ui/listview.cpp @@ -60,6 +60,7 @@ void ListView::clearList() { qDebug() << __PRETTY_FUNCTION__; + qDeleteAll(m_listItems.begin(), m_listItems.end()); m_listItems.clear(); clear(); diff --git a/src/ui/routewaypointlistitem.cpp b/src/ui/routewaypointlistitem.cpp index b16f5dd..80608f4 100644 --- a/src/ui/routewaypointlistitem.cpp +++ b/src/ui/routewaypointlistitem.cpp @@ -29,40 +29,53 @@ void RouteWaypointListItem::setRouteWaypointData(const RouteSegment &routeSegmen m_coordinates = coordinate; - if (routeSegment.turnType() == "C") + setTurnTypeImage(routeSegment.turnType()); + + setTitle(shortenText(routeSegment.street(), NAME_TEXT_MAX_WIDTH + MARGIN, + ListItem::TEXT_SIZE_NORMAL)); + + clearSubItems(); + + QTime zeroTime(0, 0); + QTime segmentTravelTime = zeroTime.addSecs(routeSegment.time()); + addSubItem(segmentTravelTime.toString("hh:mm:ss"), QPixmap(":/res/images/clock.png")); + + addSubItem(routeSegment.lengthCaption(), QPixmap(":/res/images/distance_icon.png")); +} + +void RouteWaypointListItem::setTurnTypeImage(const QString &turnType) +{ + if (turnType == "C") { setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_continue.png"), AvatarImage::Small)); - else if (routeSegment.turnType() == "TL") + } else if (turnType == "TL") { setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_left.png"), AvatarImage::Small)); - else if (routeSegment.turnType() == "TSLL") + } else if (turnType == "TSLL") { setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_slight_left.png"), AvatarImage::Small)); - else if (routeSegment.turnType() == "TSHL") + } else if (turnType == "TSHL") { setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_sharp_left.png"), AvatarImage::Small)); - else if (routeSegment.turnType() == "TR") + } else if (turnType == "TR") { setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_right.png"), AvatarImage::Small)); - else if (routeSegment.turnType() == "TSLR") + } else if (turnType == "TSLR") { setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_slight_right.png"), AvatarImage::Small)); - else if (routeSegment.turnType() == "TSHR") + } else if (turnType == "TSHR") { setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_sharp_right.png"), AvatarImage::Small)); - else + } else if (turnType == "TU") { + setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_u_turn.png"), + AvatarImage::Small)); + } else if (turnType == "EXIT") { + setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_roundabout.png"), + AvatarImage::Small)); + } else setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_start.png"), AvatarImage::Small)); - setTitle(shortenText(routeSegment.street(), NAME_TEXT_MAX_WIDTH + MARGIN, - ListItem::TEXT_SIZE_NORMAL)); - - clearSubItems(); - - QTime zeroTime(0, 0); - QTime segmentTravelTime = zeroTime.addSecs(routeSegment.time()); - - addSubItem(segmentTravelTime.toString("hh:mm:ss"), QPixmap(":/res/images/clock.png")); } RouteWaypointListItem::~RouteWaypointListItem() diff --git a/src/ui/routewaypointlistitem.h b/src/ui/routewaypointlistitem.h index 66e78e1..6c5fb72 100644 --- a/src/ui/routewaypointlistitem.h +++ b/src/ui/routewaypointlistitem.h @@ -66,6 +66,9 @@ public: void setRouteWaypointData(const RouteSegment &routeSegment, const GeoCoordinate &coordinate); +private: + void setTurnTypeImage(const QString &turnType); + /****************************************************************************** * DATA MEMBERS ******************************************************************************/ diff --git a/src/ui/routingpanel.cpp b/src/ui/routingpanel.cpp index fa8bbf0..29257b3 100644 --- a/src/ui/routingpanel.cpp +++ b/src/ui/routingpanel.cpp @@ -85,8 +85,6 @@ void RoutingPanel::populateLocationListView(const QList &locations) m_locationListView->addListItem(QString::number(i), item); } - //openPanel(); - const int FIRST_LOCATION_ITEM_INDEX = 0; const int ONE_LOCATION_ITEM = 1; @@ -113,9 +111,10 @@ void RoutingPanel::setRoute(Route &route) { qDebug() << __PRETTY_FUNCTION__; + m_locationListHeaderWidget->hide(); m_locationListView->hide(); m_routeWaypointListView->show(); - m_routeWaypointListView->clear(); + m_routeWaypointListView->clearList(); QList segments = route.segments(); QList geometryPoints = route.geometryPoints(); -- 1.7.9.5