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

Ref T778, improved "canLikelySkipNearGround" in airspace monitor

Browse Source 
* use CAircraftIcaoCode::guessModelParameters as this gives us an impression of speed
* use "breakable" do/while block / fewer nested "if" levels
This commit is contained in:
Klaus Basan
2020-03-27 22:56:59 +01:00
committed by Mat Sutcliffe
parent 5bc09ed2c8
commit e6a12d45c4
2 changed files with 123 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/blackmisc/aviation/aircrafticaocode.cpp
View File

@@ -247,8 +247,8 @@ namespace BlackMisc
if (!guessedCGOut.isNull() && !guessedVRotateOut.isNull()) { return; }
// init to defaults
CLength guessedCG = CLength(1.5, CLengthUnit::m());
CSpeed guessedVRotate = this->isVtol() ? CSpeed::null() : CSpeed(70, CSpeedUnit::km_h());
CLength guessedCG = CLength(1.5, CLengthUnit::m());
CSpeed guessedVRotate = CSpeed(70, CSpeedUnit::km_h());
const int engines = this->getEnginesCount();
const QChar engineType = this->getEngineTypeChar().toUpper();
@@ -267,26 +267,36 @@ namespace BlackMisc
{
// a B737 has VR 105-160kts
guessedVRotate = CSpeed(120, CSpeedUnit::kts());
guessedCG = CLength(2.5, CLengthUnit::m());
guessedCG = CLength(2.5, CLengthUnit::m());
break;
}
}
else if (engines > 2)
{
guessedCG = CLength(4.0, CLengthUnit::m());
guessedCG = CLength(4.0, CLengthUnit::m());
guessedVRotate = CSpeed(70, CSpeedUnit::kts());
if (engineType == 'J')
{
// A typical B747 has VR around 160kts
guessedCG = CLength(6.0, CLengthUnit::m());
guessedCG = CLength(6.0, CLengthUnit::m());
guessedVRotate = CSpeed(140, CSpeedUnit::kts());
break;
}
}
if (engineType == 'J')
{
// MIL Jets a bit faster
if (this->isMilitary()) { guessedVRotate *= 1.20; }
else if (this->matchesDesignator("CONC")) { guessedVRotate = CSpeed(199, CSpeedUnit::kts()); }
}
// VTOL
if (this->isVtol()) { guessedVRotate = CSpeed(0, CSpeedUnit::kts()); }
}
while (false);
if (guessedCGOut.isNull()) { guessedCGOut = guessedCG; }
if (guessedCGOut.isNull()) { guessedCGOut = guessedCG; }
if (guessedVRotateOut.isNull()) { guessedVRotateOut = guessedVRotate; }
}