diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2017-11-22 20:42:33 +0100 |
|---|---|---|
| committer | Robert C. Helling <helling@atdotde.de> | 2017-11-25 20:13:01 +0100 |
| commit | 8e21a65653514d9340ef45c9b9c53dfe5d280350 (patch) | |
| tree | 2ada40567e25bc45035698748f368127b1cca199 /qt-models/diveplannermodel.h | |
| parent | a9ceecc2e3646432d6688d04b592c48f9c63ae65 (diff) | |
| download | subsurface-8e21a65653514d9340ef45c9b9c53dfe5d280350.tar.gz | |
Localize global planner state
For UI responsiveness, we need to be able to run the planner in the background. This needs the
planner state to be localized (and we need to pass a pointer around).
In order to not let too many lines overrun (and to save typing in the future)
I have renamed instances of struct deco_state to ds. Yes this should have gone
to a separate commit but I accidentally commit --amend'ed it.
Computing of planner variations is temporarily disabled.
Unlock the planner when returning early
So we don't deadlock in add dive and recreational mode (which
use the planner without actually planning).
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Diffstat (limited to 'qt-models/diveplannermodel.h')
| -rw-r--r-- | qt-models/diveplannermodel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qt-models/diveplannermodel.h b/qt-models/diveplannermodel.h index a4fe35a65..0b714e608 100644 --- a/qt-models/diveplannermodel.h +++ b/qt-models/diveplannermodel.h @@ -115,7 +115,7 @@ private: void createPlan(bool replanCopy); struct diveplan diveplan; struct divedatapoint *cloneDiveplan(struct diveplan *plan_copy); - void computeVariations(); + void computeVariations(struct deco_state *ds); int analyzeVariations(struct decostop *min, struct decostop *mid, struct decostop *max, const char *unit); Mode mode; bool recalc; @@ -124,6 +124,7 @@ private: int tempGFHigh; int tempGFLow; int instanceCounter = 0; + struct deco_state ds_after_previous_dives; }; #endif |