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
+14
-14
@@ -108,17 +108,17 @@ bool Participant::setPosition(const TrainingAreaBase::EquipmentPosition &newPosi
|
||||
m_mutex.unlock();
|
||||
|
||||
// When a participant can have mounted participants, then there is always mountedParticipants set, can be empty
|
||||
if (newPosition.mountedParticipants().is_set())
|
||||
if (newPosition.mountedParticipants.is_set())
|
||||
{
|
||||
// list of new mounted participants
|
||||
std::vector<int32_t> newMountedParticipantIds;
|
||||
// list of already mounted participants
|
||||
std::vector<int32_t> currentMountedParticipantIds;
|
||||
if (m_positionPublished.mountedParticipants().is_set())
|
||||
currentMountedParticipantIds = m_positionPublished.mountedParticipants().get();
|
||||
if (m_positionPublished.mountedParticipants.is_set())
|
||||
currentMountedParticipantIds = m_positionPublished.mountedParticipants.get();
|
||||
|
||||
// set new position for all mounted participants
|
||||
for (const auto mountedEqId : newPosition.mountedParticipants().get())
|
||||
for (const auto mountedEqId : newPosition.mountedParticipants.get())
|
||||
{
|
||||
Participant *mountedParticipant = particpantHandler()->participantByEquipmentNumber(mountedEqId);
|
||||
|
||||
@@ -196,7 +196,7 @@ bool Participant::setPosition(const TrainingAreaBase::EquipmentPosition &newPosi
|
||||
|
||||
// set position if (new mounted position) or (unmounting and participant is still mounted)
|
||||
if ((mountedToId > 0) ||
|
||||
(mountedToId <= 0 && m_positionPublished.mountedOn().is_set()))
|
||||
(mountedToId <= 0 && m_positionPublished.mountedOn.is_set()))
|
||||
setPosition(mountedPosition);
|
||||
|
||||
m_positionToPublish.reportingSource(newPosition.position().reportingSource());
|
||||
@@ -802,17 +802,17 @@ bool Participant::hasToBeChanged(const ParticipantManagement::ParticipantBase &d
|
||||
|
||||
int newEquipmentNumber = 0;
|
||||
// don't know why this is needed though
|
||||
if (m_participantData.equipmentNumber().is_set())
|
||||
newEquipmentNumber = m_participantData.equipmentNumber().get();
|
||||
if (m_participantData.equipmentNumber.is_set())
|
||||
newEquipmentNumber = m_participantData.equipmentNumber.get();
|
||||
|
||||
if (data.equipmentNumber().is_set() && m_participantData.equipmentNumber() != data.equipmentNumber())
|
||||
if (data.equipmentNumber.is_set() && m_participantData.equipmentNumber() != data.equipmentNumber())
|
||||
{
|
||||
newEquipmentNumber = data.equipmentNumber().get();
|
||||
newEquipmentNumber = data.equipmentNumber.get();
|
||||
hasChanges = true;
|
||||
}
|
||||
|
||||
// = Reserved for excon
|
||||
if (!data.equipmentNumber().is_set() &&
|
||||
if (!data.equipmentNumber.is_set() &&
|
||||
assignState == ParticipantManagement::ParticipantAssignState::HandoutExcon)
|
||||
{
|
||||
newEquipmentNumber = 0;
|
||||
@@ -836,7 +836,7 @@ bool Participant::hasToBeChanged(const ParticipantManagement::ParticipantBase &d
|
||||
if (curData.typeId() != data.typeId())
|
||||
m_bPublishPosition = !m_participantHandler->isUnitType(data.typeId());
|
||||
|
||||
const int oldEquipNo = curData.equipmentNumber().is_set() ? curData.equipmentNumber().get() : 0;
|
||||
const int oldEquipNo = curData.equipmentNumber.is_set() ? curData.equipmentNumber.get() : 0;
|
||||
|
||||
curData = data;
|
||||
|
||||
@@ -882,12 +882,12 @@ bool Participant::setOperationalState(const TrainingAreaBase::EquipmentOperation
|
||||
bool bRet = false;
|
||||
if (operationalState.isManipulation().is_set())
|
||||
{
|
||||
if (operationalState.equipmentFunctionId().is_set() &&
|
||||
if (operationalState.equipmentFunctionId.is_set() &&
|
||||
operationalState.isManipulation().get() &&
|
||||
operationalState.sampleTime() > m_lastManipulationReset) // add if there is a new manipulation which is not outdated
|
||||
{
|
||||
removeManipulation(operationalState.equipmentFunctionId().get()); // precautionary
|
||||
m_dynamicData.manipulation().emplace_back(operationalState.equipmentFunctionId().get(),
|
||||
removeManipulation(operationalState.equipmentFunctionId.get()); // precautionary
|
||||
m_dynamicData.manipulation().emplace_back(operationalState.equipmentFunctionId.get(),
|
||||
operationalState.sampleTime());
|
||||
bRet = true;
|
||||
}
|
||||
|
||||
+1
-1
@@ -39,7 +39,7 @@ public:
|
||||
int32_t typeId() const { return m_participantData.typeId(); }
|
||||
int32_t superiorId() const { return m_participantData.superiorId(); }
|
||||
// return optional?
|
||||
int32_t equipmentNumber() const { return m_participantData.equipmentNumber().is_set() ? m_participantData.equipmentNumber().get() : 0; }
|
||||
int32_t equipmentNumber() const { return m_participantData.equipmentNumber.is_set() ? m_participantData.equipmentNumber.get() : 0; }
|
||||
int32_t partyId() const { return m_participantData.partyId(); }
|
||||
bool isDeleted() const { return m_participantData.isDeleted(); }
|
||||
ParticipantAssignState assignState() const { return m_participantData.assignState(); }
|
||||
|
||||
+4
-4
@@ -174,9 +174,9 @@ void ParticipantHandler::onNewStateFromProxy(const TrainingAreaBase::EquipmentSt
|
||||
TrainingAreaBase::EquipmentPosition pos;
|
||||
pos.equipmentNumber(data.equipmentNumber());
|
||||
pos.sampleTime(data.sampleTime());
|
||||
if (data.position().is_set())
|
||||
if (data.position.is_set())
|
||||
{
|
||||
pos.position(data.position().get());
|
||||
pos.position(data.position.get());
|
||||
onNewPositionFromProxy(pos);
|
||||
}
|
||||
|
||||
@@ -394,9 +394,9 @@ void ParticipantHandler::onNewSpecialSensorData(const TrainingAreaBase::SpecialS
|
||||
TrainingAreaBase::EquipmentPosition pos;
|
||||
pos.equipmentNumber(data.equipmentNumber());
|
||||
pos.sampleTime(data.sampleTime());
|
||||
if (data.position().is_set())
|
||||
if (data.position.is_set())
|
||||
{
|
||||
Core::GeoPosition geoPos(data.position().get().lon(), data.position().get().lat(), 0);
|
||||
Core::GeoPosition geoPos(data.position.get().lon(), data.position.get().lat(), 0);
|
||||
pos.position().position(geoPos);
|
||||
if (participant->setPosition(pos))
|
||||
participant->publishPosition();
|
||||
|
||||
+10
-10
@@ -53,8 +53,8 @@ static inline Database::PpmParticipant toDbParticipant(const ParticipantData &cu
|
||||
newDbParticipant.isDeleted = currentData.isDeleted();
|
||||
newDbParticipant.isSimulated = currentData.isSimulated();
|
||||
newDbParticipant.assignState = currentData.assignState();
|
||||
if (currentData.equipmentNumber().is_set())
|
||||
newDbParticipant.equipmentNumber = currentData.equipmentNumber().get();
|
||||
if (currentData.equipmentNumber.is_set())
|
||||
newDbParticipant.equipmentNumber = currentData.equipmentNumber.get();
|
||||
newDbParticipant.hierarchyNumber = currentData.hierarchyNumber();
|
||||
newDbParticipant.properties = QString::fromStdString(currentData.properties());
|
||||
|
||||
@@ -677,9 +677,9 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::modifyParticipantDataRe
|
||||
m_participantOrganisations.erase(it);
|
||||
}
|
||||
}
|
||||
if (request.participantOrganisation().is_set())
|
||||
if (request.participantOrganisation.is_set())
|
||||
{
|
||||
const ParticipantOrganisation &newOrga = request.participantOrganisation().get();
|
||||
const ParticipantOrganisation &newOrga = request.participantOrganisation.get();
|
||||
auto it = m_participantOrganisations.find(newOrga.participantId());
|
||||
|
||||
const int originPartyId = (it == m_participantOrganisations.end() ? -1 : it.value().originPartyId());
|
||||
@@ -1446,8 +1446,8 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::validateParticipantData
|
||||
// assign state valid?
|
||||
DEBUG_LOG(m_logger) << "checking assign state";
|
||||
int32_t equipmentNumber = 0;
|
||||
if (participantToValidate.equipmentNumber().is_set())
|
||||
equipmentNumber = participantToValidate.equipmentNumber().get();
|
||||
if (participantToValidate.equipmentNumber.is_set())
|
||||
equipmentNumber = participantToValidate.equipmentNumber.get();
|
||||
|
||||
bool isAssignStateValid = existingParticipant->isNewAssignStateValid(participantToValidate.assignState(), equipmentNumber);
|
||||
if (!isAssignStateValid)
|
||||
@@ -1485,13 +1485,13 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::validateParticipantData
|
||||
DEBUG_LOG(m_logger) << "... ok";
|
||||
|
||||
// new participant
|
||||
if (participantToValidate.equipmentNumber().is_set())
|
||||
if (participantToValidate.equipmentNumber.is_set())
|
||||
{
|
||||
if (participantToValidate.assignState() != ParticipantAssignState::HandoutExcon)
|
||||
|
||||
return Core::FunctionReplyObject(participantToValidate.modId(),
|
||||
tr_lts("dds", "Got a new participant with an equipment number (%1) but assign state is not HandoutExcon"))
|
||||
.arg(participantToValidate.equipmentNumber().get());
|
||||
.arg(participantToValidate.equipmentNumber.get());
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1583,9 +1583,9 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::validateParticipantData
|
||||
|
||||
DEBUG_LOG(m_logger) << "... ok";
|
||||
|
||||
if (participantToValidate.equipmentNumber().is_set())
|
||||
if (participantToValidate.equipmentNumber.is_set())
|
||||
{
|
||||
const int equipNo = participantToValidate.equipmentNumber().get();
|
||||
const int equipNo = participantToValidate.equipmentNumber.get();
|
||||
const int participantId = participantToValidate.id();
|
||||
DEBUG_LOG(m_logger) << "Check if equipment number is globally unique " << equipNo;
|
||||
int partIdLookup = m_equipNumber2ParticipantId.value(equipNo);
|
||||
|
||||
Reference in new issue
Block a user