Migrates TrainingAreaBase proxies to generated rtiddsgen API

Converts accessor calls to plain member access in tab and taboc proxies.

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/CMakeLists.txt

@@ -33,7 +33,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(saaTelegrams
     ${CMAKE_BINARY_DIR}/Lts/Services
 )
 NGL_TARGET_LINK_LIBRARIES(saaTelegrams
-#  svcPdmClient  # Externe Dependency - nicht verfügbar
+  svcPdmClient  # qt5 parity: brings the RTI platform defines (RTI_LINUX etc.)
   Qt6::Core
   ${Qt6_WebSockets}
 )

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.h

@@ -34,7 +34,6 @@ public:
   std::shared_ptr<AssetManagement::Interface::Ftc> getFtc() { return m_ftcAsm; }
   void modifyAssetAdlerProperties(int assetId, bool isSaaConnected = false);
 private:
-  NGL::INGLLogger &m_logger;
   void onAssetModifyReply(const Core::FunctionReplyObject &reply) override;
 
 private:

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.h

@@ -41,7 +41,6 @@ class FlmHandler
   void initHQFolders(int partyId);
 
   private:
-  NGL::INGLLogger &m_logger;
   void onFileContentModifyReply(const Core::FunctionReplyObject &reply) override;
   void onPathCreateReply(const Core::FunctionReplyObject &reply) override;
   void onCreateNotificationReply(const Core::FunctionReplyObject &replyObject) override final;

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/generatetelegrams.cpp

