Changed grouping algorithm

 - All groups are always destructed and then created from
   scratch if required

diff --git a/src/map/frienditemshandler.cpp b/src/map/frienditemshandler.cpp
index 8286f7f..a790125 100644 (file)
--- a/src/map/frienditemshandler.cpp
+++ b/src/map/frienditemshandler.cpp
@@ -184,6 +184,15 @@ void FriendItemsHandler::deleteFriendItem(FriendLocationItem *item)
     delete item;
 }
 
+void FriendItemsHandler::destructGroups()
+{
+    qDeleteAll(m_friendGroupItems);
+    m_friendGroupItems.clear();
+
+    foreach (FriendLocationItem *item, m_friendItems)
+        item->setPartOfGroup(false);
+}
+
 void FriendItemsHandler::dropFriendFromAllGroups(FriendLocationItem *item)
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -284,12 +293,20 @@ void FriendItemsHandler::refactorFriendItems(int zoomLevel)
 
     m_zoomLevel = zoomLevel;
 
-    for (int repeat = 2; repeat > 0; repeat--) {
-        mergeCollidingGroups();
-        dropOutOfGroupFriends();
-        checkAllGroupsForCollidingFriends();
-        checkAllFriendsForCollidingFriends();
-    }
+    QTime time;
+    time.start();
+
+//    for (int repeat = 2; repeat > 0; repeat--) {
+//        mergeCollidingGroups();
+//        dropOutOfGroupFriends();
+//        checkAllGroupsForCollidingFriends();
+//        checkAllFriendsForCollidingFriends();
+//    }
+
+    destructGroups();
+    checkAllFriendsForCollidingFriends();
+
+    qWarning() << __PRETTY_FUNCTION__ << "zoom level:" << zoomLevel << "time elapsed:" << time.elapsed() << "ms";
 }
 
 void FriendItemsHandler::updateFriendItem(FriendLocationItem *friendItem, User *friendData)

diff --git a/src/map/frienditemshandler.h b/src/map/frienditemshandler.h
index ad7a133..7ce25af 100644 (file)
--- a/src/map/frienditemshandler.h
+++ b/src/map/frienditemshandler.h
@@ -143,6 +143,8 @@ private:
       */
     void deleteFriendItem(FriendLocationItem *item);
 
+    void destructGroups();
+
     /**
       * @brief Drop FriendLocationItem from all FriendGroupItem groups
       *