flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 10:55:32 +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

2
src/blackgui/models/simulatedaircraftlistmodel.cpp
View File

@@ -53,7 +53,7 @@ namespace BlackGui
this->m_columns.addColumn(CColumn("dist.", "distance", CSimulatedAircraft::IndexDistanceToOwnAircraft, new CAirspaceDistanceFormatter())); this->m_columns.addColumn(CColumn("dist.", "distance", CSimulatedAircraft::IndexDistanceToOwnAircraft, new CAirspaceDistanceFormatter()));
this->m_columns.addColumn(CColumn("altitude", { CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexAltitude }, new CAltitudeFormatter())); this->m_columns.addColumn(CColumn("altitude", { CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexAltitude }, new CAltitudeFormatter()));
this->m_columns.addColumn(CColumn("gs.", { CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexGroundspeed }, new CAircraftSpeedFormatter())); this->m_columns.addColumn(CColumn("gs.", { CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexGroundspeed }, new CAircraftSpeedFormatter()));
this->m_columns.addColumn(CColumn::standardString("icao", { CSimulatedAircraft::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexAircraftDesignator})); this->m_columns.addColumn(CColumn::standardString("icao", "icao and livery info",{ CSimulatedAircraft::IndexCombinedIcaoLiveryString}));
this->m_columns.addColumn(CColumn("frequency", { CSimulatedAircraft::IndexCom1System, CComSystem::IndexActiveFrequency }, new CComFrequencyFormatter())); this->m_columns.addColumn(CColumn("frequency", { CSimulatedAircraft::IndexCom1System, CComSystem::IndexActiveFrequency }, new CComFrequencyFormatter()));
this->m_columns.addColumn(CColumn::standardString("transponder", { CSimulatedAircraft::IndexTransponder, CTransponder::IndexTransponderCodeAndModeFormatted })); this->m_columns.addColumn(CColumn::standardString("transponder", { CSimulatedAircraft::IndexTransponder, CTransponder::IndexTransponderCodeAndModeFormatted }));
this->m_columns.addColumn(CColumn("latitude", { CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexLatitude }, new CLatLonFormatter())); this->m_columns.addColumn(CColumn("latitude", { CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexLatitude }, new CLatLonFormatter()));

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

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