lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung
- 44 Export-Header Include-Pfade korrigiert (_export.h)
- 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h)
- INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros
- Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits)
- FATAL_LOG Makro hinzugefügt
- InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h)
- FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h)
- AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp)
- SymbolAppearance Klasse vollständig definiert mit content() Methode
- BuildingComponentFilter Klasse definiert mit Copy-Konstruktor
- Ftc Factory: nullptr Return (abstract class)
- AesFilter Klasse in aes.hpp hinzugefügt
- Dtc Klasse in ppm.hpp mit participantChanged Signal
- AesType Enum: alle 15 At* Werte definiert
- AesEffectState_def: EsReceived hinzugefügt
- DataModification Enum: eAdded/eModified/eRemoved
- function_reply_object.h → core_types.h Include-Pfad (72 Dateien)
- Enum-Class-Streaming Template-Operator in INGLLogger.h
- ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen
- ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge
- QRegExp → QRegularExpression in tpm_js_parser.cpp
- .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert
- Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.cpp
+13 -14
View File
@@ -19,14 +19,13 @@ HandlerTargetConfig::HandlerTargetConfig(const std::shared_ptr<DdsHandler> &ddsH
, m_ddsHandler(ddsHandler)
, m_dtcTab(ddsHandler->dtcTab())
, m_dtsTgt(ddsHandler->dtsTgt())
, m_logger(getLogger("HandlerTargetConfig"))
{
} // end of ctor()
//-----------------------------------------------------------------------------
bool HandlerTargetConfig::init()
{
INFO_LOG(m_logger) << "init";
INFO_LOG() << "init";
connect(m_dtcTab.get(), &TrainingAreaBase::Interface::Dtc::targetDataChanged,
this, &HandlerTargetConfig::onTargetDataChanged);
@@ -41,10 +40,10 @@ void HandlerTargetConfig::onTargetDataChanged(const TrainingAreaBase::TargetData
uint8_t responseCmd = 100;
TargetManagement::TargetConfig tgtTargetData;
INFO_LOG(m_logger) << "onTargetDataChanged payload.size=" << targetData.payload().size();
INFO_LOG() << "onTargetDataChanged payload.size=" << targetData.payload().size();
tgtTargetData.participantId(m_ddsHandler->equipNo2participantId(targetData.equipmentNumber()));
for (size_t i = 0; i < targetData.payload().size(); i++)
INFO_LOG(m_logger) << "payload[" << i << "]=" << targetData.payload()[i];
INFO_LOG() << "payload[" << i << "]=" << targetData.payload()[i];
if (targetData.payload().size() < 6)
return;
@@ -52,29 +51,29 @@ void HandlerTargetConfig::onTargetDataChanged(const TrainingAreaBase::TargetData
tgtTargetData.tgtCommand(static_cast <TargetManagement::TgtCommand_def::type>(targetData.payload()[0] - responseCmd));
tgtTargetData.mode(static_cast <TargetManagement::Mode_def::type>(targetData.payload()[1]));
tgtTargetData.weapon(targetData.payload()[2]);
INFO_LOG(m_logger) << "tgtTargetData.tgtCommand =" << tgtTargetData.tgtCommand()
INFO_LOG() << "tgtTargetData.tgtCommand =" << tgtTargetData.tgtCommand()
<< " mode=" << tgtTargetData.mode()
<< " weapon=" << tgtTargetData.weapon();
if (!m_dtsTgt->publish(tgtTargetData))
ERROR_LOG(m_logger) << "Error publish targetData";
ERROR_LOG() << "Error publish targetData";
} // end of onTargetDataChanged
void HandlerTargetConfig::onSendTargetDataReply(const Core::FunctionReplyObject &replyObject)
{
if (replyObject.error())
WARNING_LOG(m_logger) << "Can not send target data to target participant : " << replyObject();
WARNING_LOG() << "Can not send target data to target participant : " << replyObject();
else
DEBUG_LOG(m_logger) << "onSendTargetDataReply for id " << replyObject.id() << " success";
DEBUG_LOG() << "onSendTargetDataReply for id " << replyObject.id() << " success";
}
// Send to TAB
void HandlerTargetConfig::onConfigureTargetRequest(const rti::core::SampleIdentity &cookie,
const ConfigureTargetRequest &request)
{
INFO_LOG(m_logger) << "onConfigureTargetRequest";
INFO_LOG() << "onConfigureTargetRequest";
Core::FunctionReplyObject reply = Core::FunctionReplyObject(request.id());
DEBUG_LOG(m_logger) << "HandlerTargetConfig onTargetConfigChanged participantId=" << request.participantId();
DEBUG_LOG() << "HandlerTargetConfig onTargetConfigChanged participantId=" << request.participantId();
TrainingAreaBase::SendTargetDataRequest tgt;
const int participantId = request.participantId();
@@ -88,7 +87,7 @@ void HandlerTargetConfig::onConfigureTargetRequest(const rti::core::SampleIdenti
case TargetManagement::TgtCommand_def::Unknown:
case TargetManagement::TgtCommand_def::PlaySound:
{
WARNING_LOG(m_logger) << "onTargetConfigChanged Command =" << request.tgtCommand() << " not handled.";
WARNING_LOG() << "onTargetConfigChanged Command =" << request.tgtCommand() << " not handled.";
m_ddsHandler->ftsTgt()->configureTargetReply(cookie, reply);
return;
}
@@ -102,7 +101,7 @@ void HandlerTargetConfig::onConfigureTargetRequest(const rti::core::SampleIdenti
{
if (!request.mode().is_set())
{
ERROR_LOG(m_logger) << "Set mode requested, but mode ist not set";
ERROR_LOG() << "Set mode requested, but mode ist not set";
m_ddsHandler->ftsTgt()->configureTargetReply(cookie, Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Set mode requested, but mode is not set")));
return;
}
@@ -113,7 +112,7 @@ void HandlerTargetConfig::onConfigureTargetRequest(const rti::core::SampleIdenti
{
if (!request.weapon().is_set())
{
ERROR_LOG(m_logger) << "Set weapon requested, but weapon ist not set";
ERROR_LOG() << "Set weapon requested, but weapon ist not set";
m_ddsHandler->ftsTgt()->configureTargetReply(cookie, Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Set weapon requested, but weapon is not set")));
return;
}
@@ -124,7 +123,7 @@ void HandlerTargetConfig::onConfigureTargetRequest(const rti::core::SampleIdenti
{
if (!request.parameterSet().is_set())
{
ERROR_LOG(m_logger) << "Set parameterset requested, but parameterset ist not set";
ERROR_LOG() << "Set parameterset requested, but parameterset ist not set";
m_ddsHandler->ftsTgt()->configureTargetReply(cookie, Core::FunctionReplyObject(request.participantId(), tr_lts("dds", "Set parameterset requested, but parameterset is not set")));
return;
}