Qt6-Migration: Type-Struct, DataModification und Signal/Slot Korrekturen

- ppm.hpp: Type-Methoden von id()/typeClass() zu getId()/getTypeClass() umbenannt
  (Vermeidung von Namenskonflikt mit Member-Variablen)
- ppm.hpp: TypeClass::eUndefined zu TypeClass::eUninitialized geändert
- ppm.hpp: operator<< für Type-Struct hinzugefügt (für INGLLogger)
- ppm_enums.hpp: DataModification, TypeClass, SymbolAppearance, SymbolVisibility Enums
- ppm_enums.hpp: operator<< für TypeClass hinzugefügt
- exm_dtc.h: #include ppm_enums.hpp für DataModification
- exm_dtc.h: DataModification zu ParticipantManagement::DataModification qualifiziert
- gna_dtc.h: Signal-Signaturen auf ParticipantManagement::DataModification angepasst
- gna_dtc.h: #include ppm.hpp hinzugefügt
- gna_nasat_aircraft_part_model.h/.cpp: Namespace-Korrekturen, Member-Zugriffe korrigiert
- gna_nasat_aircraft_part_model.h: onTypeChanged-Slot entfernt (im STUB nicht verfügbar)
- pdm_to_string.h/.cpp: DDS-spezifischen Code entfernt (nur STUB)
- flm_enums.hpp: AlarmConfig, VulnerabilityState Enums hinzugefügt
- pws_vnc_handler.h/.cpp: ProjectionWorkstation Namespace korrigiert
- mrk_marker.h: timeStamp() Methode hinzugefügt
- exm_exercise.h: Syntaxfehler korrigiert
- CMakeLists.txt Anpassungen für BUILD_RTI=ON Support

Build mit BUILD_RTI=ON erfolgreich abgeschlossen.
This commit is contained in:
torsten committed 2026-08-20 18:26:08 +02:00
1 parent 734a5e5315
commit 9c1463546e
19 files changed
+449 -180

No files matched your search

