Ref T129, added callsign in flight plan and made flight plan timestamp interface compliant

samples/cliclient/client.cpp

@@ -272,19 +272,19 @@ namespace BlackSample
         args >> equipmentIcao >> originAirportIcao >> destinationAirportIcao >> alternateAirportIcao >> takeoffTimePlanned >> takeoffTimeActual
              >> enrouteTime >> fuelTime >> cruiseAltitude >> cruiseTrueAirspeed >> flightRulesString >> route;
 
-        BlackMisc::Aviation::CFlightPlan::FlightRules flightRules;
+        CFlightPlan::FlightRules flightRules;
-        if (flightRulesString == "IFR") { flightRules = BlackMisc::Aviation::CFlightPlan::IFR; }
+        if (flightRulesString == "IFR") { flightRules = CFlightPlan::IFR; }
-        else if (flightRulesString == "SVFR") { flightRules = BlackMisc::Aviation::CFlightPlan::SVFR; }
+        else if (flightRulesString == "SVFR") { flightRules = CFlightPlan::SVFR; }
         else { flightRules = BlackMisc::Aviation::CFlightPlan::VFR; }
 
-        BlackMisc::Aviation::CFlightPlan
+        const CCallsign callsign("DAMBZ");
-        fp(equipmentIcao, originAirportIcao, destinationAirportIcao, alternateAirportIcao,
+        CFlightPlan fp(callsign, equipmentIcao, originAirportIcao, destinationAirportIcao, alternateAirportIcao,
-           QDateTime::fromString(takeoffTimePlanned, "hhmm"), QDateTime::fromString(takeoffTimeActual, "hhmm"),
+                       QDateTime::fromString(takeoffTimePlanned, "hhmm"), QDateTime::fromString(takeoffTimeActual, "hhmm"),
-           BlackMisc::PhysicalQuantities::CTime(enrouteTime, BlackMisc::PhysicalQuantities::CTimeUnit::hrmin()),
+                       CTime(enrouteTime, CTimeUnit::hrmin()),
-           BlackMisc::PhysicalQuantities::CTime(fuelTime, BlackMisc::PhysicalQuantities::CTimeUnit::hrmin()),
+                       CTime(fuelTime, CTimeUnit::hrmin()),
-           BlackMisc::Aviation::CAltitude(cruiseAltitude, BlackMisc::Aviation::CAltitude::MeanSeaLevel, BlackMisc::PhysicalQuantities::CLengthUnit::ft()),
+                       CAltitude(cruiseAltitude, CAltitude::MeanSeaLevel, CLengthUnit::ft()),
-           BlackMisc::PhysicalQuantities::CSpeed(cruiseTrueAirspeed, BlackMisc::PhysicalQuantities::CSpeedUnit::kts()),
+                       CSpeed(cruiseTrueAirspeed, CSpeedUnit::kts()),
-           flightRules, route, args.readAll());
+                       flightRules, route, args.readAll());
         emit sendFlightPlan(fp);
     }
 
