diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-02-03 18:52:17 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-02-11 20:37:09 -0800 |
| commit | 190a2a876e3fe3148c6cfce87ac630f251833066 (patch) | |
| tree | 560473d8debc387f039456233c851b67bc98c3e9 /backend-shared | |
| parent | 6622f42aab937e72cc11cb5512012394aa687767 (diff) | |
| download | subsurface-190a2a876e3fe3148c6cfce87ac630f251833066.tar.gz | |
Planner: make cylinder-model subobject of planner-model
The cylinder-model had an instance() function, but actually
there were two cylinder models: one used by the equipment tab,
one used by the planner.
This is misleading. Therefore, remove the instance() function
and make the cylinder-model a subobject of the planner-model.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'backend-shared')
| -rw-r--r-- | backend-shared/plannershared.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/backend-shared/plannershared.cpp b/backend-shared/plannershared.cpp index 606dbb9d2..bc2fa58be 100644 --- a/backend-shared/plannershared.cpp +++ b/backend-shared/plannershared.cpp @@ -126,7 +126,7 @@ void PlannerShared::set_o2narcotic(bool value) { qPrefDivePlanner::set_o2narcotic(value); DivePlannerPointsModel::instance()->emitDataChanged(); - CylindersModelFiltered::instance()->model()->updateBestMixes(); + DivePlannerPointsModel::instance()->cylindersModel()->model()->updateBestMixes(); } double PlannerShared::bottompo2() @@ -136,7 +136,7 @@ double PlannerShared::bottompo2() void PlannerShared::set_bottompo2(double value) { qPrefDivePlanner::set_bottompo2((int) (value * 1000.0)); - CylindersModelFiltered::instance()->model()->updateBestMixes(); + DivePlannerPointsModel::instance()->cylindersModel()->model()->updateBestMixes(); } double PlannerShared::decopo2() @@ -148,8 +148,8 @@ void PlannerShared::set_decopo2(double value) pressure_t olddecopo2; olddecopo2.mbar = prefs.decopo2; qPrefDivePlanner::instance()->set_decopo2((int) (value * 1000.0)); - CylindersModelFiltered::instance()->model()->updateDecoDepths(olddecopo2); - CylindersModelFiltered::instance()->model()->updateBestMixes(); + DivePlannerPointsModel::instance()->cylindersModel()->model()->updateDecoDepths(olddecopo2); + DivePlannerPointsModel::instance()->cylindersModel()->model()->updateBestMixes(); } int PlannerShared::bestmixend() @@ -159,5 +159,5 @@ int PlannerShared::bestmixend() void PlannerShared::set_bestmixend(int value) { qPrefDivePlanner::set_bestmixend(units_to_depth(value).mm); - CylindersModelFiltered::instance()->model()->updateBestMixes(); + DivePlannerPointsModel::instance()->cylindersModel()->model()->updateBestMixes(); } |