flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-08 21:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T223, use const values for standard pressure

Browse Source 
* standardISASeaLevelPressure
* use static const values for standard pressure
* minor formatting
This commit is contained in:
Klaus Basan
2018-01-14 21:19:02 +01:00
parent 56adde399e
commit f049900e1f
13 changed files with 72 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackgui/editors/situationform.cpp
View File

@@ -17,6 +17,7 @@
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Geo;
using namespace BlackMisc::PhysicalQuantities;
namespace BlackGui
@@ -57,12 +58,12 @@ namespace BlackGui
CAircraftSituation CSituationForm::getSituation() const
{
const BlackMisc::Geo::CCoordinateGeodetic position = ui->comp_Coordinate->getCoordinate();
const CCoordinateGeodetic position = ui->comp_Coordinate->getCoordinate();
const CAltitude pressureAltitude(position.geodeticHeight().toPressureAltitude(this->getBarometricPressureMsl()));
CAircraftSituation s(position);
s.setBank(this->getBankAngle());
s.setPitch(this->getPitchAngle());
CAltitude pressureAltitude(position.geodeticHeight().toPressureAltitude(this->getBarometricPressureMsl()));
s.setPressureAltitude(pressureAltitude);
return s;
}
@@ -100,13 +101,13 @@ namespace BlackGui
const QString v(ui->le_Pressure->text().replace(',', '.'));
bool ok;
double vd = v.toDouble(&ok);
if (!ok) { vd = 1013.25; }
if (!ok) { vd = CAltitude::standardISASeaLevelPressure().value(CPressureUnit::mbar()); }
return vd;
}
CPressure CSituationForm::getBarometricPressureMsl() const
{
return CPressure (getBarometricPressureMslMillibar(), CPressureUnit::mbar());
return CPressure(getBarometricPressureMslMillibar(), CPressureUnit::mbar());
}
void CSituationForm::setReadOnly(bool readonly)
@@ -207,8 +208,10 @@ namespace BlackGui
void CSituationForm::resetPressure()
{
ui->le_Pressure->setText("1013.00");
ui->hs_Pressure->setValue(1013);
static const int v = CAltitude::standardISASeaLevelPressure().valueInteger(CPressureUnit::mbar());
static const QString vs(dotToLocaleDecimalPoint(QString::number(CAltitude::standardISASeaLevelPressure().valueRounded(CPressureUnit::mbar(), 2))));
ui->le_Pressure->setText(vs);
ui->hs_Pressure->setValue(v);
}
} // ns
} // ns