refs #267, classes for model matching

* extended model class, refactored model class
* new mapping classes: value class / list

src/blackmisc/nwaircraftmapping.cpp

@@ -0,0 +1,176 @@
+#include "nwaircraftmapping.h"
+
+using namespace BlackMisc::Aviation;
+using namespace BlackMisc::Network;
+
+namespace BlackMisc
+{
+    namespace Network
+    {
+
+        /*
+         * Constructor
+         */
+        CAircraftMapping::CAircraftMapping(const QString &aircraftDesignator, const QString &airlineDesignator, const QString &model) :
+            m_icao(CAircraftIcao(aircraftDesignator, airlineDesignator)), m_model(CAircraftModel(model, false))
+        { }
+
+        /*
+         * Convert to string
+         */
+        QString CAircraftMapping::convertToQString(bool i18n) const
+        {
+            QString s = QString(this->m_model.toQString(i18n)).append(' ').append(this->m_icao.toQString(i18n));
+            return s;
+        }
+
+        /*
+         * Compare
+         */
+        int CAircraftMapping::compareImpl(const CValueObject &otherBase) const
+        {
+            const auto &other = static_cast<const CAircraftMapping &>(otherBase);
+            return compare(TupleConverter<CAircraftMapping>::toTuple(*this), TupleConverter<CAircraftMapping>::toTuple(other));
+        }
+
+        /*
+         * Marshall to DBus
+         */
+        void CAircraftMapping::marshallToDbus(QDBusArgument &argument) const
+        {
+            argument << TupleConverter<CAircraftMapping>::toTuple(*this);
+        }
+
+        /*
+         * Unmarshall from DBus
+         */
+        void CAircraftMapping::unmarshallFromDbus(const QDBusArgument &argument)
+        {
+            argument >> TupleConverter<CAircraftMapping>::toTuple(*this);
+        }
+
+        /*
+         * Hash
+         */
+        uint CAircraftMapping::getValueHash() const
+        {
+            return qHash(TupleConverter<CAircraftMapping>::toTuple(*this));
+        }
+
+        /*
+         * Model string?
+         */
+        bool CAircraftMapping::matchesModelString(const QString &modelString, Qt::CaseSensitivity sensitivity) const
+        {
+            return this->m_model.matchesModelString(modelString, sensitivity);
+        }
+
+        /*
+         * Equal?
+         */
+        bool CAircraftMapping::operator ==(const CAircraftMapping &other) const
+        {
+            if (this == &other) return true;
+            return TupleConverter<CAircraftMapping>::toTuple(*this) == TupleConverter<CAircraftMapping>::toTuple(other);
+        }
+
+        /*
+         * Unequal?
+         */
+        bool CAircraftMapping::operator !=(const CAircraftMapping &other) const
+        {
+            return !((*this) == other);
+        }
+
+        /*
+         * metaTypeId
+         */
+        int CAircraftMapping::getMetaTypeId() const
+        {
+            return qMetaTypeId<CAircraftMapping>();
+        }
+
+        /*
+         * is a
+         */
+        bool CAircraftMapping::isA(int metaTypeId) const
+        {
+            if (metaTypeId == qMetaTypeId<CAircraftMapping>()) { return true; }
+            return this->CValueObject::isA(metaTypeId);
+        }
+
+        /*
+         * Register metadata
+         */
+        void CAircraftMapping::registerMetadata()
+        {
+            qRegisterMetaType<CAircraftMapping>();
+            qDBusRegisterMetaType<CAircraftMapping>();
+        }
+
+        /*
+         * Members
+         */
+        const QStringList &CAircraftMapping::jsonMembers()
+        {
+            return TupleConverter<CAircraftMapping>::jsonMembers();
+        }
+
+        /*
+         * To JSON
+         */
+        QJsonObject CAircraftMapping::toJson() const
+        {
+            return BlackMisc::serializeJson(CAircraftMapping::jsonMembers(), TupleConverter<CAircraftMapping>::toTuple(*this));
+        }
+
+        /*
+         * From Json
+         */
+        void CAircraftMapping::fromJson(const QJsonObject &json)
+        {
+            BlackMisc::deserializeJson(json, CAircraftMapping::jsonMembers(), TupleConverter<CAircraftMapping>::toTuple(*this));
+        }
+
+        /*
+         * Property by index
+         */
+        QVariant CAircraftMapping::propertyByIndex(int index) const
+        {
+            switch (index)
+            {
+            case IndexModel:
+                return this->m_model.toQVariant();
+                break;
+            case IndexIcaoCode:
+                return this->m_icao.toQVariant();
+                break;
+            default:
+                break;
+            }
+            Q_ASSERT_X(false, "CAircraftMapping", "index unknown");
+            QString m = QString("no property, index ").append(QString::number(index));
+            return QVariant::fromValue(m);
+        }
+
+        /*
+         * Set property as index
+         */
+        void CAircraftMapping::setPropertyByIndex(const QVariant &variant, int index)
+        {
+            switch (index)
+            {
+            case IndexModel:
+                this->m_model = variant.value<BlackMisc::Network::CAircraftModel>();
+                break;
+            case IndexIcaoCode:
+                this->m_icao = variant.value<BlackMisc::Aviation::CAircraftIcao>();
+                break;
+            default:
+                Q_ASSERT_X(false, "CAircraftMapping", "index unknown");
+                break;
+            }
+        }
+
+    } // namespace
+} // namespace