mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 14:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

planner: fix calculations of variations

Browse source 
In 8704a8b the code in cloneDiveplan() was replaced by a simple
assignment statement.

Alas, the original code was more complex: it copied only up
to a certain point (it stopped at automatically generated
steps).

The new behavior made the calculations of variations fail,
because a call to plan() adds deco stops.

Therefore, copy the plan _before_ calling plan().

Fixes #4368

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-11-15 07:25:44 +01:00
parent beb352d47c
commit 147621ef35
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
qt-models/diveplannermodel.cpp
View file

@ -1118,17 +1118,20 @@ void DivePlannerPointsModel::updateDiveProfile()
if (diveplan.is_empty())
return;
// For calculating variations, we need a copy of the plan. We have to copy _before_
// calling plan(), because that adds deco stops.
bool computeVariations = isPlanner() && shouldComputeVariations();
std::unique_ptr<struct diveplan> plan_copy;
if (computeVariations)
plan_copy = std::make_unique<struct diveplan>(diveplan);
deco_state_cache cache;
struct deco_state plan_deco_state;
plan(&plan_deco_state, diveplan, d, dcNr, decotimestep, cache, isPlanner(), false);
updateMaxDepth();
if (isPlanner() && shouldComputeVariations()) {
auto plan_copy = std::make_unique<struct diveplan>();
lock_planner();
*plan_copy = diveplan;
unlock_planner();
if (computeVariations) {
#ifdef VARIATIONS_IN_BACKGROUND
// Since we're calling computeVariations asynchronously and plan_deco_state is allocated
// on the stack, it must be copied and freed by the worker-thread.
@ -1252,6 +1255,7 @@ void DivePlannerPointsModel::computeVariations(std::unique_ptr<struct diveplan>
auto deeper = plan(&ds, plan_copy, dive.get(), dcNr, 1, cache, true, false);
save.restore(&ds, false);
plan_copy = *original_plan;
second_to_last(plan_copy.dp).depth.mm -= delta_depth.mm;
plan_copy.dp.back().depth.mm -= delta_depth.mm;
if (my_instance != instanceCounter)
@ -1266,6 +1270,7 @@ void DivePlannerPointsModel::computeVariations(std::unique_ptr<struct diveplan>
auto longer = plan(&ds, plan_copy, dive.get(), dcNr, 1, cache, true, false);
save.restore(&ds, false);
plan_copy = *original_plan;
plan_copy.dp.back().time -= delta_time.seconds;
if (my_instance != instanceCounter)
return;
@ -1308,15 +1313,16 @@ void DivePlannerPointsModel::createPlan(bool saveAsNew)
removeDeco();
createTemporaryPlan();
// For calculating variations, we need a copy of the plan. We have to copy _before_
// calling plan(), because that adds deco stops.
std::unique_ptr<struct diveplan> plan_copy;
if (shouldComputeVariations())
plan_copy = std::make_unique<struct diveplan>(diveplan);
plan(&ds_after_previous_dives, diveplan, d, dcNr, decotimestep, cache, isPlanner(), true);
if (shouldComputeVariations()) {
auto plan_copy = std::make_unique<struct diveplan>();
lock_planner();
*plan_copy = diveplan;
unlock_planner();
if (shouldComputeVariations())
computeVariations(std::move(plan_copy), &ds_after_previous_dives);
}
// Fixup planner notes.
if (current_dive && d->id == current_dive->id) {