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

Planner: make cylinder-model subobject of planner-model

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2020-02-03 18:52:17 +01:00 • committed by Dirk Hohndel
parent 6622f42aab
commit 190a2a876e
7 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

3
qt-models/diveplannermodel.h
View file

@ -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;