@@ -352,12 +352,12 @@ namespace BlackSample
         QString xpdrMode;
         args >> lat >> lon >> alt >> hdg >> pitch >> bank >> gs >> com1 >> com2 >> xpdrCode >> xpdrMode;
         BlackMisc::Simulation::CSimulatedAircraft aircraft("", BlackMisc::Network::CUser(), BlackMisc::Aviation::CAircraftSituation(
-                BlackMisc::Geo::CCoordinateGeodetic(lat, lon, alt),
+                    BlackMisc::Geo::CCoordinateGeodetic(lat, lon, alt),
-                BlackMisc::Aviation::CHeading(hdg, BlackMisc::Aviation::CHeading::True, BlackMisc::PhysicalQuantities::CAngleUnit::deg()),
+                    BlackMisc::Aviation::CHeading(hdg, BlackMisc::Aviation::CHeading::True, BlackMisc::PhysicalQuantities::CAngleUnit::deg()),
-                BlackMisc::PhysicalQuantities::CAngle(pitch, BlackMisc::PhysicalQuantities::CAngleUnit::deg()),
+                    BlackMisc::PhysicalQuantities::CAngle(pitch, BlackMisc::PhysicalQuantities::CAngleUnit::deg()),
-                BlackMisc::PhysicalQuantities::CAngle(bank, BlackMisc::PhysicalQuantities::CAngleUnit::deg()),
+                    BlackMisc::PhysicalQuantities::CAngle(bank, BlackMisc::PhysicalQuantities::CAngleUnit::deg()),
-                BlackMisc::PhysicalQuantities::CSpeed(gs, BlackMisc::PhysicalQuantities::CSpeedUnit::kts())
+                    BlackMisc::PhysicalQuantities::CSpeed(gs, BlackMisc::PhysicalQuantities::CSpeedUnit::kts())
-                                                ));
+                ));
         updateCockpit(
             BlackMisc::Aviation::CComSystem("COM1", BlackMisc::PhysicalQuantities::CFrequency(com1, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz())),
             BlackMisc::Aviation::CComSystem("COM2", BlackMisc::PhysicalQuantities::CFrequency(com2, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz())),

src/blackcore/vatsim/networkvatlib.cpp

@@ -1089,7 +1089,9 @@ namespace BlackCore
             const QString depTimePlanned = QString("0000").append(QString::number(fp->departTime)).right(4);
             const QString depTimeActual = QString("0000").append(QString::number(fp->departTimeActual)).right(4);
 
+            const CCallsign callsign(self->fromFSD(callsignChar), CCallsign::Aircraft);
             const CFlightPlan flightPlan(
+                callsign,
                 self->fromFSD(fp->aircraftType),
                 self->fromFSD(fp->departAirport),
                 self->fromFSD(fp->destAirport),
@@ -1105,7 +1107,6 @@ namespace BlackCore
                 self->fromFSD(fp->remarks)
             );
 
-            const CCallsign callsign(self->fromFSD(callsignChar), CCallsign::Aircraft);
             emit self->flightPlanReplyReceived(callsign, flightPlan);
         }
 

src/blackmisc/aviation/flightplan.cpp

