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
+67
-67
@@ -24,7 +24,7 @@ ObjectChargeEffect::ObjectChargeEffect(MainHandler *mainHandler, QObject *parent
|
||||
: QObject(parent)
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_trajectoryId(-1)
|
||||
, m_state(AesEffectState::inner_enum::EsUnknown)
|
||||
, m_state(AesEffectState::EsUnknown)
|
||||
, m_stateChanged(false)
|
||||
, m_stateTimer(new QTimer(this))
|
||||
, m_logger(getLogger(QStringLiteral("ObjectChargeEffect")))
|
||||
@@ -38,16 +38,16 @@ ObjectChargeEffect::ObjectChargeEffect(MainHandler *mainHandler, QObject *parent
|
||||
|
||||
Core::FunctionReplyObject ObjectChargeEffect::create(const ChargeEffectModifyRequest &data)
|
||||
{
|
||||
Core::FunctionReplyObject reply(data.id());
|
||||
Core::FunctionReplyObject reply(data.id);
|
||||
Database::AesChargeEffect dbData = functionTopicToDatabase(data);
|
||||
|
||||
if (!m_mainHandler)
|
||||
reply.setStr("Not possible to create ChargeEffect --> No MainHandler present.");
|
||||
else if (data.effectStart() < QDateTime::currentMSecsSinceEpoch())
|
||||
else if (data.effectStart < QDateTime::currentMSecsSinceEpoch())
|
||||
reply.setStr("Not possible to create ChargeEffect --> EffectStart has to be in the future.");
|
||||
else if (data.effectDuration() < 1000)
|
||||
else if (data.effectDuration < 1000)
|
||||
reply.setStr("Not possible to create ChargeEffect --> EffectDuration must be at least 1000ms.");
|
||||
else if (data.name().empty())
|
||||
else if (data.name.empty())
|
||||
reply.setStr("Not possible to create ChargeEffect --> Name must not be empty.");
|
||||
else if (!m_mainHandler->db()->insert(dbData))
|
||||
reply.setStr("Not possible to create ChargeEffect --> Database insert failed.");
|
||||
@@ -68,14 +68,14 @@ Core::FunctionReplyObject ObjectChargeEffect::create(const ChargeEffectModifyReq
|
||||
|
||||
Core::FunctionReplyObject ObjectChargeEffect::update(const ChargeEffectModifyRequest &data)
|
||||
{
|
||||
Core::FunctionReplyObject reply(data.id());
|
||||
Core::FunctionReplyObject reply(data.id);
|
||||
Database::AesChargeEffect dbData = functionTopicToDatabase(data);
|
||||
|
||||
if (!m_mainHandler)
|
||||
reply.setStr("Not possible to update ChargeEffect --> No MainHandler present.");
|
||||
else if (data.id() != m_data.id)
|
||||
else if (data.id != m_data.id)
|
||||
reply.setStr("Not possible to update ChargeEffect --> Id mismatch.");
|
||||
else if (m_state != AesEffectState::inner_enum::EsPrepared)
|
||||
else if (m_state != AesEffectState::EsPrepared)
|
||||
{
|
||||
// properties update is allowed!!!
|
||||
if (dbData.properties != m_data.properties)
|
||||
@@ -83,7 +83,7 @@ Core::FunctionReplyObject ObjectChargeEffect::update(const ChargeEffectModifyReq
|
||||
else
|
||||
reply.setStr("Not possible to update ChargeEffect --> It is not allowed to make changes EsState doesn't allow it.");
|
||||
}
|
||||
else if (data.name().empty())
|
||||
else if (data.name.empty())
|
||||
reply.setStr("Not possible to update ChargeEffect --> Name must not be empty.");
|
||||
else if (!hasChanges(dbData))
|
||||
reply.setStr("Not possible to update ChargeEffect --> There are no changes.");
|
||||
@@ -150,19 +150,19 @@ Database::AesChargeEffect ObjectChargeEffect::functionTopicToDatabase(const Char
|
||||
{
|
||||
Database::AesChargeEffect dbData;
|
||||
|
||||
dbData.id = data.id();
|
||||
dbData.name = QString::fromStdString(data.name());
|
||||
dbData.chargeTypeId = data.chargeTypeId();
|
||||
dbData.igniterTypeId = data.igniterTypeId();
|
||||
dbData.effectDuration = data.effectDuration();
|
||||
dbData.effectStart = QDateTime::fromMSecsSinceEpoch(data.effectStart());
|
||||
dbData.gearTypeId = data.gearTypeId();
|
||||
dbData.originatorId = data.originatorId();
|
||||
dbData.originatorTypeId = static_cast<int>(data.originatorTypeId().underlying());
|
||||
dbData.position.setX(data.position().lon());
|
||||
dbData.position.setY(data.position().lat());
|
||||
dbData.position.setZ(data.position().z());
|
||||
dbData.properties = QString::fromStdString(data.properties());
|
||||
dbData.id = data.id;
|
||||
dbData.name = QString::fromStdString(data.name);
|
||||
dbData.chargeTypeId = data.chargeTypeId;
|
||||
dbData.igniterTypeId = data.igniterTypeId;
|
||||
dbData.effectDuration = data.effectDuration;
|
||||
dbData.effectStart = QDateTime::fromMSecsSinceEpoch(data.effectStart);
|
||||
dbData.gearTypeId = data.gearTypeId;
|
||||
dbData.originatorId = data.originatorId;
|
||||
dbData.originatorTypeId = static_cast<int>(data.originatorTypeId);
|
||||
dbData.position.setX(data.position.lon);
|
||||
dbData.position.setY(data.position.lat);
|
||||
dbData.position.setZ(data.position.z);
|
||||
dbData.properties = QString::fromStdString(data.properties);
|
||||
|
||||
return dbData;
|
||||
}
|
||||
@@ -173,21 +173,21 @@ ChargeEffect ObjectChargeEffect::dataBaseToDataTopic(const Database::AesChargeEf
|
||||
{
|
||||
ChargeEffect dataTopic;
|
||||
|
||||
dataTopic.id(data.id);
|
||||
dataTopic.name(data.name.toStdString());
|
||||
dataTopic.chargeTypeId(data.chargeTypeId);
|
||||
dataTopic.effectDuration(data.effectDuration);
|
||||
dataTopic.effectStart(data.effectStart.toMSecsSinceEpoch());
|
||||
dataTopic.igniterTypeId(data.igniterTypeId);
|
||||
dataTopic.gearTypeId(data.gearTypeId);
|
||||
dataTopic.originatorId(data.originatorId);
|
||||
dataTopic.originatorTypeId(static_cast<ProjectDataManagement::StateChangeOriginator::inner_enum>(data.originatorTypeId));
|
||||
dataTopic.position().lon(data.position.x());
|
||||
dataTopic.position().lat(data.position.y());
|
||||
dataTopic.position().z(data.position.z());
|
||||
dataTopic.state(m_state);
|
||||
dataTopic.properties(data.properties.toStdString());
|
||||
dataTopic.sampleTime(m_mainHandler->dds()->currentPartitionTimeMSec());
|
||||
dataTopic.id = data.id;
|
||||
dataTopic.name = data.name.toStdString();
|
||||
dataTopic.chargeTypeId = data.chargeTypeId;
|
||||
dataTopic.effectDuration = data.effectDuration;
|
||||
dataTopic.effectStart = data.effectStart.toMSecsSinceEpoch();
|
||||
dataTopic.igniterTypeId = data.igniterTypeId;
|
||||
dataTopic.gearTypeId = data.gearTypeId;
|
||||
dataTopic.originatorId = data.originatorId;
|
||||
dataTopic.originatorTypeId = static_cast<ProjectDataManagement::StateChangeOriginator>(data.originatorTypeId);
|
||||
dataTopic.position.lon = data.position.x();
|
||||
dataTopic.position.lat = data.position.y();
|
||||
dataTopic.position.z = data.position.z();
|
||||
dataTopic.state = m_state;
|
||||
dataTopic.properties = data.properties.toStdString();
|
||||
dataTopic.sampleTime = m_mainHandler->dds()->currentPartitionTimeMSec();
|
||||
|
||||
return dataTopic;
|
||||
}
|
||||
@@ -243,24 +243,24 @@ bool ObjectChargeEffect::isFinished() const
|
||||
|
||||
void ObjectChargeEffect::onStateTimerTimeout()
|
||||
{
|
||||
switch (m_state.underlying())
|
||||
switch (m_state)
|
||||
{
|
||||
case AesEffectState::inner_enum::EsPrepared:
|
||||
case AesEffectState::inner_enum::EsActivated:
|
||||
case AesEffectState::EsPrepared:
|
||||
case AesEffectState::EsActivated:
|
||||
setNextState();
|
||||
startStateTimer();
|
||||
publish();
|
||||
|
||||
return;
|
||||
case AesEffectState::inner_enum::EsExpired:
|
||||
case AesEffectState::EsExpired:
|
||||
emit finished(m_data.id);
|
||||
|
||||
return;
|
||||
case AesEffectState::inner_enum::EsUnknown:
|
||||
case AesEffectState::inner_enum::EsError:
|
||||
case AesEffectState::inner_enum::EsRemoved:
|
||||
case AesEffectState::inner_enum::EsCreated:
|
||||
case AesEffectState::inner_enum::EsPaused:
|
||||
case AesEffectState::EsUnknown:
|
||||
case AesEffectState::EsError:
|
||||
case AesEffectState::EsRemoved:
|
||||
case AesEffectState::EsCreated:
|
||||
case AesEffectState::EsPaused:
|
||||
default:
|
||||
return;
|
||||
}
|
||||
@@ -273,20 +273,20 @@ void ObjectChargeEffect::setNextState()
|
||||
AesEffectState oldState = m_state;
|
||||
m_stateChanged = false;
|
||||
|
||||
switch (m_state.underlying())
|
||||
switch (m_state)
|
||||
{
|
||||
case AesEffectState::inner_enum::EsPrepared:
|
||||
case AesEffectState::EsPrepared:
|
||||
m_state = AesEffectState::EsActivated;
|
||||
break;
|
||||
case AesEffectState::inner_enum::EsActivated:
|
||||
case AesEffectState::EsActivated:
|
||||
m_state = AesEffectState::EsExpired;
|
||||
break;
|
||||
case AesEffectState::inner_enum::EsExpired:
|
||||
case AesEffectState::inner_enum::EsUnknown:
|
||||
case AesEffectState::inner_enum::EsError:
|
||||
case AesEffectState::inner_enum::EsRemoved:
|
||||
case AesEffectState::inner_enum::EsCreated:
|
||||
case AesEffectState::inner_enum::EsPaused:
|
||||
case AesEffectState::EsExpired:
|
||||
case AesEffectState::EsUnknown:
|
||||
case AesEffectState::EsError:
|
||||
case AesEffectState::EsRemoved:
|
||||
case AesEffectState::EsCreated:
|
||||
case AesEffectState::EsPaused:
|
||||
default:
|
||||
m_state = AesEffectState::EsUnknown;
|
||||
break;
|
||||
@@ -309,11 +309,11 @@ void ObjectChargeEffect::calculateInitEffectState()
|
||||
m_stateChanged = false;
|
||||
|
||||
if (QDateTime::currentMSecsSinceEpoch() < effectStartMsecs)
|
||||
m_state = AesEffectState::inner_enum::EsPrepared;
|
||||
m_state = AesEffectState::EsPrepared;
|
||||
else if (QDateTime::currentMSecsSinceEpoch() >= effectStartMsecs && QDateTime::currentMSecsSinceEpoch() < durationEndMsecs)
|
||||
m_state = AesEffectState::inner_enum::EsActivated;
|
||||
m_state = AesEffectState::EsActivated;
|
||||
else // expired
|
||||
m_state = AesEffectState::inner_enum::EsExpired;
|
||||
m_state = AesEffectState::EsExpired;
|
||||
|
||||
if (oldState != m_state)
|
||||
m_stateChanged = true;
|
||||
@@ -324,9 +324,9 @@ void ObjectChargeEffect::calculateInitEffectState()
|
||||
|
||||
void ObjectChargeEffect::startStateTimer()
|
||||
{
|
||||
switch (m_state.underlying())
|
||||
switch (m_state)
|
||||
{
|
||||
case AesEffectState::inner_enum::EsPrepared:
|
||||
case AesEffectState::EsPrepared:
|
||||
{
|
||||
qint64 timeToActivatedMsecs = m_data.effectStart.toMSecsSinceEpoch() - QDateTime::currentMSecsSinceEpoch();
|
||||
|
||||
@@ -336,7 +336,7 @@ void ObjectChargeEffect::startStateTimer()
|
||||
|
||||
return;
|
||||
}
|
||||
case AesEffectState::inner_enum::EsActivated:
|
||||
case AesEffectState::EsActivated:
|
||||
{
|
||||
qint64 timeToExpiredMsecs = m_data.effectStart.toMSecsSinceEpoch() + m_data.effectDuration - QDateTime::currentMSecsSinceEpoch();
|
||||
|
||||
@@ -346,7 +346,7 @@ void ObjectChargeEffect::startStateTimer()
|
||||
|
||||
return;
|
||||
}
|
||||
case AesEffectState::inner_enum::EsExpired:
|
||||
case AesEffectState::EsExpired:
|
||||
{
|
||||
qint64 timeToFinishMsecs = m_data.effectStart.toMSecsSinceEpoch() + m_data.effectDuration + s_afterglowMsecs - QDateTime::currentMSecsSinceEpoch();
|
||||
|
||||
@@ -356,11 +356,11 @@ void ObjectChargeEffect::startStateTimer()
|
||||
|
||||
return;
|
||||
}
|
||||
case AesEffectState::inner_enum::EsUnknown:
|
||||
case AesEffectState::inner_enum::EsError:
|
||||
case AesEffectState::inner_enum::EsRemoved:
|
||||
case AesEffectState::inner_enum::EsCreated:
|
||||
case AesEffectState::inner_enum::EsPaused:
|
||||
case AesEffectState::EsUnknown:
|
||||
case AesEffectState::EsError:
|
||||
case AesEffectState::EsRemoved:
|
||||
case AesEffectState::EsCreated:
|
||||
case AesEffectState::EsPaused:
|
||||
default:
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user