diff options
| -rw-r--r-- | desktop-widgets/divepicturewidget.cpp | 11 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 44 | ||||
| -rw-r--r-- | qt-models/divepicturemodel.cpp | 8 |
3 files changed, 29 insertions, 34 deletions
diff --git a/desktop-widgets/divepicturewidget.cpp b/desktop-widgets/divepicturewidget.cpp index 46de16d09..bc692fd9f 100644 --- a/desktop-widgets/divepicturewidget.cpp +++ b/desktop-widgets/divepicturewidget.cpp @@ -32,7 +32,9 @@ void DivePictureWidget::mouseDoubleClickEvent(QMouseEvent *event) void DivePictureWidget::mousePressEvent(QMouseEvent *event) { if (event->button() == Qt::LeftButton && event->modifiers() == Qt::NoModifier) { - QString filename = model()->data(indexAt(event->pos()), Qt::DisplayPropertyRole).toString(); + QModelIndex index = indexAt(event->pos()); + QString filename = model()->data(index, Qt::DisplayPropertyRole).toString(); + int diveId = model()->data(index, Qt::UserRole).toInt(); if (!filename.isEmpty()) { int dim = lrint(defaultIconMetrics().sz_pic * 0.2); @@ -42,7 +44,7 @@ void DivePictureWidget::mousePressEvent(QMouseEvent *event) QByteArray itemData; QDataStream dataStream(&itemData, QIODevice::WriteOnly); - dataStream << filename << event->pos(); + dataStream << filename << diveId; QMimeData *mimeData = new QMimeData; mimeData->setData("application/x-subsurfaceimagedrop", itemData); @@ -53,11 +55,8 @@ void DivePictureWidget::mousePressEvent(QMouseEvent *event) drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::CopyAction); } - - QListView::mousePressEvent(event); - } else { - QListView::mousePressEvent(event); } + QListView::mousePressEvent(event); } void DivePictureWidget::wheelEvent(QWheelEvent *event) diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 5cc5a3a18..11dddaa41 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -2202,8 +2202,17 @@ void ProfileWidget2::dropEvent(QDropEvent *event) QDataStream dataStream(&itemData, QIODevice::ReadOnly); QString filename; - QPoint pos; - dataStream >> filename >> pos; + int diveId; + dataStream >> filename >> diveId; + + // If the id of the drag & dropped picture belongs to a different dive, then + // the offset we determine makes no sense what so ever. Simply ignore such an event. + // In the future, we might think about duplicating the picture or moving the picture + // from one dive to the other. + if (!current_dive || displayed_dive.id != diveId) { + event->ignore(); + return; + } #ifndef SUBSURFACE_MOBILE // Calculate time in dive where picture was dropped and whether the new position is during the dive. @@ -2211,19 +2220,15 @@ void ProfileWidget2::dropEvent(QDropEvent *event) offset_t offset { (int32_t)lrint(timeAxis->valueAt(mappedPos)) }; bool duringDive = current_dive && offset.seconds > 0 && offset.seconds < current_dive->duration.seconds; - // Flag which states whether the drag&dropped picture actually belongs to this dive. - // If this is not the case, the calculated offset makes no sense whatsoever and we must ignore the event. - bool belongsToDive = true; - // A picture was drag&dropped onto the profile: We have four cases to consider: // 1a) The image was already shown on the profile and is moved to a different position on the profile. // Calculate the new position and move the picture. // 1b) The image was on the profile and is moved outside of the dive time. // Remove the picture. - // 2a) The image was not on the profile, but belongs to the current dive. - // Add the picture to the profile if it is during the dive. - // 2b) The picture does not belong to the current dive. - // For now, do nothing. We may think about adding the picture to the dive. + // 2a) The image was not on the profile and is moved into the dive time. + // Add the picture to the profile. + // 2b) The image was not on the profile and is moved outside of the dive time. + // Do nothing. auto oldPos = std::find_if(pictures.begin(), pictures.end(), [filename](const PictureEntry &e) { return e.filename == filename; }); if (oldPos != pictures.end()) { @@ -2250,16 +2255,9 @@ void ProfileWidget2::dropEvent(QDropEvent *event) // In both cases the picture list changed, therefore we must recalculate the y-coordinatesA. calculatePictureYPositions(); } else { - // Cases 2a) and 2b): picture not on profile. Check if it belongs to current dive. - // Note that FOR_EACH_PICTURE handles current_dive being null gracefully. - bool found = false; - FOR_EACH_PICTURE(current_dive) { - if (picture->filename == filename) { - found = true; - break; - } - } - if (found && duringDive) { + // Cases 2a) and 2b): picture not on profile. We only have to take action for + // the first case: picture is moved into dive-time. + if (duringDive) { // Case 2a): add the picture at the appropriate position. // The case move from outside-to-outside of the profile plot was handled by // the "&& duringDive" condition in the if above. @@ -2273,15 +2271,11 @@ void ProfileWidget2::dropEvent(QDropEvent *event) newPos = pictures.emplace(newPos, offset, filename, scene()); updateThumbnailXPos(*newPos); calculatePictureYPositions(); - } else if (!found) { - // Case 2b): Unknown picture. Ignore. - belongsToDive = false; } } // Only signal the drag&drop action if the picture actually belongs to the dive. - if (belongsToDive) - DivePictureModel::instance()->updateDivePictureOffset(displayed_dive.id, filename, offset.seconds); + DivePictureModel::instance()->updateDivePictureOffset(displayed_dive.id, filename, offset.seconds); #endif if (event->source() == this) { diff --git a/qt-models/divepicturemodel.cpp b/qt-models/divepicturemodel.cpp index 0aaf8f868..c881ce5bf 100644 --- a/qt-models/divepicturemodel.cpp +++ b/qt-models/divepicturemodel.cpp @@ -96,14 +96,16 @@ QVariant DivePictureModel::data(const QModelIndex &index, int role) const break; case Qt::DisplayPropertyRole: ret = QFileInfo(entry.filename).filePath(); + break; + case Qt::UserRole: + ret = entry.diveId; + break; } } else if (index.column() == 1) { switch (role) { - case Qt::UserRole: - ret = QVariant::fromValue(entry.offsetSeconds); - break; case Qt::DisplayRole: ret = entry.filename; + break; } } return ret; |