Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
+44
-45
@@ -33,7 +33,6 @@ HandlerEffectShow::HandlerEffectShow(Initialization *mainHandler,
|
||||
, m_cleanupTimer(new QTimer(this))
|
||||
, m_timerMeteoData(new QTimer(this))
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger("HandlerEffectShow"))
|
||||
{} // end of ctor()
|
||||
//=============================================================================
|
||||
|
||||
@@ -55,7 +54,7 @@ bool HandlerEffectShow::init()
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
bRet = false;
|
||||
return;
|
||||
}
|
||||
@@ -63,7 +62,7 @@ bool HandlerEffectShow::init()
|
||||
};
|
||||
if (!m_mainHandler->db()->select(cbEffectShow) || !bRet)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database 'esm_effect_show!";
|
||||
ERROR_LOG() << "Error reading data from database 'esm_effect_show!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -74,13 +73,13 @@ bool HandlerEffectShow::init()
|
||||
connect(m_cleanupTimer, &QTimer::timeout, this, &HandlerEffectShow::onCleanUp);
|
||||
m_cleanupTimer->start(CLEANUPTIME); //10 minutes
|
||||
|
||||
DEBUG_LOG(m_logger) << "m_effectShowObjMap.size() = " << m_effectShowObjMap.size();
|
||||
DEBUG_LOG() << "m_effectShowObjMap.size() = " << m_effectShowObjMap.size();
|
||||
return true;
|
||||
} // end of init()
|
||||
//=============================================================================
|
||||
void HandlerEffectShow::onExplosionAreaChanged(const AreaEffectSimulation::ExplosionArea &data, KindOfModification_e kindOfModification)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onExplosionAreaChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
|
||||
INFO_LOG() << "onExplosionAreaChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
|
||||
switch (kindOfModification)
|
||||
{
|
||||
case KindOfModification_e::Added:
|
||||
@@ -114,7 +113,7 @@ void HandlerEffectShow::onExplosionAreaChanged(const AreaEffectSimulation::Explo
|
||||
|
||||
void HandlerEffectShow::onExplosionClusterChanged(const AreaEffectSimulation::ExplosionCluster &data, HandlerEffectShow::KindOfModification_e kindOfModification)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onExplosionClusterChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
|
||||
INFO_LOG() << "onExplosionClusterChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
|
||||
switch (kindOfModification)
|
||||
{
|
||||
case KindOfModification_e::Added:
|
||||
@@ -149,7 +148,7 @@ void HandlerEffectShow::onExplosionClusterChanged(const AreaEffectSimulation::Ex
|
||||
|
||||
void HandlerEffectShow::onEffectClusterChanged(const AreaEffectSimulation::EffectCluster &data, KindOfModification_e kindOfModification)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onEffectClusterChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
|
||||
INFO_LOG() << "onEffectClusterChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
|
||||
switch (kindOfModification)
|
||||
{
|
||||
case KindOfModification_e::Added:
|
||||
@@ -185,7 +184,7 @@ void HandlerEffectShow::onEffectClusterChanged(const AreaEffectSimulation::Effec
|
||||
//=============================================================================
|
||||
void HandlerEffectShow::onMineAreaChanged(const AreaEffectSimulation::MineArea &data, KindOfModification_e kindOfModification)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onMineAreaChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
|
||||
INFO_LOG() << "onMineAreaChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
|
||||
switch (kindOfModification)
|
||||
{
|
||||
case KindOfModification_e::Added:
|
||||
@@ -219,12 +218,12 @@ void HandlerEffectShow::onMineAreaChanged(const AreaEffectSimulation::MineArea &
|
||||
//=============================================================================
|
||||
void HandlerEffectShow::effectShowOrderConfirmationReceived(const ConvertFromTab::OrderConfirmation_t &orderConfirmation)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onEffectShowConfirmationReceived()";
|
||||
DEBUG_LOG() << "onEffectShowConfirmationReceived()";
|
||||
|
||||
ObjectEffectShow *ifs = m_effectShowObjMap.value(orderConfirmation.orderId);
|
||||
if (ifs == nullptr)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Error receiving effect show ID not known: " << orderConfirmation.orderId;
|
||||
WARNING_LOG() << "Error receiving effect show ID not known: " << orderConfirmation.orderId;
|
||||
return;
|
||||
}
|
||||
const auto oldId = ifs->getData().orderConfirmation;
|
||||
@@ -234,7 +233,7 @@ void HandlerEffectShow::effectShowOrderConfirmationReceived(const ConvertFromTab
|
||||
|
||||
if (oldId != ifs->getData().orderConfirmation && ifs->getData().orderConfirmation == EffectShowManagement::OrderConfirmation_e::FiringReadiness)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "effectShowOrderConfirmationReceived Got Fire Readyness, send to aes for " << ifs->getId();
|
||||
DEBUG_LOG() << "effectShowOrderConfirmationReceived Got Fire Readyness, send to aes for " << ifs->getId();
|
||||
AreaEffectSimulation::SetAesItemEffectorStateRequest req;
|
||||
req.aesId(ifs->getIdAES());
|
||||
req.newEffectorState(AreaEffectSimulation::AesEffectorState::EsReadyToFire);
|
||||
@@ -264,7 +263,7 @@ void HandlerEffectShow::createEffectShow(const Database::EsmEffectShow &data, bo
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -278,10 +277,10 @@ void HandlerEffectShow::onEffectShowModifyRequest(
|
||||
const rti::core::SampleIdentity &cookie,
|
||||
const EffectShow &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onEffectShowModifyRequest: " << request.id();
|
||||
DEBUG_LOG() << "onEffectShowModifyRequest: " << request.id();
|
||||
if (request.id() <= 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Illegal Effect Show Id: " << request.id();
|
||||
ERROR_LOG() << "Illegal Effect Show Id: " << request.id();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -290,7 +289,7 @@ void HandlerEffectShow::onEffectShowModifyRequest(
|
||||
|
||||
auto ret = effectShowModifyRequest(request);
|
||||
if (ret.error())
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
|
||||
m_mainHandler->dds()->fts()->effectShowModifyReply(cookie, ret);
|
||||
|
||||
@@ -320,7 +319,7 @@ Core::FunctionReplyObject HandlerEffectShow::effectShowModifyRequest(const Effec
|
||||
triggerEffectShowOrder(ifs); // trigger effect show order to effect show actor
|
||||
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -328,7 +327,7 @@ Core::FunctionReplyObject HandlerEffectShow::effectShowModifyRequest(const Effec
|
||||
void HandlerEffectShow::onEffectShowRemoveRequest(const rti::core::SampleIdentity &cookie,
|
||||
const Core::RemoveElementRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onEffectShowRemoveRequest: " << request.id();
|
||||
DEBUG_LOG() << "onEffectShowRemoveRequest: " << request.id();
|
||||
|
||||
ObjectEffectShow *ifs = m_effectShowObjMap.value(request.id());
|
||||
Core::FunctionReplyObject ret;
|
||||
@@ -378,7 +377,7 @@ void HandlerEffectShow::createEffectShowsRelatedToMineArea(const AreaEffectSimul
|
||||
for (const auto &esmEffectShow : esmEffectShows)
|
||||
{
|
||||
createEffectShow(esmEffectShow);
|
||||
DEBUG_LOG(m_logger) << toString(esmEffectShow);
|
||||
DEBUG_LOG() << toString(esmEffectShow);
|
||||
}
|
||||
}
|
||||
//-------------------------------------------------------------------------------
|
||||
@@ -388,7 +387,7 @@ void HandlerEffectShow::createEffectShowsRelatedToExplosionArea(const AreaEffect
|
||||
for (const auto &esmEffectShow : esmEffectShows)
|
||||
{
|
||||
createEffectShow(esmEffectShow);
|
||||
DEBUG_LOG(m_logger) << toString(esmEffectShow);
|
||||
DEBUG_LOG() << toString(esmEffectShow);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -398,7 +397,7 @@ void HandlerEffectShow::createEffectShowsRelatedToExplosionCluster(const AreaEff
|
||||
for (const auto &esmEffectShow : esmEffectShows)
|
||||
{
|
||||
createEffectShow(esmEffectShow);
|
||||
DEBUG_LOG(m_logger) << toString(esmEffectShow);
|
||||
DEBUG_LOG() << toString(esmEffectShow);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -408,7 +407,7 @@ void HandlerEffectShow::createEffectShowsRelatedToEffectCluster(const AreaEffect
|
||||
for (const auto &esmEffectShow : esmEffectShows)
|
||||
{
|
||||
createEffectShow(esmEffectShow);
|
||||
DEBUG_LOG(m_logger) << toString(esmEffectShow);
|
||||
DEBUG_LOG() << toString(esmEffectShow);
|
||||
}
|
||||
}
|
||||
//-------------------------------------------------------------------------------
|
||||
@@ -416,7 +415,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
|
||||
{
|
||||
QVector<Database::EsmEffectShow> ret;
|
||||
|
||||
DEBUG_LOG(m_logger) << "createEffectShowDbDataRelatedToExplosionArea: ";
|
||||
DEBUG_LOG() << "createEffectShowDbDataRelatedToExplosionArea: ";
|
||||
|
||||
EffectShowMineArea effectShowMineArea(data);
|
||||
Database::EsmEffectShow esmEffectShow = effectShowMineArea.getEffectShow();
|
||||
@@ -428,7 +427,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
|
||||
{
|
||||
QVector<Database::EsmEffectShow> ret;
|
||||
|
||||
DEBUG_LOG(m_logger) << "createEffectShowDbDataRelatedToExplosionArea: ";
|
||||
DEBUG_LOG() << "createEffectShowDbDataRelatedToExplosionArea: ";
|
||||
|
||||
EffectShowExplosionArea effectShowExplosionArea(data, m_mainHandler->handlerPdmData());
|
||||
|
||||
@@ -437,7 +436,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
|
||||
//create exact 1
|
||||
ret.reserve(1);
|
||||
Database::EsmEffectShow esmEffectShow = effectShowExplosionArea.getEffectShow(0);
|
||||
DEBUG_LOG(m_logger) << toString(esmEffectShow);
|
||||
DEBUG_LOG() << toString(esmEffectShow);
|
||||
ret.push_back(std::move(esmEffectShow));
|
||||
}
|
||||
else
|
||||
@@ -467,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(m_logger) << toString(esmEffectShow);
|
||||
DEBUG_LOG() << toString(esmEffectShow);
|
||||
|
||||
ret.push_back(std::move(esmEffectShow));
|
||||
}
|
||||
@@ -487,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(m_logger) << toString(esmEffectShow);
|
||||
DEBUG_LOG() << toString(esmEffectShow);
|
||||
ret.push_back(std::move(esmEffectShow));
|
||||
}
|
||||
else
|
||||
@@ -517,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(m_logger) << toString(esmEffectShow);
|
||||
DEBUG_LOG() << toString(esmEffectShow);
|
||||
|
||||
// Evlt. nicht bei DM42 (dann ist max > 1)
|
||||
if(data.esmParticipantIds().size() > 0)
|
||||
@@ -540,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(m_logger) << toString(esmEffectShow);
|
||||
DEBUG_LOG() << toString(esmEffectShow);
|
||||
ret.push_back(std::move(esmEffectShow));
|
||||
}
|
||||
else
|
||||
@@ -570,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(m_logger) << toString(esmEffectShow);
|
||||
//DEBUG_LOG() << 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(m_logger) << toString(esmEffectShow);
|
||||
DEBUG_LOG() << toString(esmEffectShow);
|
||||
|
||||
ret.push_back(std::move(esmEffectShow));
|
||||
}
|
||||
@@ -585,7 +584,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
|
||||
//-------------------------------------------------------------------------------
|
||||
void HandlerEffectShow::removeEffectShowsRelatedToAes(int idAes, bool retract)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "removeEffectShowsRelatedToAes(" << idAes << ")";
|
||||
DEBUG_LOG() << "removeEffectShowsRelatedToAes(" << idAes << ")";
|
||||
auto it = m_effectShowObjMap.begin();
|
||||
while (it != m_effectShowObjMap.end())
|
||||
{
|
||||
@@ -596,7 +595,7 @@ void HandlerEffectShow::removeEffectShowsRelatedToAes(int idAes, bool retract)
|
||||
(it.value()->getData().orderConfirmation != EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut))
|
||||
remove = true;
|
||||
else
|
||||
INFO_LOG(m_logger) << "Effect Show: " << it.value()->getId() << " not removed due to EXECUTION / ORDER CARRIED OUT";
|
||||
INFO_LOG() << "Effect Show: " << it.value()->getId() << " not removed due to EXECUTION / ORDER CARRIED OUT";
|
||||
}
|
||||
if (remove)
|
||||
{
|
||||
@@ -783,7 +782,7 @@ Core::FunctionReplyObject HandlerEffectShow::removeEffectShow(ObjectEffectShow *
|
||||
Core::FunctionReplyObject ret = ifs->removeObject();
|
||||
if (ret.error())
|
||||
{
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -792,9 +791,9 @@ Core::FunctionReplyObject HandlerEffectShow::removeEffectShow(ObjectEffectShow *
|
||||
|
||||
// remove from map
|
||||
if (!m_effectShowObjMap.remove(effectShowId) && bWarnWhenNotInMap)
|
||||
WARNING_LOG(m_logger) << "Remove of EffectShow(" << effectShowId << ") failed.";
|
||||
WARNING_LOG() << "Remove of EffectShow(" << effectShowId << ") failed.";
|
||||
else
|
||||
DEBUG_LOG(m_logger) << "EffectShow(" << effectShowId << ") removed.";
|
||||
DEBUG_LOG() << "EffectShow(" << effectShowId << ") removed.";
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -802,7 +801,7 @@ Core::FunctionReplyObject HandlerEffectShow::removeEffectShow(ObjectEffectShow *
|
||||
void HandlerEffectShow::triggerEffectShowOrder(const ObjectEffectShow *ifs)
|
||||
{
|
||||
const Database::EsmEffectShow &effectShow = ifs->getData();
|
||||
INFO_LOG(m_logger) << "triggerEffectShowOrder for id " << ifs->getId()
|
||||
INFO_LOG() << "triggerEffectShowOrder for id " << ifs->getId()
|
||||
<< ", aesId: " << ifs->getIdAES()
|
||||
<< ", actor: " << effectShow.esmParticipantId;
|
||||
if (effectShow.esmParticipantId == -1)
|
||||
@@ -817,7 +816,7 @@ void HandlerEffectShow::triggerEffectShowOrder(const ObjectEffectShow *ifs)
|
||||
void HandlerEffectShow::triggerRetractOrder(const ObjectEffectShow *ifs)
|
||||
{
|
||||
const Database::EsmEffectShow &effectShow = ifs->getData();
|
||||
INFO_LOG(m_logger) << "triggerRetractOrder for id " << ifs->getId()
|
||||
INFO_LOG() << "triggerRetractOrder for id " << ifs->getId()
|
||||
<< ", aesId: " << ifs->getIdAES()
|
||||
<< ", actor: " << effectShow.esmParticipantId;
|
||||
if (effectShow.esmParticipantId == -1)
|
||||
@@ -833,7 +832,7 @@ void HandlerEffectShow::triggerRetractOrder(const ObjectEffectShow *ifs)
|
||||
void HandlerEffectShow::triggerEffectShowStop(const ObjectEffectShow *ifs)
|
||||
{
|
||||
const Database::EsmEffectShow &effectShow = ifs->getData();
|
||||
INFO_LOG(m_logger) << "triggerEffectShowStop for id " << ifs->getId()
|
||||
INFO_LOG() << "triggerEffectShowStop for id " << ifs->getId()
|
||||
<< ", aesId: " << ifs->getIdAES()
|
||||
<< ", actor: " << effectShow.esmParticipantId;
|
||||
if (effectShow.esmParticipantId == -1)
|
||||
@@ -847,7 +846,7 @@ void HandlerEffectShow::triggerEffectShowStop(const ObjectEffectShow *ifs)
|
||||
void HandlerEffectShow::triggerEffectShowContinue(const ObjectEffectShow *ifs)
|
||||
{
|
||||
const Database::EsmEffectShow &effectShow = ifs->getData();
|
||||
INFO_LOG(m_logger) << "triggerEffectShowContinue for id " << ifs->getId()
|
||||
INFO_LOG() << "triggerEffectShowContinue for id " << ifs->getId()
|
||||
<< ", aesId: " << ifs->getIdAES()
|
||||
<< ", actor: " << effectShow.esmParticipantId;
|
||||
if (effectShow.esmParticipantId == -1)
|
||||
@@ -869,7 +868,7 @@ void HandlerEffectShow::triggerMeteoData(const ObjectEffectShow *ifs)
|
||||
{
|
||||
if (!meteoData.windOk() && !meteoData.climateOk())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Found MeteoStation but no weather Data available, try again in 1 minute";
|
||||
WARNING_LOG() << "Found MeteoStation but no weather Data available, try again in 1 minute";
|
||||
QTimer::singleShot(6000, this, &HandlerEffectShow::onSendMeteoData);
|
||||
return;
|
||||
}
|
||||
@@ -880,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(m_logger) << "Age of meteo data=" << (deltaTime / 60000) << "min for vehicle: " << equipmentNumber;
|
||||
WARNING_LOG() << "Age of meteo data=" << (deltaTime / 60000) << "min for vehicle: " << equipmentNumber;
|
||||
}
|
||||
else
|
||||
{
|
||||
int equipmentNumber = m_mainHandler->handlerPpmData()->getEquipmentNumber(effectShow.esmParticipantId);
|
||||
WARNING_LOG(m_logger) << "Meteo data not available for effect show vehicle: " << equipmentNumber;
|
||||
WARNING_LOG() << "Meteo data not available for effect show vehicle: " << equipmentNumber;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -908,7 +907,7 @@ void HandlerEffectShow::onSendMeteoData()
|
||||
|
||||
void HandlerEffectShow::onCleanUp()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Start Cleanup ";
|
||||
DEBUG_LOG() << "Start Cleanup ";
|
||||
QVector<ObjectEffectShow * > objects;
|
||||
for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
|
||||
{
|
||||
@@ -916,11 +915,11 @@ void HandlerEffectShow::onCleanUp()
|
||||
if (effectShow.orderConfirmation == OrderConfirmation_e::OrderCarriedOut || effectShow.startTime <= 0 || effectShow.id <= 0)
|
||||
continue;
|
||||
|
||||
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();
|
||||
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();
|
||||
if ((effectShow.startTime + effectShow.duration + CLEANUPTIME) < m_mainHandler->dds()->currentPartitionTime())
|
||||
{
|
||||
//remove object
|
||||
DEBUG_LOG(m_logger) << "Remove Effect Show " << effectShow.id ;
|
||||
DEBUG_LOG() << "Remove Effect Show " << effectShow.id ;
|
||||
objects.append(obj);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user