feat: Implementation of the msfs2024 model mapping is ready for testing

Author: tzobler

src/core/aircraftmatcher.cpp

@@ -1710,6 +1710,14 @@ namespace swift::core
                                                    const QString &livery)
     {
         Q_UNUSED(livery)
+        // TODO TZ remove after testing
+        CLogMessage(this).info(u"CAircraftMatcher::onIcaoCodesReceived CHECK:"
+                               u"callsign %1 "
+                               u"aircraftIcao %2 "
+                               u"airlineIcao %3 "
+                               u"livery %4 ")
+            << callsign << aircraftIcao << airlineIcao << livery;
+
         Q_ASSERT_X(sApp && sApp->hasWebDataServices(), Q_FUNC_INFO, "Missing web data services");
         if (m_modelSet.isEmpty()) { return; } // ignore empty sets to not create silly stats
         if (sessionId.isEmpty()) { return; }

src/core/airspacemonitor.cpp

@@ -773,6 +773,14 @@ namespace swift::core
                                                        const QString &aircraftIcaoDesignator,
                                                        const QString &combinedAircraftType, const QString &modelString)
     {
+        // TODO TZ remove when testing is done
+        CLogMessage(this).info(u"CAirspaceMonitor::onCustomFSInnPacketReceived CHECK:"
+                               u"callsign %1 "
+                               u"airlineIcaoDesignator %2 "
+                               u"aircraftIcaoDesignator %3 "
+                               u"modelString %4 ")
+            << callsign << airlineIcaoDesignator << aircraftIcaoDesignator << modelString;
+
         // it can happen this is called before any queries
         // ES sends FsInn packets for callsigns such as ACCGER1, which are hard to distinguish
         // 1) checking if they are already in the list checks again ATC position which is safe
@@ -834,9 +842,9 @@ namespace swift::core
             // in order not to override swift livery string data, we ignore those
             if (!usedModelString.isEmpty())
             {
-                this->addOrUpdateAircraftInRange(callsign, aircraftIcaoDesignator, airlineIcaoDesignator, QString(),
-                                                 usedModelString, CAircraftModel::TypeFSInnData,
-                                                 pReverseLookupMessages);
+                const CSimulatedAircraft aircraft = this->addOrUpdateAircraftInRange(
+                    callsign, aircraftIcaoDesignator, airlineIcaoDesignator, QString(), usedModelString,
+                    CAircraftModel::TypeFSInnData, pReverseLookupMessages);
                 this->addReverseLookupMessages(callsign, reverseLookupMessages);
             }
             this->sendReadyForModelMatching(callsign, ReceivedFsInnPacket); // from FSInn
@@ -846,6 +854,14 @@ namespace swift::core
     void CAirspaceMonitor::onIcaoCodesReceived(const CCallsign &callsign, const QString &aircraftIcaoDesignator,
                                                const QString &airlineIcaoDesignator, const QString &livery)
     {
+        // TODO TZ remove when testing is done
+        CLogMessage(this).info(u"CAirspaceMonitor::onIcaoCodesReceived CHECK:"
+                               u"callsign %1 "
+                               u"aircraftIcaoDesignator %2 "
+                               u"airlineIcaoDesignator %3 "
+                               u"livery %4 ")
+            << callsign << aircraftIcaoDesignator << airlineIcaoDesignator << livery;
+
         Q_ASSERT_X(CThreadUtils::isInThisThread(this), Q_FUNC_INFO, "not in main thread");
         if (!this->isConnectedAndNotShuttingDown()) { return; }
         if (CBuildConfig::isLocalDeveloperDebugBuild())
@@ -865,13 +881,16 @@ namespace swift::core
                                        CAirspaceMonitor::getLogCategories());
 
         const CClient client = this->getClientOrDefaultForCallsign(callsign);
-        this->addOrUpdateAircraftInRange(callsign, aircraftIcaoDesignator, airlineIcaoDesignator, livery,
-                                         client.getQueriedModelString(), CAircraftModel::TypeQueriedFromNetwork,
-                                         pReverseLookupMessages);
-        this->addReverseLookupMessages(callsign, reverseLookupMessages);
-        this->sendReadyForModelMatching(callsign, ReceivedIcaoCodes); // ICAO codes received
+        const CSimulatedAircraft aircraft = this->addOrUpdateAircraftInRange(
+            callsign, aircraftIcaoDesignator, airlineIcaoDesignator, livery, client.getQueriedModelString(),
+            CAircraftModel::TypeQueriedFromNetwork, pReverseLookupMessages);
+        if (aircraft.getModel().getModelType() != CAircraftModel::TypeManuallySet)
+        {
+            this->addReverseLookupMessages(callsign, reverseLookupMessages);
+            this->sendReadyForModelMatching(callsign, ReceivedIcaoCodes); // ICAO codes received
 
-        emit this->requestedNewAircraft(callsign, aircraftIcaoDesignator, airlineIcaoDesignator, livery);
+            emit this->requestedNewAircraft(callsign, aircraftIcaoDesignator, airlineIcaoDesignator, livery);
+        }
     }
 
     CAircraftModel CAirspaceMonitor::reverseLookupModelWithFlightplanData(
@@ -1178,9 +1197,26 @@ namespace swift::core
         const CSimulatedAircraft aircraft = this->getAircraftInRangeForCallsign(callsign);
         if (aircraft.hasValidCallsign())
         {
+            // TODO TZ at this point we have a poblem if the model has no DB key yet (msfs2024 liveries)
             // only if we do not have a DB model yet
-            if (!aircraft.getModel().hasValidDbKey())
+            // int testType = aircraft.getModelType();1
+            CLogMessage(this).info(u"CAirspaceMonitor::addOrUpdateAircraftInRange CHECK:"
+                                   u"aircraft.getModelType %1 "
+                                   u"callsign %2 "
+                                   u"aircraftIcao %3 "
+                                   u"incomming modelType %4 ")
+                << aircraft.getModelType() << callsign.toQString() << aircraftIcao << modelType;
+
+            if (!aircraft.getModel().hasValidDbKey() && aircraft.getModelType() != CAircraftModel::TypeManuallySet)
             {
+
+                CLogMessage(this).warning(u"CAirspaceMonitor::reverseLookupModelWithFlightplanData "
+                                          u"aircraft.getModelType %1 "
+                                          u"callsign %2 "
+                                          u"aircraftIcao %3 "
+                                          u"incomming modelType %4 ")
+                    << aircraft.getModelType() << callsign.toQString() << aircraftIcao << modelType;
+
                 CAircraftModel model = this->reverseLookupModelWithFlightplanData(callsign, aircraftIcao, airlineIcao,
                                                                                   livery, modelString, modelType, log);
                 model.updateMissingParts(aircraft.getModel());

src/core/context/contextnetworkimpl.cpp

@@ -1142,6 +1142,11 @@ namespace swift::core::context
         if (c)
         {
             const CSimulatedAircraft aircraft(this->getAircraftInRangeForCallsign(callsign));
+            // TODO TZ
+            CLogMessage(this).info(u"CContextNetwork::updateAircraftModel model.getModelString %1 model.getModelLivery "
+                                   u"%2 model.getModelType %3 aircraft.getModelType '%4'")
+                << model.getModelString() << model.getModelLivery() << model.getModelType() << aircraft.getModelType();
+
             Q_ASSERT_X(!aircraft.getCallsign().isEmpty(), Q_FUNC_INFO, "missing callsign");
             emit this->changedRemoteAircraftModel(aircraft, originator); // update aircraft model
         }

src/core/simulator.cpp

@@ -981,6 +981,15 @@ namespace swift::core
     bool ISimulator::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft)
     {
         if (this->isShuttingDown()) { return false; }
+
+        // TODO TZ remove after testing
+        CLogMessage(this).info(u"ISimulator::changeRemoteAircraftEnabled CHECK:"
+                               u"aircraft.getModelType %1 "
+                               u"aircraft.getModelString %2 "
+                               u"aircraft.getLiveryString %3 ")
+            << aircraft.getModelType() << aircraft.getModelString() << aircraft.getLiveryString();
+        ;
+
         return aircraft.isEnabled() ? this->physicallyAddRemoteAircraft(aircraft) :
                                       this->physicallyRemoveRemoteAircraft(aircraft.getCallsign());
     }

src/gui/components/logincomponent.cpp

@@ -41,6 +41,9 @@
 #include "misc/logmessage.h"
 #include "misc/network/connectionstatus.h"
 #include "misc/network/entityflags.h"
+// TODO TZ remove afte testing
+#include "misc/network/server.h"
+// TODO TZ end remove afte testing
 #include "misc/network/serverlist.h"
 #include "misc/simulation/aircraftmodel.h"
 #include "misc/simulation/simulatedaircraft.h"
@@ -298,8 +301,14 @@ namespace swift::gui::components
     {
         if (!m_updatePilotOnServerChanges) { return; }
         const bool vatsim = this->isVatsimNetworkTabSelected();
-        const CUser user = vatsim ? this->getCurrentVatsimServer().getUser() : server.getUser();
-        ui->form_Pilot->setUser(user);
+        // TODO TZ remove after testing
+        // const CUser user = vatsim ? this->getCurrentVatsimServer().getUser() : server.getUser();
+        const CUser user =
+            server.getServerType() != CServer::FSDServer ? this->getCurrentVatsimServer().getUser() : server.getUser();
+        if ((vatsim && server.getServerType() != CServer::FSDServer) ||
+            (!vatsim && server.getServerType() == CServer::FSDServer))
+            // End remove after testing
+            ui->form_Pilot->setUser(user);
     }
 
     void CLoginComponent::onSimulatorStatusChanged(int status)

src/gui/components/mappingcomponent.cpp

@@ -84,6 +84,7 @@ namespace swift::gui::components
                 &CMappingComponent::onModelsUpdateRequested);
         connect(ui->tvp_AircraftModels, &CAircraftModelView::modelDataChanged, this,
                 &CMappingComponent::onRowCountChanged);
+        connect(ui->tvp_AircraftModels, &CAircraftModelView::clicked, this, &CMappingComponent::onModelSelectedInView);
         connect(ui->tvp_AircraftModels, &CAircraftModelView::requestTempDisableModelsForMatching, this,
                 &CMappingComponent::onTempDisableModelsForMatchingRequested);
 
@@ -258,6 +259,12 @@ namespace swift::gui::components
         ui->completer_ModelStrings->setModel(simAircraft.getModel());
     }
 
