diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2021-01-08 23:55:20 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2021-01-10 15:57:39 -0800 |
| commit | 9bfc6d2520b83b8151a84e23cbab082ab460532e (patch) | |
| tree | 246d0cf6ed87b1a6dde850ff3633431752d675ff /profile-widget/profilewidget2.cpp | |
| parent | 94a57d9a1d9b1d1eeb89b1ccbba27f4b677ff6ed (diff) | |
| download | subsurface-9bfc6d2520b83b8151a84e23cbab082ab460532e.tar.gz | |
profile: use a parameter to determine planner state
The in_planner() function is incompatible with a reentrant
profile, since it accesses a global variable. In
create_plot_info_new() it is essentially redundant, because
there is a planner_ds (ds = deco_state) parameter that
is used only when in the planner. Therefore use that as
the in_planner indicator: when non-null, the profile is
showing a planned dive.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'profile-widget/profilewidget2.cpp')
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 546a618d8..5e32f39a8 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -598,6 +598,7 @@ void ProfileWidget2::plotDive(const struct dive *d, bool force, bool doClearPict ccrsensor3GasItem->setVisible(sensorflag && (currentdc->no_o2sensors > 2)); ocpo2GasItem->setVisible((currentdc->divemode == PSCR) && prefs.show_scr_ocpo2); + /* This struct holds all the data that's about to be plotted. * I'm not sure this is the best approach ( but since we are * interpolating some points of the Dive, maybe it is... ) @@ -608,7 +609,9 @@ void ProfileWidget2::plotDive(const struct dive *d, bool force, bool doClearPict // create_plot_info_new() automatically frees old plot data #ifndef SUBSURFACE_MOBILE - create_plot_info_new(&displayed_dive, currentdc, &plotInfo, !shouldCalculateMaxDepth, &DivePlannerPointsModel::instance()->final_deco_state); + // A non-null planner_ds signals to create_plot_info_new that the dive is currently planned. + struct deco_state *planner_ds = currentState == PLAN ? &DivePlannerPointsModel::instance()->final_deco_state : nullptr; + create_plot_info_new(&displayed_dive, currentdc, &plotInfo, !shouldCalculateMaxDepth, planner_ds); #else create_plot_info_new(&displayed_dive, currentdc, &plotInfo, !shouldCalculateMaxDepth, nullptr); #endif |