refs #369, adjusted aircraft parts/lights and list to new style

* support of property index
* used support classes BlackMisc::ITimestampBased, ITimestampObjectList and ICallsignObjectList
* fixed some issues in related aircraft situation class in same step

src/blackmisc/aviation/aircraftlights.cpp

@@ -8,6 +8,9 @@
  */
 
 #include "aircraftlights.h"
+#include "blackmisc/variant.h"
+
+using namespace BlackMisc;
 
 namespace BlackMisc
 {
@@ -15,8 +18,7 @@ namespace BlackMisc
     {
         CAircraftLights::CAircraftLights(bool strobeOn, bool landingOn, bool taxiOn, bool beaconOn, bool navOn, bool logoOn)
             : m_strobeOn(strobeOn), m_landingOn(landingOn), m_taxiOn(taxiOn), m_beaconOn(beaconOn), m_navOn(navOn), m_logoOn(logoOn)
-        {
-        }
+        { }
 
         CAircraftLights CAircraftLights::allLightsOn()
         {
@@ -45,5 +47,65 @@ namespace BlackMisc
             s += m_logoOn;
             return s;
         }
+
+        CVariant CAircraftLights::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
+        {
+            if (index.isMyself()) { return this->toCVariant(); }
+
+            ColumnIndex i = index.frontCasted<ColumnIndex>();
+            switch (i)
+            {
+            case IndexBeacon:
+                return CVariant::from(m_beaconOn);
+            case IndexLanding:
+                return CVariant::from(m_landingOn);
+            case IndexLogo:
+                return CVariant::from(m_logoOn);
+            case IndexNav:
+                return CVariant::from(m_navOn);
+            case IndexStrobe:
+                return CVariant::from(m_strobeOn);
+            case IndexTaxi:
+                return CVariant::from(m_taxiOn);
+            default:
+                return CValueObject::propertyByIndex(index);
+            }
+        }
+
+        void CAircraftLights::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
+        {
+            if (index.isMyself())
+            {
+                this->convertFromCVariant(variant);
+                return;
+            }
+
+            ColumnIndex i = index.frontCasted<ColumnIndex>();
+            switch (i)
+            {
+            case IndexBeacon:
+                this->m_beaconOn = variant.toBool();
+                break;
+            case IndexLanding:
+                this->m_landingOn = variant.toBool();
+                break;
+            case IndexLogo:
+                this->m_logoOn = variant.toBool();
+                break;
+            case IndexNav:
+                this->m_navOn = variant.toBool();
+                break;
+            case IndexStrobe:
+                this->m_strobeOn = variant.toBool();
+                break;
+            case IndexTaxi:
+                this->m_taxiOn = variant.toBool();
+                break;
+            default:
+                CValueObject::setPropertyByIndex(variant, index);
+                break;
+            }
+        }
+
     } // namespace
 } // namespace

src/blackmisc/aviation/aircraftlights.h

@@ -13,6 +13,7 @@
 #define BLACKMISC_AIRCRAFTLIGHTS_H
 
 #include "blackmisc/valueobject.h"
