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_smoke.cpp
+38 -36
View File
@@ -1,6 +1,7 @@
#include "esc_firing_smoke.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "esc_order_edit.h"
#include "esc_safety_confirmation_widget.h"
@@ -18,6 +19,7 @@ FiringSmoke::FiringSmoke(QWidget* parent)
m_safetyConfirmationWidget(nullptr), m_ui(new Ui::FiringSmoke),
m_requestHelper(new LtsUtils::RequestHelper(this)), m_idOrder(0), m_firingClearanceCountDown(0),
m_endOfFiringClearanceCountDown(0)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
DEBUG_LOG(m_logger) << "FiringSmoke::FiringSmoke()";
@@ -66,7 +68,7 @@ bool FiringSmoke::init(const std::shared_ptr<EffectShowClient::Interface::Dtc>&
&FiringSmoke::onMeteoDataChanged);
const EffectShowClient::MeteoNearVehicle dat = m_dtc.get()->meteoNearVehicle();
if (dat.windDirection() > 0)
if (dat.windDirection > 0)
onMeteoDataChanged(dat, DataModification());
else
onMeteoTimerTimeout();
@@ -92,15 +94,15 @@ void FiringSmoke::onFiringSmokeEntityChanged(const EffectShowClient::FiringSmoke
if (modType == DataModification::eRemoved)
return;
m_idOrder = data.idOrder();
m_idOrder = data.idOrder;
if (data.idEffectShow() > 0)
if (data.idEffectShow > 0)
{
const EffectShowClient::Order& order = m_dtc->order(data.idOrder());
m_ui->leEffectShow->setText(QString::fromStdString(order.info()));
const EffectShowClient::Order& order = m_dtc->order(data.idOrder);
m_ui->leEffectShow->setText(QString::fromStdString(order.info));
m_ui->lblLengthOfFogZone->setText(
tr("%1m x %2m").arg(QString::number(order.areaWidth()), QString::number(order.areaDepth())));
m_ui->lblDirectionOfFogZone->setText(QString::number(order.areaRotation()));
tr("%1m x %2m").arg(QString::number(order.areaWidth), QString::number(order.areaDepth)));
m_ui->lblDirectionOfFogZone->setText(QString::number(order.areaRotation));
}
else
{
@@ -109,16 +111,16 @@ void FiringSmoke::onFiringSmokeEntityChanged(const EffectShowClient::FiringSmoke
m_ui->lblDirectionOfFogZone->setText(QString::number(0));
}
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;
m_timer->stop();
onFiringClearanceCountDown();
m_safetyConfirmation = data.safetyConfirmation();
m_safetyConfirmation = data.safetyConfirmation;
onSafetyConfirmationDisplay();
m_oldEntity = data;
@@ -129,32 +131,32 @@ void FiringSmoke::onOperatingConditionEntityChanged(const OperatingConditionEnti
Q_UNUSED(modType)
QVector<QColor> onColor = {
data.smokeCartridge1().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
data.smokeCartridge1 <= EffectShowClient::StatusSmokeCartridge_e::Ready
? QColor(0, 255, 0)
: QColor(255, 255, 0),
data.smokeCartridge2().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
data.smokeCartridge2 <= EffectShowClient::StatusSmokeCartridge_e::Ready
? QColor(0, 255, 0)
: QColor(255, 255, 0),
data.smokeCartridge3().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
data.smokeCartridge3 <= EffectShowClient::StatusSmokeCartridge_e::Ready
? QColor(0, 255, 0)
: QColor(255, 255, 0),
data.smokeCartridge4().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
data.smokeCartridge4 <= EffectShowClient::StatusSmokeCartridge_e::Ready
? QColor(0, 255, 0)
: QColor(255, 255, 0),
data.smokeCartridge5().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
data.smokeCartridge5 <= EffectShowClient::StatusSmokeCartridge_e::Ready
? QColor(0, 255, 0)
: QColor(255, 255, 0)};
QVector<bool> status = {
((data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
(data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
((data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
(data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
((data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
(data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
((data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
(data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
((data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
(data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking))};
((data.smokeCartridge1 == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
(data.smokeCartridge1 == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
((data.smokeCartridge2 == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
(data.smokeCartridge2 == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
((data.smokeCartridge3 == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
(data.smokeCartridge3 == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
((data.smokeCartridge4 == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
(data.smokeCartridge4 == EffectShowClient::StatusSmokeCartridge_e::Smoking)),
((data.smokeCartridge5 == EffectShowClient::StatusSmokeCartridge_e::Ready) ||
(data.smokeCartridge5 == EffectShowClient::StatusSmokeCartridge_e::Smoking))};
m_smokeState->setSmokeState(status, onColor);
m_safetyConfirmationWidget->onOperatingConditionEntityChanged(data);
@@ -166,7 +168,7 @@ void FiringSmoke::onMeteoDataChanged(const MeteoNearVehicle& data, DataModificat
Q_UNUSED(modType)
m_meteoTimer->start(),
m_ui->lblWeather->setText(
tr("Speed [m/s]: %1 | Direction [°]: %2").arg(data.windSpeed()).arg(data.windDirection()));
tr("Speed [m/s]: %1 | Direction [°]: %2").arg(data.windSpeed).arg(data.windDirection));
}
void FiringSmoke::onMeteoTimerTimeout()
@@ -210,7 +212,7 @@ void FiringSmoke::onSafetyConfirmationDisplay()
{
if (!m_safetyConfirmationWidget)
return;
m_safetyConfirmationWidget->setNewSafetyConfirmationDisplay(m_safetyConfirmation.underlying());
m_safetyConfirmationWidget->setNewSafetyConfirmationDisplay(m_safetyConfirmation);
}
void FiringSmoke::onFiringClearanceCountDown()
@@ -241,10 +243,10 @@ bool FiringSmoke::statusChangedForManuallyEffectShow(EffectShowStatus_e status)
return m_requestHelper->startSingleRequest([this, status]() {
EffectShowClient::ManuallySmokeRequest request;
request.directionOfFogZone(0);
request.lengthOfFogZone(0);
request.pbAbort(status == EffectShowStatus_e::Abort);
request.pbCarriedOut(status == EffectShowStatus_e::CarriedOut);
request.directionOfFogZone = 0;
request.lengthOfFogZone = 0;
request.pbAbort = status == EffectShowStatus_e::Abort;
request.pbCarriedOut = status == EffectShowStatus_e::CarriedOut;
return m_ftc->manuallySmokeRequest(request, this);
});
}
@@ -259,7 +261,7 @@ bool FiringSmoke::statusChangedForOrderedEffectShow(EffectShowStatus_e status)
return m_requestHelper->startSingleRequest([this, status]() {
OrderModifyRequest orderModifyRequest;
orderModifyRequest.id(m_idOrder);
orderModifyRequest.id = m_idOrder;
EffectShowManagement::OrderConfirmation_e oc;
switch (status)
{
@@ -274,8 +276,8 @@ bool FiringSmoke::statusChangedForOrderedEffectShow(EffectShowStatus_e status)
"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);
});