lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
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:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.cpp
+40 -38
View File
@@ -1,6 +1,7 @@
#include "esc_firing_explosion.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "esc_order_edit.h"
#include "esc_safety_confirmation_widget.h"
@@ -15,6 +16,7 @@ FiringExplosion::FiringExplosion(QWidget* parent)
m_ui(new Ui::FiringExplosion), m_requestHelper(new LtsUtils::RequestHelper(this)), m_idOrder(0),
m_idEffectShow(0), m_shotsAvail(0), m_isClearance(true), m_firingClearanceCountDown(0),
m_endOfFiringClearanceCountDown(0)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_ui->setupUi(this);
m_ui->pbFire->setEnabled(false);
@@ -92,34 +94,34 @@ void FiringExplosion::onFiringExplosionEntityChanged(const EffectShowClient::Fir
if (modType == DataModification::eRemoved)
return;
m_idOrder = data.idOrder();
m_idEffectShow = data.idEffectShow();
m_idOrder = data.idOrder;
m_idEffectShow = data.idEffectShow;
m_ui->pbApply->setEnabled(!data.isActive());
m_ui->pbApply->setEnabled(!data.isActive);
OperatingConditionEntity opcon = m_dtc->operatingConditionEntity();
bool fireUnitsActive = opcon.firingUnitReadyAftLh() || opcon.firingUnitReadyAftRh() ||
opcon.firingUnitReadyFwdLh() || opcon.firingUnitReadyFwdRh();
bool fireUnitsActive = opcon.firingUnitReadyAftLh || opcon.firingUnitReadyAftRh ||
opcon.firingUnitReadyFwdLh || opcon.firingUnitReadyFwdRh;
bool pbActiv =
(data.fireEnabled() && data.safetyConfirmation() != EffectShowClient::SafetyConfirmation_e::SafetyNotConfirmed);
(data.fireEnabled && data.safetyConfirmation != EffectShowClient::SafetyConfirmation_e::SafetyNotConfirmed);
if (!fireUnitsActive && m_safetyConfirmationWidget)
m_safetyConfirmationWidget->setMessage(tr("Waiting for ready firing unit"));
else
m_safetyConfirmationWidget->setMessage(QString());
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Yes, data.carriedOutEnabled());
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Yes, data.carriedOutEnabled);
if (m_oldEntity.numberOfVolley() != data.numberOfVolley())
m_ui->sbNumberOfVolley->setValue(data.numberOfVolley());
if (m_oldEntity.numberOfShot() != data.numberOfShot())
m_ui->sbNumberOfShot->setValue(data.numberOfShot());
if (m_oldEntity.duration() != data.duration())
m_ui->sbDuration->setValue(data.duration() / 1000);
if (m_oldEntity.numberOfVolley != data.numberOfVolley)
m_ui->sbNumberOfVolley->setValue(data.numberOfVolley);
if (m_oldEntity.numberOfShot != data.numberOfShot)
m_ui->sbNumberOfShot->setValue(data.numberOfShot);
if (m_oldEntity.duration != data.duration)
m_ui->sbDuration->setValue(data.duration / 1000);
if (m_idEffectShow > 0)
{
QString textStr = QString::fromStdString(m_dtc->order(m_idEffectShow).info());
QString textStr = QString::fromStdString(m_dtc->order(m_idEffectShow).info);
m_ui->leEffectShow->setText(textStr);
}
else
@@ -127,15 +129,15 @@ void FiringExplosion::onFiringExplosionEntityChanged(const EffectShowClient::Fir
m_timer->stop();
m_firingClearanceCountDown = data.firingClearanceTime().is_set()
? (1000 + data.firingClearanceTime().get() - m_session->partitionTime())
m_firingClearanceCountDown = data.firingClearanceTime.has_value()
? (1000 + data.firingClearanceTime.get() - m_session->partitionTime())
: 0;
m_endOfFiringClearanceCountDown = data.endOfFiringClearanceTime().is_set()
? (1000 + data.endOfFiringClearanceTime().get() - m_session->partitionTime())
m_endOfFiringClearanceCountDown = data.endOfFiringClearanceTime.has_value()
? (1000 + data.endOfFiringClearanceTime.get() - m_session->partitionTime())
: 0;
onFiringClearanceCountDown();
if (data.idOrder() == 0 || (!data.firingClearanceTime().is_set() && data.duration() == 0))
if (data.idOrder == 0 || (!data.firingClearanceTime.has_value() && data.duration == 0))
m_isClearance = true;
else
m_isClearance = (m_firingClearanceCountDown <= 0 && m_endOfFiringClearanceCountDown > 0);
@@ -143,15 +145,15 @@ void FiringExplosion::onFiringExplosionEntityChanged(const EffectShowClient::Fir
m_ui->pbFire->setEnabled(pbActiv && fireUnitsActive && m_isClearance);
bool isInterruptEnabled =
!data.carriedOutEnabled() && !m_ui->pbFire->isEnabled() && data.isActive() && m_isClearance;
!data.carriedOutEnabled && !m_ui->pbFire->isEnabled() && data.isActive && m_isClearance;
m_ui->pbInterrupt->setEnabled(isInterruptEnabled);
m_ui->leRemainingShots->setText(data.remainingShots() > 0 ? QString::number(data.remainingShots())
m_ui->leRemainingShots->setText(data.remainingShots > 0 ? QString::number(data.remainingShots)
: QString::number(0));
m_ui->leRemainingTime->setText(QString::number(data.remainingTime() / 1000));
m_ui->leRemainingVolley->setText(data.remainingVolleys() > 0 ? QString::number(data.remainingVolleys())
m_ui->leRemainingTime->setText(QString::number(data.remainingTime / 1000));
m_ui->leRemainingVolley->setText(data.remainingVolleys > 0 ? QString::number(data.remainingVolleys)
: QString::number(0));
m_safetyConfirmation = data.safetyConfirmation();
m_safetyConfirmation = data.safetyConfirmation;
onSafetyConfirmationDisplay();
m_oldEntity = data;
@@ -162,7 +164,7 @@ void FiringExplosion::onOperatingConditionEntityChanged(const OperatingCondition
Q_UNUSED(modType)
if (m_safetyConfirmationWidget)
m_safetyConfirmationWidget->onOperatingConditionEntityChanged(data);
m_shotsAvail = data.ammunitionMagazine();
m_shotsAvail = data.ammunitionMagazine;
m_ui->lblShotsAvail->setText(QString::number(m_shotsAvail));
}
@@ -278,21 +280,21 @@ bool FiringExplosion::statusChangedForManuallyEffectShow(EffectShowStatus_e stat
{
const EffectShowClient::FiringExplosionEntity manEx = m_dtc->firingExplosionEntity();
request.numberOfVolley(manEx.remainingVolleys());
request.numberOfShot(manEx.remainingShots());
request.duration(manEx.remainingTime());
request.numberOfVolley = manEx.remainingVolleys;
request.numberOfShot = manEx.remainingShots;
request.duration = manEx.remainingTime;
}
else
{
request.numberOfVolley(m_ui->sbNumberOfVolley->value());
request.numberOfShot(m_ui->sbNumberOfShot->value());
request.duration(m_ui->sbDuration->value() * 1000);
request.numberOfVolley = m_ui->sbNumberOfVolley->value();
request.numberOfShot = m_ui->sbNumberOfShot->value();
request.duration = m_ui->sbDuration->value() * 1000;
}
request.pbFire(status == EffectShowStatus_e::Fire);
request.pbAbort(status == EffectShowStatus_e::Abort);
request.pbInterrupt(status == EffectShowStatus_e::Interrupt);
request.pbFire = status == EffectShowStatus_e::Fire;
request.pbAbort = status == EffectShowStatus_e::Abort;
request.pbInterrupt = status == EffectShowStatus_e::Interrupt;
request.pbCarriedOut(status == EffectShowStatus_e::CarriedOut || status == EffectShowStatus_e::Abort);
request.pbCarriedOut = status == EffectShowStatus_e::CarriedOut || status == EffectShowStatus_e::Abort;
return m_ftc->manuallyExplosionRequest(request, this);
});
@@ -308,7 +310,7 @@ bool FiringExplosion::statusChangedForOrderedEffectShow(EffectShowStatus_e statu
return m_requestHelper->startSingleRequest([this, status]() {
OrderModifyRequest orderModifyRequest;
orderModifyRequest.id(m_idEffectShow);
orderModifyRequest.id = m_idEffectShow;
EffectShowManagement::OrderConfirmation_e oc;
switch (status)
{
@@ -326,8 +328,8 @@ bool FiringExplosion::statusChangedForOrderedEffectShow(EffectShowStatus_e statu
"should not happen I guess...";
break;
}
orderModifyRequest.orderConfirmation(oc);
orderModifyRequest.answerText(QString().toStdString());
orderModifyRequest.orderConfirmation = oc;
orderModifyRequest.answerText = QString().toStdString();
return m_ftc->orderModifyRequest(orderModifyRequest, this);
});