mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Hand planner variables to profile

Browse source 
Pass the planner state struct to the profile computation so it can use
deco_time and first ceiling to display VPM-B ceiling.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
This commit is contained in:
Robert C. Helling 2017-11-24 14:17:01 +01:00
parent 8e21a65653
commit 088db5e12b
6 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
qt-models/diveplannermodel.cpp
View file

@ -924,6 +924,7 @@ void DivePlannerPointsModel::createTemporaryPlan()
struct deco_state plan_deco_state;
plan(&plan_deco_state, &diveplan, &displayed_dive, DECOTIMESTEP, stoptable, &cache, isPlanner(), false);
//QtConcurrent::run(this, &DivePlannerPointsModel::computeVariations, &ds_after_previous_dives);
final_deco_state = plan_deco_state;
emit calculatedPlanNotes();
}
// throw away the cache

1
qt-models/diveplannermodel.h
View file

@ -56,6 +56,7 @@ public:
int lastEnteredPoint();
void removeDeco();
static bool addingDeco;
struct deco_state final_deco_state;
public
slots:

3
qt-models/diveplotdatamodel.cpp
View file

@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include "qt-models/diveplotdatamodel.h"
#include "qt-models/diveplannermodel.h"
#include "core/dive.h"
#include "core/profile.h"
#include "core/divelist.h"
@ -232,7 +233,7 @@ void DivePlotDataModel::calculateDecompression()
{
struct divecomputer *dc = select_dc(&displayed_dive);
init_decompression(&plot_deco_state, &displayed_dive);
calculate_deco_information(&plot_deco_state, &displayed_dive, dc, &pInfo, false);
calculate_deco_information(&plot_deco_state, &(DivePlannerPointsModel::instance()->final_deco_state), &displayed_dive, dc, &pInfo, false);
dataChanged(index(0, CEILING), index(pInfo.nr - 1, TISSUE_16));
}
#endif