Moves remaining few files to common subfolders

2026-09-14 08:49:36 +00:00
1 parent 6aa040abb3
commit 290d9c1f5d
@@ -0,0 +1,4 @@
 # export MIGRATE_PIPELINE_ROOT="/home/torsten/sandbox/qt6-migration-pipeline"
 export MIGRATE_PIPELINE_ROOT="Passe Deinen Pfad an."
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
@@ -96,7 +96,7 @@ include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore)
 include_directories(${CMAKE_SOURCE_DIR}/include/Viewer/SituationMap)
 include_directories(${CMAKE_SOURCE_DIR}/include/OperatorManagement)
 include_directories(${CMAKE_SOURCE_DIR}/include/FileManagement)
-include_directories(${CMAKE_SOURCE_DIR}/forward-declarations)
+include_directories(${CMAKE_SOURCE_DIR}/../../../forward-declarations)
 SET(CMAKE_CXX_STANDARD 17)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
@@ -1,20 +0,0 @@
 #pragma once
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Forward-Declarations
 namespace AreaEffectSimulation
 {
 namespace Interface
 {
 class Dtc;
 class Ftc;
 } // namespace Interface
 } // namespace AreaEffectSimulation
 // AES Namespace Alias für Test-Kompatibilität
 namespace AES
 {
 class Dtc;
 class Ftc;
 } // namespace AES
@@ -1,13 +1,18 @@
 #!/bin/bash
 set -e
-# Load environment variables from .envrc if it exists
+# Check if .envrc exists
-if [ -f .envrc ]; then
+if [ ! -f .envrc ]; then
-  set -a
+  echo "ERROR: .envrc not found in current directory"
-  source .envrc
+  echo "Please create .envrc with required environment variables (e.g., MIGRATE_PIPELINE_ROOT)"
-  set +a
+  exit 1
 fi
 # Load environment variables from .envrc
 set -a
 source .envrc
 set +a
 # Run CMake configuration and build inside Docker
 docker run --rm \
  -e MIGRATE_PIPELINE_ROOT \
@@ -1,13 +0,0 @@
 #pragma once
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Forward-Declarations
 namespace DDS
 {
 namespace Interface
 {
 class Dtc;
 class Ftc;
 } // namespace Interface
 } // namespace DDS
@@ -3,120 +3,11 @@
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Forward-Declarations
 #include <functional>
 #include <memory>
 #include <ostream>
 #include <string>
 #include <QtCore/QObject>
 #include "LtsUtils/LtsUtilsCore/data_modification_enum.h"
 namespace AreaEffectSimulation
 {
 // AesItem-Struct (wird normalerweise von DDS generiert)
 struct AesItem
 {
  int32_t id() const { return m_id; }
  const std::string& name() const { return m_name; }
  int32_t m_id = 0;
  std::string m_name;
 };
 inline std::ostream& operator<<(std::ostream& os, const AesItem& item)
 {
    os << "AesItem{id=" << item.id() << ", name=" << item.name() << "}";
    return os;
 }
 // BCContamination-Struct (wird normalerweise von DDS generiert)
 struct BCContamination : public AesItem
 {
 };
 // BoobyTrap-Struct (wird normalerweise von DDS generiert)
 struct BoobyTrap : public AesItem
 {
 };
 // OffRouteMine-Struct (wird normalerweise von DDS generiert)
 struct OffRouteMine : public AesItem
 {
 };
 namespace Interface
 {
-
+class Dtc;
 // Dtc - Data Transfer Component für Area Effect Simulation
 // DDS-generierte Klasse mit Signals für AES-Item-Änderungen
 class Dtc : public QObject {
  Q_OBJECT
 public:
  Dtc() = default;
  ~Dtc() override = default;
  // Callback registration for AES item changes
  void bcContaminations(std::function<void(const BCContamination&)> callback) {
    m_bcCallback = callback;
  }
  void boobyTraps(std::function<void(const BoobyTrap&)> callback) {
    m_boobyTrapCallback = callback;
  }
  void offRouteMines(std::function<void(const OffRouteMine&)> callback) {
    m_offRouteMineCallback = callback;
  }
  void aesItems(std::function<void(const AesItem&)> callback) {
    m_aesCallback = callback;
  }
  // Trigger methods for STUB testing
  void triggerBCContaminationChanged(const BCContamination& item, DataModification modType) {
    emit bcContaminationChanged(item, modType);
    if (m_bcCallback) {
      m_bcCallback(item);
    }
  }
  void triggerBoobyTrapChanged(const BoobyTrap& item, DataModification modType) {
    emit boobyTrapChanged(item, modType);
    if (m_boobyTrapCallback) {
      m_boobyTrapCallback(item);
    }
  }
  void triggerOffRouteMineChanged(const OffRouteMine& item, DataModification modType) {
    emit offRouteMineChanged(item, modType);
    if (m_offRouteMineCallback) {
      m_offRouteMineCallback(item);
    }
  }
  void triggerAesItemChanged(const AesItem& item, DataModification modType) {
    emit aesItemChanged(item, modType);
    if (m_aesCallback) {
      m_aesCallback(item);
    }
  }
 signals:
  void bcContaminationChanged(const BCContamination& item, DataModification modType);
  void boobyTrapChanged(const BoobyTrap& item, DataModification modType);
  void offRouteMineChanged(const OffRouteMine& item, DataModification modType);
  void aesItemChanged(const AesItem& item, DataModification modType);
 private:
  std::function<void(const BCContamination&)> m_bcCallback;
  std::function<void(const BoobyTrap&)> m_boobyTrapCallback;
  std::function<void(const OffRouteMine&)> m_offRouteMineCallback;
  std::function<void(const AesItem&)> m_aesCallback;
 };
 class Ftc;
 } // namespace Interface
 } // namespace AreaEffectSimulation
