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

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

No files matched your search

@@ -66,7 +66,7 @@ static ExerciseEventManagement::Event db2dds(const ExerciseEventManagement::Data
ev.equipmentNumber(evDb.equipmentNumber);
ev.properties(evDb.properties.toUtf8().data());
if ( ev.eventTypeId() == ProjectDataManagement::EventType_def::HitBuilding)
if ( ev.eventTypeId() == ProjectDataManagement::PdmEventType_def::HitBuilding)
{
QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(ev.properties()).toUtf8()).object();
@@ -247,7 +247,7 @@ void ForeignInterfaceImpl::textMessageFromScm(const QString &message)
{
const QJsonObject &port = valPort.toObject();
int typeId = port.value(QStringLiteral("typeId")).toInt();
if (typeId == Core::PortType::WebSocketServer)
if (typeId == Core::CorePortType::WebSocketServer)
{
m_eemPort = port.value(QStringLiteral("number")).toInt();
connectToEem();
@@ -72,8 +72,8 @@ void CrossBorderlineFilter::updateFilterString()
}
m_filterString = QStringLiteral(" WHEN event_type_id = %1 OR event_type_id = %2")
.arg(int(ProjectDataManagement::EventType_def::CrossLocalBorderline))
.arg(int(ProjectDataManagement::EventType_def::CrossGlobalBorderline));
.arg(int(ProjectDataManagement::PdmEventType_def::CrossLocalBorderline))
.arg(int(ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline));
if (m_attributes[CrossBorderlineEventFactory::s_global].isEmpty() &&
m_attributes[CrossBorderlineEventFactory::s_sampleTime].isEmpty())
@@ -477,7 +477,7 @@ void TimelineDialog::onDebugCreateFakeEvent()
}
m_model->onLiveEvent(ExerciseEventManagement::Event(uniqueId, start,
ProjectDataManagement::EventType(static_cast<ProjectDataManagement::EventType::inner_enum>(typeId)),
ProjectDataManagement::PdmEventType(static_cast<ProjectDataManagement::PdmEventType::inner_enum>(typeId)),
participantId, partyId, eqId, te->toPlainText().toStdString(), {}));
});
@@ -608,9 +608,9 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
auto updateItem = [this, &properties, &eemEvent](Item &i, Track &t)
{
int type = (int)eemEvent.eventTypeId().underlying();
if (type == ProjectDataManagement::EventType_def::CameraVideo
|| type == ProjectDataManagement::EventType_def::RadioTvc
|| type == ProjectDataManagement::EventType_def::RadioCnr)
if (type == ProjectDataManagement::PdmEventType_def::CameraVideo
|| type == ProjectDataManagement::PdmEventType_def::RadioTvc
|| type == ProjectDataManagement::PdmEventType_def::RadioCnr)
{
int duration = properties[QStringLiteral("duration")].toInt(0);
@@ -722,8 +722,8 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
EventType eventType = static_cast<EventType>(static_cast<int>(eemEvent.eventTypeId().underlying()));
if (eemEvent.eventTypeId().underlying() == ProjectDataManagement::EventType_def::CrossGlobalBorderline ||
eemEvent.eventTypeId().underlying() == ProjectDataManagement::EventType_def::CrossLocalBorderline)
if (eemEvent.eventTypeId().underlying() == ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline ||
eemEvent.eventTypeId().underlying() == ProjectDataManagement::PdmEventType_def::CrossLocalBorderline)
eventType = EventType::CrossBorderline;
EventItemPtr eventItem;
@@ -13,115 +13,115 @@ QString eventTypeString(EventType eventType)
switch (eventType)
{
case EventType::Hit:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::Hit);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Hit);
case EventType::WeaponAssignment:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::WeaponAssignment);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::WeaponAssignment);
case EventType::BiteMessage:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::BiteMessage);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::BiteMessage);
case EventType::FireEvent:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::FireEvent);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::FireEvent);
case EventType::HitBuilding:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::HitBuilding);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitBuilding);
case EventType::Manipulation:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::Manipulation);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Manipulation);
case EventType::CameraVideo:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::CameraVideo);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::CameraVideo);
case EventType::RadioCnr:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::RadioCnr);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::RadioCnr);
case EventType::RadioTvc:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::RadioTvc);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::RadioTvc);
case EventType::HitEffectSimulation:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::HitEffectSimulation);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitEffectSimulation);
case EventType::HitMine:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::HitMine);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitMine);
case EventType::HitN:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::HitN);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitN);
case EventType::HitC:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::HitC);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitC);
case EventType::EnterDangerArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::EnterDangerArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EnterDangerArea);
case EventType::LeaveDangerArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::LeaveDangerArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::LeaveDangerArea);
case EventType::EnterMineArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::EnterMineArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EnterMineArea);
case EventType::LeaveMineArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::LeaveMineArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::LeaveMineArea);
case EventType::CrossBorderline:
return QCoreApplication::translate("EventType", "CrossBorderline");
case EventType::EnterFunctionalArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::EnterFunctionalArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EnterFunctionalArea);
case EventType::LeaveFunctionalArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::LeaveFunctionalArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea);
case EventType::EnterNuclear:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::EnterNuclear);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EnterNuclear);
case EventType::LeaveNuclear:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::LeaveNuclear);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::LeaveNuclear);
case EventType::HitB:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::HitB);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitB);
case EventType::FriendlyFire:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::FriendlyFire);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::FriendlyFire);
case EventType::HitGasPipe:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::HitGasPipe);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitGasPipe);
case EventType::MineArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::MineArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::MineArea);
case EventType::NContamination:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::NContamination);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::NContamination);
case EventType::BCContamination:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::BCContamination);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::BCContamination);
case EventType::DangerArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::DangerArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::DangerArea);
case EventType::FunctionalArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::FunctionalArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::FunctionalArea);
case EventType::MineCorridor:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::MineCorridor);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::MineCorridor);
case EventType::Borderline:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::Borderline);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Borderline);
case EventType::TechnicalArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::TechnicalArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::TechnicalArea);
case EventType::GasPipe:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::GasPipe);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::GasPipe);
case EventType::Sanitation:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::Sanitation);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Sanitation);
case EventType::EquipmentErrorReport:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::EquipmentErrorReport);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EquipmentErrorReport);
case EventType::EmergencyCall:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::EmergencyCall);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EmergencyCall);
case EventType::Marker:
return QCoreApplication::translate("EventType", "Marker");
@@ -131,7 +131,7 @@ QString eventTypeString(EventType eventType)
case EventType::Unknown:
default:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::Unknown);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Unknown);
}
Q_UNREACHABLE();
}
@@ -191,8 +191,8 @@ EventType toEventType(int eventType)
case EventType::LeaveMineArea:
return EventType::LeaveMineArea;
case ProjectDataManagement::EventType_def::CrossLocalBorderline:
case ProjectDataManagement::EventType_def::CrossGlobalBorderline:
case ProjectDataManagement::PdmEventType_def::CrossLocalBorderline:
case ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline:
return EventType::CrossBorderline;
case EventType::EnterFunctionalArea:
@@ -10,46 +10,46 @@ namespace Timeline
enum EventType
{
Unknown = ProjectDataManagement::EventType_def::Unknown,
Hit = ProjectDataManagement::EventType_def::Hit,
WeaponAssignment = ProjectDataManagement::EventType_def::WeaponAssignment,
BiteMessage = ProjectDataManagement::EventType_def::BiteMessage,
FireEvent = ProjectDataManagement::EventType_def::FireEvent,
HitBuilding = ProjectDataManagement::EventType_def::HitBuilding,
Manipulation = ProjectDataManagement::EventType_def::Manipulation,
CameraVideo = ProjectDataManagement::EventType_def::CameraVideo,
RadioCnr = ProjectDataManagement::EventType_def::RadioCnr,
RadioTvc = ProjectDataManagement::EventType_def::RadioTvc,
HitEffectSimulation = ProjectDataManagement::EventType_def::HitEffectSimulation,
HitMine = ProjectDataManagement::EventType_def::HitMine,
HitN = ProjectDataManagement::EventType_def::HitN,
HitC = ProjectDataManagement::EventType_def::HitC,
EnterDangerArea = ProjectDataManagement::EventType_def::EnterDangerArea,
LeaveDangerArea = ProjectDataManagement::EventType_def::LeaveDangerArea,
EnterMineArea = ProjectDataManagement::EventType_def::EnterMineArea,
LeaveMineArea = ProjectDataManagement::EventType_def::LeaveMineArea,
CrossBorderline = ProjectDataManagement::EventType_def::CrossLocalBorderline,
Unknown = ProjectDataManagement::PdmEventType_def::Unknown,
Hit = ProjectDataManagement::PdmEventType_def::Hit,
WeaponAssignment = ProjectDataManagement::PdmEventType_def::WeaponAssignment,
BiteMessage = ProjectDataManagement::PdmEventType_def::BiteMessage,
FireEvent = ProjectDataManagement::PdmEventType_def::FireEvent,
HitBuilding = ProjectDataManagement::PdmEventType_def::HitBuilding,
Manipulation = ProjectDataManagement::PdmEventType_def::Manipulation,
CameraVideo = ProjectDataManagement::PdmEventType_def::CameraVideo,
RadioCnr = ProjectDataManagement::PdmEventType_def::RadioCnr,
RadioTvc = ProjectDataManagement::PdmEventType_def::RadioTvc,
HitEffectSimulation = ProjectDataManagement::PdmEventType_def::HitEffectSimulation,
HitMine = ProjectDataManagement::PdmEventType_def::HitMine,
HitN = ProjectDataManagement::PdmEventType_def::HitN,
HitC = ProjectDataManagement::PdmEventType_def::HitC,
EnterDangerArea = ProjectDataManagement::PdmEventType_def::EnterDangerArea,
LeaveDangerArea = ProjectDataManagement::PdmEventType_def::LeaveDangerArea,
EnterMineArea = ProjectDataManagement::PdmEventType_def::EnterMineArea,
LeaveMineArea = ProjectDataManagement::PdmEventType_def::LeaveMineArea,
CrossBorderline = ProjectDataManagement::PdmEventType_def::CrossLocalBorderline,
EnterFunctionalArea = ProjectDataManagement::EventType_def::EnterFunctionalArea,
LeaveFunctionalArea = ProjectDataManagement::EventType_def::LeaveFunctionalArea,
EnterNuclear = ProjectDataManagement::EventType_def::EnterNuclear,
LeaveNuclear = ProjectDataManagement::EventType_def::LeaveNuclear,
EnterFunctionalArea = ProjectDataManagement::PdmEventType_def::EnterFunctionalArea,
LeaveFunctionalArea = ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea,
EnterNuclear = ProjectDataManagement::PdmEventType_def::EnterNuclear,
LeaveNuclear = ProjectDataManagement::PdmEventType_def::LeaveNuclear,
HitB = ProjectDataManagement::EventType_def::HitB,
FriendlyFire = ProjectDataManagement::EventType_def::FriendlyFire,
HitGasPipe = ProjectDataManagement::EventType_def::HitGasPipe,
MineArea = ProjectDataManagement::EventType_def::MineArea,
NContamination = ProjectDataManagement::EventType_def::NContamination,
BCContamination = ProjectDataManagement::EventType_def::BCContamination,
DangerArea = ProjectDataManagement::EventType_def::DangerArea,
FunctionalArea = ProjectDataManagement::EventType_def::FunctionalArea,
MineCorridor = ProjectDataManagement::EventType_def::MineCorridor,
Borderline = ProjectDataManagement::EventType_def::Borderline,
TechnicalArea = ProjectDataManagement::EventType_def::TechnicalArea,
GasPipe = ProjectDataManagement::EventType_def::GasPipe,
Sanitation = ProjectDataManagement::EventType_def::Sanitation,
EquipmentErrorReport = ProjectDataManagement::EventType_def::EquipmentErrorReport,
EmergencyCall = ProjectDataManagement::EventType_def::EmergencyCall,
HitB = ProjectDataManagement::PdmEventType_def::HitB,
FriendlyFire = ProjectDataManagement::PdmEventType_def::FriendlyFire,
HitGasPipe = ProjectDataManagement::PdmEventType_def::HitGasPipe,
MineArea = ProjectDataManagement::PdmEventType_def::MineArea,
NContamination = ProjectDataManagement::PdmEventType_def::NContamination,
BCContamination = ProjectDataManagement::PdmEventType_def::BCContamination,
DangerArea = ProjectDataManagement::PdmEventType_def::DangerArea,
FunctionalArea = ProjectDataManagement::PdmEventType_def::FunctionalArea,
MineCorridor = ProjectDataManagement::PdmEventType_def::MineCorridor,
Borderline = ProjectDataManagement::PdmEventType_def::Borderline,
TechnicalArea = ProjectDataManagement::PdmEventType_def::TechnicalArea,
GasPipe = ProjectDataManagement::PdmEventType_def::GasPipe,
Sanitation = ProjectDataManagement::PdmEventType_def::Sanitation,
EquipmentErrorReport = ProjectDataManagement::PdmEventType_def::EquipmentErrorReport,
EmergencyCall = ProjectDataManagement::PdmEventType_def::EmergencyCall,
Marker = 666,
Block = 999,
};
@@ -34,35 +34,35 @@ AttributeValueMap AvmChargeType::getAttributeValueMap(int eventType) const
case EventType::Hit:
case EventType::WeaponAssignment:
case EventType::FireEvent:
charges = m_dtc->chargesForGearClass(GearClass::DuelSim);
charges = m_dtc->chargesForGearClass(GearClass::GearClass_DuelSim);
break;
case EventType::HitBuilding:
charges = m_dtc->chargesForGearClass(GearClass::DuelSim);
charges = m_dtc->chargesForGearClass(GearClass::GearClass_DuelSim);
Q_FALLTHROUGH();
case EventType::HitEffectSimulation:
charges += m_dtc->chargesForGearClass(GearClass::Artillery);
charges += m_dtc->chargesForGearClass(GearClass::Mortar);
charges += m_dtc->chargesForGearClass(GearClass::Geopairing);
charges += m_dtc->chargesForGearClass(GearClass::AirSupport);
charges += m_dtc->chargesForGearClass(GearClass::MineArea);
charges += m_dtc->chargesForGearClass(GearClass::Biological);
charges += m_dtc->chargesForGearClass(GearClass::Chemical);
charges += m_dtc->chargesForGearClass(GearClass::GearClass_Artillery);
charges += m_dtc->chargesForGearClass(GearClass::GearClass_Mortar);
charges += m_dtc->chargesForGearClass(GearClass::GearClass_Geopairing);
charges += m_dtc->chargesForGearClass(GearClass::GearClass_AirSupport);
charges += m_dtc->chargesForGearClass(GearClass::GearClass_MineArea);
charges += m_dtc->chargesForGearClass(GearClass::GearClass_Biological);
charges += m_dtc->chargesForGearClass(GearClass::GearClass_Chemical);
break;
case EventType::HitB:
charges = m_dtc->chargesForGearClass(GearClass::Biological);
charges = m_dtc->chargesForGearClass(GearClass::GearClass_Biological);
break;
case EventType::HitC:
charges = m_dtc->chargesForGearClass(GearClass::Chemical);
charges = m_dtc->chargesForGearClass(GearClass::GearClass_Chemical);
break;
case EventType::BCContamination:
charges = m_dtc->chargesForGearClass(GearClass::Biological);
charges += m_dtc->chargesForGearClass(GearClass::Chemical);
charges = m_dtc->chargesForGearClass(GearClass::GearClass_Biological);
charges += m_dtc->chargesForGearClass(GearClass::GearClass_Chemical);
break;
case EventType::HitMine:
case EventType::EnterMineArea:
case EventType::LeaveMineArea:
case EventType::MineArea:
charges = m_dtc->chargesForGearClass(GearClass::MineArea);
charges = m_dtc->chargesForGearClass(GearClass::GearClass_MineArea);
break;
}
@@ -101,7 +101,7 @@ AttributeValueMap AvmGearType::getAttributeValueMap(int eventType) const
AttributeValueMap ret;
for (const auto &data : gearTypes)
{
if (data.gearClassId() == GearClass::DuelSim &&
if (data.gearClassId() == GearClass::GearClass_DuelSim &&
data.tasCode() != 0)
ret.insert(data.id(), m_dtc->trGearTypeName(data.id()));
}
@@ -250,7 +250,7 @@ AttributeValueMap AvmStreamName::getAttributeValueMap(int eventType) const
switch (eventType)
{
case ProjectDataManagement::EventType::RadioCnr:
case ProjectDataManagement::PdmEventType::RadioCnr:
{
auto cb = [&ret](const AudioVideoManagement::CnrConfig &cnrConfig) -> void
{
@@ -259,7 +259,7 @@ AttributeValueMap AvmStreamName::getAttributeValueMap(int eventType) const
m_dtc->cnrConfigs(cb);
break;
}
case ProjectDataManagement::EventType::RadioTvc:
case ProjectDataManagement::PdmEventType::RadioTvc:
{
auto cb = [&ret](const AudioVideoManagement::TvcConfig &tvcConfig) -> void
{
@@ -268,7 +268,7 @@ AttributeValueMap AvmStreamName::getAttributeValueMap(int eventType) const
m_dtc->tvcConfigs(cb);
break;
}
case ProjectDataManagement::EventType::CameraVideo:
case ProjectDataManagement::PdmEventType::CameraVideo:
{
auto cb = [this, &ret](const AudioVideoManagement::Stream &stream) -> void
{
@@ -79,7 +79,7 @@ void DetailData::addEventType(int eventTypeId, const QString &eventTypeString)
}
void DetailData::addEventType(const ProjectDataManagement::EventType &eventType)
void DetailData::addEventType(const ProjectDataManagement::PdmEventType &eventType)
{
addEventType(eventType.underlying(), ProjectDataManagement::toString(eventType));
}
@@ -195,7 +195,7 @@ void DetailData::populate()
case EventType::DangerArea:
case EventType::FunctionalArea:
case EventType::MineCorridor:
case ProjectDataManagement::EventType::GasPipe:
case ProjectDataManagement::PdmEventType::GasPipe:
attributeEventLookup.addAttributesToEvent(eventType, {QStringLiteral("AesName"),
QStringLiteral("duration")});
break;
@@ -642,7 +642,7 @@ void DetailData::AttributeEventLookup::addAttributesToEvent(const int eventType,
al += attributeTypeList;
}
void DetailData::AttributeEventLookup::addAttributesToEvent(const ProjectDataManagement::EventType &eventType, const AttributeList &attributeTypeList)
void DetailData::AttributeEventLookup::addAttributesToEvent(const ProjectDataManagement::PdmEventType &eventType, const AttributeList &attributeTypeList)
{
addAttributesToEvent(eventType.underlying(), attributeTypeList);
}
@@ -130,7 +130,7 @@ private:
}
void addEventType(int eventTypeId, const QString &eventTypeString);
void addEventType(const ProjectDataManagement::EventType &eventType);
void addEventType(const ProjectDataManagement::PdmEventType &eventType);
GetDetailDataForAttributeResult getDetailDataForAttribute(const QString &attributeType, const QJsonValue &attributeValueJson);
@@ -198,7 +198,7 @@ public:
AttributeEventLookup();
void addAttributesToEvent(const int eventType, const AttributeList &attributeTypeList);
void addAttributesToEvent(const ProjectDataManagement::EventType &eventType, const AttributeList &attributeTypeList);
void addAttributesToEvent(const ProjectDataManagement::PdmEventType &eventType, const AttributeList &attributeTypeList);
bool isAttributeInEvent(const int eventType, const QString &attributeType);
AttributeList getEventsAttributeList(const int eventType) const;
@@ -1005,7 +1005,7 @@ void TimelineViewDialog::slotShowEventDetails(const Event *event)
{
switch (event->typeId())
{
case ProjectDataManagement::EventType::BiteMessage:
case ProjectDataManagement::PdmEventType::BiteMessage:
{
m_ppmInfoIfc->showBiteWindow(event->detailData());
break;
@@ -143,7 +143,7 @@ void DDSTimelineModel::slotAddLiveEventsFake()
ExerciseEventManagement::Event event;
event.id(testLiveEventId++);
event.eventTypeId(ProjectDataManagement::EventType::Hit);
event.eventTypeId(ProjectDataManagement::PdmEventType::Hit);
event.sampleTime(currentTime());
event.properties(QStringLiteral("{}").toStdString());
@@ -552,52 +552,52 @@ void DDSTimelineModel::slotRequestMessageReceived(const QString &message)
switch (eventTypeId)
{
case ProjectDataManagement::EventType::HitBuilding:
case ProjectDataManagement::PdmEventType::HitBuilding:
path = getPathForBuildingEvents(tr("Buildings"), root);
break;
case ProjectDataManagement::EventType::CameraVideo:
case ProjectDataManagement::PdmEventType::CameraVideo:
path = getPathForAvsEvents(tr("Camera Video"), root);
break;
case ProjectDataManagement::EventType::RadioCnr:
case ProjectDataManagement::PdmEventType::RadioCnr:
path = getPathForAvsEvents(tr("CNR Radio"), root);
break;
case ProjectDataManagement::EventType::RadioTvc:
case ProjectDataManagement::PdmEventType::RadioTvc:
path = getPathForAvsEvents(tr("TVC Radio"), root);
break;
case ProjectDataManagement::EventType_def::MineArea:
case ProjectDataManagement::PdmEventType_def::MineArea:
path = getPathForAesEvents(tr("Mine Area"), root);
break;
case ProjectDataManagement::EventType_def::Borderline:
case ProjectDataManagement::PdmEventType_def::Borderline:
path = getPathForAesEvents(tr("Borderline"), root);
break;
case ProjectDataManagement::EventType_def::BCContamination:
case ProjectDataManagement::PdmEventType_def::BCContamination:
path = getPathForAesEvents(tr("B/C Contamination"), root);
break;
case ProjectDataManagement::EventType_def::NContamination:
case ProjectDataManagement::PdmEventType_def::NContamination:
path = getPathForAesEvents(tr("N Contamination"), root);
break;
case ProjectDataManagement::EventType_def::DangerArea:
case ProjectDataManagement::PdmEventType_def::DangerArea:
path = getPathForAesEvents(tr("Danger Area"), root);
break;
case ProjectDataManagement::EventType_def::FunctionalArea:
case ProjectDataManagement::PdmEventType_def::FunctionalArea:
path = getPathForAesEvents(tr("Functional Area"), root);
break;
case ProjectDataManagement::EventType_def::MineCorridor:
case ProjectDataManagement::PdmEventType_def::MineCorridor:
path = getPathForAesEvents(tr("Mine Corridor"), root);
break;
case ProjectDataManagement::EventType_def::TechnicalArea:
case ProjectDataManagement::PdmEventType_def::TechnicalArea:
path = getPathForAesEvents(tr("Technical Area"), root);
break;
case ProjectDataManagement::EventType_def::GasPipe:
case ProjectDataManagement::PdmEventType_def::GasPipe:
path = getPathForAesEvents(tr("Gas Pipe"), root);
break;
@@ -609,7 +609,7 @@ void DDSTimelineModel::slotRequestMessageReceived(const QString &message)
LtsTimelineClassic::Event::EventPaintFunc paintFunc;
QColor color;
setColorPaintFun(paintFunc, color, ProjectDataManagement::EventType_def::type(eventTypeId));
setColorPaintFun(paintFunc, color, ProjectDataManagement::PdmEventType_def::type(eventTypeId));
qint64 endTime = root[QStringLiteral("endTime")].toDouble();
@@ -916,139 +916,139 @@ void DDSTimelineModel::getEvents(qint64 rangeMin, qint64 rangeMax)
void DDSTimelineModel::setColorPaintFun(LtsTimelineClassic::Event::EventPaintFunc &paintFunc, QColor &color,
ProjectDataManagement::EventType eventType) const
ProjectDataManagement::PdmEventType eventType) const
{
paintFunc = nullptr;
color = QColor();
switch (eventType.underlying())
{
case ProjectDataManagement::EventType::BiteMessage:
case ProjectDataManagement::PdmEventType::BiteMessage:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicRect;
color = QColor("red");
return;
case ProjectDataManagement::EventType::CameraVideo:
case ProjectDataManagement::PdmEventType::CameraVideo:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicRect;
color = QColor("yellow");
return;
case ProjectDataManagement::EventType::CrossGlobalBorderline:
case ProjectDataManagement::EventType::CrossLocalBorderline:
case ProjectDataManagement::PdmEventType::CrossGlobalBorderline:
case ProjectDataManagement::PdmEventType::CrossLocalBorderline:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicRect;
color = QColor("orange");
return;
case ProjectDataManagement::EventType::EnterDangerArea:
case ProjectDataManagement::PdmEventType::EnterDangerArea:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicRoundedRect;
color = QColor("blue");
return;
case ProjectDataManagement::EventType::LeaveDangerArea:
case ProjectDataManagement::PdmEventType::LeaveDangerArea:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicRoundedRect;
color = QColor("red");
return;
case ProjectDataManagement::EventType::EnterFunctionalArea:
case ProjectDataManagement::PdmEventType::EnterFunctionalArea:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicRoundedRect;
color = QColor("green");
return;
case ProjectDataManagement::EventType::LeaveFunctionalArea:
case ProjectDataManagement::PdmEventType::LeaveFunctionalArea:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicRoundedRect;
color = QColor("yellow");
return;
case ProjectDataManagement::EventType::EnterMineArea:
case ProjectDataManagement::PdmEventType::EnterMineArea:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicRoundedRect;
color = QColor("orange");
return;
case ProjectDataManagement::EventType::LeaveMineArea:
case ProjectDataManagement::PdmEventType::LeaveMineArea:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicRoundedRect;
color = QColor("brown");
return;
case ProjectDataManagement::EventType::FireEvent:
case ProjectDataManagement::PdmEventType::FireEvent:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicEllipse;
color = QColor("blue");
return;
case ProjectDataManagement::EventType::Hit:
case ProjectDataManagement::PdmEventType::Hit:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicEllipse;
color = QColor("green");
return;
case ProjectDataManagement::EventType::Sanitation:
case ProjectDataManagement::PdmEventType::Sanitation:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicEllipse;
color = QColor("magenta");
return;
case ProjectDataManagement::EventType::HitBuilding:
case ProjectDataManagement::PdmEventType::HitBuilding:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicEllipse;
color = QColor("cyan");
return;
case ProjectDataManagement::EventType::HitEffectSimulation:
case ProjectDataManagement::PdmEventType::HitEffectSimulation:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicEllipse;
color = QColor("orange");
return;
case ProjectDataManagement::EventType::Manipulation:
case ProjectDataManagement::PdmEventType::Manipulation:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicTriangle;
color = QColor("blue");
return;
case ProjectDataManagement::EventType::RadioCnr:
case ProjectDataManagement::PdmEventType::RadioCnr:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicTriangle;
color = QColor("red");
return;
case ProjectDataManagement::EventType::RadioTvc:
case ProjectDataManagement::PdmEventType::RadioTvc:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicTriangle;
color = QColor("green");
return;
case ProjectDataManagement::EventType::WeaponAssignment:
case ProjectDataManagement::PdmEventType::WeaponAssignment:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicTriangle;
color = QColor("orange");
return;
case ProjectDataManagement::EventType::MineArea:
case ProjectDataManagement::PdmEventType::MineArea:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicInvertTriangle;
color = QColor("green");
return;
case ProjectDataManagement::EventType::NContamination:
case ProjectDataManagement::PdmEventType::NContamination:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicInvertTriangle;
color = QColor("pink");
return;
case ProjectDataManagement::EventType::EnterNuclear:
case ProjectDataManagement::PdmEventType::EnterNuclear:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicRoundedRect;
color = QColor("pink");
return;
case ProjectDataManagement::EventType::LeaveNuclear:
case ProjectDataManagement::PdmEventType::LeaveNuclear:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicRoundedRect;
color = QColor("pink").darker();
return;
case ProjectDataManagement::EventType::BCContamination:
case ProjectDataManagement::PdmEventType::BCContamination:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicInvertTriangle;
color = QColor("blue");
return;
case ProjectDataManagement::EventType::DangerArea:
case ProjectDataManagement::PdmEventType::DangerArea:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicInvertTriangle;
color = QColor("yellow");
return;
case ProjectDataManagement::EventType::FunctionalArea:
case ProjectDataManagement::PdmEventType::FunctionalArea:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicInvertTriangle;
color = QColor("red");
return;
case ProjectDataManagement::EventType::MineCorridor:
case ProjectDataManagement::PdmEventType::MineCorridor:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicInvertTriangle;
color = QColor("brown");
return;
case ProjectDataManagement::EventType::Borderline:
case ProjectDataManagement::PdmEventType::Borderline:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicInvertTriangle;
color = QColor("orange");
return;
case ProjectDataManagement::EventType::TechnicalArea:
case ProjectDataManagement::PdmEventType::TechnicalArea:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicInvertTriangle;
color = QColor("black");
return;
case ProjectDataManagement::EventType::GasPipe:
case ProjectDataManagement::PdmEventType::GasPipe:
paintFunc = LtsTimelineClassic::Event::drawCustomEventGraphicRect;
color = QColor("cyan");
return;
case ProjectDataManagement::EventType::Unknown:
case ProjectDataManagement::PdmEventType::Unknown:
case ProjectDataManagement::EventType::HitN:
case ProjectDataManagement::EventType::HitB:
case ProjectDataManagement::EventType::HitC:
case ProjectDataManagement::EventType::HitGasPipe:
case ProjectDataManagement::EventType::HitMine:
case ProjectDataManagement::EventType::FriendlyFire:
case ProjectDataManagement::EventType::EquipmentErrorReport:
case ProjectDataManagement::EventType::EmergencyCall:
case ProjectDataManagement::PdmEventType::HitN:
case ProjectDataManagement::PdmEventType::HitB:
case ProjectDataManagement::PdmEventType::HitC:
case ProjectDataManagement::PdmEventType::HitGasPipe:
case ProjectDataManagement::PdmEventType::HitMine:
case ProjectDataManagement::PdmEventType::FriendlyFire:
case ProjectDataManagement::PdmEventType::EquipmentErrorReport:
case ProjectDataManagement::PdmEventType::EmergencyCall:
return;
}
Q_ASSERT(false);
@@ -1212,7 +1212,7 @@ const QJsonObject DDSTimelineModel::getDetailData(const ExerciseEventManagement:
}
const QJsonObject DDSTimelineModel::getDetailData(const QByteArray &data, int id, const ProjectDataManagement::EventType& type, qint64 startTime) const
const QJsonObject DDSTimelineModel::getDetailData(const QByteArray &data, int id, const ProjectDataManagement::PdmEventType& type, qint64 startTime) const
{
QJsonParseError err;
QJsonDocument doc(QJsonDocument::fromJson(data, &err));
@@ -1247,43 +1247,43 @@ LtsTimelineClassic::Event *DDSTimelineModel::createEvent(const ExerciseEventMana
switch (data.eventTypeId().underlying())
{
case ProjectDataManagement::EventType::HitBuilding:
case ProjectDataManagement::PdmEventType::HitBuilding:
path = getPathForBuildingEvents(tr("Buildings"), root);
break;
case ProjectDataManagement::EventType::CameraVideo:
case ProjectDataManagement::PdmEventType::CameraVideo:
path = getPathForAvsEvents(tr("Camera Video"), root);
break;
case ProjectDataManagement::EventType::RadioCnr:
case ProjectDataManagement::PdmEventType::RadioCnr:
path = getPathForAvsEvents(tr("CNR Radio"), root);
break;
case ProjectDataManagement::EventType::RadioTvc:
case ProjectDataManagement::PdmEventType::RadioTvc:
path = getPathForAvsEvents(tr("TVC Radio"), root);
break;
case ProjectDataManagement::EventType_def::MineArea:
case ProjectDataManagement::PdmEventType_def::MineArea:
path = getPathForAesEvents(tr("Mine Area"), root);
break;
case ProjectDataManagement::EventType_def::Borderline:
case ProjectDataManagement::PdmEventType_def::Borderline:
path = getPathForAesEvents(tr("Borderline"), root);
break;
case ProjectDataManagement::EventType_def::BCContamination:
case ProjectDataManagement::PdmEventType_def::BCContamination:
path = getPathForAesEvents(tr("B/C Contamination"), root);
break;
case ProjectDataManagement::EventType_def::NContamination:
case ProjectDataManagement::PdmEventType_def::NContamination:
path = getPathForAesEvents(tr("N Contamination"), root);
break;
case ProjectDataManagement::EventType_def::DangerArea:
case ProjectDataManagement::PdmEventType_def::DangerArea:
path = getPathForAesEvents(tr("Danger Area"), root);
break;
case ProjectDataManagement::EventType_def::FunctionalArea:
case ProjectDataManagement::PdmEventType_def::FunctionalArea:
path = getPathForAesEvents(tr("Functional Area"), root);
break;
case ProjectDataManagement::EventType_def::MineCorridor:
case ProjectDataManagement::PdmEventType_def::MineCorridor:
path = getPathForAesEvents(tr("Mine Corridor"), root);
break;
case ProjectDataManagement::EventType_def::TechnicalArea:
case ProjectDataManagement::PdmEventType_def::TechnicalArea:
path = getPathForAesEvents(tr("Technical Area"), root);
break;
case ProjectDataManagement::EventType_def::GasPipe:
case ProjectDataManagement::PdmEventType_def::GasPipe:
path = getPathForAesEvents(tr("Gas Pipe"), root);
break;
@@ -62,7 +62,7 @@ public:
void applyFilter(const QJsonArray &filter);
void setDetailData(DetailData *detailData) { m_detailData = detailData; }
void setColorPaintFun(LtsTimelineClassic::Event::EventPaintFunc &paintFunc, QColor &color, ProjectDataManagement::EventType eventType) const;
void setColorPaintFun(LtsTimelineClassic::Event::EventPaintFunc &paintFunc, QColor &color, ProjectDataManagement::PdmEventType eventType) const;
void setTimeRange(qint64 min, qint64 max);
void getEvents(qint64 rangeMin, qint64 rangeMax);
QVector<LtsTimelineClassic::Range> getKnownRanges() const;
@@ -117,7 +117,7 @@ NGL::INGLLogger &m_logger;
void _uncache(const CacheRange &cr);
void saveAndClearLiveCache();
const QJsonObject getDetailData(const ExerciseEventManagement::Event &event) const;
const QJsonObject getDetailData(const QByteArray &data, int id, const ProjectDataManagement::EventType& type, qint64 startTime) const;
const QJsonObject getDetailData(const QByteArray &data, int id, const ProjectDataManagement::PdmEventType& type, qint64 startTime) const;
std::shared_ptr<TimeLineManagement::ForeignDataInterface> m_eemForeign;
std::shared_ptr<ExerciseManagement::Interface::Dtc> m_dtcExm;
@@ -68,7 +68,7 @@ QVariant EventListDialogModel::data(const QModelIndex &index, int role) const
if (event->typeId() == markerTypeId )
return tr("Marker");
return ProjectDataManagement::toString(static_cast<ProjectDataManagement::EventType::type>(event->typeId()));
return ProjectDataManagement::toString(static_cast<ProjectDataManagement::PdmEventType::type>(event->typeId()));
}
case EventListDialogModel::Columns::Time:
return QDateTime::fromMSecsSinceEpoch(event->startTime());
@@ -76,13 +76,13 @@ QVariant EventListDialogModel::data(const QModelIndex &index, int role) const
return (event->duration() / 1000);
case EventListDialogModel::Columns::Party:
{
if (event->typeId() == ProjectDataManagement::EventType::HitBuilding)
if (event->typeId() == ProjectDataManagement::PdmEventType::HitBuilding)
break;
return ParticipantManagement::trPartyName(m_ppmDtc->party(event->partyId()).name());
}
case EventListDialogModel::Columns::EquipNo:
{
if (event->typeId() == ProjectDataManagement::EventType::HitBuilding)
if (event->typeId() == ProjectDataManagement::PdmEventType::HitBuilding)
break;
return event->equipmentId();
}
@@ -78,21 +78,21 @@ void TimelineLegendDialog::setActiveEventTypeIds(const QSet<int> &activeEventTyp
setUnchangeable(false);
}
QVector<ProjectDataManagement::EventType> TimelineLegendDialog::possibleEvents()
QVector<ProjectDataManagement::PdmEventType> TimelineLegendDialog::possibleEvents()
{
QVector<ProjectDataManagement::EventType> ret
QVector<ProjectDataManagement::PdmEventType> ret
({
ProjectDataManagement::EventType::Hit,
ProjectDataManagement::EventType::WeaponAssignment,
ProjectDataManagement::EventType::BiteMessage,
ProjectDataManagement::EventType::FireEvent,
ProjectDataManagement::EventType::HitBuilding,
ProjectDataManagement::EventType::Manipulation,
ProjectDataManagement::EventType::CameraVideo,
ProjectDataManagement::EventType::RadioCnr,
ProjectDataManagement::EventType::RadioTvc,
ProjectDataManagement::EventType::HitEffectSimulation,
ProjectDataManagement::PdmEventType::Hit,
ProjectDataManagement::PdmEventType::WeaponAssignment,
ProjectDataManagement::PdmEventType::BiteMessage,
ProjectDataManagement::PdmEventType::FireEvent,
ProjectDataManagement::PdmEventType::HitBuilding,
ProjectDataManagement::PdmEventType::Manipulation,
ProjectDataManagement::PdmEventType::CameraVideo,
ProjectDataManagement::PdmEventType::RadioCnr,
ProjectDataManagement::PdmEventType::RadioTvc,
ProjectDataManagement::PdmEventType::HitEffectSimulation,
@@ -100,12 +100,12 @@ QVector<ProjectDataManagement::EventType> TimelineLegendDialog::possibleEvents()
ProjectDataManagement::EventType::CrossLocalBorderline,
ProjectDataManagement::PdmEventType::CrossLocalBorderline,
ProjectDataManagement::EventType::CrossGlobalBorderline,
ProjectDataManagement::PdmEventType::CrossGlobalBorderline,
@@ -127,37 +127,37 @@ QVector<ProjectDataManagement::EventType> TimelineLegendDialog::possibleEvents()
if (ps->value(QStringLiteral("tln"),
QStringLiteral("showEffectSimulationEvents")).toBool())
{
ret += ProjectDataManagement::EventType::MineArea;
ret += ProjectDataManagement::EventType::DangerArea;
ret += ProjectDataManagement::EventType::FunctionalArea;
ret += ProjectDataManagement::EventType::MineCorridor;
ret += ProjectDataManagement::EventType::Borderline;
ret += ProjectDataManagement::PdmEventType::MineArea;
ret += ProjectDataManagement::PdmEventType::DangerArea;
ret += ProjectDataManagement::PdmEventType::FunctionalArea;
ret += ProjectDataManagement::PdmEventType::MineCorridor;
ret += ProjectDataManagement::PdmEventType::Borderline;
if (ps->value(QStringLiteral("aes"),
QStringLiteral("enableNuclearContaminations")).toBool())
ret += ProjectDataManagement::EventType::NContamination;
ret += ProjectDataManagement::PdmEventType::NContamination;
if (ps->value(QStringLiteral("aes"),
QStringLiteral("enableNuclearContaminations")).toBool() ||
ps->value(QStringLiteral("aes"),
QStringLiteral("enableNuclearContaminations")).toBool())
ret += ProjectDataManagement::EventType::BCContamination;
ret += ProjectDataManagement::PdmEventType::BCContamination;
}
if (ps->value(QStringLiteral("tln"),
QStringLiteral("showEnterLeaveEvents")).toBool())
{
ret += ProjectDataManagement::EventType::EnterDangerArea;
ret += ProjectDataManagement::EventType::LeaveDangerArea;
ret += ProjectDataManagement::EventType::EnterMineArea;
ret += ProjectDataManagement::EventType::LeaveMineArea;
ret += ProjectDataManagement::EventType::EnterFunctionalArea;
ret += ProjectDataManagement::EventType::LeaveFunctionalArea;
ret += ProjectDataManagement::PdmEventType::EnterDangerArea;
ret += ProjectDataManagement::PdmEventType::LeaveDangerArea;
ret += ProjectDataManagement::PdmEventType::EnterMineArea;
ret += ProjectDataManagement::PdmEventType::LeaveMineArea;
ret += ProjectDataManagement::PdmEventType::EnterFunctionalArea;
ret += ProjectDataManagement::PdmEventType::LeaveFunctionalArea;
if (ps->value(QStringLiteral("aes"),
QStringLiteral("enableNuclearContaminations")).toBool())
{
ret += ProjectDataManagement::EventType::EnterNuclear;
ret += ProjectDataManagement::EventType::LeaveNuclear;
ret += ProjectDataManagement::PdmEventType::EnterNuclear;
ret += ProjectDataManagement::PdmEventType::LeaveNuclear;
}
}
@@ -165,68 +165,68 @@ QVector<ProjectDataManagement::EventType> TimelineLegendDialog::possibleEvents()
if (ps->value(QStringLiteral("aes"),
QStringLiteral("enableGasPipes")).toBool())
{
ret += ProjectDataManagement::EventType::GasPipe;
ret += ProjectDataManagement::PdmEventType::GasPipe;
}
const bool showPvSan = LtsUtils::ProjectSettings::isFunctionEnabled(QStringLiteral("ParticipantInformation"),
QStringLiteral("HasPvSan"));
if (showPvSan)
ret += ProjectDataManagement::EventType::Sanitation;
ret += ProjectDataManagement::PdmEventType::Sanitation;
return ret;
}
static int categoryFromEventType(ProjectDataManagement::EventType et)
static int categoryFromEventType(ProjectDataManagement::PdmEventType et)
{
switch (et.underlying())
{
case ProjectDataManagement::EventType::Unknown:
case ProjectDataManagement::PdmEventType::Unknown:
return 0;
case ProjectDataManagement::EventType::Hit:
case ProjectDataManagement::EventType::WeaponAssignment:
case ProjectDataManagement::EventType::BiteMessage:
case ProjectDataManagement::EventType::FireEvent:
case ProjectDataManagement::EventType::FriendlyFire:
case ProjectDataManagement::EventType::Manipulation:
case ProjectDataManagement::PdmEventType::Hit:
case ProjectDataManagement::PdmEventType::WeaponAssignment:
case ProjectDataManagement::PdmEventType::BiteMessage:
case ProjectDataManagement::PdmEventType::FireEvent:
case ProjectDataManagement::PdmEventType::FriendlyFire:
case ProjectDataManagement::PdmEventType::Manipulation:
return 1;
case ProjectDataManagement::EventType::CameraVideo:
case ProjectDataManagement::EventType::RadioCnr:
case ProjectDataManagement::EventType::RadioTvc:
case ProjectDataManagement::PdmEventType::CameraVideo:
case ProjectDataManagement::PdmEventType::RadioCnr:
case ProjectDataManagement::PdmEventType::RadioTvc:
return 5;
case ProjectDataManagement::EventType::HitBuilding:
case ProjectDataManagement::EventType::HitEffectSimulation:
case ProjectDataManagement::EventType::HitMine:
case ProjectDataManagement::EventType::HitN:
case ProjectDataManagement::EventType::HitB:
case ProjectDataManagement::EventType::HitC:
case ProjectDataManagement::EventType::HitGasPipe:
case ProjectDataManagement::PdmEventType::HitBuilding:
case ProjectDataManagement::PdmEventType::HitEffectSimulation:
case ProjectDataManagement::PdmEventType::HitMine:
case ProjectDataManagement::PdmEventType::HitN:
case ProjectDataManagement::PdmEventType::HitB:
case ProjectDataManagement::PdmEventType::HitC:
case ProjectDataManagement::PdmEventType::HitGasPipe:
return 2;
case ProjectDataManagement::EventType::EnterDangerArea:
case ProjectDataManagement::EventType::LeaveDangerArea:
case ProjectDataManagement::EventType::EnterMineArea:
case ProjectDataManagement::EventType::LeaveMineArea:
case ProjectDataManagement::EventType::CrossLocalBorderline:
case ProjectDataManagement::EventType::EnterFunctionalArea:
case ProjectDataManagement::EventType::LeaveFunctionalArea:
case ProjectDataManagement::EventType::EnterNuclear:
case ProjectDataManagement::EventType::LeaveNuclear:
case ProjectDataManagement::EventType::CrossGlobalBorderline:
case ProjectDataManagement::EventType::Sanitation:
case ProjectDataManagement::PdmEventType::EnterDangerArea:
case ProjectDataManagement::PdmEventType::LeaveDangerArea:
case ProjectDataManagement::PdmEventType::EnterMineArea:
case ProjectDataManagement::PdmEventType::LeaveMineArea:
case ProjectDataManagement::PdmEventType::CrossLocalBorderline:
case ProjectDataManagement::PdmEventType::EnterFunctionalArea:
case ProjectDataManagement::PdmEventType::LeaveFunctionalArea:
case ProjectDataManagement::PdmEventType::EnterNuclear:
case ProjectDataManagement::PdmEventType::LeaveNuclear:
case ProjectDataManagement::PdmEventType::CrossGlobalBorderline:
case ProjectDataManagement::PdmEventType::Sanitation:
return 3;
case ProjectDataManagement::EventType::MineArea:
case ProjectDataManagement::EventType::NContamination:
case ProjectDataManagement::EventType::BCContamination:
case ProjectDataManagement::EventType::DangerArea:
case ProjectDataManagement::EventType::FunctionalArea:
case ProjectDataManagement::EventType::MineCorridor:
case ProjectDataManagement::EventType::Borderline:
case ProjectDataManagement::EventType::GasPipe:
case ProjectDataManagement::PdmEventType::MineArea:
case ProjectDataManagement::PdmEventType::NContamination:
case ProjectDataManagement::PdmEventType::BCContamination:
case ProjectDataManagement::PdmEventType::DangerArea:
case ProjectDataManagement::PdmEventType::FunctionalArea:
case ProjectDataManagement::PdmEventType::MineCorridor:
case ProjectDataManagement::PdmEventType::Borderline:
case ProjectDataManagement::PdmEventType::GasPipe:
return 6;
case ProjectDataManagement::EventType::TechnicalArea:
case ProjectDataManagement::EventType::EquipmentErrorReport:
case ProjectDataManagement::EventType::EmergencyCall:
case ProjectDataManagement::PdmEventType::TechnicalArea:
case ProjectDataManagement::PdmEventType::EquipmentErrorReport:
case ProjectDataManagement::PdmEventType::EmergencyCall:
return 0;
}
Q_ASSERT(false);
@@ -239,7 +239,7 @@ bool TimelineLegendDialog::init(DDSTimelineModel *model, const QSet<int> &active
{
QLabel *lbl = nullptr;
QCheckBox *cbx = nullptr;
ProjectDataManagement::EventType et = ProjectDataManagement::EventType::Unknown;
ProjectDataManagement::PdmEventType et = ProjectDataManagement::PdmEventType::Unknown;
};
QImage p(16, 24, QImage::Format_ARGB32);
QColor c;
@@ -249,7 +249,7 @@ bool TimelineLegendDialog::init(DDSTimelineModel *model, const QSet<int> &active
const auto events = possibleEvents();
std::vector<WidgetSortHelper> helperCont;
helperCont.reserve(events.size());
for (const ProjectDataManagement::EventType eventType : events)
for (const ProjectDataManagement::PdmEventType eventType : events)
{
model->setColorPaintFun(paintFunc, c, eventType.underlying());
@@ -305,7 +305,7 @@ bool TimelineLegendDialog::apply()
{
QSet<int> activeEventTypeIds;
const auto events = possibleEvents();
for (const ProjectDataManagement::EventType eventType : events)
for (const ProjectDataManagement::PdmEventType eventType : events)
{
if (checkBox(eventType)->isChecked())
activeEventTypeIds.insert(eventType.underlying());
@@ -30,7 +30,7 @@ public:
bool init(DDSTimelineModel *model, const QSet<int> &activeEventTypeIds);
void setActiveEventTypeIds(const QSet<int> &activeEventTypeIds);
static QVector<ProjectDataManagement::EventType> possibleEvents();
static QVector<ProjectDataManagement::PdmEventType> possibleEvents();
signals:
void signalEventTypesChanged(const QSet<int> &activeEventTypeIds);
@@ -40,9 +40,9 @@ NGL::INGLLogger &m_logger;
void retranslate() override;
static QString checkBoxName(int eventTypeId) { return QStringLiteral("CheckBoxEvent%1").arg(eventTypeId); }
static QString checkBoxName(ProjectDataManagement::EventType eventType) { return checkBoxName(eventType.underlying()); }
static QString checkBoxName(ProjectDataManagement::PdmEventType eventType) { return checkBoxName(eventType.underlying()); }
QCheckBox *checkBox(int eventTypeId) { return findChild<QCheckBox *>(checkBoxName(eventTypeId)); }
QCheckBox *checkBox(ProjectDataManagement::EventType eventType) { return checkBox(eventType.underlying()); }
QCheckBox *checkBox(ProjectDataManagement::PdmEventType eventType) { return checkBox(eventType.underlying()); }
private:
Ui::TimelineLegendDialog *m_ui;
@@ -242,28 +242,28 @@ bool ShowDetailsDialog::isAvsCapable(const LtsTimelineClassic::Event *event)
bool ShowDetailsDialog::isHitEventType(int eventTypeId)
{
return (eventTypeId == ProjectDataManagement::EventType_def::Hit ||
eventTypeId == ProjectDataManagement::EventType_def::HitB ||
eventTypeId == ProjectDataManagement::EventType_def::HitBuilding ||
eventTypeId == ProjectDataManagement::EventType_def::HitC ||
eventTypeId == ProjectDataManagement::EventType_def::HitGasPipe ||
eventTypeId == ProjectDataManagement::EventType_def::HitEffectSimulation ||
eventTypeId == ProjectDataManagement::EventType_def::HitMine ||
eventTypeId == ProjectDataManagement::EventType_def::HitN);
return (eventTypeId == ProjectDataManagement::PdmEventType_def::Hit ||
eventTypeId == ProjectDataManagement::PdmEventType_def::HitB ||
eventTypeId == ProjectDataManagement::PdmEventType_def::HitBuilding ||
eventTypeId == ProjectDataManagement::PdmEventType_def::HitC ||
eventTypeId == ProjectDataManagement::PdmEventType_def::HitGasPipe ||
eventTypeId == ProjectDataManagement::PdmEventType_def::HitEffectSimulation ||
eventTypeId == ProjectDataManagement::PdmEventType_def::HitMine ||
eventTypeId == ProjectDataManagement::PdmEventType_def::HitN);
}
bool ShowDetailsDialog::isAvEventType(int eventTypeId)
{
return (isAudioEventType(eventTypeId) ||
eventTypeId == ProjectDataManagement::EventType_def::CameraVideo);
eventTypeId == ProjectDataManagement::PdmEventType_def::CameraVideo);
}
bool ShowDetailsDialog::isAudioEventType(int eventTypeId)
{
return (eventTypeId == ProjectDataManagement::EventType_def::RadioCnr ||
eventTypeId == ProjectDataManagement::EventType_def::RadioTvc);
return (eventTypeId == ProjectDataManagement::PdmEventType_def::RadioCnr ||
eventTypeId == ProjectDataManagement::PdmEventType_def::RadioTvc);
}
@@ -483,7 +483,7 @@ bool ShowDetailsDialog::init(DetailData *detailData, const LtsTimelineClassic::E
}
if (m_eventType.isEmpty())
m_eventType = QStringLiteral("%1 (%2)").arg(tr("<unknown>"), ProjectDataManagement::toString(static_cast<ProjectDataManagement::EventType::type>(event->typeId())));
m_eventType = QStringLiteral("%1 (%2)").arg(tr("<unknown>"), ProjectDataManagement::toString(static_cast<ProjectDataManagement::PdmEventType::type>(event->typeId())));
m_ui->lblEventType->setText(QStringLiteral("<b>%1</b>").arg(m_eventType));
m_ui->pteDetailDataTest->setPlainText(QString::fromUtf8(QJsonDocument(event->detailData()).toJson()));