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
@@ -32,7 +32,7 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
# generate cod_[d|f]tc.h
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV WS svcCodCommon SHARED ${SRCS_common})
|
||||
NGL_ADD_LIBRARY2(AAR SV WS svcCodCommon SHARED ${SRCS_common})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcCodCommon
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
@@ -60,7 +60,7 @@ SET(SRCS_client
|
||||
# generate cod_[d|f]tc_impl.[cpp|h]
|
||||
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV WS svcCodClient SHARED ${SRCS_client})
|
||||
NGL_ADD_LIBRARY2(AAR SV WS svcCodClient SHARED ${SRCS_client})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcCodClient
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
@@ -101,7 +101,7 @@ CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
|
||||
# Generate cod.sql, cod.xml
|
||||
CODEGEN_SQL(SRCS_server ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV svcCodServer SHARED ${SRCS_server})
|
||||
NGL_ADD_LIBRARY2(AAR SV svcCodServer SHARED ${SRCS_server})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcCodServer
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
|
||||
@@ -12,19 +12,18 @@ using namespace CodificationManagement;
|
||||
|
||||
DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
|
||||
: m_ddsConnector(ddsConnector)
|
||||
, m_logger(getLogger("DdsHandler"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
DEBUG_LOG() << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
bool DdsHandler::init(const QStringList &qosFileList)
|
||||
{
|
||||
INFO_LOG(m_logger) << "--- Start CodificationManagement DDSHandler.";
|
||||
INFO_LOG() << "--- Start CodificationManagement DDSHandler.";
|
||||
|
||||
if (!m_ddsConnector->init(qosFileList))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
|
||||
ERROR_LOG() << "Error initializing dds connections - aborting";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -36,12 +35,12 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
// DTS
|
||||
m_ddsDts = CodificationManagement::Interface::Dts::create(m_ddsConnector);
|
||||
bool bRet = m_ddsDts->enableAll();
|
||||
INFO_LOG(m_logger) << "Dts initialised";
|
||||
INFO_LOG() << "Dts initialised";
|
||||
|
||||
// FTS
|
||||
m_ddsFts = CodificationManagement::Interface::Fts::create(m_ddsConnector);
|
||||
bRet &= m_ddsFts->enableAll();
|
||||
INFO_LOG(m_logger) << "Fts initialised";
|
||||
INFO_LOG() << "Fts initialised";
|
||||
|
||||
return bRet;
|
||||
} // end of init()
|
||||
|
||||
@@ -37,8 +37,6 @@ private:
|
||||
std::shared_ptr<Core::TopicLockMaster> m_topicLockMaster;
|
||||
std::shared_ptr<CodificationManagement::Interface::Dts> m_ddsDts;
|
||||
std::shared_ptr<CodificationManagement::Interface::Fts> m_ddsFts;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
} // Namespace CodificationManagement
|
||||
+8
-9
@@ -18,7 +18,6 @@ HandlerCodificationData::HandlerCodificationData(const std::shared_ptr<DdsHandle
|
||||
, Interface::Fts::CodificationDataRemoveRequestHandler(ddsHandler->fts())
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_dbHandler(dbHandler)
|
||||
, m_logger(getLogger("HandlerCodificationData"))
|
||||
{
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -35,7 +34,7 @@ bool HandlerCodificationData::init()
|
||||
// read all CodificationDatas from database
|
||||
if (!m_dbHandler->db()->select(dataVec))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -48,13 +47,13 @@ bool HandlerCodificationData::init()
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
return false;
|
||||
}
|
||||
m_codificationdataObjMap.insert(ifs->getId(), ifs);
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "m_codificationdataObjMap.size() = " << m_codificationdataObjMap.size();
|
||||
DEBUG_LOG() << "m_codificationdataObjMap.size() = " << m_codificationdataObjMap.size();
|
||||
|
||||
return true;
|
||||
} // end of init()
|
||||
@@ -63,10 +62,10 @@ bool HandlerCodificationData::init()
|
||||
void HandlerCodificationData::onCodificationDataModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
const CodificationData &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onCodificationDataModifyRequest: " << request;
|
||||
DEBUG_LOG() << "onCodificationDataModifyRequest: " << request;
|
||||
auto ret = request.id() > 0 ? codificationDataModifyRequest(request) : codificationDataCreateRequest(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
m_ddsHandler->fts()->codificationDataModifyReply(cookie, ret);
|
||||
} // end of onCodificationDataModifyRequest()
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -97,14 +96,14 @@ Core::FunctionReplyObject HandlerCodificationData::codificationDataModifyRequest
|
||||
void HandlerCodificationData::onCodificationDataRemoveRequest(const rti::core::SampleIdentity &cookie,
|
||||
const Core::RemoveElementRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onCodificationDataRemoveRequest: " << request;
|
||||
DEBUG_LOG() << "onCodificationDataRemoveRequest: " << request;
|
||||
|
||||
|
||||
ObjectCodificationData *ifs = m_codificationdataObjMap.value(request.id());
|
||||
if (ifs == nullptr)
|
||||
{
|
||||
Core::FunctionReplyObject ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Codification table with id %1 not found")).arg(request.id());
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
m_ddsHandler->fts()->codificationDataRemoveReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
@@ -118,7 +117,7 @@ void HandlerCodificationData::onCodificationDataRemoveRequest(const rti::core::S
|
||||
|
||||
Core::FunctionReplyObject ret = ifs->removeObject();
|
||||
if (ret.error())
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
else
|
||||
{
|
||||
// delete codification object
|
||||
|
||||
-1
@@ -42,6 +42,5 @@ private: // attributes
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<DbHandler> m_dbHandler;
|
||||
QMap<int, ObjectCodificationData *> m_codificationdataObjMap;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
+5
-5
@@ -33,13 +33,13 @@ Initialization::~Initialization()
|
||||
bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector,
|
||||
const QSqlDatabase &sqlDb)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Start CodificationManagement Initialization.";
|
||||
INFO_LOG() << "Start CodificationManagement Initialization.";
|
||||
|
||||
// initialize DDS
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(ddsConnector);
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
|
||||
ERROR_LOG() << "Initialisation DdsHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -47,14 +47,14 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
|
||||
m_dbHandler = std::make_shared<DbHandler>();
|
||||
if (!m_dbHandler->init(ddsConnector->getPartitionId(), sqlDb))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
|
||||
ERROR_LOG() << "Initialisation DbHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// create HandlerCodificationData
|
||||
m_handlerCodificationData.reset(new HandlerCodificationData(m_ddsHandler, m_dbHandler));
|
||||
|
||||
INFO_LOG(m_logger) << "CodificationManagement Initialization initialized. pacemakerState: Running ";
|
||||
INFO_LOG() << "CodificationManagement Initialization initialized. pacemakerState: Running ";
|
||||
|
||||
return true;
|
||||
} // end of init()
|
||||
@@ -66,7 +66,7 @@ bool Initialization::loadFromDatabase()
|
||||
return false;
|
||||
if (!m_handlerCodificationData->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerCodificationData failed.";
|
||||
ERROR_LOG() << "Initialisation HandlerCodificationData failed.";
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <ngldb/db_service_handler.h>
|
||||
#include <CodificationManagement/cod_export.h>
|
||||
#include "svccodserver_export.h"
|
||||
#include <CodificationManagement/logger.h>
|
||||
|
||||
class QSqlDatabase;
|
||||
@@ -34,7 +34,7 @@ private: // attributes
|
||||
std::shared_ptr<DbHandler> m_dbHandler; ///< Pointer to DB handler
|
||||
std::shared_ptr<HandlerCodificationData> m_handlerCodificationData; ///< Pointer to codification data handler
|
||||
|
||||
NGL::INGLLogger &m_logger; ///< Interface to the Logging-Facility
|
||||
|
||||
|
||||
};
|
||||
} // namespace CodificationManagement
|
||||
@@ -9,7 +9,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
#include "cod_export.h"
|
||||
#include "svccodcommon_export.h"
|
||||
|
||||
namespace CodificationManagement
|
||||
{
|
||||
|
||||
+8
-9
@@ -15,7 +15,6 @@ ObjectCodificationData::ObjectCodificationData(const std::shared_ptr<DdsHandler>
|
||||
const std::shared_ptr<DbHandler> &dbHandler)
|
||||
: m_ddsHandler(ddsHandler)
|
||||
, m_dbHandler(dbHandler)
|
||||
, m_logger(getLogger("ObjectCodificationData"))
|
||||
{
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -28,7 +27,7 @@ ObjectCodificationData::~ObjectCodificationData()
|
||||
|
||||
Core::FunctionReplyObject ObjectCodificationData::createObject(const CodificationData &ddsData)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ObjectCodificationData::createObject()";
|
||||
DEBUG_LOG() << "ObjectCodificationData::createObject()";
|
||||
|
||||
m_ddsData = ddsData;
|
||||
if (m_ddsData.id() <= 0)
|
||||
@@ -42,7 +41,7 @@ Core::FunctionReplyObject ObjectCodificationData::createObject(const Codificatio
|
||||
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting codification_table data into database"));
|
||||
|
||||
m_ddsData.id(dbData.id);
|
||||
DEBUG_LOG(m_logger) << "New codificationTable id: " << m_ddsData.id();
|
||||
DEBUG_LOG() << "New codificationTable id: " << m_ddsData.id();
|
||||
}
|
||||
|
||||
// Publish Data via DTS
|
||||
@@ -54,7 +53,7 @@ Core::FunctionReplyObject ObjectCodificationData::createObject(const Codificatio
|
||||
|
||||
Core::FunctionReplyObject ObjectCodificationData::updateObject(const CodificationManagement::CodificationData &ddsData)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ObjectCodificationData::updateObject()";
|
||||
DEBUG_LOG() << "ObjectCodificationData::updateObject()";
|
||||
|
||||
if (!isValid())
|
||||
return Core::FunctionReplyObject(ddsData.id(), tr_lts("dds", "Object not valid/blocked"));
|
||||
@@ -67,7 +66,7 @@ Core::FunctionReplyObject ObjectCodificationData::updateObject(const Codificatio
|
||||
return Core::FunctionReplyObject(ddsData.id(), tr_lts("dds", "Error updating codification_table data in database"));
|
||||
// update internal objectdata
|
||||
m_ddsData = ddsData;
|
||||
DEBUG_LOG(m_logger) << "Data changed for codification_table id: " << m_ddsData.id();
|
||||
DEBUG_LOG() << "Data changed for codification_table id: " << m_ddsData.id();
|
||||
|
||||
// Publish Data via DTS
|
||||
onPublishData();
|
||||
@@ -79,7 +78,7 @@ Core::FunctionReplyObject ObjectCodificationData::updateObject(const Codificatio
|
||||
|
||||
Core::FunctionReplyObject ObjectCodificationData::removeObject()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ObjectCodificationData::removeObject()";
|
||||
DEBUG_LOG() << "ObjectCodificationData::removeObject()";
|
||||
|
||||
if (isUsed())
|
||||
return Core::FunctionReplyObject(m_ddsData.id(), tr_lts("dds", "codification_table data still in use"));
|
||||
@@ -87,7 +86,7 @@ Core::FunctionReplyObject ObjectCodificationData::removeObject()
|
||||
if (!m_dbHandler->db()->removeCodCodificationTable(m_ddsData.id()))
|
||||
return Core::FunctionReplyObject(m_ddsData.id(), tr_lts("dds", "codification_table with id %1 can not be removed")).arg(m_ddsData.id());
|
||||
|
||||
DEBUG_LOG(m_logger) << "Removed codification_table id " << m_ddsData.id();
|
||||
DEBUG_LOG() << "Removed codification_table id " << m_ddsData.id();
|
||||
m_ddsHandler->dts()->removeCodificationDataByKey(m_ddsData.id());
|
||||
|
||||
return Core::FunctionReplyObject(m_ddsData.id());
|
||||
@@ -96,10 +95,10 @@ Core::FunctionReplyObject ObjectCodificationData::removeObject()
|
||||
|
||||
void ObjectCodificationData::onPublishData()
|
||||
{
|
||||
INFO_LOG(m_logger) << "Publish CodificationData data to dds (" << m_ddsData.id() << ") ...";
|
||||
INFO_LOG() << "Publish CodificationData data to dds (" << m_ddsData.id() << ") ...";
|
||||
|
||||
if (!m_ddsHandler->dts()->publish(m_ddsData))
|
||||
ERROR_LOG(m_logger) << "Error publishing CodificationData data to dds";
|
||||
ERROR_LOG() << "Error publishing CodificationData data to dds";
|
||||
} // end of onPublishData()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
-2
@@ -46,7 +46,5 @@ private:
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<DbHandler> m_dbHandler;
|
||||
CodificationData m_ddsData;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <CodificationManagement/cod_export.h>
|
||||
#include "svccodserver_export.h"
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user