diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2017-01-07 03:01:14 +0100 |
|---|---|---|
| committer |  Subsurface <dirk@subsurface-divelog.org> | 2017-01-06 20:43:23 -0800 |
| commit | bb4bf639c333bee28d398c3670f52797d726b126 (patch) | |
| tree | c28fe4eb2f51dc226931ee16e58edade6bf644ea /profile-widget | |
| parent | 4e375f56a8b15212b96e0ce5b7ca4724dc268612 (diff) | |
| download | subsurface-bb4bf639c333bee28d398c3670f52797d726b126.tar.gz | |
Fix deco_mode confusion
We have two prefernces determining the deco_mode (BUEHLMANN vs VPMB
vs RECREATIONAL): One for the planner (deco_mode) and one for
displaying dives (display_deco_mode). The former is set in the planner
settings while the latter is set in the preferences.
This patch clears up a confusion which of the two to use by introducing
a helper function that selects the correct variable.
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Diffstat (limited to 'profile-widget')
| -rw-r--r-- | profile-widget/divetooltipitem.cpp | 3 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/profile-widget/divetooltipitem.cpp b/profile-widget/divetooltipitem.cpp index e55ceb269..4b422fe81 100644 --- a/profile-widget/divetooltipitem.cpp +++ b/profile-widget/divetooltipitem.cpp @@ -8,6 +8,7 @@ #include <QSettings> #include <QGraphicsView> #include <QStyleOptionGraphicsItem> +#include "core/qthelper.h" void ToolTipItem::addToolTip(const QString &toolTip, const QIcon &icon, const QPixmap& pixmap) { @@ -267,7 +268,7 @@ void ToolTipItem::refresh(const QPointF &pos) Q_ASSERT(view); painter.setPen(QColor(0, 0, 0, 255)); - if ((view->currentState == ProfileWidget2::PLAN && prefs.deco_mode == BUEHLMANN) || prefs.display_deco_mode == BUEHLMANN) + if (decoMode() == BUEHLMANN) painter.drawLine(0, 60 - entry->gfline / 2, 16, 60 - entry->gfline / 2); painter.drawLine(0, 60 - AMB_PERCENTAGE * (entry->pressures.n2 + entry->pressures.he) / entry->ambpressure / 2, 16, 60 - AMB_PERCENTAGE * (entry->pressures.n2 + entry->pressures.he) / entry->ambpressure /2); diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 44e06eafb..f0df220e3 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -19,6 +19,7 @@ #include "desktop-widgets/diveplanner.h" #include "desktop-widgets/simplewidgets.h" #include "desktop-widgets/divepicturewidget.h" +#include "core/qthelper.h" #endif #include <libdivecomputer/parser.h> @@ -558,7 +559,7 @@ void ProfileWidget2::plotDive(struct dive *d, bool force) // this copies the dive and makes copies of all the relevant additional data copy_dive(d, &displayed_dive); #ifndef SUBSURFACE_MOBILE - if ((currentState == PLAN && prefs.deco_mode == VPMB) || prefs.display_deco_mode == VPMB) + if (decoMode() == VPMB) decoModelParameters->setText(QString("VPM-B +%1").arg(prefs.vpmb_conservatism)); else decoModelParameters->setText(QString("GF %1/%2").arg(prefs.gflow).arg(prefs.gfhigh)); @@ -570,7 +571,7 @@ void ProfileWidget2::plotDive(struct dive *d, bool force) plannerModel->deleteTemporaryPlan(); return; } - if ((currentState == PLAN && prefs.deco_mode == VPMB) || prefs.display_deco_mode == VPMB) + if (decoMode() == VPMB) decoModelParameters->setText(QString("VPM-B +%1").arg(diveplan.vpmb_conservatism)); else decoModelParameters->setText(QString("GF %1/%2").arg(diveplan.gflow).arg(diveplan.gfhigh)); |