BUILD_RTI conditional fixes and Qt6 API updates
- cmake/FindRTI.cmake: Add INTERFACE placeholder targets when RTI not found - cmake/FindRTI.cmake: Force BUILD_RTI=OFF when RTI not installed - Lts/Common/LtsSession/CMakeLists.txt: Make LtsSessionDataDds conditional on BUILD_RTI - Lts/Viewer/CMakeLists.txt: Make LtsDataView conditional on BUILD_RTI - Lts/Plugins/*/CMakeLists.txt: 97 plugin files wrapped in BUILD_RTI conditionals - cmake/NGLMacros.cmake: Fix NGL_ADD_BIG_RESOURCES macro (removed premature return()) - Multiple Qt6 API fixes: QLinkedList→std::list, QStringRef→QStringView, etc. - BUILD_RTI_FIXES_SUMMARY.md: Comprehensive documentation of all fixes Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2065 files changed
+48219
-1763
No files matched your search
@@ -2,8 +2,11 @@
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von DDS generiert
|
||||
// Für die Migration erstellen wir minimale Typ-Definitionen
|
||||
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QList>
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
@@ -29,6 +32,7 @@ struct Participant {
|
||||
QString externalName;
|
||||
int partyId = 0;
|
||||
bool isVerbund = false;
|
||||
int superiorId = 0;
|
||||
|
||||
// Additional fields as needed
|
||||
double x = 0.0;
|
||||
@@ -73,27 +77,39 @@ struct MainSchedule {
|
||||
bool isActive = false;
|
||||
};
|
||||
|
||||
namespace Interface
|
||||
{
|
||||
|
||||
// Dtc - Data Transfer Component für Participant Management
|
||||
// DDS-generierte Klasse mit participantChanged Signal
|
||||
class Dtc {
|
||||
class Dtc : public QObject {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
Dtc() = default;
|
||||
virtual ~Dtc() = default;
|
||||
~Dtc() override = default;
|
||||
|
||||
// Teilnehmer-Liste abrufen
|
||||
QList<Participant> participants() const { return m_participants; }
|
||||
// Teilnehmer-Liste abrufen (Callback-basiert wie im Original)
|
||||
void participants(const std::function<void(const Participant&)>& callback) const {
|
||||
for (const auto& p : m_participants) {
|
||||
callback(p);
|
||||
}
|
||||
}
|
||||
|
||||
// Teilnehmer-Liste als QList (für direkten Zugriff)
|
||||
QList<Participant> participantsList() const { return m_participants; }
|
||||
|
||||
// Teilnehmer hinzufügen/entfernen/ändern
|
||||
void addParticipant(const Participant& p) {
|
||||
m_participants.append(p);
|
||||
emit participantChanged(p, static_cast<int>(DataModification::eAdded));
|
||||
emit participantChanged(p, DataModification::eAdded);
|
||||
}
|
||||
|
||||
void updateParticipant(const Participant& p) {
|
||||
for (auto& existing : m_participants) {
|
||||
if (existing.id == p.id) {
|
||||
existing = p;
|
||||
emit participantChanged(p, static_cast<int>(DataModification::eModified));
|
||||
emit participantChanged(p, DataModification::eModified);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -105,17 +121,20 @@ public:
|
||||
if (it->id == id) {
|
||||
Participant removed = *it;
|
||||
m_participants.erase(it);
|
||||
emit participantChanged(removed, static_cast<int>(DataModification::eRemoved));
|
||||
emit participantChanged(removed, DataModification::eRemoved);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Signal für Teilnehmer-Änderungen (Qt6: als normale Methode, wird von Connects verwendet)
|
||||
void emit participantChanged(const Participant& participant, int modificationType);
|
||||
signals:
|
||||
// Signal für Teilnehmer-Änderungen
|
||||
void participantChanged(const Participant& participant, DataModification modificationType);
|
||||
|
||||
private:
|
||||
QList<Participant> m_participants;
|
||||
};
|
||||
|
||||
} // namespace Interface
|
||||
|
||||
} // namespace ParticipantManagement
|
||||
@@ -1,12 +0,0 @@
|
||||
#pragma once
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
|
||||
// Für die Migration erstellen wir minimale Forward-Declarations
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
namespace Interface
|
||||
{
|
||||
class Dtc;
|
||||
class Ftc;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
#pragma once
|
||||
|
||||
// DDS-Stub-Header für ParticipantManagement FTC (Filter Topic Client)
|
||||
// Generiert für Qt6-Migration ohne RTI DDS
|
||||
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <Core/core_types.h>
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
#include <map>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
namespace Interface
|
||||
{
|
||||
|
||||
class Ftc
|
||||
{
|
||||
public:
|
||||
class ModifyTypeReplyHandler
|
||||
{
|
||||
public:
|
||||
virtual ~ModifyTypeReplyHandler() = default;
|
||||
virtual void onModifyTypeReply(const Core::FunctionReplyObject &replyObject) = 0;
|
||||
};
|
||||
|
||||
Ftc() = default;
|
||||
virtual ~Ftc() = default;
|
||||
|
||||
virtual std::map<int32_t, Type> getTypes() const
|
||||
{
|
||||
return std::map<int32_t, Type>();
|
||||
}
|
||||
|
||||
virtual Type type(int32_t typeId) const
|
||||
{
|
||||
Type t;
|
||||
t.id = typeId;
|
||||
return t;
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace Interface
|
||||
} // namespace ParticipantManagement
|
||||
Reference in new issue
Block a user