Qt6 Migration: Merge latest Qt5 devel content and apply migration fixes
- Merged 292 changed files from dlbo snapshot - Fixed IDL enum collisions (PortType, PdmEventType) - Fixed Grantlee template for C++11 scoped enums - Fixed CMake VERSION_GREATER syntax - Added missing directories (THP, LtsRestClient, etc.) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
310 files changed
+2823
-740
No files matched your search
@@ -470,6 +470,8 @@ void ExplosionsEditAdler::onEffectClusterChanged(const EffectCluster &ecData, Da
|
||||
m_ui->pbStateChange->setEnabled(false);
|
||||
m_ui->gbEffectMarkingInTa->setEnabled(false);
|
||||
}
|
||||
|
||||
__unchange__();
|
||||
}
|
||||
|
||||
QPointF ExplosionsEditAdler::centerOfFiringUnitGeo(int particpantUnitId)
|
||||
|
||||
+23
-8
@@ -283,6 +283,15 @@ ExplosionsEditAdlerStandAlone::ExplosionsEditAdlerStandAlone(const QString &menu
|
||||
if (enableRocket)
|
||||
m_gearClassFilter += ProjectDataManagement::GearClass::Rocket;
|
||||
m_uiRequirements->addRequirement({m_ui->lblPosition, [this]() { return (!m_coord.isNull()); }});
|
||||
m_uiRequirements->addRequirement({m_ui->lblPosition_2, [this]() {
|
||||
// Im Fall (Zielgeometrie == Linear) ist positionEdit_2 enabled. Ansonsten disabled.
|
||||
// Daher: Wenn enabled, muss auch ein Wert enthalten sein.
|
||||
// Andernfalls wird in apply() die cornerBottomLeft aufgrund fehlerhafter Werte berechnet.
|
||||
// Die dabei resultierenden Werte haben bereits mal zu einem Absturz gefuehrt.
|
||||
// LS-693 [Stand-Alone] Koordinatenberechnung Linear...
|
||||
return (!m_ui->positionEdit_2->isEnabled()) || // Ok, wenn disabled
|
||||
(!m_ui->positionEdit_2->coordinate().isNull()); } // oder coordinate not null
|
||||
});
|
||||
m_uiRequirements->addRequirement({m_ui->lblRadiusBreite, [this]() { return (m_ui->sbDimensionX_BreiteRadius->value() >= s_minWidth); }});
|
||||
m_uiRequirements->addRequirement({m_ui->lblDimensionY_Tiefe, [this]() { return (m_ui->sbDimensionY_Tiefe->value() >= s_minHeight); }});
|
||||
// m_uiRequirements->addRequirement({m_ui->lblName, [this]() { return (!m_ui->leElement->text().isEmpty()); }});
|
||||
@@ -1669,6 +1678,13 @@ void ExplosionsEditAdlerStandAlone::onEffectClusterChanged(const EffectCluster &
|
||||
if (m_aesItem.effectStateId() == AreaEffectSimulation::AesEffectState::EsCreated ||
|
||||
m_aesItem.effectStateId() == AreaEffectSimulation::AesEffectState::EsPrepared)
|
||||
enableUiElements(!unchangeable());
|
||||
else if (m_aesItem.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired ||
|
||||
m_aesItem.effectStateId() == AreaEffectSimulation::AesEffectState::EsFired ||
|
||||
m_aesItem.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated)
|
||||
{
|
||||
if (hasUnsavedChanges())
|
||||
__unchange__();
|
||||
}
|
||||
|
||||
if(!unchangeable())
|
||||
setFireBtnState();
|
||||
@@ -2107,12 +2123,8 @@ bool ExplosionsEditAdlerStandAlone::apply()
|
||||
|
||||
if (m_ui->dteEffectStart->isChecked() && m_ui->dteEffectStart->isVisible())
|
||||
{
|
||||
const FiringType::type firingType = static_cast<FiringType::type>(m_ui->cbFiringType->currentData().toInt());
|
||||
if (firingType != FiringType::FireWithIndicationTTF)
|
||||
{
|
||||
// we use the effect start as usual
|
||||
request.effectStart().set(m_ui->dteEffectStart->msecsSinceEpoch());
|
||||
}
|
||||
// we use the effect start as usual
|
||||
request.effectStart().set(m_ui->dteEffectStart->msecsSinceEpoch());
|
||||
}
|
||||
if (m_ui->sbDurationSec->isVisible())
|
||||
request.effectDuration(m_ui->sbDurationSec->value() * 1000);
|
||||
@@ -2293,13 +2305,16 @@ bool ExplosionsEditAdlerStandAlone::apply()
|
||||
const QString properties = QString::fromUtf8(QJsonDocument(propertiesObj).toJson());
|
||||
DEBUG_LOG(m_logger) << "properties: " << properties;
|
||||
request.properties(properties.toStdString());
|
||||
DEBUG_LOG(m_logger) << "request abschicken";
|
||||
|
||||
// Rocket-Spezifika:
|
||||
const QVariant currentData = m_ui->cbGearClass->currentData();
|
||||
const ProjectDataManagement::GearClass::type currentGearClass = static_cast<ProjectDataManagement::GearClass::type>(currentData.toInt());
|
||||
|
||||
if (currentGearClass == ProjectDataManagement::GearClass::Rocket)
|
||||
{
|
||||
RocketUtility::addRocketPropertiesToRequest(request, m_ppmDtc);
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "request abschicken, request = '" << request << "'";
|
||||
|
||||
m_requestHelper->addRequest([this, request]() { return m_ftc->effectClusterModifyRequest(request, this); });
|
||||
|
||||
|
||||
@@ -179,6 +179,7 @@ void addRocketPropertiesForLinearGeometry(EffectClusterModifyRequest &request, c
|
||||
const double flightTimeStep = currentEffector.flightTime() / static_cast<double>(trajectoryWithoutTime.size());
|
||||
double currentFlightTime = 0.0;
|
||||
|
||||
currentEffector.trajectoryRelative().clear(); // LS_711_akkumulierende_flugkurven_bei_rakete
|
||||
const LtsCoordTrans::UtmCoordinate utmStartPos = LtsCoordTrans::UtmCoordinate::fromGeographic(participantPosition.pos().lon(), participantPosition.pos().lat());
|
||||
for (const Core::GeoPosition &pos : trajectoryWithoutTime)
|
||||
{
|
||||
@@ -240,6 +241,7 @@ void addRocketPropertiesForPointGeometry(EffectClusterModifyRequest &request, co
|
||||
const double flightTimeStep = currentEffector.flightTime() / static_cast<double>(trajectoryWithoutTime.size());
|
||||
double currentFlightTime = 0.0;
|
||||
|
||||
currentEffector.trajectoryRelative().clear(); // LS_711_akkumulierende_flugkurven_bei_rakete
|
||||
const LtsCoordTrans::UtmCoordinate utmStartPos = LtsCoordTrans::UtmCoordinate::fromGeographic(participantPosition.pos().lon(), participantPosition.pos().lat());
|
||||
for (const Core::GeoPosition &pos : trajectoryWithoutTime)
|
||||
{
|
||||
@@ -250,7 +252,7 @@ void addRocketPropertiesForPointGeometry(EffectClusterModifyRequest &request, co
|
||||
|
||||
currentFlightTime += flightTimeStep;
|
||||
}
|
||||
}
|
||||
} // for (EffectorData ¤tEffector : request.effectors())
|
||||
}
|
||||
|
||||
} // namespace RocketUtility
|
||||
|
||||
Reference in new issue
Block a user