Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
@@ -27,7 +27,6 @@ HandlerOrder::HandlerOrder(MainHandler *mainHandler,
|
||||
: QObject(parent)
|
||||
, OrderModifyRequestHandler(mainHandler->dds()->fts())
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger("HandlerOrder"))
|
||||
{}
|
||||
//=============================================================================
|
||||
HandlerOrder::~HandlerOrder()
|
||||
@@ -45,7 +44,7 @@ bool HandlerOrder::init()
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
bRet = false;
|
||||
return;
|
||||
}
|
||||
@@ -53,11 +52,11 @@ bool HandlerOrder::init()
|
||||
};
|
||||
if (!m_mainHandler->db()->select(cbOrder) || !bRet)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
return false;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "m_orderObjMap.size() = " << m_orderObjMap.size();
|
||||
DEBUG_LOG() << "m_orderObjMap.size() = " << m_orderObjMap.size();
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -96,7 +95,7 @@ void HandlerOrder::createOrder(const ConvertFromTab::EffectShowOrder_t &effectSh
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
return;
|
||||
}
|
||||
m_orderObjMap.insert(ifs->getId(), ifs);
|
||||
@@ -126,7 +125,7 @@ void HandlerOrder::createOrder(const ConvertFromTab::RelocationOrder_t &relocati
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
return;
|
||||
}
|
||||
m_orderObjMap.insert(ifs->getId(), ifs);
|
||||
@@ -137,7 +136,7 @@ void HandlerOrder::removeOrder(const ConvertFromTab::OrderRetract_t &orderRetrac
|
||||
for (auto it = m_orderObjMap.begin(); it != m_orderObjMap.end(); ++it)
|
||||
{
|
||||
if (it.value()->getData().typeOfOrder == orderRetract.orderType)
|
||||
//ERROR_LOG(m_logger) << "current idorder =" ;
|
||||
//ERROR_LOG() << "current idorder =" ;
|
||||
if (it.value()->getData().idOrder == orderRetract.id)
|
||||
{
|
||||
int id = it.key();
|
||||
@@ -145,14 +144,14 @@ void HandlerOrder::removeOrder(const ConvertFromTab::OrderRetract_t &orderRetrac
|
||||
int def = it.value()->getData().orderConfirmation;
|
||||
ret = it.value()->removeObject();
|
||||
if (ret.error())
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << ret();
|
||||
ERROR_LOG() << Q_FUNC_INFO << ret();
|
||||
else
|
||||
{
|
||||
if (def == EffectShowManagement::OrderConfirmation_e_def::Execution ||
|
||||
def == EffectShowManagement::OrderConfirmation_e_def::InterruptExecution ||
|
||||
def == EffectShowManagement::OrderConfirmation_e_def::FiringReadiness)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "EndFireHandler from Remove";
|
||||
DEBUG_LOG() << "EndFireHandler from Remove";
|
||||
|
||||
emit endHandlerFiring(it.value()->getData());
|
||||
//Stop the current execution
|
||||
@@ -172,7 +171,7 @@ void HandlerOrder::removeOrder(const ConvertFromTab::OrderRetract_t &orderRetrac
|
||||
void HandlerOrder::sendOrderConfirmation(const ConvertToTab::OrderConfirmation_t &oc)
|
||||
{
|
||||
|
||||
ERROR_LOG(m_logger) << "Send Order Confirmation to Excon " << oc.orderId << " / ";
|
||||
ERROR_LOG() << "Send Order Confirmation to Excon " << oc.orderId << " / ";
|
||||
m_mainHandler->handlerTabData()->orderConfirmation(oc);
|
||||
}
|
||||
|
||||
@@ -180,7 +179,7 @@ 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() << "Order: " << request.id() << " Order: " << request.orderConfirmation();
|
||||
|
||||
if (request.id() > 0)
|
||||
{
|
||||
@@ -195,7 +194,7 @@ void HandlerOrder::onOrderModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
if (ret.error())
|
||||
{
|
||||
m_mainHandler->dds()->fts()->orderModifyReply(cookie, ret);
|
||||
ERROR_LOG(m_logger) << "Update Order object failed.";
|
||||
ERROR_LOG() << "Update Order object failed.";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -208,7 +207,7 @@ void HandlerOrder::onOrderModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
else
|
||||
{
|
||||
m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id()));
|
||||
ERROR_LOG(m_logger) << "Illegal Order ID";
|
||||
ERROR_LOG() << "Illegal Order ID";
|
||||
}
|
||||
}
|
||||
bool HandlerOrder::updateOrder(ObjectOrder *order,
|
||||
@@ -223,14 +222,14 @@ bool HandlerOrder::updateOrder(ObjectOrder *order,
|
||||
oc.confirmation = orderConf.underlying();
|
||||
oc.answerText = answerText;
|
||||
sendOrderConfirmation(oc);
|
||||
ERROR_LOG(m_logger) << "Update Order " << oc.orderId << " / ";
|
||||
ERROR_LOG() << "Update Order " << oc.orderId << " / ";
|
||||
switch (orderConf.underlying())
|
||||
{
|
||||
case EffectShowManagement::OrderConfirmation_e_def::FiringReadiness:
|
||||
emit startHandlerFiring(order->getData());
|
||||
break;
|
||||
case EffectShowManagement::OrderConfirmation_e_def::Execution:
|
||||
DEBUG_LOG(m_logger) << "start execution";
|
||||
DEBUG_LOG() << "start execution";
|
||||
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowClient::EffectShowControl_e::Start);
|
||||
emit effectShowStarted();
|
||||
break;
|
||||
@@ -243,7 +242,7 @@ bool HandlerOrder::updateOrder(ObjectOrder *order,
|
||||
case EffectShowManagement::OrderConfirmation_e_def::Abort:
|
||||
if (checkForActiveOrder(escOrder.idOrder))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "idOrder is " << escOrder.idOrder << " send abbort as is active";
|
||||
DEBUG_LOG() << "idOrder is " << escOrder.idOrder << " send abbort as is active";
|
||||
m_mainHandler->handlerControlUnit()->send(CommandSignal::FT_SE_CB_SALVE_UNTERBRECHEN);
|
||||
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::Abort);
|
||||
}
|
||||
@@ -263,7 +262,7 @@ bool HandlerOrder::updateOrder(ObjectOrder *order,
|
||||
break;
|
||||
}
|
||||
default:
|
||||
ERROR_LOG(m_logger) << "Unhandled EffectShowManagement::OrderConfirmation_e_def in HandlerOrder::onOrderModifyRequest"; // todo
|
||||
ERROR_LOG() << "Unhandled EffectShowManagement::OrderConfirmation_e_def in HandlerOrder::onOrderModifyRequest"; // todo
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -280,14 +279,14 @@ void HandlerOrder::updateOrderWithId(int orderId, const QString &answerText, Eff
|
||||
ifs->setOrderConfirmation(orderConf.underlying());
|
||||
auto ret = ifs->updateObject();
|
||||
if (ret.error())
|
||||
ERROR_LOG(m_logger) << "Error Updating Order " << orderId << " / ";
|
||||
ERROR_LOG() << "Error Updating Order " << orderId << " / ";
|
||||
updateOrder(ifs, answerText, orderConf);
|
||||
|
||||
}
|
||||
|
||||
bool HandlerOrder::checkForActiveOrder(int orderId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "check for active Order " << orderId << " ";
|
||||
DEBUG_LOG() << "check for active Order " << orderId << " ";
|
||||
if (orderId <= 0)
|
||||
return false;
|
||||
return ((m_mainHandler->handlerFiringExplosion()->getCurrentorderId() == orderId )||( m_mainHandler->handlerFiringSmoke()->getCurrentorderId() == orderId));
|
||||
|
||||
Reference in new issue
Block a user