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/OcSituationClient/handler_oc_aes_data.cpp
+21 -22
View File
@@ -28,7 +28,6 @@ HandlerOcAesData::HandlerOcAesData(MainHandler *mainHandler,
, m_tabDts(mainHandler->tabDts())
, m_tabocDtc(mainHandler->tabocDtc())
, m_utmCoord(LtsCoordTrans::UtmCoordinate::fromMgrs(Settings::baseCoord()))
, m_logger(getLogger("HandlerOcAesData"))
{}
HandlerOcAesData::~HandlerOcAesData()
@@ -39,7 +38,7 @@ bool HandlerOcAesData::init()
// AES DTC enable
if (!m_aesDtc->enableDangerArea())
{
ERROR_LOG(m_logger) << "Enabling AES Data-Topics failed.";
ERROR_LOG() << "Enabling AES Data-Topics failed.";
return false;
}
@@ -47,27 +46,27 @@ bool HandlerOcAesData::init()
if (!m_aesFtc->enableDangerAreaModify() ||
!m_aesFtc->enableDangerAreaRemove())
{
ERROR_LOG(m_logger) << "Enabling AES Function-Topics failed.";
ERROR_LOG() << "Enabling AES Function-Topics failed.";
return false;
}
// GIM DTC enable
if (!m_gimDtc->enableIed())
{
ERROR_LOG(m_logger) << "Enabling GIM Data-Topics failed.";
ERROR_LOG() << "Enabling GIM Data-Topics failed.";
return false;
}
// TAB DTS enable
if (!m_tabDts->enableDefinitionIed())
{
ERROR_LOG(m_logger) << "Enabling TAB DTS Data-Topics failed.";
ERROR_LOG() << "Enabling TAB DTS Data-Topics failed.";
return false;
}
// TABOC DTC enable
if (!m_tabocDtc->enableSpecificsExercise())
{
ERROR_LOG(m_logger) << "Enabling TABOC Data-Topics failed.";
ERROR_LOG() << "Enabling TABOC Data-Topics failed.";
return false;
}
connect(m_tabocDtc.get(), &TrainingAreaBaseOC::Interface::Dtc::specificsExerciseChanged, this, &HandlerOcAesData::onSpecificsExerciseChanged);
@@ -82,11 +81,11 @@ bool HandlerOcAesData::init()
void HandlerOcAesData::process(const QByteArray &data)
{
DEBUG_LOG(m_logger) << "Compressed binary data: " << data.toHex(' ');
DEBUG_LOG() << "Compressed binary data: " << data.toHex(' ');
QByteArray uncompressed = MainHandler::tryUncompress(data, true);
DEBUG_LOG(m_logger) << "Uncompressed binary data: " << uncompressed.toHex(' ');
DEBUG_LOG() << "Uncompressed binary data: " << uncompressed.toHex(' ');
OcSituation::AesType aesType;
LtsUtils::get1Byte(uncompressed, aesType);
@@ -110,7 +109,7 @@ void HandlerOcAesData::process(const QByteArray &data)
}
default:
{
WARNING_LOG(m_logger) << "Aes type: " << aesType << " is currently not handled.";
WARNING_LOG() << "Aes type: " << aesType << " is currently not handled.";
}
}
}
@@ -118,23 +117,23 @@ void HandlerOcAesData::process(const QByteArray &data)
void HandlerOcAesData::onDangerAreaModifyReply(const Core::FunctionReplyObject &reply)
{
if (reply.error())
ERROR_LOG(m_logger) << "Danger area modify failed: " << reply.translated();
ERROR_LOG() << "Danger area modify failed: " << reply.translated();
else
DEBUG_LOG(m_logger) << "Danger area modify successfull. Id: " << reply.id();
DEBUG_LOG() << "Danger area modify successfull. Id: " << reply.id();
}
void HandlerOcAesData::onDangerAreaRemoveReply(const Core::FunctionReplyObject &reply)
{
if (reply.error())
ERROR_LOG(m_logger) << "Danger area remove failed: " << reply.translated();
ERROR_LOG() << "Danger area remove failed: " << reply.translated();
else
DEBUG_LOG(m_logger) << "Danger area remove successfull. Id: " << reply.id();
DEBUG_LOG() << "Danger area remove successfull. Id: " << reply.id();
}
void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
{
INFO_LOG(m_logger) << "Got new danger area data";
DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
INFO_LOG() << "Got new danger area data";
DEBUG_LOG() << "Binary data: " << data.toHex(' ');
QList<int> aesToBeDeleted = m_aesDtc->dangerAreas().keys();
@@ -171,7 +170,7 @@ void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
}
req.segments(segments);
DEBUG_LOG(m_logger) << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "danger area: " << req;
DEBUG_LOG() << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "danger area: " << req;
aesToBeDeleted.removeAll(req.id()); // item was created/modified -> does not need to be deleted
req.id(req.id() * -1); // inverted id to mark as for oc
@@ -184,7 +183,7 @@ void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
continue;
if (m_aesDtc->dangerArea(id).effectStateId().underlying() > AreaEffectSimulation::AesEffectState::EsRemoved)
{
DEBUG_LOG(m_logger) << "Removing danger area id: " << id;
DEBUG_LOG() << "Removing danger area id: " << id;
m_aesFtc->dangerAreaRemoveRequest(Core::RemoveElementRequest(id), this);
}
}
@@ -192,8 +191,8 @@ void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
void HandlerOcAesData::handleIeds(const QByteArray &data, size_t pos)
{
INFO_LOG(m_logger) << "Got new ied data";
DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
INFO_LOG() << "Got new ied data";
DEBUG_LOG() << "Binary data: " << data.toHex(' ');
int cnt;
LtsUtils::get1Byte(data, pos, cnt);
@@ -225,7 +224,7 @@ void HandlerOcAesData::handleIeds(const QByteArray &data, size_t pos)
LtsUtils::get3Byte(data, pos, y);
def.position(relativeFromGeoPosition(x, y));
DEBUG_LOG(m_logger) << "Publishing definition ied: " << def;
DEBUG_LOG() << "Publishing definition ied: " << def;
m_tabDts->publish(def);
}
@@ -233,8 +232,8 @@ void HandlerOcAesData::handleIeds(const QByteArray &data, size_t pos)
void HandlerOcAesData::handleIedPositions(const QByteArray &data, size_t pos)
{
INFO_LOG(m_logger) << "Got new ied positions data";
DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
INFO_LOG() << "Got new ied positions data";
DEBUG_LOG() << "Binary data: " << data.toHex(' ');
int cnt;
LtsUtils::get1Byte(data, pos, cnt);