@@ -1,101 +1,20 @@
 /**
  * @RDE_HEADER@
  * DTC TypeDefinitions
  * $Id$
  * $HeadURL$
  * $Author$
  */
 #pragma once
-#include <functional>
+// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-#include <string>
+// Für die Migration erstellen wir minimale Forward-Declarations
 #include <LtsUtilsCore/data_modification_enum.h>
-#ifdef BUILD_RTI
+namespace DDS
 // Use actual RTI Connext DDS types
 #include <dds/sub/LoanedSamples.hpp>
 #include <dds/sub/SampleInfo.hpp>
 // DataModification enum is provided by LtsUtilsCore/data_modification_enum.h (included above)
 #else
 // Stub für BUILD_RTI=OFF - keine RTI Connext DDS Verfügbarkeit
 // Diese Header ermöglicht Kompilierung ohne RTI DDS Dependencies
 // DataModification enum is still provided by LtsUtilsCore/data_modification_enum.h
 // Forward declarations für DDS-Typen (Stubs)
 namespace dds {
 namespace sub {
  template<typename T>
  struct LoanedSamples {
    // Minimaler Stub - keine Implementierung für BUILD_RTI=OFF
  };
  struct SampleInfo {
    // Minimaler Stub - keine Implementierung für BUILD_RTI=OFF
  };
 }
 }
 #endif
 namespace NGLLogger
 {
 class INGLLogger;
 }
 namespace DTC
 {
-class SubscriberListener;
+class Dtc;
 class Ftc;
 } // namespace DTC
 } // namespace DDS
