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_operating_condition.cpp
+54 -52
View File
@@ -1,6 +1,7 @@
#include "esc_operating_condition.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "LtsWidgets/lts_message_dialog.h"
#include "esc_safety_confirmation_widget.h"
@@ -19,6 +20,7 @@ OperatingCondition::OperatingCondition(QWidget* parent)
m_lastState(EffectShowClient::OperatingConditionEntity()), m_meteoTimerTimeout(60 * 1000 * 15),
m_meteoTimer(new QTimer(this)), m_smokeState(nullptr), m_safetyConfirmationWidget(nullptr),
m_ui(new Ui::OperatingCondition), m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_ui->setupUi(this);
m_smokeState = new EffectShowClient::SmokeState(this);
@@ -83,7 +85,7 @@ bool OperatingCondition::init(const std::shared_ptr<EffectShowClient::Interface:
onOperatingConditionEntityChanged(m_dtc->operatingConditionEntity(), DataModification::eAdded);
const EffectShowClient::MeteoNearVehicle mdmv = m_dtc->meteoNearVehicle();
if (mdmv.temperature() > 0 && mdmv.windSpeed() > 0)
if (mdmv.temperature > 0 && mdmv.windSpeed > 0)
onMeteoNearVehicleChanged(m_dtc->meteoNearVehicle(), DataModification::eAdded);
connect(m_ui->pbConfirmReadiness, &QPushButton::clicked, this, &OperatingCondition::onSendConfirmReadiness);
@@ -103,15 +105,15 @@ int OperatingCondition::getSmokeCount()
{
const OperatingConditionEntity& data = m_dtc->operatingConditionEntity();
int currentSmokeLoad = 0;
if (data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
if (data.smokeCartridge1 == EffectShowClient::StatusSmokeCartridge_e::Ready)
currentSmokeLoad++;
if (data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
if (data.smokeCartridge2 == EffectShowClient::StatusSmokeCartridge_e::Ready)
currentSmokeLoad++;
if (data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
if (data.smokeCartridge3 == EffectShowClient::StatusSmokeCartridge_e::Ready)
currentSmokeLoad++;
if (data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
if (data.smokeCartridge4 == EffectShowClient::StatusSmokeCartridge_e::Ready)
currentSmokeLoad++;
if (data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
if (data.smokeCartridge5 == EffectShowClient::StatusSmokeCartridge_e::Ready)
currentSmokeLoad++;
return currentSmokeLoad;
@@ -125,19 +127,19 @@ void OperatingCondition::onOperatingConditionEntityChanged(const EffectShowClien
m_lastState = data;
if (data.vehicleFeature() ==
if (data.vehicleFeature ==
EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Explosion24))
{
m_ui->ledAftLh->hide();
m_ui->ledAftRh->hide();
}
else if (data.vehicleFeature() ==
else if (data.vehicleFeature ==
EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Explosion48))
{
m_ui->ledAftLh->show();
m_ui->ledAftRh->show();
}
bool isExp = data.vehicleFeature() !=
bool isExp = data.vehicleFeature !=
EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Smoke);
m_ui->frame->setHidden(!isExp);
m_ui->lblMagazine->setHidden(!isExp);
@@ -151,26 +153,26 @@ void OperatingCondition::onOperatingConditionEntityChanged(const EffectShowClien
m_ui->pbConfirmReadiness->setEnabled(hasNoWarnings);
}
setBatteryVoltage(data.batteryVoltage());
setBatteryVoltage(data.batteryVoltage);
if (data.vehicleFeature() !=
if (data.vehicleFeature !=
EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Smoke))
{
if (data.vehicleFeature() ==
if (data.vehicleFeature ==
EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::NotSpecified))
return;
int max = data.vehicleFeature() ==
int max = data.vehicleFeature ==
EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Explosion24)
? 24
: 48;
m_ui->sbMagazine->setMaximum(max);
m_ui->sbAvailable->setMaximum(255);
m_ui->ledFwdLh->setStatus(data.firingUnitReadyFwdLh());
m_ui->ledAftLh->setStatus(data.firingUnitReadyAftLh());
m_ui->ledFwdRh->setStatus(data.firingUnitReadyFwdRh());
m_ui->ledAftRh->setStatus(data.firingUnitReadyAftRh());
m_ui->ledFwdLh->setStatus(data.firingUnitReadyFwdLh);
m_ui->ledAftLh->setStatus(data.firingUnitReadyAftLh);
m_ui->ledFwdRh->setStatus(data.firingUnitReadyFwdRh);
m_ui->ledAftRh->setStatus(data.firingUnitReadyAftRh);
}
else
{
@@ -178,56 +180,56 @@ void OperatingCondition::onOperatingConditionEntityChanged(const EffectShowClien
m_ui->sbMagazine->setMaximum(5);
m_ui->sbAvailable->setMaximum(12);
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_ui->ltsLedWidget->setColor(data.readiness() ? QColor(0, 255, 0) : QColor(255, 0, 0));
m_ui->ltsLedWidget->setColor(data.readiness ? QColor(0, 255, 0) : QColor(255, 0, 0));
m_ui->ltsLedWidget->setStatus(true);
if (m_ui->lblAva->text().toInt() != data.ammunitionAvailable())
m_ui->sbAvailable->setValue(data.ammunitionAvailable());
m_ui->lblAva->setText(QString::number(data.ammunitionAvailable()));
m_ui->lblMag->setText(QString::number(data.ammunitionMagazine()));
if (m_ui->lblAva->text().toInt() != data.ammunitionAvailable)
m_ui->sbAvailable->setValue(data.ammunitionAvailable);
m_ui->lblAva->setText(QString::number(data.ammunitionAvailable));
m_ui->lblMag->setText(QString::number(data.ammunitionMagazine));
}
void OperatingCondition::onFiringExplosionEntityChanged(const FiringExplosionEntity& data, DataModification modType)
{
Q_UNUSED(modType)
m_safetyConfirmation = data.safetyConfirmation();
m_safetyConfirmation = data.safetyConfirmation;
onSafetyConfirmationDisplay();
}
void OperatingCondition::onFiringSmokeEntityChanged(const FiringSmokeEntity& data, DataModification modType)
{
Q_UNUSED(modType)
m_safetyConfirmation = data.safetyConfirmation();
m_safetyConfirmation = data.safetyConfirmation;
onSafetyConfirmationDisplay();
}
@@ -235,14 +237,14 @@ void OperatingCondition::onSafetyConfirmationDisplay()
{
if (!m_safetyConfirmationWidget)
return;
m_safetyConfirmationWidget->setNewSafetyConfirmationDisplay(m_safetyConfirmation.underlying());
m_safetyConfirmationWidget->setNewSafetyConfirmationDisplay(m_safetyConfirmation);
}
bool OperatingCondition::onSendRevokeReadiness()
{
bool ret = m_requestHelper->startSingleRequest([this]() {
EffectShowClient::SendReadinessRequest request;
request.readiness(false);
request.readiness = false;
return m_ftc->sendReadinessRequest(request, this);
});
@@ -253,7 +255,7 @@ bool OperatingCondition::onSendConfirmReadiness()
{
bool ret = m_requestHelper->startSingleRequest([this]() {
EffectShowClient::SendReadinessRequest request;
request.readiness(true);
request.readiness = true;
return m_ftc->sendReadinessRequest(request, this);
});
@@ -267,11 +269,11 @@ void OperatingCondition::onMeteoNearVehicleChanged(const EffectShowClient::Meteo
return;
m_meteoTimer->start(m_meteoTimerTimeout);
m_ui->leTemperature->setText(QString::number(data.temperature(), 'f', 2));
m_ui->leHumidity->setText(QString::number(data.humidity(), 'f', 2));
m_ui->lePressure->setText(QString::number(data.pressure(), 'f', 2));
m_ui->leWindSpeed->setText(QString::number(data.windSpeed(), 'f', 2));
m_ui->leWindDirection->setText(QString::number(data.windDirection(), 'f', 2));
m_ui->leTemperature->setText(QString::number(data.temperature, 'f', 2));
m_ui->leHumidity->setText(QString::number(data.humidity, 'f', 2));
m_ui->lePressure->setText(QString::number(data.pressure, 'f', 2));
m_ui->leWindSpeed->setText(QString::number(data.windSpeed, 'f', 2));
m_ui->leWindDirection->setText(QString::number(data.windDirection, 'f', 2));
m_ui->leLastUpdate->setText(DTG::toString(QDateTime::currentDateTime()));
}
@@ -293,7 +295,7 @@ bool OperatingCondition::onSendAmmunition()
new LtsWidgets::LtsMessageDialogNew(
this, tr("The value for Magazine must not be higher than the value for Available."));
QPalette* palette = new QPalette();
palette->setColor(QPalette::Background, Qt::red);
palette->setColor(QPalette::Window, Qt::red);
m_ui->sbMagazine->setPalette(*palette);
return false;
}
@@ -303,13 +305,13 @@ bool OperatingCondition::onSendAmmunition()
return m_requestHelper->startSingleRequest([this]() {
EffectShowClient::SendAmmunitionRequest request;
const OperatingConditionEntity& condition = m_dtc->operatingConditionEntity();
if (condition.vehicleFeature() ==
if (condition.vehicleFeature ==
EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Smoke))
request.ammunitionMagazine(getSmokeCount());
request.ammunitionMagazine = getSmokeCount();
else
request.ammunitionMagazine(m_ui->sbMagazine->value());
request.ammunitionMagazine = m_ui->sbMagazine->value();
request.ammunitionAvailable(m_ui->sbAvailable->value());
request.ammunitionAvailable = m_ui->sbAvailable->value();
return m_ftc->sendAmmunitionRequest(request, this);
});