From ac44485ff8891a50171b604d0eaced198a9396f9 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 7 Dec 2015 02:22:24 +0100 Subject: [PATCH] Improved/fixed ICAO designator displayed in table view (discovered during #refs #533 tasks) --- .../models/simulatedaircraftlistmodel.cpp | 2 +- src/blackmisc/simulation/simulatedaircraft.cpp | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/blackgui/models/simulatedaircraftlistmodel.cpp b/src/blackgui/models/simulatedaircraftlistmodel.cpp index e0ef81ede..9175aa4e6 100644 --- a/src/blackgui/models/simulatedaircraftlistmodel.cpp +++ b/src/blackgui/models/simulatedaircraftlistmodel.cpp @@ -53,7 +53,7 @@ namespace BlackGui 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("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::standardString("transponder", { CSimulatedAircraft::IndexTransponder, CTransponder::IndexTransponderCodeAndModeFormatted })); this->m_columns.addColumn(CColumn("latitude", { CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexLatitude }, new CLatLonFormatter())); diff --git a/src/blackmisc/simulation/simulatedaircraft.cpp b/src/blackmisc/simulation/simulatedaircraft.cpp index 257d991c4..c2f4121d1 100644 --- a/src/blackmisc/simulation/simulatedaircraft.cpp +++ b/src/blackmisc/simulation/simulatedaircraft.cpp @@ -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