@@ -489,7 +489,7 @@ void GenerateTelegrams::generateStellungsmeldungFS(AdlerJson::ExFeuerstellungFS
   req.feuerstellungsdaten.status = ProjectDataManagement::L28_Status::Einsatzbereit;
   req.feuerstellungsdaten.feuereinheit.verein = QStringLiteral("verein ExFeuerstellungFS");
   req.feuerstellungsdaten.feuereinheit.r = 5;
-  req.feuerstellungsdaten.feuereinheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3;
+  req.feuerstellungsdaten.feuereinheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_F3;
   req.feuerstellungsdaten.mittelpunkt.koordinate.latitude = 53.37791;
   req.feuerstellungsdaten.mittelpunkt.koordinate.longitude = 8.759;
   req.feuerstellungsdaten.mittelpunkt.hoehe = 20;
@@ -526,7 +526,7 @@ void GenerateTelegrams::generateStellungsmeldungWS(AdlerJson::ExFeuerstellungWS
   req.waffensystemdaten.status = ProjectDataManagement::L28_Status::Einsatzbereit;
   req.waffensystemdaten.einheit.verein = QStringLiteral("AB7X");
   req.waffensystemdaten.einheit.r = 6;
-  req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F6;
+  req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_F6;
 
   AdlerJson::Geschoss geschoss1;
   AdlerJson::Geschoss geschoss2;
@@ -558,7 +558,7 @@ void GenerateTelegrams::generateStellungsmeldungWS_Gmlrs(AdlerJson::ExFeuerstell
   req.waffensystemdaten.status = ProjectDataManagement::L28_Status::NichtEinsatzbereit;
   req.waffensystemdaten.einheit.verein = QStringLiteral("AB13X");
   req.waffensystemdaten.einheit.r =  6;
-  req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F6;
+  req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_F6;
 
   AdlerJson::Geschoss geschoss1;
   AdlerJson::Geschoss geschoss2;
@@ -591,7 +591,7 @@ void GenerateTelegrams::generateStellungsmeldungWS_Dm72(AdlerJson::ExFeuerstellu
   req.waffensystemdaten.status = ProjectDataManagement::L28_Status::NichtEinsatzbereit;
   req.waffensystemdaten.einheit.verein = QStringLiteral("AB72X");
   req.waffensystemdaten.einheit.r =  1;
-  req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F1;
+  req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_F1;
 
   AdlerJson::Geschoss geschoss1;
   AdlerJson::Geschoss geschoss2;
@@ -622,7 +622,7 @@ void GenerateTelegrams::generateStellungsmeldungLP(AdlerJson::ExFeuerstellungLP
 {
   req.ladeplatzdaten.einheit.r = 5;
   req.ladeplatzdaten.einheit.verein = QStringLiteral("verein StellungsmeldungLP");
-  req.ladeplatzdaten.einheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3;
+  req.ladeplatzdaten.einheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_F3;
 
   req.ladeplatzdaten.koordinate.koordinate.latitude = 53.37791;
   req.ladeplatzdaten.koordinate.koordinate.longitude = 8.759;
@@ -644,7 +644,7 @@ void GenerateTelegrams::generateStellungsmeldungLP(AdlerJson::ExFeuerstellungLP
 
 void GenerateTelegrams::generateStellungswechsel(AdlerJson::ExStellungswechsel &req)
 {
-  req.stellungswechseldaten.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3;
+  req.stellungswechseldaten.oi = ProjectDataManagement::L19_Oi::L19_Oi_F3;
   req.stellungswechseldaten.r = 5;
   req.stellungswechseldaten.verein = QStringLiteral("verein ExStellungswechsel");
 }

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.h

@@ -65,7 +65,6 @@ private slots:
   void onDynamicParticipantDataChanged(const ParticipantManagement::DynamicParticipantData &data, DataModification modType);
   void onSendParticipantDataTimeout();
 private:
-  NGL::INGLLogger &m_logger;
   void handleParticipantPositionChangedExternal(const ParticipantManagement::ParticipantPosition &position);
   void handleParticipantPositionChangedInternal(const ParticipantManagement::ParticipantPosition &position);
 

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.h

@@ -750,15 +750,15 @@ struct SAATELEGRAMS_EXPORT Treffpunkt
 // EX-L49 Wirkmittel Feuerkommando Rakete
 struct SAATELEGRAMS_EXPORT WirkmittelFeuerkommandoRakete
 {
-  ProjectDataManagement::L27_EffectorId kenner {ProjectDataManagement::L27_EffectorId_def::get_default()}; // EX-L27
+  ProjectDataManagement::L27_EffectorId kenner {ProjectDataManagement::L27_EffectorId::A}; // EX-L27
   QVector<Treffpunkt> treffpunkte;
   double flugzeit {0.0};
   int gipfelhoehe {0};
   double schussrichtung {0.0};
   int fallwinkel {0};
-  ProjectDataManagement::L48_TrajectoryRocket anflug {ProjectDataManagement::L48_TrajectoryRocket_def::get_default()};
+  ProjectDataManagement::L48_TrajectoryRocket anflug {ProjectDataManagement::L48_TrajectoryRocket::Nominal};
   FeuerkommandoGeschosse geschoss;
-  ProjectDataManagement::L46_GpsFrequency gps {ProjectDataManagement::L46_GpsFrequency_def::get_default()};
+  ProjectDataManagement::L46_GpsFrequency gps {ProjectDataManagement::L46_GpsFrequency::L1};
   int wirkzeit {-1};
 };
 
@@ -1442,17 +1442,17 @@ const QMap<QString, ProjectDataManagement::L7_Request> ForderungMap = {
 
 // EX-L19 Orts ID
 const QMap<QString, ProjectDataManagement::L19_Oi> ortsIdMap = {
-    {QStringLiteral("Empty"), ProjectDataManagement::L19_Oi::Empty}, // Orts ID nicht gesetzt
+    {QStringLiteral("Empty"), ProjectDataManagement::L19_Oi::L19_Oi_Empty}, // Orts ID nicht gesetzt
-    {QStringLiteral("F1"), ProjectDataManagement::L19_Oi::F1},       //  1. Feuerstellung
+    {QStringLiteral("F1"), ProjectDataManagement::L19_Oi::L19_Oi_F1},       //  1. Feuerstellung
-    {QStringLiteral("F2"), ProjectDataManagement::L19_Oi::F2},       // 2. Feuerstellung
+    {QStringLiteral("F2"), ProjectDataManagement::L19_Oi::L19_Oi_F2},       // 2. Feuerstellung
-    {QStringLiteral("F3"), ProjectDataManagement::L19_Oi::F3},       //  3. Feuerstellung
+    {QStringLiteral("F3"), ProjectDataManagement::L19_Oi::L19_Oi_F3},       //  3. Feuerstellung
-    {QStringLiteral("F4"), ProjectDataManagement::L19_Oi::F4},       //  4. Feuerstellung
+    {QStringLiteral("F4"), ProjectDataManagement::L19_Oi::L19_Oi_F4},       //  4. Feuerstellung
-    {QStringLiteral("F5"), ProjectDataManagement::L19_Oi::F5},       //  5. Feuerstellung
+    {QStringLiteral("F5"), ProjectDataManagement::L19_Oi::L19_Oi_F5},       //  5. Feuerstellung
-    {QStringLiteral("F6"), ProjectDataManagement::L19_Oi::F6},       //  6. Feuerstellung
+    {QStringLiteral("F6"), ProjectDataManagement::L19_Oi::L19_Oi_F6},       //  6. Feuerstellung
-    {QStringLiteral("F7"), ProjectDataManagement::L19_Oi::F7},       //  7. Feuerstellung
+    {QStringLiteral("F7"), ProjectDataManagement::L19_Oi::L19_Oi_F7},       //  7. Feuerstellung
-    {QStringLiteral("F8"), ProjectDataManagement::L19_Oi::F8},       //  8. Feuerstellung
+    {QStringLiteral("F8"), ProjectDataManagement::L19_Oi::L19_Oi_F8},       //  8. Feuerstellung
-    {QStringLiteral("F9"), ProjectDataManagement::L19_Oi::F9},       //  9. Feuerstellung
+    {QStringLiteral("F9"), ProjectDataManagement::L19_Oi::L19_Oi_F9},       //  9. Feuerstellung
-    {QStringLiteral("L"), ProjectDataManagement::L19_Oi::L}          //  Ladeplatz
+    {QStringLiteral("L"), ProjectDataManagement::L19_Oi::L19_Oi_L}          //  Ladeplatz
 };
 
 // EX-20 TargetType -> pdm_target_type
@@ -1460,11 +1460,11 @@ const QMap<QString, ProjectDataManagement::L19_Oi> ortsIdMap = {
 
 // EX-L22 Feuer HALT Kategorie
 const QMap<QString, ProjectDataManagement::L22_FireHaltCategory> feuerHaltKategorieMap = {
-    {QStringLiteral("A"), ProjectDataManagement::L22_FireHaltCategory::A}, //   Feuer HALT Allgemein
+    {QStringLiteral("A"), ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_A}, //   Feuer HALT Allgemein
-    {QStringLiteral("R"), ProjectDataManagement::L22_FireHaltCategory::R}, //  Feuer HALT Referenziert
+    {QStringLiteral("R"), ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_R}, //  Feuer HALT Referenziert
-    {QStringLiteral("E"), ProjectDataManagement::L22_FireHaltCategory::E}, //  Feuer Einstellen
+    {QStringLiteral("E"), ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_E}, //  Feuer Einstellen
-    {QStringLiteral("C"), ProjectDataManagement::L22_FireHaltCategory::C}, //  Aufheben Feuer HALT Allgemein
+    {QStringLiteral("C"), ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_C}, //  Aufheben Feuer HALT Allgemein
-    {QStringLiteral("F"), ProjectDataManagement::L22_FireHaltCategory::F}, //  Aufheben Feuer HALT Referenziert
+    {QStringLiteral("F"), ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_F}, //  Aufheben Feuer HALT Referenziert
 };
 
 // EX-L24 HQ(G) Art

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_rx.h

@@ -31,7 +31,6 @@ public:
 Q_SIGNALS:
   void participantConnectionState(int equipmentNumber, bool dataCommunicationPossible);
 private:
-  NGL::INGLLogger &m_logger;
   template<typename T>
   void rxData(const T &data);
 

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_tx.h

@@ -74,7 +74,6 @@ public slots:
   void onGenericTelegram(const QJsonObject &telegram);
 
 private:
-  NGL::INGLLogger &m_logger;
   bool sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data, bool bForce = false);
 private:
   NGL::INGLLogger &m_logger;

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_cleaner.h

@@ -35,7 +35,6 @@ public:
 public Q_SLOTS:
   void onTimeout();
 private:
-  NGL::INGLLogger &m_logger;
   void doCleanup();
 private:
   NGL::INGLLogger &m_logger;

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_rx.h

@@ -24,7 +24,6 @@ public:
 Q_SIGNALS:
   void participantConnectionState(int equipmentNumber, bool dataCommunicationPossible);
 private:
-  NGL::INGLLogger &m_logger;
   template<typename T>
   void rxData(const T &data);
 private:

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_tx.h

@@ -73,7 +73,6 @@ public:
 public Q_SLOTS:
   void onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible);
 private:
-  NGL::INGLLogger &m_logger;
   bool sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data, bool bForce = false);
 private:
   NGL::INGLLogger &m_logger;

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_from_json.h

@@ -16,7 +16,6 @@ public:
   virtual ~ConvertFromJson() = default;
 
 protected:
-  NGL::INGLLogger &m_logger;
   bool handleTelegram(const QByteArray &baJson, int &recvCounter);
   virtual void handleAcknowledge(qint64 timeStamp, int counter) = 0;
   virtual void handleTetraConnectionChanged(bool bConnected) = 0;

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_to_json.h

@@ -72,7 +72,6 @@ public:
 Q_SIGNALS:
   void outgoingMessage(const QByteArray &msg);
 protected:
-  NGL::INGLLogger &m_logger;
 protected:
   NGL::INGLLogger &m_logger;
   int m_sendCounter;

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_handler_tx.h

@@ -64,7 +64,6 @@ public:
   bool txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data) override;
   bool txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data) override;
 private:
-  NGL::INGLLogger &m_logger;
   template <typename T>
   bool sendToTxMixin(const T *data);
 private:

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_tx.h

@@ -67,7 +67,6 @@ public:
 Q_SIGNALS:
   void outgoingMessage(const QByteArray &msg);
 protected:
-  NGL::INGLLogger &m_logger;
 protected:
   NGL::INGLLogger &m_logger;
   int m_sendCounter = 1;

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_rx.h

@@ -27,7 +27,6 @@ public:
 Q_SIGNALS:
   void participantConnectionState(int equipmentNumber, bool dataCommunicationPossible);
 private:
-  NGL::INGLLogger &m_logger;
   void sfmData(const TrainingAreaBase::TetraIcd::WlsBinarySfmData &data);
 
   template<typename T>

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_tx.h

@@ -68,7 +68,6 @@ public:
 public Q_SLOTS:
   void onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible);
 private:
-  NGL::INGLLogger &m_logger;
   template <typename T>
   bool sendToTxBinary(const T *data);
   bool sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data,

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.h

@@ -54,7 +54,6 @@ private Q_SLOTS:
   void onMainFootprintChanged(const InfrastructureManagement::MainFootprint &data, DataModification modType);
 
 private:
-  NGL::INGLLogger &m_logger;
   void rotateBuildingFootprint(int mseId);
   void removeOpsDataByStructureElementId(int structureElementId);
   void removeOpsAsset(int assetId);

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.h

@@ -65,7 +65,6 @@ public:
   bool isInTrainingArea(const TetraIcd::RelativePosition &relPos) const;
 
 private:
-  NGL::INGLLogger &m_logger;
   bool initCoordinateConversion() const;
 
 private:

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.h

@@ -156,7 +156,6 @@ public:
   void onSendExConfirmationReportRequest(const rti::core::SampleIdentity &cookie, const SendExConfirmationReportRequest &request) override;
 
 private:
-  NGL::INGLLogger &m_logger;
   static Core::FunctionReplyObject fillFro(int participantId, bool bSuccess);
   int calculateRemainEffectTasCode(int chargeTypeIdBase, int remainEffectPercent) const;
   uint32_t getVulnerabilityVitalityIndexFromVitalityAndVba(uint32_t vulnerabilityKind, uint32_t vitality);

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.h

@@ -66,7 +66,6 @@ public:
   void rxData(const TetraIcd::UAVMissionStatus &inData) override;
 
 private:
-  NGL::INGLLogger &m_logger;
   template <typename T>
   bool setPosition(T &data,
                    const TetraIcd::AbsolutePosition &geoPos,

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp

@@ -733,9 +733,9 @@ bool get(const QJsonObject &obj, const QString &key, ParticipantModeBase::Intern
   get(obj, key, iVal, bOptional);
   switch (static_cast<ParticipantModeBase::InternationalMode>(iVal))
   {
-  case ParticipantModeBase::InternationalMode::InternationalMode_NoChange:
+  case ParticipantModeBase::InternationalMode::NoChange:
-  case ParticipantModeBase::InternationalMode::InternationalMode_On:
+  case ParticipantModeBase::InternationalMode::On:
-  case ParticipantModeBase::InternationalMode::InternationalMode_Off:
+  case ParticipantModeBase::InternationalMode::Off:
     val = static_cast<ParticipantModeBase::InternationalMode>(iVal);
     return true;
   }

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.h

@@ -1863,7 +1863,7 @@ struct ParticipantModeBase
     NoChange = 0,
     Off = 1,
     On = 2
-  } internationalMode = InternationalMode::InternationalMode_NoChange;
+  } internationalMode = InternationalMode::NoChange;
 
   enum class ABCProtectionMode
   {

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.h

@@ -40,7 +40,6 @@ signals:
   void disconnectedFromEq();
 
 private:
-  NGL::INGLLogger &m_logger;
   void initCanSocket();
   void newDataAvailable(const QByteArray &);
   bool findNextSyncByte(int &iCurReadPos) const;

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/logger.h

@@ -10,7 +10,7 @@ namespace TrainingAreaBaseOC
 {
 using LOGGER_T = NGL::INGLLogger&;
 
-TABOC_COMMON_EXPORT LOGGER_T getLogger(const char *name);
+SVCTABOCCOMMON_EXPORT LOGGER_T getLogger(const char *name);
 inline LOGGER_T getLogger(const QString &loggerName)
 {
   return getLogger(loggerName.toUtf8().constData());