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_effect_show_gui_plugin.cpp
+15 -15
View File
@@ -161,11 +161,11 @@ void InterfaceImpl::onOperatingConditionEntityChanged(const OperatingConditionEn
Q_UNUSED(modType)
if (data.vehicleFeature() != m_vehicleType)
if (data.vehicleFeature != m_vehicleType)
{
m_vehicleType = data.vehicleFeature();
m_vehicleType = data.vehicleFeature;
m_session->baseLayout()->addMenuAction(m_effecShowAction);
@@ -221,15 +221,15 @@ void InterfaceImpl::onOperatingConditionEntityChanged(const OperatingConditionEn
if (m_vehicleType == EffectShowManagement::Feature_e::Smoke)
{
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++;
if (currentSmokeLoad != m_oldSmokeCount)
@@ -241,13 +241,13 @@ void InterfaceImpl::onOperatingConditionEntityChanged(const OperatingConditionEn
else if (m_vehicleType != EffectShowManagement::Feature_e::NotSpecified)
{
if (m_oldCondition.ammunitionMagazine() != data.ammunitionMagazine())
if (m_oldCondition.ammunitionMagazine != data.ammunitionMagazine)
onSendAmmunition();
}
m_lastStatesTime = m_session->partitionTime();
if (data.readiness() && !m_oldCondition.readiness() && !m_operationalStatusTimer->isActive())
if (data.readiness && !m_oldCondition.readiness && !m_operationalStatusTimer->isActive())
{
DEBUG_LOG(m_logger) << "Operating condition: operational. Starting timer.";
m_operationalStatusTimer->start(10 * 60 * 1000);
@@ -262,10 +262,10 @@ void InterfaceImpl::onSendAmmunition(int currentSmokeCount)
const OperatingConditionEntity &condition = m_dtc->operatingConditionEntity();
SendAmmunitionRequest req;
if (currentSmokeCount >= 0)
req.ammunitionMagazine(currentSmokeCount);
req.ammunitionMagazine = currentSmokeCount;
else
req.ammunitionMagazine(condition.ammunitionMagazine());
req.ammunitionAvailable(condition.ammunitionAvailable());
req.ammunitionMagazine = condition.ammunitionMagazine;
req.ammunitionAvailable = condition.ammunitionAvailable;
m_ftc->sendAmmunitionRequest(req, this);
}
@@ -281,11 +281,11 @@ void InterfaceImpl::checkLastState()
void InterfaceImpl::onOperationalStatusTimeout()
{
DEBUG_LOG(m_logger) << "Sending operational status: " << (m_oldCondition.readiness() ? "operational." : "not operational.");
DEBUG_LOG(m_logger) << "Sending operational status: " << (m_oldCondition.readiness ? "operational." : "not operational.");
SendReadinessRequest req;
req.readiness(m_oldCondition.readiness());
req.readiness = m_oldCondition.readiness;
m_ftc->sendReadinessRequest(req, this);
if (!m_oldCondition.readiness())
if (!m_oldCondition.readiness)
{
DEBUG_LOG(m_logger) << "Operating condition: not operational. Stopping timer.";
m_operationalStatusTimer->stop();
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);
});
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);
});
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);
});
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.cpp
+52 -50
View File
@@ -1,10 +1,11 @@
#include "esc_order_edit.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "ui_esc_order_edit.h"
// esm_translation.h - external dependency, removed for build
#include <EffectShowManagement/esm_translation.h>
namespace EffectShowClient
{
@@ -13,6 +14,7 @@ OrderEdit::OrderEdit(const Order& order, bool fireReadinessAvailable, QWidget* p
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkCancel), m_ftc(nullptr), m_ui(new Ui::OrderEdit),
m_requestHelper(new LtsUtils::RequestHelper(this)), m_order(order),
m_fireReadinessAvailable(fireReadinessAvailable)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_ui->setupUi(this);
}
@@ -48,7 +50,7 @@ bool OrderEdit::init(const std::shared_ptr<EffectShowClient::Interface::Ftc>& ft
showOrder();
else
{
m_ui->cbOrderConfirmation->addItem(m_orderList[order.underlying()]);
m_ui->cbOrderConfirmation->addItem(m_orderList[static_cast<int>(order)]);
m_ui->cbOrderConfirmation->setEnabled(false);
slotChangesMade();
setUnchangeable(true);
@@ -83,11 +85,11 @@ bool OrderEdit::apply()
int key = m_orderList.key(m_ui->cbOrderConfirmation->currentText());
EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e(key);
orderModifyRequest.orderConfirmation(oc);
orderModifyRequest.orderConfirmation = oc;
orderModifyRequest.answerText(m_ui->cbxAnswer->currentText().toStdString());
orderModifyRequest.answerText = m_ui->cbxAnswer->currentText().toStdString();
orderModifyRequest.id(m_order.id());
orderModifyRequest.id = m_order.id;
return m_ftc->orderModifyRequest(orderModifyRequest, this);
});
@@ -95,7 +97,7 @@ bool OrderEdit::apply()
void OrderEdit::retranslate()
{
if (m_order.typeOfOrder() == 0)
if (m_order.typeOfOrder == 0)
translate(m_ui, tr("Edit relocation order"));
else
translate(m_ui, tr("Edit Effectshow Order"));
@@ -107,8 +109,8 @@ bool OrderEdit::checkForAnswerUiRequirement() const
return true;
int key = m_orderList.key(m_ui->cbOrderConfirmation->currentText());
return !(((key == EffectShowManagement::OrderConfirmation_e::Nonacceptance) ||
(key == EffectShowManagement::OrderConfirmation_e::Abort)) &&
return !(((key == static_cast<int>(EffectShowManagement::OrderConfirmation_e::Nonacceptance)) ||
(key == static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort))) &&
m_ui->cbxAnswer->currentText().isEmpty());
}
@@ -116,64 +118,64 @@ void OrderEdit::showOrder()
{
QStringList orderList;
switch (m_order.orderConfirmation().underlying())
switch (m_order.orderConfirmation)
{
case EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::OrderAcceptance]
<< m_orderList[EffectShowManagement::OrderConfirmation_e::DriveOff]
<< m_orderList[EffectShowManagement::OrderConfirmation_e::PositionReached];
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::OrderAcceptance)]
<< m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::DriveOff)]
<< m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::PositionReached)];
if (m_order.typeOfOrder() != 0 && m_fireReadinessAvailable)
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness];
if (m_order.typeOfOrder != 0 && m_fireReadinessAvailable)
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::FiringReadiness)];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Nonacceptance];
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Nonacceptance)];
break;
case EffectShowManagement::OrderConfirmation_e::OrderAcceptance:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::DriveOff]
<< m_orderList[EffectShowManagement::OrderConfirmation_e::InterruptRelocation]
<< m_orderList[EffectShowManagement::OrderConfirmation_e::PositionReached];
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::DriveOff)]
<< m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::InterruptRelocation)]
<< m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::PositionReached)];
if (m_order.typeOfOrder() != 0 && m_fireReadinessAvailable)
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness];
if (m_order.typeOfOrder != 0 && m_fireReadinessAvailable)
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::FiringReadiness)];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort)];
break;
case EffectShowManagement::OrderConfirmation_e::DriveOff:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::InterruptRelocation]
<< m_orderList[EffectShowManagement::OrderConfirmation_e::PositionReached];
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::InterruptRelocation)]
<< m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::PositionReached)];
if (m_order.typeOfOrder() != 0 && m_fireReadinessAvailable)
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness];
if (m_order.typeOfOrder != 0 && m_fireReadinessAvailable)
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::FiringReadiness)];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort)];
break;
case EffectShowManagement::OrderConfirmation_e::PositionReached:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::InterruptRelocation];
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::InterruptRelocation)];
if (m_fireReadinessAvailable)
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::FiringReadiness)];
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort)];
break;
case EffectShowManagement::OrderConfirmation_e::FiringReadiness:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort)];
break;
case EffectShowManagement::OrderConfirmation_e::Execution:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort)];
break;
case EffectShowManagement::OrderConfirmation_e::InterruptRelocation:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::DriveOff]
<< m_orderList[EffectShowManagement::OrderConfirmation_e::PositionReached];
if (m_order.typeOfOrder() != 0 && m_fireReadinessAvailable)
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::DriveOff)]
<< m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::PositionReached)];
if (m_order.typeOfOrder != 0 && m_fireReadinessAvailable)
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::FiringReadiness)];
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort)];
break;
case EffectShowManagement::OrderConfirmation_e::InterruptExecution:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::OrderCarriedOut]
<< m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::OrderCarriedOut)]
<< m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort)];
break;
default:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
orderList << m_orderList[static_cast<int>(EffectShowManagement::OrderConfirmation_e::Abort)];
break;
}
m_ui->cbOrderConfirmation->addItems(orderList);
@@ -183,27 +185,27 @@ void OrderEdit::showOrder()
void OrderEdit::createOrderList()
{
EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e::OrderAcceptance;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e::DriveOff;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e::PositionReached;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e::FiringReadiness;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e::Execution;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e::InterruptExecution;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e::OrderCarriedOut;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e::Abort;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e::Nonacceptance;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e::InterruptRelocation;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
m_orderList[static_cast<int>(oc)] = EffectShowManagement::toString(oc);
}
} // namespace EffectShowClient
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.h
+1 -1
View File
@@ -48,7 +48,7 @@ class OrderEdit : public LtsWidgets::LtsDialog, protected EffectShowClient::Inte
LtsUtils::RequestHelper* m_requestHelper;
Order m_order;
bool m_fireReadinessAvailable;
EffectShowManagement::OrderConfirmation m_forcedState;
EffectShowManagement::OrderConfirmation_e m_forcedState;
QHash<int, QString> m_orderList;
};
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.cpp
+13 -11
View File
@@ -1,6 +1,7 @@
#include "esc_order_list.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "esc_firing_explosion.h"
#include "esc_firing_smoke.h"
@@ -21,6 +22,7 @@ OrderList::OrderList(const QString& menuGroup, LtsSession::LtsSession* session,
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_menuGroup(menuGroup), m_model(nullptr),
m_dtc(nullptr), m_ftc(nullptr), m_sitMapGuiIfc(nullptr), m_session(session), m_ui(new Ui::OrderList),
m_isEffectShow(false)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_ui->setupUi(this);
m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -64,7 +66,7 @@ bool OrderList::init(bool isEffectShow, const std::shared_ptr<EffectShowClient::
m_ftc = ftc;
if (!m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(m_sitMapGuiIfc))
return false;
EffectShowManagement::Feature_e feature = m_dtc->operatingConditionEntity().vehicleFeature();
EffectShowManagement::Feature_e feature = m_dtc->operatingConditionEntity().vehicleFeature;
if (isEffectShow && feature == EffectShowManagement::Feature_e::NotSpecified)
return false;
@@ -135,8 +137,8 @@ void OrderList::onSelectionChanged()
const QModelIndex idx = m_ui->widget->currentIndex();
int row = idx.row();
const EffectShowClient::Order order = m_model->getRowData(row);
bool isReady = order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::FiringReadiness ||
order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::Execution;
bool isReady = order.orderConfirmation == EffectShowManagement::OrderConfirmation_e::FiringReadiness ||
order.orderConfirmation == EffectShowManagement::OrderConfirmation_e::Execution;
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Show, isReady);
@@ -155,15 +157,15 @@ void OrderList::onEditOrder()
const EffectShowClient::Order order = m_model->getRowData(row);
DEBUG_LOG(m_logger) << "--- onEditOrder() ";
if (order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::OrderCarriedOut)
if (order.orderConfirmation == EffectShowManagement::OrderConfirmation_e::OrderCarriedOut)
return;
bool fireReadinessEnable = true;
const auto orders = m_dtc->orders();
for (const auto& ord : orders)
{
if (ord.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::FiringReadiness ||
ord.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::InterruptExecution ||
ord.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::Execution)
if (ord.orderConfirmation == EffectShowManagement::OrderConfirmation_e::FiringReadiness ||
ord.orderConfirmation == EffectShowManagement::OrderConfirmation_e::InterruptExecution ||
ord.orderConfirmation == EffectShowManagement::OrderConfirmation_e::Execution)
{
fireReadinessEnable = false;
@@ -184,7 +186,7 @@ void OrderList::onShowOrder()
if (row < 0)
return;
EffectShowManagement::Feature_e feature = m_dtc->operatingConditionEntity().vehicleFeature();
EffectShowManagement::Feature_e feature = m_dtc->operatingConditionEntity().vehicleFeature;
if (feature == EffectShowManagement::Feature_e::NotSpecified)
return;
@@ -227,11 +229,11 @@ void OrderList::onCreateShowEscOrderPosition()
const EffectShowClient::Order order = m_model->getRowData(row);
bool is_smoke =
m_dtc.get()->operatingConditionEntity().vehicleFeature() == EffectShowManagement::Feature_e::Smoke &&
m_dtc.get()->operatingConditionEntity().vehicleFeature == EffectShowManagement::Feature_e::Smoke &&
m_isEffectShow;
const QPointF& pos = QPointF(order.position().lon(), order.position().lat());
m_sitMapGuiIfc->escOrderPosition_create(pos, order.areaWidth(), order.areaDepth(), order.areaRotation(), is_smoke);
const QPointF& pos = QPointF(order.position.lon, order.position.lat);
m_sitMapGuiIfc->escOrderPosition_create(pos, order.areaWidth, order.areaDepth, order.areaRotation, is_smoke);
m_sitMapGuiIfc->setCenterPoint(pos);
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load, true);
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_model.cpp
+25 -23
View File
@@ -2,7 +2,8 @@
#include "esc_order_model.h"
// esm_translation.h - external dependency, removed for build
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <EffectShowManagement/esm_translation.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <ngltools/ngltools_dtg.h>
#include <sstream>
@@ -29,6 +30,7 @@ OrderModel::OrderModel(QObject *parent)
tr("Shots In Total")
},
parent)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{}
@@ -46,7 +48,7 @@ bool OrderModel::initModel(const std::shared_ptr<EffectShowClient::Interface::Dt
const QMap<qint32, EffectShowClient::Order> &orderMap = m_dtc->orders();
for (const auto &order : orderMap)
{
if (order.typeOfOrder() == m_isEffectShow)
if (order.typeOfOrder == m_isEffectShow)
insertRow(order);
}
@@ -68,41 +70,41 @@ QVariant OrderModel::data(const QModelIndex &index, int role) const
{
if (role != Qt::DisplayRole || !indexIsValid(index))
return QVariant();
bool is_smoke = m_dtc.get()->operatingConditionEntity().vehicleFeature() == EffectShowManagement::Feature_e::Smoke;
bool is_smoke = m_dtc.get()->operatingConditionEntity().vehicleFeature == EffectShowManagement::Feature_e::Smoke;
const EffectShowClient::Order &order = m_vecData.at(index.row());
switch (index.column())
{
case Status:
return EffectShowManagement::toString(order.orderConfirmation());
return EffectShowManagement::toString(order.orderConfirmation);
case Id:
return order.idOrder();
return order.idOrder;
case StartTime:
return order.startTime().is_set() ? DTG::toStringMSec(order.startTime().get()) : tr("---");
return order.startTime.has_value() ? DTG::toStringMSec(order.startTime.get()) : tr("---");
case Duration:
return LtsWidgets::readableDuration(order.duration() * 1000);
return LtsWidgets::readableDuration(order.duration * 1000);
case Distance:
{
if (!m_dtcTabOC)
return QVariant();
int distance = qRound(LtsCoordTrans::distance(m_ownPosition.position().lon(), m_ownPosition.position().lat(),
order.position().lon(), order.position().lat()));
int distance = qRound(LtsCoordTrans::distance(m_ownPosition.position.lon, m_ownPosition.position.lat,
order.position.lon, order.position.lat));
return (distance / 10) * 10;
}
case Position:
{
const Core::GeoPosition2D &pos = order.position();
return LtsCoordTrans::mgrsFromGeographic(pos.lon(), pos.lat());
const Core::GeoPosition2D &pos = order.position;
return LtsCoordTrans::mgrsFromGeographic(pos.lon, pos.lat);
}
case Area:
{
return tr("%1m x %2m", "Ausdehung: 5m x 6m").arg(order.areaWidth()).arg(order.areaDepth());
return tr("%1m x %2m", "Ausdehung: 5m x 6m").arg(order.areaWidth).arg(order.areaDepth);
}
case Type:
{
if (order.typeOfOrder() == 0)
if (order.typeOfOrder == 0)
return tr("Relocation Position");
else if (is_smoke)
return tr("Smoke");
@@ -111,21 +113,21 @@ QVariant OrderModel::data(const QModelIndex &index, int role) const
}
case Rotation:
if (is_smoke)
return order.areaRotation();
return order.areaRotation;
else
return QStringLiteral("--");
case Volley:
if (is_smoke)
return QStringLiteral("--");
else
return order.numOfVolley();
return order.numOfVolley;
case Info:
return QString::fromStdString(order.info());
return QString::fromStdString(order.info);
case ShotsInTotal:
if (is_smoke)
return QStringLiteral("--");
else
return order.shotsPerVolley();
return order.shotsPerVolley;
}
@@ -150,7 +152,7 @@ bool OrderModel::onDataChanged(const Order &data, DataModification modType)
{
if (modType == DataModification::eRemoved)
return LtsAbstractTableModel::onDataChanged(data, modType);
else if (data.typeOfOrder() == m_isEffectShow)
else if (data.typeOfOrder == m_isEffectShow)
return LtsAbstractTableModel::onDataChanged(data, modType);
return false;
}
@@ -188,13 +190,13 @@ bool OrderProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex
switch (source_left.column())
{
case OrderModel::StartTime:
if (dataLeft.startTime().is_set() && dataRight.startTime().is_set())
return dataLeft.startTime().get() < dataRight.startTime().get();
if (dataRight.startTime().is_set())
if (dataLeft.startTime.has_value() && dataRight.startTime.has_value())
return dataLeft.startTime.get() < dataRight.startTime.get();
if (dataRight.startTime.has_value())
return true;
if (dataLeft.startTime().is_set())
if (dataLeft.startTime.has_value())
return false;
return dataLeft.id() < dataRight.id();
return dataLeft.id < dataRight.id;
case OrderModel::Status:
case OrderModel::Id:
case OrderModel::Duration:
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.cpp
+10 -10
View File
@@ -37,21 +37,21 @@ bool SafetyConfirmationWidget::init(const std::shared_ptr<Interface::Ftc> &ftc)
bool SafetyConfirmationWidget::onOperatingConditionEntityChanged(const OperatingConditionEntity &data)
{
QStringList warningText;
if (data.loadingBoardWall())
if (data.loadingBoardWall)
warningText.append(tr("Loading Board Wall open"));
if (data.temperatureWarning())
if (data.temperatureWarning)
warningText.append(tr("Temperature Warning"));
if (data.errorEquipment())
if (data.errorEquipment)
warningText.append(tr("Error Equipment"));
if (data.errorFireUnit())
if (data.errorFireUnit)
warningText.append(tr("Fire Unit Error"));
if (data.errorGeneral())
if (data.errorGeneral)
warningText.append(tr("General Error"));
if (data.errorPanel())
if (data.errorPanel)
warningText.append(tr("Panel Error"));
if (data.errorSmoke())
if (data.errorSmoke)
warningText.append(tr("Smoke Unit Error"));
if (data.emergencyStop())
if (data.emergencyStop)
warningText.append(tr("Emergency Stop!"));
if (warningText.size() > 0)
@@ -97,14 +97,14 @@ bool SafetyConfirmationWidget::onRevokeClicked()
{
EffectShowClient::SendSafetyRevokeRequest request;
request.revoke(true);
request.revoke = true;
return m_ftc->sendSafetyRevokeRequest(request, this);
});
}
void SafetyConfirmationWidget::onSafetyConfirmationDisplay()
{
switch (m_currentState.underlying())
switch (m_currentState)
{
case EffectShowClient::SafetyConfirmation_e::SafetyConfirmed:
m_ui->ltsLedWidget->setColor(QColor(0, 255, 0));