Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+10
-10
@@ -23,16 +23,16 @@ HandlerMineLayingArtillery::HandlerMineLayingArtillery(const std::shared_ptr<Cen
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_logger(CentralEffectSimulation::getLogger("Plugin.MineLayingArtillery.HandlerMineLayingArtillery"))
|
||||
{
|
||||
INFO_LOG() << "HandlerMineLayingArtillery::HandlerMineLayingArtillery";
|
||||
INFO_LOG(m_logger) << "HandlerMineLayingArtillery::HandlerMineLayingArtillery";
|
||||
|
||||
m_effectClusterTimer->setInterval(500);
|
||||
}
|
||||
|
||||
HandlerMineLayingArtillery::~HandlerMineLayingArtillery() { INFO_LOG() << "HandlerMineLayingArtillery::~HandlerMineLayingArtillery"; }
|
||||
HandlerMineLayingArtillery::~HandlerMineLayingArtillery() { INFO_LOG(m_logger) << "HandlerMineLayingArtillery::~HandlerMineLayingArtillery"; }
|
||||
|
||||
bool HandlerMineLayingArtillery::init()
|
||||
{
|
||||
INFO_LOG() << "HandlerMineLayingArtillery::init";
|
||||
INFO_LOG(m_logger) << "HandlerMineLayingArtillery::init";
|
||||
|
||||
m_dtcAes = m_ddsHandler->dtcAes();
|
||||
m_ftcAes = m_ddsHandler->ftcAes();
|
||||
@@ -87,7 +87,7 @@ std::vector<AreaEffectSimulation::MineData> HandlerMineLayingArtillery::calculat
|
||||
const double armingTimeOffset = mineLayingPattern[QStringLiteral("armingTimeOffset")].toDouble();
|
||||
const double armingJitter = mineLayingPattern[QStringLiteral("armingJitter")].toDouble();
|
||||
|
||||
DEBUG_LOG() << "[calculateImpacts] ## \n\tappearanceTimeOffset: " << appearanceTimeOffset << "\n\tappearanceJitter: " << appearanceJitter << "\n\tarmingTimeOffset: " << armingTimeOffset<<"\n\ttime: "<<time;
|
||||
DEBUG_LOG(m_logger) << "[calculateImpacts] ## \n\tappearanceTimeOffset: " << appearanceTimeOffset << "\n\tappearanceJitter: " << appearanceJitter << "\n\tarmingTimeOffset: " << armingTimeOffset<<"\n\ttime: "<<time;
|
||||
|
||||
const LtsCoordTrans::UtmCoordinate impactPostionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(QPointF(impactPositon.lon(), impactPositon.lat()));
|
||||
|
||||
@@ -117,7 +117,7 @@ std::vector<AreaEffectSimulation::MineData> HandlerMineLayingArtillery::calculat
|
||||
const double appearenceTime = time + appearanceTimeOffset + QRandomGenerator::global()->bounded(0, appearanceJitter * 2) - appearanceJitter;
|
||||
const double armingTime = time + armingTimeOffset + QRandomGenerator::global()->bounded(0, armingJitter * 2) - armingJitter;
|
||||
|
||||
DEBUG_LOG() <<"[calculateImpacts] patternCount: "<<patternCounter<< " appearenceTime: " << appearenceTime << " armingTime: " << armingTime;
|
||||
DEBUG_LOG(m_logger) <<"[calculateImpacts] patternCount: "<<patternCounter<< " appearenceTime: " << appearenceTime << " armingTime: " << armingTime;
|
||||
|
||||
mineData.position(Core::GeoPosition2D(transformedImpactPosition.x(), transformedImpactPosition.y()));
|
||||
mineData.appearenceTime(appearenceTime);
|
||||
@@ -126,7 +126,7 @@ std::vector<AreaEffectSimulation::MineData> HandlerMineLayingArtillery::calculat
|
||||
transformedImpacts.push_back(mineData);
|
||||
}
|
||||
|
||||
DEBUG_LOG()<<"[calculateImpacts] ### pattern patterCount: "<< patternCounter <<" patternsArray.size(): "<<patternsArray.size();
|
||||
DEBUG_LOG(m_logger)<<"[calculateImpacts] ### pattern patterCount: "<< patternCounter <<" patternsArray.size(): "<<patternsArray.size();
|
||||
|
||||
return transformedImpacts;
|
||||
}
|
||||
@@ -155,7 +155,7 @@ void HandlerMineLayingArtillery::onChargeTypeChanged(const ProjectDataManagement
|
||||
void HandlerMineLayingArtillery::onChargeEffectModifyReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
if (replyObject.error())
|
||||
ERROR_LOG()<<"[CES ChargeEffectModifyReply]: "<<replyObject.str();
|
||||
ERROR_LOG(m_logger)<<"[CES ChargeEffectModifyReply]: "<<replyObject.str();
|
||||
}
|
||||
|
||||
void HandlerMineLayingArtillery::onEffectClusterTimerTimeout()
|
||||
@@ -185,11 +185,11 @@ void HandlerMineLayingArtillery::onEffectClusterTimerTimeout()
|
||||
const QJsonObject &mineLayingProperties = m_mineLayingChargeTypes[chargeTypeId];
|
||||
const int mineChargeTypeId = mineLayingProperties[QStringLiteral("mineChargeTypeId")].toInt();
|
||||
AreaEffectSimulation::EffectCluster ec = m_dtcAes->effectCluster(chargeEffect.originatorId());
|
||||
DEBUG_LOG()<<" [onChargeEffectChanged] effectClusterId: "<<ec.id()<<" mineChargeTypeId: "<<mineChargeTypeId;
|
||||
DEBUG_LOG(m_logger)<<" [onChargeEffectChanged] effectClusterId: "<<ec.id()<<" mineChargeTypeId: "<<mineChargeTypeId;
|
||||
|
||||
if (mineChargeTypeId <= 0)
|
||||
{
|
||||
ERROR_LOG()<<" [onChargeEffectChanged] mineChargeTypeId invalid!!! chargeEffectId: "<<chargeEffectId;
|
||||
ERROR_LOG(m_logger)<<" [onChargeEffectChanged] mineChargeTypeId invalid!!! chargeEffectId: "<<chargeEffectId;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -221,7 +221,7 @@ void HandlerMineLayingArtillery::onEffectClusterTimerTimeout()
|
||||
request.effectDurationMsec(chargeEffectPropsObj[QStringLiteral("effectDurationMsec")].toInt(3 * 60 * 60 * 1000));
|
||||
|
||||
const int ret = m_ftcAes->mineAreaReferenceModifyRequest(request);
|
||||
DEBUG_LOG()<<"[onChargeEffectChanged] ****** mineAreaReferenceModifyRequest \n\tret id: "<< ret
|
||||
DEBUG_LOG(m_logger)<<"[onChargeEffectChanged] ****** mineAreaReferenceModifyRequest \n\tret id: "<< ret
|
||||
<< "\n\tchargeTypeId: " << chargeTypeId
|
||||
<< "\n\tchargeEffectId: " << chargeEffectId << "\n\ttrajectoryId: " << trajectory.id()
|
||||
<< "\n\tangle: " << angle << "\n\ttimeFromLastTrajectoryPointAbsolute: " << timeFromLastTrajectoryPointAbsolute;
|
||||
|
||||
+4
-4
@@ -35,8 +35,8 @@ MineLayingArtilleryPluginInterfaceImpl::MineLayingArtilleryPluginInterfaceImpl(C
|
||||
QString MineLayingArtilleryPluginInterfaceImpl::echo(const QString &message)
|
||||
{
|
||||
QString ret(QStringLiteral("<<<< %1 >>>> MineLayingArtilleryPluginInterfaceImpl::echo").arg(message));
|
||||
INFO_LOG() << "MineLayingArtilleryPluginInterfaceImpl::echo return:" << ret;
|
||||
DEBUG_LOG() << "DEBUG: MineLayingArtilleryPluginInterfaceImpl::echo return:" << ret;
|
||||
INFO_LOG(m_logger) << "MineLayingArtilleryPluginInterfaceImpl::echo return:" << ret;
|
||||
DEBUG_LOG(m_logger) << "DEBUG: MineLayingArtilleryPluginInterfaceImpl::echo return:" << ret;
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ bool MineLayingArtilleryPluginInterfaceImpl::init(int domainId, int exerciseId)
|
||||
m_domainId = domainId;
|
||||
m_exerciseId = exerciseId;
|
||||
|
||||
INFO_LOG() << "MineLayingArtilleryPluginInterfaceImpl::init()"
|
||||
INFO_LOG(m_logger) << "MineLayingArtilleryPluginInterfaceImpl::init()"
|
||||
<< " m_domainId=" << m_domainId << " m_exerciseId=" << m_exerciseId;
|
||||
|
||||
// initialize handlerMineLayingArtillery
|
||||
@@ -53,7 +53,7 @@ bool MineLayingArtilleryPluginInterfaceImpl::init(int domainId, int exerciseId)
|
||||
|
||||
if (!m_handlerMineLayingArtillery->init())
|
||||
{
|
||||
ERROR_LOG() << "Initialisation m_handlerMineLayingArtillery failed.";
|
||||
ERROR_LOG(m_logger) << "Initialisation m_handlerMineLayingArtillery failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user