Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
+47
-47
@@ -56,14 +56,14 @@ bool HandlerMineLayingArtillery::init()
|
||||
|
||||
double HandlerMineLayingArtillery::calculateAngle(const AreaEffectSimulation::TrajectoryTimeAware &trajectory)
|
||||
{
|
||||
Core::GeoPositionRelativeTime trajectoryGeometryFirst = trajectory.geometry().front();
|
||||
Core::GeoPositionRelativeTime trajectoryGeometryLast = trajectory.geometry().back();
|
||||
Core::GeoPositionRelativeTime trajectoryGeometryFirst = trajectory.geometry.front();
|
||||
Core::GeoPositionRelativeTime trajectoryGeometryLast = trajectory.geometry.back();
|
||||
|
||||
const LtsCoordTrans::UtmCoordinate &trajectoryGeometryFirstUtm
|
||||
= LtsCoordTrans::UtmCoordinate::fromGeographic(QPointF(trajectoryGeometryFirst.lon(), trajectoryGeometryFirst.lat()));
|
||||
= LtsCoordTrans::UtmCoordinate::fromGeographic(QPointF(trajectoryGeometryFirst.lon, trajectoryGeometryFirst.lat));
|
||||
|
||||
const LtsCoordTrans::UtmCoordinate &trajectoryGeometryLastUtm
|
||||
= LtsCoordTrans::UtmCoordinate::fromGeographic(QPointF(trajectoryGeometryLast.lon(), trajectoryGeometryLast.lat()), trajectoryGeometryFirstUtm.zone);
|
||||
= LtsCoordTrans::UtmCoordinate::fromGeographic(QPointF(trajectoryGeometryLast.lon, trajectoryGeometryLast.lat), trajectoryGeometryFirstUtm.zone);
|
||||
|
||||
QLineF lineFromStartToImpact
|
||||
= QLineF(QPointF(trajectoryGeometryFirstUtm.x, trajectoryGeometryFirstUtm.y), QPointF(trajectoryGeometryLastUtm.x, trajectoryGeometryLastUtm.y));
|
||||
@@ -89,7 +89,7 @@ std::vector<AreaEffectSimulation::MineData> HandlerMineLayingArtillery::calculat
|
||||
|
||||
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()));
|
||||
const LtsCoordTrans::UtmCoordinate impactPostionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(QPointF(impactPositon.lon, impactPositon.lat));
|
||||
|
||||
QJsonObject patternObj = patternsArray[patternCounter].toObject();
|
||||
QJsonArray positionsArray = patternObj[QStringLiteral("positions")].toArray();
|
||||
@@ -114,14 +114,14 @@ std::vector<AreaEffectSimulation::MineData> HandlerMineLayingArtillery::calculat
|
||||
QPointF transformedImpactPosition = impactPostionUtm.geographic(positionRot.x(), positionRot.y());
|
||||
|
||||
|
||||
const double appearenceTime = time + appearanceTimeOffset + QRandomGenerator::global()->bounded(0, appearanceJitter * 2) - appearanceJitter;
|
||||
const double armingTime = time + armingTimeOffset + QRandomGenerator::global()->bounded(0, armingJitter * 2) - armingJitter;
|
||||
const double appearenceTime = time + appearanceTimeOffset + QRandomGenerator::global()->bounded(0, static_cast<int>(appearanceJitter * 2)) - appearanceJitter;
|
||||
const double armingTime = time + armingTimeOffset + QRandomGenerator::global()->bounded(0, static_cast<int>(armingJitter * 2)) - armingJitter;
|
||||
|
||||
DEBUG_LOG(m_logger) <<"[calculateImpacts] patternCount: "<<patternCounter<< " appearenceTime: " << appearenceTime << " armingTime: " << armingTime;
|
||||
|
||||
mineData.position(Core::GeoPosition2D(transformedImpactPosition.x(), transformedImpactPosition.y()));
|
||||
mineData.appearenceTime(appearenceTime);
|
||||
mineData.armingTime(armingTime);
|
||||
mineData.position = Core::GeoPosition2D(transformedImpactPosition.x(), transformedImpactPosition.y());
|
||||
mineData.appearenceTime = appearenceTime;
|
||||
mineData.armingTime = armingTime;
|
||||
|
||||
transformedImpacts.push_back(mineData);
|
||||
}
|
||||
@@ -138,16 +138,16 @@ void HandlerMineLayingArtillery::onChargeTypeChanged(const ProjectDataManagement
|
||||
case DataModification::eAdded:
|
||||
case DataModification::eModified:
|
||||
{
|
||||
if (!m_dtcPdm->isMineLaying(data.id(), 0, 0))
|
||||
if (!m_dtcPdm->isMineLaying(data.id, 0, 0))
|
||||
return;
|
||||
|
||||
QJsonObject mineLayingPattern = m_dtcPdm->mineLayingPattern(data.id(), 0, 0);
|
||||
m_mineLayingChargeTypes.insert(data.id(), mineLayingPattern);
|
||||
QJsonObject mineLayingPattern = m_dtcPdm->mineLayingPattern(data.id, 0, 0);
|
||||
m_mineLayingChargeTypes.insert(data.id, mineLayingPattern);
|
||||
|
||||
return;
|
||||
}
|
||||
case DataModification::eRemoved:
|
||||
m_mineLayingChargeTypes.remove(data.id());
|
||||
m_mineLayingChargeTypes.remove(data.id);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -164,9 +164,9 @@ void HandlerMineLayingArtillery::onEffectClusterTimerTimeout()
|
||||
return;
|
||||
|
||||
const AreaEffectSimulation::ChargeEffect chargeEffect = m_effectClusterQue.dequeue();
|
||||
const int chargeTypeId = chargeEffect.chargeTypeId();
|
||||
const int chargeTypeId = chargeEffect.chargeTypeId;
|
||||
|
||||
QByteArray jsonData = QByteArray::fromStdString(chargeEffect.properties());
|
||||
QByteArray jsonData = QByteArray::fromStdString(chargeEffect.properties);
|
||||
QJsonDocument doc = QJsonDocument::fromJson(jsonData);
|
||||
|
||||
bool alreadyUsed = false;
|
||||
@@ -180,12 +180,12 @@ void HandlerMineLayingArtillery::onEffectClusterTimerTimeout()
|
||||
if (!m_mineLayingChargeTypes.contains(chargeTypeId) || alreadyUsed)
|
||||
return;
|
||||
|
||||
const int chargeEffectId = chargeEffect.id();
|
||||
const int chargeEffectId = chargeEffect.id;
|
||||
|
||||
const QJsonObject &mineLayingProperties = m_mineLayingChargeTypes[chargeTypeId];
|
||||
const int mineChargeTypeId = mineLayingProperties[QStringLiteral("mineChargeTypeId")].toInt();
|
||||
AreaEffectSimulation::EffectCluster ec = m_dtcAes->effectCluster(chargeEffect.originatorId());
|
||||
DEBUG_LOG(m_logger)<<" [onChargeEffectChanged] effectClusterId: "<<ec.id()<<" mineChargeTypeId: "<<mineChargeTypeId;
|
||||
AreaEffectSimulation::EffectCluster ec = m_dtcAes->effectCluster(chargeEffect.originatorId);
|
||||
DEBUG_LOG(m_logger)<<" [onChargeEffectChanged] effectClusterId: "<<ec.id<<" mineChargeTypeId: "<<mineChargeTypeId;
|
||||
|
||||
if (mineChargeTypeId <= 0)
|
||||
{
|
||||
@@ -195,54 +195,54 @@ void HandlerMineLayingArtillery::onEffectClusterTimerTimeout()
|
||||
|
||||
for (const auto &trajectory : m_dtcAes->trajectoryTimeAwares())
|
||||
{
|
||||
if (trajectory.originatorId() != chargeEffectId && trajectory.originatorTypeId().underlying() != ProjectDataManagement::StateChangeOriginator::ChargeEffect)
|
||||
if (trajectory.originatorId != chargeEffectId && trajectory.originatorTypeId != ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ChargeEffect)
|
||||
continue;
|
||||
|
||||
if (!m_impactCounters.contains(chargeEffect.originatorId()))
|
||||
m_impactCounters[chargeEffect.originatorId()] = 0;
|
||||
if (!m_impactCounters.contains(chargeEffect.originatorId))
|
||||
m_impactCounters[chargeEffect.originatorId] = 0;
|
||||
|
||||
const int impactCounter = m_impactCounters.value(chargeEffect.originatorId());
|
||||
const int impactCounter = m_impactCounters.value(chargeEffect.originatorId);
|
||||
const double angle = calculateAngle(trajectory);
|
||||
const qint64 timeFromLastTrajectoryPointAbsolute = chargeEffect.effectStart() + trajectory.geometry().back().relativeTime();
|
||||
const qint64 timeFromLastTrajectoryPointAbsolute = chargeEffect.effectStart + trajectory.geometry.back().relativeTime;
|
||||
const int patternCount = mineLayingProperties.value(QStringLiteral("pattern")).toArray().size();
|
||||
const int patternCounter = patternCounterByImpactCount(ec, patternCount, impactCounter);
|
||||
const int effectorIndex = effectorIndexByImpactCount(ec, impactCounter);
|
||||
const Core::GeoPosition mhpPositionGeo = ec.effectors().at(effectorIndex).mhpPosition();
|
||||
const Core::GeoPosition2D mhpPositionGeo2D(mhpPositionGeo.lon(), mhpPositionGeo.lat());
|
||||
const Core::GeoPosition mhpPositionGeo = ec.effectors.at(effectorIndex).mhpPosition;
|
||||
const Core::GeoPosition2D mhpPositionGeo2D(mhpPositionGeo.lon, mhpPositionGeo.lat);
|
||||
const std::vector<AreaEffectSimulation::MineData> mineImpacts
|
||||
= calculateImpacts(mineLayingProperties, mhpPositionGeo2D, angle, timeFromLastTrajectoryPointAbsolute, patternCounter);
|
||||
|
||||
AreaEffectSimulation::MineAreaReferenceModifyRequest request;
|
||||
request.chargeTypeId(mineChargeTypeId);
|
||||
request.referenceAesItemId(chargeEffect.originatorId());
|
||||
request.mineData(mineImpacts);
|
||||
request.chargeTypeId = mineChargeTypeId;
|
||||
request.referenceAesItemId = chargeEffect.originatorId;
|
||||
request.mineData = mineImpacts;
|
||||
|
||||
QJsonObject chargeEffectPropsObj = QJsonDocument::fromJson(QByteArray::fromStdString(chargeEffect.properties())).object();
|
||||
request.effectDurationMsec(chargeEffectPropsObj[QStringLiteral("effectDurationMsec")].toInt(3 * 60 * 60 * 1000));
|
||||
QJsonObject chargeEffectPropsObj = QJsonDocument::fromJson(QByteArray::fromStdString(chargeEffect.properties)).object();
|
||||
request.effectDurationMsec = chargeEffectPropsObj[QStringLiteral("effectDurationMsec")].toInt(3 * 60 * 60 * 1000);
|
||||
|
||||
const int ret = m_ftcAes->mineAreaReferenceModifyRequest(request);
|
||||
DEBUG_LOG(m_logger)<<"[onChargeEffectChanged] ****** mineAreaReferenceModifyRequest \n\tret id: "<< ret
|
||||
<< "\n\tchargeTypeId: " << chargeTypeId
|
||||
<< "\n\tchargeEffectId: " << chargeEffectId << "\n\ttrajectoryId: " << trajectory.id()
|
||||
<< "\n\tchargeEffectId: " << chargeEffectId << "\n\ttrajectoryId: " << trajectory.id
|
||||
<< "\n\tangle: " << angle << "\n\ttimeFromLastTrajectoryPointAbsolute: " << timeFromLastTrajectoryPointAbsolute;
|
||||
|
||||
AreaEffectSimulation::ChargeEffectModifyRequest chargeEffectRequest;
|
||||
chargeEffectRequest.chargeTypeId(chargeEffect.chargeTypeId());
|
||||
chargeEffectRequest.effectDuration(chargeEffect.effectDuration());
|
||||
chargeEffectRequest.effectStart(chargeEffect.effectStart());
|
||||
chargeEffectRequest.gearTypeId(chargeEffect.gearTypeId());
|
||||
chargeEffectRequest.id(chargeEffect.id());
|
||||
chargeEffectRequest.igniterTypeId(chargeEffect.igniterTypeId());
|
||||
chargeEffectRequest.originatorId(chargeEffect.originatorId());
|
||||
chargeEffectRequest.originatorTypeId(chargeEffect.originatorTypeId());
|
||||
chargeEffectRequest.position(chargeEffect.position());
|
||||
chargeEffectRequest.chargeTypeId = chargeEffect.chargeTypeId;
|
||||
chargeEffectRequest.effectDuration = chargeEffect.effectDuration;
|
||||
chargeEffectRequest.effectStart = chargeEffect.effectStart;
|
||||
chargeEffectRequest.gearTypeId = chargeEffect.gearTypeId;
|
||||
chargeEffectRequest.id = chargeEffect.id;
|
||||
chargeEffectRequest.igniterTypeId = chargeEffect.igniterTypeId;
|
||||
chargeEffectRequest.originatorId = chargeEffect.originatorId;
|
||||
chargeEffectRequest.originatorTypeId = chargeEffect.originatorTypeId;
|
||||
chargeEffectRequest.position = chargeEffect.position;
|
||||
|
||||
chargeEffectPropsObj.insert(QStringLiteral("used"), QJsonValue::fromVariant(true));
|
||||
chargeEffectRequest.properties(QJsonDocument(chargeEffectPropsObj).toJson().toStdString());
|
||||
chargeEffectRequest.properties = QJsonDocument(chargeEffectPropsObj).toJson().toStdString();
|
||||
|
||||
m_ftcAes->chargeEffectModifyRequest(chargeEffectRequest);
|
||||
|
||||
++m_impactCounters[chargeEffect.originatorId()];
|
||||
++m_impactCounters[chargeEffect.originatorId];
|
||||
|
||||
break;
|
||||
}
|
||||
@@ -253,22 +253,22 @@ void HandlerMineLayingArtillery::onEffectClusterTimerTimeout()
|
||||
|
||||
int HandlerMineLayingArtillery::patternCounterByImpactCount(const AreaEffectSimulation::EffectCluster &effectCluster, int patternCount, int impactCounter) const
|
||||
{
|
||||
return impactCounter / effectCluster.effectors().size() % patternCount;
|
||||
return impactCounter / effectCluster.effectors.size() % patternCount;
|
||||
}
|
||||
|
||||
int HandlerMineLayingArtillery::effectorIndexByImpactCount(const AreaEffectSimulation::EffectCluster &effectCluster, int impactCounter) const
|
||||
{
|
||||
return impactCounter % effectCluster.effectors().size();
|
||||
return impactCounter % effectCluster.effectors.size();
|
||||
}
|
||||
|
||||
void HandlerMineLayingArtillery::onChargeEffectChanged(const AreaEffectSimulation::ChargeEffect &data, DataModification modType)
|
||||
{
|
||||
Q_UNUSED(modType);
|
||||
|
||||
if (data.state() != AreaEffectSimulation::AesEffectState::EsActivated)
|
||||
if (data.state != AreaEffectSimulation::AesEffectState::EsActivated)
|
||||
return;
|
||||
|
||||
if (data.originatorTypeId() != ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
|
||||
if (data.originatorTypeId != ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation)
|
||||
return;
|
||||
|
||||
// since there are some mines missing when adding them too fast, they are queued
|
||||
|
||||
Reference in new issue
Block a user