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/main_handler_sqlite.cpp
+11 -11
View File
@@ -53,7 +53,7 @@ bool MainHandlerSqlite::initDb(const ReplayInformation &replayInformation,
{
if (!m_ddsInterface)
{
WARNING_LOG() << "dds must be initialized first!";
WARNING_LOG(m_logger) << "dds must be initialized first!";
return false;
}
@@ -102,15 +102,15 @@ bool MainHandlerSqlite::initDb(const ReplayInformation &replayInformation,
m_dbHandler = std::make_shared<DbHandler>();
if (!m_dbHandler->init(partitionIdIn, m_dbSqlite))
{
ERROR_LOG() << "Initialisation dbHandler failed.";
ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
return false;
}
DEBUG_LOG() << "opening sqlite db successful";
DEBUG_LOG(m_logger) << "opening sqlite db successful";
m_dbReader = std::make_shared<DbReader>(m_ddsInterface->ddsReplay(), partitionIdIn, false);
if (!m_dbReader->init(m_dbHandler->db()->database()))
{
ERROR_LOG() << "Could not initialize database reader";
ERROR_LOG(m_logger) << "Could not initialize database reader";
return false;
}
@@ -120,7 +120,7 @@ bool MainHandlerSqlite::initDb(const ReplayInformation &replayInformation,
if (!initSrpHandler(partitionIdIn, m_ddsInterface->ddsReplay()->getPartitionId(),
replayInformation.timeSpan.begin, replayInformation.timeSpan.end))
{
ERROR_LOG() << "Could not initialize situation replay handler";
ERROR_LOG(m_logger) << "Could not initialize situation replay handler";
return false;
}
@@ -178,14 +178,14 @@ bool MainHandlerSqlite::loadReplayConfig(const QString &replayConfigPath)
QFile f(replayConfigPath);
if (!f.open(QIODevice::ReadOnly))
{
WARNING_LOG() << "Could not open '" << replayConfigPath << "' for reading - no replay config loaded";
WARNING_LOG(m_logger) << "Could not open '" << replayConfigPath << "' for reading - no replay config loaded";
return false;
}
QJsonParseError error;
const QJsonDocument doc(QJsonDocument::fromJson(f.readAll(), &error));
if (error.error != QJsonParseError::NoError)
{
WARNING_LOG() << "Could not parse replay config loaded json file: " << error.errorString();
WARNING_LOG(m_logger) << "Could not parse replay config loaded json file: " << error.errorString();
return false;
}
const QJsonObject obj = doc.object();
@@ -246,7 +246,7 @@ void MainHandlerSqlite::maybeAddNewOverlay(qint64 curTime)
return;
m_curOverlayArrayIdx = nextIdx;
m_currentVisibleOverlays += m_overlays.at(nextIdx);
DEBUG_LOG() << "Showing new overlay with id " << m_overlays.at(m_curOverlayArrayIdx).overlayId
DEBUG_LOG(m_logger) << "Showing new overlay with id " << m_overlays.at(m_curOverlayArrayIdx).overlayId
<< " at time " << curTime;
emit applyNewOverlay(m_overlays.at(m_curOverlayArrayIdx).overlayId);
}
@@ -254,7 +254,7 @@ void MainHandlerSqlite::maybeAddNewOverlay(qint64 curTime)
void MainHandlerSqlite::removeOutdatedOverlays(qint64 curTime)
{
DEBUG_LOG() << Q_FUNC_INFO << " curTime = "<< curTime
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " curTime = "<< curTime
<< " m_currentVisibleOverlays.size()= "<< m_currentVisibleOverlays.size();
const qint64 curTimeRelative = curTime - m_replay.timeSpan.begin + m_replay.relativeTimeSpan.begin; // + m_replay.relativeTimeSpan.begin
@@ -262,7 +262,7 @@ void MainHandlerSqlite::removeOutdatedOverlays(qint64 curTime)
{
const qint64 endTime = m_currentVisibleOverlays.at(i).relativeTimeSpan.end;
DEBUG_LOG() << Q_FUNC_INFO << " curTimeRelative = " << curTimeRelative << " endTime = " << endTime;
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " curTimeRelative = " << curTimeRelative << " endTime = " << endTime;
if (curTimeRelative > endTime)
{
@@ -308,7 +308,7 @@ int MainHandlerSqlite::findNextIndex(qint64 curTime, int curIdx, const QVector<F
// startTime: msec, rel. to begin of SCRIPT
const qint64 startTime = data.at(nextIdx).relativeTimeSpan.begin;
DEBUG_LOG() << Q_FUNC_INFO << " curTimeRelative = " << curTimeRelative << " startTime = " << startTime;
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " curTimeRelative = " << curTimeRelative << " startTime = " << startTime;
if (curTimeRelative < startTime)
return -1;