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

Don't block profile updates in variations computation

Browse source 
We needed to prevent updates when we messed with the
diveplannerpointsmodel as those would trigger
starting planning from scratch causing infinite loops.

Now, the variations calculation operates on a copy of
the diveplan, so the model is no longer involved and
we should not block recalculations (as those might be
triggered by the UI).

Signed-off-by: Robert C. Helling <helling@atdotde.de>
This commit is contained in:
Robert C. Helling 2017-11-28 20:23:47 +01:00 • committed by Dirk Hohndel
parent f6b00fb3dd
commit 0839342d33
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
qt-models/diveplannermodel.cpp
View file

@ -1022,7 +1022,7 @@ int DivePlannerPointsModel::analyzeVariations(struct decostop *min, struct decos
void DivePlannerPointsModel::computeVariations(struct diveplan *original_plan, struct deco_state *previos_ds)
{
bool oldRecalc = setRecalc(false);
// bool oldRecalc = setRecalc(false);
struct dive *dive = alloc_dive();
copy_dive(&displayed_dive, dive);
struct decostop original[60], deeper[60], shallower[60], shorter[60], longer[60];
@ -1032,7 +1032,7 @@ void DivePlannerPointsModel::computeVariations(struct diveplan *original_plan, s
struct deco_state ds = *previos_ds;
if(!original_plan) {
setRecalc(oldRecalc);
// setRecalc(oldRecalc);
return;
}
@ -1083,19 +1083,19 @@ void DivePlannerPointsModel::computeVariations(struct diveplan *original_plan, s
plan(&ds, &plan_copy, dive, 1, shorter, &cache, true, false);
free_dps(&plan_copy);
restore_deco_state(save, &ds, false);
finish:
free_dps(original_plan);
free(original_plan);
#ifdef SHOWSTOPVARIATIONS
printf("\n\n");
#endif
char buf[200];
sprintf(buf, "+ %d:%02d /m + %d:%02d /min", FRACTION(analyzeVariations(shallower, original, deeper, "m"),60),
FRACTION(analyzeVariations(shorter, original, longer, "min"), 60));
emit variationsComputed(QString(buf));
#ifdef SHOWSTOPVARIATIONS
printf("\n\n");
#endif
}
setRecalc(oldRecalc);
finish:
free_dps(original_plan);
free(original_plan);
// setRecalc(oldRecalc);
}
void DivePlannerPointsModel::createPlan(bool replanCopy)