Removes .IDL warnings: multiple enum definitons and builtin-type collisions
This commit is contained in:
135 files changed
+1122
-1122
No files matched your search
+1
-1
@@ -110,7 +110,7 @@ QVariant ConfigAlarmModel::data(const QModelIndex& index, int role) const
|
||||
}
|
||||
|
||||
case EventType:
|
||||
return ProjectDataManagement::toString(static_cast<ProjectDataManagement::EventType>(alarmConfig.eventTypeId()));
|
||||
return ProjectDataManagement::toString(static_cast<ProjectDataManagement::PdmEventType>(alarmConfig.eventTypeId()));
|
||||
case MessageWindow:
|
||||
return alarmConfig.messageWindow() ? tr("Yes") : tr("No");
|
||||
case SetMarker:
|
||||
|
||||
+3
-3
@@ -84,7 +84,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
|
||||
|
||||
if (role == Qt::BackgroundRole)
|
||||
{
|
||||
if (notificationEx.eventType() == ProjectDataManagement::EventType::Alarm)
|
||||
if (notificationEx.eventType() == ProjectDataManagement::PdmEventType::Alarm)
|
||||
return QColor(Qt::red);
|
||||
return QVariant();
|
||||
}
|
||||
@@ -100,7 +100,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
|
||||
return notificationEx.equipmentNumber;
|
||||
break;
|
||||
case Incident:
|
||||
return ProjectDataManagement::toString(static_cast<ProjectDataManagement::EventType>(notificationEx.eventTypeId));
|
||||
return ProjectDataManagement::toString(static_cast<ProjectDataManagement::PdmEventType>(notificationEx.eventTypeId));
|
||||
case Hierarchie:
|
||||
return m_ppmDtc->hierarchyFromParticipant(notificationEx.participantId);
|
||||
case ParticipantId:
|
||||
@@ -142,7 +142,7 @@ void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notificatio
|
||||
notification.equipmentNumber = data.equipmentNumber();
|
||||
if (data.participantId().has_value())
|
||||
notification.participantId = data.participantId().value();
|
||||
notification.eventTypeId = static_cast<ProjectDataManagement::EventType>(data.eventType());
|
||||
notification.eventTypeId = static_cast<ProjectDataManagement::PdmEventType>(data.eventType());
|
||||
if (data.aesId().has_value())
|
||||
notification.aesId = data.aesId().value();
|
||||
const int global = propertieJsonObj[QStringLiteral("Global")].toInt();
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ struct NotificationEx : public AlarmManagement::Notification
|
||||
int equipmentNumber = 0;
|
||||
int participantId = 0;
|
||||
int aesId = 0;
|
||||
ProjectDataManagement::EventType eventTypeId = ProjectDataManagement::EventType::Unknown;
|
||||
ProjectDataManagement::PdmEventType eventTypeId = ProjectDataManagement::PdmEventType::Unknown;
|
||||
|
||||
NotificationEx() = default;
|
||||
|
||||
|
||||
+1
-1
@@ -57,7 +57,7 @@ void InterfaceImpl::clearInterfaces()
|
||||
|
||||
void InterfaceImpl::showEmergencyMessage(const AlarmManagement::Notification &data)
|
||||
{
|
||||
if (data.eventType() != ProjectDataManagement::EventType_def::EmergencyCall)
|
||||
if (data.eventType() != ProjectDataManagement::PdmEventType_def::EmergencyCall)
|
||||
return;
|
||||
|
||||
const int issi = data.equipmentNumber();
|
||||
|
||||
+18
-18
@@ -57,55 +57,55 @@ AlarmDialog::AlarmDialog(QWidget* parent)
|
||||
alarmCheckBox.name = QLatin1String("NuclearAgentEntry");
|
||||
alarmCheckBox.checkboxMarker = m_ui->cbxNMarker;
|
||||
alarmCheckBox.checkboxWindow = m_ui->cbxNMessage;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::EventType::EnterNuclear;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::EnterNuclear;
|
||||
m_checkBoxes.append(alarmCheckBox);
|
||||
|
||||
alarmCheckBox.name = QLatin1String("DangerAreasEntry");
|
||||
alarmCheckBox.checkboxMarker = m_ui->cbxDanerAreaMarker;
|
||||
alarmCheckBox.checkboxWindow = m_ui->cbxDangerAreaMessage;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::EventType::EnterDangerArea;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::EnterDangerArea;
|
||||
m_checkBoxes.append(alarmCheckBox);
|
||||
|
||||
alarmCheckBox.name = QLatin1String("MineAreaEntry");
|
||||
alarmCheckBox.checkboxMarker = m_ui->cbxMineAreaEntryMarker;
|
||||
alarmCheckBox.checkboxWindow = m_ui->cbxMineAreaEntryMessage;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::EventType::EnterMineArea;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::EnterMineArea;
|
||||
m_checkBoxes.append(alarmCheckBox);
|
||||
|
||||
alarmCheckBox.name = QLatin1String("MineAreaHit");
|
||||
alarmCheckBox.checkboxMarker = m_ui->cbxMineAreaHitMarker;
|
||||
alarmCheckBox.checkboxWindow = m_ui->cbxMineAreaHitMessage;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::EventType::HitMine;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::HitMine;
|
||||
m_checkBoxes.append(alarmCheckBox);
|
||||
|
||||
alarmCheckBox.name = QLatin1String("DirectFire");
|
||||
alarmCheckBox.checkboxMarker = m_ui->cbxDirectFireMarker;
|
||||
alarmCheckBox.checkboxWindow = m_ui->cbxDirectFireMessage;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::EventType::Hit;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::Hit;
|
||||
m_checkBoxes.append(alarmCheckBox);
|
||||
|
||||
alarmCheckBox.name = QLatin1String("IndirectFire");
|
||||
alarmCheckBox.checkboxMarker = m_ui->cbxIndirectFireMarker;
|
||||
alarmCheckBox.checkboxWindow = m_ui->cbxIndirectFireMessage;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::EventType::HitEffectSimulation;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::HitEffectSimulation;
|
||||
m_checkBoxes.append(alarmCheckBox);
|
||||
|
||||
alarmCheckBox.name = QLatin1String("CrossLocalBorderlines");
|
||||
alarmCheckBox.checkboxMarker = m_ui->cbxLocalBorderMarker;
|
||||
alarmCheckBox.checkboxWindow = m_ui->cbxLocalBorderMessage;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::EventType::CrossLocalBorderline;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::CrossLocalBorderline;
|
||||
m_checkBoxes.append(alarmCheckBox);
|
||||
|
||||
alarmCheckBox.name = QLatin1String("CrossGlobalBorderlines");
|
||||
alarmCheckBox.checkboxMarker = m_ui->cbxGlobalBorderMarker;
|
||||
alarmCheckBox.checkboxWindow = m_ui->cbxGlobalBorderMessage;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::EventType::CrossGlobalBorderline;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::CrossGlobalBorderline;
|
||||
m_checkBoxes.append(alarmCheckBox);
|
||||
|
||||
alarmCheckBox.name = QLatin1String("AirSupport");
|
||||
alarmCheckBox.checkboxMarker = m_ui->cbxAirSupportMarker;
|
||||
alarmCheckBox.checkboxWindow = m_ui->cbxAirSupportMessage;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::EventType::AirSupport;
|
||||
alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::AirSupport;
|
||||
m_checkBoxes.append(alarmCheckBox);
|
||||
|
||||
setOnlineHelpFilename(QLatin1String("Situation-Configure_Global_Alarms"));
|
||||
@@ -176,57 +176,57 @@ void AlarmDialog::onAlarmConfigChanged(const AlarmManagement::AlarmConfig& data,
|
||||
DEBUG_LOG(m_logger) << "************** onAlarmConfig zuweisen ";
|
||||
switch (data.eventTypeId().underlying())
|
||||
{
|
||||
case ProjectDataManagement::EventType_def::EnterNuclear: {
|
||||
case ProjectDataManagement::PdmEventType_def::EnterNuclear: {
|
||||
DEBUG_LOG(m_logger) << "EnterNuclear zuweisen ";
|
||||
m_ui->cbxNMarker->setChecked(setMarker);
|
||||
m_ui->cbxNMessage->setChecked(messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::EnterDangerArea: {
|
||||
case ProjectDataManagement::PdmEventType_def::EnterDangerArea: {
|
||||
DEBUG_LOG(m_logger) << "EnterDangerArea zuweisen ";
|
||||
m_ui->cbxDanerAreaMarker->setChecked(setMarker);
|
||||
m_ui->cbxDangerAreaMessage->setChecked(messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::EnterMineArea: {
|
||||
case ProjectDataManagement::PdmEventType_def::EnterMineArea: {
|
||||
DEBUG_LOG(m_logger) << "EnterMineArea zuweisen ";
|
||||
m_ui->cbxMineAreaEntryMarker->setChecked(setMarker);
|
||||
m_ui->cbxMineAreaEntryMessage->setChecked(messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::HitMine: {
|
||||
case ProjectDataManagement::PdmEventType_def::HitMine: {
|
||||
DEBUG_LOG(m_logger) << "HitMine zuweisen ";
|
||||
m_ui->cbxMineAreaHitMarker->setChecked(setMarker);
|
||||
m_ui->cbxMineAreaHitMessage->setChecked(messageWindow);
|
||||
break;
|
||||
}
|
||||
|
||||
case ProjectDataManagement::EventType_def::Hit: {
|
||||
case ProjectDataManagement::PdmEventType_def::Hit: {
|
||||
DEBUG_LOG(m_logger) << "Hit zuweisen ";
|
||||
m_ui->cbxDirectFireMarker->setChecked(setMarker);
|
||||
m_ui->cbxDirectFireMessage->setChecked(messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::HitEffectSimulation: {
|
||||
case ProjectDataManagement::PdmEventType_def::HitEffectSimulation: {
|
||||
DEBUG_LOG(m_logger) << "HitEffectSimulation zuweisen ";
|
||||
m_ui->cbxIndirectFireMarker->setChecked(setMarker);
|
||||
m_ui->cbxIndirectFireMessage->setChecked(messageWindow);
|
||||
break;
|
||||
}
|
||||
|
||||
case ProjectDataManagement::EventType_def::CrossLocalBorderline: {
|
||||
case ProjectDataManagement::PdmEventType_def::CrossLocalBorderline: {
|
||||
DEBUG_LOG(m_logger) << "CrossLocalBorderline zuweisen ";
|
||||
m_ui->cbxLocalBorderMarker->setChecked(setMarker);
|
||||
m_ui->cbxLocalBorderMessage->setChecked(messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::CrossGlobalBorderline: {
|
||||
case ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline: {
|
||||
DEBUG_LOG(m_logger) << "CrossGlobalBorderline zuweisen ";
|
||||
m_ui->cbxGlobalBorderMarker->setChecked(setMarker);
|
||||
m_ui->cbxGlobalBorderMessage->setChecked(messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::AirSupport: {
|
||||
case ProjectDataManagement::PdmEventType_def::AirSupport: {
|
||||
DEBUG_LOG(m_logger) << "AirSupport zuweisen ";
|
||||
m_ui->cbxAirSupportMarker->setChecked(setMarker);
|
||||
m_ui->cbxAirSupportMessage->setChecked(messageWindow);
|
||||
|
||||
+1
-1
@@ -41,7 +41,7 @@ public:
|
||||
QCheckBox *checkboxMarker = nullptr;
|
||||
QCheckBox *checkboxWindow = nullptr;
|
||||
QString name;
|
||||
ProjectDataManagement::EventType eventTypeId = ProjectDataManagement::EventType::Unknown;
|
||||
ProjectDataManagement::PdmEventType eventTypeId = ProjectDataManagement::PdmEventType::Unknown;
|
||||
};
|
||||
|
||||
explicit AlarmDialog(QWidget *parent = nullptr);
|
||||
|
||||
+22
-22
@@ -115,7 +115,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig&
|
||||
|
||||
switch (alarm.eventTypeId().underlying())
|
||||
{
|
||||
case ProjectDataManagement::EventType_def::Hit: {
|
||||
case ProjectDataManagement::PdmEventType_def::Hit: {
|
||||
DEBUG_LOG(m_logger) << "Hit zuweisen ";
|
||||
m_ui->cbxDirectFire->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
@@ -129,37 +129,37 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig&
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::HitEffectSimulation: {
|
||||
case ProjectDataManagement::PdmEventType_def::HitEffectSimulation: {
|
||||
DEBUG_LOG(m_logger) << "HitIndirect zuweisen ";
|
||||
m_ui->cbxIndirectFire->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::AirSupport: {
|
||||
case ProjectDataManagement::PdmEventType_def::AirSupport: {
|
||||
DEBUG_LOG(m_logger) << "AirSupport zuweisen ";
|
||||
m_ui->cbxAirSupport->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::HitMine: {
|
||||
case ProjectDataManagement::PdmEventType_def::HitMine: {
|
||||
DEBUG_LOG(m_logger) << "HitMine zuweisen ";
|
||||
m_ui->cbxMines->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::HitB:
|
||||
case ProjectDataManagement::EventType_def::HitN:
|
||||
case ProjectDataManagement::EventType_def::HitC: {
|
||||
case ProjectDataManagement::PdmEventType_def::HitB:
|
||||
case ProjectDataManagement::PdmEventType_def::HitN:
|
||||
case ProjectDataManagement::PdmEventType_def::HitC: {
|
||||
DEBUG_LOG(m_logger) << "Hit N/B/C zuweisen ";
|
||||
m_ui->cbxNbcAgent->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::FriendlyFire: {
|
||||
case ProjectDataManagement::PdmEventType_def::FriendlyFire: {
|
||||
DEBUG_LOG(m_logger) << "FriendlyFire zuweisen ";
|
||||
m_ui->cbxFriendlyFire->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
@@ -173,21 +173,21 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig&
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::Manipulation: {
|
||||
case ProjectDataManagement::PdmEventType_def::Manipulation: {
|
||||
DEBUG_LOG(m_logger) << "Manipulation zuweisen ";
|
||||
m_ui->cbxManipulation->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::CrossGlobalBorderline: {
|
||||
case ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline: {
|
||||
DEBUG_LOG(m_logger) << "CrossGlobalBorderline zuweisen ";
|
||||
m_ui->cbxGlobalBorderLine->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::EventType_def::CrossLocalBorderline: {
|
||||
case ProjectDataManagement::PdmEventType_def::CrossLocalBorderline: {
|
||||
DEBUG_LOG(m_logger) << "CrossLocalBorderline zuweisen ";
|
||||
m_ui->cbxLocalBorderLine->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
@@ -215,7 +215,7 @@ std::vector<AlarmManagement::AlarmAction> ConfigParticipantsDialog::getCheckedVa
|
||||
{
|
||||
if (m_ui->cbxDirectFire->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::EventType_def::Hit);
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::Hit);
|
||||
int statusDirect = -1;
|
||||
if (m_ui->cbStatusDirect->currentIndex() > 0)
|
||||
statusDirect = m_ui->cbStatusDirect->currentData().toInt();
|
||||
@@ -224,7 +224,7 @@ std::vector<AlarmManagement::AlarmAction> ConfigParticipantsDialog::getCheckedVa
|
||||
}
|
||||
if (m_ui->cbxFriendlyFire->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::EventType_def::FriendlyFire);
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::FriendlyFire);
|
||||
int statusFriendly = -1;
|
||||
if (m_ui->cbStatusFriendly->currentIndex() > 0)
|
||||
statusFriendly = m_ui->cbStatusFriendly->currentData().toInt();
|
||||
@@ -234,41 +234,41 @@ std::vector<AlarmManagement::AlarmAction> ConfigParticipantsDialog::getCheckedVa
|
||||
alarmActionDds.vulnerabilityState(-1);
|
||||
if (m_ui->cbxIndirectFire->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::EventType_def::HitEffectSimulation);
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::HitEffectSimulation);
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
}
|
||||
if (m_ui->cbxAirSupport->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::EventType_def::AirSupport);
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::AirSupport);
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
}
|
||||
if (m_ui->cbxMines->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::EventType_def::HitMine);
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::HitMine);
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
}
|
||||
if (m_ui->cbxNbcAgent->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::EventType_def::HitN);
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::HitN);
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::EventType_def::HitB);
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::HitB);
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::EventType_def::HitC);
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::HitC);
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
}
|
||||
if (m_ui->cbxManipulation->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::EventType_def::Manipulation);
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::Manipulation);
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
}
|
||||
if (m_ui->cbxGlobalBorderLine->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::EventType_def::CrossGlobalBorderline);
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline);
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
}
|
||||
if (m_ui->cbxLocalBorderLine->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::EventType_def::CrossLocalBorderline);
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::CrossLocalBorderline);
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -220,10 +220,10 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(aiv.chargeStruct().chargeTypeId());
|
||||
|
||||
for (auto gc :
|
||||
{ProjectDataManagement::GearClass::Artillery, ProjectDataManagement::GearClass::Mortar,
|
||||
ProjectDataManagement::GearClass::AirSupport})
|
||||
{ProjectDataManagement::GearClass::GearClass_Artillery, ProjectDataManagement::GearClass::GearClass_Mortar,
|
||||
ProjectDataManagement::GearClass::GearClass_AirSupport})
|
||||
{
|
||||
if (gc == ProjectDataManagement::GearClass::AirSupport && !isExplosionSingle)
|
||||
if (gc == ProjectDataManagement::GearClass::GearClass_AirSupport && !isExplosionSingle)
|
||||
continue;
|
||||
|
||||
if (gearClass == gc)
|
||||
|
||||
+4
-4
@@ -975,8 +975,8 @@ void AesInfoDialog::onShowDetails()
|
||||
std::shared_ptr<AesExplosion::ForeignGuiInterface> ifc;
|
||||
if (m_session->getForeignGuiInterface<AesExplosion::ForeignGuiInterface>(ifc))
|
||||
{
|
||||
const auto gcs = {ProjectDataManagement::GearClass::Artillery, ProjectDataManagement::GearClass::Mortar,
|
||||
ProjectDataManagement::GearClass::AirSupport};
|
||||
const auto gcs = {ProjectDataManagement::GearClass::GearClass_Artillery, ProjectDataManagement::GearClass::GearClass_Mortar,
|
||||
ProjectDataManagement::GearClass::GearClass_AirSupport};
|
||||
const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(m_singleExpChargeTypeId);
|
||||
for (auto gc : gcs)
|
||||
{
|
||||
@@ -1001,8 +1001,8 @@ void AesInfoDialog::onShowDetails()
|
||||
std::shared_ptr<AesExplosion::ForeignGuiInterface> ifc;
|
||||
if (m_session->getForeignGuiInterface<AesExplosion::ForeignGuiInterface>(ifc))
|
||||
{
|
||||
const auto gcs = {ProjectDataManagement::GearClass::Artillery,
|
||||
ProjectDataManagement::GearClass::Mortar};
|
||||
const auto gcs = {ProjectDataManagement::GearClass::GearClass_Artillery,
|
||||
ProjectDataManagement::GearClass::GearClass_Mortar};
|
||||
const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(m_areaExpChargeTypeId);
|
||||
for (auto gc : gcs)
|
||||
{
|
||||
|
||||
+2
-2
@@ -45,7 +45,7 @@ class BContaminationsModel final : public BCContaminationsModel
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit BContaminationsModel(QObject *parent)
|
||||
: BCContaminationsModel(ProjectDataManagement::GearClass::Biological, parent)
|
||||
: BCContaminationsModel(ProjectDataManagement::GearClass::GearClass_Biological, parent)
|
||||
{}
|
||||
};
|
||||
|
||||
@@ -58,7 +58,7 @@ class CContaminationsModel final : public BCContaminationsModel
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit CContaminationsModel(QObject *parent)
|
||||
: BCContaminationsModel(ProjectDataManagement::GearClass::Chemical, parent)
|
||||
: BCContaminationsModel(ProjectDataManagement::GearClass::GearClass_Chemical, parent)
|
||||
{}
|
||||
};
|
||||
}
|
||||
|
||||
+8
-8
@@ -183,7 +183,7 @@ void ExplosionEdit::retranslate()
|
||||
|
||||
switch (m_gearClass.underlying())
|
||||
{
|
||||
case ProjectDataManagement::GearClass::Artillery:
|
||||
case ProjectDataManagement::GearClass::GearClass_Artillery:
|
||||
if (m_type == etSingle)
|
||||
title = tr("Single Artillery");
|
||||
else if (m_type == etArea)
|
||||
@@ -191,7 +191,7 @@ void ExplosionEdit::retranslate()
|
||||
else
|
||||
title = tr ("Single Artillery Central");
|
||||
break;
|
||||
case ProjectDataManagement::GearClass::Mortar:
|
||||
case ProjectDataManagement::GearClass::GearClass_Mortar:
|
||||
if (m_type == etSingle)
|
||||
title = tr("Single Mortar");
|
||||
else if (m_type == etArea)
|
||||
@@ -364,7 +364,7 @@ bool ExplosionEdit::init(int aesItemId, bool copy,
|
||||
bool readable = false;
|
||||
switch (m_gearClass.underlying())
|
||||
{
|
||||
case ProjectDataManagement::GearClass::Artillery:
|
||||
case ProjectDataManagement::GearClass::GearClass_Artillery:
|
||||
m_editable = (LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::SingleExplosionsEditArtillery) && m_type == etSingle) ||
|
||||
(LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::AreaExplosionsEditArtillery) && m_type == etArea) ||
|
||||
(LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::SingleExplosionsCentralEditArtillery) && m_type == etSingleCentral) ||
|
||||
@@ -380,7 +380,7 @@ bool ExplosionEdit::init(int aesItemId, bool copy,
|
||||
else if (m_type == etSingleCentral)
|
||||
setOnlineHelpFilename(QStringLiteral("Situation-Add_Single_Central_Artillery"));
|
||||
break;
|
||||
case ProjectDataManagement::GearClass::Mortar:
|
||||
case ProjectDataManagement::GearClass::GearClass_Mortar:
|
||||
m_editable = (LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::SingleExplosionsEditMortar) && m_type == etSingle) ||
|
||||
(LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::AreaExplosionsEditMortar) && m_type == etArea) ||
|
||||
(LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::SingleExplosionsCentralEditMortar) && m_type == etSingleCentral) ;
|
||||
@@ -481,14 +481,14 @@ QString ExplosionEdit::dialogIdentifier() const
|
||||
{
|
||||
switch (m_gearClass.underlying())
|
||||
{
|
||||
case ProjectDataManagement::GearClass::Artillery:
|
||||
case ProjectDataManagement::GearClass::GearClass_Artillery:
|
||||
if (m_type == etSingle)
|
||||
return m_aesItem.id() <= 0 ? QStringLiteral("AddExplosionSingleArtillery") : QStringLiteral("EditExplosionSingleArtillery%1").arg(m_aesItem.id());
|
||||
else if (m_type == etArea)
|
||||
return m_aesItem.id() <= 0 ? QStringLiteral("AddExplosionAreaArtillery") : QStringLiteral("EditExplosionAreaArtillery%1").arg(m_aesItem.id());
|
||||
else
|
||||
return m_aesItem.id() <= 0 ? QStringLiteral("AddExplosionSingleCentralArtillery") : QStringLiteral("EditExplosionSingleCentralArtillery%1").arg(m_aesItem.id());
|
||||
case ProjectDataManagement::GearClass::Mortar:
|
||||
case ProjectDataManagement::GearClass::GearClass_Mortar:
|
||||
if (m_type == etSingle)
|
||||
return m_aesItem.id() <= 0 ? QStringLiteral("AddExplosionSingleMortar") : QStringLiteral("EditExplosionSingleMortar%1").arg(m_aesItem.id());
|
||||
else if (m_type == etArea)
|
||||
@@ -716,7 +716,7 @@ void ExplosionEdit::onPartyChanged()
|
||||
int partyId = m_ui->cbParty->currentData().toInt();
|
||||
int chargeTypeId = m_ui->cbChargeType->currentData().toInt();
|
||||
if (chargeTypeId <= 0)
|
||||
chargeTypeId = m_gearClass == ProjectDataManagement::GearClass::Artillery ? s_lastChargeTypeA : s_lastChargeTypeM;
|
||||
chargeTypeId = m_gearClass == ProjectDataManagement::GearClass::GearClass_Artillery ? s_lastChargeTypeA : s_lastChargeTypeM;
|
||||
|
||||
QSignalBlocker sb(m_ui->cbChargeType);
|
||||
m_ui->cbChargeType->clear();
|
||||
@@ -736,7 +736,7 @@ bool ExplosionEdit::apply()
|
||||
std::string name = m_ui->leIdentifier->text().toStdString();
|
||||
qint64 effectStart = m_ui->dteEffectStart->msecsSinceEpoch();
|
||||
int chargeType = m_ui->cbChargeType->currentData().toInt();
|
||||
if (m_gearClass == ProjectDataManagement::GearClass::Artillery)
|
||||
if (m_gearClass == ProjectDataManagement::GearClass::GearClass_Artillery)
|
||||
s_lastChargeTypeA = chargeType;
|
||||
else
|
||||
s_lastChargeTypeM = chargeType;
|
||||
|
||||
+11
-11
@@ -45,7 +45,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
|
||||
tr("Single Artillery"),
|
||||
QLatin1String("ShowExplosionSingleArtillery"),
|
||||
QIcon(QLatin1String("icon:arti_ammunition_firings_single.svg")),
|
||||
[this](QWidget *parent) { return onShowExplosionListDialog(true, false, ProjectDataManagement::GearClass::Artillery, parent); },
|
||||
[this](QWidget *parent) { return onShowExplosionListDialog(true, false, ProjectDataManagement::GearClass::GearClass_Artillery, parent); },
|
||||
OperatorRights::SingleExplosionsShowArtillery,
|
||||
LtsWidgets::ExercisePart::eExecution));
|
||||
|
||||
@@ -55,7 +55,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
|
||||
tr("Add Single Artillery"),
|
||||
QLatin1String("AddExplosionSingleArtillery"),
|
||||
QIcon(QLatin1String("icon:arti_ammunition_firings_single_add.svg")),
|
||||
[this](QWidget *parent) { return onShowAddExplosionDialog(true, false, ProjectDataManagement::GearClass::Artillery, parent); },
|
||||
[this](QWidget *parent) { return onShowAddExplosionDialog(true, false, ProjectDataManagement::GearClass::GearClass_Artillery, parent); },
|
||||
OperatorRights::SingleExplosionsShowArtillery,
|
||||
LtsWidgets::ExercisePart::eExecution,
|
||||
LtsWidgets::ExerciseState::eCreated | LtsWidgets::ExerciseState::eStarted | LtsWidgets::ExerciseState::ePaused));
|
||||
@@ -68,7 +68,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
|
||||
tr("Single Artillery Central"),
|
||||
QLatin1String("ShowExplosionSingleCentralArtillery"),
|
||||
QIcon(QLatin1String("icon:arti_ammunition_firings_single.svg")),
|
||||
[this](QWidget *parent) { return onShowExplosionListDialog(true, true, ProjectDataManagement::GearClass::Artillery, parent); },
|
||||
[this](QWidget *parent) { return onShowExplosionListDialog(true, true, ProjectDataManagement::GearClass::GearClass_Artillery, parent); },
|
||||
|
||||
OperatorRights::SingleExplosionsShowArtillery,
|
||||
LtsWidgets::ExercisePart::eExecution));
|
||||
@@ -79,7 +79,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
|
||||
tr("Add Single Artillery Central"),
|
||||
QLatin1String("AddExplosionSingleCentralArtillery"),
|
||||
QIcon(QLatin1String("icon:arti_ammunition_firings_single_add.svg")),
|
||||
[this](QWidget *parent) { return onShowAddExplosionDialog(true, true, ProjectDataManagement::GearClass::Artillery, parent); },
|
||||
[this](QWidget *parent) { return onShowAddExplosionDialog(true, true, ProjectDataManagement::GearClass::GearClass_Artillery, parent); },
|
||||
|
||||
OperatorRights::SingleExplosionsShowArtillery,
|
||||
LtsWidgets::ExercisePart::eExecution,
|
||||
@@ -97,7 +97,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
|
||||
tr("Single Mortar"),
|
||||
QLatin1String("ShowExplosionSingleMortar"),
|
||||
QIcon(QLatin1String("icon:mortar_ammunition_firings.svg")),
|
||||
[this](QWidget *parent) { return onShowExplosionListDialog(true, false, ProjectDataManagement::GearClass::Mortar, parent); },
|
||||
[this](QWidget *parent) { return onShowExplosionListDialog(true, false, ProjectDataManagement::GearClass::GearClass_Mortar, parent); },
|
||||
OperatorRights::SingleExplosionsShowMortar,
|
||||
LtsWidgets::ExercisePart::eExecution));
|
||||
|
||||
@@ -107,7 +107,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
|
||||
tr("Add Single Mortar"),
|
||||
QLatin1String("AddExplosionSingleMortar"),
|
||||
QIcon(QLatin1String("icon:add_mortar_ammunition_firings_single.svg")),
|
||||
[this](QWidget *parent) { return onShowAddExplosionDialog(true, false, ProjectDataManagement::GearClass::Mortar, parent); },
|
||||
[this](QWidget *parent) { return onShowAddExplosionDialog(true, false, ProjectDataManagement::GearClass::GearClass_Mortar, parent); },
|
||||
OperatorRights::SingleExplosionsEditMortar,
|
||||
LtsWidgets::ExercisePart::eExecution,
|
||||
LtsWidgets::ExerciseState::eCreated | LtsWidgets::ExerciseState::eStarted | LtsWidgets::ExerciseState::ePaused));
|
||||
@@ -121,7 +121,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
|
||||
tr("Single NASAT Impacts"),
|
||||
QLatin1String("ShowExplosionSingleAerial"),
|
||||
QIcon(QLatin1String("icon:mortar_ammunition_firings.svg")),
|
||||
[this](QWidget *parent) { return onShowExplosionListDialog(true, false, ProjectDataManagement::GearClass::AirSupport, parent); },
|
||||
[this](QWidget *parent) { return onShowExplosionListDialog(true, false, ProjectDataManagement::GearClass::GearClass_AirSupport, parent); },
|
||||
OperatorRights::AirSupportShow,
|
||||
LtsWidgets::ExercisePart::eExecution));
|
||||
}
|
||||
@@ -136,7 +136,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
|
||||
tr("Area Artillery"),
|
||||
QLatin1String("ShowExplosionAreaArtillery"),
|
||||
QIcon(QLatin1String("icon:arti_ammunition_firings.svg")),
|
||||
[this](QWidget *parent) { return onShowExplosionListDialog(false, false, ProjectDataManagement::GearClass::Artillery, parent); },
|
||||
[this](QWidget *parent) { return onShowExplosionListDialog(false, false, ProjectDataManagement::GearClass::GearClass_Artillery, parent); },
|
||||
OperatorRights::AreaExplosionsShowArtillery,
|
||||
LtsWidgets::ExercisePart::eExecution));
|
||||
|
||||
@@ -146,7 +146,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
|
||||
tr("Add Area Artillery"),
|
||||
QLatin1String("AddExplosionAreaArtillery"),
|
||||
QIcon(QLatin1String("icon:arti_ammunition_firings_add.svg")),
|
||||
[this](QWidget *parent) { return onShowAddExplosionDialog(false, false, ProjectDataManagement::GearClass::Artillery, parent); },
|
||||
[this](QWidget *parent) { return onShowAddExplosionDialog(false, false, ProjectDataManagement::GearClass::GearClass_Artillery, parent); },
|
||||
OperatorRights::AreaExplosionsEditArtillery,
|
||||
LtsWidgets::ExercisePart::eExecution,
|
||||
LtsWidgets::ExerciseState::eCreated | LtsWidgets::ExerciseState::eStarted | LtsWidgets::ExerciseState::ePaused));
|
||||
@@ -161,7 +161,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
|
||||
tr("Area Mortar"),
|
||||
QLatin1String("ShowExplosionAreaMortar"),
|
||||
QIcon(QLatin1String("icon:mortar_ammunition_firings.svg")),
|
||||
[this](QWidget *parent) { return onShowExplosionListDialog(false, false, ProjectDataManagement::GearClass::Mortar, parent); },
|
||||
[this](QWidget *parent) { return onShowExplosionListDialog(false, false, ProjectDataManagement::GearClass::GearClass_Mortar, parent); },
|
||||
OperatorRights::AreaExplosionsShowMortar,
|
||||
LtsWidgets::ExercisePart::eExecution));
|
||||
|
||||
@@ -171,7 +171,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
|
||||
tr("Add Area Mortar"),
|
||||
QLatin1String("AddExplosionAreaMortar"),
|
||||
QIcon(QLatin1String("icon:add_mortar_ammunition_firings.svg")),
|
||||
[this](QWidget *parent) { return onShowAddExplosionDialog(false, false, ProjectDataManagement::GearClass::Mortar, parent); },
|
||||
[this](QWidget *parent) { return onShowAddExplosionDialog(false, false, ProjectDataManagement::GearClass::GearClass_Mortar, parent); },
|
||||
OperatorRights::AreaExplosionsEditMortar,
|
||||
LtsWidgets::ExercisePart::eExecution,
|
||||
LtsWidgets::ExerciseState::eCreated | LtsWidgets::ExerciseState::eStarted | LtsWidgets::ExerciseState::ePaused));
|
||||
|
||||
+3
-3
@@ -29,7 +29,7 @@ bool ExplosionList::init(LtsSession::LtsSession *session)
|
||||
m_bHasAddEditOperatorRights = false;
|
||||
switch (m_gearClass.underlying())
|
||||
{
|
||||
case ProjectDataManagement::GearClass::Artillery:
|
||||
case ProjectDataManagement::GearClass::GearClass_Artillery:
|
||||
|
||||
|
||||
switch (m_type)
|
||||
@@ -66,7 +66,7 @@ bool ExplosionList::init(LtsSession::LtsSession *session)
|
||||
|
||||
|
||||
break;
|
||||
case ProjectDataManagement::GearClass::Mortar:
|
||||
case ProjectDataManagement::GearClass::GearClass_Mortar:
|
||||
m_bHasAddEditOperatorRights = (LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::SingleExplosionsEditMortar) && m_type == etSingle)
|
||||
|| (LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::AreaExplosionsEditMortar) && m_type == etArea);
|
||||
if (m_type == etSingle)
|
||||
@@ -80,7 +80,7 @@ bool ExplosionList::init(LtsSession::LtsSession *session)
|
||||
m_windowTitle = tr("Area Mortar");
|
||||
}
|
||||
break;
|
||||
case ProjectDataManagement::GearClass::AirSupport:
|
||||
case ProjectDataManagement::GearClass::GearClass_AirSupport:
|
||||
Q_ASSERT(m_type == etSingle);
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -248,11 +248,11 @@ ExplosionsEdit::ExplosionsEdit(const QString &menuGroup, QWidget *parent)
|
||||
m_geometrieButtonGroup->addButton(m_ui->geometrieRadialBtn, static_cast<int>(AreaEffectSimulation::AesExplosionGeometry_def::EgRadial));
|
||||
m_geometrieButtonGroup->setExclusive(true);
|
||||
|
||||
m_gearClassFilter = {ProjectDataManagement::GearClass::Artillery, ProjectDataManagement::GearClass::Mortar};
|
||||
m_gearClassFilter = {ProjectDataManagement::GearClass::GearClass_Artillery, ProjectDataManagement::GearClass::GearClass_Mortar};
|
||||
LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
|
||||
const bool enableRocket = ps->value(QStringLiteral("aes"), QStringLiteral("enableRocket"), false).toBool();
|
||||
if (enableRocket)
|
||||
m_gearClassFilter += ProjectDataManagement::GearClass::Rocket;
|
||||
m_gearClassFilter += ProjectDataManagement::GearClass::GearClass_Rocket;
|
||||
m_uiRequirements->addRequirement({m_ui->lblPosition, [this]() { return (!m_coord.isNull()); }});
|
||||
m_uiRequirements->addRequirement({m_ui->lblRadiusBreite, [this]() { return (m_ui->sbDimensionX_BreiteRadius->value() >= s_minWidth); }});
|
||||
m_uiRequirements->addRequirement({m_ui->lblDimensionY_Tiefe, [this]() { return (m_ui->sbDimensionY_Tiefe->value() >= s_minHeight); }});
|
||||
|
||||
+2
-2
@@ -86,11 +86,11 @@ ExplosionsEditAdler::ExplosionsEditAdler(const QString &menuGroup, QWidget *pare
|
||||
m_geometrieButtonGroup->addButton(m_ui->geometrieRadialBtn, static_cast<int>(AreaEffectSimulation::AesExplosionGeometry_def::EgRadial));
|
||||
m_geometrieButtonGroup->setExclusive(true);
|
||||
|
||||
m_gearClassFilter = {ProjectDataManagement::GearClass::Artillery, ProjectDataManagement::GearClass::Mortar};
|
||||
m_gearClassFilter = {ProjectDataManagement::GearClass::GearClass_Artillery, ProjectDataManagement::GearClass::GearClass_Mortar};
|
||||
LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
|
||||
const bool enableRocket = ps->value(QStringLiteral("aes"), QStringLiteral("enableRocket"), false).toBool();
|
||||
if (enableRocket)
|
||||
m_gearClassFilter += ProjectDataManagement::GearClass::Rocket;
|
||||
m_gearClassFilter += ProjectDataManagement::GearClass::GearClass_Rocket;
|
||||
|
||||
m_uiRequirements->addRequirement(
|
||||
{m_ui->lbxActors,
|
||||
|
||||
+3
-3
@@ -269,11 +269,11 @@ ExplosionsEditAdlerStandAlone::ExplosionsEditAdlerStandAlone(const QString &menu
|
||||
m_geometrieButtonGroup->addButton(m_ui->geometrieRadialBtn, static_cast<int>(AreaEffectSimulation::AesExplosionGeometry_def::EgRadial));
|
||||
m_geometrieButtonGroup->setExclusive(true);
|
||||
|
||||
m_gearClassFilter = {ProjectDataManagement::GearClass::Artillery, ProjectDataManagement::GearClass::Mortar};
|
||||
m_gearClassFilter = {ProjectDataManagement::GearClass::GearClass_Artillery, ProjectDataManagement::GearClass::GearClass_Mortar};
|
||||
LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
|
||||
const bool enableRocket = ps->value(QStringLiteral("aes"), QStringLiteral("enableRocket"), false).toBool();
|
||||
if (enableRocket)
|
||||
m_gearClassFilter += ProjectDataManagement::GearClass::Rocket;
|
||||
m_gearClassFilter += ProjectDataManagement::GearClass::GearClass_Rocket;
|
||||
m_uiRequirements->addRequirement({m_ui->lblPosition, [this]() { return (!m_coord.isNull()); }});
|
||||
m_uiRequirements->addRequirement({m_ui->lblRadiusBreite, [this]() { return (m_ui->sbDimensionX_BreiteRadius->value() >= s_minWidth); }});
|
||||
m_uiRequirements->addRequirement({m_ui->lblDimensionY_Tiefe, [this]() { return (m_ui->sbDimensionY_Tiefe->value() >= s_minHeight); }});
|
||||
@@ -2157,7 +2157,7 @@ bool ExplosionsEditAdlerStandAlone::apply()
|
||||
const QVariant currentData = m_ui->cbGearClass->currentData();
|
||||
const ProjectDataManagement::GearClass::type currentGearClass = static_cast<ProjectDataManagement::GearClass::type>(currentData.toInt());
|
||||
|
||||
if (currentGearClass == ProjectDataManagement::GearClass::Rocket)
|
||||
if (currentGearClass == ProjectDataManagement::GearClass::GearClass_Rocket)
|
||||
RocketUtility::addRocketPropertiesToRequest(request, m_ppmDtc);
|
||||
|
||||
m_requestHelper->addRequest([this, request]() { return m_ftc->effectClusterModifyRequest(request, this); });
|
||||
|
||||
+2
-2
@@ -41,7 +41,7 @@ void enaDisaWirkmittel(QComboBox *wirkmittelCombobox, AesExplosionGeometry::type
|
||||
const QVariant currentData = wirkmittelCombobox->itemData(indexCounter);
|
||||
const ProjectDataManagement::GearClass::type currentGearClass = static_cast<ProjectDataManagement::GearClass::type>(currentData.toInt());
|
||||
|
||||
if (currentGearClass == ProjectDataManagement::GearClass::Rocket)
|
||||
if (currentGearClass == ProjectDataManagement::GearClass::GearClass_Rocket)
|
||||
{
|
||||
QStandardItem *item = cboModel->item(indexCounter);
|
||||
|
||||
@@ -64,7 +64,7 @@ void enaDisaWirkmittel(QComboBox *wirkmittelCombobox, AesExplosionGeometry::type
|
||||
const QVariant currentData = wirkmittelCombobox->itemData(indexCounter);
|
||||
const ProjectDataManagement::GearClass::type currentGearClass = static_cast<ProjectDataManagement::GearClass::type>(currentData.toInt());
|
||||
|
||||
if (currentGearClass == ProjectDataManagement::GearClass::Rocket)
|
||||
if (currentGearClass == ProjectDataManagement::GearClass::GearClass_Rocket)
|
||||
{
|
||||
QStandardItem *item = cboModel->item(indexCounter);
|
||||
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ public:
|
||||
enum AdditionalColumns {ColType = BcCount};
|
||||
explicit FunctionalAreasModel(QObject *parent = nullptr)
|
||||
: AesGuiBaseModel<FunctionalArea>(parent, {tr("Type")})
|
||||
, m_gearClass(ProjectDataManagement::GearClass::FunctionalArea)
|
||||
, m_gearClass(ProjectDataManagement::GearClass::GearClass_FunctionalArea)
|
||||
{}
|
||||
|
||||
bool initModel(LtsSession::LtsSession *session) override;
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ bool BoobyTrapModel::initModel(LtsSession::LtsSession *session)
|
||||
connect(m_aesDtc.get(), &Interface::Dtc::boobyTrapChanged,
|
||||
this, &BoobyTrapModel::onDataChanged);
|
||||
|
||||
fillAvailableChargeIds(ProjectDataManagement::GearClass::BoobyTrap);
|
||||
fillAvailableChargeIds(ProjectDataManagement::GearClass::GearClass_BoobyTrap);
|
||||
|
||||
m_aesDtc->boobyTraps([this](const BoobyTrap &item) { insertRow(item); });
|
||||
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ bool OffRouteMineModel::initModel(LtsSession::LtsSession *session)
|
||||
connect(m_aesDtc.get(), &Interface::Dtc::offRouteMineChanged,
|
||||
this, &OffRouteMineModel::onDataChanged);
|
||||
|
||||
fillAvailableChargeIds(ProjectDataManagement::GearClass::OffRouteMine);
|
||||
fillAvailableChargeIds(ProjectDataManagement::GearClass::GearClass_OffRouteMine);
|
||||
|
||||
m_aesDtc->offRouteMines([this](const OffRouteMine &item) { insertRow(item); });
|
||||
|
||||
|
||||
+1
-1
@@ -149,7 +149,7 @@ QString BuildingHistoryDialogModel::getContaminations(
|
||||
const ProjectDataManagement::GearClass& gc =
|
||||
m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct().chargeTypeId());
|
||||
DEBUG_LOG(m_logger) << "gc=" << gc;
|
||||
if (gc == ProjectDataManagement::GearClass::Unknown)
|
||||
if (gc == ProjectDataManagement::GearClass::GearClass_Unknown)
|
||||
continue;
|
||||
QString gearClassName = ProjectDataManagement::toString(gc).trimmed();
|
||||
gearClassName.chop(gearClassName.size() - 1);
|
||||
|
||||
+1
-1
@@ -151,7 +151,7 @@ HitLineInfoDialog::getContaminations(const std::vector<Buildings::ContaminationS
|
||||
m_aesDtc->aesItemFromId(cs.aesId(), item);
|
||||
const ProjectDataManagement::GearClass& gc =
|
||||
m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct().chargeTypeId());
|
||||
if (gc == ProjectDataManagement::GearClass::Unknown)
|
||||
if (gc == ProjectDataManagement::GearClass::GearClass_Unknown)
|
||||
continue;
|
||||
QString gearClassName = ProjectDataManagement::toString(gc).trimmed();
|
||||
gearClassName.chop(gearClassName.size() - 1);
|
||||
|
||||
+1
-1
@@ -606,7 +606,7 @@ void BldInfoDialog::showBuildingInfos(const Buildings::BuildingState& bldState)
|
||||
m_aesDtc->aesItemFromId(cs.aesId(), item);
|
||||
const ProjectDataManagement::GearClass& gc =
|
||||
m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct().chargeTypeId());
|
||||
if (gc == ProjectDataManagement::GearClass::Unknown)
|
||||
if (gc == ProjectDataManagement::GearClass::GearClass_Unknown)
|
||||
continue;
|
||||
QString gearClassName = ProjectDataManagement::toString(gc).trimmed();
|
||||
gearClassName.chop(gearClassName.size() - 1);
|
||||
|
||||
+1
-1
@@ -438,7 +438,7 @@ void AesFilterWidget::onPbChargTypesMineAreaClicked()
|
||||
emit changesMade();
|
||||
};
|
||||
|
||||
m_ifcPdmCbx->chargeSelector(ess.visibleChargeTypeIds, ProjectDataManagement::GearClass::MineArea, cb, this);
|
||||
m_ifcPdmCbx->chargeSelector(ess.visibleChargeTypeIds, ProjectDataManagement::GearClass::GearClass_MineArea, cb, this);
|
||||
}
|
||||
|
||||
void AesFilterWidget::onChbMineAreSingleMinesClicked()
|
||||
|
||||
+2
-2
@@ -113,7 +113,7 @@ bool FiringUnitValidator::isSameGearClassArtillery(int typeIdA, int typeIdB) con
|
||||
{
|
||||
const ProjectDataManagement::GearClass::type gearClassA = getGearClassType(typeIdA);
|
||||
|
||||
if (gearClassA == ProjectDataManagement::GearClass::Unknown)
|
||||
if (gearClassA == ProjectDataManagement::GearClass::GearClass_Unknown)
|
||||
return false;
|
||||
|
||||
const ProjectDataManagement::GearClass::type gearClassB = getGearClassType(typeIdB);
|
||||
@@ -126,7 +126,7 @@ ProjectDataManagement::GearClass::type FiringUnitValidator::getGearClassType(int
|
||||
const Type type = m_ppmDtc->type(typeId);
|
||||
const QJsonDocument properties = QJsonDocument::fromJson(QByteArray::fromStdString(type.properties()));
|
||||
const QJsonObject propertiesObject = properties.object();
|
||||
const int gearClassId = propertiesObject.value(QStringLiteral("gearClassId")).toInt(ProjectDataManagement::GearClass::Unknown);
|
||||
const int gearClassId = propertiesObject.value(QStringLiteral("gearClassId")).toInt(ProjectDataManagement::GearClass::GearClass_Unknown);
|
||||
|
||||
return static_cast<ProjectDataManagement::GearClass::type>(gearClassId);
|
||||
}
|
||||
|
||||
+2
-2
@@ -959,9 +959,9 @@ QString ParticipantConfigModel::buildInternationalModeString(const ProjectDataMa
|
||||
{
|
||||
switch(inMode.underlying())
|
||||
{
|
||||
case ProjectDataManagement::InternationalMode::On:
|
||||
case ProjectDataManagement::InternationalMode::InternationalMode_On:
|
||||
return tr("On");
|
||||
case ProjectDataManagement::InternationalMode::Off:
|
||||
case ProjectDataManagement::InternationalMode::InternationalMode_Off:
|
||||
return tr("Off");
|
||||
default:
|
||||
return tr("No Change");
|
||||
|
||||
+2
-2
@@ -1653,13 +1653,13 @@ void ParticipantInfoDialog::onUasChanged(const UAS &uas)
|
||||
|
||||
switch (uas.uasState().underlying())
|
||||
{
|
||||
case ProjectDataManagement::UasState::Auto:
|
||||
case ProjectDataManagement::UasState::UasState_Auto:
|
||||
{
|
||||
m_ui->lblOperatingMode->setText(textHtml.arg(QStringLiteral("green")).arg(operatingMode));
|
||||
break;
|
||||
}
|
||||
|
||||
case ProjectDataManagement::UasState::Manual:
|
||||
case ProjectDataManagement::UasState::UasState_Manual:
|
||||
{
|
||||
m_ui->lblOperatingMode->setText(textHtml.arg(QStringLiteral("orange")).arg(operatingMode));
|
||||
break;
|
||||
|
||||
+1
-1
@@ -59,7 +59,7 @@ public:
|
||||
explicit ChargeTableDialog(QWidget *parent = nullptr, bool organiser = false);
|
||||
~ChargeTableDialog();
|
||||
|
||||
bool init(LtsSession::LtsSession *session, bool showDetails = false, const QSet<GearClass> &gearClasses = {GearClass::DuelSim});
|
||||
bool init(LtsSession::LtsSession *session, bool showDetails = false, const QSet<GearClass> &gearClasses = {GearClass::GearClass_DuelSim});
|
||||
bool apply() override;
|
||||
|
||||
public slots:
|
||||
|
||||
+1
-1
@@ -79,7 +79,7 @@ public:
|
||||
explicit ChargeTableDialogModel(bool isOrganiser, QObject *parent = nullptr);
|
||||
~ChargeTableDialogModel();
|
||||
|
||||
bool initModel(const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &dtc, const QSet<GearClass> &gearClasses = {GearClass::DuelSim});
|
||||
bool initModel(const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &dtc, const QSet<GearClass> &gearClasses = {GearClass::GearClass_DuelSim});
|
||||
|
||||
QVariant data(const QModelIndex &, int) const override final;
|
||||
bool setData(const QModelIndex &idx, const QVariant &value, int role = Qt::EditRole) override final;
|
||||
|
||||
+3
-3
@@ -286,9 +286,9 @@ bool fill(QComboBox *cbx, PdmComboBoxType type)
|
||||
}
|
||||
case PdmComboBoxType::CbInternationalMode:
|
||||
{
|
||||
cbx->addItem(toString(InternationalMode::NoChange), InternationalMode::NoChange);
|
||||
cbx->addItem(toString(InternationalMode::On), InternationalMode::On);
|
||||
cbx->addItem(toString(InternationalMode::Off), InternationalMode::Off);
|
||||
cbx->addItem(toString(InternationalMode::InternationalMode_NoChange), InternationalMode::InternationalMode_NoChange);
|
||||
cbx->addItem(toString(InternationalMode::InternationalMode_On), InternationalMode::InternationalMode_On);
|
||||
cbx->addItem(toString(InternationalMode::InternationalMode_Off), InternationalMode::InternationalMode_Off);
|
||||
break;
|
||||
}
|
||||
case PdmComboBoxType::CbABCProtectionMode:
|
||||
|
||||
+10
-10
@@ -28,42 +28,42 @@ void ForeignGuiInterfaceImpl::uninit()
|
||||
|
||||
bool ForeignGuiInterfaceImpl::fillBComboBox(QComboBox *cbx)
|
||||
{
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::Biological, m_dtc);
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_Biological, m_dtc);
|
||||
}
|
||||
|
||||
bool ForeignGuiInterfaceImpl::fillCComboBox(QComboBox *cbx)
|
||||
{
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::Chemical, m_dtc);
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_Chemical, m_dtc);
|
||||
}
|
||||
|
||||
bool ForeignGuiInterfaceImpl::fillNComboBox(QComboBox *cbx)
|
||||
{
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::Nuclear, m_dtc);
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_Nuclear, m_dtc);
|
||||
}
|
||||
|
||||
bool ForeignGuiInterfaceImpl::fillArtilleryComboBox(QComboBox *cbx)
|
||||
{
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::Artillery, m_dtc);
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_Artillery, m_dtc);
|
||||
}
|
||||
|
||||
bool ForeignGuiInterfaceImpl::fillMortarComboBox(QComboBox *cbx)
|
||||
{
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::Mortar, m_dtc);
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_Mortar, m_dtc);
|
||||
}
|
||||
|
||||
bool ForeignGuiInterfaceImpl::fillSingleMineComboBox(QComboBox *cbx)
|
||||
{
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::MineSingle, m_dtc);
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_MineSingle, m_dtc);
|
||||
}
|
||||
|
||||
bool ForeignGuiInterfaceImpl::fillMineFieldComboBox(QComboBox *cbx)
|
||||
{
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::MineArea, m_dtc);
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_MineArea, m_dtc);
|
||||
}
|
||||
|
||||
bool ForeignGuiInterfaceImpl::fillBoobyTrapComboBox(QComboBox *cbx)
|
||||
{
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::BoobyTrap, m_dtc);
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_BoobyTrap, m_dtc);
|
||||
}
|
||||
|
||||
bool ForeignGuiInterfaceImpl::fillOffRouteMineComboBox(QComboBox *cbx)
|
||||
@@ -73,12 +73,12 @@ bool ForeignGuiInterfaceImpl::fillOffRouteMineComboBox(QComboBox *cbx)
|
||||
|
||||
bool ForeignGuiInterfaceImpl::fillFunctionalAreaComboBox(QComboBox *cbx)
|
||||
{
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::FunctionalArea, m_dtc);
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_FunctionalArea, m_dtc);
|
||||
}
|
||||
|
||||
bool ForeignGuiInterfaceImpl::fillAirSupportComboBox(QComboBox *cbx)
|
||||
{
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::AirSupport, m_dtc);
|
||||
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_AirSupport, m_dtc);
|
||||
}
|
||||
|
||||
void ForeignGuiInterfaceImpl::fillIgniterComboBox(QComboBox *cbx, int chargeTypeId)
|
||||
|
||||
+5
-5
@@ -77,20 +77,20 @@ bool ReportChargeModel::isFiltered(const ProjectDataManagement::ChargeType &data
|
||||
switch (m_reportType.underlying())
|
||||
{
|
||||
case ReportType::ChargeAdministration:
|
||||
return (gc != ProjectDataManagement::GearClass::Artillery &&
|
||||
gc != ProjectDataManagement::GearClass::Mortar &&
|
||||
gc != ProjectDataManagement::GearClass::Rocket);
|
||||
return (gc != ProjectDataManagement::GearClass::GearClass_Artillery &&
|
||||
gc != ProjectDataManagement::GearClass::GearClass_Mortar &&
|
||||
gc != ProjectDataManagement::GearClass::GearClass_Rocket);
|
||||
case ReportType::ChargeResupply:
|
||||
|
||||
|
||||
case ReportType::Firings:
|
||||
|
||||
return (gc != ProjectDataManagement::GearClass::DuelSim ||
|
||||
return (gc != ProjectDataManagement::GearClass::GearClass_DuelSim ||
|
||||
m_pdmDtc->isDryFire(data.id(),0,0) || m_pdmDtc->isIed(data.id(),0,0));
|
||||
|
||||
|
||||
case ReportType::AirSupport:
|
||||
return (gc != ProjectDataManagement::GearClass::AirSupport);
|
||||
return (gc != ProjectDataManagement::GearClass::GearClass_AirSupport);
|
||||
case ReportType::ExplosiveDevice:
|
||||
return !m_pdmDtc->isIed(data.id(),0,0);
|
||||
default:
|
||||
|
||||
+2
-2
@@ -93,7 +93,7 @@ void EquipmentErrorRegistrationModel::doEventRequests()
|
||||
{
|
||||
int64_t reqEnd = ((startTime + 24 * 60 * 60 * 1000) > endTime ? endTime : startTime + 24 * 60 * 60 * 1000);
|
||||
|
||||
m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::EventType_def::EquipmentErrorReport});
|
||||
m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::PdmEventType_def::EquipmentErrorReport});
|
||||
|
||||
|
||||
startTime += (24 * 60 * 60 * 1000) + 1;
|
||||
@@ -133,7 +133,7 @@ void EquipmentErrorRegistrationModel::onRequestedDataAvailable(TimeLineManagemen
|
||||
|
||||
void EquipmentErrorRegistrationModel::onLiveEvent(const ExerciseEventManagement::Event &ev)
|
||||
{
|
||||
if (ev.eventTypeId() != ProjectDataManagement::EventType_def::EquipmentErrorReport)
|
||||
if (ev.eventTypeId() != ProjectDataManagement::PdmEventType_def::EquipmentErrorReport)
|
||||
return;
|
||||
INFO_LOG(m_logger) << "Event EquipmentNumber=" << ev.equipmentNumber();
|
||||
insertRow(event2Entry(ev));
|
||||
|
||||
+3
-3
@@ -347,9 +347,9 @@ void HgrAndMineSearchModel::doEventRequests()
|
||||
arr += QJsonValue(it.key());
|
||||
const QJsonObject filter({{QStringLiteral("OriginatorChargeTypeId"), arr}});
|
||||
|
||||
m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::EventType_def::Hit,
|
||||
ProjectDataManagement::EventType_def::HitEffectSimulation,
|
||||
ProjectDataManagement::EventType_def::HitMine}, filter);
|
||||
m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::PdmEventType_def::Hit,
|
||||
ProjectDataManagement::PdmEventType_def::HitEffectSimulation,
|
||||
ProjectDataManagement::PdmEventType_def::HitMine}, filter);
|
||||
|
||||
|
||||
startTime += (24 * 60 * 60 * 1000) + 1;
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ namespace ServiceMonitor
|
||||
{
|
||||
struct HgrAndMineSearchEntry
|
||||
{
|
||||
ProjectDataManagement::HgrMineSearchFilterType type = ProjectDataManagement::HgrMineSearchFilterType::Unknown;
|
||||
ProjectDataManagement::HgrMineSearchFilterType type = ProjectDataManagement::HgrMineSearchFilterType_Unknown;
|
||||
Core::GeoPosition pos;
|
||||
int64_t timeStamp = -1;
|
||||
int32_t source = -1;
|
||||
|
||||
+1
-1
@@ -108,7 +108,7 @@ bool AlarmToMap::isElapsed(const Sim2SituationMap::DDS_T &data) const
|
||||
|
||||
|
||||
|
||||
if (data.eventType().underlying() != ProjectDataManagement::EventType_def::EmergencyCall)
|
||||
if (data.eventType().underlying() != ProjectDataManagement::PdmEventType_def::EmergencyCall)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
|
||||
+4
-4
@@ -518,12 +518,12 @@ AreaEffectSimulation::AesType EffectCluster2SituationMap::aesTypeFromGearClassCh
|
||||
const ProjectDataManagement::GearClass &gc = m_pdmHandler->gearClassFromChargeTypeId(data.chargeStruct().chargeTypeId());
|
||||
switch (gc.underlying())
|
||||
{
|
||||
case ProjectDataManagement::GearClass::AirSupport:
|
||||
case ProjectDataManagement::GearClass::GearClass_AirSupport:
|
||||
s_aesTypeMap[data.chargeStruct().chargeTypeId()] = AreaEffectSimulation::AesType::AtAirSupportImpact;
|
||||
break;
|
||||
case ProjectDataManagement::GearClass::Artillery:
|
||||
case ProjectDataManagement::GearClass::Mortar:
|
||||
case ProjectDataManagement::GearClass::Rocket:
|
||||
case ProjectDataManagement::GearClass::GearClass_Artillery:
|
||||
case ProjectDataManagement::GearClass::GearClass_Mortar:
|
||||
case ProjectDataManagement::GearClass::GearClass_Rocket:
|
||||
s_aesTypeMap[data.chargeStruct().chargeTypeId()] = AreaEffectSimulation::AesType::AtExplosionArea;
|
||||
break;
|
||||
default:
|
||||
|
||||
+4
-4
@@ -920,12 +920,12 @@ AreaEffectSimulation::AesType ExplosionCluster2SituationMap::aesTypeFromGearClas
|
||||
const ProjectDataManagement::GearClass &gc = m_pdmHandler->gearClassFromChargeTypeId(data.chargeStruct().chargeTypeId());
|
||||
switch (gc.underlying())
|
||||
{
|
||||
case ProjectDataManagement::GearClass::AirSupport:
|
||||
case ProjectDataManagement::GearClass::GearClass_AirSupport:
|
||||
s_aesTypeMap[data.chargeStruct().chargeTypeId()] = AreaEffectSimulation::AesType::AtAirSupportImpact;
|
||||
break;
|
||||
case ProjectDataManagement::GearClass::Artillery:
|
||||
case ProjectDataManagement::GearClass::Mortar:
|
||||
case ProjectDataManagement::GearClass::Rocket:
|
||||
case ProjectDataManagement::GearClass::GearClass_Artillery:
|
||||
case ProjectDataManagement::GearClass::GearClass_Mortar:
|
||||
case ProjectDataManagement::GearClass::GearClass_Rocket:
|
||||
s_aesTypeMap[data.chargeStruct().chargeTypeId()] = AreaEffectSimulation::AesType::AtExplosionArea;
|
||||
break;
|
||||
default:
|
||||
|
||||
@@ -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();
|
||||
|
||||
+2
-2
@@ -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())
|
||||
|
||||
+1
-1
@@ -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(), {}));
|
||||
});
|
||||
|
||||
|
||||
+5
-5
@@ -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;
|
||||
|
||||
+39
-39
@@ -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,
|
||||
};
|
||||
|
||||
+18
-18
@@ -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
|
||||
{
|
||||
|
||||
+3
-3
@@ -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);
|
||||
}
|
||||
|
||||
+2
-2
@@ -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;
|
||||
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+69
-69
@@ -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;
|
||||
|
||||
|
||||
+2
-2
@@ -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;
|
||||
|
||||
+3
-3
@@ -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();
|
||||
}
|
||||
|
||||
+74
-74
@@ -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());
|
||||
|
||||
+3
-3
@@ -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;
|
||||
|
||||
+12
-12
@@ -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()));
|
||||
|
||||
Reference in new issue
Block a user