feat: new lights and number of engines increased to 6

Author: tzobler

src/core/airspacemonitor.cpp

@@ -551,8 +551,8 @@ namespace swift::core
 
         // TODO TZ remove when testing is done
         CLogMessage(this).info(u"CAirspaceMonitor::sendReadyForModelMatching "
-                               u"callsign %1 ")
-            << callsign;
+                               u"callsign %1 Flag %2 ")
+            << callsign << rf;
         // TODO remove
 
         // set flag and init ts
@@ -1212,17 +1212,7 @@ 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
-            // 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;
-
-            // we do not change manually assigned models
+            // we do not change manually assigned models (msfs2024)
             if (!aircraft.getModel().hasValidDbKey() && aircraft.getModelType() != CAircraftModel::TypeManuallySet)
             {
 
@@ -1491,6 +1481,7 @@ namespace swift::core
         this->updateAircraftInRange(callsign, vm);
     }
 
+    // TODO TZ  I think, we can remove this method in future, as we have now longer IVAO supported protocols
     void CAirspaceMonitor::onRevBAircraftConfigReceived(const CCallsign &callsign, const QString &config,
                                                         qint64 currentOffsetMs)
     {

src/core/context/contextnetworkimpl.cpp

@@ -1142,10 +1142,6 @@ 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,15 +981,6 @@ 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,7 +41,7 @@
 #include "misc/logmessage.h"
 #include "misc/network/connectionstatus.h"
 #include "misc/network/entityflags.h"
-// TODO TZ remove afte testing
+// TODO TZ remove after testing. it is in another branch already
 #include "misc/network/server.h"
 // TODO TZ end remove afte testing
 #include "misc/network/serverlist.h"
@@ -301,7 +301,7 @@ namespace swift::gui::components
     {
         if (!m_updatePilotOnServerChanges) { return; }
         const bool vatsim = this->isVatsimNetworkTabSelected();
-        // TODO TZ remove after testing
+        // TODO TZ remove after testing. it is on another branch already
         // const CUser user = vatsim ? this->getCurrentVatsimServer().getUser() : server.getUser();
         const CUser user =
             server.getServerType() != CServer::FSDServer ? this->getCurrentVatsimServer().getUser() : server.getUser();

src/gui/components/mappingcomponent.cpp

@@ -370,12 +370,6 @@ namespace swift::gui::components
         {
             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'")

src/gui/editors/aircraftpartsform.cpp

@@ -100,6 +100,9 @@ namespace swift::gui::editors
         ui->cb_AircraftPartsLightsBeacon->setChecked(on);
         ui->cb_AircraftPartsLightsNav->setChecked(on);
         ui->cb_AircraftPartsLightsLogo->setChecked(on);
+        ui->cb_AircraftPartsLightsWing->setChecked(on);
+        ui->cb_AircraftPartsLightsRecognition->setChecked(on);
+        ui->cb_AircraftPartsLightsCabin->setChecked(on);
     }
 
     void CAircraftPartsForm::setAllEngines()
@@ -115,10 +118,13 @@ namespace swift::gui::editors
 
     aviation::CAircraftParts CAircraftPartsForm::guiToAircraftParts() const
     {
+        // added new values for lights and engines here
         const CAircraftLights lights(
             ui->cb_AircraftPartsLightsStrobe->isChecked(), ui->cb_AircraftPartsLightsLanding->isChecked(),
             ui->cb_AircraftPartsLightsTaxi->isChecked(), ui->cb_AircraftPartsLightsBeacon->isChecked(),
-            ui->cb_AircraftPartsLightsNav->isChecked(), ui->cb_AircraftPartsLightsLogo->isChecked());
+            ui->cb_AircraftPartsLightsNav->isChecked(), ui->cb_AircraftPartsLightsLogo->isChecked(),
+            ui->cb_AircraftPartsLightsRecognition->isChecked(), ui->cb_AircraftPartsLightsCabin->isChecked(),
+            ui->cb_AircraftPartsLightsWing->isChecked());
         const CAircraftEngineList engines(
             { ui->cb_AircraftPartsEngine1->isChecked(), ui->cb_AircraftPartsEngine2->isChecked(),
               ui->cb_AircraftPartsEngine3->isChecked(), ui->cb_AircraftPartsEngine4->isChecked(),
@@ -143,6 +149,7 @@ namespace swift::gui::editors
         ui->cb_AircraftPartsLightsNav->setChecked(lights.isNavOn());
         ui->cb_AircraftPartsLightsStrobe->setChecked(lights.isStrobeOn());
         ui->cb_AircraftPartsLightsTaxi->setChecked(lights.isTaxiOn());
+        ui->cb_AircraftPartsLightsWing->setChecked(lights.isWingOn());
 
         const CAircraftEngineList engines = parts.getEngines();
         ui->cb_AircraftPartsEngine1->setChecked(engines.isEngineOn(1));

src/gui/editors/aircraftpartsform.ui

@@ -32,7 +32,7 @@
    <property name="bottomMargin">
     <number>3</number>
    </property>
-   <item row="4" column="1">
+   <item row="3" column="4">
     <widget class="QCheckBox" name="cb_AircraftPartsLightsStrobe">
      <property name="text">
       <string>Strobe</string>
@@ -70,7 +70,31 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
+
+    <item row="4" column="1">
+      <widget class="QCheckBox" name="cb_AircraftPartsLightsWing">
+        <property name="text">
+          <string>Wing</string>
+        </property>
+      </widget>
+    </item>
+    <item row="4" column="2">
+      <widget class="QCheckBox" name="cb_AircraftPartsLightsRecognition">
+        <property name="text">
+          <string>Recognition</string>
+        </property>
+      </widget>
+    </item>
+    <item row="4" column="3">
+      <widget class="QCheckBox" name="cb_AircraftPartsLightsCabin">
+        <property name="text">
+          <string>Cabin</string>
+        </property>
+      </widget>
+    </item>
+
+
+    <item row="3" column="1">
     <widget class="QCheckBox" name="cb_AircraftPartsLightsNav">
      <property name="text">
       <string>Nav</string>
@@ -91,7 +115,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item row="3" column="3">
     <widget class="QCheckBox" name="cb_AircraftPartsLightsBeacon">
      <property name="text">
       <string>Beacon</string>
@@ -140,7 +164,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="2">
+   <item row="4" column="0">
     <widget class="QCheckBox" name="cb_AircraftPartsLightsLogo">
      <property name="text">
       <string>Logo</string>

src/gui/models/aircraftmodellistmodel.cpp

@@ -36,7 +36,6 @@ namespace swift::gui::models
         (void)QT_TRANSLATE_NOOP("CAircraftModelListModel", "model");
     }
 
-    // TODO TZ check if some columns can be hidden automatically for different sims
     void CAircraftModelListModel::setAircraftModelMode(CAircraftModelListModel::AircraftModelMode mode)
     {
         if (m_mode == mode) { return; }

src/misc/CMakeLists.txt

@@ -535,6 +535,8 @@ add_library(misc SHARED
         simulation/flightgear/flightgearutil.h
         simulation/msfs2024/aircraftmodelloadermsfs2024.cpp
         simulation/msfs2024/aircraftmodelloadermsfs2024.h
+        simulation/msfs2024/simconnectutilities.cpp
+        simulation/msfs2024/simconnectutilities.h
         simulation/fscommon/aircraftcfgentries.cpp
         simulation/fscommon/aircraftcfgentries.h
         simulation/fscommon/aircraftcfgentrieslist.cpp
@@ -681,7 +683,7 @@ add_library(misc SHARED
         weather/windlayer.h
         weather/windlayerlist.cpp
         weather/windlayerlist.h
-)
+        )
 
 if(APPLE)
     target_sources(misc PRIVATE

src/misc/aviation/aircraftlights.cpp

@@ -20,17 +20,23 @@ namespace swift::misc::aviation
     CAircraftLights::CAircraftLights(bool strobeOn, bool landingOn, bool taxiOn, bool beaconOn, bool navOn, bool logoOn,
                                      bool recognition, bool cabin)
         : m_strobeOn(strobeOn), m_landingOn(landingOn), m_taxiOn(taxiOn), m_beaconOn(beaconOn), m_navOn(navOn),
-          m_logoOn(logoOn), m_recognition(recognition), m_cabin(cabin)
+          m_logoOn(logoOn), m_recognitionOn(recognition), m_cabinOn(cabin)
+    {}
+
+    CAircraftLights::CAircraftLights(bool strobeOn, bool landingOn, bool taxiOn, bool beaconOn, bool navOn, bool logoOn,
+                                     bool recognition, bool cabin, bool wing)
+        : m_strobeOn(strobeOn), m_landingOn(landingOn), m_taxiOn(taxiOn), m_beaconOn(beaconOn), m_navOn(navOn),
+          m_logoOn(logoOn), m_recognitionOn(recognition), m_cabinOn(cabin), m_wingOn(wing)
     {}
 
     CAircraftLights CAircraftLights::allLightsOn()
     {
-        return CAircraftLights { true, true, true, true, true, true, true, true };
+        return CAircraftLights { true, true, true, true, true, true, true, true, true };
     }
 
     CAircraftLights CAircraftLights::allLightsOff()
     {
-        return CAircraftLights { false, false, false, false, false, false, false, false };
+        return CAircraftLights { false, false, false, false, false, false, false, false, false };
     }
 
     QString CAircraftLights::convertToQString(bool i18n) const
@@ -39,7 +45,8 @@ namespace swift::misc::aviation
         const QString s = u"strobe: " % boolToYesNo(m_strobeOn) % u" landing: " % boolToYesNo(m_landingOn) %
                           u" taxi: " % boolToYesNo(m_taxiOn) % u" beacon: " % boolToYesNo(m_beaconOn) % u" nav: " %
                           boolToYesNo(m_navOn) % u" logo: " % boolToYesNo(m_logoOn) % u" recognition: " %
-                          boolToYesNo(m_recognition) % u" cabin: " % boolToYesNo(m_cabin);
+                          boolToYesNo(m_recognitionOn) % u" cabin: " % boolToYesNo(m_cabinOn) % u" cabin: " %
+                          boolToYesNo(m_wingOn);
         return s;
     }
 
@@ -57,8 +64,9 @@ namespace swift::misc::aviation
         case IndexNav: return QVariant::fromValue(m_navOn);
         case IndexStrobe: return QVariant::fromValue(m_strobeOn);
         case IndexTaxi: return QVariant::fromValue(m_taxiOn);
-        case IndexRecognition: return QVariant::fromValue(m_recognition);
-        case IndexCabin: return QVariant::fromValue(m_cabin);
+        case IndexRecognition: return QVariant::fromValue(m_recognitionOn);
+        case IndexCabin: return QVariant::fromValue(m_cabinOn);
+        case IndexWing: return QVariant::fromValue(m_wingOn);
         default: return CValueObject::propertyByIndex(index);
         }
     }
@@ -81,8 +89,9 @@ namespace swift::misc::aviation
         case IndexNav: m_navOn = variant.toBool(); break;
         case IndexStrobe: m_strobeOn = variant.toBool(); break;
         case IndexTaxi: m_taxiOn = variant.toBool(); break;
-        case IndexCabin: m_cabin = variant.toBool(); break;
-        case IndexRecognition: m_recognition = variant.toBool(); break;
+        case IndexCabin: m_cabinOn = variant.toBool(); break;
+        case IndexRecognition: m_recognitionOn = variant.toBool(); break;
+        case IndexWing: m_wingOn = variant.toBool(); break;
         default: CValueObject::setPropertyByIndex(index, variant); break;
         }
     }
