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/EffectShowManagement/handler_effect_show.cpp
+44 -44
View File
@@ -54,7 +54,7 @@ bool HandlerEffectShow::init()
if (ret.error())
{
delete ifs;
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
bRet = false;
return;
}
@@ -62,7 +62,7 @@ bool HandlerEffectShow::init()
};
if (!m_mainHandler->db()->select(cbEffectShow) || !bRet)
{
ERROR_LOG() << "Error reading data from database 'esm_effect_show!";
ERROR_LOG(m_logger) << "Error reading data from database 'esm_effect_show!";
return false;
}
@@ -73,13 +73,13 @@ bool HandlerEffectShow::init()
connect(m_cleanupTimer, &QTimer::timeout, this, &HandlerEffectShow::onCleanUp);
m_cleanupTimer->start(CLEANUPTIME); //10 minutes
DEBUG_LOG() << "m_effectShowObjMap.size() = " << m_effectShowObjMap.size();
DEBUG_LOG(m_logger) << "m_effectShowObjMap.size() = " << m_effectShowObjMap.size();
return true;
} // end of init()
//=============================================================================
void HandlerEffectShow::onExplosionAreaChanged(const AreaEffectSimulation::ExplosionArea &data, KindOfModification_e kindOfModification)
{
INFO_LOG() << "onExplosionAreaChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
INFO_LOG(m_logger) << "onExplosionAreaChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
switch (kindOfModification)
{
case KindOfModification_e::Added:
@@ -113,7 +113,7 @@ void HandlerEffectShow::onExplosionAreaChanged(const AreaEffectSimulation::Explo
void HandlerEffectShow::onExplosionClusterChanged(const AreaEffectSimulation::ExplosionCluster &data, HandlerEffectShow::KindOfModification_e kindOfModification)
{
INFO_LOG() << "onExplosionClusterChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
INFO_LOG(m_logger) << "onExplosionClusterChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
switch (kindOfModification)
{
case KindOfModification_e::Added:
@@ -148,7 +148,7 @@ void HandlerEffectShow::onExplosionClusterChanged(const AreaEffectSimulation::Ex
void HandlerEffectShow::onEffectClusterChanged(const AreaEffectSimulation::EffectCluster &data, KindOfModification_e kindOfModification)
{
INFO_LOG() << "onEffectClusterChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
INFO_LOG(m_logger) << "onEffectClusterChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
switch (kindOfModification)
{
case KindOfModification_e::Added:
@@ -184,7 +184,7 @@ void HandlerEffectShow::onEffectClusterChanged(const AreaEffectSimulation::Effec
//=============================================================================
void HandlerEffectShow::onMineAreaChanged(const AreaEffectSimulation::MineArea &data, KindOfModification_e kindOfModification)
{
INFO_LOG() << "onMineAreaChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
INFO_LOG(m_logger) << "onMineAreaChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
switch (kindOfModification)
{
case KindOfModification_e::Added:
@@ -218,12 +218,12 @@ void HandlerEffectShow::onMineAreaChanged(const AreaEffectSimulation::MineArea &
//=============================================================================
void HandlerEffectShow::effectShowOrderConfirmationReceived(const ConvertFromTab::OrderConfirmation_t &orderConfirmation)
{
DEBUG_LOG() << "onEffectShowConfirmationReceived()";
DEBUG_LOG(m_logger) << "onEffectShowConfirmationReceived()";
ObjectEffectShow *ifs = m_effectShowObjMap.value(orderConfirmation.orderId);
if (ifs == nullptr)
{
WARNING_LOG() << "Error receiving effect show ID not known: " << orderConfirmation.orderId;
WARNING_LOG(m_logger) << "Error receiving effect show ID not known: " << orderConfirmation.orderId;
return;
}
const auto oldId = ifs->getData().orderConfirmation;
@@ -233,7 +233,7 @@ void HandlerEffectShow::effectShowOrderConfirmationReceived(const ConvertFromTab
if (oldId != ifs->getData().orderConfirmation && ifs->getData().orderConfirmation == EffectShowManagement::OrderConfirmation_e::FiringReadiness)
{
DEBUG_LOG() << "effectShowOrderConfirmationReceived Got Fire Readyness, send to aes for " << ifs->getId();
DEBUG_LOG(m_logger) << "effectShowOrderConfirmationReceived Got Fire Readyness, send to aes for " << ifs->getId();
AreaEffectSimulation::SetAesItemEffectorStateRequest req;
req.aesId(ifs->getIdAES());
req.newEffectorState(AreaEffectSimulation::AesEffectorState::EsReadyToFire);
@@ -263,7 +263,7 @@ void HandlerEffectShow::createEffectShow(const Database::EsmEffectShow &data, bo
if (ret.error())
{
delete ifs;
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
}
else
{
@@ -277,10 +277,10 @@ void HandlerEffectShow::onEffectShowModifyRequest(
const rti::core::SampleIdentity &cookie,
const EffectShow &request)
{
DEBUG_LOG() << "onEffectShowModifyRequest: " << request.id();
DEBUG_LOG(m_logger) << "onEffectShowModifyRequest: " << request.id();
if (request.id() <= 0)
{
ERROR_LOG() << "Illegal Effect Show Id: " << request.id();
ERROR_LOG(m_logger) << "Illegal Effect Show Id: " << request.id();
return;
}
@@ -289,7 +289,7 @@ void HandlerEffectShow::onEffectShowModifyRequest(
auto ret = effectShowModifyRequest(request);
if (ret.error())
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
m_mainHandler->dds()->fts()->effectShowModifyReply(cookie, ret);
@@ -319,7 +319,7 @@ Core::FunctionReplyObject HandlerEffectShow::effectShowModifyRequest(const Effec
triggerEffectShowOrder(ifs); // trigger effect show order to effect show actor
if (ret.error())
WARNING_LOG() << ret();
WARNING_LOG(m_logger) << ret();
return ret;
}
@@ -327,7 +327,7 @@ Core::FunctionReplyObject HandlerEffectShow::effectShowModifyRequest(const Effec
void HandlerEffectShow::onEffectShowRemoveRequest(const rti::core::SampleIdentity &cookie,
const Core::RemoveElementRequest &request)
{
DEBUG_LOG() << "onEffectShowRemoveRequest: " << request.id();
DEBUG_LOG(m_logger) << "onEffectShowRemoveRequest: " << request.id();
ObjectEffectShow *ifs = m_effectShowObjMap.value(request.id());
Core::FunctionReplyObject ret;
@@ -377,7 +377,7 @@ void HandlerEffectShow::createEffectShowsRelatedToMineArea(const AreaEffectSimul
for (const auto &esmEffectShow : esmEffectShows)
{
createEffectShow(esmEffectShow);
DEBUG_LOG() << toString(esmEffectShow);
DEBUG_LOG(m_logger) << toString(esmEffectShow);
}
}
//-------------------------------------------------------------------------------
@@ -387,7 +387,7 @@ void HandlerEffectShow::createEffectShowsRelatedToExplosionArea(const AreaEffect
for (const auto &esmEffectShow : esmEffectShows)
{
createEffectShow(esmEffectShow);
DEBUG_LOG() << toString(esmEffectShow);
DEBUG_LOG(m_logger) << toString(esmEffectShow);
}
}
@@ -397,7 +397,7 @@ void HandlerEffectShow::createEffectShowsRelatedToExplosionCluster(const AreaEff
for (const auto &esmEffectShow : esmEffectShows)
{
createEffectShow(esmEffectShow);
DEBUG_LOG() << toString(esmEffectShow);
DEBUG_LOG(m_logger) << toString(esmEffectShow);
}
}
@@ -407,7 +407,7 @@ void HandlerEffectShow::createEffectShowsRelatedToEffectCluster(const AreaEffect
for (const auto &esmEffectShow : esmEffectShows)
{
createEffectShow(esmEffectShow);
DEBUG_LOG() << toString(esmEffectShow);
DEBUG_LOG(m_logger) << toString(esmEffectShow);
}
}
//-------------------------------------------------------------------------------
@@ -415,7 +415,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
{
QVector<Database::EsmEffectShow> ret;
DEBUG_LOG() << "createEffectShowDbDataRelatedToExplosionArea: ";
DEBUG_LOG(m_logger) << "createEffectShowDbDataRelatedToExplosionArea: ";
EffectShowMineArea effectShowMineArea(data);
Database::EsmEffectShow esmEffectShow = effectShowMineArea.getEffectShow();
@@ -427,7 +427,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
{
QVector<Database::EsmEffectShow> ret;
DEBUG_LOG() << "createEffectShowDbDataRelatedToExplosionArea: ";
DEBUG_LOG(m_logger) << "createEffectShowDbDataRelatedToExplosionArea: ";
EffectShowExplosionArea effectShowExplosionArea(data, m_mainHandler->handlerPdmData());
@@ -436,7 +436,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
//create exact 1
ret.reserve(1);
Database::EsmEffectShow esmEffectShow = effectShowExplosionArea.getEffectShow(0);
DEBUG_LOG() << toString(esmEffectShow);
DEBUG_LOG(m_logger) << toString(esmEffectShow);
ret.push_back(std::move(esmEffectShow));
}
else
@@ -466,7 +466,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
esmEffectShow.shotsPerVolley = effectShowExplosionArea.getShotsPerArea();
if (esmEffectShow.shotsPerVolley < esmEffectShow.numOfVolley)
esmEffectShow.shotsPerVolley = esmEffectShow.numOfVolley; // set minimum shots per volley
DEBUG_LOG() << toString(esmEffectShow);
DEBUG_LOG(m_logger) << toString(esmEffectShow);
ret.push_back(std::move(esmEffectShow));
}
@@ -486,7 +486,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
Database::EsmEffectShow esmEffectShow = effectShowExplosionCluster.getEffectShow(0);
if(data.esmParticipantIds().size() > 0)
esmEffectShow.esmParticipantId = data.esmParticipantIds().at(0); // TODO handle vector
DEBUG_LOG() << toString(esmEffectShow);
DEBUG_LOG(m_logger) << toString(esmEffectShow);
ret.push_back(std::move(esmEffectShow));
}
else
@@ -516,7 +516,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
esmEffectShow.shotsPerVolley = effectShowExplosionCluster.getShotsPerArea();
if (esmEffectShow.shotsPerVolley < esmEffectShow.numOfVolley)
esmEffectShow.shotsPerVolley = esmEffectShow.numOfVolley; // set minimum shots per volley
DEBUG_LOG() << toString(esmEffectShow);
DEBUG_LOG(m_logger) << toString(esmEffectShow);
// Evlt. nicht bei DM42 (dann ist max > 1)
if(data.esmParticipantIds().size() > 0)
@@ -539,7 +539,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
Database::EsmEffectShow esmEffectShow = effectShowEffectCluster.getEffectShow(0);
if(data.esmParticipantIds().size() > 0)
esmEffectShow.esmParticipantId = data.esmParticipantIds().at(0); // TODO handle vector
DEBUG_LOG() << toString(esmEffectShow);
DEBUG_LOG(m_logger) << toString(esmEffectShow);
ret.push_back(std::move(esmEffectShow));
}
else
@@ -569,12 +569,12 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
esmEffectShow.shotsPerVolley = effectShowEffectCluster.getShotsPerArea();
if (esmEffectShow.shotsPerVolley < esmEffectShow.numOfVolley)
esmEffectShow.shotsPerVolley = esmEffectShow.numOfVolley; // set minimum shots per volley
//DEBUG_LOG() << toString(esmEffectShow);
//DEBUG_LOG(m_logger) << toString(esmEffectShow);
// Evlt. nicht bei DM42 (dann ist max > 1)
if(data.esmParticipantIds().size() > (size_t)i)
esmEffectShow.esmParticipantId = data.esmParticipantIds().at(i); // TODO handle vector
DEBUG_LOG() << toString(esmEffectShow);
DEBUG_LOG(m_logger) << toString(esmEffectShow);
ret.push_back(std::move(esmEffectShow));
}
@@ -584,7 +584,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
//-------------------------------------------------------------------------------
void HandlerEffectShow::removeEffectShowsRelatedToAes(int idAes, bool retract)
{
DEBUG_LOG() << "removeEffectShowsRelatedToAes(" << idAes << ")";
DEBUG_LOG(m_logger) << "removeEffectShowsRelatedToAes(" << idAes << ")";
auto it = m_effectShowObjMap.begin();
while (it != m_effectShowObjMap.end())
{
@@ -595,7 +595,7 @@ void HandlerEffectShow::removeEffectShowsRelatedToAes(int idAes, bool retract)
(it.value()->getData().orderConfirmation != EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut))
remove = true;
else
INFO_LOG() << "Effect Show: " << it.value()->getId() << " not removed due to EXECUTION / ORDER CARRIED OUT";
INFO_LOG(m_logger) << "Effect Show: " << it.value()->getId() << " not removed due to EXECUTION / ORDER CARRIED OUT";
}
if (remove)
{
@@ -782,7 +782,7 @@ Core::FunctionReplyObject HandlerEffectShow::removeEffectShow(ObjectEffectShow *
Core::FunctionReplyObject ret = ifs->removeObject();
if (ret.error())
{
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
return ret;
}
@@ -791,9 +791,9 @@ Core::FunctionReplyObject HandlerEffectShow::removeEffectShow(ObjectEffectShow *
// remove from map
if (!m_effectShowObjMap.remove(effectShowId) && bWarnWhenNotInMap)
WARNING_LOG() << "Remove of EffectShow(" << effectShowId << ") failed.";
WARNING_LOG(m_logger) << "Remove of EffectShow(" << effectShowId << ") failed.";
else
DEBUG_LOG() << "EffectShow(" << effectShowId << ") removed.";
DEBUG_LOG(m_logger) << "EffectShow(" << effectShowId << ") removed.";
return ret;
}
@@ -801,7 +801,7 @@ Core::FunctionReplyObject HandlerEffectShow::removeEffectShow(ObjectEffectShow *
void HandlerEffectShow::triggerEffectShowOrder(const ObjectEffectShow *ifs)
{
const Database::EsmEffectShow &effectShow = ifs->getData();
INFO_LOG() << "triggerEffectShowOrder for id " << ifs->getId()
INFO_LOG(m_logger) << "triggerEffectShowOrder for id " << ifs->getId()
<< ", aesId: " << ifs->getIdAES()
<< ", actor: " << effectShow.esmParticipantId;
if (effectShow.esmParticipantId == -1)
@@ -816,7 +816,7 @@ void HandlerEffectShow::triggerEffectShowOrder(const ObjectEffectShow *ifs)
void HandlerEffectShow::triggerRetractOrder(const ObjectEffectShow *ifs)
{
const Database::EsmEffectShow &effectShow = ifs->getData();
INFO_LOG() << "triggerRetractOrder for id " << ifs->getId()
INFO_LOG(m_logger) << "triggerRetractOrder for id " << ifs->getId()
<< ", aesId: " << ifs->getIdAES()
<< ", actor: " << effectShow.esmParticipantId;
if (effectShow.esmParticipantId == -1)
@@ -832,7 +832,7 @@ void HandlerEffectShow::triggerRetractOrder(const ObjectEffectShow *ifs)
void HandlerEffectShow::triggerEffectShowStop(const ObjectEffectShow *ifs)
{
const Database::EsmEffectShow &effectShow = ifs->getData();
INFO_LOG() << "triggerEffectShowStop for id " << ifs->getId()
INFO_LOG(m_logger) << "triggerEffectShowStop for id " << ifs->getId()
<< ", aesId: " << ifs->getIdAES()
<< ", actor: " << effectShow.esmParticipantId;
if (effectShow.esmParticipantId == -1)
@@ -846,7 +846,7 @@ void HandlerEffectShow::triggerEffectShowStop(const ObjectEffectShow *ifs)
void HandlerEffectShow::triggerEffectShowContinue(const ObjectEffectShow *ifs)
{
const Database::EsmEffectShow &effectShow = ifs->getData();
INFO_LOG() << "triggerEffectShowContinue for id " << ifs->getId()
INFO_LOG(m_logger) << "triggerEffectShowContinue for id " << ifs->getId()
<< ", aesId: " << ifs->getIdAES()
<< ", actor: " << effectShow.esmParticipantId;
if (effectShow.esmParticipantId == -1)
@@ -868,7 +868,7 @@ void HandlerEffectShow::triggerMeteoData(const ObjectEffectShow *ifs)
{
if (!meteoData.windOk() && !meteoData.climateOk())
{
WARNING_LOG() << "Found MeteoStation but no weather Data available, try again in 1 minute";
WARNING_LOG(m_logger) << "Found MeteoStation but no weather Data available, try again in 1 minute";
QTimer::singleShot(6000, this, &HandlerEffectShow::onSendMeteoData);
return;
}
@@ -879,12 +879,12 @@ void HandlerEffectShow::triggerMeteoData(const ObjectEffectShow *ifs)
// meteo data available
qint64 deltaTime = m_mainHandler->dds()->currentPartitionTime() - meteoData.timeStamp();
if (deltaTime > (60 * 15 * 1000))
WARNING_LOG() << "Age of meteo data=" << (deltaTime / 60000) << "min for vehicle: " << equipmentNumber;
WARNING_LOG(m_logger) << "Age of meteo data=" << (deltaTime / 60000) << "min for vehicle: " << equipmentNumber;
}
else
{
int equipmentNumber = m_mainHandler->handlerPpmData()->getEquipmentNumber(effectShow.esmParticipantId);
WARNING_LOG() << "Meteo data not available for effect show vehicle: " << equipmentNumber;
WARNING_LOG(m_logger) << "Meteo data not available for effect show vehicle: " << equipmentNumber;
}
}
@@ -907,7 +907,7 @@ void HandlerEffectShow::onSendMeteoData()
void HandlerEffectShow::onCleanUp()
{
DEBUG_LOG() << "Start Cleanup ";
DEBUG_LOG(m_logger) << "Start Cleanup ";
QVector<ObjectEffectShow * > objects;
for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
{
@@ -915,11 +915,11 @@ void HandlerEffectShow::onCleanUp()
if (effectShow.orderConfirmation == OrderConfirmation_e::OrderCarriedOut || effectShow.startTime <= 0 || effectShow.id <= 0)
continue;
DEBUG_LOG() << "Effect show with ID " << effectShow.id << " will expire at: " << QDateTime::fromMSecsSinceEpoch(effectShow.startTime + effectShow.duration + CLEANUPTIME).toString() << " current time: " << QDateTime::fromMSecsSinceEpoch(m_mainHandler->dds()->currentPartitionTime()).toString();
DEBUG_LOG(m_logger) << "Effect show with ID " << effectShow.id << " will expire at: " << QDateTime::fromMSecsSinceEpoch(effectShow.startTime + effectShow.duration + CLEANUPTIME).toString() << " current time: " << QDateTime::fromMSecsSinceEpoch(m_mainHandler->dds()->currentPartitionTime()).toString();
if ((effectShow.startTime + effectShow.duration + CLEANUPTIME) < m_mainHandler->dds()->currentPartitionTime())
{
//remove object
DEBUG_LOG() << "Remove Effect Show " << effectShow.id ;
DEBUG_LOG(m_logger) << "Remove Effect Show " << effectShow.id ;
objects.append(obj);
}
}