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

Complete Qt6/rtiddsgen migration of residual Lts service sources

Browse Source
This commit is contained in:
berrux-dev committed 2026-09-25 20:23:37 +02:00
1 parent e748e82c84
commit a410019553
86 files changed
+1235 -1128
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_order.cpp
+25 -25
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::FiringReadiness)
|| (data.orderConfirmation == EffectShowManagement::OrderConfirmation_e::Execution)
|| (data.orderConfirmation == EffectShowManagement::OrderConfirmation_e::InterruptExecution));
bool sendStart = ((data.orderConfirmation == static_cast<int>(EffectShowManagement::OrderConfirmation_e::FiringReadiness))
|| (data.orderConfirmation == static_cast<int>(EffectShowManagement::OrderConfirmation_e::Execution))
|| (data.orderConfirmation == static_cast<int>(EffectShowManagement::OrderConfirmation_e::InterruptExecution)));
data.typeOfOrder = 1;
data.idOrder = effectShowOrder.idEffectShow;
@@ -80,8 +80,8 @@ void HandlerOrder::createOrder(const ConvertFromTab::EffectShowOrder_t &effectSh
data.duration = effectShowOrder.duration;
if (data.duration < 5)
data.duration = 5;
data.lowerLeftPosition = QPointF(effectShowOrder.lowerLeftPosition.lon(), effectShowOrder.lowerLeftPosition.lat());
data.centerPosition = QPointF(effectShowOrder.centerPosition.lon(), effectShowOrder.centerPosition.lat());
data.lowerLeftPosition = QPointF(effectShowOrder.lowerLeftPosition.lon, effectShowOrder.lowerLeftPosition.lat);
data.centerPosition = QPointF(effectShowOrder.centerPosition.lon, effectShowOrder.centerPosition.lat);
data.areaWidth = effectShowOrder.areaWidth;
data.areaDepth = effectShowOrder.areaDepth;
data.areaRotation = effectShowOrder.rotation;
@@ -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::Execution && data.startTime == 0)
if (data.orderConfirmation == static_cast<int>(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::Execution) && data.startTime > 0 && (data.startTime + data.duration < QDateTime::currentMSecsSinceEpoch())) ;
bool orignalIsTimeout = ((data.orderConfirmation == static_cast<int>(EffectShowManagement::OrderConfirmation_e::Execution)) && data.startTime > 0 && (data.startTime + data.duration < QDateTime::currentMSecsSinceEpoch())) ;
if (sendStart && !orignalIsTimeout)
emit startHandlerFiring(data);
}
@@ -117,8 +117,8 @@ void HandlerOrder::createOrder(const ConvertFromTab::RelocationOrder_t &relocati
data.typeOfOrder = 0;
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::WaitingForAcceptance;
data.centerPosition = QPointF(relocationOrder.centerPosition.lon, relocationOrder.centerPosition.lat);
data.orderConfirmation = static_cast<int>(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::Execution ||
def == EffectShowManagement::OrderConfirmation_e::InterruptExecution ||
def == EffectShowManagement::OrderConfirmation_e::FiringReadiness)
if (def == static_cast<int>(EffectShowManagement::OrderConfirmation_e::Execution) ||
def == static_cast<int>(EffectShowManagement::OrderConfirmation_e::InterruptExecution) ||
def == static_cast<int>(EffectShowManagement::OrderConfirmation_e::FiringReadiness))
{
DEBUG_LOG(m_logger) << "EndFireHandler from Remove";
@@ -180,17 +180,17 @@ void HandlerOrder::sendOrderConfirmation(const ConvertToTab::OrderConfirmation_t
void HandlerOrder::onOrderModifyRequest(const rti::core::SampleIdentity &cookie,
const OrderModifyRequest &request)
{
DEBUG_LOG(m_logger) << "Order: " << request.id() << " Order: " << request.orderConfirmation();
DEBUG_LOG(m_logger) << "Order: " << request.id << " Order: " << request.orderConfirmation;
if (request.id() > 0)
if (request.id > 0)
{
ObjectOrder *ifs = m_orderObjMap.value(request.id());
ObjectOrder *ifs = m_orderObjMap.value(request.id);
if (ifs == nullptr)
m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id(), tr_lts("dds", "Order with id %1 not found")).arg(request.id()));
m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id, tr_lts("dds", "Order with id %1 not found")).arg(request.id));
else
{
ifs->setOrderConfirmation(request.orderConfirmation().underlying());
ifs->setOrderConfirmation(static_cast<int>(request.orderConfirmation));
auto ret = ifs->updateObject();
if (ret.error())
{
@@ -199,15 +199,15 @@ void HandlerOrder::onOrderModifyRequest(const rti::core::SampleIdentity &cookie,
return;
}
if (updateOrder(ifs, QString::fromStdString(request.answerText()), request.orderConfirmation()))
m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id()));
if (updateOrder(ifs, QString::fromStdString(request.answerText), request.orderConfirmation))
m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id));
else
m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id(), tr_lts("dds", "Order with id %1 not found")).arg(request.id()));
m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id, tr_lts("dds", "Order with id %1 not found")).arg(request.id));
}
}
else
{
m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id()));
m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id));
ERROR_LOG(m_logger) << "Illegal Order ID";
}
}
@@ -220,11 +220,11 @@ bool HandlerOrder::updateOrder(ObjectOrder *order,
const Database::EscOrder &escOrder = order->getData();
oc.orderId = escOrder.idOrder;
oc.orderType = ConvertToTab::OrderType_e(escOrder.typeOfOrder);
oc.confirmation = orderConf.underlying();
oc.confirmation = orderConf;
oc.answerText = answerText;
sendOrderConfirmation(oc);
ERROR_LOG(m_logger) << "Update Order " << oc.orderId << " / ";
switch (orderConf.underlying())
switch (orderConf)
{
case EffectShowManagement::OrderConfirmation_e::FiringReadiness:
emit startHandlerFiring(order->getData());
@@ -252,7 +252,7 @@ bool HandlerOrder::updateOrder(ObjectOrder *order,
case EffectShowManagement::OrderConfirmation_e::OrderCarriedOut:
case EffectShowManagement::OrderConfirmation_e::PositionReached:
{
if (orderConf.underlying() == EffectShowManagement::OrderConfirmation_e::PositionReached &&
if (orderConf == EffectShowManagement::OrderConfirmation_e::PositionReached &&
oc.orderType != ConvertToTab::OrderType_e::Relocation)
return true;
emit endHandlerFiring(order->getData());
@@ -277,7 +277,7 @@ void HandlerOrder::updateOrderWithId(int orderId, const QString &answerText, Eff
if (ifs == nullptr)
return;
ifs->setOrderConfirmation(orderConf.underlying());
ifs->setOrderConfirmation(static_cast<int>(orderConf));
auto ret = ifs->updateObject();
if (ret.error())
ERROR_LOG(m_logger) << "Error Updating Order " << orderId << " / ";