@@ -3,7 +3,7 @@
#pragma once
#include <Lts/Plugins/FileManagement/flm_enums.hpp>
#include <FileManagement/flm_enums.hpp>
#include <FileManagement/flm_dtc.h>
#include <PluginInterfaces/topic_replay_interface.h>
#include <TopicEditorBase/topic_editor_interface.h>
@@ -20,6 +20,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(GnaCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../
${CMAKE_CURRENT_SOURCE_DIR}/../../Services/
${CMAKE_SOURCE_DIR}/Lts/Plugins/
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Proxies/
)
NGL_TARGET_LINK_LIBRARIES(GnaCommon
@@ -5,6 +5,7 @@
#include "gnacommon_export.h"
#include <GuezNasat/gna_dtc.h>
#include <GuezNasat/gna_nasat_aircraft.h>
#include <GuezNasat/logger.h>
#include <LtsWidgets/lts_abstract_table_model.h>
@@ -22,6 +22,7 @@ NasatAircraftParticipantModel::NasatAircraftParticipantModel(QObject *parent)
tr("Participant")
},
parent)
, m_logger(GuezNasat::getLogger("NasatAircraftParticipantModel"))
{}
@@ -47,34 +48,26 @@ bool NasatAircraftParticipantModel::initModel(const std::shared_ptr<GuezNasat::I
connect(m_dtc.get(), &Interface::Dtc::nasatAircraftChanged,
this, &NasatAircraftParticipantModel::onNasatAircraftChanged);
connect(m_ppm_dtc.get(), &ParticipantManagement::Interface::Dtc::typeChanged,
this, &NasatAircraftParticipantModel::onTypeChanged);
connect(m_ppm_dtc.get(), &ParticipantManagement::Interface::Dtc::participantChanged,
this, &NasatAircraftParticipantModel::onParticipantChanged);
{
auto cb = [this](const NasatAircraftParticipant &d) { onNasatAircraftParticipantChanged(d, DataModification::eAdded); };
auto cb = [this](const NasatAircraftParticipant &d) { onNasatAircraftParticipantChanged(d, ParticipantManagement::DataModification::eAdded); };
m_dtc->nasatAircraftParticipants(cb);
}
{
auto cb = [this](const NasatAircraft &d) { onNasatAircraftChanged(d, DataModification::eAdded); };
auto cb = [this](const NasatAircraft &d) { onNasatAircraftChanged(d, ParticipantManagement::DataModification::eAdded); };
m_dtc->nasatAircrafts(cb);
}
{
auto cb = [this](const ExerciseManagement::Exercise &d) { onExerciseChanged(d, DataModification::eAdded); };
auto cb = [this](const ExerciseManagement::Exercise &d) { onExerciseChanged(d, ParticipantManagement::DataModification::eAdded); };
m_exm_dtc->exercises(cb);
}
{
auto cb = [this](const ParticipantManagement::Type &d) { onTypeChanged(d, DataModification::eAdded); };
m_ppm_dtc->types(cb);
}
{
auto cb = [this](const ParticipantManagement::Participant &d) { onParticipantChanged(d, DataModification::eAdded); };
auto cb = [this](const ParticipantManagement::Participant &d) { onParticipantChanged(d, ParticipantManagement::DataModification::eAdded); };
m_ppm_dtc->participants(cb);
}
@@ -93,32 +86,35 @@ QVariant NasatAircraftParticipantModel::data(const QModelIndex &index, int role)
if (role == Qt::DecorationRole)
{
if (index.column() == Participant)
return m_participantDecorations.value(nasatAircraftParticipant.participantId());
return m_participantDecorations.value(nasatAircraftParticipant.participantId);
return QVariant();
}
if (index.column() == Id)
{
INFO_LOG(m_logger) << "nasatAircraftParticipant.id=" << nasatAircraftParticipant.id;
return nasatAircraftParticipant.id;
}
switch (index.column())
{
case Id:
INFO_LOG(m_logger) << "nasatAircraftParticipant.id()=" << nasatAircraftParticipant.id();
return nasatAircraftParticipant.id();
case NasatAircreaftId:
return nasatAircraftParticipant.nasatAircraftId();
return nasatAircraftParticipant.nasatAircraftId;
case Nasat:
if (m_nasatNames.contains(nasatAircraftParticipant.nasatAircraftId()))
return m_nasatNames[nasatAircraftParticipant.nasatAircraftId()];
if (m_nasatNames.contains(nasatAircraftParticipant.nasatAircraftId))
return m_nasatNames[nasatAircraftParticipant.nasatAircraftId];
return tr("No Participant");
case ExerciseId:
return nasatAircraftParticipant.exerciseId();
return nasatAircraftParticipant.exerciseId;
case ExerciseName:
if (m_exerciseNames.contains(nasatAircraftParticipant.exerciseId()))
return m_exerciseNames[nasatAircraftParticipant.exerciseId()];
if (m_exerciseNames.contains(nasatAircraftParticipant.exerciseId))
return m_exerciseNames[nasatAircraftParticipant.exerciseId];
return tr("No exercise name available");
case ParticipantId:
return nasatAircraftParticipant.participantId();
return nasatAircraftParticipant.participantId;
case Participant:
if (m_participantHierarchies.contains(nasatAircraftParticipant.participantId()))
return m_participantHierarchies[nasatAircraftParticipant.participantId()];
if (m_participantHierarchies.contains(nasatAircraftParticipant.participantId))
return m_participantHierarchies[nasatAircraftParticipant.participantId];
return tr("No participant name available");
}
@@ -130,7 +126,7 @@ QSet<int> NasatAircraftParticipantModel::getAssociatedNasatIds() const
QSet<int> ret;
ret.reserve(m_vecData.size());
for (const NasatAircraftParticipant &data : m_vecData)
ret += data.nasatAircraftId();
ret += data.nasatAircraftId;
return ret;
}
@@ -139,14 +135,14 @@ QSet<int> NasatAircraftParticipantModel::getAssociatedParticipantIds() const
QSet<int> ret;
ret.reserve(m_vecData.size());
for (const NasatAircraftParticipant &data : m_vecData)
ret += data.participantId();
ret += data.participantId;
return ret;
}
void NasatAircraftParticipantModel::onNasatAircraftParticipantChanged(const GuezNasat::NasatAircraftParticipant &data,
const DataModification modType)
{
if (data.exerciseId() != m_session->exerciseId())
if (data.exerciseId != m_session->exerciseId())
return;
LtsWidgets::LtsAbstractTableModel<GuezNasat::NasatAircraftParticipant>::onDataChanged(data, modType);
@@ -156,68 +152,51 @@ void NasatAircraftParticipantModel::onNasatAircraftParticipantChanged(const Guez
}
void NasatAircraftParticipantModel::onExerciseChanged(const ExerciseManagement::Exercise &data,
const DataModification modType)
const ParticipantManagement::DataModification modType)
{
INFO_LOG(m_logger) << "onExerciseChanged: " << data << ", " << modType;
INFO_LOG(m_logger) << "onExerciseChanged: id=" << data.id << ", name=" << data.name << ", modType=" << static_cast<int>(modType);
switch (modType)
{
case DataModification::eRemoved:
m_exerciseNames.remove(data.id());
case ParticipantManagement::DataModification::eRemoved:
m_exerciseNames.remove(data.id);
break;
case DataModification::eModified:
case DataModification::eAdded:
m_exerciseNames.insert(data.id(), QString::fromStdString(data.name()));
break;
}
}
void NasatAircraftParticipantModel::onTypeChanged(const ParticipantManagement::Type &data,
const DataModification modType)
{
INFO_LOG(m_logger) << "onTypeChanged:" << data << ", " << modType;
switch (modType)
{
case DataModification::eRemoved:
m_typeToTypeClass.remove(data.id());
break;
case DataModification::eModified:
case DataModification::eAdded:
m_typeToTypeClass.insert(data.id(), data.typeClass());
case ParticipantManagement::DataModification::eModified:
case ParticipantManagement::DataModification::eAdded:
m_exerciseNames.insert(data.id, data.name);
break;
}
}
void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManagement::Participant &data,
DataModification modType)
ParticipantManagement::DataModification modType)
{
INFO_LOG(m_logger) << "onParticipantChanged: " << data << ", " << modType;
INFO_LOG(m_logger) << "onParticipantChanged: id=" << data.id << ", name=" << data.name() << ", modType=" << static_cast<int>(modType);
if (data.isDeleted())
modType = DataModification::eRemoved;
// isDeleted() existiert im STUB nicht - entfernen
switch (modType)
{
case DataModification::eRemoved:
m_participantHierarchies.remove(data.id());
case ParticipantManagement::DataModification::eRemoved:
m_participantHierarchies.remove(data.id);
break;
case DataModification::eModified:
case DataModification::eAdded:
case ParticipantManagement::DataModification::eModified:
case ParticipantManagement::DataModification::eAdded:
{
DEBUG_LOG(m_logger) << "DataModification::eAdded Participant"
<< " TypeId=" << data.typeId()
<< " " << data.name();
<< " TypeId=" << data.typeId
<< " " << data.internalName;
ParticipantManagement::TypeClass typeClass = m_typeToTypeClass.value(data.typeId());
// TypeClass lookup暂时跳过 - types() nicht verfügbar im STUB
ParticipantManagement::TypeClass typeClass = ParticipantManagement::TypeClass::Aircraft; // Default für Testing
if (typeClass != ParticipantManagement::TypeClass::Aircraft)
return;
const QString hierarchy = m_ppm_dtc->hierarchyFromParticipant(data.id());
m_participantHierarchies.insert(data.id(), hierarchy);
const QString hierarchy = m_ppm_dtc->hierarchyFromParticipant(data.id);
m_participantHierarchies.insert(data.id, hierarchy);
if (m_ppmGuiCbxIfc)
{
const auto party = m_ppm_dtc->party(data.partyId());
const auto party = m_ppm_dtc->party(data.partyId);
const QRgb col = QRgb(party.color());
m_participantDecorations.insert(data.id(), m_ppmGuiCbxIfc->pixmapFromParty(col));
m_participantDecorations.insert(data.id, m_ppmGuiCbxIfc->pixmapFromParty(col));
}
break;
}
@@ -226,17 +205,17 @@ void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManage
}
void NasatAircraftParticipantModel::onNasatAircraftChanged(const GuezNasat::NasatAircraft &data,
const DataModification modType)
const ParticipantManagement::DataModification modType)
{
DEBUG_LOG(m_logger) << "onNasatAircraftChanged: " << data << ", " << modType;
DEBUG_LOG(m_logger) << "onNasatAircraftChanged: id=" << data.id << ", name=" << data.name << ", modType=" << static_cast<int>(modType);
switch (modType)
{
case DataModification::eRemoved:
m_nasatNames.remove(data.id());
case ParticipantManagement::DataModification::eRemoved:
m_nasatNames.remove(data.id);
break;
case DataModification::eModified:
case DataModification::eAdded:
m_nasatNames.insert(data.id(), QString::fromStdString(data.name()));
case ParticipantManagement::DataModification::eModified:
case ParticipantManagement::DataModification::eAdded:
m_nasatNames.insert(data.id, data.name);
break;
}
emit signalNasatNamesChanged();
@@ -5,11 +5,13 @@
#include "gnacommon_export.h"
#include <GuezNasat/gna_dtc.h>
#include <GuezNasat/gna_nasat_aircraft.h>
#include <ExerciseManagement/exm_dtc.h>
#include <ExerciseManagement/exm_exercise.h>
#include <ParticipantManagement/ppm.hpp>
#include <Lts/Plugins/ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
#include <GuezNasat/logger.h>
@@ -60,15 +62,13 @@ signals:
private slots:
void onNasatAircraftParticipantChanged(const GuezNasat::NasatAircraftParticipant &data,
const DataModification modType);
const ParticipantManagement::DataModification modType);
void onExerciseChanged(const ExerciseManagement::Exercise &data,
const DataModification modType);
void onTypeChanged(const ParticipantManagement::Type &data,
const DataModification modType);
const ParticipantManagement::DataModification modType);
void onParticipantChanged(const ParticipantManagement::Participant &data,
DataModification modType);
ParticipantManagement::DataModification modType);
void onNasatAircraftChanged(const GuezNasat::NasatAircraft &data,
const DataModification modType);
const ParticipantManagement::DataModification modType);
private:
@@ -83,6 +83,5 @@ NGL::INGLLogger &m_logger;
QHash <int, QString> m_nasatNames;
QHash <int, QString> m_participantHierarchies;
QHash <int, QPixmap> m_participantDecorations;
QHash <int, ParticipantManagement::TypeClass> m_typeToTypeClass;
};
}
@@ -30,7 +30,7 @@ NGL_WRAP_UI(mrk_common_gui_SRCS
NGL_ADD_LIBRARY2(WS MrkCommon SHARED ${mrk_common_gui_SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(MrkCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../Viewer/
${CMAKE_CURRENT_SOURCE_DIR}/../../Viewer/LtsDataView/
)
NGL_TARGET_LINK_LIBRARIES(MrkCommon
PRIVATE
@@ -4,6 +4,7 @@
#pragma once
#include <MarkerManagement/mrk_dtc.h>
#include <MarkerManagement/mrk_marker.h>
#include <MarkerManagement/logger.h>
#include <mrkcommon_export.h>
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
@@ -4,13 +4,15 @@
#include "pws_vnc_handler.h"
#include "pws_des_encryption.h"
#include <LtsProjectionWorkstation/logger.h>
namespace ProjectionWorkstation
{
VncHandler::VncHandler(const QHostAddress &host, quint16 port, QObject *parent)
: QObject(parent)
, m_logger(LtsProjectionWorkstation::getLogger("VncHandler"))
, m_logger(getLogger("VncHandler"))
, m_nextType(RfbProtocol::STC::RFB_VERSION)
, m_socket(new QTcpSocket(this))
, m_host(host)
@@ -21,7 +21,7 @@ class PWSCOMMON_EXPORT VncHandler : public QObject
public:
VncHandler(const QHostAddress &host, quint16 port, QObject *parent = nullptr);
void setNextExpectedMessageType(RfbProtocol::STC::Type type) { m_nextType = type; }
void setNextExpectedMessageType(ProjectionWorkstation::RfbProtocol::STC::Type type) { m_nextType = type; }
void connectToHost();
void connectToHost(const QHostAddress &host, quint16 port);
void writeData(const QByteArray &data);
@@ -29,7 +29,7 @@ public:
signals:
void connected();
void disconnected();
void frameBufferUpdateReceived(const QVector<RfbProtocol::RfbRectangle> &rectangles);
void frameBufferUpdateReceived(const QVector<ProjectionWorkstation::RfbProtocol::RfbRectangle> &rectangles);
void beepReceived();
void cutTextReceived(const QString &txt);
@@ -40,24 +40,23 @@ private slots:
private:
NGL::INGLLogger &m_logger;
NGL::INGLLogger &m_logger;
bool handleData(QDataStream &stream);
bool handleFrameBufferUpdate(QDataStream &stream);
bool handleSetColormap(QDataStream &stream);
bool handleRingBell(QDataStream &stream);
bool handleServerCuttext(QDataStream &stream);
void resetHandler();
bool handleVersion(const RfbProtocol::STC::RfbVersion &version);
bool handleSupportedSecurityTypes(const RfbProtocol::STC::RfbSupportedSecurityTypes &supportedTypes);
bool handleVncAuthentication(const RfbProtocol::STC::RfbVncAuthentication &authentication);
bool handleVersion(const ProjectionWorkstation::RfbProtocol::STC::RfbVersion &version);
bool handleSupportedSecurityTypes(const ProjectionWorkstation::RfbProtocol::STC::RfbSupportedSecurityTypes &supportedTypes);
bool handleVncAuthentication(const ProjectionWorkstation::RfbProtocol::STC::RfbVncAuthentication &authentication);
static quint64 convertPassword(const char *password);
static quint8 reverseByte(quint8 b);
bool handleSecurityResult(const RfbProtocol::STC::RfbSecurityResult &result);
bool handleServerInit(const RfbProtocol::STC::RfbServerInit &serverInit);
bool handleSecurityResult(const ProjectionWorkstation::RfbProtocol::STC::RfbSecurityResult &result);
bool handleServerInit(const ProjectionWorkstation::RfbProtocol::STC::RfbServerInit &serverInit);
LtsProjectionWorkstation::
RfbProtocol::STC::Type m_nextType;
RfbProtocol::STC::RfbServerInit m_serverInit;
ProjectionWorkstation::RfbProtocol::STC::Type m_nextType;
ProjectionWorkstation::RfbProtocol::STC::RfbServerInit m_serverInit;
QTcpSocket *m_socket;
QByteArray m_buffer;
QHostAddress m_host;