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

Ref T578, CG null and DB key improvements

Browse Source
This commit is contained in:
Klaus Basan
2019-03-26 20:24:06 +01:00
committed by Mat Sutcliffe
parent 254e21ab1f
commit 246d9abca8
5 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackmisc/simulation/aircraftmodel.cpp
View File

@@ -65,7 +65,7 @@ namespace BlackMisc
QString CAircraftModel::convertToQString(bool i18n) const
{
const QString s =
(this->hasAnyModelString() ? inApostrophes(this->getAllModelStringsAndAliases(), true) % QStringLiteral(" ") : QString()) %
(this->hasAnyModelString() ? inApostrophes(this->getAllModelStringsAliasesAndDbKey(), true) % QStringLiteral(" ") : QString()) %
u" type: '" % this->getModelTypeAsString() %
u"' ICAO: '" % this->getAircraftIcaoCode().toQString(i18n) %
u" CG: " % this->getCG().valueRoundedWithUnit(1) %
@@ -218,6 +218,13 @@ namespace BlackMisc
return m_modelString % u", " % m_modelStringAlias;
}
QString CAircraftModel::getAllModelStringsAliasesAndDbKey() const
{
if (!this->hasModelStringAlias() || m_modelString.isEmpty()) { return this->getModelStringAndDbKey(); }
if (!this->isLoadedFromDb()) { return this->getAllModelStringsAndAliases(); }
return this->getAllModelStringsAndAliases() % " " % this->getDbKeyAsStringInParentheses();
}
bool CAircraftModel::isVtol() const
{
return this->getAircraftIcaoCode().isVtol();
@@ -926,8 +933,10 @@ namespace BlackMisc
const QString modelName(json.value(prefix % u"name").toString());
const QString modelMode(json.value(prefix % u"mode").toString());
const QString parts(json.value(prefix % u"parts").toString());
// check for undefined to rule out 0ft values
const QJsonValue cgjv = json.value(prefix % u"cgft");
const CLength cg = cgjv.isNull() ? CLength::null() : CLength(cgjv.toDouble(), CLengthUnit::ft());
const CLength cg = (cgjv.isNull() || cgjv.isUndefined()) ? CLength::null() : CLength(cgjv.toDouble(), CLengthUnit::ft());
const CSimulatorInfo simInfo = CSimulatorInfo::fromDatabaseJson(json, prefix);
CAircraftModel model(modelString, CAircraftModel::TypeDatabaseEntry, simInfo, modelName, modelDescription);