@@ -18,19 +18,69 @@ namespace BlackMisc
     {
         CFlightPlan::CFlightPlan() { }
 
-        CFlightPlan::CFlightPlan(const QString &equipmentIcao, const CAirportIcaoCode &originAirportIcao, const CAirportIcaoCode &destinationAirportIcao, const CAirportIcaoCode &alternateAirportIcao, const QDateTime &takeoffTimePlanned, const QDateTime &takeoffTimeActual, const PhysicalQuantities::CTime &enrouteTime, const PhysicalQuantities::CTime &fuelTime, const CAltitude &cruiseAltitude, const PhysicalQuantities::CSpeed &cruiseTrueAirspeed, CFlightPlan::FlightRules flightRules, const QString &route, const QString &remarks)
+        CFlightPlan::CFlightPlan(const CCallsign &callsign, const QString &equipmentIcao, const CAirportIcaoCode &originAirportIcao, const CAirportIcaoCode &destinationAirportIcao,
-            : m_equipmentIcao(equipmentIcao), m_originAirportIcao(originAirportIcao), m_destinationAirportIcao(destinationAirportIcao), m_alternateAirportIcao(alternateAirportIcao),
+                                 const CAirportIcaoCode &alternateAirportIcao, const QDateTime &takeoffTimePlanned, const QDateTime &takeoffTimeActual, const PhysicalQuantities::CTime &enrouteTime,
+                                 const PhysicalQuantities::CTime &fuelTime, const CAltitude &cruiseAltitude, const PhysicalQuantities::CSpeed &cruiseTrueAirspeed, CFlightPlan::FlightRules flightRules,
+                                 const QString &route, const QString &remarks)
+            : m_callsign(callsign),
+              m_equipmentIcao(equipmentIcao), m_originAirportIcao(originAirportIcao), m_destinationAirportIcao(destinationAirportIcao), m_alternateAirportIcao(alternateAirportIcao),
               m_takeoffTimePlanned(takeoffTimePlanned), m_takeoffTimeActual(takeoffTimeActual), m_enrouteTime(enrouteTime), m_fuelTime(fuelTime),
               m_cruiseAltitude(cruiseAltitude), m_cruiseTrueAirspeed(cruiseTrueAirspeed), m_flightRules(flightRules),
               m_route(route.trimmed().left(MaxRouteLength).toUpper()), m_remarks(remarks.trimmed().left(MaxRemarksLength).toUpper())
         {
+            m_callsign.setTypeHint(CCallsign::Aircraft);
             m_enrouteTime.switchUnit(BlackMisc::PhysicalQuantities::CTimeUnit::hrmin());
             m_fuelTime.switchUnit(BlackMisc::PhysicalQuantities::CTimeUnit::hrmin());
         }
 
+        void CFlightPlan::setCallsign(const CCallsign &callsign)
+        {
+            m_callsign = callsign;
+            m_callsign.setTypeHint(CCallsign::Aircraft);
+        }
+
+        CVariant CFlightPlan::propertyByIndex(const CPropertyIndex &index) const
+        {
+            if (index.isMyself()) { return CVariant::from(*this); }
+            if (ITimestampBased::canHandleIndex(index)) { return ITimestampBased::propertyByIndex(index); }
+
+            const ColumnIndex i = index.frontCasted<ColumnIndex>();
+            switch (i)
+            {
+            case IndexAlternateAirportIcao: return m_alternateAirportIcao.propertyByIndex(index.copyFrontRemoved());
+            case IndexDestinationAirportIcao: return m_destinationAirportIcao.propertyByIndex(index.copyFrontRemoved());
+            case IndexOriginAirportIcao: return m_originAirportIcao.propertyByIndex(index.copyFrontRemoved());
+            case IndexCallsign: return this->m_callsign.propertyByIndex(index.copyFrontRemoved());
+            case IndexRemarks: return CVariant::from(m_remarks);
+            default: return CValueObject::propertyByIndex(index);
+            }
+        }
+
+        void CFlightPlan::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant)
+        {
+            if (index.isMyself()) { (*this) = variant.to<CFlightPlan>(); return; }
+            if (ITimestampBased::canHandleIndex(index))
+            {
+                ITimestampBased::setPropertyByIndex(index, variant);
+                return;
+            }
+
+            const ColumnIndex i = index.frontCasted<ColumnIndex>();
+            switch (i)
+            {
+            case IndexAlternateAirportIcao: m_alternateAirportIcao.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
+            case IndexDestinationAirportIcao: m_destinationAirportIcao.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
+            case IndexOriginAirportIcao: m_originAirportIcao.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
+            case IndexCallsign: m_callsign.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
+            case IndexRemarks: this->setRemarks(variant.toQString()); break;
+            default: CValueObject::setPropertyByIndex(index, variant); break;
+            }
+        }
+
         QString CFlightPlan::convertToQString(bool i18n) const
         {
-            const QString s = m_equipmentIcao
+            const QString s = m_callsign.toQString(i18n)
+                              % QLatin1Char(' ') % m_equipmentIcao
                               % QLatin1Char(' ') % m_originAirportIcao.toQString(i18n)
                               % QLatin1Char(' ') % m_destinationAirportIcao.toQString(i18n)
                               % QLatin1Char(' ') % m_alternateAirportIcao.toQString(i18n)
@@ -56,9 +106,9 @@ namespace BlackMisc
             }
         }
 
