Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,131 @@
|
||||
/**
|
||||
* Handler for codification data
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by hjl, SLSE, 2016-11-18
|
||||
*/
|
||||
|
||||
#include "handler_codification_data.h"
|
||||
#include "object_codification_data.h"
|
||||
|
||||
using namespace CodificationManagement;
|
||||
|
||||
HandlerCodificationData::HandlerCodificationData(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
const std::shared_ptr<DbHandler> &dbHandler)
|
||||
: Interface::Fts::CodificationDataModifyRequestHandler(ddsHandler->fts())
|
||||
, Interface::Fts::CodificationDataRemoveRequestHandler(ddsHandler->fts())
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_dbHandler(dbHandler)
|
||||
, m_logger(getLogger("HandlerCodificationData"))
|
||||
{
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
HandlerCodificationData::~HandlerCodificationData()
|
||||
{
|
||||
qDeleteAll(m_codificationdataObjMap);
|
||||
} // end of dtor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
bool HandlerCodificationData::init()
|
||||
{
|
||||
QVector<Database::CodCodificationTable> dataVec;
|
||||
// read all CodificationDatas from database
|
||||
if (!m_dbHandler->db()->select(dataVec))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
return true;
|
||||
}
|
||||
|
||||
// create objects
|
||||
for (const Database::CodCodificationTable &data : qAsConst(dataVec))
|
||||
{
|
||||
CodificationManagement::CodificationData ddsData = ObjectCodificationData::toDdsData(data);
|
||||
ObjectCodificationData *ifs(new ObjectCodificationData(m_ddsHandler, m_dbHandler));
|
||||
Core::FunctionReplyObject ret = ifs->createObject(ddsData);
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
return false;
|
||||
}
|
||||
m_codificationdataObjMap.insert(ifs->getId(), ifs);
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "m_codificationdataObjMap.size() = " << m_codificationdataObjMap.size();
|
||||
|
||||
return true;
|
||||
} // end of init()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void HandlerCodificationData::onCodificationDataModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
const CodificationData &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onCodificationDataModifyRequest: " << request;
|
||||
auto ret = request.id() > 0 ? codificationDataModifyRequest(request) : codificationDataCreateRequest(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
m_ddsHandler->fts()->codificationDataModifyReply(cookie, ret);
|
||||
} // end of onCodificationDataModifyRequest()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
Core::FunctionReplyObject HandlerCodificationData::codificationDataCreateRequest(const CodificationData &request)
|
||||
{
|
||||
ObjectCodificationData *ifs(new ObjectCodificationData(m_ddsHandler, m_dbHandler));
|
||||
Core::FunctionReplyObject ret = ifs->createObject(request);
|
||||
if (ret.error())
|
||||
delete ifs;
|
||||
else
|
||||
m_codificationdataObjMap.insert(ifs->getId(), ifs);
|
||||
|
||||
return ret;
|
||||
} // end of onCodificationDataCreateRequest()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
Core::FunctionReplyObject HandlerCodificationData::codificationDataModifyRequest(const CodificationData &request)
|
||||
{
|
||||
ObjectCodificationData *ifs = m_codificationdataObjMap.value(request.id());
|
||||
if (ifs == nullptr)
|
||||
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Codification table with id %1 not found")).arg(request.id());
|
||||
|
||||
return ifs->updateObject(request);
|
||||
} // end of onCodificationDataModifyRequest()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void HandlerCodificationData::onCodificationDataRemoveRequest(const rti::core::SampleIdentity &cookie,
|
||||
const Core::RemoveElementRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "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();
|
||||
m_ddsHandler->fts()->codificationDataRemoveReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_ddsHandler->topicLockMaster()->isLocked(ifs->getData(), m_ddsHandler->exerciseId()))
|
||||
{
|
||||
Core::FunctionReplyObject ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Codification '%1' is used by another user!")).arg(ifs->getData().identifier());
|
||||
m_ddsHandler->fts()->codificationDataRemoveReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
|
||||
Core::FunctionReplyObject ret = ifs->removeObject();
|
||||
if (ret.error())
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
else
|
||||
{
|
||||
// delete codification object
|
||||
delete ifs;
|
||||
m_codificationdataObjMap.remove(request.id());
|
||||
}
|
||||
|
||||
m_ddsHandler->fts()->codificationDataRemoveReply(cookie, ret);
|
||||
|
||||
} // end of onCodificationDataRemoveRequest()
|
||||
//-----------------------------------------------------------------------------
|
||||
Reference in new issue
Block a user