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
+26
-27
@@ -54,13 +54,12 @@ namespace TargetManagement
|
||||
{
|
||||
TgtTests::TgtTests(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_logger(getLogger("TgtTests"))
|
||||
{}
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
bool TgtTests::init(int domainId, int testId, int operatorId, int shootbackAreaId)
|
||||
{
|
||||
INFO_LOG(m_logger) << "init begin";
|
||||
INFO_LOG() << "init begin";
|
||||
|
||||
m_testId = testId;
|
||||
m_operatorId = operatorId;
|
||||
@@ -90,7 +89,7 @@ bool TgtTests::init(int domainId, int testId, int operatorId, int shootbackAreaI
|
||||
// ------------------------------------------------------------------
|
||||
void TgtTests::startTest()
|
||||
{
|
||||
INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
|
||||
INFO_LOG() << "startTest m_testId=" << m_testId;
|
||||
if (m_testId == 1) // Send FTC ConfigureAlarms and EEM Event
|
||||
{
|
||||
QTimer::singleShot(0, this, &TgtTests::tryCreateParticipant);
|
||||
@@ -133,7 +132,7 @@ void TgtTests::tryCreateShootbackArea()
|
||||
|
||||
if (!m_ftcTgt->shootbackAreaModifyRequest(request, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting create Shootback Area";
|
||||
ERROR_LOG() << "Error requesting create Shootback Area";
|
||||
failExit();
|
||||
}
|
||||
|
||||
@@ -149,7 +148,7 @@ void TgtTests::tryUpdateShootbackArea()
|
||||
|
||||
if (!m_ftcTgt->shootbackAreaModifyRequest(request, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting modify Shootback Area";
|
||||
ERROR_LOG() << "Error requesting modify Shootback Area";
|
||||
failExit();
|
||||
}
|
||||
|
||||
@@ -164,7 +163,7 @@ void TgtTests::tryRemoveShootbackArea()
|
||||
|
||||
if (!m_ftcTgt->shootbackAreaRemoveRequest(request, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting remove Shootback Area";
|
||||
ERROR_LOG() << "Error requesting remove Shootback Area";
|
||||
failExit();
|
||||
}
|
||||
|
||||
@@ -173,7 +172,7 @@ void TgtTests::tryRemoveShootbackArea()
|
||||
// ------------------------------------------------------------------
|
||||
void TgtTests::tryRequestTechnicalState()
|
||||
{
|
||||
INFO_LOG(m_logger) << "trying to send createRequest Operator Message";
|
||||
INFO_LOG() << "trying to send createRequest Operator Message";
|
||||
|
||||
ConfigureTargetRequest request;
|
||||
|
||||
@@ -183,7 +182,7 @@ void TgtTests::tryRequestTechnicalState()
|
||||
|
||||
if (!m_ftcTgt->configureTargetRequest(request, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting create data";
|
||||
ERROR_LOG() << "Error requesting create data";
|
||||
failExit();
|
||||
}
|
||||
} // tryRequestTechnicalState
|
||||
@@ -191,7 +190,7 @@ void TgtTests::tryRequestTechnicalState()
|
||||
// ------------------------------------------------------------------
|
||||
void TgtTests::tryConfigureTargetMode()
|
||||
{
|
||||
INFO_LOG(m_logger) << "trying to send createRequest Operator Message";
|
||||
INFO_LOG() << "trying to send createRequest Operator Message";
|
||||
|
||||
ConfigureTargetRequest request;
|
||||
|
||||
@@ -204,7 +203,7 @@ void TgtTests::tryConfigureTargetMode()
|
||||
|
||||
if (!m_ftcTgt->configureTargetRequest(request, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting create data";
|
||||
ERROR_LOG() << "Error requesting create data";
|
||||
failExit();
|
||||
}
|
||||
} // tryConfigureTargetMode
|
||||
@@ -212,7 +211,7 @@ void TgtTests::tryConfigureTargetMode()
|
||||
// ------------------------------------------------------------------
|
||||
void TgtTests::tryConfigureTargetWeapon()
|
||||
{
|
||||
INFO_LOG(m_logger) << "trying to send createRequest Operator Message";
|
||||
INFO_LOG() << "trying to send createRequest Operator Message";
|
||||
|
||||
ConfigureTargetRequest request;
|
||||
|
||||
@@ -223,7 +222,7 @@ void TgtTests::tryConfigureTargetWeapon()
|
||||
|
||||
if (!m_ftcTgt->configureTargetRequest(request, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting create data";
|
||||
ERROR_LOG() << "Error requesting create data";
|
||||
failExit();
|
||||
}
|
||||
} // tryConfigureTargetWeapon
|
||||
@@ -242,7 +241,7 @@ void TgtTests::tryCreateTargetData()
|
||||
|
||||
if (!m_dtsTab->publish(targetData))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error publish targetData";
|
||||
ERROR_LOG() << "Error publish targetData";
|
||||
failExit();
|
||||
}
|
||||
}
|
||||
@@ -250,7 +249,7 @@ void TgtTests::tryCreateTargetData()
|
||||
// ------------------------------------------------------------------
|
||||
void TgtTests::tryCreateParticipant()
|
||||
{
|
||||
INFO_LOG(m_logger) << "trying to create Participant index = " << m_participantIndex;
|
||||
INFO_LOG() << "trying to create Participant index = " << m_participantIndex;
|
||||
ParticipantManagement::Participant participant;
|
||||
participant.id(5);
|
||||
participant.superiorId(0);
|
||||
@@ -259,10 +258,10 @@ void TgtTests::tryCreateParticipant()
|
||||
participant.inferiorIds().at(1) = 3;
|
||||
participant.partyId(5);
|
||||
participant.equipmentNumber(1001);
|
||||
DEBUG_LOG(m_logger) << "Publishing Participant";
|
||||
DEBUG_LOG() << "Publishing Participant";
|
||||
if (!m_dtsPpm->publish(participant))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error publish Participant";
|
||||
ERROR_LOG() << "Error publish Participant";
|
||||
failExit();
|
||||
}
|
||||
m_participantIndex++;
|
||||
@@ -272,11 +271,11 @@ void TgtTests::tryCreateParticipant()
|
||||
// ------------------------------------------------------------------
|
||||
void TgtTests::onShootbackAreaModifyReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onShootbackAreaModifyReply on id " << replyObject.id()
|
||||
INFO_LOG() << "onShootbackAreaModifyReply on id " << replyObject.id()
|
||||
<< " and error = " << replyObject.error();
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error onShoobackAreaModifyReply - aborting";
|
||||
ERROR_LOG() << "Error onShoobackAreaModifyReply - aborting";
|
||||
failExit();
|
||||
}
|
||||
|
||||
@@ -287,11 +286,11 @@ void TgtTests::onShootbackAreaModifyReply(const Core::FunctionReplyObject &reply
|
||||
// ------------------------------------------------------------------
|
||||
void TgtTests::onShootbackAreaRemoveReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onShootbackAreaModifyReply on id " << replyObject.id()
|
||||
INFO_LOG() << "onShootbackAreaModifyReply on id " << replyObject.id()
|
||||
<< " and error = " << replyObject.error();
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error onShootbackAreaRemoveReply - aborting";
|
||||
ERROR_LOG() << "Error onShootbackAreaRemoveReply - aborting";
|
||||
failExit();
|
||||
}
|
||||
|
||||
@@ -301,10 +300,10 @@ void TgtTests::onShootbackAreaRemoveReply(const Core::FunctionReplyObject &reply
|
||||
// ------------------------------------------------------------------
|
||||
void TgtTests::onConfigureTargetReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onConfigureTargetReply, error = " << replyObject.error();
|
||||
INFO_LOG() << "onConfigureTargetReply, error = " << replyObject.error();
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error ConfigureTargets - aborting";
|
||||
ERROR_LOG() << "Error ConfigureTargets - aborting";
|
||||
failExit();
|
||||
}
|
||||
} // onConfigureTargetReply
|
||||
@@ -312,11 +311,11 @@ void TgtTests::onConfigureTargetReply(const Core::FunctionReplyObject &replyObje
|
||||
// ------------------------------------------------------------------
|
||||
void TgtTests::checkAlarm()
|
||||
{
|
||||
INFO_LOG(m_logger) << "checkAlarm";
|
||||
INFO_LOG() << "checkAlarm";
|
||||
m_dtcTgt->waitForHistoricalDataTargetConfig();
|
||||
//qint32 id = 0;
|
||||
/*TargetManagement::Notification notification = m_dtcTgt->notification(id);
|
||||
INFO_LOG(m_logger) << "Recived TargetManagement::Notification: " << notification
|
||||
INFO_LOG() << "Recived TargetManagement::Notification: " << notification
|
||||
<< " testId: " << m_testId;
|
||||
|
||||
switch (m_testId)
|
||||
@@ -324,12 +323,12 @@ void TgtTests::checkAlarm()
|
||||
case 1:
|
||||
case 2:
|
||||
case 3:
|
||||
INFO_LOG(m_logger) << "ExitSuccess";
|
||||
INFO_LOG() << "ExitSuccess";
|
||||
ExitSuccess();
|
||||
break;
|
||||
default:
|
||||
// nothing
|
||||
INFO_LOG(m_logger) << "failExit";
|
||||
INFO_LOG() << "failExit";
|
||||
failExit();
|
||||
break;
|
||||
}*/
|
||||
@@ -345,7 +344,7 @@ void TgtTests::failExit()
|
||||
// ------------------------------------------------------------------
|
||||
void TgtTests::ExitSuccess()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "SUCCESS";
|
||||
DEBUG_LOG() << "SUCCESS";
|
||||
m_bTestsSuccessful = true;
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
} // ExitSuccess
|
||||
|
||||
Reference in new issue
Block a user