FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Store a table of deco stops in planner

Browse Source 
... in addition to struct diveplan which combines all kinds
of information

Signed-off-by: Robert C. Helling <helling@atdotde.de>
This commit is contained in:
Robert C. Helling
2017-08-27 22:49:41 +02:00
committed by Dirk Hohndel
parent 456e2cec89
commit e6545a7b0f
4 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qt-models/diveplannermodel.cpp
View File

@@ -842,7 +842,8 @@ void DivePlannerPointsModel::createTemporaryPlan()
dump_plan(&diveplan);
#endif
if (recalcQ() && !diveplan_empty(&diveplan)) {
plan(&diveplan, &displayed_dive, DECOTIMESTEP, &cache, isPlanner(), false);
struct decostop stoptable[60];
plan(&diveplan, &displayed_dive, DECOTIMESTEP, stoptable, &cache, isPlanner(), false);
emit calculatedPlanNotes();
}
// throw away the cache
@@ -878,7 +879,8 @@ void DivePlannerPointsModel::createPlan(bool replanCopy)
setRecalc(oldRecalc);
//TODO: C-based function here?
plan(&diveplan, &displayed_dive, DECOTIMESTEP, &cache, isPlanner(), true);
struct decostop stoptable[60];
plan(&diveplan, &displayed_dive, DECOTIMESTEP, stoptable, &cache, isPlanner(), true);
free(cache);
if (!current_dive || displayed_dive.id != current_dive->id) {
// we were planning a new dive, not re-planning an existing on