diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2021-01-27 23:41:51 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2021-02-06 10:00:39 -0800 |
commit | 0b0e6672d5622238c2fb583dad6b51813b9338b3 (patch) | |
tree | d720b6d5b6d176667b029de691822c54ca8718c9 /profile-widget | |
parent | aefbde93ce161c08b4aca31aee4e3fc45ab72003 (diff) | |
download | subsurface-0b0e6672d5622238c2fb583dad6b51813b9338b3.tar.gz |
profile: detect dive-mode change in profile
The profile must be replotted when the dive mode changes.
Weirdly, this was routed via the dive-information tab
(making it inherently non-mobile compatible). Detect
such a change directly in the profile.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'profile-widget')
-rw-r--r-- | profile-widget/profilewidget2.cpp | 12 | ||||
-rw-r--r-- | profile-widget/profilewidget2.h | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 128793fd9..5d37496e3 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -32,7 +32,6 @@ #include "core/gettextfromc.h" #include "core/imagedownloader.h" #endif -#include "core/subsurface-qt/divelistnotifier.h" #include <libdivecomputer/parser.h> #include <QScrollBar> @@ -174,6 +173,7 @@ ProfileWidget2::ProfileWidget2(QWidget *parent) : QGraphicsView(parent), connect(&diveListNotifier, &DiveListNotifier::cylinderEdited, this, &ProfileWidget2::profileChanged); connect(&diveListNotifier, &DiveListNotifier::eventsChanged, this, &ProfileWidget2::profileChanged); connect(&diveListNotifier, &DiveListNotifier::pictureOffsetChanged, this, &ProfileWidget2::pictureOffsetChanged); + connect(&diveListNotifier, &DiveListNotifier::divesChanged, this, &ProfileWidget2::divesChanged); #endif // SUBSURFACE_MOBILE #if !defined(QT_NO_DEBUG) && defined(SHOW_PLOT_INFO_TABLE) @@ -814,6 +814,16 @@ void ProfileWidget2::plotDive(const struct dive *d, bool force, bool doClearPict } } +void ProfileWidget2::divesChanged(const QVector<dive *> &dives, DiveField field) +{ + // If the mode of the currently displayed dive changed, replot + if (field.mode && + std::any_of(dives.begin(), dives.end(), + [id = displayed_dive.id] (const dive *d) + { return d->id == id; } )) + replot(); +} + void ProfileWidget2::actionRequestedReplot(bool) { settingsChanged(); diff --git a/profile-widget/profilewidget2.h b/profile-widget/profilewidget2.h index be40694a7..b2632d511 100644 --- a/profile-widget/profilewidget2.h +++ b/profile-widget/profilewidget2.h @@ -22,6 +22,7 @@ #include "core/color.h" #include "core/pictureobj.h" #include "core/units.h" +#include "core/subsurface-qt/divelistnotifier.h" class RulerItem2; struct dive; @@ -102,6 +103,7 @@ public slots: // Necessary to call from QAction's signals. void settingsChanged(); void actionRequestedReplot(bool triggered); + void divesChanged(const QVector<dive *> &dives, DiveField field); void setEmptyState(); void setProfileState(); #ifndef SUBSURFACE_MOBILE |