diff options
Diffstat (limited to 'pictureswidget.cpp')
| -rw-r--r-- | pictureswidget.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pictureswidget.cpp b/pictureswidget.cpp index 68400af..5562006 100644 --- a/pictureswidget.cpp +++ b/pictureswidget.cpp @@ -142,8 +142,8 @@ PictureView::PictureView(QWidget *parent) : QTreeView(parent) { setColumnHidden(4, true); } -void PictureView::mappingChanged(int mapping){ - mModel->setMapping(mapping); +void PictureView::mappingChanged(int pMapId){ + mModel->setMapping(pMapId); mModel->populate(); for(int i = 0; i < PicFilesModel::NumFields; ++i){ resizeColumnToContents(i); @@ -285,7 +285,7 @@ PicFilesModel::PicFilesModel(const QStringList &headers, QObject *parent) : SmTr //setup database mDb = QSqlDatabase::database("treedb"); - mPopulateQS = QString("SELECT DISTINCT(pics.ipicsid), pics.tfilename, pics.isize, pics.tformat, pics.dtadded, pics.cmd5sum FROM pics, pics_mappings WHERE pics_mappings.imapping_id IN (%1) AND pics_mappings.ipics_id = pics.ipicsid ORDER BY pics.tfilename"); + mPopulateQS = QString("SELECT DISTINCT(pics.ipicsid), pics.tfilename, pics.isize, pics.tformat, pics.dtadded, pics.cmd5sum FROM pics, pics_mappings2 WHERE pics_mappings2.imappings_parents_id IN (%1) AND pics_mappings2.ipics_id = pics.ipicsid ORDER BY pics.tfilename"); mDeleteFileQ = new QSqlQuery(mDb); mDeleteFileQ->prepare("DELETE FROM pics WHERE ipicsid = :id"); mCurMappingIdsQS = QString("SELECT DISTINCT(pics_mappings.imapping_id) FROM pics_mappings, pics WHERE pics_mappings.ipics_id IN (%1)"); @@ -302,8 +302,8 @@ PicFilesModel::~PicFilesModel(){ mDb = QSqlDatabase::database(); } -void PicFilesModel::setMapping(int mappingId){ - QList<QVariant> ids = mMappingTreeModel->childList(mappingId, MappingTreeModel::Id); +void PicFilesModel::setMapping(int pMapId){ + QList<QVariant> ids = mMappingTreeModel->childList(pMapId, MappingTreeModel::MapParentId); mMappingIds.clear(); foreach(QVariant i, ids){ mMappingIds << i.toInt(); |