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

- 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

No files matched your search

@@ -24,7 +24,6 @@ namespace TemplateHandling
TemplateHandler::TemplateHandler(MainHandler *mainHandler)
: Interface::Fts::ModifyTemplateDataRequestHandler(mainHandler->exerciseId() <= 0 ? mainHandler->fts() : nullptr)
, m_mainHandler(mainHandler)
, m_logger(getLogger("TemplateHandler"))
{}
TemplateHandler::~TemplateHandler()
@@ -41,7 +40,7 @@ bool TemplateHandler::init()
};
if (!m_mainHandler->db()->select(cb))
{
ERROR_LOG(m_logger) << "Error while reading template data from database";
ERROR_LOG() << "Error while reading template data from database";
return false;
}
@@ -59,10 +58,10 @@ bool TemplateHandler::init()
void TemplateHandler::onModifyTemplateDataRequest(const rti::core::SampleIdentity &cookie,
const ParticipantManagement::ModifyTemplateDataRequest &request)
{
DEBUG_LOG(m_logger) << "onModifyTemplateDataRequest: " << request;
DEBUG_LOG() << "onModifyTemplateDataRequest: " << request;
const auto ret = modifyTemplateDataRequest(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
WARNING_LOG() << ret();
m_mainHandler->fts()->modifyTemplateDataReply(cookie, ret);
}
@@ -93,7 +92,7 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti
}
removeTransaction.commit();
DEBUG_LOG(m_logger) << "Starting validating ModifyTemplateDataRequest";
DEBUG_LOG() << "Starting validating ModifyTemplateDataRequest";
if (templatesToBeCreatedOrModified.size() >= 1000) // concurrent validation for big requests
{
QVector<QFuture<Core::FunctionReplyObject>> futureVec;
@@ -126,7 +125,7 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti
{
for (const ParticipantManagement::TemplateData &currentTemplate : std::as_const(templatesToBeCreatedOrModified))
{
DEBUG_LOG(m_logger) << "Validating template: " << currentTemplate;
DEBUG_LOG() << "Validating template: " << currentTemplate;
auto ret = validateTemplateData(templatesToBeCreatedOrModified, modIdToTemplateId, currentTemplate);
if (ret.error())
return ret;
@@ -135,17 +134,17 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti
DBTransaction trans(m_mainHandler->db()->database());
// only continue if there was no error detected
DEBUG_LOG(m_logger) << "ModifyTemplateDataRequest has valid data";
DEBUG_LOG() << "ModifyTemplateDataRequest has valid data";
// create new and update existing templates
DEBUG_LOG(m_logger) << "Creating new and updating existing templates ...";
DEBUG_LOG() << "Creating new and updating existing templates ...";
for (const TemplateData &currentData : std::as_const(templatesToBeCreatedOrModified))
{
Template *templateToUpdate = m_templates.value(modIdToTemplateId.value(currentData.modId()));
if (!templateToUpdate)
{
DEBUG_LOG(m_logger) << "Creating new template: " << currentData;
DEBUG_LOG() << "Creating new template: " << currentData;
const auto ret = createNewTemplate(currentData, modIdToTemplateId, templatesWithChanges);
if (ret.error())
return ret;
@@ -156,13 +155,13 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti
if (templateToUpdate->hasToBeChanged(currentData) &&
!templatesWithChanges.contains(templateToUpdate))
{
DEBUG_LOG(m_logger) << "Template changed: " << templateToUpdate->toDdsTemplateParticipant();
DEBUG_LOG() << "Template changed: " << templateToUpdate->toDdsTemplateParticipant();
templatesWithChanges.append(templateToUpdate);
}
}
}
DEBUG_LOG(m_logger) << "New templates created and existing templates updated";
DEBUG_LOG() << "New templates created and existing templates updated";
// build hierarchy
for (const TemplateData &currentData : std::as_const(templatesToBeCreatedOrModified)) // first set superiorIds
@@ -180,7 +179,7 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti
if (!currentTemplate->hasNewInferiorStructure(inferiorIdsForTemplate(currentTemplate->id())) ||
templatesWithChanges.contains(currentTemplate))
continue;
DEBUG_LOG(m_logger) << "Template got new inferiors: " << currentTemplate->toDdsTemplateParticipant();
DEBUG_LOG() << "Template got new inferiors: " << currentTemplate->toDdsTemplateParticipant();
templatesWithChanges.append(currentTemplate);
}
@@ -208,7 +207,7 @@ std::vector<int32_t> TemplateHandler::inferiorIdsForTemplate(int32_t superiorTem
{
if (currentTemplate->superiorId() == superiorTemplateId)
{
DEBUG_LOG(m_logger) << "Building hierarchy, parentId: " << superiorTemplateId << " has child " << currentTemplate->id();
DEBUG_LOG() << "Building hierarchy, parentId: " << superiorTemplateId << " has child " << currentTemplate->id();
result.push_back(currentTemplate->id());
}
}
@@ -255,14 +254,14 @@ Core::FunctionReplyObject TemplateHandler::validateTemplateData(const QVector<Te
{
if (templateToValidate.templateId() != 0)
{
DEBUG_LOG(m_logger) << "Checking template id";
DEBUG_LOG() << "Checking template id";
Template *existingTemplate = m_templates.value(templateToValidate.templateId(), nullptr);
if (existingTemplate == nullptr)
return Core::FunctionReplyObject(tr_lts("dds",
"Could not execute ModifyTemplateDataRequest, because an invalid template ID (%1) was given"))
.arg(templateToValidate.templateId());
DEBUG_LOG(m_logger) << "... ok";
DEBUG_LOG() << "... ok";
{
QMutexLocker l(&m_mutex);
modIdToTemplateId.insert(templateToValidate.modId(), existingTemplate->id()); /* register template to indicate that this template
@@ -273,7 +272,7 @@ Core::FunctionReplyObject TemplateHandler::validateTemplateData(const QVector<Te
// superior ids valid?
if (templateToValidate.superiorModId() > 0)
{
DEBUG_LOG(m_logger) << "checking superiorIds";
DEBUG_LOG() << "checking superiorIds";
// superior exists?
bool isExistingSuperiorId = false;
for (const TemplateData &dat : dataVec)
@@ -290,14 +289,14 @@ Core::FunctionReplyObject TemplateHandler::validateTemplateData(const QVector<Te
.arg(templateToValidate.modId())
.arg(templateToValidate.superiorModId());
DEBUG_LOG(m_logger) << "... ok";
DEBUG_LOG() << "... ok";
if (templateToValidate.hierarchyNumber() <= 0)
return Core::FunctionReplyObject(tr_lts("dds",
"Could not execute ModifyTemplateDataRequest, because a data set has a superior but no hierarchyNumber set"));
// all hierarchy numbers with same superior unique?
DEBUG_LOG(m_logger) << "Checking hierarchyNumbers";
DEBUG_LOG() << "Checking hierarchyNumbers";
for (const TemplateData &dat : dataVec)
{
// operator==() on optionals returns false if not set ...
@@ -309,18 +308,18 @@ Core::FunctionReplyObject TemplateHandler::validateTemplateData(const QVector<Te
.arg(dat.superiorModId())
.arg(dat.hierarchyNumber());
}
DEBUG_LOG(m_logger) << "... ok";
DEBUG_LOG() << "... ok";
}
// typeId valid?
DEBUG_LOG(m_logger) << "Checking typeId";
DEBUG_LOG() << "Checking typeId";
if (m_mainHandler->typeHandler()->typeById(templateToValidate.typeId()) == nullptr)
return Core::FunctionReplyObject(tr_lts("dds",
"Could not execute ModifyTemplateDataRequest, because data set with modId %1 has invalid typeId %2"))
.arg(templateToValidate.modId())
.arg(templateToValidate.typeId());
DEBUG_LOG(m_logger) << "... ok";
DEBUG_LOG() << "... ok";
return Core::FunctionReplyObject();
}