Migrates remaining services and plugins to generated rtiddsgen API

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

No files matched your search

@@ -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()
@@ -83,9 +83,9 @@ void HandlerComment::createDefaultSchema()
rti::core::SampleIdentity cookie;
EvlSchemaModifyRequest request;
request.id(0);
request.schemadata() = Evaluations::Settings::defaultSchema().toStdString();
request.sendToTa(false);
request.id = 0;
request.schemadata = Evaluations::Settings::defaultSchema().toStdString();
request.sendToTa = false;
onEvlSchemaModifyRequest(cookie, request);
}
@@ -94,21 +94,21 @@ void HandlerComment::onEvlCommentModifyRequest(const rti::core::SampleIdentity &
const EvlCommentModifyRequest &request)
{
Database::EvlComment data;
data.id = request.id();
data.ts = QDateTime::fromMSecsSinceEpoch(request.ts());
data.senderOperatorId = request.senderOperatorId();
data.id = request.id;
data.ts = QDateTime::fromMSecsSinceEpoch(request.ts);
data.senderOperatorId = request.senderOperatorId;
if (request.receiverOperatorId().is_set())
data.receiverOperatorId = request.receiverOperatorId().get();
if (request.receiverOperatorId.is_set())
data.receiverOperatorId = request.receiverOperatorId.get();
data.text = QString::fromStdString(request.text());
data.hierarchy = QString::fromStdString(request.hierarchy());
data.schemaId = request.schemaId();
data.elementId = request.elementId();
data.text = QString::fromStdString(request.text);
data.hierarchy = QString::fromStdString(request.hierarchy);
data.schemaId = request.schemaId;
data.elementId = request.elementId;
Core::FunctionReplyObject ret;
if (request.id() <= 0)
if (request.id <= 0)
{
ObjectComment *ifs(new ObjectComment(m_ddsHandler, m_db));
ret = ifs->createObject(data);
@@ -124,7 +124,7 @@ void HandlerComment::onEvlCommentModifyRequest(const rti::core::SampleIdentity &
}
else
{
data.id = request.id();
data.id = request.id;
ObjectComment *ifs = m_mapObjectComment.value(data.id);
ret = ifs->updateObject(data);
}
@@ -137,12 +137,12 @@ void HandlerComment::onEvlSchemaModifyRequest(const rti::core::SampleIdentity &c
const EvlSchemaModifyRequest &request)
{
Database::EvlSchema data;
data.id = request.id();
data.schemadata = QString::fromStdString(request.schemadata());
data.sendToTa = request.sendToTa();
data.id = request.id;
data.schemadata = QString::fromStdString(request.schemadata);
data.sendToTa = request.sendToTa;
Core::FunctionReplyObject ret;
if (request.id() <= 0 && !m_mapObjectSchema.contains(std::abs(request.id())))
if (request.id <= 0 && !m_mapObjectSchema.contains(std::abs(request.id)))
{
ObjectSchema *ifs(new ObjectSchema(m_ddsHandler, m_db));
ret = ifs->createObject(data);
@@ -84,12 +84,12 @@ void HandlerCriterium::onEvlCriteriumModifyRequest(const rti::core::SampleIdenti
const EvlCriteriumModifyRequest &request)
{
Database::EvlCriterium data;
data.name = QString::fromStdString(request.name());
data.description = QString::fromStdString(request.description());
data.operatorId = request.operatorId();
data.name = QString::fromStdString(request.name);
data.description = QString::fromStdString(request.description);
data.operatorId = request.operatorId;
Core::FunctionReplyObject ret;
if (request.id() <= 0)
if (request.id <= 0)
{
ObjectCriterium *ifs = new ObjectCriterium(m_ddsHandler, m_db);
ret = ifs->createObject(data);
@@ -105,7 +105,7 @@ void HandlerCriterium::onEvlCriteriumModifyRequest(const rti::core::SampleIdenti
}
else
{
data.id = request.id();
data.id = request.id;
ObjectCriterium *ifs = m_criteriumObjMap.value(data.id);
ret = ifs->updateObject(data);
}
@@ -118,11 +118,11 @@ void HandlerCriterium::onEvlCriteriumRemoveRequest(const rti::core::SampleIdenti
{
DEBUG_LOG(m_logger) << "onEvlCriteriumRemoveRequest: " << request;
ObjectCriterium *ifs = m_criteriumObjMap.value(request.id());
ObjectCriterium *ifs = m_criteriumObjMap.value(request.id);
Core::FunctionReplyObject ret;
if (!ifs)
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "No EvlCriterium with id %1 found")).arg(request.id());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "No EvlCriterium with id %1 found")).arg(request.id);
m_ddsHandler->fts()->evlCriteriumRemoveReply(cookie, ret);
return;
}
@@ -134,31 +134,31 @@ void HandlerCriterium::onEvlCriteriumRemoveRequest(const rti::core::SampleIdenti
void HandlerCriterium::onEvlElementModifyRequest(const rti::core::SampleIdentity &cookie,
const EvlElementModifyRequest &request)
{
ObjectCriterium *ifs = m_criteriumObjMap.value(request.criteriumId());
ObjectCriterium *ifs = m_criteriumObjMap.value(request.criteriumId);
Core::FunctionReplyObject ret;
if (!ifs)
{
ret = Core::FunctionReplyObject(request.criteriumId(), tr_lts("dds", "No EvlCriterium with id %1 found")).arg(request.criteriumId());
ret = Core::FunctionReplyObject(request.criteriumId, tr_lts("dds", "No EvlCriterium with id %1 found")).arg(request.criteriumId);
m_ddsHandler->fts()->evlElementModifyReply(cookie, ret);
return;
}
Database::EvlElement data;
data.criteriumId = request.criteriumId();
data.id = request.id();
data.duration = request.duration();
data.note = QString::fromStdString(request.note());
data.phaseId = request.phaseId();
data.rating = request.rating();
data.time = request.timestamp();
if (request.audioContent().is_set())
data.audioContent = QString::fromStdString(request.audioContent().get());
if (request.videoContent().is_set())
data.videoContent = QString::fromStdString(request.videoContent().get());
if (request.situationContent().is_set())
data.situationContent = QString::fromStdString(request.situationContent().get());
data.criteriumId = request.criteriumId;
data.id = request.id;
data.duration = request.duration;
data.note = QString::fromStdString(request.note);
data.phaseId = request.phaseId;
data.rating = request.rating;
data.time = request.timestamp;
if (request.audioContent.is_set())
data.audioContent = QString::fromStdString(request.audioContent.get());
if (request.videoContent.is_set())
data.videoContent = QString::fromStdString(request.videoContent.get());
if (request.situationContent.is_set())
data.situationContent = QString::fromStdString(request.situationContent.get());
if (data.id <= 0)
{
@@ -189,23 +189,23 @@ void HandlerCriterium::onEvlElementModifyRequest(const rti::core::SampleIdentity
void HandlerCriterium::onEvlElementRemoveRequest(const rti::core::SampleIdentity &cookie,
const EvlElementRemoveRequest &request)
{
ObjectCriterium *ifs = m_criteriumObjMap.value(request.criteriumId());
ObjectCriterium *ifs = m_criteriumObjMap.value(request.criteriumId);
Core::FunctionReplyObject ret;
if (!ifs)
{
ret = Core::FunctionReplyObject(request.criteriumId(), tr_lts("dds", "No EvlCriterium with id %1 found")).arg(request.criteriumId());
ret = Core::FunctionReplyObject(request.criteriumId, tr_lts("dds", "No EvlCriterium with id %1 found")).arg(request.criteriumId);
m_ddsHandler->fts()->evlElementModifyReply(cookie, ret);
return;
}
ObjectEvaluationElement *oee = ifs->getElement(request.id());
ObjectEvaluationElement *oee = ifs->getElement(request.id);
if (!oee)
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "No EvaluationElement with id %1 found")).arg(request.id());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "No EvaluationElement with id %1 found")).arg(request.id);
else
{
ret = oee->removeObject();
ifs->removeElement(request.id());
ifs->removeElement(request.id);
}
m_ddsHandler->fts()->evlElementRemoveReply(cookie, ret);
@@ -85,22 +85,22 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
const SanNineLinerModifyRequest &request)
{
Database::SanNineLiner data;
data.id = request.id();
data.lastModified = request.lastModified();
data.position = QPointF(request.line1_position().lon(), request.line1_position().lat());
data.id = request.id;
data.lastModified = request.lastModified;
data.position = QPointF(request.line1_position.lon, request.line1_position.lat);
LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(request.line1_position().lon(),
request.line1_position().lat()));
LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(request.line1_position.lon,
request.line1_position.lat));
data.positionXM = coord.x;
data.positionYM = coord.y;
data.radioFrequencySuffixCallsign = QString::fromStdString(request.line2_radioFrequencyCallSignSuffix());
data.radioFrequencySuffixCallsign = QString::fromStdString(request.line2_radioFrequencyCallSignSuffix);
INFO_LOG(m_logger) << "lines: " << request.lines();
INFO_LOG(m_logger) << "lines: " << request.lines;
Core::FunctionReplyObject ret;
Core::FunctionReplyObject ret;
ObjectSanNineLiner *ifs = nullptr;
if (request.id() <= 0)
if (request.id <= 0)
{
ifs = new ObjectSanNineLiner(m_ddsHandler, m_db);
ret = ifs->createObject(data);
@@ -119,7 +119,7 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
}
else
{
data.id = request.id();
data.id = request.id;
ifs = m_mapObjectSanNineLiner.value(data.id);
ret = ifs->updateObject(data);
}
@@ -139,7 +139,7 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
// line3 - line9 in object_san_category_line
INFO_LOG(m_logger) << "data.id: " << data.id;
QVector<Database::SanCategoryLine> linesCategory = SanCategoryLine::fromJson(request.lines(), data.id);
QVector<Database::SanCategoryLine> linesCategory = SanCategoryLine::fromJson(request.lines, data.id);
INFO_LOG(m_logger) << "LinesCategory count: " << linesCategory.count();
for (Database::SanCategoryLine cl : qAsConst(linesCategory))
@@ -165,22 +165,22 @@ void HandlerSanNineLiner::onSanNineLinerRemoveRequest(const rti::core::SampleIde
const Core::RemoveElementRequest &request)
{
ObjectSanNineLiner *ifs = m_mapObjectSanNineLiner.value(request.id());
ObjectSanNineLiner *ifs = m_mapObjectSanNineLiner.value(request.id);
Core::FunctionReplyObject ret;
if (!ifs)
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "SanNineLiner with id %1 not found")).arg(request.id());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "SanNineLiner with id %1 not found")).arg(request.id);
m_ddsHandler->fts()->sanNineLinerRemoveReply(cookie, ret);
return;
}
if (!m_db->removeCategoryLinesPerNineLiner(request.id()))
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "SanCategoryLine with id %1 not found")).arg(request.id());
if (!m_db->removeCategoryLinesPerNineLiner(request.id))
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "SanCategoryLine with id %1 not found")).arg(request.id);
else
{
ifs->removeObject();
m_mapObjectSanNineLiner.remove(request.id());
m_mapObjectSanNineLiner.remove(request.id);
}
m_ddsHandler->fts()->sanNineLinerRemoveReply(cookie, ret);
@@ -55,15 +55,15 @@ void ObjectComment::onPublishData()
{
Evaluations::EvaluationComment ddsData;
ddsData.id(m_data.id);
ddsData.ts(m_data.ts.toMSecsSinceEpoch());
ddsData.senderOperatorId(m_data.senderOperatorId);
ddsData.id = m_data.id;
ddsData.ts = m_data.ts.toMSecsSinceEpoch();
ddsData.senderOperatorId = m_data.senderOperatorId;
if (!m_data.receiverOperatorId.isNull())
ddsData.receiverOperatorId(m_data.receiverOperatorId.toUInt());
ddsData.text(m_data.text.toStdString());
ddsData.hierarchy(m_data.hierarchy.toStdString());
ddsData.schemaId(m_data.schemaId);
ddsData.elementId(m_data.elementId);
ddsData.receiverOperatorId = m_data.receiverOperatorId.toUInt();
ddsData.text = m_data.text.toStdString();
ddsData.hierarchy = m_data.hierarchy.toStdString();
ddsData.schemaId = m_data.schemaId;
ddsData.elementId = m_data.elementId;
INFO_LOG(m_logger) << "Publish EvlComment-data to dds (" << m_data.id << ") ...";
@@ -131,9 +131,9 @@ void ObjectSchema::onPublishData()
{
Evaluations::EvaluationSchema ddsData;
ddsData.id(m_data.id);
ddsData.schemadata(m_data.schemadata.toStdString());
ddsData.sendToTa(m_data.sendToTa);
ddsData.id = m_data.id;
ddsData.schemadata = m_data.schemadata.toStdString();
ddsData.sendToTa = m_data.sendToTa;
INFO_LOG(m_logger) << "Publish EvlSchema-data to dds (id = " << m_data.id << ", send to training area = " << m_data.sendToTa << ") ...";
@@ -68,10 +68,10 @@ void ObjectCriterium::onPublishData()
{
Evaluations::EvaluationCriterium ddsData;
ddsData.id(m_data.id);
ddsData.name(m_data.name.toStdString());
ddsData.description(m_data.description.toStdString());
ddsData.operatorId(m_data.operatorId);
ddsData.id = m_data.id;
ddsData.name = m_data.name.toStdString();
ddsData.description = m_data.description.toStdString();
ddsData.operatorId = m_data.operatorId;
INFO_LOG(m_logger) << "Publish EvlCriterium-data to dds (" << m_data.id << ") ...";
@@ -58,23 +58,23 @@ void ObjectEvaluationElement::onPublishData()
{
Evaluations::EvaluationElement ddsData;
ddsData.id(m_data.id);
ddsData.criteriumId(m_data.criteriumId);
ddsData.phaseId(m_data.phaseId);
ddsData.duration(m_data.duration);
ddsData.situation(!m_data.situationContent.isNull());
ddsData.video(!m_data.videoContent.isNull());
ddsData.audio(!m_data.audioContent.isNull());
ddsData.note(m_data.note.toStdString());
ddsData.rating(m_data.rating);
ddsData.timestamp(m_data.time);
ddsData.id = m_data.id;
ddsData.criteriumId = m_data.criteriumId;
ddsData.phaseId = m_data.phaseId;
ddsData.duration = m_data.duration;
ddsData.situation = !m_data.situationContent.isNull();
ddsData.video = !m_data.videoContent.isNull();
ddsData.audio = !m_data.audioContent.isNull();
ddsData.note = m_data.note.toStdString();
ddsData.rating = m_data.rating;
ddsData.timestamp = m_data.time;
if (!m_data.audioContent.isNull())
ddsData.audioContent(m_data.audioContent.toString().toStdString());
ddsData.audioContent = m_data.audioContent.toString().toStdString();
if (!m_data.videoContent.isNull())
ddsData.videoContent(m_data.videoContent.toString().toStdString());
ddsData.videoContent = m_data.videoContent.toString().toStdString();
if (!m_data.situationContent.isNull())
ddsData.situationContent(m_data.situationContent.toString().toStdString());
ddsData.situationContent = m_data.situationContent.toString().toStdString();
INFO_LOG(m_logger) << "Publish EvlElement-data to dds (" << m_data.id << ") ...";
@@ -69,15 +69,15 @@ void ObjectSanNineLiner::onPublishData()
{
Evaluations::SanNineLiner ddsData;
ddsData.id(m_data.id);
ddsData.lastModified(m_data.lastModified);
ddsData.line1_position(Core::GeoPosition2D(m_data.position.x(), m_data.position.y()));
ddsData.line2_RadioFrequencyCallSignSuffix(m_data.radioFrequencySuffixCallsign.toStdString());
ddsData.id = m_data.id;
ddsData.lastModified = m_data.lastModified;
ddsData.line1_position = Core::GeoPosition2D(m_data.position.x(), m_data.position.y());
ddsData.line2_RadioFrequencyCallSignSuffix = m_data.radioFrequencySuffixCallsign.toStdString();
QJsonDocument doc = SanCategoryLine::toJson(m_lines);
ddsData.lines(QString::fromUtf8(doc.toJson(QJsonDocument::Compact)).toStdString());
ddsData.lines = QString::fromUtf8(doc.toJson(QJsonDocument::Compact)).toStdString();
INFO_LOG(m_logger) << "Publish SanNineLiner-data to dds (" << m_data.id << ") other lines: " << ddsData.lines();
INFO_LOG(m_logger) << "Publish SanNineLiner-data to dds (" << m_data.id << ") other lines: " << ddsData.lines;
if (!m_ddsHandler->dts()->publish(ddsData))
ERROR_LOG(m_logger) << "Error publishing SanNineLiner-data to dds";