diff options
Diffstat (limited to 'qt-ui/profile')
| -rw-r--r-- | qt-ui/profile/divepixmapitem.cpp | 4 | ||||
| -rw-r--r-- | qt-ui/profile/profilewidget2.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/qt-ui/profile/divepixmapitem.cpp b/qt-ui/profile/divepixmapitem.cpp index 3fb06adb9..41541c21e 100644 --- a/qt-ui/profile/divepixmapitem.cpp +++ b/qt-ui/profile/divepixmapitem.cpp @@ -119,9 +119,7 @@ void DivePictureItem::mousePressEvent(QGraphicsSceneMouseEvent *event) void DivePictureItem::removePicture() { - /* this is a WIP, it doesn't really *removes* anything, merely hides it. - * good workaround, I still need to figure out how to activelly remove - * it from the model. */ button->hide(); hide(); + DivePictureModel::instance()->removePicture(fileUrl); } diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp index 21f0cb4e4..8f0d1584f 100644 --- a/qt-ui/profile/profilewidget2.cpp +++ b/qt-ui/profile/profilewidget2.cpp @@ -1352,7 +1352,9 @@ void ProfileWidget2::keyEscAction() void ProfileWidget2::plotPictures() { - qDeleteAll(pictures); + Q_FOREACH(DivePictureItem *item, pictures){ + item->deleteLater(); + } pictures.clear(); if (printMode) @@ -1368,7 +1370,7 @@ void ProfileWidget2::plotPictures() continue; DivePictureItem *item = new DivePictureItem(); item->setPixmap(m->index(i,0).data(Qt::DecorationRole).value<QPixmap>()); - item->setFileUrl(m->index(i,0).data(Qt::DisplayPropertyRole).toString()); + item->setFileUrl(m->index(i,1).data().toString()); // let's put the picture at the correct time, but at a fixed "depth" on the profile // not sure this is ideal, but it seems to look right. x = timeAxis->posAtValue(pic->offset.seconds); |