lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removes .IDL warnings: multiple enum definitons and builtin-type collisions

Browse Source
This commit is contained in:
torsten committed 2026-09-14 15:45:58 +00:00
1 parent eb02c1f001
commit be912de9d6
135 files changed
+1122 -1122
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.cpp
+7 -7
View File
@@ -108,7 +108,7 @@ void EemTests::startTest()
tryCreateDynamicParticipantData(1, ProjectDataManagement::VulnerabilityState::CatastrophicKill, time + 3000 * 60, 70, ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice);
QTest::qWait(5000);
checkEvents(ProjectDataManagement::EventType::HitEffectSimulation, 3);
checkEvents(ProjectDataManagement::PdmEventType::HitEffectSimulation, 3);
}
if (m_testId == 3)
@@ -130,7 +130,7 @@ void EemTests::startTest()
tryCreateDynamicParticipantData(2, ProjectDataManagement::VulnerabilityState::LightDamage, time - 5000 * 30, 0, ProjectDataManagement::StateChangeOriginator::Sanitation);
QTest::qWait(500);
checkEvents(ProjectDataManagement::EventType::Sanitation, 3);
checkEvents(ProjectDataManagement::PdmEventType::Sanitation, 3);
}
if (m_testId <= 0 || m_testId > 6)
@@ -264,8 +264,8 @@ void EemTests::trySendFireEvent()
for(const ExerciseEventManagement::Event &e : events)
{
INFO_LOG(m_logger) << "eventId: " << e.id() << ", eventType: " << e.eventTypeId().underlying();
if (e.eventTypeId() == ProjectDataManagement::EventType_def::WeaponAssignment ||
e.eventTypeId() == ProjectDataManagement::EventType_def::FireEvent)
if (e.eventTypeId() == ProjectDataManagement::PdmEventType_def::WeaponAssignment ||
e.eventTypeId() == ProjectDataManagement::PdmEventType_def::FireEvent)
noEvents ++;
}
@@ -368,7 +368,7 @@ void EemTests::tryCreateIed(qint64 time)
}
//-----------------------------------------------------------------------------------------------------------------------
void EemTests::checkEvents(const ProjectDataManagement::EventType &et, int expected)
void EemTests::checkEvents(const ProjectDataManagement::PdmEventType &et, int expected)
{
const QMap<qint64, ExerciseEventManagement::Event> events = m_dtc->events();
@@ -383,9 +383,9 @@ void EemTests::checkEvents(const ProjectDataManagement::EventType &et, int expec
QJsonObject prop = LtsUtils::JsonObject::fromJson(e.properties());
int ot = prop[QStringLiteral("OriginatorType")].toInt();
if (et == ProjectDataManagement::EventType::HitEffectSimulation && ot == 20) //ImprovisedExplosiveDevice
if (et == ProjectDataManagement::PdmEventType::HitEffectSimulation && ot == 20) //ImprovisedExplosiveDevice
noEvents ++;
if (et == ProjectDataManagement::EventType::Sanitation && ot == 10) // Sanitation
if (et == ProjectDataManagement::PdmEventType::Sanitation && ot == 10) // Sanitation
noEvents ++;
}
}
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.h
+1 -1
View File
@@ -42,7 +42,7 @@ protected Q_SLOTS:
void trySendBiteMessage();
void trySendBuildingState();
void tryCreateIed(qint64 time);
void checkEvents(const ProjectDataManagement::EventType &et, int expected);
void checkEvents(const ProjectDataManagement::PdmEventType &et, int expected);
void failExit();
void ExitSuccess();
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ void DdsHandler::setRunningState(Core::RunningState rs)
m_pacemaker->setNewState(rs);
}
void DdsHandler::addPortToPacemaker(quint16 port, Core::PortType type)
void DdsHandler::addPortToPacemaker(quint16 port, Core::CorePortType type)
{
if (!m_pacemaker)
return;
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
bool init(const QStringList &qosFileList = QStringList());
void setRunningState(Core::RunningState rs);
void addPortToPacemaker(quint16 port, Core::PortType type);
void addPortToPacemaker(quint16 port, Core::CorePortType type);
std::shared_ptr<DDSConnector::DdsConnector> ddsConnector() const { return m_ddsConnector; }
std::shared_ptr<ExerciseEventManagement::Interface::Dts> dts() const { return m_ddsDts; }
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp
+12 -12
View File
@@ -160,15 +160,15 @@ void HandlerDynamicParticipantData::tryCreateHitEvent(Database::EemEvent eData,
case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation:
case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice:
case ProjectDataManagement::StateChangeOriginator::DusMine:
eData.eventTypeId = ProjectDataManagement::EventType::HitEffectSimulation;
eData.eventTypeId = ProjectDataManagement::PdmEventType::HitEffectSimulation;
break;
case ProjectDataManagement::StateChangeOriginator::Participant:
case ProjectDataManagement::StateChangeOriginator::ObserverController:
case ProjectDataManagement::StateChangeOriginator::ExerciseControl:
eData.eventTypeId = ProjectDataManagement::EventType::Hit;
eData.eventTypeId = ProjectDataManagement::PdmEventType::Hit;
break;
case ProjectDataManagement::StateChangeOriginator::Sanitation:
eData.eventTypeId = ProjectDataManagement::EventType::Sanitation;
eData.eventTypeId = ProjectDataManagement::PdmEventType::Sanitation;
break;
case ProjectDataManagement::StateChangeOriginator::Unknown:
case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice:
@@ -196,7 +196,7 @@ void HandlerDynamicParticipantData::tryCreateHitEvent(Database::EemEvent eData,
else
obj[QStringLiteral("FriendlyFire")] = false;
}
if (eData.eventTypeId == ProjectDataManagement::EventType::HitEffectSimulation)
if (eData.eventTypeId == ProjectDataManagement::PdmEventType::HitEffectSimulation)
{
DEBUG_LOG(m_logger) << "Event HitEffectSimulation from originatorId = " << stateInfo.originatorId();
obj[QStringLiteral("AesId")] = stateInfo.originatorId();
@@ -205,7 +205,7 @@ void HandlerDynamicParticipantData::tryCreateHitEvent(Database::EemEvent eData,
if (m_aesDtc->aesItemFromId(stateInfo.originatorId(), aesItem))
obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name()));
}
if (eData.eventTypeId == ProjectDataManagement::EventType::Sanitation)
if (eData.eventTypeId == ProjectDataManagement::PdmEventType::Sanitation)
{
// ignore these events
if (stateInfo.sanitationProceduresTaken() == 0 && stateInfo.originatorChargeTypeId() == 0) //qualification
@@ -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::EventType_def::Unknown;
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::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::EventType_def::WeaponAssignment;
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::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::EventType_def::Manipulation;
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::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::EventType_def::FireEvent;
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::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::EventType_def::BiteMessage;
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::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::EventType_def::HitBuilding;
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::HitBuilding;
eData.sampleTime = data.sampleTime();
QJsonObject obj;
@@ -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::EventType_def::HitBuilding)
if (data.eventTypeId == ProjectDataManagement::PdmEventType_def::HitBuilding)
{
int mainStructureElementId = LtsUtils::JsonObject::fromJson(ddsData.properties()).valueOr<int>(QStringLiteral("MainStructureElementId"), 0);
DEBUG_LOG(m_logger) << "MainStructureElementId=" << mainStructureElementId;
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.cpp
+1 -1
View File
@@ -85,7 +85,7 @@ void HandlerEquipmentErrorRegistration::onEquipmentErrorRegistrationChanged(cons
Database::EemEvent eData;
eData.sampleTime = data.sampleTime();
eData.equipmentNumber = data.equipmentNumber();
eData.eventTypeId = ProjectDataManagement::EventType_def::EquipmentErrorReport;
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::EquipmentErrorReport;
QJsonObject obj;
obj[QStringLiteral("text")] = QString::fromStdString(data.text());
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.cpp
+50 -50
View File
@@ -111,7 +111,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
obj[QStringLiteral("AesType")] = QJsonValue(data.aesTypeId().underlying());
eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
eData.eventTypeId = ProjectDataManagement::EventType::Borderline;
eData.eventTypeId = ProjectDataManagement::PdmEventType::Borderline;
eData.position = LtsUtils::QPoint3D(data.boundingBoxBottomLeft().lon(),
data.boundingBoxBottomLeft().lat(), 0.0);
@@ -145,39 +145,39 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
switch (data.aesTypeId().underlying())
{
case AreaEffectSimulation::AesType::AtMineArea:
eData.eventTypeId = ProjectDataManagement::EventType::MineArea;
eData.eventTypeId = ProjectDataManagement::PdmEventType::MineArea;
break;
case AreaEffectSimulation::AesType::AtExplosionArea:
eData.eventTypeId = ProjectDataManagement::EventType::HitEffectSimulation;
eData.eventTypeId = ProjectDataManagement::PdmEventType::HitEffectSimulation;
break;
case AreaEffectSimulation::AesType::AtExplosionCluster:
eData.eventTypeId = ProjectDataManagement::EventType::ExplosionCluster;
eData.eventTypeId = ProjectDataManagement::PdmEventType::ExplosionCluster;
break;
case AreaEffectSimulation::AesType::AtMineAreaSingleMines:
return;
case AreaEffectSimulation::AesType::AtNContamination:
eData.eventTypeId = ProjectDataManagement::EventType::NContamination;
eData.eventTypeId = ProjectDataManagement::PdmEventType::NContamination;
break;
case AreaEffectSimulation::AesType::AtBCContamination:
eData.eventTypeId = ProjectDataManagement::EventType::BCContamination;
eData.eventTypeId = ProjectDataManagement::PdmEventType::BCContamination;
break;
case AreaEffectSimulation::AesType::AtBorderline:
eData.eventTypeId = ProjectDataManagement::EventType::Borderline;
eData.eventTypeId = ProjectDataManagement::PdmEventType::Borderline;
break;
case AreaEffectSimulation::AesType::AtDangerArea:
eData.eventTypeId = ProjectDataManagement::EventType::DangerArea;
eData.eventTypeId = ProjectDataManagement::PdmEventType::DangerArea;
break;
case AreaEffectSimulation::AesType::AtFunctionalArea:
eData.eventTypeId = ProjectDataManagement::EventType::FunctionalArea;
eData.eventTypeId = ProjectDataManagement::PdmEventType::FunctionalArea;
break;
case AreaEffectSimulation::AesType::AtMineCorridor:
eData.eventTypeId = ProjectDataManagement::EventType::MineCorridor;
eData.eventTypeId = ProjectDataManagement::PdmEventType::MineCorridor;
break;
case AreaEffectSimulation::AesType::AtTechnicalArea:
eData.eventTypeId = ProjectDataManagement::EventType::TechnicalArea;
eData.eventTypeId = ProjectDataManagement::PdmEventType::TechnicalArea;
break;
case AreaEffectSimulation::AesType::AtGasPipe:
eData.eventTypeId = ProjectDataManagement::EventType::GasPipe;
eData.eventTypeId = ProjectDataManagement::PdmEventType::GasPipe;
break;
// No ExerciseEvent for AesType
default:
@@ -190,11 +190,11 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
AreaEffectSimulation::AesItem aesItem;
m_aesDtc->aesItemFromId(data.aesItemId(), aesItem);
if (eData.eventTypeId == ProjectDataManagement::EventType::ExplosionCluster)
if (eData.eventTypeId == ProjectDataManagement::PdmEventType::ExplosionCluster)
{
ProjectDataManagement::GearClass gearClass = m_pdmDtc->gearClassFromChargeTypeId(aesItem.chargeStruct().chargeTypeId());
if (gearClass == ProjectDataManagement::GearClass_def::AirSupport)
eData.eventTypeId = ProjectDataManagement::EventType::AirSupport;
eData.eventTypeId = ProjectDataManagement::PdmEventType::AirSupport;
}
QJsonObject obj;
@@ -269,7 +269,7 @@ void HandlerParticipantEvent::onExplosionSingleChanged(const AreaEffectSimulatio
m_aesEffectState.insert(data.id(), data.effectStateId());
//m_itemViews.insert(data.id(), data.aesTypeId());
eData.eventTypeId = ProjectDataManagement::EventType::FireEvent;
eData.eventTypeId = ProjectDataManagement::PdmEventType::FireEvent;
AreaEffectSimulation::AesItem aesItem;
m_aesDtc->aesItemFromId(data.id(), aesItem);
@@ -328,7 +328,7 @@ void HandlerParticipantEvent::onParticipantEventChanged(const CentralEffectSimul
<< " position=" << data.position()
<< " eData.position=" << eData.position;
eData.eventTypeId = ProjectDataManagement::EventType_def::Unknown;
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::Unknown;
QJsonObject obj;
obj[QStringLiteral("AesId")] = QJsonValue(data.aesItemId());
@@ -338,58 +338,58 @@ void HandlerParticipantEvent::onParticipantEventChanged(const CentralEffectSimul
switch(data.eventTypeId().underlying())
{
case ProjectDataManagement::EventType_def::HitEffectSimulation:
eData.eventTypeId = ProjectDataManagement::EventType_def::HitEffectSimulation;
case ProjectDataManagement::PdmEventType_def::HitEffectSimulation:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::HitEffectSimulation;
break;
case ProjectDataManagement::EventType_def::HitMine:
eData.eventTypeId = ProjectDataManagement::EventType_def::HitMine;
case ProjectDataManagement::PdmEventType_def::HitMine:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::HitMine;
break;
case ProjectDataManagement::EventType_def::HitN:
eData.eventTypeId = ProjectDataManagement::EventType_def::HitN;
case ProjectDataManagement::PdmEventType_def::HitN:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::HitN;
break;
case ProjectDataManagement::EventType_def::HitC:
eData.eventTypeId = ProjectDataManagement::EventType_def::HitC;
case ProjectDataManagement::PdmEventType_def::HitC:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::HitC;
break;
case ProjectDataManagement::EventType_def::EnterDangerArea:
eData.eventTypeId = ProjectDataManagement::EventType_def::EnterDangerArea;
case ProjectDataManagement::PdmEventType_def::EnterDangerArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::EnterDangerArea;
break;
case ProjectDataManagement::EventType_def::LeaveDangerArea:
eData.eventTypeId = ProjectDataManagement::EventType_def::LeaveDangerArea;
case ProjectDataManagement::PdmEventType_def::LeaveDangerArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::LeaveDangerArea;
break;
case ProjectDataManagement::EventType_def::EnterMineArea:
eData.eventTypeId = ProjectDataManagement::EventType_def::EnterMineArea;
case ProjectDataManagement::PdmEventType_def::EnterMineArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::EnterMineArea;
break;
case ProjectDataManagement::EventType_def::LeaveMineArea:
eData.eventTypeId = ProjectDataManagement::EventType_def::LeaveMineArea;
case ProjectDataManagement::PdmEventType_def::LeaveMineArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::LeaveMineArea;
break;
case ProjectDataManagement::EventType_def::EnterNuclear:
eData.eventTypeId = ProjectDataManagement::EventType_def::EnterNuclear;
case ProjectDataManagement::PdmEventType_def::EnterNuclear:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::EnterNuclear;
break;
case ProjectDataManagement::EventType_def::LeaveNuclear:
eData.eventTypeId = ProjectDataManagement::EventType_def::LeaveNuclear;
case ProjectDataManagement::PdmEventType_def::LeaveNuclear:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::LeaveNuclear;
break;
case ProjectDataManagement::EventType_def::CrossLocalBorderline:
eData.eventTypeId = ProjectDataManagement::EventType_def::CrossLocalBorderline;
case ProjectDataManagement::PdmEventType_def::CrossLocalBorderline:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::CrossLocalBorderline;
obj[QStringLiteral("Global")] = QJsonValue(false);
break;
case ProjectDataManagement::EventType_def::CrossGlobalBorderline:
eData.eventTypeId = ProjectDataManagement::EventType_def::CrossGlobalBorderline;
case ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline;
obj[QStringLiteral("Global")] = QJsonValue(true);
break;
case ProjectDataManagement::EventType_def::EnterFunctionalArea:
eData.eventTypeId = ProjectDataManagement::EventType_def::EnterFunctionalArea;
case ProjectDataManagement::PdmEventType_def::EnterFunctionalArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::EnterFunctionalArea;
break;
case ProjectDataManagement::EventType_def::LeaveFunctionalArea:
eData.eventTypeId = ProjectDataManagement::EventType_def::LeaveFunctionalArea;
case ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea;
break;
case ProjectDataManagement::EventType_def::EnterHazardDistance:
eData.eventTypeId = ProjectDataManagement::EventType_def::EnterHazardDistance;
case ProjectDataManagement::PdmEventType_def::EnterHazardDistance:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::EnterHazardDistance;
break;
case ProjectDataManagement::EventType_def::LeaveHazardDistance:
eData.eventTypeId = ProjectDataManagement::EventType_def::LeaveHazardDistance;
case ProjectDataManagement::PdmEventType_def::LeaveHazardDistance:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::LeaveHazardDistance;
break;
case ProjectDataManagement::EventType_def::AirSupport:
eData.eventTypeId = ProjectDataManagement::EventType_def::AirSupport;
case ProjectDataManagement::PdmEventType_def::AirSupport:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::AirSupport;
break;
default:
return;
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/main_handler.cpp
+1 -1
View File
@@ -147,7 +147,7 @@ bool MainHandler::loadFromDatabase()
ERROR_LOG(m_logger) << "Can not initialize WebSocket Event server";
return false;
}
m_ddsHandler->addPortToPacemaker(m_webSocketEventServer->listenPort(), Core::PortType::WebSocketServer);
m_ddsHandler->addPortToPacemaker(m_webSocketEventServer->listenPort(), Core::CorePortType::WebSocketServer);
if (!m_handlerEerEvent || !m_handlerEerEvent->init())
{
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp
+17 -17
View File
@@ -21,24 +21,24 @@
#include <ngldb/nsqlquery.h>
ProjectDataManagement::EventType avsEventTypeToPdmEventType(int avsEventType)
ProjectDataManagement::PdmEventType avsEventTypeToPdmEventType(int avsEventType)
{
ProjectDataManagement::EventType eventType;
ProjectDataManagement::PdmEventType eventType;
switch(avsEventType)
{
case 305: //MVS
case 301: // CAMERA_AUDIO
case 302: // CAMERA_VIDEO
eventType = ProjectDataManagement::EventType::CameraVideo;
eventType = ProjectDataManagement::PdmEventType::CameraVideo;
break;
case 303: // RADIO_CNR
eventType = ProjectDataManagement::EventType::RadioCnr;
eventType = ProjectDataManagement::PdmEventType::RadioCnr;
break;
case 304: // RADIO_TVC
eventType = ProjectDataManagement::EventType::RadioTvc;
eventType = ProjectDataManagement::PdmEventType::RadioTvc;
break;
default:
eventType = ProjectDataManagement::EventType::Unknown;
eventType = ProjectDataManagement::PdmEventType::Unknown;
break;
}
return eventType;
@@ -113,21 +113,21 @@ AvsData WebSocketAvs::jsonObjectToAvsData(const QJsonObject &obj)
data.streamName = obj[QStringLiteral("streamName")].toString();
int avsEventType = obj[QStringLiteral("eventType")].toInt();
ProjectDataManagement::EventType eventType;
ProjectDataManagement::PdmEventType eventType;
switch(avsEventType)
{
case 301: // CAMERA_AUDIO
case 302: // CAMERA_VIDEO
eventType = ProjectDataManagement::EventType::CameraVideo;
eventType = ProjectDataManagement::PdmEventType::CameraVideo;
break;
case 303: // RADIO_CNR
eventType = ProjectDataManagement::EventType::RadioCnr;
eventType = ProjectDataManagement::PdmEventType::RadioCnr;
break;
case 304: // RADIO_TVC
eventType = ProjectDataManagement::EventType::RadioTvc;
eventType = ProjectDataManagement::PdmEventType::RadioTvc;
break;
default:
eventType = ProjectDataManagement::EventType::Unknown;
eventType = ProjectDataManagement::PdmEventType::Unknown;
ERROR_LOG(m_logger) << "Unknown avsEventType: " << avsEventType;
break;
}
@@ -216,7 +216,7 @@ void WebSocketAvs::handleAvsData(const AvsData &data, const bool &lastRangeClose
DEBUG_LOG(m_logger) << "kein Publish (avsData.endTime == -1) && (data.endTime == -1)";
return;
}
if ( (data.endTime == -1) && (data.eventType == ProjectDataManagement::EventType::RadioCnr))
if ( (data.endTime == -1) && (data.eventType == ProjectDataManagement::PdmEventType::RadioCnr))
{
DEBUG_LOG(m_logger) << "kein Publish (avsData.endTime == -1) && RadioCnr";
return;
@@ -501,7 +501,7 @@ void WebSocketAvs::onCleanUpDbInternal()
if (!collection.contains(eItem.eventTime))
{
AvsData add = eItem;
bool checkMsi = eItem.eventType == ProjectDataManagement::EventType::CameraVideo;
bool checkMsi = eItem.eventType == ProjectDataManagement::PdmEventType::CameraVideo;
int mountingPointId = 0;
if (checkMsi && m_avmDtc->mountingPointForStreamName(eItem.streamName, mountingPointId))
@@ -520,7 +520,7 @@ void WebSocketAvs::onCleanUpDbInternal()
}
for ( auto item : list)
{
bool checkMsi = eItem.eventType == ProjectDataManagement::EventType::CameraVideo;
bool checkMsi = eItem.eventType == ProjectDataManagement::PdmEventType::CameraVideo;
if (item.endTime == eItem.endTime )
{
@@ -672,9 +672,9 @@ QMap<QString, QVector<AvsData>> WebSocketAvs::getAllInternalDbData()
QVector<Database::EemEvent> dataVec;
//qCritical() << "START reading internal db ";
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::EventType::CameraVideo);
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::EventType::RadioCnr);
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::EventType::RadioTvc);
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::CameraVideo);
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::RadioCnr);
m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::RadioTvc);
// m_dbHandler->db()->select(dataVec);
//qCritical() << "END select reading internal db ";
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.h
+2 -2
View File
@@ -36,7 +36,7 @@ struct AvsData
int id;
qint64 eventTime;
qint64 endTime;
ProjectDataManagement::EventType eventType;
ProjectDataManagement::PdmEventType eventType;
QString streamName;
int mainStructureElementId;
QSharedPointer<QTimer> timer; // no plain ptr here since AvsData is copied
@@ -44,7 +44,7 @@ struct AvsData
: id(0)
, eventTime(0)
, endTime(-1)
, eventType(ProjectDataManagement::EventType::Unknown)
, eventType(ProjectDataManagement::PdmEventType::Unknown)
, mainStructureElementId(0)
, timer(new QTimer)
{
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp
+1 -1
View File
@@ -232,7 +232,7 @@ void WebSocketEventServer::historyDataRequested(const QSqlDatabase &db, QWebSock
{
int i = 0;
data.id = q.value(i++).toInt();
data.eventTypeId = static_cast<ProjectDataManagement::EventType_def::type>(q.value(i++).toInt());
data.eventTypeId = static_cast<ProjectDataManagement::PdmEventType_def::type>(q.value(i++).toInt());
data.participantId = q.value(i++).toInt();
data.partyId = q.value(i++).toInt();
data.equipmentNumber = q.value(i++).toInt();