MSFS2024 new plugin and modelloader

src/core/aircraftmatcher.cpp

@@ -1657,7 +1657,10 @@ namespace swift::core
         if (modelsCleaned.isEmpty())
         {
             // error to force popup
-            CLogMessage(this).error(u"No models for matching ('%1'), swift without a model set will not work!")
+            // TODO TZ extend commend
+            CLogMessage(this).error(
+                u"No models for matching ('%1'), swift without a model set will not work! Note: If you are using "
+                u"MSFS2024 and starting the GUI for the first time, it may take some time for the model set to load.")
                 << simulator.toQString();
         }
         else if (!duplicateModels.isEmpty())

src/core/airspacemonitor.cpp

@@ -547,6 +547,12 @@ namespace swift::core
         if (!this->isConnectedAndNotShuttingDown()) { return; }
         Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "missing callsign");
 
+        CStatusMessageList reverseLookupMessages;
+        CCallsign::addLogDetailsToList(&reverseLookupMessages, callsign,
+                                       QStringLiteral("CAirspaceMonitor::sendReadyForModelMatching Flag: %1").arg(rf),
+                                       CAirspaceMonitor::getLogCategories());
+        // TODO remove
+
         // set flag and init ts
         Readiness &readiness = this->addMatchingReadinessFlag(callsign, rf);
 
@@ -863,13 +869,18 @@ 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);
 
-        emit this->requestedNewAircraft(callsign, aircraftIcaoDesignator, airlineIcaoDesignator, livery);
+        // we do not change manually assigned models
+        if (aircraft.getModel().getModelType() != CAircraftModel::TypeManuallySet)
+        {
+            this->addReverseLookupMessages(callsign, reverseLookupMessages);
+            this->sendReadyForModelMatching(callsign, ReceivedIcaoCodes); // ICAO codes received
+
+            emit this->requestedNewAircraft(callsign, aircraftIcaoDesignator, airlineIcaoDesignator, livery);
+        }
     }
 
     CAircraftModel CAirspaceMonitor::reverseLookupModelWithFlightplanData(
@@ -1176,8 +1187,8 @@ namespace swift::core
         const CSimulatedAircraft aircraft = this->getAircraftInRangeForCallsign(callsign);
         if (aircraft.hasValidCallsign())
         {
-            // only if we do not have a DB model yet
-            if (!aircraft.getModel().hasValidDbKey())
+            // we do not change manually assigned models (msfs2024)
+            if (!aircraft.getModel().hasValidDbKey() && aircraft.getModelType() != CAircraftModel::TypeManuallySet)
             {
                 CAircraftModel model = this->reverseLookupModelWithFlightplanData(callsign, aircraftIcao, airlineIcao,
                                                                                   livery, modelString, modelType, log);

src/core/context/contextsimulatorimpl.cpp

@@ -241,7 +241,7 @@ namespace swift::core::context
     {
         Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Need single simulator");
         if (isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; }
-        if (this->isSimulatorAvailable()) { return; } // if a plugin is loaded, do ignore this
+        if (this->isSimulatorAvailable() && !simulator.isMSFS2024()) return; // if a plugin is loaded, do ignore this
         m_modelSetSimulator.set(simulator);
         const CAircraftModelList models = this->getModelSet(); // cache synced
         m_aircraftMatcher.setModelSet(models, simulator, false);

src/core/db/databaseutils.cpp

@@ -75,6 +75,7 @@ namespace swift::core::db
             dbModelModified.updateMissingParts(model);
             dbModelModified.setDistributorOrder(distributorOrder);
             dbModelModified.setSimulator(dbModel.getSimulator()); // DB simulator settings have priority
+            dbModelModified.setModelLivery(model.getModelLivery()); // keep local livery settings msfs2024
             return dbModelModified;
         }
 
@@ -88,6 +89,7 @@ namespace swift::core::db
             {
                 if (modified) { *modified = true; }
                 consolidatedModel.setLivery(dbLivery);
+                consolidatedModel.setModelLivery(model.getModelLivery()); // keep local livery settings msfs2024
             }
         }
         if (!consolidatedModel.getAircraftIcaoCode().hasValidDbKey() && consolidatedModel.hasAircraftDesignator())
@@ -99,6 +101,7 @@ namespace swift::core::db
             {
                 if (modified) { *modified = true; }
                 consolidatedModel.setAircraftIcaoCode(dbIcao);
+                consolidatedModel.setModelLivery(model.getModelLivery()); // keep local livery settings msfs2024
             }
         }
 
@@ -108,6 +111,7 @@ namespace swift::core::db
         {
             if (modified) { *modified = true; }
             consolidatedModel.setDistributor(dbDistributor);
+            consolidatedModel.setModelLivery(model.getModelLivery()); // keep local livery settings msfs2024
         }
         consolidatedModel.updateLocalFileNames(model);
         consolidatedModel.setDistributorOrder(distributorOrder);

src/core/modelsetbuilder.cpp

@@ -49,8 +49,9 @@ namespace swift::core
         }
         else
         {
-            // without any information we can not use them
-            modelSet = modelSet.findWithKnownAircraftDesignator();
+            if (!options.testFlag(ShowAllInstalledModels))
+                // without any information we can not use them
+                modelSet = modelSet.findWithKnownAircraftDesignator();
         }
 
         // Include only