-// DataModification Enum is provided by LtsUtilsCore/data_modification_enum.h
+// Generic Namespace für generische DDS-Typen
-// Do NOT redefine here - use the one from LtsUtilsCore
+namespace Generic
 // uses DRO (static)
 template <typename DRO_OBJECT, typename SC>
 class GenericDtcSC
 {
-public:
+class Dtc;
-  using DataReaderObject   = DRO_OBJECT;
+class Ftc;
-  using SubscriberCallback = SC;
+} // namespace Generic
  using TopicType          = typename DRO_OBJECT::TopicType;
  GenericDtcSC() = default;
  virtual ~GenericDtcSC() = default;
  virtual bool setSubscriberCallback(const SubscriberCallback &subscriberCallback) = 0;
  virtual dds::sub::LoanedSamples<TopicType> readAlive() const = 0;
  virtual dds::sub::LoanedSamples<TopicType> takeAlive() const = 0;
  virtual dds::sub::LoanedSamples<TopicType> takeDisposed() const = 0;
  virtual bool hasSamples() const = 0;
  virtual DataReaderObject *dataReader() const = 0;
  virtual bool waitForHistoricalData(int timeoutMSec) = 0;
 };
 // Typed topic callback (DataReader)
 template<typename DRO_OBJECT>
 class GenericDtc
    : public GenericDtcSC<DRO_OBJECT,
    std::function<void(const typename DRO_OBJECT::TopicType &, DataModification)> >
 {};
 // Typed topic callback (DataReader) with SampleInfo
 template<typename DRO_OBJECT>
 class GenericDtcSampleInfo
    : public GenericDtcSC<DRO_OBJECT,
    std::function<void(const typename DRO_OBJECT::TopicType &, const dds::sub::SampleInfo &)> >
 {};
 // Dynamic topic callback (DynamicDataReader)
 template<typename DRO_OBJECT>
 class Ddtc
    : public GenericDtcSC<DRO_OBJECT,
    std::function<void(const typename DRO_OBJECT::TopicType &, const std::string &, DataModification)> >
 {};
 // Dynamic topic callback (DynamicDataReader) with SampleInfo
 template<typename DRO_OBJECT>
 class DdtcSampleInfo
    : public GenericDtcSC<DRO_OBJECT,
    std::function<void(const typename DRO_OBJECT::TopicType &, const std::string &, const dds::sub::SampleInfo &)> >
 {};
 }
@@ -5,9 +5,16 @@
 namespace DDS
 {
-namespace Interface
+namespace DTC
 {
 class Dtc;
 class Ftc;
-} // namespace Interface
+} // namespace DTC
 } // namespace DDS
 // Generic Namespace für generische DDS-Typen
 namespace Generic
 {
 class Dtc;
 class Ftc;
 } // namespace Generic
@@ -1,13 +0,0 @@
 #pragma once
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Forward-Declarations
 namespace TrainingAreaBaseOC
 {
 namespace Interface
 {
 class Dtc;
 class Ftc;
 } // namespace Interface
 } // namespace TrainingAreaBaseOC
@@ -1,13 +0,0 @@
 #pragma once
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Forward-Declarations
 namespace DDS
 {
 namespace Interface
 {
 class Dtc;
 class Ftc;
 } // namespace Interface
 } // namespace DDS
@@ -0,0 +1,34 @@
 /**
 * Operator Rights definitions
 */
 // warning: this file is generated with command
 // Lts/Common/CodeGen/codegen_simple.py ALL Lts/Services/ProjectDataManagement/pdm_service.xml build/Lts/Services/ProjectDataManagement/
 // at Sun Sep  6 18:00:15 2026
 // it will be overwritten by next run - do not modify!
 #pragma once
 namespace ProjectDataManagement 
 {
  static const int Offset = 29; 
 }
 namespace OperatorRights
 {
 enum Charges
 {
  ChargeVisibilityEdit = 0x1d010001,
 };
 enum Groups_ProjectDataManagement
 {
  GroupChargeVisibility = 0x1d010000,
 };
 enum Plugins_ProjectDataManagement
 {
  PluginCharges = 0x1d010000,
 };
 }  // namespace OperatorRights
@@ -1,24 +0,0 @@
 /**
 * Operator Rights (source) definitions
 */
 // warning: this file is generated with command
 // Lts/Common/CodeGen/codegen_simple.py ALL Lts/Services/ProjectDataManagement/pdm_service.xml build/Lts/Services/ProjectDataManagement/
 // at Sun Sep  6 18:00:15 2026
 // it will be overwritten by next run - do not modify!
 #include "pdm_operator_rights.h"
 #include <QCoreApplication>
 void doNothing()
 {
  const char * txt[] {
  QT_TRANSLATE_NOOP("OperatorRights", "Charge Visibility"),
  QT_TRANSLATE_NOOP("OperatorRights", "Charge Visibility"),
  QT_TRANSLATE_NOOP("OperatorRights", "Edit Charge Visibility"),
  };
  Q_UNUSED(txt);
 }
@@ -1,13 +0,0 @@
 #pragma once
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Forward-Declarations
 namespace TrainingAreaBaseOC
 {
 namespace Interface
 {
 class Dtc;
 class Ftc;
 } // namespace Interface
 } // namespace TrainingAreaBaseOC