From 8c8d21d31e40867f914ee6e0af23dede7e840224 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sami=20R=C3=A4m=C3=B6?= Date: Mon, 10 May 2010 15:55:42 +0300 Subject: [PATCH] Fixed defects found in review - Code reviewed by Henri - Unit & functional tests reviewed by Jussi --- doc/test_cases/functionality-tests.doc | Bin 287744 -> 288256 bytes src/map/friendgroupitem.cpp | 12 ++++++------ src/map/friendgroupitem.h | 2 ++ src/map/frienditemshandler.cpp | 2 ++ src/map/friendlocationitem.cpp | 5 +++++ tests/map/friendgroupitem/testfriendgroupitem.cpp | 3 ++- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/doc/test_cases/functionality-tests.doc b/doc/test_cases/functionality-tests.doc index f2b2b1fde595a04f648470fadd6539df7b9b83fc..2c7915072a0ff8faf6d73e76af90cc8fdab09b79 100644 GIT binary patch delta 23323 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

Ngcx68jY zyVwGRQu_LQJhSHU+O_0XrUz-^Vpebr{B_2rPw?rDY1dNgOtS>yH*f^a;(cRXSBEH@ z<$_P)Y$k567Fk>5vmkGS0%Z0s%4qALr9xVJ<^vMki!QrpvqeKFjkepF2~=2@oOV%* zYk-!jacvd+Wob0(dF!G}wCOHDBV2@tN&eb(+O^5r-dtF|B8k+OH(7C9k9q+wLPu*VK-Ixp$!yl4SL$_dS(T2VWh@LsOSQvW z^zXbUPtxqC@vI&~=`609BA!mr^B1!7dSg}=m>ta{e}ZSle46F;*%>ZIKcTc9uTBZ> zxIAz86<=#1Fhdb5qEKp+)sNnWr(%{AO7F7ac03h3C$HirnLCx{2BNolb!xj~nr0Wn zsZffaQ>U>%HqEcIZF`o6iy@Z3;^^m`dzD9jWI^V@^>bPU(YuCal`@e>e}9F z2(|vxV^0rdKR6vl8aM=p;S^kk>=_;4xxeOb{tS9w@M`~dfam@y#C!0#S&g^@Jonc{ zc2!Vsz^jkk0iOFSH5WZWZw_9)=G*q%VfR;#J~@*eGVmx!>(s+mzgwvAEh>x4?yqD$ zZx*_Ea6{Qz{9o4GjD0;pw0|RN;b&U7C~02-pQ85WC)vFLQPw{CWE&*_zi@*F{}+3N zi`A%4?fVk$ma5<0naa>D)|%${2lfU{XOgH;qrYGHo@Nyx>g3hXQleR}tw;`Zv^|HxMNudeUzG+f5G*0#DubH4<9+WV(*dlmKD zGPMZ1;eRVjVK?qCaN0%pKN4E%|F>tF(Hu0}4q`&E3PPC?+|Fb}mdAc|J=)5M9>`Yr zaL=}b%kDEySXbH7K;Z|Sy1;*jC$I%d(+j!W91w_ix!KbO?ZHM52cPvBKHSnGY=Hlv zmP5RuwQf!!O|%#uhX`o4$BRZZ*>|Fn@M?)z_;jcCi|vcUmbcoJw#;riC;}{+FLW8nfv^W z-nA`d-ZDikT3BLtyL=bnN3C-9XPifSr)@R4WdP0yG3!w;(4Rq|Wlvj&vbH4lgwq~u zDl}#hq85}dx)bfcbt9y9wtul++60@S*@~&-+P_#t6@t$y>KbmZWz_98$`I{ejIB0- z&!p-wZm(I@?FAL0{RdlW6)$1h0aKTBQ2P&M_SL^eOuz0}`)|#vtZrF{w|}QyK6et@ zT&-R8*l8C#x6h!Zty_n-cbDB~JU4BH$AB)tey$^A3-8$P9qk)lCYRt_I0wzPdD;q^!SV^|&?j+dB6hsK@eAtk8D7?W)I4yBGv-g6$A!6x^YsOq$(iWqf5Li}?^} zZ7jWizAp5xDrbjMW|Qr&HcioPj0NFh#Jn4PhRjno`HY#{Qn7EkhbcDEtH5U${RwWb zZFGltFW)-zx3JE6gUKK4c;m;~N^1(vPJ6I*cEM&OJa~U|Yhr!V3S`T*BJWTeY}#G& z3!i!Sk9rtt$6Y*3vj^LSm%iz58!ny(=wn6st2ef;iR}va*_B_$Kc8)R?N+aSxla=+ z*LJ^GhPc@}WzagQ*!xKA@3#A_)xW`KpT)X*ix8pNYF&)hb-#Sus#}@}5<;u-@)Sm- zn8GiCmgewnZO2We-L!D(*hZ%b*{~LxP3dpNKhMIcSl{=7P!{+p+r_(E+AC$@^uN1p zCuR_Ayg&M#8-1=PIic!Wh`F_$?*+Cn{1;3AhIabbz`LQo60oDTeev5-8~O_aQSY|L zzcjmi5;4@*2~Kmp9zSnMIlXtdd|mMjG=T2|2aX*S5j20~Ko31*rs(34wz*<{XW+oVt)HTm8NWJYL+w@fV^um0ogyrx)90K`f(zzz`*2~iLYT_G0YA@Myu zbe!!{r$Ub+nlkRy_m8*T-4vOp$J^Wv`F4Z@4j2kUQ6i_J^4a!;CWf0 zHYeM58-@CV$+m==z?;DjE5nyK-}5g#-t^PYm)Y*pzmSrAyv+7@VFVZHjoHnUQSuYp?ruTx?;`$J!GFtVE{7Vr e@|;<_|34qKb%`*(*#CcL*p?cke9;rOm;WD-FkY4b delta 21161 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 Cr18K2 diff --git a/src/map/friendgroupitem.cpp b/src/map/friendgroupitem.cpp index 6bd1f5a..8ae761e 100644 --- a/src/map/friendgroupitem.cpp +++ b/src/map/friendgroupitem.cpp @@ -49,7 +49,6 @@ void FriendGroupItem::dropFriend(FriendLocationItem *item) m_friends.removeOne(item); item->setPartOfGroup(false); - item->show(); } bool FriendGroupItem::dropFriends(int zoomLevel) @@ -57,7 +56,8 @@ bool FriendGroupItem::dropFriends(int zoomLevel) qDebug() << __PRETTY_FUNCTION__; foreach (FriendLocationItem *friendItem, m_friends) { - if (!friendItem->sceneTransformedBoundingRect(zoomLevel).intersects(sceneTransformedBoundingRect(zoomLevel))) + if (!friendItem->sceneTransformedBoundingRect(zoomLevel) + .intersects(sceneTransformedBoundingRect(zoomLevel))) dropFriend(friendItem); } @@ -78,7 +78,6 @@ void FriendGroupItem::joinFriend(FriendLocationItem *item) m_friends.append(item); item->setPartOfGroup(true); - item->hide(); } void FriendGroupItem::mergeWithGroup(FriendGroupItem *group) @@ -91,14 +90,15 @@ void FriendGroupItem::mergeWithGroup(FriendGroupItem *group) } } -void FriendGroupItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) +void FriendGroupItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, + QWidget *widget) { qDebug() << __PRETTY_FUNCTION__; BaseLocationItem::paint(painter, option, widget); QFont font = painter->font(); - font.setPointSize(painter->font().pointSize() * 2); + font.setPointSize(painter->font().pointSize() * 2); // double default font size painter->setFont(font); - painter->drawText(QRect(-25, -25, 50, 50), Qt::AlignCenter, QString::number(m_friends.size())); + painter->drawText(boundingRect(), Qt::AlignCenter, QString::number(m_friends.count())); } diff --git a/src/map/friendgroupitem.h b/src/map/friendgroupitem.h index 31a5646..d9f8f22 100644 --- a/src/map/friendgroupitem.h +++ b/src/map/friendgroupitem.h @@ -33,6 +33,8 @@ class FriendLocationItem; * @brief Friend group map item * * Contains grouped FriendLocationItem items and draws group image with number of grouped friends + * + * @author Sami Rämö - sami.ramo@ixonos.com */ class FriendGroupItem : public BaseLocationItem { diff --git a/src/map/frienditemshandler.cpp b/src/map/frienditemshandler.cpp index 800bdaf..9b61023 100644 --- a/src/map/frienditemshandler.cpp +++ b/src/map/frienditemshandler.cpp @@ -170,6 +170,7 @@ void FriendItemsHandler::cleanOldFriendData(const QList &friendsList) if (!friendFound) { m_mapScene->removeItem(*iter); + delete *iter; iter = m_friendItems.erase(iter); } else { @@ -265,6 +266,7 @@ void FriendItemsHandler::updateFriendLocationsAndImages(const QList &fri if ((*iter)->profileImageUrl() != friendsList.at(i)->profileImageUrl()) { (*iter)->setPixmap(friendsList.at(i)->profileImage()); + (*iter)->setProfileImageUrl(friendsList.at(i)->profileImageUrl()); } } } diff --git a/src/map/friendlocationitem.cpp b/src/map/friendlocationitem.cpp index cbd8114..b72e637 100644 --- a/src/map/friendlocationitem.cpp +++ b/src/map/friendlocationitem.cpp @@ -56,6 +56,11 @@ void FriendLocationItem::mousePressEvent(QGraphicsSceneMouseEvent *event) void FriendLocationItem::setPartOfGroup(bool value) { m_partOfGroup = value; + + if (value) + hide(); + else + show(); } QString FriendLocationItem::userId() const diff --git a/tests/map/friendgroupitem/testfriendgroupitem.cpp b/tests/map/friendgroupitem/testfriendgroupitem.cpp index ffa08b6..aa7847f 100644 --- a/tests/map/friendgroupitem/testfriendgroupitem.cpp +++ b/tests/map/friendgroupitem/testfriendgroupitem.cpp @@ -89,6 +89,7 @@ void TestFriendGroupItem::init() // create test group group = new FriendGroupItem(friend1); QVERIFY(group != 0); + QVERIFY(friend1->isPartOfGroup()); } void TestFriendGroupItem::cleanup() @@ -170,7 +171,7 @@ void TestFriendGroupItem::mergeWithGroup() FriendGroupItem anotherGroup(friend3); anotherGroup.joinFriend(friend4); - // move friens to first group + // move friends to first group anotherGroup.mergeWithGroup(group); // no-one should actually be dropped because groups should be empty already -- 1.7.9.5