+#include "blackmisc/propertyindex.h"
 
 namespace BlackMisc
 {
@@ -22,6 +23,17 @@ namespace BlackMisc
         class CAircraftLights : public CValueObjectStdTuple<CAircraftLights>
         {
         public:
+            //! Properties by index
+            enum ColumnIndex
+            {
+                IndexStrobe = BlackMisc::CPropertyIndex::GlobalIndexCAircraftLights,
+                IndexLanding,
+                IndexTaxi,
+                IndexBeacon,
+                IndexNav,
+                IndexLogo
+            };
+
 
             //! Default constructor
             CAircraftLights() = default;
@@ -29,6 +41,12 @@ namespace BlackMisc
             //! Constructor
             CAircraftLights(bool strobeOn, bool landingOn, bool taxiOn, bool beaconOn, bool navOn, bool logoOn);
 
+            //! \copydoc CValueObject::propertyByIndex
+            virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
+
+            //! \copydoc CValueObject::setPropertyByIndex
+            virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override;
+
             //! Strobes lights on?
             bool isStrobeOn() const { return m_strobeOn; }
 
@@ -99,4 +117,4 @@ BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftLights, (
 
 Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftLights)
 
-#endif // BLACKMISC_AIRCRAFTLIGHTS_H
+#endif // guard

src/blackmisc/aviation/aircraftparts.cpp

@@ -20,7 +20,7 @@ namespace BlackMisc
             s += " gear down: ";
             s += m_gearDown;
             s += " flaps pct: ";
-            s += m_flapsPercent;
+            s += m_flapsPercentage;
             s += " spoilers out: ";
             s += m_spoilersOut;
             s += " engines on: ";
@@ -29,5 +29,74 @@ namespace BlackMisc
             s += m_isOnGround;
             return s;
         }
+
+        CVariant CAircraftParts::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
+        {
+            if (index.isMyself()) { return this->toCVariant(); }
+            if (ITimestampBased::canHandleIndex(index))
+            {
+                return ITimestampBased::propertyByIndex(index);
+            }
+
+            ColumnIndex i = index.frontCasted<ColumnIndex>();
+            switch (i)
+            {
+            case IndexCallsign:
+                return m_correspondingCallsign.propertyByIndex(index.copyFrontRemoved());
+            case IndexEngines:
+                return this->m_engines.toCVariant();
+            case IndexFlapsPercentage:
+                return CVariant::fromValue(this->m_flapsPercentage);
+            case IndexGearDown:
+                return CVariant::fromValue(this->m_gearDown);
+            case IndexLights:
+                return this->m_lights.propertyByIndex(index.copyFrontRemoved());
+            case IndexSpoilersOut:
+                return CVariant::fromValue(this->m_spoilersOut);
+            default:
+                return CValueObject::propertyByIndex(index);
+            }
+        }
+
+        void CAircraftParts::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
+        {
+            if (index.isMyself())
+            {
+                this->convertFromCVariant(variant);
+                return;
+            }
+            if (ITimestampBased::canHandleIndex(index))
+            {
+                ITimestampBased::setPropertyByIndex(variant, index);
+                return;
+            }
+
+            ColumnIndex i = index.frontCasted<ColumnIndex>();
+            switch (i)
+            {
+            case IndexEngines:
+                this->m_engines.setPropertyByIndex(variant, index.copyFrontRemoved());
+                break;
+            case IndexFlapsPercentage:
+                this->m_flapsPercentage = variant.toInt();
+                break;
+            case IndexGearDown:
+                this->m_gearDown = variant.toBool();
+                break;
+            case IndexLights:
+                this->m_lights.setPropertyByIndex(variant, index.copyFrontRemoved());
+                break;
+            case IndexSpoilersOut:
+                this->m_spoilersOut = variant.toBool();
+                break;
+            case IndexCallsign:
+                this->m_correspondingCallsign.setPropertyByIndex(variant, index.copyFrontRemoved());
+                break;
+            default:
+                CValueObject::setPropertyByIndex(variant, index);
+                break;
+            }
+        }
+
     } // namespace
 } // namespace

src/blackmisc/aviation/aircraftpartslist.cpp

@@ -19,22 +19,6 @@ namespace BlackMisc
             CSequence<CAircraftParts>(other)
         { }
 
-        CAircraftPartsList CAircraftPartsList::findBefore(const QDateTime &dateTime) const
-        {
-            return findBy([&](const CAircraftParts & parts)
-            {
-                return parts.getTimestamp() < dateTime;
-            });
-        }
-
-        void CAircraftPartsList::removeBefore(const QDateTime &dateTime)
-        {
-            removeIf([&](const CAircraftParts &parts)
-            {
-                return parts.getTimestamp() < dateTime;
-            });
-        }
-
         void CAircraftPartsList::registerMetadata()
         {
             qRegisterMetaType<BlackMisc::CSequence<CAircraftParts>>();

src/blackmisc/aviation/aircraftpartslist.h

@@ -13,8 +13,8 @@
 #define BLACKMISC_AIRCRAFTPARTSLIST_H
 
 #include "aircraftparts.h"
-#include "blackmisc/collection.h"
-#include "blackmisc/sequence.h"
+#include "blackmisc/timestampobjectlist.h"
+#include "blackmisc/avcallsignobjectlist.h"
 #include <QDateTime>
 
 namespace BlackMisc
@@ -22,7 +22,10 @@ namespace BlackMisc
     namespace Aviation
     {
         //! Value object encapsulating a list of aircraft parts.
-        class CAircraftPartsList : public CSequence<CAircraftParts>
+        class CAircraftPartsList :
+            public CSequence<CAircraftParts>,
+            public ITimestampObjectList<CAircraftParts, CAircraftPartsList>,
+            public ICallsignObjectList<CAircraftParts, CAircraftPartsList>
         {
         public:
             //! Default constructor.
@@ -31,12 +34,6 @@ namespace BlackMisc
             //! Construct from a base class object.
             CAircraftPartsList(const CSequence<CAircraftParts> &other);
 
-            //! Get a list of situations before dateTime
-            CAircraftPartsList findBefore (const QDateTime& dateTime) const;
-
-            //! Remove parts with timestamp before dateTime
-            void removeBefore(const QDateTime& dateTime);
-
             //! \copydoc CValueObject::toQVariant
             virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
 
@@ -45,6 +42,14 @@ namespace BlackMisc
 
             //! Register metadata
             static void registerMetadata();
+
+        protected:
+            //! Myself
+            virtual const CAircraftPartsList &getContainer() const { return *this; }
+
+            //! Myself
+            virtual CAircraftPartsList &getContainer() { return *this; }
+
         };
 
     } //namespace