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

units: replace SURFACE_PRESSURE by 1_atm

Browse source 
Moreover, convert diveplan::surface_pressure from int to
pressure_t.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-09-09 13:55:37 +02:00 • committed by bstoeger
parent ae81b42fe2
commit dd5def35f5
11 changed files with 56 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
qt-models/cylindermodel.cpp
View file

@ -410,7 +410,7 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
cyl.gasmix.he.permille = 1000 - get_o2(cyl.gasmix);
pressure_t modpO2;
if (d->dcs[0].divemode == PSCR)
modpO2.mbar = prefs.decopo2 + (1000 - get_o2(cyl.gasmix)) * SURFACE_PRESSURE *
modpO2.mbar = prefs.decopo2 + (1000 - get_o2(cyl.gasmix)) * (1_atm).mbar *
prefs.o2consumption / prefs.decosac / prefs.pscr_ratio;
else
modpO2.mbar = prefs.decopo2;

4
qt-models/diveplannermodel.cpp
View file

@ -609,7 +609,7 @@ void DivePlannerPointsModel::setVpmbConservatism(int level)
}
}
void DivePlannerPointsModel::setSurfacePressure(int pressure)
void DivePlannerPointsModel::setSurfacePressure(pressure_t pressure)
{
diveplan.surface_pressure = pressure;
emitDataChanged();
@ -621,7 +621,7 @@ void DivePlannerPointsModel::setSalinity(int salinity)
emitDataChanged();
}
int DivePlannerPointsModel::getSurfacePressure() const
pressure_t DivePlannerPointsModel::getSurfacePressure() const
{
return diveplan.surface_pressure;
}

4
qt-models/diveplannermodel.h
View file

@ -52,7 +52,7 @@ public:
int ascratestopsDisplay() const;
int ascratelast6mDisplay() const;
int descrateDisplay() const;
int getSurfacePressure() const;
pressure_t getSurfacePressure() const;
int gfLow() const;
int gfHigh() const;
@ -74,7 +74,7 @@ slots:
void setGFHigh(const int gfhigh);
void setGFLow(const int gflow);
void setVpmbConservatism(int level);
void setSurfacePressure(int pressure);
void setSurfacePressure(pressure_t pressure);
void setSalinity(int salinity);
void setBottomSac(double sac);
void setDecoSac(double sac);