Migrates residual Lts sources to generated rtiddsgen API
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
1 parent
5485a90385
commit
881d44f4dd
512 files changed
+6887
-6426
No files matched your search
+1
-1
@@ -42,7 +42,7 @@ OrderConfirmation_t getOrderConfirmation(const TrainingAreaBase::FireSmokeMarker
|
||||
res.orderType = OrderType_e(byte);
|
||||
LtsUtils::get2Byte(tele, k, res.orderId);
|
||||
LtsUtils::get1Byte(tele, k, byte);
|
||||
res.confirmation = EffectShowManagement::OrderConfirmation_e::inner_enum(byte);
|
||||
res.confirmation = static_cast<EffectShowManagement::OrderConfirmation_e>(byte);
|
||||
|
||||
QByteArray qbArr;
|
||||
int ie = data.payload.size() - 5;
|
||||
|
||||
+4
-4
@@ -591,8 +591,8 @@ void HandlerEffectShow::removeEffectShowsRelatedToAes(int idAes, bool retract)
|
||||
bool remove = false;
|
||||
if (it.value()->getIdAES() == idAes)
|
||||
{
|
||||
if ((it.value()->getData().orderConfirmation != static_cast<int>(EffectShowManagement::OrderConfirmation_e::Execution))) &&
|
||||
(it.value()->getData().orderConfirmation != static_cast<int>(EffectShowManagement::OrderConfirmation_e::OrderCarriedOut))
|
||||
if ((it.value()->getData().orderConfirmation != static_cast<int>(EffectShowManagement::OrderConfirmation_e::Execution)) &&
|
||||
(it.value()->getData().orderConfirmation != static_cast<int>(EffectShowManagement::OrderConfirmation_e::OrderCarriedOut)))
|
||||
remove = true;
|
||||
else
|
||||
INFO_LOG(m_logger) << "Effect Show: " << it.value()->getId() << " not removed due to EXECUTION / ORDER CARRIED OUT";
|
||||
@@ -897,8 +897,8 @@ void HandlerEffectShow::onSendMeteoData()
|
||||
if (effectShow.esmParticipantId == -1)
|
||||
continue; // no actor allocated
|
||||
|
||||
if ((effectShow.orderConfirmation < static_cast<int>(EffectShowManagement::OrderConfirmation_e::DriveOff))) ||
|
||||
(effectShow.orderConfirmation >= static_cast<int>(EffectShowManagement::OrderConfirmation_e::OrderCarriedOut))
|
||||
if ((effectShow.orderConfirmation < static_cast<int>(EffectShowManagement::OrderConfirmation_e::DriveOff)) ||
|
||||
(effectShow.orderConfirmation >= static_cast<int>(EffectShowManagement::OrderConfirmation_e::OrderCarriedOut)))
|
||||
continue; // effect show not processed
|
||||
|
||||
triggerMeteoData(obj);
|
||||
|
||||
+1
-1
@@ -75,7 +75,7 @@ void HandlerEffectShowActorRelocation::relocationOrderConfirmationReceived(const
|
||||
|
||||
// add confirmation data
|
||||
auto data = ifs->getData();
|
||||
data.orderConfirmation = orderConfirmation.confirmation;
|
||||
data.orderConfirmation = static_cast<qint32>(orderConfirmation.confirmation);
|
||||
data.answertText = orderConfirmation.answerText;
|
||||
ifs->updateObject(data);
|
||||
}
|
||||
|
||||
+4
-4
@@ -102,7 +102,7 @@ Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::Exp
|
||||
Database::EsmAesData res;
|
||||
res.idAes = data.id;
|
||||
res.nameAes = QString::fromStdString(data.name);
|
||||
res.effectStateId = data.effectStateId;
|
||||
res.effectStateId = static_cast<qint32>(data.effectStateId);
|
||||
res.position = QPointF(data.area.cornerBottomLeft.lon, data.area.cornerBottomLeft.lat);
|
||||
res.rotationAngle = data.area.rotation;
|
||||
res.depth = data.area.height;
|
||||
@@ -118,7 +118,7 @@ Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::Exp
|
||||
Database::EsmAesData res;
|
||||
res.idAes = data.id;
|
||||
res.nameAes = QString::fromStdString(data.name);
|
||||
res.effectStateId = data.effectStateId;
|
||||
res.effectStateId = static_cast<qint32>(data.effectStateId);
|
||||
res.position = QPointF(data.area.cornerBottomLeft.lon, data.area.cornerBottomLeft.lat);
|
||||
res.rotationAngle = data.area.rotation;
|
||||
res.depth = data.area.height;
|
||||
@@ -135,7 +135,7 @@ Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::Eff
|
||||
Database::EsmAesData res;
|
||||
res.idAes = data.id;
|
||||
res.nameAes = QString::fromStdString(data.name);
|
||||
res.effectStateId = data.effectStateId;
|
||||
res.effectStateId = static_cast<qint32>(data.effectStateId);
|
||||
res.position = QPointF(data.area.cornerBottomLeft.lon, data.area.cornerBottomLeft.lat);
|
||||
res.rotationAngle = data.area.rotation;
|
||||
res.depth = data.area.height;
|
||||
@@ -164,7 +164,7 @@ Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::Min
|
||||
res.width = line.length();
|
||||
res.idAes = data.id;
|
||||
res.nameAes = QString::fromStdString(data.name);
|
||||
res.effectStateId = data.effectStateId;
|
||||
res.effectStateId = static_cast<qint32>(data.effectStateId);
|
||||
res.position = QPointF(segment.positionStart.lon, segment.positionStart.lat);
|
||||
res.depth = data.width;
|
||||
res.effectStart = data.effectStart.is_set() ? data.effectStart.get() : 0;
|
||||
|
||||
+4
-4
@@ -115,7 +115,7 @@ Core::FunctionReplyObject ObjectEffectShow::updateObject(const EffectShowManagem
|
||||
m_data.areaDepth = data.areaDepth;
|
||||
m_data.areaWidth = data.areaWidth;
|
||||
m_data.areaRotation = data.areaRotation;
|
||||
m_data.orderConfirmation = data.orderConfirmation;
|
||||
m_data.orderConfirmation = static_cast<qint32>(data.orderConfirmation);
|
||||
m_data.answerText = QString::fromStdString((data.answerText));
|
||||
|
||||
if (!m_mainHandler->db()->update(m_data))
|
||||
@@ -135,7 +135,7 @@ bool ObjectEffectShow::updateObject(const ConvertFromTab::OrderConfirmation_t &d
|
||||
<< "\n orderConfirmation " << m_data.orderConfirmation << " new: " << data.confirmation
|
||||
<< "\n answerText " << m_data.answerText << " new: " << data.answerText;
|
||||
|
||||
m_data.orderConfirmation = data.confirmation;
|
||||
m_data.orderConfirmation = static_cast<qint32>(data.confirmation);
|
||||
m_data.answerText = data.answerText;
|
||||
|
||||
if (!m_mainHandler->db()->update(m_data))
|
||||
@@ -190,7 +190,7 @@ bool ObjectEffectShow::updateObject(const Database::EsmEffectShow &data)
|
||||
//=============================================================================
|
||||
bool ObjectEffectShow::resetOrderConfirmation()
|
||||
{
|
||||
m_data.orderConfirmation = EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance;
|
||||
m_data.orderConfirmation = static_cast<int>(EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance);
|
||||
m_data.answerText.clear();
|
||||
|
||||
if (!m_mainHandler->db()->update(m_data))
|
||||
@@ -282,7 +282,7 @@ void ObjectEffectShow::onPublishData()
|
||||
ddsData.areaRotation = m_data.areaRotation;
|
||||
ddsData.typeOfAmmunition = m_data.typeOfAmmunition;
|
||||
|
||||
ddsData.orderConfirmation = EffectShowManagement::OrderConfirmation_e::inner_enum(m_data.orderConfirmation);
|
||||
ddsData.orderConfirmation = static_cast<EffectShowManagement::OrderConfirmation_e>(m_data.orderConfirmation);
|
||||
ddsData.answerText = m_data.answerText.toStdString();
|
||||
ddsData.isDeleted = false;
|
||||
ddsData.isUsed = false;
|
||||
|
||||
+2
-2
@@ -76,7 +76,7 @@ void ObjectEffectShowActorRelocation::onPublishData()
|
||||
ddsData.arrival_time = m_data.arrivalTime;
|
||||
ddsData.position = Core::GeoPosition2D(m_data.position.x(), m_data.position.y());
|
||||
ddsData.info = m_data.info.toStdString();
|
||||
ddsData.orderConfirmation = EffectShowManagement::OrderConfirmation_e::inner_enum(m_data.orderConfirmation);
|
||||
ddsData.orderConfirmation = static_cast<EffectShowManagement::OrderConfirmation_e>(m_data.orderConfirmation);
|
||||
ddsData.answerText = m_data.answertText.toStdString();
|
||||
ddsData.isDeleted = false;
|
||||
ddsData.isUsed = false;
|
||||
@@ -114,7 +114,7 @@ Database::EsmEffectShowActorRelocation ObjectEffectShowActorRelocation::ddsToDb(
|
||||
dbData.arrivalTime = ddsData.arrival_time.get();
|
||||
dbData.position = QPointF(ddsData.position.lon, ddsData.position.lat);
|
||||
dbData.info = QString::fromStdString(ddsData.info);
|
||||
dbData.orderConfirmation = ddsData.orderConfirmation;
|
||||
dbData.orderConfirmation = static_cast<qint32>(ddsData.orderConfirmation);
|
||||
dbData.answertText = QString::fromStdString(ddsData.answerText);
|
||||
return dbData;
|
||||
}
|
||||
|
||||
+1
-1
@@ -104,7 +104,7 @@ void ObjectEffectShowVehicleStatus::onPublishData()
|
||||
ddsData.ammunitionAvailable = m_data.ammunitionAvailable;
|
||||
ddsData.ammunitionMagazine = m_data.ammunitionMagazine;
|
||||
ddsData.controlComputerFail = m_data.controlComputerFail;
|
||||
ddsData.feature = EffectShowManagement::Feature_e::type(m_data.feature);
|
||||
ddsData.feature = EffectShowManagement::Feature_e(m_data.feature);
|
||||
ddsData.esmParticipantId = m_data.esmParticipantId;
|
||||
ddsData.inclinationSensorFail = m_data.inclinationSensorFail;
|
||||
ddsData.magazineFail = m_data.magazineFail;
|
||||
|
||||
Reference in new issue
Block a user