+    void CMappingComponent::onModelSelectedInView(const QModelIndex &index)
+    {
+        const CAircraftModel model = ui->tvp_AircraftModels->at(index);
+        ui->completer_ModelStrings->setModel(model);
+    }
+
     CCallsign CMappingComponent::validateRenderedCallsign()
     {
         const QString cs = ui->le_Callsign->text().trimmed();
@@ -326,7 +333,10 @@ namespace swift::gui::components
         }
         const CCallsign callsign(this->validateRenderedCallsign());
         if (callsign.isEmpty()) { return; }
+
+        // Because of msfs2024, the model string contains the combination of title and livery.
         const QString modelString = ui->completer_ModelStrings->getModelString();
+
         if (modelString.isEmpty())
         {
             this->showOverlayHTMLMessage(CStatusMessage(this).validationError(u"Missing model for mapping"),
@@ -359,6 +369,13 @@ namespace swift::gui::components
         if (aircraftFromBackend.getModelString() != modelString)
         {
             const CAircraftModelList models = sGui->getIContextSimulator()->getModelSetModelsStartingWith(modelString);
+
+            // TODO TZ DEBUG only for testing
+            const CStatusMessage msg = CStatusMessage(this).validationInfo(u"Found: %1 models for %2")
+                                       << models.size() << modelString;
+            this->showOverlayMessage(msg, OverlayMessageMs);
+            // END testing
+
             if (models.isEmpty())
             {
                 const CStatusMessage msg = CStatusMessage(this).validationError(u"No model for title: '%1'")
@@ -368,6 +385,7 @@ namespace swift::gui::components
             }
 
             CAircraftModel model(models.front());
+            // found more than one model?
             if (models.size() > 1)
             {
                 if (models.containsModelString(modelString))
@@ -384,8 +402,10 @@ namespace swift::gui::components
             model.setModelType(CAircraftModel::TypeManuallySet);
             CLogMessage(this).info(u"Requesting changes for '%1'") << callsign.asString();
 
-            // enable in any case
+            // rendering-flag enable in any case
             sGui->getIContextNetwork()->updateAircraftEnabled(aircraftFromBackend.getCallsign(), true);
+
+            // trigger model change
             changed =
                 sGui->getIContextNetwork()->updateAircraftModel(aircraftFromBackend.getCallsign(), model, identifier());
         }

src/gui/components/mappingcomponent.h

@@ -113,6 +113,9 @@ namespace swift::gui
             //! Aircraft selected (in view)
             void onAircraftSelectedInView(const QModelIndex &index);
 
+            //! Model selected (in view)
+            void onModelSelectedInView(const QModelIndex &index);
+
             //! Save changed aircraft
             void onSaveAircraft();
 

src/misc/simulation/simulatedaircraft.h

@@ -412,7 +412,7 @@ namespace swift::misc
             //! Get model Livery MSFS2024
             const QString &getLiveryString() const { return m_models[CurrentModel].getModelLivery(); }
 
-            //! Get short model string (without livery)
+            //! Get short model string (without livery msfs2024)
             const QString getShortModelString() const { return m_models[CurrentModel].getShortModelString(); }
 
             //! Set model string
@@ -492,6 +492,9 @@ namespace swift::misc
             //! \copydoc swift::misc::mixin::Icon::toIcon()
             CIcons::IconIndex toIcon() const { return m_callsign.toIcon(); }
 
+            //! Get model type
+            int getModelType() const { return m_models[CurrentModel].getModelType(); }
+
         private:
             static constexpr int CurrentModel = 0; //!< m_models
             static constexpr int NetworkModel = 1; //!< m_models

src/plugins/simulator/msfs2024/simconnectdatadefinitionmsfs2024.h

@@ -86,7 +86,7 @@ namespace swift::simplugin::msfs2024common
     struct DataDefinitionOwnAircraftModel
     {
         char title[256]; //!< Aircraft model string
-        char livery[256]; //!< Aircraft model string
+        char livery[256]; //!< Aircraft livery string msfs2024
     };
 
     //! Data struct of aircraft model data
@@ -107,6 +107,7 @@ namespace swift::simplugin::msfs2024common
         char atcAirlineNumber[64]; //!< airline number
         char atcFlightNumber[8]; //!< flight number (168)
         char title[256]; //!< Aircraft model string
+        char livery[256]; //!< Aircraft livery string msfs2024
     };
 
     //! Data struct of aircraft data (setable)