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

Improved/fixed ICAO designator displayed in table view

Browse Source 
(discovered during #refs #533 tasks)
This commit is contained in:
Klaus Basan
2015-12-07 02:22:24 +01:00
parent 291c95160f
commit ac44485ff8
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/blackmisc/simulation/simulatedaircraft.cpp
View File

@@ -119,7 +119,7 @@ namespace BlackMisc
const QString &CSimulatedAircraft::getAirlineIcaoCodeDesignator() const
{
return getAircraftIcaoCode().getDesignator();
return getAirlineIcaoCode().getDesignator();
}
void CSimulatedAircraft::setAircraftIcaoDesignator(const QString &designator)
@@ -231,19 +231,29 @@ namespace BlackMisc
{
if (this->hasAircraftAndAirlineDesignator())
{
QString s("%1 (%2)");
return s.arg(getAircraftIcaoCodeDesignator()).arg(getAirlineIcaoCodeDesignator());
if (getLivery().hasCombinedCode())
{
QString s("%1 (%2 %3)");
return s.arg(getAircraftIcaoCodeDesignator()).arg(getAirlineIcaoCodeDesignator()).arg(getLivery().getCombinedCode());
}
else
{
QString s("%1 (%2)");
return s.arg(getAircraftIcaoCodeDesignator()).arg(getAirlineIcaoCodeDesignator());
}
}
if (!this->hasAircraftDesignator())
{
return getLivery().getCombinedCode();
}
else
else if (this->getLivery().hasCombinedCode())
{
QString s("%1 (%2)");
return s.arg(getAircraftIcaoCodeDesignator()).arg(getLivery().getCombinedCode());
}
return getAircraftIcaoCode().getDesignator();
}
CVariant CSimulatedAircraft::propertyByIndex(const BlackMisc::CPropertyIndex &index) const