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/MarkerManagement/object_marker.cpp
+64 -64
View File
@@ -23,7 +23,7 @@ ObjectMarker::ObjectMarker(const std::shared_ptr<DdsHandler> &ddsHandler, const
ObjectMarker::~ObjectMarker()
{
m_ddsHandler->dts()->removeMarkerByKey(m_dataMarkerObject.id());
m_ddsHandler->dts()->removeMarkerByKey(m_dataMarkerObject.id);
} // end of dtor()
//-----------------------------------------------------------------------------
@@ -31,7 +31,7 @@ Core::FunctionReplyObject ObjectMarker::createObject(const Marker &data)
{
m_dataMarkerObject = data;
if (data.id() <= 0)
if (data.id <= 0)
{
Database::MrkMarker dbDataMarker = toDbData(data);
DBTransaction trans(m_db->database());
@@ -39,15 +39,15 @@ Core::FunctionReplyObject ObjectMarker::createObject(const Marker &data)
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting MrkMarker-data into database"));
// Neue DB Id in lokale Struktur uebernehmen
m_dataMarkerObject.id(dbDataMarker.id);
m_dataMarkerObject.id = dbDataMarker.id;
DEBUG_LOG(m_logger) << "New MarkerId: " << dbDataMarker.id;
DEBUG_LOG(m_logger) << "Handle MarkerDescription for markerId:" << dbDataMarker.id << " number of depending descriptions: " << data.descriptions().size();
DEBUG_LOG(m_logger) << "Handle MarkerDescription for markerId:" << dbDataMarker.id << " number of depending descriptions: " << data.descriptions.size();
// Behandlung von MarkerDescription
for (size_t i = 0; i < data.descriptions().size(); ++i)
for (size_t i = 0; i < data.descriptions.size(); ++i)
{
MarkerDescription &mrkDesc = m_dataMarkerObject.descriptions()[i];
MarkerDescription &mrkDesc = m_dataMarkerObject.descriptions[i];
Database::MrkMarkerDescription dbDataDesc = toDbData(mrkDesc);
// Struct MarkerDescription vorbereiten
@@ -56,7 +56,7 @@ Core::FunctionReplyObject ObjectMarker::createObject(const Marker &data)
if (!m_db->insert(dbDataDesc))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting MarkerDescription-data into database"));
// Neue DB Id in lokale Struktur uebernehmen
mrkDesc.id(dbDataDesc.id);
mrkDesc.id = dbDataDesc.id;
}
trans.commit();
@@ -65,7 +65,7 @@ Core::FunctionReplyObject ObjectMarker::createObject(const Marker &data)
// Publish Data via DTS
onPublishData();
return Core::FunctionReplyObject(m_dataMarkerObject.id());
return Core::FunctionReplyObject(m_dataMarkerObject.id);
} // end of createObject()
//-----------------------------------------------------------------------------
@@ -73,49 +73,49 @@ Core::FunctionReplyObject ObjectMarker::createObject(const Marker &data)
Core::FunctionReplyObject ObjectMarker::updateObject(const Marker &data)
{
if (!isValid())
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked"));
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Object not valid/blocked"));
const Database::MrkMarker dbDataMarker = toDbData(data);
auto newData = data;
DBTransaction trans(m_db->database());
if (!m_db->update(dbDataMarker))
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating MrkMarker-data into database"));
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating MrkMarker-data into database"));
DEBUG_LOG(m_logger) << "Data changed for markerId: " << m_dataMarkerObject.id();
DEBUG_LOG(m_logger) << "Data changed for markerId: " << m_dataMarkerObject.id;
INFO_LOG(m_logger) << "Handle MarkerDescriptions for markerId:" << data.id()
INFO_LOG(m_logger) << "Handle MarkerDescriptions for markerId:" << data.id
<< ". Number of pending descriptions (new/previous):"
<< data.descriptions().size() << "/" << m_dataMarkerObject.descriptions().size();
<< data.descriptions.size() << "/" << m_dataMarkerObject.descriptions.size();
// Descriptions mit id -> schon vorhanden
// Desctiptions ohne id -> neu einfügen
for (auto &desc : newData.descriptions())
for (auto &desc : newData.descriptions)
{
Database::MrkMarkerDescription dbDesc = toDbData(desc);
dbDesc.markerId = dbDataMarker.id; // FK auf MarkerId
if (desc.id() > 0)
if (desc.id > 0)
{
// immer update ...
if (!m_db->update(dbDesc))
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating MrkMarkerDescription-data into database"));
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating MrkMarkerDescription-data into database"));
}
else
{
if (!m_db->insert(dbDesc))
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error inserting MarkerDescription-data into database"));
desc.id(dbDesc.id);
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error inserting MarkerDescription-data into database"));
desc.id = dbDesc.id;
}
}
// jetzt noch prüfen ob ggf. etwas rausgefallen ist
for (const auto &oldDesc : m_dataMarkerObject.descriptions())
for (const auto &oldDesc : m_dataMarkerObject.descriptions)
{
bool bFound = false;
for (const auto &newDesc : newData.descriptions())
for (const auto &newDesc : newData.descriptions)
{
if (newDesc.id() == oldDesc.id())
if (newDesc.id == oldDesc.id)
{
bFound = true;
break;
@@ -123,11 +123,11 @@ Core::FunctionReplyObject ObjectMarker::updateObject(const Marker &data)
}
if (!bFound)
{
DEBUG_LOG(m_logger) << "Description with id " << oldDesc.id() << " was removed - removing from db";
if (!m_db->removeMrkMarkerDescription(oldDesc.id()))
return Core::FunctionReplyObject(data.id(),
DEBUG_LOG(m_logger) << "Description with id " << oldDesc.id << " was removed - removing from db";
if (!m_db->removeMrkMarkerDescription(oldDesc.id))
return Core::FunctionReplyObject(data.id,
tr_lts("dds", "MarkerDescription with id %1 can not be removed"))
.arg(oldDesc.id());
.arg(oldDesc.id);
}
}
@@ -138,54 +138,54 @@ Core::FunctionReplyObject ObjectMarker::updateObject(const Marker &data)
// Publish Data via DTS
onPublishData();
return Core::FunctionReplyObject(m_dataMarkerObject.id());
return Core::FunctionReplyObject(m_dataMarkerObject.id);
} // end of updateObject()
//-----------------------------------------------------------------------------
Core::FunctionReplyObject ObjectMarker::removeObject()
{
if (isUsed())
return Core::FunctionReplyObject(m_dataMarkerObject.id(), tr_lts("dds", "Marker still in use"));
return Core::FunctionReplyObject(m_dataMarkerObject.id, tr_lts("dds", "Marker still in use"));
// MarkerDescription werden automatisch entfernt (ON DELETE CASCADE)
if (!m_db->removeMrkMarker(m_dataMarkerObject.id()))
return Core::FunctionReplyObject(m_dataMarkerObject.id(), tr_lts("dds", "Marker with id %1 can not be removed")).arg(m_dataMarkerObject.id());
if (!m_db->removeMrkMarker(m_dataMarkerObject.id))
return Core::FunctionReplyObject(m_dataMarkerObject.id, tr_lts("dds", "Marker with id %1 can not be removed")).arg(m_dataMarkerObject.id);
m_ddsHandler->dts()->removeMarkerByKey(m_dataMarkerObject.id());
m_ddsHandler->dts()->removeMarkerByKey(m_dataMarkerObject.id);
return Core::FunctionReplyObject(m_dataMarkerObject.id());
return Core::FunctionReplyObject(m_dataMarkerObject.id);
} // end of removeObject()
//-----------------------------------------------------------------------------
Core::FunctionReplyObject ObjectMarker::setUsed(bool isUsed)
{
if (!isValid())
return Core::FunctionReplyObject(m_dataMarkerObject.id(), tr_lts("dds", "Trying to update an already removed Marker object"));
return Core::FunctionReplyObject(m_dataMarkerObject.id, tr_lts("dds", "Trying to update an already removed Marker object"));
m_dataMarkerObject.isUsed(isUsed);
m_dataMarkerObject.isUsed = isUsed;
// Publish Data via DTS
onPublishData();
return Core::FunctionReplyObject(m_dataMarkerObject.id());
return Core::FunctionReplyObject(m_dataMarkerObject.id);
} // end of setUsed()
//-----------------------------------------------------------------------------
bool ObjectMarker::isValid() const
{
return m_dataMarkerObject.id() > 0;
return m_dataMarkerObject.id > 0;
} // end of isValid()
//-----------------------------------------------------------------------------
bool ObjectMarker::isUsed() const
{
return m_dataMarkerObject.isUsed();
return m_dataMarkerObject.isUsed;
} // end of isUsed()
//-----------------------------------------------------------------------------
void ObjectMarker::onPublishData()
{
INFO_LOG(m_logger) << "Publish MrkMarker-data to dds markerId:" << m_dataMarkerObject.id() ;
INFO_LOG(m_logger) << "Publish MrkMarker-data to dds markerId:" << m_dataMarkerObject.id ;
if (!m_ddsHandler->dts()->publish(m_dataMarkerObject))
WARNING_LOG(m_logger) << "Error publishing MrkMarker-data to dds";
@@ -202,16 +202,16 @@ Database::MrkMarker ObjectMarker::toDbData(const Marker &ddsData)
{
Database::MrkMarker dbData;
dbData.id = ddsData.id();
dbData.operatorId = ddsData.operatorId();
dbData.note = QString::fromStdString(ddsData.note());
dbData.timeStamp = ddsData.timeStamp();
dbData.timeStampOffset = ddsData.timeStampOffset();
dbData.mapSettings = QString::fromStdString(ddsData.mapSettings());
dbData.filter = QString::fromStdString(ddsData.filter());
dbData.position.setX(ddsData.position().lon());
dbData.position.setY(ddsData.position().lat());
dbData.fileContentId = ddsData.fileContentId();
dbData.id = ddsData.id;
dbData.operatorId = ddsData.operatorId;
dbData.note = QString::fromStdString(ddsData.note);
dbData.timeStamp = ddsData.timeStamp;
dbData.timeStampOffset = ddsData.timeStampOffset;
dbData.mapSettings = QString::fromStdString(ddsData.mapSettings);
dbData.filter = QString::fromStdString(ddsData.filter);
dbData.position.setX(ddsData.position.lon);
dbData.position.setY(ddsData.position.lat);
dbData.fileContentId = ddsData.fileContentId;
return dbData;
} // end of toDbData()
@@ -222,19 +222,19 @@ Marker ObjectMarker::toDdsData(const Database::MrkMarker &dbData)
{
Marker ddsData;
ddsData.id(dbData.id);
ddsData.operatorId(dbData.operatorId);
ddsData.note(dbData.note.toStdString());
ddsData.timeStamp(dbData.timeStamp);
ddsData.timeStampOffset(dbData.timeStampOffset);
ddsData.mapSettings(dbData.mapSettings.toStdString());
ddsData.filter(dbData.filter.toStdString());
ddsData.position(Core::GeoPosition(dbData.position.x(), dbData.position.y(), 0.0));
ddsData.fileContentId(dbData.fileContentId);
ddsData.id = dbData.id;
ddsData.operatorId = dbData.operatorId;
ddsData.note = dbData.note.toStdString();
ddsData.timeStamp = dbData.timeStamp;
ddsData.timeStampOffset = dbData.timeStampOffset;
ddsData.mapSettings = dbData.mapSettings.toStdString();
ddsData.filter = dbData.filter.toStdString();
ddsData.position = Core::GeoPosition(dbData.position.x(), dbData.position.y(), 0.0);
ddsData.fileContentId = dbData.fileContentId;
// init data not in db
ddsData.isDeleted(false);
ddsData.isUsed(false);
ddsData.isDeleted = false;
ddsData.isUsed = false;
return ddsData;
} // end of toDdsData()
@@ -245,9 +245,9 @@ Database::MrkMarkerDescription ObjectMarker::toDbData(const MarkerDescription &d
{
Database::MrkMarkerDescription dbData;
dbData.id = ddsData.id();
dbData.markerTypeId = ddsData.markerType();
dbData.content = QString::fromStdString(ddsData.content());
dbData.id = ddsData.id;
dbData.markerTypeId = ddsData.markerType;
dbData.content = QString::fromStdString(ddsData.content);
return dbData;
} // end of toDbData()
@@ -258,9 +258,9 @@ MarkerDescription ObjectMarker::toDdsData(const Database::MrkMarkerDescription &
{
MarkerDescription ddsData;
ddsData.id(dbData.id);
ddsData.markerType(dbData.markerTypeId);
ddsData.content(dbData.content.toStdString());
ddsData.id = dbData.id;
ddsData.markerType = dbData.markerTypeId;
ddsData.content = dbData.content.toStdString();
return ddsData;
} // end of toDdsData()