lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds immediate migration results in progress

Browse Source
This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.cpp
+20 -21
View File
@@ -20,14 +20,13 @@ namespace SituationReplay
ObjectSituationReplay::ObjectSituationReplay(const std::shared_ptr<DdsHandler> &ddsHandler,
const std::shared_ptr<DatabaseInterface> &db,
const std::shared_ptr<DbReader> &dbReader,
int exerciseId)
: m_ddsInterface(ddsHandler)
int exerciseId) : m_ddsInterface(ddsHandler)
, m_db(db)
, m_dbReader(dbReader)
, m_exerciseId(exerciseId)
, m_replayTimer(new QTimer(this))
, m_currentReplayTime(0)
{
, m_currentReplayTime(0),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
connect(m_replayTimer, &QTimer::timeout, this, &ObjectSituationReplay::onReplayTimerTimeout);
}
@@ -67,7 +66,7 @@ Core::FunctionReplyObject ObjectSituationReplay::createObject(const Database::Sr
}
// Id is serial -> will be generated by db => inside m_data after db-insert
DEBUG_LOG() << "New srpId: " << m_data.id;
DEBUG_LOG(m_logger) << "New srpId: " << m_data.id;
switchToState(SituationReplay::SrpState_def::Stopped);
@@ -90,7 +89,7 @@ bool ObjectSituationReplay::setPace(double newPace)
{
if (newPace < 0)
{
WARNING_LOG() << "Trying to set a pace < 0";
WARNING_LOG(m_logger) << "Trying to set a pace < 0";
return false;
}
m_data.pace = newPace;
@@ -113,7 +112,7 @@ bool ObjectSituationReplay::setSrpData(const Database::SrpSituationReplay &newDa
{
if (!m_db->update(m_data))
{
ERROR_LOG() << "Error updating SitReplay data in database (exerciseState)";
ERROR_LOG(m_logger) << "Error updating SitReplay data in database (exerciseState)";
return false;
}
@@ -129,7 +128,7 @@ bool ObjectSituationReplay::setSrpData(const Database::SrpSituationReplay &newDa
// record SrpStateChange
if (!m_db->insert(stateChange))
WARNING_LOG() << "Recording change of srpState failed";
WARNING_LOG(m_logger) << "Recording change of srpState failed";
}
// Publish Data via DTS
@@ -140,7 +139,7 @@ bool ObjectSituationReplay::setSrpData(const Database::SrpSituationReplay &newDa
bool ObjectSituationReplay::start()
{
INFO_LOG() << "start: " << m_currentReplayTime;
INFO_LOG(m_logger) << "start: " << m_currentReplayTime;
m_currentReplayTime = m_data.beginTime;
emit started(m_currentReplayTime);
@@ -156,7 +155,7 @@ bool ObjectSituationReplay::start()
bool ObjectSituationReplay::pause()
{
INFO_LOG() << "paused: " << m_currentReplayTime;
INFO_LOG(m_logger) << "paused: " << m_currentReplayTime;
m_replayTimer->stop();
emit paused();
return true;
@@ -164,7 +163,7 @@ bool ObjectSituationReplay::pause()
bool ObjectSituationReplay::resume()
{
INFO_LOG() << "resumed" << m_currentReplayTime;
INFO_LOG(m_logger) << "resumed" << m_currentReplayTime;
m_replayTimer->start(1000);
emit resumed(m_currentReplayTime);
return true;
@@ -172,7 +171,7 @@ bool ObjectSituationReplay::resume()
bool ObjectSituationReplay::stop()
{
INFO_LOG() << "stopped: " << m_currentReplayTime;
INFO_LOG(m_logger) << "stopped: " << m_currentReplayTime;
m_replayTimer->stop();
emit stopped();
return true;
@@ -188,10 +187,10 @@ void ObjectSituationReplay::onPublishReplayInformation()
m_data.endTime,
m_data.pace);
INFO_LOG() << "Publish SitReplay data: " << ddsData;
INFO_LOG(m_logger) << "Publish SitReplay data: " << ddsData;
if (!m_ddsInterface->dts()->publish(ddsData))
ERROR_LOG() << "Error publishing SitReplay data to dds";
ERROR_LOG(m_logger) << "Error publishing SitReplay data to dds";
}
void ObjectSituationReplay::onPublishReplayTime()
@@ -204,13 +203,13 @@ void ObjectSituationReplay::onPublishReplayTime()
void ObjectSituationReplay::onReplayTimerTimeout()
{
m_currentReplayTime += qRound64(m_data.pace * 1000);
DEBUG_LOG() << "onReplayTimerTimeout, endTime: " << m_data.endTime << " - " << m_currentReplayTime;
DEBUG_LOG(m_logger) << "onReplayTimerTimeout, endTime: " << m_data.endTime << " - " << m_currentReplayTime;
checkPublishData();
}
bool ObjectSituationReplay::checkPublishData()
{
INFO_LOG() << " checkPublishData...";
INFO_LOG(m_logger) << " checkPublishData...";
onPublishReplayTime();
if (m_data.endTime != 0 && m_data.endTime < m_currentReplayTime)
@@ -225,7 +224,7 @@ bool ObjectSituationReplay::checkPublishData()
// publish data for current time
m_dbReader->publish(m_currentReplayTime);
if (m_logger.isInfoEnabled()) INFO_LOG() << "m_dbReader->publish took " << timer.elapsed() << " [ms]";
if (m_logger.isInfoEnabled()) INFO_LOG(m_logger) << "m_dbReader->publish took " << timer.elapsed() << " [ms]";
if (qFuzzyIsNull(m_data.pace)) // pace == 0 -> snapshot
@@ -236,7 +235,7 @@ bool ObjectSituationReplay::checkPublishData()
if (switchToState(SrpState_def::Stopped).error())
return false;
if (m_logger.isInfoEnabled()) INFO_LOG() << "m_dbReader->waitForAsyncOperations took " << timerReadData.elapsed() << " [ms]";
if (m_logger.isInfoEnabled()) INFO_LOG(m_logger) << "m_dbReader->waitForAsyncOperations took " << timerReadData.elapsed() << " [ms]";
}
else
@@ -247,17 +246,17 @@ bool ObjectSituationReplay::checkPublishData()
if (!m_dbReader->readData(m_currentReplayTime, m_currentReplayTime + qRound64(m_data.pace * 1000)))
return false;
if (m_logger.isInfoEnabled()) INFO_LOG() << "m_dbReader->readData took " << timerReadData.elapsed() << " [ms]";
if (m_logger.isInfoEnabled()) INFO_LOG(m_logger) << "m_dbReader->readData took " << timerReadData.elapsed() << " [ms]";
}
}
INFO_LOG() << " checkPublishData... DONE";
INFO_LOG(m_logger) << " checkPublishData... DONE";
return true;
}
Core::FunctionReplyObject ObjectSituationReplay::switchToState(SrpState newSrpState)
{
Core::FunctionReplyObject ret(m_data.id);
INFO_LOG() << "-------------- switchTo: " << newSrpState
INFO_LOG(m_logger) << "-------------- switchTo: " << newSrpState
<< ", current: " << m_data.srpStateId;
if (m_data.srpStateId != newSrpState)
{