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

Migrates remaining services and plugins to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across the residual service set.
This commit is contained in:
berrux-dev committed 2026-09-21 02:47:48 +02:00
1 parent 6a8c31b735
commit c3eda18234
104 files changed
+2424 -2430
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/ModuleTests/pre_tests.cpp
+38 -38
View File
@@ -98,25 +98,25 @@ void PreTests::tryCreate()
m_presentationId = -1;
PresentationModifyRequest request;
request.name("Test Presentation");
request.description("Description Presentation");
request.operatorId(100);
request.lastModified(QDateTime(QDate(2017,2,14), QTime(9,34)).toMSecsSinceEpoch());
request.name = "Test Presentation";
request.description = "Description Presentation";
request.operatorId = 100;
request.lastModified = QDateTime(QDate(2017,2,14), QTime(9,34)).toMSecsSinceEpoch();
std::vector<PresentationContent> vectorPc;
vectorPc.resize(2);
vectorPc[0].presentationTopicType("pdf");
vectorPc[0].channel("1V");
vectorPc[0].duration(30);
vectorPc[0].startTime(QDateTime(QDate(2017,2,13), QTime(12,34)).toMSecsSinceEpoch());
vectorPc[0].presentationTopicType = "pdf";
vectorPc[0].channel = "1V";
vectorPc[0].duration = 30;
vectorPc[0].startTime = QDateTime(QDate(2017,2,13), QTime(12,34)).toMSecsSinceEpoch();
vectorPc[1].presentationTopicType("text");
vectorPc[1].channel("2V");
vectorPc[1].duration(30);
vectorPc[1].startTime(QDateTime(QDate(2017,2,14), QTime(9,45)).toMSecsSinceEpoch());
vectorPc[1].presentationTopicType = "text";
vectorPc[1].channel = "2V";
vectorPc[1].duration = 30;
vectorPc[1].startTime = QDateTime(QDate(2017,2,14), QTime(9,45)).toMSecsSinceEpoch();
request.content(vectorPc);
request.content = vectorPc;
if (!m_ftc->presentationModifyRequest(request, this))
{
@@ -132,24 +132,24 @@ void PreTests::tryModify()
{
PresentationModifyRequest request;
request.id(m_presentationId);
request.name("Presentation Modify");
request.description("Description Presentation Modify");
request.operatorId(102);
request.lastModified(QDateTime(QDate(2017,2,16), QTime(10,34)).toMSecsSinceEpoch());
request.id = m_presentationId;
request.name = "Presentation Modify";
request.description = "Description Presentation Modify";
request.operatorId = 102;
request.lastModified = QDateTime(QDate(2017,2,16), QTime(10,34)).toMSecsSinceEpoch();
std::vector<PresentationContent> &vectorPc = request.content();
std::vector<PresentationContent> &vectorPc = request.content;
vectorPc.resize(2);
vectorPc[0].presentationTopicType("pdf");
vectorPc[0].channel("1V2");
vectorPc[0].duration(60);
vectorPc[0].startTime(QDateTime(QDate(2017,2,13), QTime(12,34)).toMSecsSinceEpoch());
vectorPc[0].presentationTopicType = "pdf";
vectorPc[0].channel = "1V2";
vectorPc[0].duration = 60;
vectorPc[0].startTime = QDateTime(QDate(2017,2,13), QTime(12,34)).toMSecsSinceEpoch();
vectorPc[1].presentationTopicType("text");
vectorPc[1].channel("2V");
vectorPc[1].duration(60);
vectorPc[1].startTime(QDateTime(QDate(2017,2,14), QTime(9,45)).toMSecsSinceEpoch());
vectorPc[1].presentationTopicType = "text";
vectorPc[1].channel = "2V";
vectorPc[1].duration = 60;
vectorPc[1].startTime = QDateTime(QDate(2017,2,14), QTime(9,45)).toMSecsSinceEpoch();
INFO_LOG(m_logger) << "trying to send modify request for presentation Id = " << m_presentationId;
if (!m_ftc->presentationModifyRequest(request, this))
@@ -166,7 +166,7 @@ void PreTests::tryDelete()
{
PresentationRemoveRequest request;
request.id(m_presentationId);
request.id = m_presentationId;
INFO_LOG(m_logger) << "trying to send delete request for presentation Id = " << m_presentationId;
if (!m_ftc->presentationRemoveRequest(request, this))
@@ -181,7 +181,7 @@ void PreTests::tryGetContent()
{
GetPresentationContentRequest request;
request.presentationId(m_presentationId);
request.presentationId = m_presentationId;
INFO_LOG(m_logger) << "trying to send content request for presentation Id = " << m_presentationId;
if (!m_ftc->getPresentationContentRequest(request, this))
@@ -198,10 +198,10 @@ void PreTests::tryChangeStatus()
{
PresentationChangeStatusRequest request;
request.id(m_presentationId);
request.operatorId(101);
request.lastModified(QDateTime::currentMSecsSinceEpoch());
request.fileStatus(FileStatus::Deleted);
request.id = m_presentationId;
request.operatorId = 101;
request.lastModified = QDateTime::currentMSecsSinceEpoch();
request.fileStatus = FileStatus::Deleted;
INFO_LOG(m_logger) << "trying to send change status request for presentation Id = " << m_presentationId;
if (!m_ftc->presentationChangeStatusRequest(request, this))
@@ -310,16 +310,16 @@ void PreTests::onGetPresentationContentReply(const GetPresentationContentReply &
{
DEBUG_LOG(m_logger) << "END (onGetPresentationContentReply)";
if (replyObject.errorString().size() > 0)
if (replyObject.errorString.size() > 0)
{
ERROR_LOG(m_logger) << "Got onGetPresentationContentReply error: " << replyObject.errorString();
ERROR_LOG(m_logger) << "Got onGetPresentationContentReply error: " << replyObject.errorString;
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
return;
}
INFO_LOG(m_logger) << "Got reply with id " << replyObject.id()
<< " and errorString " << replyObject.errorString()
<< " and content size " << replyObject.content().size();
INFO_LOG(m_logger) << "Got reply with id " << replyObject.id
<< " and errorString " << replyObject.errorString
<< " and content size " << replyObject.content.size();
if(m_testId == 0)
QTimer::singleShot(0, this, &PreTests::tryDelete);
qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/handler_presentation.cpp
+16 -16
View File
@@ -84,7 +84,7 @@ void HandlerPresentation::onPresentationModifyRequest(const rti::core::SampleIde
const PresentationModifyRequest &request)
{
DEBUG_LOG(m_logger) << "onPresentationModifyRequest: " << request;
auto ret = request.id() > 0 ? presentationModifyRequest(request) : presentationCreateRequest(request);
auto ret = request.id > 0 ? presentationModifyRequest(request) : presentationCreateRequest(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
m_mainHandler->dds()->fts()->presentationModifyReply(cookie, ret);
@@ -112,11 +112,11 @@ Core::FunctionReplyObject HandlerPresentation::presentationCreateRequest(const P
//---------------------------------------------------------------------------------------------------------------------------------------------------
Core::FunctionReplyObject HandlerPresentation::presentationModifyRequest(const PresentationModifyRequest &request)
{
PresentationManagement::ObjectPresentation *ifs = m_objectPresentationMap.value(request.id());
PresentationManagement::ObjectPresentation *ifs = m_objectPresentationMap.value(request.id);
if (ifs == nullptr)
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Presentation with id %1 not found")).arg(request.id());
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Presentation with id %1 not found")).arg(request.id);
int oldId = request.id();
int oldId = request.id;
Core::FunctionReplyObject ret = ifs->updateObject(request);
if (ret.error())
return ret;
@@ -133,7 +133,7 @@ void HandlerPresentation::onPresentationRemoveRequest(const rti::core::SampleIde
{
DEBUG_LOG(m_logger) << "onPresentationRemoveRequest: " << request;
Core::FunctionReplyObject ret;
int presentationId = request.id();
int presentationId = request.id;
// gest presentation object
PresentationManagement::ObjectPresentation *ifs = m_objectPresentationMap.value(presentationId);
@@ -146,7 +146,7 @@ void HandlerPresentation::onPresentationRemoveRequest(const rti::core::SampleIde
if (m_mainHandler->dds()->topicLockMaster()->isLocked(ifs->getData(), m_mainHandler->exerciseId()))
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Presentation '%1' is used by another user!")).arg(ifs->getName());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Presentation '%1' is used by another user!")).arg(ifs->getName());
m_mainHandler->dds()->fts()->presentationRemoveReply(cookie, ret);
return;
}
@@ -173,26 +173,26 @@ void HandlerPresentation::onGetPresentationContentRequest(const rti::core::Sampl
Core::FunctionReplyObject fro;
GetPresentationContentReply reply;
ObjectPresentation *ifs = m_objectPresentationMap.value(request.presentationId());
ObjectPresentation *ifs = m_objectPresentationMap.value(request.presentationId);
if (ifs)
{
reply.id(ifs->getId());
reply.id = ifs->getId();
/*
if (ifs->getContent().size() <= 0)
fro = Core::FunctionReplyObject(request.presentationId(), tr_lts("dds", "No content for presentation "));
fro = Core::FunctionReplyObject(request.presentationId, tr_lts("dds", "No content for presentation "));
else
*/
reply.content(ifs->getContent());
reply.content = ifs->getContent();
}
else
fro = Core::FunctionReplyObject(request.presentationId(), tr_lts("dds", "No valid presentation id for retrieving presentation content"));
fro = Core::FunctionReplyObject(request.presentationId, tr_lts("dds", "No valid presentation id for retrieving presentation content"));
if (fro.error())
{
reply.id(fro.id());
reply.errorString(fro.str());
reply.errorParams(fro.args());
reply.id = fro.id();
reply.errorString = fro.str();
reply.errorParams = fro.args();
}
m_mainHandler->dds()->fts()->getPresentationContentReply(cookie, reply);
@@ -202,10 +202,10 @@ void HandlerPresentation::onGetPresentationContentRequest(const rti::core::Sampl
void HandlerPresentation::onPresentationChangeStatusRequest(const rti::core::SampleIdentity &cookie,
const PresentationChangeStatusRequest &request)
{
ObjectPresentation *ifs = m_objectPresentationMap.value(request.id());
ObjectPresentation *ifs = m_objectPresentationMap.value(request.id);
if (ifs == nullptr)
{
Core::FunctionReplyObject ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Presentation with id %1 not found")).arg(request.id());
Core::FunctionReplyObject ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Presentation with id %1 not found")).arg(request.id);
m_mainHandler->dds()->fts()->presentationChangeStatusReply(cookie, ret);
return;
}
qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.cpp
+78 -78
View File
@@ -36,7 +36,7 @@ ObjectPresentation::~ObjectPresentation()
//------------------------------------------------------------------------------------------------------------
bool ObjectPresentation::isValid() const
{
return m_data.id() > 0;
return m_data.id > 0;
}
void ObjectPresentation::addPresentationContent(PresentationContent &&data)
@@ -50,12 +50,12 @@ Core::FunctionReplyObject ObjectPresentation::createObject(const PresentationMod
m_data = Presentation();
m_content.clear();
m_data.name(request.name());
m_data.description(request.description());
m_data.operatorId(request.operatorId());
m_data.lastModified(request.lastModified());
m_data.name = request.name;
m_data.description = request.description;
m_data.operatorId = request.operatorId;
m_data.lastModified = request.lastModified;
m_content = request.content();
m_content = request.content;
//for(auto it = request.content().begin(); it != request.content().end(); ++it)
// m_content.append(*it);
@@ -65,68 +65,68 @@ Core::FunctionReplyObject ObjectPresentation::createObject(const PresentationMod
Database::PrePresentation dbData(toDbData(m_data));
if (!m_mainHandler->db()->insert(dbData))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting Presentation-data into database"));
m_data.id(dbData.id);
m_data.id = dbData.id;
// Insert PresentationContent
for (PresentationContent &conData : m_content)
{
conData.presentationId(m_data.id());
conData.presentationId = m_data.id;
Database::PrePresentationContent conDbData = toDbData(conData);
conDbData.id = 0;
conDbData.presentationId = m_data.id();
conDbData.presentationId = m_data.id;
if (!m_mainHandler->db()->insert(conDbData))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting PresentationContent-data into database"));
else
{
DEBUG_LOG(m_logger) << "New presentation content id : " << conDbData.id;
conData.id(conDbData.id);
conData.id = conDbData.id;
}
}
DEBUG_LOG(m_logger) << "New Id: " << m_data.id();
DEBUG_LOG(m_logger) << "New Id: " << m_data.id;
trans.commit();
onPublishData();
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
//------------------------------------------------------------------------------------------------------------
Core::FunctionReplyObject ObjectPresentation::updateObject(const PresentationModifyRequest &request)
{
if (!isValid())
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Object not valid/blocked"));
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Object not valid/blocked"));
m_data.id(request.id());
m_data.name(request.name());
m_data.description(request.description());
m_data.operatorId(request.operatorId());
m_data.lastModified(request.lastModified());
m_data.fileStatus(request.fileStatus());
m_data.id = request.id;
m_data.name = request.name;
m_data.description = request.description;
m_data.operatorId = request.operatorId;
m_data.lastModified = request.lastModified;
m_data.fileStatus = request.fileStatus;
DBTransaction trans(m_mainHandler->db()->database());
Database::PrePresentation dbData(toDbData(m_data));
if (!m_mainHandler->db()->update(dbData))
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Error updating Presentation-data into database"));
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating Presentation-data into database"));
for (const auto &content : qAsConst(m_content))
{
if (m_mainHandler->db()->removePrePresentationContent(content.id()))
DEBUG_LOG(m_logger) << "Removed presentation content id " << content.id();
if (m_mainHandler->db()->removePrePresentationContent(content.id))
DEBUG_LOG(m_logger) << "Removed presentation content id " << content.id;
else
ERROR_LOG(m_logger) << "Failed to remove presentation content id " << content.id();
ERROR_LOG(m_logger) << "Failed to remove presentation content id " << content.id;
}
m_content = request.content();
m_content = request.content;
for (PresentationContent &conData : m_content)
{
conData.presentationId(m_data.id());
conData.presentationId = m_data.id;
Database::PrePresentationContent conDbData = toDbData(conData);
conDbData.presentationId = m_data.id();
conDbData.presentationId = m_data.id;
conDbData.id = 0;
if (!m_mainHandler->db()->insert(conDbData))
@@ -134,7 +134,7 @@ Core::FunctionReplyObject ObjectPresentation::updateObject(const PresentationMod
else
{
DEBUG_LOG(m_logger) << "New presentation content id : " << conDbData.id;
conData.id(conDbData.id);
conData.id = conDbData.id;
}
}
@@ -143,17 +143,17 @@ Core::FunctionReplyObject ObjectPresentation::updateObject(const PresentationMod
onPublishData();
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
//------------------------------------------------------------------------------------------------------------
Core::FunctionReplyObject ObjectPresentation::removeObject()
{
// remove also presentationContent data via foreign key
if (!m_mainHandler->db()->removePrePresentation(m_data.id()))
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Presentation with id %1 can not be removed from DB")).arg(m_data.id());
if (!m_mainHandler->db()->removePrePresentation(m_data.id))
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Presentation with id %1 can not be removed from DB")).arg(m_data.id);
int id = m_data.id();
int id = m_data.id;
m_content.clear();
m_data = Presentation();
@@ -164,24 +164,24 @@ Core::FunctionReplyObject ObjectPresentation::removeObject()
Core::FunctionReplyObject ObjectPresentation::changeStatus(const PresentationChangeStatusRequest &request)
{
if (!isValid())
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Trying to update an already removed Presentation object"));
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Trying to update an already removed Presentation object"));
m_data.fileStatus(request.fileStatus());
m_data.operatorId(request.operatorId());
m_data.lastModified(request.lastModified());
m_data.fileStatus = request.fileStatus;
m_data.operatorId = request.operatorId;
m_data.lastModified = request.lastModified;
Database::PrePresentation dbData(toDbData(m_data));
if (!m_mainHandler->db()->update(dbData))
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Error updating Presentation-data into database"));
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating Presentation-data into database"));
// Publish Data via DTS
onPublishData();
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
//------------------------------------------------------------------------------------------------------------
void ObjectPresentation::onPublishData()
{
INFO_LOG(m_logger) << "Publish Presentation-data to dds (" << m_data.id() << ") ...";
INFO_LOG(m_logger) << "Publish Presentation-data to dds (" << m_data.id << ") ...";
m_mainHandler->dds()->dts()->publish(m_data);
}
@@ -195,12 +195,12 @@ Database::PrePresentation ObjectPresentation::toDbData(const Presentation &ddsDa
{
Database::PrePresentation dbData;
dbData.id = ddsData.id();
dbData.name = QString::fromStdString(ddsData.name());
dbData.description = QString::fromStdString(ddsData.description());
dbData.lastModified = ddsData.lastModified();
dbData.operatorId = ddsData.operatorId();
dbData.fileStatusId = ddsData.fileStatus();
dbData.id = ddsData.id;
dbData.name = QString::fromStdString(ddsData.name);
dbData.description = QString::fromStdString(ddsData.description);
dbData.lastModified = ddsData.lastModified;
dbData.operatorId = ddsData.operatorId;
dbData.fileStatusId = ddsData.fileStatus;
return dbData;
}
@@ -211,16 +211,16 @@ Presentation ObjectPresentation::toDdsData(const Database::PrePresentation &dbDa
{
Presentation ddsData;
ddsData.id(dbData.id);
ddsData.name(dbData.name.toStdString());
ddsData.description(dbData.description.toStdString());
ddsData.operatorId(dbData.operatorId);
ddsData.lastModified(dbData.lastModified);
ddsData.fileStatus(dbData.fileStatusId);
ddsData.id = dbData.id;
ddsData.name = dbData.name.toStdString();
ddsData.description = dbData.description.toStdString();
ddsData.operatorId = dbData.operatorId;
ddsData.lastModified = dbData.lastModified;
ddsData.fileStatus = dbData.fileStatusId;
// init data not in db
ddsData.isDeleted(false);
ddsData.isUsed(false);
ddsData.isDeleted = false;
ddsData.isUsed = false;
return ddsData;
}
@@ -228,19 +228,19 @@ Presentation ObjectPresentation::toDdsData(const Database::PrePresentation &dbDa
Database::PrePresentationContent ObjectPresentation::toDbData(const PresentationContent &ddsData)
{
Database::PrePresentationContent dbData;
dbData.id = ddsData.id();
dbData.presentationId = ddsData.presentationId();
dbData.presentationTopicType = QString::fromStdString(ddsData.presentationTopicType());
dbData.channel = QString::fromStdString(ddsData.channel());
dbData.description = QString::fromStdString(ddsData.description());
dbData.duration = ddsData.duration();
dbData.startTime = ddsData.startTime();
dbData.attributes = QString::fromStdString(ddsData.attributes());
dbData.x = ddsData.x();
dbData.y = ddsData.y();
dbData.width = ddsData.width();
dbData.height = ddsData.height();
dbData.index = ddsData.index();
dbData.id = ddsData.id;
dbData.presentationId = ddsData.presentationId;
dbData.presentationTopicType = QString::fromStdString(ddsData.presentationTopicType);
dbData.channel = QString::fromStdString(ddsData.channel);
dbData.description = QString::fromStdString(ddsData.description);
dbData.duration = ddsData.duration;
dbData.startTime = ddsData.startTime;
dbData.attributes = QString::fromStdString(ddsData.attributes);
dbData.x = ddsData.x;
dbData.y = ddsData.y;
dbData.width = ddsData.width;
dbData.height = ddsData.height;
dbData.index = ddsData.index;
return dbData;
}
@@ -248,19 +248,19 @@ Database::PrePresentationContent ObjectPresentation::toDbData(const Presentation
PresentationContent ObjectPresentation::toDdsData(const Database::PrePresentationContent &dbData)
{
PresentationContent ddsData;
ddsData.id(dbData.id);
ddsData.presentationId(dbData.presentationId);
ddsData.presentationTopicType(dbData.presentationTopicType.toStdString());
ddsData.channel(dbData.channel.toStdString());
ddsData.description(dbData.description.toStdString());
ddsData.startTime(dbData.startTime);
ddsData.attributes(dbData.attributes.toStdString());
ddsData.duration(dbData.duration);
ddsData.x(dbData.x);
ddsData.y(dbData.y);
ddsData.width(dbData.width);
ddsData.height(dbData.height);
ddsData.index(dbData.index);
ddsData.id = dbData.id;
ddsData.presentationId = dbData.presentationId;
ddsData.presentationTopicType = dbData.presentationTopicType.toStdString();
ddsData.channel = dbData.channel.toStdString();
ddsData.description = dbData.description.toStdString();
ddsData.startTime = dbData.startTime;
ddsData.attributes = dbData.attributes.toStdString();
ddsData.duration = dbData.duration;
ddsData.x = dbData.x;
ddsData.y = dbData.y;
ddsData.width = dbData.width;
ddsData.height = dbData.height;
ddsData.index = dbData.index;
return ddsData;
}
qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.h
+2 -2
View File
@@ -35,8 +35,8 @@ public:
Core::FunctionReplyObject removeObject();
Core::FunctionReplyObject changeStatus(const PresentationChangeStatusRequest &request);
qint32 getId() const { return m_data.id(); }
QString getName() const { return QString::fromStdString(m_data.name()); }
qint32 getId() const { return m_data.id; }
QString getName() const { return QString::fromStdString(m_data.name); }
const std::vector<PresentationContent> &getContent() const { return m_content; }
const Presentation &getData() const { return m_data; }