From decd4270d9aa1b31729f4aa0c195d7b04c768f14 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 13 Apr 2014 13:59:27 +0200
Subject: [PATCH] added CellId role to RegionMap model

---
 apps/opencs/model/world/regionmap.cpp | 15 +++++++++++----
 apps/opencs/model/world/regionmap.hpp |  5 ++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/apps/opencs/model/world/regionmap.cpp b/apps/opencs/model/world/regionmap.cpp
index 7f233a433..fc4638432 100644
--- a/apps/opencs/model/world/regionmap.cpp
+++ b/apps/opencs/model/world/regionmap.cpp
@@ -384,15 +384,22 @@ QVariant CSMWorld::RegionMap::data (const QModelIndex& index, int role) const
             return QString::fromUtf8 (Misc::StringUtils::lowerCase (cell->second.mRegion).c_str());
     }
 
+    if (role==Role_CellId)
+    {
+        CellCoordinates cellIndex = getIndex (index);
+
+        std::ostringstream stream;
+        stream << "#" << cellIndex.getX() << " " << cellIndex.getY();
+
+        return QString::fromUtf8 (stream.str().c_str());
+    }
+
     return QVariant();
 }
 
 Qt::ItemFlags CSMWorld::RegionMap::flags (const QModelIndex& index) const
 {
-    if (mMap.find (getIndex (index))!=mMap.end())
-        return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
-
-    return 0;
+    return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
 }
 
 void CSMWorld::RegionMap::regionsAboutToBeRemoved (const QModelIndex& parent, int start, int end)
diff --git a/apps/opencs/model/world/regionmap.hpp b/apps/opencs/model/world/regionmap.hpp
index 29cc8c512..5b82ac217 100644
--- a/apps/opencs/model/world/regionmap.hpp
+++ b/apps/opencs/model/world/regionmap.hpp
@@ -26,7 +26,8 @@ namespace CSMWorld
 
             enum Role
             {
-                Role_Region = Qt::UserRole
+                Role_Region = Qt::UserRole,
+                Role_CellId = Qt::UserRole+1
             };
 
         private:
@@ -93,6 +94,8 @@ namespace CSMWorld
             virtual int columnCount (const QModelIndex& parent = QModelIndex()) const;
 
             virtual QVariant data (const QModelIndex& index, int role = Qt::DisplayRole) const;
+            ///< \note Calling this function with role==Role_CellId may return the ID of a cell
+            /// that does not exist.
 
             virtual Qt::ItemFlags flags (const QModelIndex& index) const;