Migrates Participant and OperatorManagement to generated rtiddsgen API
Converts accessor calls to plain member access in ppm and opm services and plugins.
This commit is contained in:
36 files changed
+513
-529
No files matched your search
+21
-21
@@ -307,12 +307,12 @@ void ObjectOperator::onPublishData()
|
||||
{
|
||||
OperatorManagement::User op;
|
||||
|
||||
op.id(m_data.id);
|
||||
op.name(m_data.name.toStdString());
|
||||
op.description(m_data.description.toStdString());
|
||||
op.primaryGroupId(m_data.primaryGroupId);
|
||||
op.rolePresetId(m_data.rolePresetId);
|
||||
op.effectiveAcls() = LtsUtils::convert<std::vector<int32_t>>(m_effectiveAcls);
|
||||
op.id = m_data.id;
|
||||
op.name = m_data.name.toStdString();
|
||||
op.description = m_data.description.toStdString();
|
||||
op.primaryGroupId = m_data.primaryGroupId;
|
||||
op.rolePresetId = m_data.rolePresetId;
|
||||
op.effectiveAcls = LtsUtils::convert<std::vector<int32_t>>(m_effectiveAcls);
|
||||
|
||||
auto vpbe = toDdsData(m_dataExercise);
|
||||
// Append Visible Parties Template (= exId == 0)
|
||||
@@ -325,16 +325,16 @@ void ObjectOperator::onPublishData()
|
||||
|
||||
vpbe.push_back(OperatorManagement::PartiesByExercise(0, m_data.visibleParties(), std::vector<int>(),
|
||||
adlerAllowedDocument.toJson(QJsonDocument::Compact).toStdString()));
|
||||
op.visiblePartiesByExercise(vpbe);
|
||||
op.visiblePartiesByExercise = vpbe;
|
||||
|
||||
op.exerciseIds(m_exercises);
|
||||
op.image() = LtsUtils::convert<std::vector<uint8_t>>(m_data.image);
|
||||
op.workstationIp(m_data.workstationIp);
|
||||
op.workstationId(m_data.workstationId.toInt());
|
||||
op.projectionPriority(m_data.projectionPriority);
|
||||
op.audioChannelPriority(m_data.audioChannelPriority);
|
||||
op.rolePresetId(m_data.rolePresetId);
|
||||
op.properties(m_data.properties.toStdString());
|
||||
op.exerciseIds = m_exercises;
|
||||
op.image = LtsUtils::convert<std::vector<uint8_t>>(m_data.image);
|
||||
op.workstationIp = m_data.workstationIp;
|
||||
op.workstationId = m_data.workstationId.toInt();
|
||||
op.projectionPriority = m_data.projectionPriority;
|
||||
op.audioChannelPriority = m_data.audioChannelPriority;
|
||||
op.rolePresetId = m_data.rolePresetId;
|
||||
op.properties = m_data.properties.toStdString();
|
||||
|
||||
INFO_LOG(m_logger) << "Publish OpmOperator-data to dds (" << m_data.id
|
||||
<< " rolePresetId =" << m_data.rolePresetId
|
||||
@@ -351,22 +351,22 @@ std::vector<OperatorManagement::PartiesByExercise> ObjectOperator::toDdsData(con
|
||||
for (const Database::OpmOperatorExercise &ooe : dbData)
|
||||
{
|
||||
PartiesByExercise pbe;
|
||||
pbe.exerciseId(ooe.exerciseId);
|
||||
pbe.visibleParties();
|
||||
pbe.hiddenParties();
|
||||
pbe.exerciseId = ooe.exerciseId;
|
||||
pbe.visibleParties;
|
||||
pbe.hiddenParties;
|
||||
std::vector<int> visibleParty;
|
||||
for (const auto &elem : ooe.visibleParties())
|
||||
{
|
||||
visibleParty.push_back(elem);
|
||||
}
|
||||
pbe.visibleParties().set(visibleParty);
|
||||
pbe.visibleParties.set(visibleParty);
|
||||
std::vector<int> hiddenParty;
|
||||
for (const auto &elem : ooe.hiddenParties())
|
||||
{
|
||||
hiddenParty.push_back(elem);
|
||||
}
|
||||
pbe.hiddenParties().set(hiddenParty);
|
||||
pbe.properties(ooe.properties.toStdString());
|
||||
pbe.hiddenParties.set(hiddenParty);
|
||||
pbe.properties = ooe.properties.toStdString();
|
||||
ddsData.push_back(pbe);
|
||||
}
|
||||
return ddsData;
|
||||
|
||||
Reference in new issue
Block a user