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:
2785 files changed
+18754
-18316
No files matched your search
@@ -12,7 +12,6 @@ namespace TrainingAreaBase
|
||||
PdmHandler::PdmHandler(MainHandler *mainHandler)
|
||||
: m_initialized(false)
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger("PdmHandler"))
|
||||
{}
|
||||
|
||||
bool PdmHandler::init()
|
||||
@@ -57,7 +56,7 @@ bool PdmHandler::initializePdm()
|
||||
!m_dtcPdm->waitForHistoricalDataBuildingChargeEffect(20000) ||
|
||||
!m_dtcPdm->waitForHistoricalDataVulnerabilityKind(20000))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not read charge/gear types from PDM";
|
||||
ERROR_LOG() << "Can not read charge/gear types from PDM";
|
||||
return false;
|
||||
}
|
||||
m_chargeTypes = m_dtcPdm->chargeTypes();
|
||||
@@ -72,7 +71,7 @@ bool PdmHandler::initializePdm()
|
||||
const int realTypeId = (k.taVulnerabilityKind() & 0x00FF0000) >> 16;
|
||||
const int fallbackTypeId = (k.taVulnerabilityKind() & 0xFF000000) >> 24;
|
||||
m_vulnerabilityKinds[realTasKindId] = k;
|
||||
TRACE_LOG(m_logger) << "realTasKindId: " << realTasKindId << ", realTypeId: " << realTypeId << ", fallbackTypeId: " << fallbackTypeId;
|
||||
TRACE_LOG() << "realTasKindId: " << realTasKindId << ", realTypeId: " << realTypeId << ", fallbackTypeId: " << fallbackTypeId;
|
||||
if (fallbackTypeId)
|
||||
m_vulnerabilityKindFallback[realTypeId] = fallbackTypeId;
|
||||
};
|
||||
@@ -94,7 +93,7 @@ ProjectDataManagement::ChargeType PdmHandler::chargeTypeFromId(int chargeTypeId)
|
||||
auto it = m_chargeTypes.constFind(ctId);
|
||||
if (it == m_chargeTypes.cend())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not find charge type with id " << chargeTypeId;
|
||||
WARNING_LOG() << "Could not find charge type with id " << chargeTypeId;
|
||||
return ProjectDataManagement::ChargeType();
|
||||
}
|
||||
return it.value();
|
||||
@@ -155,23 +154,23 @@ int PdmHandler::vulnerabilityKindId(int tasVulnerabilityKindId, int equipmentNum
|
||||
const int index = (tasVulnerabilityKindId & 0x0000FFFF);
|
||||
|
||||
int fallBackTypeId = m_vulnerabilityKindFallback.value(typeId);
|
||||
TRACE_LOG(m_logger) << "Looking for fallback for typeId " << typeId << ": " << fallBackTypeId;
|
||||
TRACE_LOG() << "Looking for fallback for typeId " << typeId << ": " << fallBackTypeId;
|
||||
if (!fallBackTypeId)
|
||||
{
|
||||
fallBackTypeId = m_vulnerabilityKindFallback.value(0);
|
||||
TRACE_LOG(m_logger) << "None found - using default: " << fallBackTypeId;
|
||||
TRACE_LOG() << "None found - using default: " << fallBackTypeId;
|
||||
}
|
||||
tasVulnerabilityKindId = (fallBackTypeId << 16) | index;
|
||||
TRACE_LOG(m_logger) << "Searching for " << tasVulnerabilityKindId;
|
||||
TRACE_LOG() << "Searching for " << tasVulnerabilityKindId;
|
||||
it = m_vulnerabilityKinds.constFind(tasVulnerabilityKindId);
|
||||
if (it == m_vulnerabilityKinds.constEnd())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not find vulnerability type with id " << typeId
|
||||
WARNING_LOG() << "Could not find vulnerability type with id " << typeId
|
||||
<< " and index " << index
|
||||
<< " for equipment " << equipmentNumber;
|
||||
return tasVulnerabilityKindId;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "vulnerability type with id " << typeId
|
||||
DEBUG_LOG() << "vulnerability type with id " << typeId
|
||||
<< " and index " << index << " is using fallback typeId " << fallBackTypeId;
|
||||
}
|
||||
return it.value().taVulnerabilityKind();
|
||||
@@ -230,7 +229,7 @@ int PdmHandler::chargeTypeIdFromGearAndChargeTasCode(int gearTasCode, int charge
|
||||
if (m_chargeTypes.contains(chargeTasCode))
|
||||
return chargeTasCode;
|
||||
|
||||
WARNING_LOG(m_logger) << "Got unmapped training area charge type id "
|
||||
WARNING_LOG() << "Got unmapped training area charge type id "
|
||||
<< chargeTasCode << " for gear type "
|
||||
<< gearTasCode;
|
||||
return (s_unknownMarker | chargeTasCode);
|
||||
@@ -252,7 +251,7 @@ int PdmHandler::gearTypeIdFromTasGearTasCode(int gearTasCode)
|
||||
return gearType.id();
|
||||
}
|
||||
|
||||
WARNING_LOG(m_logger) << "Got unmapped training area gear type id "
|
||||
WARNING_LOG() << "Got unmapped training area gear type id "
|
||||
<< gearTasCode;
|
||||
return (s_unknownMarker | gearTasCode);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user