Migrates AreaEffectSimulation to generated rtiddsgen API
Converts accessor calls to plain member access across aes service and plugin.
This commit is contained in:
102 files changed
+3307
-3313
No files matched your search
+10
-10
@@ -40,7 +40,7 @@ bool ObjectTrajectory::updateObject(const TrajectoryData &providedData)
|
||||
{
|
||||
if (!providedData.isIdValid())
|
||||
return false;
|
||||
if (providedData.id != m_ddsTrajectory.id())
|
||||
if (providedData.id != m_ddsTrajectory.id)
|
||||
return false;
|
||||
m_providedData = providedData;
|
||||
publish();
|
||||
@@ -50,22 +50,22 @@ bool ObjectTrajectory::updateObject(const TrajectoryData &providedData)
|
||||
bool ObjectTrajectory::publish()
|
||||
{
|
||||
TrajectoryTimeAware newTrajectory;
|
||||
newTrajectory.id(m_providedData.id);
|
||||
newTrajectory.id = m_providedData.id;
|
||||
// // newTrajectory.sampleTime() will be set later
|
||||
newTrajectory.index(m_providedData.index );
|
||||
newTrajectory.index = m_providedData.index;
|
||||
// [E01562-259] use originatorId, originatorTypeId (instead of aesItemId, aesTypeId)
|
||||
// newTrajectory.aesItemId(m_providedData.aesItemId);
|
||||
// newTrajectory.aesTypeId(m_providedData.aesTypeId);
|
||||
newTrajectory.trajectoryStartTime(m_providedData.startTime);
|
||||
newTrajectory.geometry(m_providedData.geometry);
|
||||
newTrajectory.originatorId(m_providedData.originatorId);
|
||||
newTrajectory.originatorTypeId(m_providedData.originatorTypeId);
|
||||
newTrajectory.trajectoryStartTime = m_providedData.startTime;
|
||||
newTrajectory.geometry = m_providedData.geometry;
|
||||
newTrajectory.originatorId = m_providedData.originatorId;
|
||||
newTrajectory.originatorTypeId = m_providedData.originatorTypeId;
|
||||
|
||||
if (!hasDdsChanged(newTrajectory))
|
||||
return true;
|
||||
|
||||
m_ddsTrajectory = newTrajectory;
|
||||
newTrajectory.sampleTime(partitionTimeMSec()); // publish sampleTime, but do not store
|
||||
newTrajectory.sampleTime = partitionTimeMSec(); // publish sampleTime, but do not store
|
||||
return m_mainHandler->dds()->dts()->publish(newTrajectory);
|
||||
//emit newAiv(newTrajectory);
|
||||
}
|
||||
@@ -77,10 +77,10 @@ bool ObjectTrajectory::hasDdsChanged(const TrajectoryTimeAware &trajectory)
|
||||
|
||||
bool ObjectTrajectory::removeTopic()
|
||||
{
|
||||
if (m_ddsTrajectory.id() <= 0)
|
||||
if (m_ddsTrajectory.id <= 0)
|
||||
return false;
|
||||
auto dts = m_mainHandler->dds()->dts();
|
||||
return dts->removeTrajectoryTimeAwareByKey(m_ddsTrajectory.id());
|
||||
return dts->removeTrajectoryTimeAwareByKey(m_ddsTrajectory.id);
|
||||
}
|
||||
|
||||
} // Namespace AreaEffectSimulation
|
||||
Reference in new issue
Block a user