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

Merge branch 'boyle-ready' of https://github.com/Slagvi/subsurface

Browse source 
Fixed merge conflicts in
	deco.c
	dive.h
	planner.c

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-08-17 21:45:51 -07:00
commit d93984448c
10 changed files with 345 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qt-models/diveplannermodel.cpp
View file

@ -397,6 +397,12 @@ void DivePlannerPointsModel::triggerGFLow()
}
}
void DivePlannerPointsModel::setConservatism(int level)
{
prefs.conservatism_level = level;
emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1));
}
void DivePlannerPointsModel::setSurfacePressure(int pressure)
{
diveplan.surface_pressure = pressure;

1
qt-models/diveplannermodel.h
View file

@ -65,6 +65,7 @@ slots:
void triggerGFHigh();
void setGFLow(const int ghflow);
void triggerGFLow();
void setConservatism(int level);
void setSurfacePressure(int pressure);
void setSalinity(int salinity);
int getSurfacePressure();