Disable WorldMapPlacement usage

1 files changed, 19 insertions, 18 deletions

diff --git a/sigmodr/widgets/mapeditor/WorldMapItem.cpp b/sigmodr/widgets/mapeditor/WorldMapItem.cpp
index 6dceaed3..7e82414e 100644
--- a/sigmodr/widgets/mapeditor/WorldMapItem.cpp
+++ b/sigmodr/widgets/mapeditor/WorldMapItem.cpp
@@ -124,23 +124,23 @@ void WorldMapItem::hoverLeaveEvent(QGraphicsSceneHoverEvent* event)
 
 void WorldMapItem::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
 {
-    QList<QGraphicsItem*> items = scene()->items();
-    QList<QGraphicsItem*> cItems = scene()->items(QRectF(event->scenePos() - event->buttonDownPos(Qt::LeftButton), QSizeF(m_map->width(), m_map->height())));
-    QtConcurrent::blockingFilter(items, isSetWorldMapItem);
-    QtConcurrent::blockingFilter(cItems, isSetWorldMapItem);
-    items.removeAll(this);
-    cItems.removeAll(this);
-    if (cItems.size())
-    {
-        WorldMapPlacement placement(QSize(m_map->width(), m_map->height()));
-        foreach (QGraphicsItem* item, items)
-        {
-            WorldMapItem* mapItem = qgraphicsitem_cast<WorldMapItem*>(item);
-            placement.addRect(QRectF(item->scenePos(), QSizeF(mapItem->m_map->width(), mapItem->m_map->height())));
-        }
-        setPos(placement.find(((QPointF(m_map->width(), m_map->height()) / 2.) + event->scenePos() - event->buttonDownPos(Qt::LeftButton)).toPoint()));
-    }
-    else
+//     QList<QGraphicsItem*> items = scene()->items();
+//     QList<QGraphicsItem*> cItems = scene()->items(QRectF(event->scenePos() - event->buttonDownPos(Qt::LeftButton), QSizeF(m_map->width(), m_map->height())));
+//     QtConcurrent::blockingFilter(items, isSetWorldMapItem);
+//     QtConcurrent::blockingFilter(cItems, isSetWorldMapItem);
+//     items.removeAll(this);
+//     cItems.removeAll(this);
+//     if (cItems.size())
+//     {
+//         WorldMapPlacement placement(QSize(m_map->width(), m_map->height()));
+//         foreach (QGraphicsItem* item, items)
+//         {
+//             WorldMapItem* mapItem = qgraphicsitem_cast<WorldMapItem*>(item);
+//             placement.addRect(QRectF(item->scenePos(), QSizeF(mapItem->m_map->width(), mapItem->m_map->height())));
+//         }
+//         setPos(placement.find(((QPointF(m_map->width(), m_map->height()) / 2.) + event->scenePos() - event->buttonDownPos(Qt::LeftButton)).toPoint()));
+//     }
+//     else
         setPos(event->scenePos() - event->buttonDownPos(Qt::LeftButton));
     event->accept();
     moveTo(scenePos().toPoint());
@@ -151,6 +151,7 @@ void WorldMapItem::keyPressEvent(QKeyEvent* event)
 {
     if (event->key() == Qt::Key_Space)
     {
+        // FIXME: Map placement is broken
         QList<QGraphicsItem*> items;
         if (!m_locked)
         {
@@ -171,7 +172,7 @@ void WorldMapItem::keyPressEvent(QKeyEvent* event)
             m_locked = !m_locked;
             setFlag(ItemIsMovable, !m_locked);
             update();
-            WorldMapPlacement::invalidateCache();
+//             WorldMapPlacement::invalidateCache();
             return;
         }
     }