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
@@ -24,7 +24,9 @@ StateInformation youngestStateInformation(const std::vector<ParticipantManagemen
|
||||
qWarning() << "########## youngestStateInformation ##########";
|
||||
|
||||
ParticipantManagement::StateInformation ret;
|
||||
ret.vulnerabilityState(ProjectDataManagement::VulnerabilityState::NotReady);
|
||||
// rtiddsgen 7.7 generates plain public members (no setters) and prefixed
|
||||
// PDM enumerators (commit be912de9d resolved duplicate enumerators).
|
||||
ret.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady;
|
||||
|
||||
if (stateList.empty())
|
||||
{
|
||||
@@ -58,7 +60,7 @@ StateInformation youngestStateInformation(const std::vector<ParticipantManagemen
|
||||
std::sort(sortedStateList.begin(), sortedStateList.end(),
|
||||
[/*&debug,readyToDebug*/](const ParticipantManagement::StateInformation &left, const ParticipantManagement::StateInformation &right)
|
||||
{
|
||||
if (left.stateTime() == right.stateTime() && left.vulnerabilityState() != right.vulnerabilityState())
|
||||
if (left.stateTime == right.stateTime && left.vulnerabilityState != right.vulnerabilityState)
|
||||
{
|
||||
// if (readyToDebug)
|
||||
// debug = true;
|
||||
@@ -66,10 +68,10 @@ StateInformation youngestStateInformation(const std::vector<ParticipantManagemen
|
||||
// qWarning() << "WARNING: StateInformation with state" << (int)left.vulnerabilityState().underlying() << "has the same stateTime as StateInformation with state" << (int)right.vulnerabilityState().underlying();
|
||||
|
||||
// sort by state if time is the same (higher state = winner)
|
||||
return (left.vulnerabilityState() > right.vulnerabilityState());
|
||||
return (left.vulnerabilityState > right.vulnerabilityState);
|
||||
}
|
||||
|
||||
return (left.stateTime() > right.stateTime());
|
||||
return (left.stateTime > right.stateTime);
|
||||
});
|
||||
|
||||
|
||||
@@ -77,7 +79,7 @@ StateInformation youngestStateInformation(const std::vector<ParticipantManagemen
|
||||
{
|
||||
qWarning() << ">> printing all SIs";
|
||||
for (const ParticipantManagement::StateInformation &si : qAsConst(sortedStateList))
|
||||
qWarning() << ">>>> si" << "siVulnId" << (uint8_t)si.vulnerabilityState().underlying() << "bits" << si.vulnerabilityBits() << "time" << si.stateTime();
|
||||
qWarning() << ">>>> si" << "siVulnId" << (uint8_t)si.vulnerabilityState << "bits" << si.vulnerabilityBits << "time" << si.stateTime;
|
||||
|
||||
qWarning() << ">> checking SIs";
|
||||
}
|
||||
@@ -85,7 +87,7 @@ StateInformation youngestStateInformation(const std::vector<ParticipantManagemen
|
||||
|
||||
for (const ParticipantManagement::StateInformation &si : qAsConst(sortedStateList))
|
||||
{
|
||||
const uint8_t siVulnId = si.vulnerabilityState().underlying();
|
||||
const uint8_t siVulnId = static_cast<uint8_t>(si.vulnerabilityState);
|
||||
|
||||
if (debug)
|
||||
{
|
||||
@@ -94,14 +96,14 @@ StateInformation youngestStateInformation(const std::vector<ParticipantManagemen
|
||||
}
|
||||
|
||||
// we're only interested in 'visible' VBGs, don't care about near miss etc. here
|
||||
if (bSkipVbgGreaterCatastrophicKill && si.vulnerabilityState() > ProjectDataManagement::VulnerabilityState::CatastrophicKill)
|
||||
if (bSkipVbgGreaterCatastrophicKill && si.vulnerabilityState > ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
|
||||
{
|
||||
if (debug)
|
||||
qWarning() << ">>>> vulnId is higher than CK!";
|
||||
continue;
|
||||
}
|
||||
|
||||
if (bSkipSanitation && si.originatorType() == ProjectDataManagement::StateChangeOriginator::Sanitation)
|
||||
if (bSkipSanitation && si.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation)
|
||||
{
|
||||
if (debug)
|
||||
qWarning() << ">>>> is sanitation!";
|
||||
@@ -125,29 +127,29 @@ StateInformation youngestRealStateInformation(const std::vector<ParticipantManag
|
||||
if (stateList.size() == 0)
|
||||
{
|
||||
ParticipantManagement::StateInformation ret;
|
||||
ret.vulnerabilityState(ProjectDataManagement::VulnerabilityState::NotReady);
|
||||
ret.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady;
|
||||
return ret;
|
||||
}
|
||||
StateInformation youngestState = youngestStateInformation(stateList);
|
||||
size_t youngest = 0;
|
||||
for (size_t i = 1; i < stateList.size(); ++i)
|
||||
{
|
||||
const auto &tCurrent = stateList.at(i).stateTime();
|
||||
const auto &tYoungest = stateList.at(youngest).stateTime();
|
||||
const auto &tCurrent = stateList.at(i).stateTime;
|
||||
const auto &tYoungest = stateList.at(youngest).stateTime;
|
||||
|
||||
// we're only interested in 'visible' VBGs, don't care about near miss etc. here
|
||||
if (bSkipVbgGreaterCatastrophicKill && stateList.at(i).vulnerabilityState() > ProjectDataManagement::VulnerabilityState::CatastrophicKill)
|
||||
if (bSkipVbgGreaterCatastrophicKill && stateList.at(i).vulnerabilityState > ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
|
||||
continue;
|
||||
if (stateList.at(i).originatorType() == ProjectDataManagement::StateChangeOriginator::Sanitation ||
|
||||
stateList.at(i).originatorType() == ProjectDataManagement::StateChangeOriginator::MedicalTimeout)
|
||||
if (stateList.at(i).originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation ||
|
||||
stateList.at(i).originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout)
|
||||
continue;
|
||||
if (tCurrent > youngestState.stateTime())
|
||||
if (tCurrent > youngestState.stateTime)
|
||||
continue;
|
||||
|
||||
bool higherState = (stateList.at(i).vulnerabilityState() > stateList.at(youngest).vulnerabilityState() ) ||
|
||||
(stateList.at(i).vulnerabilityState() == stateList.at(youngest).vulnerabilityState() && (stateList.at(i).vitality() < stateList.at(youngest).vitality()));
|
||||
bool higherState = (stateList.at(i).vulnerabilityState > stateList.at(youngest).vulnerabilityState ) ||
|
||||
(stateList.at(i).vulnerabilityState == stateList.at(youngest).vulnerabilityState && (stateList.at(i).vitality < stateList.at(youngest).vitality));
|
||||
|
||||
if ((tCurrent > tYoungest && (stateList.at(i).originatorType() == ProjectDataManagement::StateChangeOriginator::ObserverController || stateList.at(i).originatorType() == ProjectDataManagement::StateChangeOriginator::ExerciseControl)) ||
|
||||
if ((tCurrent > tYoungest && (stateList.at(i).originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController || stateList.at(i).originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl)) ||
|
||||
(tCurrent > tYoungest && higherState) ||
|
||||
(tCurrent == tYoungest && higherState))
|
||||
youngest = i;
|
||||
@@ -165,7 +167,7 @@ ParticipantManagement::SanitationResult proceduresDone(const std::vector<StateIn
|
||||
|
||||
// If that guy is killed: NoEffect
|
||||
StateInformation youngestReal = youngestRealStateInformation(stateList);
|
||||
if (youngestReal.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
|
||||
if (youngestReal.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
|
||||
return SanitationResult::NoEffect;
|
||||
|
||||
|
||||
@@ -174,19 +176,19 @@ ParticipantManagement::SanitationResult proceduresDone(const std::vector<StateIn
|
||||
for (size_t i = 1; i < stateList.size(); ++i)
|
||||
{
|
||||
// Better than "Unhandled" can only occur if this is done by Sanitation or O/C
|
||||
if (stateList.at(i).originatorType() != ProjectDataManagement::StateChangeOriginator::Sanitation
|
||||
&& stateList.at(i).originatorType() != ProjectDataManagement::StateChangeOriginator::ObserverController )
|
||||
if (stateList.at(i).originatorType != ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation
|
||||
&& stateList.at(i).originatorType != ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController )
|
||||
continue;
|
||||
// Let's find the newest
|
||||
if (stateList.at(i).stateTime() < youngestReal.stateTime())
|
||||
if (stateList.at(i).stateTime < youngestReal.stateTime)
|
||||
continue;
|
||||
//
|
||||
if (ret == SanitationResult::Unhandled ) //we have a sanitation so at least 1
|
||||
ret = stateList.at(i).sanitationResult();
|
||||
ret = stateList.at(i).sanitationResult;
|
||||
|
||||
if (stateList.at(i).sanitationResult() == SanitationResult::Sufficient && ret != SanitationResult::Optimal )
|
||||
if (stateList.at(i).sanitationResult == SanitationResult::Sufficient && ret != SanitationResult::Optimal )
|
||||
ret = SanitationResult::Sufficient;
|
||||
if (stateList.at(i).sanitationResult() == SanitationResult::Optimal)
|
||||
if (stateList.at(i).sanitationResult == SanitationResult::Optimal)
|
||||
ret = SanitationResult::Optimal;
|
||||
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user