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

Migrates residual Lts sources to generated rtiddsgen API

Browse Source 
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
berrux-dev committed 2026-09-23 12:05:37 +02:00
1 parent 5485a90385
commit 881d44f4dd
512 files changed
+6887 -6426
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
+5 -5
View File
@@ -221,15 +221,15 @@ void InterfaceImpl::onOperatingConditionEntityChanged(const OperatingConditionEn
if (m_vehicleType == EffectShowManagement::Feature_e::Smoke)
{
if (data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready)
if (data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
currentSmokeLoad++;
if (data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready)
if (data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
currentSmokeLoad++;
if (data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready)
if (data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
currentSmokeLoad++;
if (data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready)
if (data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
currentSmokeLoad++;
if (data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready)
if (data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
currentSmokeLoad++;
if (currentSmokeLoad != m_oldSmokeCount)
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.cpp
+3 -3
View File
@@ -313,13 +313,13 @@ bool FiringExplosion::statusChangedForOrderedEffectShow(EffectShowStatus_e statu
switch (status)
{
case EffectShowStatus_e::Fire:
oc = EffectShowManagement::OrderConfirmation_e_def::Execution;
oc = EffectShowManagement::OrderConfirmation_e::Execution;
break;
case EffectShowStatus_e::CarriedOut:
oc = EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut;
oc = EffectShowManagement::OrderConfirmation_e::OrderCarriedOut;
break;
case EffectShowStatus_e::Interrupt:
oc = EffectShowManagement::OrderConfirmation_e_def::InterruptExecution;
oc = EffectShowManagement::OrderConfirmation_e::InterruptExecution;
break;
default:
DEBUG_LOG(m_logger) << "FiringExplosion::statusChangedForOrderedEffectShow switch is defaulting, "
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.cpp
+17 -17
View File
@@ -129,32 +129,32 @@ void FiringSmoke::onOperatingConditionEntityChanged(const OperatingConditionEnti
Q_UNUSED(modType)
QVector<QColor> onColor = {
data.smokeCartridge1().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready
data.smokeCartridge1().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
? QColor(0, 255, 0)
: QColor(255, 255, 0),
data.smokeCartridge2().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready
data.smokeCartridge2().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
? QColor(0, 255, 0)
: QColor(255, 255, 0),
data.smokeCartridge3().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready
data.smokeCartridge3().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
? QColor(0, 255, 0)
: QColor(255, 255, 0),
data.smokeCartridge4().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready
data.smokeCartridge4().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
? QColor(0, 255, 0)
: QColor(255, 255, 0),
data.smokeCartridge5().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready
data.smokeCartridge5().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
? QColor(0, 255, 0)
: QColor(255, 255, 0)};
QVector<bool> status = {
((data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) ||
(data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking)),
((data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) ||
(data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking)),
((data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) ||
(data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking)),
((data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) ||
(data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking)),
((data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) ||
(data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking))};
((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))};
m_smokeState->setSmokeState(status, onColor);
m_safetyConfirmationWidget->onOperatingConditionEntityChanged(data);
@@ -264,10 +264,10 @@ bool FiringSmoke::statusChangedForOrderedEffectShow(EffectShowStatus_e status)
switch (status)
{
case EffectShowStatus_e::Abort:
oc = EffectShowManagement::OrderConfirmation_e_def::Abort;
oc = EffectShowManagement::OrderConfirmation_e::Abort;
break;
case EffectShowStatus_e::CarriedOut:
oc = EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut;
oc = EffectShowManagement::OrderConfirmation_e::OrderCarriedOut;
break;
default:
DEBUG_LOG(m_logger) << "FiringSmoke::statusChangedForOrderedEffectShow switch is defaulting, should "
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.cpp
+27 -27
View File
@@ -103,15 +103,15 @@ int OperatingCondition::getSmokeCount()
{
const OperatingConditionEntity& data = m_dtc->operatingConditionEntity();
int currentSmokeLoad = 0;
if (data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready)
if (data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
currentSmokeLoad++;
if (data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready)
if (data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
currentSmokeLoad++;
if (data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready)
if (data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
currentSmokeLoad++;
if (data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready)
if (data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
currentSmokeLoad++;
if (data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready)
if (data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready)
currentSmokeLoad++;
return currentSmokeLoad;
@@ -126,19 +126,19 @@ void OperatingCondition::onOperatingConditionEntityChanged(const EffectShowClien
m_lastState = data;
if (data.vehicleFeature() ==
EffectShowManagement::Feature_e::inner_enum(EffectShowManagement::Feature_e_def::Explosion24))
EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Explosion24))
{
m_ui->ledAftLh->hide();
m_ui->ledAftRh->hide();
}
else if (data.vehicleFeature() ==
EffectShowManagement::Feature_e::inner_enum(EffectShowManagement::Feature_e_def::Explosion48))
EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Explosion48))
{
m_ui->ledAftLh->show();
m_ui->ledAftRh->show();
}
bool isExp = data.vehicleFeature() !=
EffectShowManagement::Feature_e::inner_enum(EffectShowManagement::Feature_e_def::Smoke);
EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Smoke);
m_ui->frame->setHidden(!isExp);
m_ui->lblMagazine->setHidden(!isExp);
m_ui->lblMag->setHidden(!isExp);
@@ -154,14 +154,14 @@ void OperatingCondition::onOperatingConditionEntityChanged(const EffectShowClien
setBatteryVoltage(data.batteryVoltage());
if (data.vehicleFeature() !=
EffectShowManagement::Feature_e::inner_enum(EffectShowManagement::Feature_e_def::Smoke))
EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Smoke))
{
if (data.vehicleFeature() ==
EffectShowManagement::Feature_e::inner_enum(EffectShowManagement::Feature_e_def::NotSpecified))
EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::NotSpecified))
return;
int max = data.vehicleFeature() ==
EffectShowManagement::Feature_e::inner_enum(EffectShowManagement::Feature_e_def::Explosion24)
EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Explosion24)
? 24
: 48;
m_ui->sbMagazine->setMaximum(max);
@@ -178,32 +178,32 @@ void OperatingCondition::onOperatingConditionEntityChanged(const EffectShowClien
m_ui->sbMagazine->setMaximum(5);
m_ui->sbAvailable->setMaximum(12);
QVector<QColor> onColor = {
data.smokeCartridge1().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready
data.smokeCartridge1().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
? QColor(0, 255, 0)
: QColor(255, 255, 0),
data.smokeCartridge2().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready
data.smokeCartridge2().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
? QColor(0, 255, 0)
: QColor(255, 255, 0),
data.smokeCartridge3().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready
data.smokeCartridge3().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
? QColor(0, 255, 0)
: QColor(255, 255, 0),
data.smokeCartridge4().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready
data.smokeCartridge4().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
? QColor(0, 255, 0)
: QColor(255, 255, 0),
data.smokeCartridge5().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready
data.smokeCartridge5().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready
? QColor(0, 255, 0)
: QColor(255, 255, 0)};
QVector<bool> status = {
((data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) ||
(data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking)),
((data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) ||
(data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking)),
((data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) ||
(data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking)),
((data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) ||
(data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking)),
((data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) ||
(data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking))};
((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))};
m_smokeState->setSmokeState(status, onColor);
}
@@ -304,7 +304,7 @@ bool OperatingCondition::onSendAmmunition()
EffectShowClient::SendAmmunitionRequest request;
const OperatingConditionEntity& condition = m_dtc->operatingConditionEntity();
if (condition.vehicleFeature() ==
EffectShowManagement::Feature_e::inner_enum(EffectShowManagement::Feature_e_def::Smoke))
EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Smoke))
request.ammunitionMagazine(getSmokeCount());
else
request.ammunitionMagazine(m_ui->sbMagazine->value());
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.cpp
+48 -48
View File
@@ -82,7 +82,7 @@ bool OrderEdit::apply()
OrderModifyRequest orderModifyRequest;
int key = m_orderList.key(m_ui->cbOrderConfirmation->currentText());
EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e::inner_enum(key);
EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e(key);
orderModifyRequest.orderConfirmation(oc);
orderModifyRequest.answerText(m_ui->cbxAnswer->currentText().toStdString());
@@ -107,8 +107,8 @@ bool OrderEdit::checkForAnswerUiRequirement() const
return true;
int key = m_orderList.key(m_ui->cbOrderConfirmation->currentText());
return !(((key == EffectShowManagement::OrderConfirmation_e_def::Nonacceptance) ||
(key == EffectShowManagement::OrderConfirmation_e_def::Abort)) &&
return !(((key == EffectShowManagement::OrderConfirmation_e::Nonacceptance) ||
(key == EffectShowManagement::OrderConfirmation_e::Abort)) &&
m_ui->cbxAnswer->currentText().isEmpty());
}
@@ -118,62 +118,62 @@ void OrderEdit::showOrder()
switch (m_order.orderConfirmation().underlying())
{
case EffectShowManagement::OrderConfirmation_e_def::WaitingForAcceptance:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::OrderAcceptance]
<< m_orderList[EffectShowManagement::OrderConfirmation_e_def::DriveOff]
<< m_orderList[EffectShowManagement::OrderConfirmation_e_def::PositionReached];
case EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::OrderAcceptance]
<< 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_def::FiringReadiness];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::Nonacceptance];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Nonacceptance];
break;
case EffectShowManagement::OrderConfirmation_e_def::OrderAcceptance:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::DriveOff]
<< m_orderList[EffectShowManagement::OrderConfirmation_e_def::InterruptRelocation]
<< m_orderList[EffectShowManagement::OrderConfirmation_e_def::PositionReached];
case EffectShowManagement::OrderConfirmation_e::OrderAcceptance:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::DriveOff]
<< m_orderList[EffectShowManagement::OrderConfirmation_e::InterruptRelocation]
<< m_orderList[EffectShowManagement::OrderConfirmation_e::PositionReached];
if (m_order.typeOfOrder() != 0 && m_fireReadinessAvailable)
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::FiringReadiness];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::Abort];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
break;
case EffectShowManagement::OrderConfirmation_e_def::DriveOff:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::InterruptRelocation]
<< m_orderList[EffectShowManagement::OrderConfirmation_e_def::PositionReached];
case EffectShowManagement::OrderConfirmation_e::DriveOff:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::InterruptRelocation]
<< m_orderList[EffectShowManagement::OrderConfirmation_e::PositionReached];
if (m_order.typeOfOrder() != 0 && m_fireReadinessAvailable)
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::FiringReadiness];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::Abort];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
break;
case EffectShowManagement::OrderConfirmation_e_def::PositionReached:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::InterruptRelocation];
case EffectShowManagement::OrderConfirmation_e::PositionReached:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::InterruptRelocation];
if (m_fireReadinessAvailable)
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::FiringReadiness];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::Abort];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
break;
case EffectShowManagement::OrderConfirmation_e_def::FiringReadiness:
case EffectShowManagement::OrderConfirmation_e::FiringReadiness:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::Abort];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
break;
case EffectShowManagement::OrderConfirmation_e_def::Execution:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::Abort];
case EffectShowManagement::OrderConfirmation_e::Execution:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
break;
case EffectShowManagement::OrderConfirmation_e_def::InterruptRelocation:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::DriveOff]
<< m_orderList[EffectShowManagement::OrderConfirmation_e_def::PositionReached];
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_def::FiringReadiness];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::Abort];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
break;
case EffectShowManagement::OrderConfirmation_e_def::InterruptExecution:
case EffectShowManagement::OrderConfirmation_e::InterruptExecution:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut]
<< m_orderList[EffectShowManagement::OrderConfirmation_e_def::Abort];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::OrderCarriedOut]
<< m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
break;
default:
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::Abort];
orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort];
break;
}
m_ui->cbOrderConfirmation->addItems(orderList);
@@ -182,27 +182,27 @@ void OrderEdit::showOrder()
void OrderEdit::createOrderList()
{
EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e_def::WaitingForAcceptance;
EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e_def::OrderAcceptance;
oc = EffectShowManagement::OrderConfirmation_e::OrderAcceptance;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e_def::DriveOff;
oc = EffectShowManagement::OrderConfirmation_e::DriveOff;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e_def::PositionReached;
oc = EffectShowManagement::OrderConfirmation_e::PositionReached;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e_def::FiringReadiness;
oc = EffectShowManagement::OrderConfirmation_e::FiringReadiness;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e_def::Execution;
oc = EffectShowManagement::OrderConfirmation_e::Execution;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e_def::InterruptExecution;
oc = EffectShowManagement::OrderConfirmation_e::InterruptExecution;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut;
oc = EffectShowManagement::OrderConfirmation_e::OrderCarriedOut;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e_def::Abort;
oc = EffectShowManagement::OrderConfirmation_e::Abort;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e_def::Nonacceptance;
oc = EffectShowManagement::OrderConfirmation_e::Nonacceptance;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
oc = EffectShowManagement::OrderConfirmation_e_def::InterruptRelocation;
oc = EffectShowManagement::OrderConfirmation_e::InterruptRelocation;
m_orderList[oc.underlying()] = EffectShowManagement::toString(oc);
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.h
+2 -2
View File
@@ -27,7 +27,7 @@ class OrderEdit : public LtsWidgets::LtsDialog, protected EffectShowClient::Inte
bool init(const std::shared_ptr<EffectShowClient::Interface::Ftc>& ftc,
EffectShowManagement::OrderConfirmation_e order =
EffectShowManagement::OrderConfirmation_e_def::WaitingForAcceptance);
EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance);
bool apply() override;
private:
@@ -48,7 +48,7 @@ class OrderEdit : public LtsWidgets::LtsDialog, protected EffectShowClient::Inte
LtsUtils::RequestHelper* m_requestHelper;
Order m_order;
bool m_fireReadinessAvailable;
EffectShowManagement::OrderConfirmation_e_def m_forcedState;
EffectShowManagement::OrderConfirmation m_forcedState;
QHash<int, QString> m_orderList;
};
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.cpp
+6 -6
View File
@@ -135,8 +135,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_def::FiringReadiness ||
order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e_def::Execution;
bool isReady = order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::FiringReadiness ||
order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::Execution;
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Show, isReady);
@@ -155,15 +155,15 @@ void OrderList::onEditOrder()
const EffectShowClient::Order order = m_model->getRowData(row);
DEBUG_LOG(m_logger) << "--- onEditOrder() ";
if (order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e_def::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_def::FiringReadiness ||
ord.orderConfirmation() == EffectShowManagement::OrderConfirmation_e_def::InterruptExecution ||
ord.orderConfirmation() == EffectShowManagement::OrderConfirmation_e_def::Execution)
if (ord.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::FiringReadiness ||
ord.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::InterruptExecution ||
ord.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::Execution)
{
fireReadinessEnable = false;
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.cpp
+3 -3
View File
@@ -106,16 +106,16 @@ void SafetyConfirmationWidget::onSafetyConfirmationDisplay()
{
switch (m_currentState.underlying())
{
case EffectShowClient::SafetyConfirmation_e_def::SafetyConfirmed:
case EffectShowClient::SafetyConfirmation_e::SafetyConfirmed:
m_ui->ltsLedWidget->setColor(QColor(0, 255, 0));
m_ui->ltsLedWidget->setStatus(true);
break;
case EffectShowClient::SafetyConfirmation_e_def::SafetyExpiring:
case EffectShowClient::SafetyConfirmation_e::SafetyExpiring:
m_ui->ltsLedWidget->setColor(QColor(0, 255, 0));
m_ui->ltsLedWidget->setStatus(!m_ui->ltsLedWidget->status());
QTimer::singleShot(800, this, &SafetyConfirmationWidget::onSafetyConfirmationDisplay);
break;
case EffectShowClient::SafetyConfirmation_e_def::SafetyNotConfirmed:
case EffectShowClient::SafetyConfirmation_e::SafetyNotConfirmed:
m_ui->ltsLedWidget->setColor(QColor(255, 0, 0));
m_ui->ltsLedWidget->setStatus(true);
break;