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

refs #638, refs #614, support for military flag and swift livery string

Browse Source 
* fixed missing tuple attribute
* improved toQString conversion
This commit is contained in:
Klaus Basan
2016-04-11 19:37:57 +02:00
parent d9e550beef
commit 826662cbb5
5 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -278,6 +278,12 @@ namespace BlackMisc
return this->m_livery.hasValidAirlineDesignator();
}
bool CAircraftModel::isMilitary() const
{
return this->getAircraftIcaoCode().isMilitary() ||
this->getLivery().isMilitary();
}
bool CAircraftModel::hasDistributor() const
{
return this->m_distributor.hasValidDbKey();
@@ -329,6 +335,15 @@ namespace BlackMisc
return (static_cast<int>(simulator.getSimulator()) & static_cast<int>(this->getSimulatorInfo().getSimulator())) > 0;
}
QString CAircraftModel::getSwiftLiveryString() const
{
const QString cc(this->getLivery().getCombinedCode());
if (cc.isEmpty() && !this->hasModelString()) { return ""; }
if (cc.isEmpty()) { return this->getModelString(); }
if (!this->hasModelString()) { return cc; }
return cc + " [" + this->getModelString() + "]";
}
void CAircraftModel::updateMissingParts(const CAircraftModel &otherModel, bool dbModelPriority)
{
if (dbModelPriority && !this->hasValidDbKey() && otherModel.hasValidDbKey())
@@ -472,5 +487,36 @@ namespace BlackMisc
model.setKeyAndTimestampFromDatabaseJson(json, prefix);
return model;
}
QStringList CAircraftModel::splitNetworkLiveryString(const QString &liveryString)
{
QStringList liveryModelStrings({ "", "" });
if (liveryString.isEmpty()) { return liveryModelStrings; }
const QString l(liveryString.toUpper().trimmed());
if (liveryString.contains('[') && liveryString.contains(']'))
{
// seems to be a valid swift string
const QStringList split = l.split("[");
if (split.size() > 0)
{
liveryModelStrings[0] = split[0].trimmed();
}
if (split.size() > 1)
{
QString m = split[1];
m.replace('[', ' ');
m.replace(']', ' ');
liveryModelStrings[1] = m.trimmed();
}
}
else
{
if (CLivery::isValidCombinedCode(l))
{
liveryModelStrings[0] = l;
}
}
return liveryModelStrings;
}
} // namespace
} // namespace