Adds immediate migration results in progress

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

No files matched your search

@@ -26,31 +26,31 @@ EffectorStateMachine::~EffectorStateMachine() { stopAllTimer(); }
int EffectorStateMachine::intervalFire()
{
DEBUG_LOG() << "intervalFire";
DEBUG_LOG(m_logger) << "intervalFire";
return QRandomGenerator::global()->bounded(Settings::getEffectorIntervalFireMin(), Settings::getEffectorIntervalFireMax() + 1);
}
int EffectorStateMachine::intervalReportFired()
{
DEBUG_LOG() << "intervalReportFired";
DEBUG_LOG(m_logger) << "intervalReportFired";
return QRandomGenerator::global()->bounded(Settings::getEffectorIntervalReportFiredMin(), Settings::getEffectorIntervalReportFiredMax() + 1);
}
int EffectorStateMachine::intervalReportFireReadiness()
{
DEBUG_LOG() << "intervalReportFireReadiness";
DEBUG_LOG(m_logger) << "intervalReportFireReadiness";
return QRandomGenerator::global()->bounded(m_intervalReportFireReadinessMin, m_intervalReportFireReadinessMax + 1);
}
int EffectorStateMachine::intervalInitialFireReadiness()
{
DEBUG_LOG() << "intervalInitialFireReadiness";
DEBUG_LOG(m_logger) << "intervalInitialFireReadiness";
return QRandomGenerator::global()->bounded(Settings::getEffectorInitialReportFireReadinessMin(), Settings::getEffectorInitialReportFireReadinessMax() + 1);
}
void EffectorStateMachine::init()
{
DEBUG_LOG() << "EffectorStateMachine::init";
DEBUG_LOG(m_logger) << "EffectorStateMachine::init";
emit logMessage(
QStringLiteral("intervalFire min=%1 max=%2, intervalReportFired min=%3 max=%4, intervalReportFireReadiness min=%5 max=%6 , initialFireReadiness min=%7 max=%8")
.arg(
@@ -109,7 +109,7 @@ QString EffectorStateMachine::getStateStr(AreaEffectSimulation::AesEffectorState
bool EffectorStateMachine::overrideReportFireReadinessMinMax(int newMin, int newMax)
{
DEBUG_LOG() << "Override ReadinessMinMax min: " << newMin << " max: " << newMax;
DEBUG_LOG(m_logger) << "Override ReadinessMinMax min: " << newMin << " max: " << newMax;
m_intervalReportFireReadinessMin = newMin;
m_intervalReportFireReadinessMax = newMax;
@@ -118,7 +118,7 @@ bool EffectorStateMachine::overrideReportFireReadinessMinMax(int newMin, int new
bool EffectorStateMachine::resetReportFireReadinessMinMax()
{
DEBUG_LOG() << "Reset ReadinessMinMax min:" << Settings::getEffectorIntervalReportFireReadinessMin()
DEBUG_LOG(m_logger) << "Reset ReadinessMinMax min:" << Settings::getEffectorIntervalReportFireReadinessMin()
<< " max: " << Settings::getEffectorIntervalReportFireReadinessMax();
m_intervalReportFireReadinessMin = Settings::getEffectorIntervalReportFireReadinessMin();
@@ -156,7 +156,7 @@ bool EffectorStateMachine::reportNotFireReadiness()
}
QString timestamp = QDateTime::currentDateTime().toString(QStringLiteral("hh:mm:ss"));
emit logMessage(QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr));
DEBUG_LOG() << QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr);
DEBUG_LOG(m_logger) << QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr);
emit signalNotReadyToFire();
return true;
}
@@ -199,7 +199,7 @@ bool EffectorStateMachine::reportFireReadiness()
bool EffectorStateMachine::fireOrder()
{
DEBUG_LOG() << "fireOrder";
DEBUG_LOG(m_logger) << "fireOrder";
AreaEffectSimulation::AesEffectorState newState = AreaEffectSimulation::AesEffectorState::EsReceivedOrder;
@@ -209,7 +209,7 @@ bool EffectorStateMachine::fireOrder()
if (m_currentState == newState)
{
emit logMessage(QStringLiteral("Same State from %1 -> %2").arg(oldStateStr, newStateStr));
DEBUG_LOG() << QStringLiteral("Same State from %1 -> %2").arg(oldStateStr, newStateStr);
DEBUG_LOG(m_logger) << QStringLiteral("Same State from %1 -> %2").arg(oldStateStr, newStateStr);
return false;
}
@@ -220,7 +220,7 @@ bool EffectorStateMachine::fireOrder()
if (Settings::getEffectorIntervalFireMin() >= 0)
{
emit logMessage(QStringLiteral("m_timerFire.start()"));
DEBUG_LOG() << QStringLiteral("m_timerFire.start()");
DEBUG_LOG(m_logger) << QStringLiteral("m_timerFire.start()");
m_timerFire.setInterval(intervalFire());
m_timerFire.start();
}
@@ -228,12 +228,12 @@ bool EffectorStateMachine::fireOrder()
else
{
emit logMessage(QStringLiteral("No Statechange possible from %1 -> %2").arg(oldStateStr, newStateStr));
DEBUG_LOG() << QStringLiteral("No Statechange possible from %1 -> %2").arg(oldStateStr, newStateStr);
DEBUG_LOG(m_logger) << QStringLiteral("No Statechange possible from %1 -> %2").arg(oldStateStr, newStateStr);
return false;
}
QString timestamp = QDateTime::currentDateTime().toString(QStringLiteral("hh:mm:ss"));
emit logMessage(QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr));
DEBUG_LOG() << QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr);
DEBUG_LOG(m_logger) << QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr);
emit signalReceivedOrder();
return true;
}