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

@@ -79,9 +79,9 @@ AesHandler::AesHandler(NgsHandler *ngsHandler)
void AesHandler::onMineAreaModifyReply(const Core::FunctionReplyObject &replyObject)
{
if (replyObject.error())
WARNING_LOG() << "ModifyReply: " << replyObject();
WARNING_LOG(m_logger) << "ModifyReply: " << replyObject();
else
DEBUG_LOG() << "ModifyReply: " << replyObject();
DEBUG_LOG(m_logger) << "ModifyReply: " << replyObject();
m_requestHelper->requestReply(replyObject);
}
@@ -176,7 +176,7 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
for (const auto &pos : data.form())
formString << ParticipantPosition(pos).toString();
DEBUG_LOG() << "\n##############################"
DEBUG_LOG(m_logger) << "\n##############################"
<< "\n##### AesItemViewChanged #####"
<< "\n##############################"
<< "\nid: " << data.id()
@@ -196,7 +196,7 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
data.effectStateId() == AesEffectState::EsExpired ||
data.effectStateId() == AesEffectState::EsRemoved)
{
DEBUG_LOG() << "Item view with id " << data.aesItemId() << " removed";
DEBUG_LOG(m_logger) << "Item view with id " << data.aesItemId() << " removed";
m_aesItemViews.remove(data.aesItemId());
m_takenIndicesForAesItem.remove(data.aesItemId());
m_ngsHandler->ngsConnector()->setItemForm(data.aesItemId());
@@ -205,7 +205,7 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
else if (data.effectStateId() == AesEffectState::EsPrepared &&
data.aesTypeId() == AesType_def::AtExplosionAreaSingleExplosions)
{
DEBUG_LOG() << "Item view with id " << data.aesItemId() << " added";
DEBUG_LOG(m_logger) << "Item view with id " << data.aesItemId() << " added";
m_aesItemViews.insert(data.aesItemId(), data);
m_takenIndicesForAesItem.insert(data.aesItemId(), QVector<int32_t>());
}
@@ -213,7 +213,7 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
else if (data.aesTypeId() == AesType_def::AtBCContamination)
{
m_ngsHandler->ngsConnector()->setItemForm(data.aesItemId(), data.aesTypeId().underlying(), data.form());
DEBUG_LOG() << "Item view with id " << data.aesItemId() << " directly updated in ngsConnector";
DEBUG_LOG(m_logger) << "Item view with id " << data.aesItemId() << " directly updated in ngsConnector";
}
}
@@ -229,7 +229,7 @@ void AesHandler::onTriggeredImpactsChanged(const TriggeredImpacts &data, DataMod
}
bitfield.append(QStringLiteral("]"));
DEBUG_LOG() << "\n#####################################"
DEBUG_LOG(m_logger) << "\n#####################################"
<< "\n##### triggered impacts changed #####"
<< "\n#####################################"
<< "\nid: " << data.id()
@@ -349,7 +349,7 @@ void AesHandler::onAesExplosionSingleChanged(const ExplosionSingle &data, DataMo
DEBUG_LOG() << "\n####################################"
DEBUG_LOG(m_logger) << "\n####################################"
<< "\n##### single explosion changed #####"
<< "\n####################################"
<< "\nid: " << data.id()
@@ -387,7 +387,7 @@ void AesHandler::onAesMineAreaChanged(const MineArea &data, DataModification mod
{
Q_UNUSED(modType);
DEBUG_LOG() << "\n#############################"
DEBUG_LOG(m_logger) << "\n#############################"
<< "\n##### mine area changed #####"
<< "\n#############################"
<< "\nid: " << data.id()
@@ -410,7 +410,7 @@ void AesHandler::onAesMineCorridorChanged(const MineCorridor &data, DataModifica
{
Q_UNUSED(modType);
DEBUG_LOG() << "\n#################################"
DEBUG_LOG(m_logger) << "\n#################################"
<< "\n##### mine corridor changed #####"
<< "\n#################################"
<< "\nid: " << data.id()
@@ -435,7 +435,7 @@ void AesHandler::onAesNContaminationChanged(const NContamination &data, DataModi
Q_UNUSED(modType);
m_ngsHandler->ngsConnector()->guezNuclearAgent(data);
DEBUG_LOG() << "\n####################################"
DEBUG_LOG(m_logger) << "\n####################################"
<< "\n##### n contamination changed #####"
<< "\n####################################"
<< "\nid: " << data.id()
@@ -458,7 +458,7 @@ void AesHandler::onAesBCContaminationChanged(const BCContamination &data, DataMo
Q_UNUSED(modType);
m_ngsHandler->ngsConnector()->guezChemicalAgent(data);
DEBUG_LOG() << "\n####################################"
DEBUG_LOG(m_logger) << "\n####################################"
<< "\n##### bc contamination changed #####"
<< "\n####################################"
<< "\nid: " << data.id()
@@ -563,7 +563,7 @@ void AesHandler::onAesRemoveItem(qint64 identifierInt)
AesType type = m_dtcAes->aesItemIdFromExternalId(identifierInt, aesItemId);
Core::RemoveElementRequest req(aesItemId);
DEBUG_LOG() << "Remove Item for " << aesItemId << " requested. Type: " << type;
DEBUG_LOG(m_logger) << "Remove Item for " << aesItemId << " requested. Type: " << type;
switch (type.underlying())
{
@@ -647,11 +647,11 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi
}
case AreaEffectSimulation::AesType_def::AtMineArea:
{
DEBUG_LOG() << "onAesActivationTimeChanged / MineArea";
DEBUG_LOG(m_logger) << "onAesActivationTimeChanged / MineArea";
MineAreaModifyRequest *req = static_cast<MineAreaModifyRequest*>(m_pendingRequests.value(aesItemId));
if (!req)
{
DEBUG_LOG() << "onAesActivationTimeChanged / MineArea - Request NOT found";
DEBUG_LOG(m_logger) << "onAesActivationTimeChanged / MineArea - Request NOT found";
AreaEffectSimulation::MineArea item = m_dtcAes->mineArea(aesItemId);
if ((item.effectStart().is_set() && item.effectStart().get() == msecsSinceEpoch) || !isModifiable(item))
return;
@@ -958,7 +958,7 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector<
int aesItemId = 0;
AesType type = m_dtcAes->aesItemIdFromExternalId(identifierInt, aesItemId);
DEBUG_LOG() << "Points Data changed for Aes Item ID: " << aesItemId << ". Type: " << type;
DEBUG_LOG(m_logger) << "Points Data changed for Aes Item ID: " << aesItemId << ". Type: " << type;
switch (type.underlying())
{
@@ -980,7 +980,7 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector<
std::vector<Core::GeoPosition2D> segments;
if (!getCorridorSegment(pos, segments, width))
{
ERROR_LOG() << "Could not calculate Mine Area from given Points Data!";
ERROR_LOG(m_logger) << "Could not calculate Mine Area from given Points Data!";
return;
}
req->segments(segments);
@@ -1003,7 +1003,7 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector<
std::vector<Core::GeoPosition2D> segments;
if (!getCorridorSegment(pos, segments, width))
{
ERROR_LOG() << "Could not calculate Mine Area from given Points Data!";
ERROR_LOG(m_logger) << "Could not calculate Mine Area from given Points Data!";
return;
}
req->segments(segments);