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/Evaluations/ModuleTests/evl_tests.cpp
+81 -81
View File
@@ -132,10 +132,10 @@ void EvlTests::tryCreateCriterium()
m_eTestStep = eCreateCriterium;
EvlCriteriumModifyRequest data;
data.id(0); // id = 0 -> Create request
data.name("Test Criterium");
data.description("Test description");
data.operatorId(m_operatorId);
data.id = 0; // id = 0 -> Create request
data.name = "Test Criterium";
data.description = "Test description";
data.operatorId = m_operatorId;
INFO_LOG(m_logger) << "trying to send EvlCriteriumModifyRequest";
if (!m_ftc->evlCriteriumModifyRequest(data, this))
@@ -152,15 +152,15 @@ void EvlTests::tryModifyCriterium()
m_eTestStep = eModifyCriterium;
EvlCriteriumModifyRequest data;
data.id(m_criteriumId);
data.name("Name criterium modified");
data.description("Description modified");
data.operatorId(m_operatorId);
data.id = m_criteriumId;
data.name = "Name criterium modified";
data.description = "Description modified";
data.operatorId = m_operatorId;
INFO_LOG(m_logger) << "trying to send EvlCriteriumModifyRequest for criteriumId:" << data.id();
INFO_LOG(m_logger) << "trying to send EvlCriteriumModifyRequest for criteriumId:" << data.id;
if (!m_ftc->evlCriteriumModifyRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting modify data for criteriumId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting modify data for criteriumId:" << data.id;
failExit();
}
QTest::qWait(1000);
@@ -172,12 +172,12 @@ void EvlTests::tryRemoveCriterium()
m_eTestStep = eRemoveCriterium;
EvlCriteriumRemoveRequest data;
data.id(m_criteriumId);
data.id = m_criteriumId;
INFO_LOG(m_logger) << "trying to send remove request for criteriumId:" << data.id();
INFO_LOG(m_logger) << "trying to send remove request for criteriumId:" << data.id;
if (!m_ftc->evlCriteriumRemoveRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting remove data for criteriumId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting remove data for criteriumId:" << data.id;
failExit();
}
QTest::qWait(1000);
@@ -193,11 +193,11 @@ void EvlTests::tryGetAllCriteria()
m_criteriumId = -1;
auto cb = [this] (const Evaluations::EvaluationCriterium &c)
{
m_criteriumId = c.id();
INFO_LOG(m_logger) << "Evl(" << c.id() << ") :"
<< " name:" << c.name()
<< " desc:" << c.description()
<< " operatorId:" << c.operatorId();
m_criteriumId = c.id;
INFO_LOG(m_logger) << "Evl(" << c.id << ") :"
<< " name:" << c.name
<< " desc:" << c.description
<< " operatorId:" << c.operatorId;
};
m_dtc->evaluationCriteriums(cb);
if (m_criteriumId == -1)
@@ -227,17 +227,17 @@ void EvlTests::tryGetCriterium()
m_dtc->waitForHistoricalDataEvaluationCriterium(5000);
Evaluations::EvaluationCriterium data = m_dtc->evaluationCriterium(m_criteriumId);
if (data.id() <= 0)
if (data.id <= 0)
{
ERROR_LOG(m_logger) << "Error receiving data for criteriumId " << m_criteriumId << " returnVal: " << data.id();
ERROR_LOG(m_logger) << "Error receiving data for criteriumId " << m_criteriumId << " returnVal: " << data.id;
failExit();
}
else
{
INFO_LOG(m_logger) << "Evl(" << data.id() << ") :"
<< " name:" << data.name()
<< " desc:" << data.description()
<< " operatorId:" << data.operatorId();
INFO_LOG(m_logger) << "Evl(" << data.id << ") :"
<< " name:" << data.name
<< " desc:" << data.description
<< " operatorId:" << data.operatorId;
}
if (m_testId == 0)
@@ -264,21 +264,21 @@ void EvlTests::tryCreateElement()
m_eTestStep = eCreateElement;
EvlElementModifyRequest data;
data.id(0);
data.criteriumId(m_criteriumId);
data.timestamp(QDateTime::currentMSecsSinceEpoch());
data.note("Test test test");
data.phaseId(1);
data.rating(10);
data.id = 0;
data.criteriumId = m_criteriumId;
data.timestamp = QDateTime::currentMSecsSinceEpoch();
data.note = "Test test test";
data.phaseId = 1;
data.rating = 10;
QJsonObject obj;
obj[QStringLiteral("actualStream")] = QJsonValue(QStringLiteral("av_0011"));
obj[QStringLiteral("allStreams")] = QJsonValue(QStringLiteral("av_0011, av_0012, av_0013"));
data.videoContent().set(QJsonDocument(obj).toJson().constData());
data.videoContent.set(QJsonDocument(obj).toJson().constData());
obj[QStringLiteral("actualStream")] = QJsonValue(QStringLiteral("vhf01"));
obj[QStringLiteral("allStreams")] = QJsonValue(QStringLiteral("vhf01, hf01, hf02, vhf03"));
data.audioContent().set(QJsonDocument(obj).toJson().constData());
data.audioContent.set(QJsonDocument(obj).toJson().constData());
INFO_LOG(m_logger) << "trying to send evlElementModifyRequest";
if (!m_ftc->evlElementModifyRequest(data, this))
@@ -295,26 +295,26 @@ void EvlTests::tryModifyElement()
m_eTestStep = eModifyElement;
EvlElementModifyRequest data;
data.id(m_elementId);
data.criteriumId(m_criteriumId);
data.timestamp(QDateTime::currentMSecsSinceEpoch());
data.note("Test1 test2 test3");
data.phaseId(2);
data.rating(5);
data.id = m_elementId;
data.criteriumId = m_criteriumId;
data.timestamp = QDateTime::currentMSecsSinceEpoch();
data.note = "Test1 test2 test3";
data.phaseId = 2;
data.rating = 5;
QJsonObject obj;
obj[QStringLiteral("actualStream")] = QJsonValue(QStringLiteral("av_0013"));
obj[QStringLiteral("allStreams")] = QJsonValue(QStringLiteral("av_0011, av_0012, av_0013"));
data.videoContent().set(QJsonDocument(obj).toJson().constData());
data.videoContent.set(QJsonDocument(obj).toJson().constData());
obj[QStringLiteral("actualStream")] = QJsonValue(QStringLiteral("hf01"));
obj[QStringLiteral("allStreams")] = QJsonValue(QStringLiteral("vhf01, hf01, hf02, vhf03"));
data.audioContent().set(QJsonDocument(obj).toJson().constData());
data.audioContent.set(QJsonDocument(obj).toJson().constData());
INFO_LOG(m_logger) << "trying to send evlElementModifyRequest for elementId:" << data.id();
INFO_LOG(m_logger) << "trying to send evlElementModifyRequest for elementId:" << data.id;
if (!m_ftc->evlElementModifyRequest(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();
}
QTest::qWait(1000);
@@ -326,13 +326,13 @@ void EvlTests::tryRemoveElement()
m_eTestStep = eRemoveElement;
EvlElementRemoveRequest data;
data.id(m_elementId);
data.criteriumId(m_criteriumId);
data.id = m_elementId;
data.criteriumId = m_criteriumId;
INFO_LOG(m_logger) << "trying to send remove request for elementId:" << data.id();
INFO_LOG(m_logger) << "trying to send remove request for elementId:" << data.id;
if (!m_ftc->evlElementRemoveRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting remove data for elementId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting remove data for elementId:" << data.id;
failExit();
}
QTest::qWait(1000);
@@ -344,8 +344,8 @@ void EvlTests::tryCreateSanNineLiner()
m_eTestStep = eCreateSanNineLiner;
SanNineLinerModifyRequest data;
data.id(0);
data.lastModified(QDateTime::currentMSecsSinceEpoch());
data.id = 0;
data.lastModified = QDateTime::currentMSecsSinceEpoch();
data.line1_position(Core::GeoPosition2D(0.100000, 0.2450000));
data.line2_radioFrequencyCallSignSuffix("32.00 FM, Troublemaker");
@@ -401,9 +401,9 @@ void EvlTests::tryCreateSanNineLiner()
vecCl.push_back(std::move(cl));
QJsonDocument doc = SanCategoryLine::toJson(vecCl);
data.lines(doc.toJson().toStdString());
data.lines = doc.toJson().toStdString();
INFO_LOG(m_logger) << "lines: " << data.lines();
INFO_LOG(m_logger) << "lines: " << data.lines;
INFO_LOG(m_logger) << "trying to send sanNineLinerRequest";
if (!m_ftc->sanNineLinerModifyRequest(data, this))
@@ -420,8 +420,8 @@ void EvlTests::tryModifySanNineLiner()
m_eTestStep = eModifySanNineLiner;
SanNineLinerModifyRequest data;
data.id(m_sanNineLinerId);
data.lastModified(QDateTime::currentMSecsSinceEpoch());
data.id = m_sanNineLinerId;
data.lastModified = QDateTime::currentMSecsSinceEpoch();
data.line1_position(Core::GeoPosition2D(0.200000, 0.4560000));
data.line2_radioFrequencyCallSignSuffix("39.000 FM, Troublemaker");
@@ -476,9 +476,9 @@ void EvlTests::tryModifySanNineLiner()
vecCl.push_back(std::move(cl));
QJsonDocument doc = SanCategoryLine::toJson(vecCl);
data.lines(doc.toJson().toStdString());
data.lines = doc.toJson().toStdString();
INFO_LOG(m_logger) << "lines: " << data.lines();
INFO_LOG(m_logger) << "lines: " << data.lines;
INFO_LOG(m_logger) << "trying to send sanNineLinerRequest";
if (!m_ftc->sanNineLinerModifyRequest(data, this))
@@ -495,12 +495,12 @@ void EvlTests::tryRemoveSanNineLiner()
m_eTestStep = eRemoveSanNineLiner;
EvlCriteriumRemoveRequest data;
data.id(m_sanNineLinerId);
data.id = m_sanNineLinerId;
INFO_LOG(m_logger) << "trying to send remove request for sanNineLinerId:" << data.id();
INFO_LOG(m_logger) << "trying to send remove request for sanNineLinerId:" << data.id;
if (!m_ftc->sanNineLinerRemoveRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting remove data for sanNineLinerId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting remove data for sanNineLinerId:" << data.id;
failExit();
}
QTest::qWait(1000);
@@ -525,19 +525,19 @@ void EvlTests::tryGetSanNineLiner()
m_dtc->waitForHistoricalDataSanNineLiner(5000);
Evaluations::SanNineLiner data = m_dtc->sanNineLiner(m_sanNineLinerId);
if (data.id() <= 0)
if (data.id <= 0)
{
ERROR_LOG(m_logger) << "Error receiving data for sanNineLiner " << m_sanNineLinerId << " returnVal: " << data.id();
ERROR_LOG(m_logger) << "Error receiving data for sanNineLiner " << m_sanNineLinerId << " returnVal: " << data.id;
failExit();
}
else
{
INFO_LOG(m_logger) << "SanNineLiner(" << data.id() << ") :"
<< " lastModified: " << data.lastModified()
<< " position lat: " << data.line1_position().lat()
<< " position lon: " << data.line1_position().lon()
<< " radiofreq, CallSign: " << data.line2_RadioFrequencyCallSignSuffix()
<< " lines: " << data.lines();
INFO_LOG(m_logger) << "SanNineLiner(" << data.id << ") :"
<< " lastModified: " << data.lastModified
<< " position lat: " << data.line1_position.lat
<< " position lon: " << data.line1_position.lon
<< " radiofreq, CallSign: " << data.line2_RadioFrequencyCallSignSuffix
<< " lines: " << data.lines;
}
@@ -696,21 +696,21 @@ void EvlTests::onSanNineLinerRemoveReply(const Core::FunctionReplyObject &replyO
//-----------------------------------------------------------------------------
void EvlTests::onReceiveCriteriumChanged(const EvaluationCriterium &data, DataModification modType)
{
INFO_LOG(m_logger) << "onReceiveCriteriumChanged() criteriumId:" << data.id()
INFO_LOG(m_logger) << "onReceiveCriteriumChanged() criteriumId:" << data.id
<< " modificationType: = " << (int)modType<< " received";
switch (modType)
{
case DataModification::eAdded:
INFO_LOG(m_logger) << "*** Criterium added received. criteriumId:" << data.id();
INFO_LOG(m_logger) << "*** Criterium added received. criteriumId:" << data.id;
break;
case DataModification::eModified:
INFO_LOG(m_logger) << "*** Criterium modified received. criteriumId:" << data.id();
INFO_LOG(m_logger) << "*** Criterium modified received. criteriumId:" << data.id;
break;
case DataModification::eRemoved:
INFO_LOG(m_logger) << "*** Criterium removed received. criteriumId:" << data.id();
INFO_LOG(m_logger) << "*** Criterium removed received. criteriumId:" << data.id;
break;
}
@@ -720,9 +720,9 @@ void EvlTests::onReceiveCriteriumChanged(const EvaluationCriterium &data, DataMo
//-----------------------------------------------------------------------------
void EvlTests::getCriteriumModifyRequestData(EvlCriteriumModifyRequest &data)
{
data.name("Name criterium modified");
data.description("Description modified");
data.operatorId(m_operatorId);
data.name = "Name criterium modified";
data.description = "Description modified";
data.operatorId = m_operatorId;
} // end of getCriteriumModifyRequestData()
@@ -737,7 +737,7 @@ void EvlTests::getSanNineLinerModifyRequestData(SanNineLinerModifyRequest &data)
//-----------------------------------------------------------------------------
bool EvlTests::onCompareCreatedData(EvaluationCriterium &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
@@ -745,17 +745,17 @@ bool EvlTests::onCompareCreatedData(EvaluationCriterium &data)
getCriteriumModifyRequestData(createData);
if (createData.name() != data.name())
if (createData.name != data.name)
return false;
if (createData.operatorId() != data.operatorId())
if (createData.operatorId != data.operatorId)
return false;
if (createData.description() != data.description())
if (createData.description != data.description)
return false;
DEBUG_LOG(m_logger) << "successfully finished onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "successfully finished onCompareCreatedData() for id :" << data.id;
return true;
} // end of onCompareCreatedData()
@@ -763,19 +763,19 @@ bool EvlTests::onCompareCreatedData(EvaluationCriterium &data)
//-----------------------------------------------------------------------------
bool EvlTests::onCompareCreatedData(SanNineLiner &data)
{
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id;
SanNineLinerModifyRequest createData;
getSanNineLinerModifyRequestData(createData);
if (createData.line1_position() != data.line1_position())
if (createData.line1_position != data.line1_position)
return false;
if (createData.line2_radioFrequencyCallSignSuffix() != data.line2_RadioFrequencyCallSignSuffix())
if (createData.line2_radioFrequencyCallSignSuffix != data.line2_RadioFrequencyCallSignSuffix)
return false;
DEBUG_LOG(m_logger) << "successfully finished onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "successfully finished onCompareCreatedData() for id :" << data.id;
return true;
} // end of onCompareCreatedData()