From c94584a19f6611cf4b797d9238f177aa843b4d6d Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 30 Dec 2016 01:59:14 +0100 Subject: [PATCH] Removed redundant speed formatter, use existing CSpeedKtsFormatter CAircraftSpeedFormatter renamed to CSpeedKtsFormatter in same step --- src/blackgui/models/columnformatters.cpp | 3 +- src/blackgui/models/columnformatters.h | 9 +++--- .../models/simulatedaircraftlistmodel.cpp | 4 +-- src/blackgui/models/windlayerlistmodel.cpp | 32 +++---------------- 4 files changed, 11 insertions(+), 37 deletions(-) diff --git a/src/blackgui/models/columnformatters.cpp b/src/blackgui/models/columnformatters.cpp index 0f9b635d9..2165400d6 100644 --- a/src/blackgui/models/columnformatters.cpp +++ b/src/blackgui/models/columnformatters.cpp @@ -260,7 +260,7 @@ namespace BlackGui } } - CVariant CAircraftSpeedFormatter::displayRole(const CVariant &dataCVariant) const + CVariant CSpeedKtsFormatter::displayRole(const CVariant &dataCVariant) const { // special treatment for some cases BlackMisc::PhysicalQuantities::CSpeed s = dataCVariant.value(); @@ -408,6 +408,5 @@ namespace BlackGui if (!rgbColor.isValid()) { return ""; } return rgbColor.hex(true); } - } // namespace } // namespace diff --git a/src/blackgui/models/columnformatters.h b/src/blackgui/models/columnformatters.h index fea15b35a..1be478aac 100644 --- a/src/blackgui/models/columnformatters.h +++ b/src/blackgui/models/columnformatters.h @@ -378,7 +378,7 @@ namespace BlackGui CLatLonFormatter(int alignment = alignRightVCenter()) : CValueObjectFormatter(alignment) {} }; - //! Airspace distance + //! Airspace distance displayed in NM class CAirspaceDistanceFormatter : public CPhysiqalQuantiyFormatter { public: @@ -389,17 +389,16 @@ namespace BlackGui virtual BlackMisc::CVariant displayRole(const BlackMisc::CVariant &dataCVariant) const override; }; - //! Airspeed - class CAircraftSpeedFormatter : public CPhysiqalQuantiyFormatter + //! Speed displayed in kts + class CSpeedKtsFormatter : public CPhysiqalQuantiyFormatter { public: //! Constructor - CAircraftSpeedFormatter(int alignment = alignRightVCenter(), bool withUnit = true, bool i18n = true) : CPhysiqalQuantiyFormatter(BlackMisc::PhysicalQuantities::CSpeedUnit::kts(), 0, alignment, withUnit, i18n) {} + CSpeedKtsFormatter(int alignment = alignRightVCenter(), bool withUnit = true, bool i18n = true) : CPhysiqalQuantiyFormatter(BlackMisc::PhysicalQuantities::CSpeedUnit::kts(), 0, alignment, withUnit, i18n) {} //! \copydoc CDefaultFormatter::displayRole virtual BlackMisc::CVariant displayRole(const BlackMisc::CVariant &dataCVariant) const override; }; - } // namespace } // namespace diff --git a/src/blackgui/models/simulatedaircraftlistmodel.cpp b/src/blackgui/models/simulatedaircraftlistmodel.cpp index 2ce5e5c8a..04f33fbad 100644 --- a/src/blackgui/models/simulatedaircraftlistmodel.cpp +++ b/src/blackgui/models/simulatedaircraftlistmodel.cpp @@ -64,7 +64,7 @@ namespace BlackGui this->m_columns.addColumn(CColumn::standardString("realname", "pilot's real name", { CSimulatedAircraft::IndexPilot, CUser::IndexRealName })); this->m_columns.addColumn(CColumn("dist.", "distance", CSimulatedAircraft::IndexRelativeDistance, 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("gs.", { CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexGroundSpeed }, new CSpeedKtsFormatter())); this->m_columns.addColumn(CColumn::standardString("icao", "icao and livery info", { CSimulatedAircraft::IndexCombinedIcaoLiveryStringNetworkModel})); // icon column for airline @@ -90,7 +90,7 @@ namespace BlackGui this->m_columns.addColumn(CColumn::standardValueObject("cs.", "callsign", { CSimulatedAircraft::IndexCallsign, CCallsign::IndexCallsignString })); this->m_columns.addColumn(CColumn("dist.", "distance", CSimulatedAircraft::IndexRelativeDistance, 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("gs.", { CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexGroundSpeed }, new CSpeedKtsFormatter())); this->m_columns.addColumn(CColumn("p.", "parts", CSimulatedAircraft::IndexPartsSynchronized, new CBoolIconFormatter("parts", "no parts"), true)); this->m_columns.addColumn(CColumn("fp.", "fast position updates", CSimulatedAircraft::IndexFastPositionUpdates, new CBoolIconFormatter("enabled", "disabled"), true)); this->m_columns.addColumn(CColumn::standardString("realname", "pilot's real name", { CSimulatedAircraft::IndexPilot, CUser::IndexRealName })); diff --git a/src/blackgui/models/windlayerlistmodel.cpp b/src/blackgui/models/windlayerlistmodel.cpp index 1374fcc35..e5369b92b 100644 --- a/src/blackgui/models/windlayerlistmodel.cpp +++ b/src/blackgui/models/windlayerlistmodel.cpp @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#include "blackgui/models/windlayerlistmodel.h" -#include "blackgui/models/columnformatters.h" +#include "windlayerlistmodel.h" +#include "columnformatters.h" #include #include @@ -21,37 +21,13 @@ namespace BlackGui { namespace Models { - - //! Speed - class CSpeedFormatter : public CPhysiqalQuantiyFormatter - { - public: - //! Constructor - CSpeedFormatter(int alignment = alignRightVCenter(), bool withUnit = true, bool i18n = true) : CPhysiqalQuantiyFormatter(BlackMisc::PhysicalQuantities::CSpeedUnit::kts(), 0, alignment, withUnit, i18n) {} - - //! \copydoc CDefaultFormatter::displayRole - virtual CVariant displayRole(const CVariant &dataCVariant) const override - { - // special treatment for some cases - BlackMisc::PhysicalQuantities::CSpeed s = dataCVariant.value(); - if (!s.isNull() && (s.isPositiveWithEpsilonConsidered() || s.isZeroEpsilonConsidered())) - { - return CPhysiqalQuantiyFormatter::displayRole(dataCVariant); - } - else - { - return ""; - } - } - }; - CWindLayerListModel::CWindLayerListModel(QObject *parent) : CListModelBase("WindLayerListModel", parent) { this->m_columns.addColumn(CColumn("level", CWindLayer::IndexLevel, new CAltitudeFormatter())); this->m_columns.addColumn(CColumn("direction", CWindLayer::IndexDirection, new CAngleDegreeFormatter())); - this->m_columns.addColumn(CColumn("speed", CWindLayer::IndexSpeed, new CSpeedFormatter())); - this->m_columns.addColumn(CColumn("gust speed", CWindLayer::IndexGustSpeed, new CSpeedFormatter())); + this->m_columns.addColumn(CColumn("speed", CWindLayer::IndexSpeed, new CSpeedKtsFormatter())); + this->m_columns.addColumn(CColumn("gust speed", CWindLayer::IndexGustSpeed, new CSpeedKtsFormatter())); // default sort order this->setSortColumnByPropertyIndex(CWindLayer::IndexLevel);