@@ -99,8 +108,9 @@ namespace swift::misc::aviation
         case IndexNav: return Compare::compare(m_navOn, compareValue.isNavOn());
         case IndexStrobe: return Compare::compare(m_strobeOn, compareValue.isStrobeOn());
         case IndexTaxi: return Compare::compare(m_taxiOn, compareValue.isTaxiOn());
-        case IndexCabin: return Compare::compare(m_cabin, compareValue.isCabinOn());
-        case IndexRecognition: return Compare::compare(m_recognition, compareValue.isRecognitionOn());
+        case IndexCabin: return Compare::compare(m_cabinOn, compareValue.isCabinOn());
+        case IndexRecognition: return Compare::compare(m_recognitionOn, compareValue.isRecognitionOn());
+        case IndexWing: return Compare::compare(m_wingOn, compareValue.isWingOn());
         default: break;
         }
         return 0;
@@ -114,8 +124,9 @@ namespace swift::misc::aviation
         m_navOn = true;
         m_strobeOn = true;
         m_taxiOn = true;
-        m_cabin = true;
-        m_recognition = true;
+        m_cabinOn = true;
+        m_recognitionOn = true;
+        m_wingOn = true;
     }
 
     void CAircraftLights::setAllOff()
@@ -126,7 +137,8 @@ namespace swift::misc::aviation
         m_navOn = false;
         m_strobeOn = false;
         m_taxiOn = false;
-        m_recognition = false;
-        m_cabin = false;
+        m_recognitionOn = false;
+        m_cabinOn = false;
+        m_wingOn = false;
     }
 } // namespace swift::misc::aviation