src/core/modelsetbuilder.h

@@ -34,7 +34,8 @@ namespace swift::core
             OnlyDbIcaoCodes = 1 << 2,
             Incremental = 1 << 3,
             SortByDistributors = 1 << 4,
-            ConsolidateWithDb = 1 << 5
+            ConsolidateWithDb = 1 << 5,
+            ShowAllInstalledModels = 1 << 6,
         };
         Q_DECLARE_FLAGS(Builder, BuilderFlag)
 

src/gui/components/dbownmodelscomponent.cpp

@@ -332,6 +332,22 @@ namespace swift::gui::components
         ui->tvp_OwnAircraftModels->updateContainerMaybeAsync(this->getOwnModels());
     }
 
+    // TODO TZ this is a stub for SimConnect loading
+    void CDbOwnModelsComponent::loadInstalledModelsSimConnect(const CSimulatorInfo &simulator,
+                                                              IAircraftModelLoader::LoadMode mode,
+                                                              const QStringList &modelDirectories)
+    {
+        Q_UNUSED(mode);
+        Q_UNUSED(modelDirectories);
+
+        using namespace std::chrono_literals;
+        const CStatusMessage msg = CLogMessage(this).info(u"Triiger loading models for %1 from SimConnect")
+                                   << simulator.toQString();
+        this->showOverlayHTMLMessage(msg, 2s);
+
+        return;
+    }
+
     void CDbOwnModelsComponent::loadInstalledModels(const CSimulatorInfo &simulator,
                                                     IAircraftModelLoader::LoadMode mode,
                                                     const QStringList &modelDirectories)
@@ -512,6 +528,9 @@ namespace swift::gui::components
                                                        IAircraftModelLoader::LoadMode mode,
                                                        const QStringList &modelDirectories)
     {
+        // TODO TZ add SimConnect loading
+        if (simulator.isMSFS2024()) this->loadInstalledModelsSimConnect(simulator, mode, modelDirectories);
+
         this->loadInstalledModels(simulator, mode, modelDirectories);
     }
 

src/gui/components/dbownmodelscomponent.h

@@ -153,6 +153,8 @@ namespace swift::gui
             void ownModelsSimulatorChanged(const swift::misc::simulation::CSimulatorInfo &simulator);
 
         private:
+            static constexpr std::chrono::milliseconds OverlayMsgTimeout { 5000 }; //!< how long overlay is displayed
+
             QScopedPointer<Ui::CDbOwnModelsComponent> ui;
             swift::misc::simulation::IAircraftModelLoader *m_modelLoader =
                 nullptr; //!< read own aircraft models, aka models on disk
@@ -167,7 +169,12 @@ namespace swift::gui
             //! Request own models
             void requestOwnModelsUpdate();
 
-            //! Load the models
+            //! Load the models via SimConnect
+            void loadInstalledModelsSimConnect(const swift::misc::simulation::CSimulatorInfo &simulator,
+                                               swift::misc::simulation::IAircraftModelLoader::LoadMode mode,
+                                               const QStringList &modelDirectories = {});
+
+            //! Load the models via disk
             void loadInstalledModels(const swift::misc::simulation::CSimulatorInfo &simulator,
                                      swift::misc::simulation::IAircraftModelLoader::LoadMode mode,
                                      const QStringList &modelDirectories = {});

src/gui/components/mappingcomponent.cpp

@@ -333,6 +333,8 @@ 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())
         {
@@ -375,6 +377,7 @@ namespace swift::gui::components
             }
 
             CAircraftModel model(models.front());
+            // found more than one model?
             if (models.size() > 1)
             {
                 if (models.containsModelString(modelString))
@@ -391,8 +394,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());
         }