Complete Qt6/rtiddsgen migration of residual Lts service sources
This commit is contained in:
86 files changed
+1235
-1128
No files matched your search
+31
-31
@@ -155,37 +155,37 @@ void HandlerDynamicParticipantData::tryCreateHitEvent(Database::EemEvent eData,
|
||||
return;
|
||||
|
||||
// only handle 'real' hit events
|
||||
switch (stateInfo.originatorType.underlying())
|
||||
switch (stateInfo.originatorType)
|
||||
{
|
||||
case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation:
|
||||
case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice:
|
||||
case ProjectDataManagement::StateChangeOriginator::DusMine:
|
||||
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation:
|
||||
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ImprovisedExplosiveDevice:
|
||||
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_DusMine:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation;
|
||||
break;
|
||||
case ProjectDataManagement::StateChangeOriginator::Participant:
|
||||
case ProjectDataManagement::StateChangeOriginator::ObserverController:
|
||||
case ProjectDataManagement::StateChangeOriginator::ExerciseControl:
|
||||
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant:
|
||||
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController:
|
||||
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Hit;
|
||||
break;
|
||||
case ProjectDataManagement::StateChangeOriginator::Sanitation:
|
||||
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Sanitation;
|
||||
break;
|
||||
case ProjectDataManagement::StateChangeOriginator::Unknown:
|
||||
case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice:
|
||||
case ProjectDataManagement::StateChangeOriginator::MaintainanceDevice:
|
||||
case ProjectDataManagement::StateChangeOriginator::FunctionalArea:
|
||||
case ProjectDataManagement::StateChangeOriginator::Initialization:
|
||||
case ProjectDataManagement::StateChangeOriginator::MedicalTimeout:
|
||||
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown:
|
||||
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_WoundTreatmentDevice:
|
||||
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MaintainanceDevice:
|
||||
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea:
|
||||
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization:
|
||||
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout:
|
||||
return;
|
||||
}
|
||||
|
||||
QJsonObject obj;
|
||||
obj[QStringLiteral("VulnerabilityState")] = vulnState.underlying();
|
||||
obj[QStringLiteral("VulnerabilityState")] = static_cast<int>(vulnState);
|
||||
obj[QStringLiteral("OriginatorId")] = stateInfo.originatorId;
|
||||
obj[QStringLiteral("OriginatorType")] = stateInfo.originatorType.underlying();
|
||||
obj[QStringLiteral("OriginatorType")] = static_cast<int>(stateInfo.originatorType);
|
||||
obj[QStringLiteral("OriginatorChargeTypeId")] = stateInfo.originatorChargeTypeId;
|
||||
|
||||
if (stateInfo.originatorType == ProjectDataManagement::StateChangeOriginator::Participant)
|
||||
if (stateInfo.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant)
|
||||
{
|
||||
ParticipantManagement::Participant originData = m_partMap.value(stateInfo.originatorId);
|
||||
if (originData.equipmentNumber.is_set())
|
||||
@@ -200,7 +200,7 @@ void HandlerDynamicParticipantData::tryCreateHitEvent(Database::EemEvent eData,
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Event HitEffectSimulation from originatorId = " << stateInfo.originatorId;
|
||||
obj[QStringLiteral("AesId")] = stateInfo.originatorId;
|
||||
obj[QStringLiteral("AesType")] = m_itemViews.value(stateInfo.originatorId).underlying();
|
||||
obj[QStringLiteral("AesType")] = static_cast<int>(m_itemViews.value(stateInfo.originatorId));
|
||||
AreaEffectSimulation::AesItem aesItem;
|
||||
if (m_aesDtc->aesItemFromId(stateInfo.originatorId, aesItem))
|
||||
obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name));
|
||||
@@ -214,8 +214,8 @@ void HandlerDynamicParticipantData::tryCreateHitEvent(Database::EemEvent eData,
|
||||
DEBUG_LOG(m_logger) << "Event sanitation ";
|
||||
|
||||
obj[QStringLiteral("Vitality")] = stateInfo.vitality;
|
||||
obj[QStringLiteral("SanitationResult")] = stateInfo.sanitationResult.underlying();
|
||||
obj[QStringLiteral("SanitationProceduresTaken")] = stateInfo.sanitationProceduresTaken;
|
||||
obj[QStringLiteral("SanitationResult")] = static_cast<int>(stateInfo.sanitationResult);
|
||||
obj[QStringLiteral("SanitationProceduresTaken")] = QJsonValue(static_cast<qint64>(stateInfo.sanitationProceduresTaken));
|
||||
}
|
||||
|
||||
eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
|
||||
@@ -272,7 +272,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
eData.equipmentNumber = pData.equipmentNumber.is_set() ? pData.equipmentNumber.get() : -1;
|
||||
eData.partyId = pData.partyId;
|
||||
eData.sampleTime = data.sampleTime;
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_Unknown;
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Unknown;
|
||||
eData.position = LtsUtils::QPoint3D(pPos.pos.lon, pPos.pos.lat, pPos.pos.z);
|
||||
|
||||
if (data.stateHistory != lastDynData.stateHistory)
|
||||
@@ -307,7 +307,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
obj[QStringLiteral("DryFire")] = QJsonValue(gi.chargeCounting);
|
||||
eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
|
||||
eData.sampleTime = gi.lastUpdate;
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_WeaponAssignment;
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_WeaponAssignment;
|
||||
eData.id = 0;
|
||||
if (!m_dbHandler->db()->insert(eData))
|
||||
ERROR_LOG(m_logger) << "Error while inserting event data for participant: " << data.participantId;
|
||||
@@ -317,7 +317,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
|
||||
if (data.manipulation != lastDynData.manipulation)
|
||||
{
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_Manipulation;
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Manipulation;
|
||||
|
||||
const auto isOldManipulation = [&lastDynData](const ParticipantManagement::ManipulationInformation & mani) -> bool
|
||||
{
|
||||
@@ -376,7 +376,7 @@ void HandlerDynamicParticipantData::onParticipantGearEventChanged(const Particip
|
||||
eData.equipmentNumber = pData.equipmentNumber.is_set() ? pData.equipmentNumber.get() : -1;
|
||||
eData.partyId = pData.partyId;
|
||||
eData.sampleTime = data.sampleTime;
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_FireEvent;
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_FireEvent;
|
||||
eData.position = LtsUtils::QPoint3D(pPos.pos.lon, pPos.pos.lat, pPos.pos.z);
|
||||
|
||||
QJsonObject obj;
|
||||
@@ -442,7 +442,7 @@ void HandlerDynamicParticipantData::onBiteChanged(const ParticipantManagement::B
|
||||
Database::EemEvent eData;
|
||||
|
||||
eData.id = 0;
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_BiteMessage;
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_BiteMessage;
|
||||
eData.equipmentNumber = data.equipmentNumber;
|
||||
eData.participantId = data.participantId;
|
||||
eData.sampleTime = data.sampleTime;
|
||||
@@ -495,7 +495,7 @@ void HandlerDynamicParticipantData::onBuildingStateChanged(const Buildings::Buil
|
||||
Database::EemEvent eData;
|
||||
|
||||
eData.id = 0;
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_HitBuilding;
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitBuilding;
|
||||
eData.sampleTime = data.sampleTime;
|
||||
|
||||
QJsonObject obj;
|
||||
@@ -503,18 +503,18 @@ void HandlerDynamicParticipantData::onBuildingStateChanged(const Buildings::Buil
|
||||
obj[QStringLiteral("damagePercent")] = QJsonValue(data.damagePercent);
|
||||
obj[QStringLiteral("damagePercentOld")] = QJsonValue(data.damagePercentOld);
|
||||
// obj[QStringLiteral("Name")] = QJsonValue(data.name());
|
||||
obj[QStringLiteral("VulnerabilityState")] = QJsonValue(data.vulnerabilityState.underlying());
|
||||
obj[QStringLiteral("VulnerabilityState")] = QJsonValue(static_cast<int>(data.vulnerabilityState));
|
||||
|
||||
if (data.originatorType == ProjectDataManagement::StateChangeOriginator::Participant)
|
||||
if (data.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant)
|
||||
{
|
||||
ParticipantManagement::Participant originData = m_partMap.value(data.originatorParticipantId);
|
||||
if (originData.equipmentNumber.is_set())
|
||||
obj[QStringLiteral("OriginatorEquipmentNumber")] = originData.equipmentNumber.get();
|
||||
}
|
||||
if (data.originatorType == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
|
||||
if (data.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation)
|
||||
{
|
||||
obj[QStringLiteral("AesId")] = data.aesId;
|
||||
obj[QStringLiteral("AesType")] = m_itemViews.value(data.aesId).underlying();
|
||||
obj[QStringLiteral("AesType")] = static_cast<int>(m_itemViews.value(data.aesId));
|
||||
AreaEffectSimulation::AesItem aesItem;
|
||||
if (m_aesDtc->aesItemFromId(data.aesId, aesItem))
|
||||
obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name));
|
||||
@@ -577,7 +577,7 @@ ExerciseEventManagement::Event HandlerDynamicParticipantData::toDdsData(const Da
|
||||
ddsData.properties = data.properties.toStdString();
|
||||
ddsData.position = Core::GeoPosition(data.position.x(), data.position.y(), data.position.z());
|
||||
|
||||
if (data.eventTypeId == ProjectDataManagement::PdmEventType::PdmEventType_HitBuilding)
|
||||
if (data.eventTypeId == ProjectDataManagement::PdmEventType::EventType_HitBuilding)
|
||||
{
|
||||
int mainStructureElementId = LtsUtils::JsonObject::fromJson(ddsData.properties).valueOr<int>(QStringLiteral("MainStructureElementId"), 0);
|
||||
DEBUG_LOG(m_logger) << "MainStructureElementId=" << mainStructureElementId;
|
||||
|
||||
+1
-1
@@ -85,7 +85,7 @@ void HandlerEquipmentErrorRegistration::onEquipmentErrorRegistrationChanged(cons
|
||||
Database::EemEvent eData;
|
||||
eData.sampleTime = data.sampleTime;
|
||||
eData.equipmentNumber = data.equipmentNumber;
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_EquipmentErrorReport;
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport;
|
||||
|
||||
QJsonObject obj;
|
||||
obj[QStringLiteral("text")] = QString::fromStdString(data.text);
|
||||
|
||||
+48
-48
@@ -100,7 +100,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
|
||||
DEBUG_LOG(m_logger) << "eAdded: AesItemId: " << data.aesItemId << ", effectState: " << data.effectStateId;
|
||||
m_aesEffectState.insert(data.aesItemId, data.effectStateId);
|
||||
|
||||
if (data.aesTypeId == AreaEffectSimulation::AesType::AesType_AtBorderline)
|
||||
if (data.aesTypeId == AreaEffectSimulation::AesType::AtBorderline)
|
||||
{
|
||||
AreaEffectSimulation::AesItem aesItem;
|
||||
m_aesDtc->aesItemFromId(data.aesItemId, aesItem);
|
||||
@@ -108,7 +108,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
|
||||
QJsonObject obj;
|
||||
obj[QStringLiteral("AesId")] = QJsonValue(aesItem.id);
|
||||
obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name));
|
||||
obj[QStringLiteral("AesType")] = QJsonValue(data.aesTypeId.underlying());
|
||||
obj[QStringLiteral("AesType")] = QJsonValue(static_cast<int>(data.aesTypeId));
|
||||
|
||||
eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Borderline;
|
||||
@@ -130,7 +130,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
|
||||
|
||||
// insert event only once
|
||||
if (effectState != AreaEffectSimulation::AesEffectState::EsPrepared &&
|
||||
(effectState == AreaEffectSimulation::AesEffectState::AesEffectState_EsActivated && data.effectStateId != AreaEffectSimulation::AesEffectState::AesEffectState_EsExpired))
|
||||
(effectState == AreaEffectSimulation::AesEffectState::EsActivated && data.effectStateId != AreaEffectSimulation::AesEffectState::EsExpired))
|
||||
return;
|
||||
|
||||
INFO_LOG(m_logger) << "new/update event: aesId: " << data.aesItemId;
|
||||
@@ -142,7 +142,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
|
||||
|
||||
INFO_LOG(m_logger) << "aesType: " << data.aesTypeId;
|
||||
|
||||
switch (data.aesTypeId.underlying())
|
||||
switch (data.aesTypeId)
|
||||
{
|
||||
case AreaEffectSimulation::AesType::AtMineArea:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_MineArea;
|
||||
@@ -182,7 +182,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
|
||||
// No ExerciseEvent for AesType
|
||||
default:
|
||||
{
|
||||
INFO_LOG(m_logger) << "No ExerciseEvent for AesType:" << data.aesTypeId.underlying();
|
||||
INFO_LOG(m_logger) << "No ExerciseEvent for AesType:" << data.aesTypeId;
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -200,12 +200,12 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
|
||||
QJsonObject obj;
|
||||
obj[QStringLiteral("AesId")] = QJsonValue(aesItem.id);
|
||||
obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name));
|
||||
obj[QStringLiteral("AesType")] = QJsonValue(data.aesTypeId.underlying());
|
||||
if (data.aesTypeId.underlying() != AreaEffectSimulation::AesType::AtBorderline)
|
||||
obj[QStringLiteral("AesType")] = QJsonValue(static_cast<int>(data.aesTypeId));
|
||||
if (data.aesTypeId != AreaEffectSimulation::AesType::AtBorderline)
|
||||
{
|
||||
obj[QStringLiteral("duration")] = QJsonValue(aesItem.effectDuration);
|
||||
obj[QStringLiteral("ChargeTypeId")] = QJsonValue(data.chargeStruct.chargeTypeId);
|
||||
obj[QStringLiteral("endTime")] = QJsonValue(data.effectStart + aesItem.effectDuration);
|
||||
obj[QStringLiteral("endTime")] = QJsonValue(static_cast<qint64>(data.effectStart + aesItem.effectDuration));
|
||||
}
|
||||
eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
|
||||
|
||||
@@ -263,7 +263,7 @@ void HandlerParticipantEvent::onExplosionSingleChanged(const AreaEffectSimulatio
|
||||
|
||||
// insert event only once
|
||||
if (effectState != AreaEffectSimulation::AesEffectState::EsPrepared &&
|
||||
(effectState == AreaEffectSimulation::AesEffectState::AesEffectState_EsActivated && data.effectStateId != AreaEffectSimulation::AesEffectState::AesEffectState_EsExpired))
|
||||
(effectState == AreaEffectSimulation::AesEffectState::EsActivated && data.effectStateId != AreaEffectSimulation::AesEffectState::EsExpired))
|
||||
return;
|
||||
|
||||
m_aesEffectState.insert(data.id, data.effectStateId);
|
||||
@@ -277,10 +277,10 @@ void HandlerParticipantEvent::onExplosionSingleChanged(const AreaEffectSimulatio
|
||||
QJsonObject obj;
|
||||
obj[QStringLiteral("AesId")] = QJsonValue(aesItem.id);
|
||||
obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name));
|
||||
obj[QStringLiteral("AesType")] = QJsonValue(AreaEffectSimulation::AesType::AtExplosionSingle);
|
||||
obj[QStringLiteral("AesType")] = QJsonValue(static_cast<int>(AreaEffectSimulation::AesType::AtExplosionSingle));
|
||||
obj[QStringLiteral("ChargeTypeId")] = QJsonValue(data.chargeStruct.chargeTypeId);
|
||||
obj[QStringLiteral("duration")] = QJsonValue(aesItem.effectDuration);
|
||||
obj[QStringLiteral("endTime")] = QJsonValue(data.effectStart.get() + aesItem.effectDuration);
|
||||
obj[QStringLiteral("endTime")] = QJsonValue(static_cast<qint64>(data.effectStart.get() + aesItem.effectDuration));
|
||||
eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
|
||||
|
||||
//const Core::GeoPosition geoPosition ( data.impactPosition().lon(), data.impactPosition().lat(), 0);
|
||||
@@ -328,68 +328,68 @@ void HandlerParticipantEvent::onParticipantEventChanged(const CentralEffectSimul
|
||||
<< " position=" << data.position
|
||||
<< " eData.position=" << eData.position;
|
||||
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_Unknown;
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Unknown;
|
||||
|
||||
QJsonObject obj;
|
||||
obj[QStringLiteral("AesId")] = QJsonValue(data.aesItemId);
|
||||
obj[QStringLiteral("AesType")] = QJsonValue(m_itemViews.value(data.aesItemId).underlying());
|
||||
obj[QStringLiteral("AesType")] = QJsonValue(static_cast<int>(m_itemViews.value(data.aesItemId)));
|
||||
obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(data.aesName));
|
||||
obj[QStringLiteral("FriendlyFire")] = QJsonValue(data.friendlyFire);
|
||||
|
||||
switch(data.eventTypeId.underlying())
|
||||
switch(data.eventTypeId)
|
||||
{
|
||||
case ProjectDataManagement::PdmEventType::PdmEventType_HitEffectSimulation:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_HitEffectSimulation;
|
||||
case ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation;
|
||||
break;
|
||||
case ProjectDataManagement::PdmEventType::PdmEventType_HitMine:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_HitMine;
|
||||
case ProjectDataManagement::PdmEventType::EventType_HitMine:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitMine;
|
||||
break;
|
||||
case ProjectDataManagement::PdmEventType::PdmEventType_HitN:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_HitN;
|
||||
case ProjectDataManagement::PdmEventType::EventType_HitN:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitN;
|
||||
break;
|
||||
case ProjectDataManagement::PdmEventType::PdmEventType_HitC:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_HitC;
|
||||
case ProjectDataManagement::PdmEventType::EventType_HitC:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitC;
|
||||
break;
|
||||
case ProjectDataManagement::PdmEventType::PdmEventType_EnterDangerArea:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_EnterDangerArea;
|
||||
case ProjectDataManagement::PdmEventType::EventType_EnterDangerArea:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_EnterDangerArea;
|
||||
break;
|
||||
case ProjectDataManagement::PdmEventType::PdmEventType_LeaveDangerArea:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_LeaveDangerArea;
|
||||
case ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea;
|
||||
break;
|
||||
case ProjectDataManagement::PdmEventType::PdmEventType_EnterMineArea:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_EnterMineArea;
|
||||
case ProjectDataManagement::PdmEventType::EventType_EnterMineArea:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_EnterMineArea;
|
||||
break;
|
||||
case ProjectDataManagement::PdmEventType::PdmEventType_LeaveMineArea:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_LeaveMineArea;
|
||||
case ProjectDataManagement::PdmEventType::EventType_LeaveMineArea:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_LeaveMineArea;
|
||||
break;
|
||||
case ProjectDataManagement::PdmEventType::PdmEventType_EnterNuclear:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_EnterNuclear;
|
||||
case ProjectDataManagement::PdmEventType::EventType_EnterNuclear:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_EnterNuclear;
|
||||
break;
|
||||
case ProjectDataManagement::PdmEventType::PdmEventType_LeaveNuclear:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_LeaveNuclear;
|
||||
case ProjectDataManagement::PdmEventType::EventType_LeaveNuclear:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_LeaveNuclear;
|
||||
break;
|
||||
case ProjectDataManagement::PdmEventType::PdmEventType_CrossLocalBorderline:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_CrossLocalBorderline;
|
||||
case ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline;
|
||||
obj[QStringLiteral("Global")] = QJsonValue(false);
|
||||
break;
|
||||
case ProjectDataManagement::PdmEventType::PdmEventType_CrossGlobalBorderline:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_CrossGlobalBorderline;
|
||||
case ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline;
|
||||
obj[QStringLiteral("Global")] = QJsonValue(true);
|
||||
break;
|
||||
case ProjectDataManagement::PdmEventType::PdmEventType_EnterFunctionalArea:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_EnterFunctionalArea;
|
||||
case ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea;
|
||||
break;
|
||||
case ProjectDataManagement::PdmEventType::PdmEventType_LeaveFunctionalArea:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_LeaveFunctionalArea;
|
||||
case ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea;
|
||||
break;
|
||||
case ProjectDataManagement::PdmEventType::PdmEventType_EnterHazardDistance:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_EnterHazardDistance;
|
||||
case ProjectDataManagement::PdmEventType::EventType_EnterHazardDistance:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_EnterHazardDistance;
|
||||
break;
|
||||
case ProjectDataManagement::PdmEventType::PdmEventType_LeaveHazardDistance:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_LeaveHazardDistance;
|
||||
case ProjectDataManagement::PdmEventType::EventType_LeaveHazardDistance:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_LeaveHazardDistance;
|
||||
break;
|
||||
case ProjectDataManagement::PdmEventType::PdmEventType_AirSupport:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_AirSupport;
|
||||
case ProjectDataManagement::PdmEventType::EventType_AirSupport:
|
||||
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_AirSupport;
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
|
||||
+2
-2
@@ -131,7 +131,7 @@ AvsData WebSocketAvs::jsonObjectToAvsData(const QJsonObject &obj)
|
||||
ERROR_LOG(m_logger) << "Unknown avsEventType: " << avsEventType;
|
||||
break;
|
||||
}
|
||||
data.eventType = eventType.underlying();
|
||||
data.eventType = eventType;
|
||||
|
||||
int mountingPointId = 0;
|
||||
if (m_avmDtc->mountingPointForStreamName(data.streamName, mountingPointId))
|
||||
@@ -148,7 +148,7 @@ Database::EemEvent WebSocketAvs::avsDataToEemEvent(const AvsData &data)
|
||||
{
|
||||
Database::EemEvent eemEvent;
|
||||
eemEvent.id = data.id;
|
||||
eemEvent.eventTypeId = data.eventType.underlying();
|
||||
eemEvent.eventTypeId = data.eventType;
|
||||
eemEvent.sampleTime = data.eventTime;
|
||||
|
||||
QJsonObject obj;
|
||||
|
||||
Reference in new issue
Block a user