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/Services/EffectShowClient/handler_firing_explosion.cpp
+1 -1
View File
@@ -180,7 +180,7 @@ void HandlerFiringExplosion::onSafetyConfirmation(const SafetyConfirmation_e &sa
m_firingExplosionEntity.isActive() && !m_firingExplosionEntity.carriedOutEnabled())
{
if (m_firingExplosionEntity.idEffectShow() > 0)
m_mainHandler->handlerOrder()->updateOrderWithId(m_firingExplosionEntity.idEffectShow(), QString(), EffectShowManagement::OrderConfirmation_e_def::InterruptExecution);
m_mainHandler->handlerOrder()->updateOrderWithId(m_firingExplosionEntity.idEffectShow(), QString(), EffectShowManagement::OrderConfirmation_e::InterruptExecution);
onEffectShowInterrupted();
}
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.cpp
+10 -10
View File
@@ -106,15 +106,15 @@ void HandlerOperatingCondition::onVehicleSmokeCardridgesFireStatus(const CardRid
} // if
if (fireStatus.cardrige1)
m_operatingCondition.smokeCartridge1(StatusSmokeCartridge_e_def::Smoking);
m_operatingCondition.smokeCartridge1(StatusSmokeCartridge_e::Smoking);
if (fireStatus.cardrige2)
m_operatingCondition.smokeCartridge2(StatusSmokeCartridge_e_def::Smoking);
m_operatingCondition.smokeCartridge2(StatusSmokeCartridge_e::Smoking);
if (fireStatus.cardrige3)
m_operatingCondition.smokeCartridge3(StatusSmokeCartridge_e_def::Smoking);
m_operatingCondition.smokeCartridge3(StatusSmokeCartridge_e::Smoking);
if (fireStatus.cardrige4)
m_operatingCondition.smokeCartridge4(StatusSmokeCartridge_e_def::Smoking);
m_operatingCondition.smokeCartridge4(StatusSmokeCartridge_e::Smoking);
if (fireStatus.cardrige5)
m_operatingCondition.smokeCartridge5(StatusSmokeCartridge_e_def::Smoking);
m_operatingCondition.smokeCartridge5(StatusSmokeCartridge_e::Smoking);
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (Somoking) to dds";
@@ -124,15 +124,15 @@ void HandlerOperatingCondition::onVehicleSmokeCardridgesStatus(const CardRidges
{
m_readyCardridges = fireStatus;
if (!m_smokingCardridges.cardrige1)
m_operatingCondition.smokeCartridge1(m_readyCardridges.cardrige1 ? StatusSmokeCartridge_e_def::Ready : StatusSmokeCartridge_e_def::NotReady);
m_operatingCondition.smokeCartridge1(m_readyCardridges.cardrige1 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady);
if (!m_smokingCardridges.cardrige2)
m_operatingCondition.smokeCartridge2(m_readyCardridges.cardrige2 ? StatusSmokeCartridge_e_def::Ready : StatusSmokeCartridge_e_def::NotReady);
m_operatingCondition.smokeCartridge2(m_readyCardridges.cardrige2 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady);
if (!m_smokingCardridges.cardrige3)
m_operatingCondition.smokeCartridge3(m_readyCardridges.cardrige3 ? StatusSmokeCartridge_e_def::Ready : StatusSmokeCartridge_e_def::NotReady);
m_operatingCondition.smokeCartridge3(m_readyCardridges.cardrige3 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady);
if (!m_smokingCardridges.cardrige4)
m_operatingCondition.smokeCartridge4(m_readyCardridges.cardrige4 ? StatusSmokeCartridge_e_def::Ready : StatusSmokeCartridge_e_def::NotReady);
m_operatingCondition.smokeCartridge4(m_readyCardridges.cardrige4 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady);
if (!m_smokingCardridges.cardrige5)
m_operatingCondition.smokeCartridge5(m_readyCardridges.cardrige5 ? StatusSmokeCartridge_e_def::Ready : StatusSmokeCartridge_e_def::NotReady);
m_operatingCondition.smokeCartridge5(m_readyCardridges.cardrige5 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady);
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data to dds";
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.cpp
+19 -19
View File
@@ -70,9 +70,9 @@ void HandlerOrder::createOrder(const ConvertFromTab::EffectShowOrder_t &effectSh
if (it.value()->getData().idOrder == effectShowOrder.idEffectShow)
data = it.value()->getData();
}
bool sendStart = ((data.orderConfirmation == EffectShowManagement::OrderConfirmation_e_def::FiringReadiness)
|| (data.orderConfirmation == EffectShowManagement::OrderConfirmation_e_def::Execution)
|| (data.orderConfirmation == EffectShowManagement::OrderConfirmation_e_def::InterruptExecution));
bool sendStart = ((data.orderConfirmation == EffectShowManagement::OrderConfirmation_e::FiringReadiness)
|| (data.orderConfirmation == EffectShowManagement::OrderConfirmation_e::Execution)
|| (data.orderConfirmation == EffectShowManagement::OrderConfirmation_e::InterruptExecution));
data.typeOfOrder = 1;
data.idOrder = effectShowOrder.idEffectShow;
@@ -88,7 +88,7 @@ void HandlerOrder::createOrder(const ConvertFromTab::EffectShowOrder_t &effectSh
data.numOfVolley = effectShowOrder.numOfVolley;
data.shotsPerVolley = effectShowOrder.shotsInTotal;
data.typeOfAmmunition = effectShowOrder.typeOfAmmunition;
//data.orderConfirmation = EffectShowManagement::OrderConfirmation_e_def::WaitingForAcceptance; //no reset
//data.orderConfirmation = EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance; //no reset
data.info = effectShowOrder.name;
ObjectOrder *ifs(new ObjectOrder(m_mainHandler, this));
@@ -100,13 +100,13 @@ void HandlerOrder::createOrder(const ConvertFromTab::EffectShowOrder_t &effectSh
return;
}
m_orderObjMap.insert(ifs->getId(), ifs);
if (data.orderConfirmation == EffectShowManagement::OrderConfirmation_e_def::Execution && data.startTime == 0)
if (data.orderConfirmation == EffectShowManagement::OrderConfirmation_e::Execution && data.startTime == 0)
{
m_mainHandler->handlerControlUnit()->send(CommandSignal::FT_SE_CB_SICHERHEIT_WIDERRUFEN);
m_mainHandler->handlerControlUnit()->send(CommandSignal::FT_SE_CB_SALVE_UNTERBRECHEN);
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::Stop);
}
bool orignalIsTimeout = ((data.orderConfirmation == EffectShowManagement::OrderConfirmation_e_def::Execution) && data.startTime > 0 && (data.startTime + data.duration < QDateTime::currentMSecsSinceEpoch())) ;
bool orignalIsTimeout = ((data.orderConfirmation == EffectShowManagement::OrderConfirmation_e::Execution) && data.startTime > 0 && (data.startTime + data.duration < QDateTime::currentMSecsSinceEpoch())) ;
if (sendStart && !orignalIsTimeout)
emit startHandlerFiring(data);
}
@@ -118,7 +118,7 @@ void HandlerOrder::createOrder(const ConvertFromTab::RelocationOrder_t &relocati
data.idOrder = relocationOrder.idRelocation;
data.startTime = relocationOrder.executionTime * 1000; // s -> msec
data.centerPosition = QPointF(relocationOrder.centerPosition.lon(), relocationOrder.centerPosition.lat());
data.orderConfirmation = EffectShowManagement::OrderConfirmation_e_def::WaitingForAcceptance;
data.orderConfirmation = EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance;
data.info = relocationOrder.infoText;
ObjectOrder *ifs(new ObjectOrder(m_mainHandler, this));
@@ -148,9 +148,9 @@ void HandlerOrder::removeOrder(const ConvertFromTab::OrderRetract_t &orderRetrac
ERROR_LOG(m_logger) << LOGFUNCTION << ret();
else
{
if (def == EffectShowManagement::OrderConfirmation_e_def::Execution ||
def == EffectShowManagement::OrderConfirmation_e_def::InterruptExecution ||
def == EffectShowManagement::OrderConfirmation_e_def::FiringReadiness)
if (def == EffectShowManagement::OrderConfirmation_e::Execution ||
def == EffectShowManagement::OrderConfirmation_e::InterruptExecution ||
def == EffectShowManagement::OrderConfirmation_e::FiringReadiness)
{
DEBUG_LOG(m_logger) << "EndFireHandler from Remove";
@@ -226,21 +226,21 @@ bool HandlerOrder::updateOrder(ObjectOrder *order,
ERROR_LOG(m_logger) << "Update Order " << oc.orderId << " / ";
switch (orderConf.underlying())
{
case EffectShowManagement::OrderConfirmation_e_def::FiringReadiness:
case EffectShowManagement::OrderConfirmation_e::FiringReadiness:
emit startHandlerFiring(order->getData());
break;
case EffectShowManagement::OrderConfirmation_e_def::Execution:
case EffectShowManagement::OrderConfirmation_e::Execution:
DEBUG_LOG(m_logger) << "start execution";
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowClient::EffectShowControl_e::Start);
emit effectShowStarted();
break;
case EffectShowManagement::OrderConfirmation_e_def::InterruptExecution:
case EffectShowManagement::OrderConfirmation_e::InterruptExecution:
//stop current volley
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowClient::EffectShowControl_e::Stop);
//revoke safety
emit effectShowInterrupted();
break;
case EffectShowManagement::OrderConfirmation_e_def::Abort:
case EffectShowManagement::OrderConfirmation_e::Abort:
if (checkForActiveOrder(escOrder.idOrder))
{
DEBUG_LOG(m_logger) << "idOrder is " << escOrder.idOrder << " send abbort as is active";
@@ -248,11 +248,11 @@ bool HandlerOrder::updateOrder(ObjectOrder *order,
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::Abort);
}
Q_FALLTHROUGH();
case EffectShowManagement::OrderConfirmation_e_def::Nonacceptance:
case EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut:
case EffectShowManagement::OrderConfirmation_e_def::PositionReached:
case EffectShowManagement::OrderConfirmation_e::Nonacceptance:
case EffectShowManagement::OrderConfirmation_e::OrderCarriedOut:
case EffectShowManagement::OrderConfirmation_e::PositionReached:
{
if (orderConf.underlying() == EffectShowManagement::OrderConfirmation_e_def::PositionReached &&
if (orderConf.underlying() == EffectShowManagement::OrderConfirmation_e::PositionReached &&
oc.orderType != ConvertToTab::OrderType_e::Relocation)
return true;
emit endHandlerFiring(order->getData());
@@ -263,7 +263,7 @@ bool HandlerOrder::updateOrder(ObjectOrder *order,
break;
}
default:
ERROR_LOG(m_logger) << "Unhandled EffectShowManagement::OrderConfirmation_e_def in HandlerOrder::onOrderModifyRequest"; // todo
ERROR_LOG(m_logger) << "Unhandled EffectShowManagement::OrderConfirmation in HandlerOrder::onOrderModifyRequest"; // todo
break;
}
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.cpp
+2 -2
View File
@@ -105,7 +105,7 @@ void HandlerVehicle::setSmokeParameter(int lengthOfFogZone, int directionOfFogZo
m_statusSmokeFiring.remainingDistance_m = lengthOfFogZone;
m_statusSmokeFiring.remainingTime_s = burningTimeSmokeCartridge_s();
EffectShowClient::SafetyConfirmation_e sc = EffectShowClient::SafetyConfirmation_e_def::SafetyConfirmed;
EffectShowClient::SafetyConfirmation_e sc = EffectShowClient::SafetyConfirmation_e::SafetyConfirmed;
emit safetyConfirmation(sc);
emit readyForSmokeFiring(true);
@@ -145,7 +145,7 @@ void HandlerVehicle::effectShowControl(EffectShowControl_e effectShowControl)
m_statusExplosionFiring.remainingShots = 0;
m_statusExplosionFiring.remainingVolley = 0;
EffectShowClient::SafetyConfirmation_e sc = EffectShowClient::SafetyConfirmation_e_def::SafetyNotConfirmed;
EffectShowClient::SafetyConfirmation_e sc = EffectShowClient::SafetyConfirmation_e::SafetyNotConfirmed;
emit safetyConfirmation(sc);
break;
}
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.cpp
+6 -6
View File
@@ -85,7 +85,7 @@ void ObjectOrder::onPublishData()
ddsData.idOrder(m_data.idOrder);
ddsData.numOfVolley(m_data.numOfVolley);
ddsData.shotsPerVolley(m_data.shotsPerVolley);
EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e::inner_enum(m_data.orderConfirmation);
EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e(m_data.orderConfirmation);
ddsData.orderConfirmation(oc);
ddsData.position(Core::GeoPosition2D(m_data.centerPosition.x(), m_data.centerPosition.y()));
ddsData.lowerLeftPosition(Core::GeoPosition2D(m_data.lowerLeftPosition.x(), m_data.lowerLeftPosition.y()));
@@ -135,9 +135,9 @@ void ObjectOrder::getCreateNotificationRequestData(NotificationManagement::Creat
notif.contentArgs(args);
notif.timeStamp(m_mainHandler->dds()->currentPartitionTime());
notif.expiryTime(expiryTime);
notif.priority(NotificationManagement::Priority_def::High);
notif.processedPriority(NotificationManagement::Priority_def::Low);
notif.messageType(NotificationManagement::MessageType_def::Info);
notif.priority(NotificationManagement::Priority::High);
notif.processedPriority(NotificationManagement::Priority::Low);
notif.messageType(NotificationManagement::MessageType::Info);
notif.exerciseId(m_mainHandler->dds()->getExerciseId());
NotificationManagement::Address wsAddr;
@@ -145,7 +145,7 @@ void ObjectOrder::getCreateNotificationRequestData(NotificationManagement::Creat
wsAddr.isRead(false);
QString name = localHostName;
wsAddr.name(name.toStdString());
wsAddr.addressType(NotificationManagement::AddressType_def::Workstation);
wsAddr.addressType(NotificationManagement::AddressType::Workstation);
notif.recipientIds().reserve(1);
notif.recipientIds().push_back(wsAddr);
@@ -153,7 +153,7 @@ void ObjectOrder::getCreateNotificationRequestData(NotificationManagement::Creat
NotificationManagement::Address addrSender;
addrSender.addressId(EffectShowClient::Offset);
addrSender.name(QStringLiteral("svcEffectShowClient").toStdString());
addrSender.addressType(NotificationManagement::AddressType_def::Service);
addrSender.addressType(NotificationManagement::AddressType::Service);
notif.sender(addrSender);
data.notification(notif);