mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ask user about merging dives more than 30m apart

Browse source 
...and remember the answer.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2015-05-18 10:52:03 +02:00 • committed by Dirk Hohndel
parent 043bd3afb7
commit 6730405624
1 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
qt-ui/divelistview.cpp
View file

@ -16,6 +16,7 @@
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkReply> #include <QNetworkReply>
#include <QStandardPaths> #include <QStandardPaths>
#include <QMessageBox>
#include "qthelper.h" #include "qthelper.h"
#include "undocommands.h" #include "undocommands.h"
#include "divelistview.h" #include "divelistview.h"
@ -566,15 +567,32 @@ void DiveListView::selectionChanged(const QItemSelection &selected, const QItemS
Q_EMIT currentDiveChanged(selected_dive); Q_EMIT currentDiveChanged(selected_dive);
} }
static bool can_merge(const struct dive *a, const struct dive *b) enum asked_user {NOTYET, MERGE, DONTMERGE};
static bool can_merge(const struct dive *a, const struct dive *b, enum asked_user *have_asked)
{ {
if (!a || !b) if (!a || !b)
return false; return false;
if (a->when > b->when) if (a->when > b->when)
return false; return false;
/* Don't merge dives if there's more than half an hour between them */ /* Don't merge dives if there's more than half an hour between them */
if (a->when + a->duration.seconds + 30 * 60 < b->when) if (a->when + a->duration.seconds + 30 * 60 < b->when) {
return false; if (*have_asked == NOTYET) {
if (QMessageBox::warning(MainWindow::instance(),
MainWindow::instance()->tr("Warning"),
MainWindow::instance()->tr("Trying to merge dives with %1min interval in between").arg(
(b->when - a->when - a->duration.seconds) / 60),
QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Cancel) {
*have_asked = DONTMERGE;
return false;
} else {
*have_asked = MERGE;
return true;
}
} else {
return *have_asked == MERGE ? true : false;
}
}
return true; return true;
} }
@ -582,10 +600,11 @@ void DiveListView::mergeDives()
{ {
int i; int i;
struct dive *dive, *maindive = NULL; struct dive *dive, *maindive = NULL;
enum asked_user have_asked = NOTYET;
for_each_dive (i, dive) { for_each_dive (i, dive) {
if (dive->selected) { if (dive->selected) {
if (!can_merge(maindive, dive)) { if (!can_merge(maindive, dive, &have_asked)) {
maindive = dive; maindive = dive;
} else { } else {
maindive = merge_two_dives(maindive, dive); maindive = merge_two_dives(maindive, dive);