1 files changed, 45 insertions, 3 deletions

diff --git a/mappingtreemodel.cpp b/mappingtreemodel.cpp
index 9bb278d..ff7d7d3 100644
--- a/mappingtreemodel.cpp
+++ b/mappingtreemodel.cpp
@@ -11,6 +11,8 @@
 
 #include <algorithm>
 
+#include <QDebug>
+
 #include "mappingtreemodel.h"
 #include "smtreeitem.h"
 
@@ -148,7 +150,7 @@ QVariant MappingTreeModel::data(const QModelIndex &index, int role) const{
 }
 
 QList<QVariant> MappingTreeModel::childList(const QVariant &value, int column) const{
-    QModelIndex itemIdx = findRecursive(value, column, createIndex(0, 0, root()));
+    QModelIndex itemIdx = findRecursive(value, column, createIndex(0, column, root()));
     SmTreeItem *item = static_cast<SmTreeItem*>(itemIdx.internalPointer());
     if(item){
         if(item->childCount()){
@@ -169,6 +171,23 @@ QList<QVariant> MappingTreeModel::mappingsForFile(const QVariant &fileId) const{
     return retval;
 }
 
+QStringList MappingTreeModel::path(QModelIndex &idx) const{
+    if(!idx.isValid()){
+        return QStringList();
+    }
+    QStringList retval;
+    SmTreeItem *item = static_cast<SmTreeItem*>(idx.internalPointer());
+    do {
+        QString d = item->data(MappingTreeModel::Name).toString();
+        if(!d.isEmpty()){
+            retval << d;
+        }
+        item = item->parent();
+    }while(item);
+    std::reverse(retval.begin(), retval.end());
+    return retval;
+}
+
 QModelIndex MappingTreeModel::indexFromPath(const QString &path, int column) const{
     QStringList items = path.split("/");
     if(items.isEmpty() || column >= NumFields){
@@ -362,14 +381,37 @@ int MappingTreeModel::childCount(const QModelIndex &idx) const{
     return item->childCount();
 }
 
+MappingData MappingTreeModel::mappingDataFromIndex(QModelIndex &idx) const{
+    MappingData retval = { -1, QString(), QStringList() };
+    if(!idx.isValid()){
+        return retval;
+    }
+    retval.id = idx.data(MappingTreeModel::IdRole).toInt();
+    retval.name = idx.data(MappingTreeModel::NameRole).toString();
+    retval.path = path(idx);
+    return retval;
+}
+
+//continue here!
 MappingData MappingTreeModel::mappingDataFromId(int mappingId) const{
     MappingData retval = { -1, QString(), QStringList() };
-    foreach(MappingData d, mValidMappings){
+    QModelIndex mapIdx = findRecursive(mappingId, MappingTreeModel::Id, rootIndex());
+    //REMOVE ME
+    Q_ASSERT(mapIdx.isValid());
+    retval.id = mappingId;
+    retval.name = mapIdx.data(MappingTreeModel::NameRole).toString();
+    qDebug() << "mapping" << retval.id << retval.name;
+    SmTreeItem *mapItem = static_cast<SmTreeItem*>(mapIdx.internalPointer());
+    //REMOVE ME
+    Q_ASSERT(mapItem);
+    //retval.path = path(mapItem);
+
+    /*foreach(MappingData d, mValidMappings){
         if(d.id == mappingId){
             retval = d;
             break;
         }
-    }
+    }*/
     return retval;
 }