From d8e38764fd24bd0bce965a7404a92227d98bbf36 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Tue, 3 Nov 2015 21:17:50 +0100 Subject: Drag and Drop Images Now that we have the possibility to add images without meaningful time stamps to a dive, we should let the user provide that time offset manually. This patch allowed pictures to be dragged from the image list to the profile. Signed-off-by: Robert C. Helling Signed-off-by: Dirk Hohndel --- profile-widget/profilewidget2.cpp | 66 +++++++++++++++++++++++++++++++++++++++ profile-widget/profilewidget2.h | 4 +++ 2 files changed, 70 insertions(+) (limited to 'profile-widget') diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index b44bdfc99..2306a2831 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -14,6 +14,7 @@ #include "diveplannermodel.h" #include "models.h" #include "divepicturemodel.h" +#include "divelist.h" #ifndef SUBSURFACE_MOBILE #include "diveplanner.h" #include "simplewidgets.h" @@ -33,6 +34,7 @@ #include #endif #include "preferences/preferencesdialog.h" +#include // a couple of helpers we need extern bool haveFilesOnCommandLine(); @@ -129,6 +131,8 @@ ProfileWidget2::ProfileWidget2(QWidget *parent) : QGraphicsView(parent), scene()->installEventFilter(this); #ifndef SUBSURFACE_MOBILE QAction *action = NULL; + setAcceptDrops(true); + #define ADD_ACTION(SHORTCUT, Slot) \ action = new QAction(this); \ action->setShortcut(SHORTCUT); \ @@ -1874,3 +1878,65 @@ void ProfileWidget2::plotPictures() pictures.push_back(item); } } + +void ProfileWidget2::dropEvent(QDropEvent *event) +{ + if (event->mimeData()->hasFormat("application/x-subsurfaceimagedrop")) { + QByteArray itemData = event->mimeData()->data("application/x-subsurfaceimagedrop"); + QDataStream dataStream(&itemData, QIODevice::ReadOnly); + + QString filename; + QPoint offset; + dataStream >> filename >> offset; + + QPointF mappedPos = mapToScene(event->pos()); + + FOR_EACH_PICTURE(current_dive) { + if (QString(picture->filename) == filename) { + picture->offset.seconds = timeAxis->valueAt(mappedPos); + mark_divelist_changed(true); + break; + } + } + copy_dive(current_dive, &displayed_dive); + DivePictureModel::instance()->updateDivePictures(); + + + if (event->source() == this) { + event->setDropAction(Qt::MoveAction); + event->accept(); + } else { + event->acceptProposedAction(); + } + } else { + event->ignore(); + } +} + +void ProfileWidget2::dragEnterEvent(QDragEnterEvent *event) +{ + if (event->mimeData()->hasFormat("application/x-subsurfaceimagedrop")) { + if (event->source() == this) { + event->setDropAction(Qt::MoveAction); + event->accept(); + } else { + event->acceptProposedAction(); + } + } else { + event->ignore(); + } +} + +void ProfileWidget2::dragMoveEvent(QDragMoveEvent *event) +{ + if (event->mimeData()->hasFormat("application/x-subsurfaceimagedrop")) { + if (event->source() == this) { + event->setDropAction(Qt::MoveAction); + event->accept(); + } else { + event->acceptProposedAction(); + } + } else { + event->ignore(); + } +} diff --git a/profile-widget/profilewidget2.h b/profile-widget/profilewidget2.h index c73d675bb..9255fe3aa 100644 --- a/profile-widget/profilewidget2.h +++ b/profile-widget/profilewidget2.h @@ -149,6 +149,10 @@ protected: virtual void mouseDoubleClickEvent(QMouseEvent *event); virtual void mousePressEvent(QMouseEvent *event); virtual void mouseReleaseEvent(QMouseEvent *event); + void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE; + void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE; + private: /*methods*/ void fixBackgroundPos(); -- cgit v1.2.3-70-g09d2