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 /qt-models/diveplannermodel.h | |
| 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 'qt-models/diveplannermodel.h')
| -rw-r--r-- | qt-models/diveplannermodel.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qt-models/diveplannermodel.h b/qt-models/diveplannermodel.h index 23d9ada02..4dda5cc6e 100644 --- a/qt-models/diveplannermodel.h +++ b/qt-models/diveplannermodel.h @@ -7,6 +7,7 @@ #include "core/deco.h" #include "core/planner.h" +#include "qt-models/cylindermodel.h" class DivePlannerPointsModel : public QAbstractTableModel { Q_OBJECT @@ -47,6 +48,7 @@ public: bool tankInUse(int cylinderid); void setupCylinders(); bool updateMaxDepth(); + CylindersModelFiltered *cylindersModel(); int ascrate75Display(); int ascrate50Display(); @@ -127,6 +129,7 @@ private: void computeVariations(struct diveplan *diveplan, const struct deco_state *ds); void computeVariationsFreeDeco(struct diveplan *diveplan, struct deco_state *ds); int analyzeVariations(struct decostop *min, struct decostop *mid, struct decostop *max, const char *unit); + CylindersModelFiltered cylinders; Mode mode; bool recalc; QVector<divedatapoint> divepoints; |