From f30d07e5acb83dd74bc6e6dc75b8b1c9e39e6e01 Mon Sep 17 00:00:00 2001 From: Arno Date: Sat, 24 Mar 2012 08:40:23 +0100 Subject: Show mappings in PictureViewer2 Hell, this was one heck of a bitch. Lots of changes just to show the mapping tree in PictureViewer2. Did I mention that I hate recursion? Added a function for fetching a SmTreeItem * from MappingTreeModel for paths, just to turn it into a QTextDocument in PictureViewer2. Of course everything is recursive. Did I say that I hate recursion? Well, as said in the comments, one recursion function seems fishy, but it works (tm). --- mappingtreemodel.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'mappingtreemodel.h') diff --git a/mappingtreemodel.h b/mappingtreemodel.h index c1b6248..396484a 100644 --- a/mappingtreemodel.h +++ b/mappingtreemodel.h @@ -32,9 +32,14 @@ class MappingTreeModel : public SmTreeModel { int mappingTypeIdFromName(const QVariant &name) const; QString mappingTypeNameFromId(int id) const; + //static convenience funcs + //the caller is responsible for deleting the result! + SmTreeItem *treeFromPaths(const QStringList &paths); + //data QVariant data(const QModelIndex &index, int role) const; QList childList(const QVariant &value, int column = 0) const; + QList mappingsForFile(const QVariant &fileId) const; QModelIndex indexFromPath(const QString &path, int column = 0) const; bool setData(const QModelIndex &index, const QVariant &value, int role); void move(const QModelIndex &source, const QModelIndex &dest); @@ -80,6 +85,7 @@ class MappingTreeModel : public SmTreeModel { QSqlQuery *mDeleteChildQ; QSqlQuery *mUpdateParentQ; QSqlQuery *mDeleteMappingParentQ; + QSqlQuery *mMappingsForFileIdQ; QList mMappingTypes; QList mValidMappings; QList mSelectedMappings; -- cgit v1.2.3-70-g09d2