-        BlackMisc::CIcon CFlightPlan::toIcon() const
+        CIcon CFlightPlan::toIcon() const
         {
-            return BlackMisc::CIcon::iconByIndex(CIcons::StandardIconAppFlightPlan16);
+            return CIcon::iconByIndex(CIcons::StandardIconAppFlightPlan16);
         }
     } // namespace
 } // namespace

src/blackmisc/aviation/flightplan.h

@@ -12,15 +12,17 @@
 #ifndef BLACKMISC_AVIATION_FLIGHTPLAN_H
 #define BLACKMISC_AVIATION_FLIGHTPLAN_H
 
-#include "blackmisc/aviation/airporticaocode.h"
+#include "airporticaocode.h"
-#include "blackmisc/aviation/altitude.h"
+#include "altitude.h"
-#include "blackmisc/blackmiscexport.h"
+#include "callsign.h"
-#include "blackmisc/icon.h"
-#include "blackmisc/metaclass.h"
 #include "blackmisc/pq/speed.h"
 #include "blackmisc/pq/time.h"
 #include "blackmisc/pq/units.h"
+#include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/icon.h"
+#include "blackmisc/blackmiscexport.h"
 
 #include <QDateTime>
 #include <QMetaType>
@@ -33,7 +35,9 @@ namespace BlackMisc
     namespace Aviation
     {
         //! Value object for a flight plan
-        class BLACKMISC_EXPORT CFlightPlan : public CValueObject<CFlightPlan>
+        class BLACKMISC_EXPORT CFlightPlan :
+            public CValueObject<CFlightPlan>,
+            public ITimestampBased
         {
         public:
             //! Flight rules (VFR or IFR)
@@ -45,6 +49,16 @@ namespace BlackMisc
                 DVFR        //!< Defense VFR
             };
 
+            //! Properties by index
+            enum ColumnIndex
+            {
+                IndexCallsign = CPropertyIndex::GlobalIndexCFlightPlan,
+                IndexOriginAirportIcao,
+                IndexDestinationAirportIcao,
+                IndexAlternateAirportIcao,
+                IndexRemarks
+            };
+
             static constexpr int MaxRemarksLength = 150; //!< Max remarks length
             static constexpr int MaxRouteLength = 150; //!< Max route length
 
@@ -52,10 +66,14 @@ namespace BlackMisc
             CFlightPlan();
 
             //! Constructor
-            CFlightPlan(const QString &equipmentIcao, const CAirportIcaoCode &originAirportIcao, const CAirportIcaoCode &destinationAirportIcao, const CAirportIcaoCode &alternateAirportIcao,
+            CFlightPlan(const CCallsign &callsign,
+                        const QString &equipmentIcao, const CAirportIcaoCode &originAirportIcao, const CAirportIcaoCode &destinationAirportIcao, const CAirportIcaoCode &alternateAirportIcao,
                         const QDateTime &takeoffTimePlanned, const QDateTime &takeoffTimeActual, const PhysicalQuantities::CTime &enrouteTime, const PhysicalQuantities::CTime &fuelTime,
                         const CAltitude &cruiseAltitude, const PhysicalQuantities::CSpeed &cruiseTrueAirspeed, FlightRules flightRules, const QString &route, const QString &remarks);
 
+            //! Callsign (of aircraft)
+            void setCallsign(const CCallsign &callsign);
+
             //! Set ICAO aircraft equipment code string (e.g. "T/A320/F")
             void setEquipmentIcao(const QString &equipmentIcao) { m_equipmentIcao = equipmentIcao; }
 
@@ -114,7 +132,13 @@ namespace BlackMisc
             void setRemarks(const QString &remarks) { m_remarks = remarks.trimmed().left(MaxRemarksLength).toUpper(); }
 
             //! When last sent
-            void setWhenLastSentOrLoaded(const QDateTime &dateTime) { m_lastSentOrLoaded = dateTime; }
+            void setWhenLastSentOrLoaded(const QDateTime &dateTime) { this->setUtcTimestamp(dateTime); }
+
+            //! Aircraft callsign
+            const CCallsign &getCallsign() const { return m_callsign; }
+
+            //! Has callsign?
+            bool hasCallsign() const { return !m_callsign.isEmpty(); }
 
             //! Get ICAO aircraft equipment code string
             const QString &getEquipmentIcao() const { return m_equipmentIcao; }
@@ -165,20 +189,23 @@ namespace BlackMisc
             const QString &getRoute() const { return m_route; }
 
             //! When last sent
-            const QDateTime &whenLastSentOrLoaded() const { return m_lastSentOrLoaded; }
+            const QDateTime whenLastSentOrLoaded() const { return this->getUtcTimestamp() ; }
 
             //! Flight plan already sent
-            bool wasSentOrLoaded() const { return m_lastSentOrLoaded.isValid() && !m_lastSentOrLoaded.isNull(); }
+            bool wasSentOrLoaded() const { return this->hasValidTimestamp(); }
 
             //! Received before n ms
-            qint64 timeDiffSentOrLoadedMs() const
+            qint64 timeDiffSentOrLoadedMs() const { return this->msecsToNow(); }
-            {
-                return this->m_lastSentOrLoaded.msecsTo(QDateTime::currentDateTimeUtc());
-            }
 
             //! Get remarks string
             const QString &getRemarks() const { return m_remarks; }
 
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
+            CVariant propertyByIndex(const CPropertyIndex &index) const;
+
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
+            void setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant);
+
             //! \copydoc BlackMisc::Mixin::Icon::toIcon
             CIcon toIcon() const;
 
@@ -189,6 +216,7 @@ namespace BlackMisc
             static const QString flightRuleToString(FlightRules rule);
 
         private:
+            CCallsign m_callsign;
             QString m_equipmentIcao; //!< e.g. "T/A320/F"
             CAirportIcaoCode m_originAirportIcao;
             CAirportIcaoCode m_destinationAirportIcao;
@@ -202,7 +230,6 @@ namespace BlackMisc
             FlightRules m_flightRules;
             QString m_route;
             QString m_remarks;
-            QDateTime m_lastSentOrLoaded;
 
             BLACK_METACLASS(
                 CFlightPlan,
@@ -219,7 +246,7 @@ namespace BlackMisc
                 BLACK_METAMEMBER(flightRules),
                 BLACK_METAMEMBER(route),
                 BLACK_METAMEMBER(remarks),
-                BLACK_METAMEMBER(lastSentOrLoaded)
+                BLACK_METAMEMBER(timestampMSecsSinceEpoch)
             );
         };
     } // namespace

