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

Simplify update of gflow and gfhigh values in the code

Browse source 
The more complex handling is no longer needed because:
- Keyboard tracking for gfhigh/low UI fields was switched off here:
  030c094854
- GFhigh was limited to 40 here:
  53fffe0ce3

Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
This commit is contained in:
Stefan Fuchs 2017-12-19 20:55:17 +01:00 • committed by Robert C. Helling
parent 3ad398e3a7
commit d703ba99c1
3 changed files with 7 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

31
qt-models/diveplannermodel.cpp
View file

@ -404,9 +404,7 @@ int DivePlannerPointsModel::rowCount(const QModelIndex &parent) const
DivePlannerPointsModel::DivePlannerPointsModel(QObject *parent) : QAbstractTableModel(parent),
mode(NOTHING),
recalc(false),
tempGFHigh(100),
tempGFLow(100)
recalc(false)
{
memset(&diveplan, 0, sizeof(diveplan));
startTime.setTimeSpec(Qt::UTC);
@ -455,25 +453,18 @@ void DivePlannerPointsModel::setProblemSolvingTime(int minutes)
void DivePlannerPointsModel::setGFHigh(const int gfhigh)
{
tempGFHigh = gfhigh;
// GFHigh <= 34 can cause infinite deco at 6m - don't trigger a recalculation
// for smaller GFHigh unless the user explicitly leaves the field
if (tempGFHigh > 34)
triggerGFHigh();
}
void DivePlannerPointsModel::triggerGFHigh()
{
if (diveplan.gfhigh != tempGFHigh) {
diveplan.gfhigh = tempGFHigh;
if (diveplan.gfhigh != gfhigh) {
diveplan.gfhigh = gfhigh;
emitDataChanged();
}
}
void DivePlannerPointsModel::setGFLow(const int gflow)
{
tempGFLow = gflow;
triggerGFLow();
if (diveplan.gflow != gflow) {
diveplan.gflow = gflow;
emitDataChanged();
}
}
void DivePlannerPointsModel::setRebreatherMode(int mode)
@ -485,14 +476,6 @@ void DivePlannerPointsModel::setRebreatherMode(int mode)
emitDataChanged();
}
void DivePlannerPointsModel::triggerGFLow()
{
if (diveplan.gflow != tempGFLow) {
diveplan.gflow = tempGFLow;
emitDataChanged();
}
}
void DivePlannerPointsModel::setVpmbConservatism(int level)
{
if (diveplan.vpmb_conservatism != level) {