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
+7
-8
@@ -29,7 +29,6 @@ HandlerSituationReplay::HandlerSituationReplay(const std::shared_ptr<DdsHandler>
|
||||
, m_dbReader(dbReader)
|
||||
, m_exerciseId(0)
|
||||
, m_partitionId(0)
|
||||
, m_logger(getLogger("HandlerSituationReplay"))
|
||||
{}
|
||||
|
||||
HandlerSituationReplay::~HandlerSituationReplay()
|
||||
@@ -47,7 +46,7 @@ bool HandlerSituationReplay::init(int exerciseId, int partitionId)
|
||||
NSqlQuery q(m_db->database());
|
||||
const qint64 exerciseStartTime = (q.execAndFetch(stmt) ? q.value(0).toLongLong() : 0);
|
||||
|
||||
DEBUG_LOG(m_logger) << "stmt: " << stmt << ", res " << exerciseStartTime;
|
||||
DEBUG_LOG() << "stmt: " << stmt << ", res " << exerciseStartTime;
|
||||
|
||||
Database::SrpSituationReplay newData;
|
||||
newData.srpStateId = SrpState::Stopped;
|
||||
@@ -68,14 +67,14 @@ bool HandlerSituationReplay::createObject(const Database::SrpSituationReplay &ne
|
||||
{
|
||||
delete m_objSrp;
|
||||
m_objSrp = nullptr;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
}
|
||||
return m_objSrp != nullptr;
|
||||
}
|
||||
|
||||
Core::FunctionReplyObject HandlerSituationReplay::startReplayRequest(const SituationReplay::ChangeReplayStateRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onStartReplayRequest: " << request;
|
||||
DEBUG_LOG() << "onStartReplayRequest: " << request;
|
||||
// Start only own replay
|
||||
if (request.replayPartitionId() != m_partitionId)
|
||||
return Core::FunctionReplyObject(request.replayPartitionId(),tr_lts("dds", "Wrong replay partition"));
|
||||
@@ -103,7 +102,7 @@ Core::FunctionReplyObject HandlerSituationReplay::startReplayRequest(const Situa
|
||||
|
||||
Core::FunctionReplyObject HandlerSituationReplay::stopReplayRequest(const SituationReplay::ChangeReplayStateRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onStopReplayRequest: " << request;
|
||||
DEBUG_LOG() << "onStopReplayRequest: " << request;
|
||||
|
||||
if (m_objSrp == nullptr)
|
||||
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "SituationReplay for replayPartitionId %1 not found")).arg(request.replayPartitionId());
|
||||
@@ -145,7 +144,7 @@ Core::FunctionReplyObject HandlerSituationReplay::changeReplayStateRequest(const
|
||||
return startReplayRequest(request);
|
||||
case SrpState_def::Resumed:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Resume request: " << request.beginTime() << ", cur playback time: " << m_objSrp->currentReplayTime();
|
||||
DEBUG_LOG() << "Resume request: " << request.beginTime() << ", cur playback time: " << m_objSrp->currentReplayTime();
|
||||
if (request.beginTime() != 0 && request.beginTime() != m_objSrp->currentReplayTime())
|
||||
{
|
||||
stopReplayRequest(request);
|
||||
@@ -164,10 +163,10 @@ Core::FunctionReplyObject HandlerSituationReplay::changeReplayStateRequest(const
|
||||
void HandlerSituationReplay::onChangeReplayStateRequest(const rti::core::SampleIdentity &cookie,
|
||||
const ChangeReplayStateRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onChangeReplayStateRequest: " << request;
|
||||
DEBUG_LOG() << "onChangeReplayStateRequest: " << request;
|
||||
auto ret = changeReplayStateRequest(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
m_ddsHandler->fts()->changeReplayStateReply(cookie, ret);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user