diff --git a/src/blackcore/network_vatlib.cpp b/src/blackcore/network_vatlib.cpp index 179d5e4af..4a5460f7d 100644 --- a/src/blackcore/network_vatlib.cpp +++ b/src/blackcore/network_vatlib.cpp @@ -514,16 +514,16 @@ namespace BlackCore { try { - const QByteArray acTypeICAObytes = toFSD(m_icaoCodes.getDesignator()); - const QByteArray airlineICAObytes = toFSD(m_icaoCodes.getAirline()); + const QByteArray acTypeICAObytes = toFSD(m_icaoCodes.getAircraftDesignator()); + const QByteArray airlineICAObytes = toFSD(m_icaoCodes.getAirlineDesignator()); const QByteArray liverybytes = toFSD(m_icaoCodes.getLivery()); std::vector keysValues; - if (!m_icaoCodes.getDesignator().isEmpty()) + if (!m_icaoCodes.getAircraftDesignator().isEmpty()) { keysValues.push_back(m_net->acinfo_Equipment); keysValues.push_back(acTypeICAObytes); } - if (m_icaoCodes.hasAirline()) + if (m_icaoCodes.hasAirlineDesignator()) { keysValues.push_back(m_net->acinfo_Airline); keysValues.push_back(airlineICAObytes); @@ -844,8 +844,8 @@ namespace BlackCore { QString key(*keysValues); keysValues++; - if (key == net->acinfo_Equipment) { icao.setDesignator(*keysValues); } - else if (key == net->acinfo_Airline) { icao.setAirline(*keysValues); } + if (key == net->acinfo_Equipment) { icao.setAircraftDesignator(*keysValues); } + else if (key == net->acinfo_Airline) { icao.setAirlineDesignator(*keysValues); } else if (key == net->acinfo_Livery) { icao.setLivery(*keysValues); } keysValues++; } diff --git a/src/blackmisc/avaircraft.cpp b/src/blackmisc/avaircraft.cpp index 2eb12360c..e1ed6ce05 100644 --- a/src/blackmisc/avaircraft.cpp +++ b/src/blackmisc/avaircraft.cpp @@ -134,7 +134,7 @@ namespace BlackMisc */ QVariant CAircraft::propertyByIndex(int index) const { - if (index >= static_cast(CAircraftIcao::IndexIcaoDesignator)) + if (index >= static_cast(CAircraftIcao::IndexAircraftDesignator)) return this->m_icao.propertyByIndex(index); if (index >= static_cast(CAircraftSituation::IndexPosition)) @@ -209,7 +209,7 @@ namespace BlackMisc */ void CAircraft::setPropertyByIndex(const QVariant &variant, int index) { - if (index >= static_cast(CAircraftIcao::IndexIcaoDesignator)) + if (index >= static_cast(CAircraftIcao::IndexAircraftDesignator)) return this->m_icao.setPropertyByIndex(variant, index); if (index >= static_cast(CAircraftSituation::IndexPosition)) diff --git a/src/blackmisc/avaircrafticao.cpp b/src/blackmisc/avaircrafticao.cpp index c342acdfb..fefbeaf94 100644 --- a/src/blackmisc/avaircrafticao.cpp +++ b/src/blackmisc/avaircrafticao.cpp @@ -11,12 +11,11 @@ namespace BlackMisc */ QString CAircraftIcao::convertToQString(bool /** i18n **/) const { - QString s(this->m_designator); - s.append(" ").append(this->m_type); - if (this->hasAirline()) s.append(" ").append(this->m_airline); - if (this->hasAirline()) s.append(" ").append(this->m_airline); + QString s(this->m_aircraftDesignator); + s.append(" ").append(this->m_aircraftCombinedType); + if (this->hasAirlineDesignator()) s.append(" ").append(this->m_airlineDesignator); if (this->hasLivery()) s.append(" ").append(this->m_livery); - if (this->hasColor()) s.append(" ").append(this->m_color); + if (this->hasAircraftColor()) s.append(" ").append(this->m_aircraftColor); return s; } @@ -34,7 +33,6 @@ namespace BlackMisc bool CAircraftIcao::isA(int metaTypeId) const { if (metaTypeId == qMetaTypeId()) { return true; } - return this->CValueObject::isA(metaTypeId); } @@ -44,7 +42,6 @@ namespace BlackMisc int CAircraftIcao::compareImpl(const CValueObject &otherBase) const { const auto &other = static_cast(otherBase); - return compare(TupleConverter::toTuple(*this), TupleConverter::toTuple(other)); } @@ -69,16 +66,16 @@ namespace BlackMisc */ QString CAircraftIcao::asString() const { - if (this->m_designator.isEmpty()) return ""; - QString s(this->m_designator); - if (!this->m_airline.isEmpty()) + if (this->m_aircraftDesignator.isEmpty()) return ""; + QString s(this->m_aircraftDesignator); + if (!this->m_airlineDesignator.isEmpty()) { - s.append(" (").append(this->m_airline).append(")"); + s.append(" (").append(this->m_airlineDesignator).append(")"); return s; } - if (!this->m_color.isEmpty()) + if (!this->m_aircraftColor.isEmpty()) { - s.append(" (").append(this->m_color).append(")"); + s.append(" (").append(this->m_aircraftColor).append(")"); return s; } return s; @@ -113,14 +110,14 @@ namespace BlackMisc { switch (index) { - case IndexIcaoDesignator: - return QVariant::fromValue(this->m_designator); - case IndexAirline: - return QVariant::fromValue(this->m_airline); - case IndexType: - return QVariant::fromValue(this->m_type); - case IndexColor: - return QVariant::fromValue(this->m_color); + case IndexAircraftDesignator: + return QVariant::fromValue(this->m_aircraftDesignator); + case IndexAirlineDesignator: + return QVariant::fromValue(this->m_airlineDesignator); + case IndexCombinedAircraftType: + return QVariant::fromValue(this->m_aircraftCombinedType); + case IndexAircraftColor: + return QVariant::fromValue(this->m_aircraftColor); case IndexAsString: return QVariant::fromValue(this->asString()); default: @@ -148,17 +145,17 @@ namespace BlackMisc { switch (index) { - case IndexIcaoDesignator: - this->setDesignator(variant.value()); + case IndexAircraftDesignator: + this->setAircraftDesignator(variant.value()); break; - case IndexAirline: - this->setAirline(variant.value()); + case IndexAirlineDesignator: + this->setAirlineDesignator(variant.value()); break; - case IndexType: - this->setType(variant.value()); + case IndexCombinedAircraftType: + this->setAircraftCombinedType(variant.value()); break; - case IndexColor: - this->setColor(variant.value()); + case IndexAircraftColor: + this->setAircraftColor(variant.value()); break; default: Q_ASSERT_X(false, "CAircraftIcao", "index unknown"); diff --git a/src/blackmisc/avaircrafticao.h b/src/blackmisc/avaircrafticao.h index a9211c25b..dc9112658 100644 --- a/src/blackmisc/avaircrafticao.h +++ b/src/blackmisc/avaircrafticao.h @@ -22,9 +22,7 @@ namespace BlackMisc class CAircraftIcao : public BlackMisc::CValueObject { public: - /*! - * Default constructor. - */ + //! \brief Default constructor. CAircraftIcao() {} /*! @@ -36,8 +34,8 @@ namespace BlackMisc * \param color */ CAircraftIcao(const QString &icao, const QString &type, const QString &airline, const QString &livery, const QString &color) - : m_designator(icao.trimmed().toUpper()), m_type(type.trimmed().toUpper()), m_airline(airline.trimmed().toUpper()), - m_livery(livery.trimmed().toUpper()), m_color(color.trimmed().toUpper()) {} + : m_aircraftDesignator(icao.trimmed().toUpper()), m_aircraftCombinedType(type.trimmed().toUpper()), m_airlineDesignator(airline.trimmed().toUpper()), + m_livery(livery.trimmed().toUpper()), m_aircraftColor(color.trimmed().toUpper()) {} //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override @@ -46,19 +44,19 @@ namespace BlackMisc } //! Get ICAO designator, e.g. "B737" - const QString &getDesignator() const { return m_designator; } + const QString &getAircraftDesignator() const { return m_aircraftDesignator; } - //! Set callsign - void setDesignator(const QString &icaoDesignator) { this->m_designator = icaoDesignator.trimmed().toUpper(); } + //! Set ICAO designator, e.g. "B737" + void setAircraftDesignator(const QString &icaoDesignator) { this->m_aircraftDesignator = icaoDesignator.trimmed().toUpper(); } - //! \brief Get airline - const QString &getAirline() const { return this->m_airline; } + //! \brief Get airline, e.g. "DLH" + const QString &getAirlineDesignator() const { return this->m_airlineDesignator; } - //! \brief Set airline - void setAirline(const QString &airline) { this->m_airline = airline.trimmed().toUpper(); } + //! \brief Set airline, e.g. "DLH" + void setAirlineDesignator(const QString &icaoDesignator) { this->m_airlineDesignator = icaoDesignator.trimmed().toUpper(); } //! \brief Airline available? - bool hasAirline() const { return !this->m_airline.isEmpty(); } + bool hasAirlineDesignator() const { return !this->m_airlineDesignator.isEmpty(); } //! \brief Get livery const QString &getLivery() const { return this->m_livery; } @@ -70,25 +68,25 @@ namespace BlackMisc bool hasLivery() const { return !this->m_livery.isEmpty(); } //! \brief Get livery or color - const QString &getLiveryOrColor() const { return this->hasLivery() ? this->m_livery : this->m_color; } + const QString &getLiveryOrColor() const { return this->hasLivery() ? this->m_livery : this->m_aircraftColor; } - //! \brief Get color - const QString &getColor() const { return this->m_color; } + //! \brief Get color (RGB hex) + const QString &getAircraftColor() const { return this->m_aircraftColor; } - //! \brief Set color - void setColor(const QString &color) { this->m_color = color.trimmed().toUpper(); } + //! \brief Set color (RGB hex) + void setAircraftColor(const QString &color) { this->m_aircraftColor = color.trimmed().toUpper(); } //! \brief Color available? - bool hasColor() const { return !this->m_color.isEmpty(); } + bool hasAircraftColor() const { return !this->m_aircraftColor.isEmpty(); } - //! \brief Get type - const QString &getType() const { return this->m_type; } + //! \brief Get type, e.g. "L2J" + const QString &getAircraftCombinedType() const { return this->m_aircraftCombinedType; } - //! \brief Get engine type + //! \brief Get engine type, e.g. "J" QString getEngineType() const { - if (this->m_type.length() != 3) return ""; - return this->m_type.right(1); + if (this->m_aircraftCombinedType.length() != 3) return ""; + return this->m_aircraftCombinedType.right(1); } /*! @@ -98,7 +96,7 @@ namespace BlackMisc QString asString() const; //! \brief Set type - void setType(const QString &type) { this->m_type = type.trimmed().toUpper(); } + void setAircraftCombinedType(const QString &type) { this->m_aircraftCombinedType = type.trimmed().toUpper(); } //! \brief Equal operator == bool operator ==(const CAircraftIcao &other) const; @@ -117,10 +115,10 @@ namespace BlackMisc */ enum ColumnIndex { - IndexIcaoDesignator = 2000, // used, so it can be chained in aircraft - IndexType, - IndexAirline, - IndexColor, + IndexAircraftDesignator = 2000, // used, so it can be chained in aircraft + IndexCombinedAircraftType, + IndexAirlineDesignator, + IndexAircraftColor, IndexAsString }; @@ -154,16 +152,16 @@ namespace BlackMisc private: BLACK_ENABLE_TUPLE_CONVERSION(CAircraftIcao) - QString m_designator; - QString m_type; - QString m_airline; + QString m_aircraftDesignator; //!< "B737" + QString m_aircraftCombinedType; //!< "L2J" + QString m_airlineDesignator; //!< "DLH" QString m_livery; - QString m_color; + QString m_aircraftColor; //!< RGB Hex "330044" }; } // namespace } // namespace -BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftIcao, (o.m_designator, o.m_type, o.m_airline, o.m_livery, o.m_color)) +BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftIcao, (o.m_aircraftDesignator, o.m_aircraftCombinedType, o.m_airlineDesignator, o.m_livery, o.m_aircraftColor)) Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftIcao) #endif // guard