src/blackmisc/propertyindex.h

@@ -93,6 +93,7 @@ namespace BlackMisc
             GlobalIndexCAircraftParts                   =  1400,
             GlobalIndexCAircraftLights                  =  1500,
             GlobalIndexCLivery                          =  1600,
+            GlobalIndexCFlightPlan                      =  1700,
             GlobalIndexCComSystem                       =  2000,
             GlobalIndexCModulator                       =  2100,
             GlobalIndexCTransponder                     =  2200,

src/blackmisc/test/testdata.cpp

@@ -81,7 +81,8 @@ namespace BlackMisc
 
         const CFlightPlan &CTestData::getFlightPlan()
         {
-            static const CFlightPlan fp("T/A320/F", "EDDF", "EDDM", "EDDN",
+            static const CFlightPlan fp(CCallsign("DAMBZ", CCallsign::Aircraft),
+                                        "T/A320/F", "EDDF", "EDDM", "EDDN",
                                         QDateTime::currentDateTimeUtc(), QDateTime::currentDateTime().addSecs(600),
                                         CTime(1.0, CTimeUnit::h()), CTime(2.0, CTimeUnit::h()),
                                         CAltitude(10000, CAltitude::MeanSeaLevel, CLengthUnit::ft()), CSpeed(400, CSpeedUnit::kts()), CFlightPlan::IFR,