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/ModuleTests/mrk_tests.cpp
+80 -80
View File
@@ -128,10 +128,10 @@ void MrkTests::tryModify()
MarkerModifyRequest data;
getMarkerModifyRequestData(data);
INFO_LOG(m_logger) << "trying to send MarkerModifyRequest for markerId:" << data.id();
INFO_LOG(m_logger) << "trying to send MarkerModifyRequest for markerId:" << data.id;
if (!m_ftc->markerModifyRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting modify data for markerId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting modify data for markerId:" << data.id;
failExit();
}
} // end of tryModify()
@@ -142,12 +142,12 @@ void MrkTests::tryRemove()
m_eTestStep = eRemove;
MarkerRemoveRequest data;
data.id(m_markerId);
data.id = m_markerId;
INFO_LOG(m_logger) << "trying to send remove request for markerId:" << data.id();
INFO_LOG(m_logger) << "trying to send remove request for markerId:" << data.id;
if (!m_ftc->markerRemoveRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting remove data for markerId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting remove data for markerId:" << data.id;
failExit();
}
} // end of tryRemove()
@@ -172,11 +172,11 @@ void MrkTests::tryGetAllMarkers()
for (auto it = map.begin(); it != map.end(); ++it)
{
INFO_LOG(m_logger) << "Mrk(" << it.key() << ") :"
<< " note:" << it.value().note()
<< " operatorId:" << it.value().operatorId()
<< " timeStamp:" << it.value().timeStamp()
<< " timeStampOffset:" << it.value().timeStampOffset()
<< " description count:" << it.value().descriptions().size();
<< " note:" << it.value().note
<< " operatorId:" << it.value().operatorId
<< " timeStamp:" << it.value().timeStamp
<< " timeStampOffset:" << it.value().timeStampOffset
<< " description count:" << it.value().descriptions.size();
}
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -200,18 +200,18 @@ void MrkTests::tryGetMarker()
m_dtc->waitForHistoricalDataMarker();
MarkerManagement::Marker data = m_dtc->marker(m_markerId);
if (data.id() <= 0)
if (data.id <= 0)
{
ERROR_LOG(m_logger) << "Error receiving data for markerId " << m_markerId << " returnVal:" << data.id();
ERROR_LOG(m_logger) << "Error receiving data for markerId " << m_markerId << " returnVal:" << data.id;
failExit();
}
else
{
INFO_LOG(m_logger) << "Mrk(" << data.id() << ") :"
<< " note:" << data.note()
<< " operatorId:" << data.operatorId()
<< " timeStamp:" << data.timeStamp()
<< " timeStampOffset:" << data.timeStampOffset()
INFO_LOG(m_logger) << "Mrk(" << data.id << ") :"
<< " note:" << data.note
<< " operatorId:" << data.operatorId
<< " timeStamp:" << data.timeStamp
<< " timeStampOffset:" << data.timeStampOffset
;
}
@@ -256,13 +256,13 @@ void MrkTests::tryCreateSnapshot()
m_eTestStep = eCreate;
Snapshot data;
data.id(0); // create
data.name("Snapshot 1");
data.description("Dies ist ein Test");
data.mapSettings("78000 92000 xxxx");
data.operatorId(100);
data.timeStamp(QDateTime::currentMSecsSinceEpoch());
data.planOverlay("Plan Overlay");
data.id = 0; // create
data.name = "Snapshot 1";
data.description = "Dies ist ein Test";
data.mapSettings = "78000 92000 xxxx";
data.operatorId = 100;
data.timeStamp = QDateTime::currentMSecsSinceEpoch();
data.planOverlay = "Plan Overlay";
INFO_LOG(m_logger) << "trying to send SnapshotCreateRequest";
if (!m_ftc->snapshotModifyRequest(data, this))
@@ -278,15 +278,15 @@ void MrkTests::tryModifySnapshot()
m_eTestStep = eModify;
Snapshot data;
data.id(m_snapshotId);
data.name("Snapshot modify");
data.description("Dies ist ein Test modify");
data.planOverlay("Plan Overlay updated");
data.id = m_snapshotId;
data.name = "Snapshot modify";
data.description = "Dies ist ein Test modify";
data.planOverlay = "Plan Overlay updated";
INFO_LOG(m_logger) << "trying to send SnapshotModifyRequest for snapshotId:" << data.id();
INFO_LOG(m_logger) << "trying to send SnapshotModifyRequest for snapshotId:" << data.id;
if (!m_ftc->snapshotModifyRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting modify data for snapshotId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting modify data for snapshotId:" << data.id;
failExit();
}
} // end of tryModifySnapshot()
@@ -297,12 +297,12 @@ void MrkTests::tryRemoveSnapshot()
m_eTestStep = eRemove;
SnapshotRemoveRequest data;
data.id(m_snapshotId);
data.id = m_snapshotId;
INFO_LOG(m_logger) << "trying to send remove request for snapshotId:" << data.id();
INFO_LOG(m_logger) << "trying to send remove request for snapshotId:" << data.id;
if (!m_ftc->snapshotRemoveRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting remove data for snapshotId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting remove data for snapshotId:" << data.id;
failExit();
}
} // end of tryRemoveSnapshot()
@@ -468,15 +468,15 @@ void MrkTests::onReceiveMarkerChanged(const Marker &data, DataModification modTy
switch (modType)
{
case DataModification::eAdded:
INFO_LOG(m_logger) << "*** Marker added received. markerId:" << data.id();
INFO_LOG(m_logger) << "*** Marker added received. markerId:" << data.id;
break;
case DataModification::eModified:
INFO_LOG(m_logger) << "*** Marker modified received. markerId:" << data.id();
INFO_LOG(m_logger) << "*** Marker modified received. markerId:" << data.id;
break;
case DataModification::eRemoved:
INFO_LOG(m_logger) << "*** Marker removed received. markerId:" << data.id();
INFO_LOG(m_logger) << "*** Marker removed received. markerId:" << data.id;
break;
}
@@ -489,10 +489,10 @@ void MrkTests::getMarkerCreateRequestData(MarkerModifyRequest &data)
if (m_testId == 0)
currentTime = currentTime / 10;
data.note("TestMarkerCreate");
data.operatorId(100);
data.timeStamp(currentTime);
data.timeStampOffset(33000);
data.note = "TestMarkerCreate";
data.operatorId = 100;
data.timeStamp = currentTime;
data.timeStampOffset = 33000;
getMarkerDescriptionCreateRequestData(data);
@@ -502,15 +502,15 @@ void MrkTests::getMarkerCreateRequestData(MarkerModifyRequest &data)
void MrkTests::getMarkerDescriptionCreateRequestData(MarkerModifyRequest &data)
{
// Info: FK fuer markerId wird in object_marker gesetzt.
data.descriptions().resize(3);
data.descriptions()[0].markerType(MarkerManagement::MarkerType::Audio);
data.descriptions()[0].content("Audio07, Audio08*, Audio09");
data.descriptions.resize(3);
data.descriptions[0].markerType = MarkerManagement::MarkerType::Audio;
data.descriptions[0].content("Audio07, Audio08*, Audio09");
data.descriptions()[1].markerType(MarkerManagement::MarkerType::Video);
data.descriptions()[1].content("cam07, cam08, cam09*");
data.descriptions[1].markerType = MarkerManagement::MarkerType::Video;
data.descriptions[1].content("cam07, cam08, cam09*");
data.descriptions()[2].markerType(MarkerManagement::MarkerType::Video);
data.descriptions()[2].content("cam06, cam07, cam08, cam09*");
data.descriptions[2].markerType = MarkerManagement::MarkerType::Video;
data.descriptions[2].content("cam06, cam07, cam08, cam09*");
} // end of getMarkerDescriptionCreateRequestData()
//-----------------------------------------------------------------------------
@@ -520,22 +520,22 @@ void MrkTests::getMarkerModifyRequestData(MarkerModifyRequest &data)
if (m_testId == 0)
currentTime = currentTime / 10;
data.id(m_markerId);
data.note("TestMarkerModify");
data.operatorId(100);
data.timeStamp(currentTime * 1000);
data.timeStampOffset(77 * 1000);
data.id = m_markerId;
data.note = "TestMarkerModify";
data.operatorId = 100;
data.timeStamp = currentTime * 1000;
data.timeStampOffset = 77 * 1000;
getMarkerDescriptionCreateRequestData(data);
for (auto &desc : data.descriptions())
desc.content(std::string("+++MOD+++") + desc.content());
for (auto &desc : data.descriptions)
desc.content = std::string("+++MOD+++") + desc.content;
} // end of getMarkerModifyRequestData()
//-----------------------------------------------------------------------------
bool MrkTests::onCompareCreatedData(Marker &data)
{
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id;
// Vergleicht die zurueckgelesen Datan mit den statischen create Daten
@@ -543,21 +543,21 @@ bool MrkTests::onCompareCreatedData(Marker &data)
getMarkerCreateRequestData(createData);
if (createData.note() != data.note())
if (createData.note != data.note)
return false;
if (createData.operatorId() != data.operatorId())
if (createData.operatorId != data.operatorId)
return false;
if (createData.timeStamp() != data.timeStamp())
if (createData.timeStamp != data.timeStamp)
return false;
if (createData.timeStampOffset() != data.timeStampOffset())
if (createData.timeStampOffset != data.timeStampOffset)
return false;
// Descriptions vergleichen
if (createData.descriptions().size() != data.descriptions().size())
if (createData.descriptions.size() != data.descriptions.size())
{
ERROR_LOG(m_logger) << "Error onCompareCreatedData() different number of description data.";
failExit();
@@ -565,20 +565,20 @@ bool MrkTests::onCompareCreatedData(Marker &data)
}
int foundCount = 0;
for (const auto &expected : createData.descriptions())
for (const auto &expected : createData.descriptions)
{
for (const auto &got : data.descriptions())
for (const auto &got : data.descriptions)
{
// we've got one description per type
if (got.markerType() != expected.markerType())
if (got.markerType != expected.markerType)
continue;
++foundCount;
if (got.content() != expected.content())
if (got.content != expected.content)
{
ERROR_LOG(m_logger) << "Content for description does not match: "
<< got.content() << " - "
<< expected.content();
<< got.content << " - "
<< expected.content;
failExit();
return false;
}
@@ -591,7 +591,7 @@ bool MrkTests::onCompareCreatedData(Marker &data)
return false;
}
DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id;
return true;
} // end of onCompareCreatedData()
@@ -599,43 +599,43 @@ bool MrkTests::onCompareCreatedData(Marker &data)
//-----------------------------------------------------------------------------
bool MrkTests::onCompareModifiedData(Marker &data)
{
DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id;
MarkerModifyRequest modifyData;
getMarkerModifyRequestData(modifyData);
if (modifyData.id() != data.id())
if (modifyData.id != data.id)
return false;
if (modifyData.note() != data.note())
if (modifyData.note != data.note)
return false;
if (modifyData.operatorId() != data.operatorId())
if (modifyData.operatorId != data.operatorId)
return false;
if (modifyData.timeStamp() != data.timeStamp())
if (modifyData.timeStamp != data.timeStamp)
return false;
if (modifyData.timeStampOffset() != data.timeStampOffset())
if (modifyData.timeStampOffset != data.timeStampOffset)
return false;
// Alle Descriptions zu dieser MarkerId holen ...
int foundCount = 0;
for (const auto &expected : modifyData.descriptions())
for (const auto &expected : modifyData.descriptions)
{
for (const auto &got : data.descriptions())
for (const auto &got : data.descriptions)
{
// we've got one description per type
if (got.markerType() != expected.markerType())
if (got.markerType != expected.markerType)
continue;
++foundCount;
if (got.content() != expected.content())
if (got.content != expected.content)
{
ERROR_LOG(m_logger) << "Content for description does not match: "
<< got.content() << " - "
<< expected.content();
<< got.content << " - "
<< expected.content;
failExit();
return false;
}
@@ -648,7 +648,7 @@ bool MrkTests::onCompareModifiedData(Marker &data)
return false;
}
DEBUG_LOG(m_logger) << "successfull finished onCompareModifiedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "successfull finished onCompareModifiedData() for id :" << data.id;
return true;
} // end of onCompareModifiedData()