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

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

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

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/main.cpp
+1 -1
View File
@@ -20,7 +20,7 @@ void add(qint64 time_offset)
time += time_offset;
ttm->addTestEvent(new LtsTimelineClassic::Event(
0, (int)ProjectDataManagement::EventType_def::Hit, time, 0, 0, 0, 0, QStringList() << QStringLiteral("Test"),
0, (int)ProjectDataManagement::PdmEventType_def::Hit, time, 0, 0, 0, 0, QStringList() << QStringLiteral("Test"),
LtsTimelineClassic::Event::drawCustomEventGraphicEllipse, QColor("green"), QString()));
}
qt6-after/qt6-migrated-legatus/Lts/DDS/Core/core.xml
+2 -2
View File
@@ -105,7 +105,7 @@
</topicType>
<topicType name="PortInformation">
<column name="number" idlType="long"/>
<column name="type" idlType="PortType"/>
<column name="type" idlType="CorePortType"/>
<column name="properties" idlType="string"/>
</topicType>
<topicType name="RelativePosition">
@@ -150,7 +150,7 @@
<attribute key="Completed" value="2"/>
<attribute key="Error" value="4"/>
</enumeration>
<enumeration name="PortType">
<enumeration name="CorePortType">
<attribute key="Unknown" value="0"/>
<attribute key="WebSocketServer" value="1"/>
<attribute key="WebSocketPositionServer" value="2"/>
qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp
+4 -4
View File
@@ -48,7 +48,7 @@ void Pacemaker::setNewStateInternal(Core::RunningState newState, const QString&
publishState();
}
void Pacemaker::addPort(unsigned short number, Core::PortType portType, const QString& properties)
void Pacemaker::addPort(unsigned short number, Core::CorePortType portType, const QString& properties)
{
if (QThread::currentThread() == this->thread())
addPortInternal(number, portType, properties);
@@ -57,7 +57,7 @@ void Pacemaker::addPort(unsigned short number, Core::PortType portType, const QS
[this, number, portType, properties]() { addPortInternal(number, portType, properties); });
}
void Pacemaker::addPortInternal(unsigned short number, Core::PortType portType, const QString& properties)
void Pacemaker::addPortInternal(unsigned short number, Core::CorePortType portType, const QString& properties)
{
if (!m_state.ports().is_set())
m_state.ports() = std::vector<Core::PortInformation>();
@@ -133,14 +133,14 @@ void Pacemaker::setNewStateInternal(Core::RunningState newState, const QString&
Q_UNUSED(errorString)
}
void Pacemaker::addPort(unsigned short number, Core::PortType portType, const QString& properties)
void Pacemaker::addPort(unsigned short number, Core::CorePortType portType, const QString& properties)
{
Q_UNUSED(number)
Q_UNUSED(portType)
Q_UNUSED(properties)
}
void Pacemaker::addPortInternal(unsigned short number, Core::PortType portType, const QString& properties)
void Pacemaker::addPortInternal(unsigned short number, Core::CorePortType portType, const QString& properties)
{
Q_UNUSED(number)
Q_UNUSED(portType)
qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.h
+3 -3
View File
@@ -8,7 +8,7 @@
#include <QtCore/QThread>
// Forward declarations for moc compatibility (moc doesn't see BUILD_RTI guards)
namespace Core { enum class RunningState; enum class PortType; }
namespace Core { enum class RunningState; enum class CorePortType; }
namespace DTS { class CurrentRunningStateImpl; }
#if BUILD_RTI
@@ -52,7 +52,7 @@ class CORE_CLIENT_EXPORT Pacemaker final : public QObject
public Q_SLOTS:
#if BUILD_RTI
void setNewState(Core::RunningState newState, const QString& errorString = QString());
void addPort(unsigned short number, Core::PortType portType, const QString& properties = QStringLiteral(""));
void addPort(unsigned short number, Core::CorePortType portType, const QString& properties = QStringLiteral(""));
void publishState();
#endif
@@ -62,7 +62,7 @@ class CORE_CLIENT_EXPORT Pacemaker final : public QObject
NGL::INGLLogger& m_logger;
void init(DDSConnector::DdsConnector* ddsConnector);
void setNewStateInternal(Core::RunningState newState, const QString& errorString = QString());
void addPortInternal(unsigned short number, Core::PortType portType,
void addPortInternal(unsigned short number, Core::CorePortType portType,
const QString& properties = QStringLiteral(""));
CurrentRunningState m_state;
qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/ddsut.xml
+2 -2
View File
@@ -70,7 +70,7 @@
</topicType>
<topicType name="PortInformation">
<column name="number" idlType="long"/>
<column name="type" idlType="PortType"/>
<column name="type" idlType="DdsutPortType"/>
</topicType>
<topicType name="RelativePosition">
<column name="offsetX" idlType="double" comment="in meter"/>
@@ -115,7 +115,7 @@
<functionTopic name="FunctionTopicTestWithState" requestTopicType="FunctionRequestWithState" replyTopicType="FunctionReplyWithState" requestTopicName="FunctionTopicTestWithStateRequest" replyTopicName="FunctionTopicTestWithStateReply" routeInReplay="0"/>
</functionTopics>
<enumerations>
<enumeration name="PortType">
<enumeration name="DdsutPortType">
<attribute key="Unknown" value="0"/>
<attribute key="WebSocketServer" value="1"/>
</enumeration>
qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp
+1 -1
View File
@@ -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:
qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp
+3 -3
View File
@@ -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();
qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h
+1 -1
View File
@@ -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;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.cpp
+1 -1
View File
@@ -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();
qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.cpp
+18 -18
View File
@@ -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);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.h
+1 -1
View File
@@ -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);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.cpp
+22 -22
View File
@@ -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);
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.cpp
+3 -3
View File
@@ -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)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.cpp
+4 -4
View File
@@ -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)
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontaminations_model.h
+2 -2
View File
@@ -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)
{}
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.cpp
+8 -8
View File
@@ -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;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.cpp
+11 -11
View File
@@ -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));
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_list.cpp
+3 -3
View File
@@ -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);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.cpp
+2 -2
View File
@@ -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); }});
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.cpp
+2 -2
View File
@@ -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,
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp
+3 -3
View File
@@ -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); });
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.cpp
+2 -2
View File
@@ -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);
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_areas_model.h
+1 -1
View File
@@ -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;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_model.cpp
+1 -1
View File
@@ -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); });
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_model.cpp
+1 -1
View File
@@ -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); });
qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_history_dialog_model.cpp
+1 -1
View File
@@ -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);
qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_hitline_info_dialog.cpp
+1 -1
View File
@@ -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);
qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.cpp
+1 -1
View File
@@ -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);
qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_widget.cpp
+1 -1
View File
@@ -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()
qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.cpp
+2 -2
View File
@@ -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);
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.cpp
+2 -2
View File
@@ -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");
qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp
+2 -2
View File
@@ -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;
qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.h
+1 -1
View File
@@ -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:
qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.h
+1 -1
View File
@@ -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;
qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp
+3 -3
View File
@@ -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:
qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.cpp
+10 -10
View File
@@ -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)
qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.cpp
+5 -5
View File
@@ -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:
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.cpp
+2 -2
View File
@@ -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));
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.cpp
+3 -3
View File
@@ -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;
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.h
+1 -1
View File
@@ -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;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/alarm_to_map.cpp
+1 -1
View File
@@ -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;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp
+4 -4
View File
@@ -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:
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp
+4 -4
View File
@@ -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:
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Data/tln_data_plugin.cpp
+2 -2
View File
@@ -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();
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_filter.cpp
+2 -2
View File
@@ -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())
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp
+1 -1
View File
@@ -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(), {}));
});
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.cpp
+5 -5
View File
@@ -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;
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.cpp
+39 -39
View File
@@ -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:
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.h
+38 -38
View File
@@ -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,
};
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.cpp
+18 -18
View File
@@ -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
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.cpp
+3 -3
View File
@@ -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);
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.h
+2 -2
View File
@@ -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;
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog.cpp
+1 -1
View File
@@ -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;
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.cpp
+69 -69
View File
@@ -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;
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.h
+2 -2
View File
@@ -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;
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_model.cpp
+3 -3
View File
@@ -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();
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_legend.cpp
+74 -74
View File
@@ -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());
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_legend.h
+3 -3
View File
@@ -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;
qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_show_details.cpp
+12 -12
View File
@@ -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()));
qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ bool MainHandler::init(int domainId, int exerciseId)
DEBUG_LOG(m_logger) << "WebSocketInterfaceHandler initialized Port=" << m_webSocketHandler->listenPort();
m_ddsHandler->pacemaker()->addPort(m_webSocketHandler->listenPort(), Core::PortType::WebSocketServer);
m_ddsHandler->pacemaker()->addPort(m_webSocketHandler->listenPort(), Core::CorePortType::WebSocketServer);
if (bRet)
{
qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ModuleTest/msgcompares.cpp
+5 -5
View File
@@ -110,7 +110,7 @@ void MsgCompares::compareFeuerkommandoGeschosse(const AdlerJson::FeuerkommandoGe
void MsgCompares::compareFeuerHaltDaten(const AdlerJson::FeuerHaltDaten &feuerHaltDaten)
{
QCOMPARE(feuerHaltDaten.kategorie, ProjectDataManagement::L22_FireHaltCategory::E);
QCOMPARE(feuerHaltDaten.kategorie, ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_E);
QCOMPARE(feuerHaltDaten.feuerkampfReferenz, QStringLiteral("feuerHaltDaten"));
QCOMPARE(feuerHaltDaten.zpNummer, 5);
QCOMPARE(feuerHaltDaten.koordinate.latitude, 53.37791);
@@ -147,7 +147,7 @@ void MsgCompares::compareFeuerstellungsdaten(const AdlerJson::Feuerstellungsdate
QCOMPARE(feuerstellungsdaten.status, ProjectDataManagement::L28_Status::Einsatzbereit);
QCOMPARE(feuerstellungsdaten.feuereinheit.verein, QStringLiteral("verein ExFeuerstellungFS"));
QCOMPARE(feuerstellungsdaten.feuereinheit.r, 5);
QCOMPARE(feuerstellungsdaten.feuereinheit.oi, ProjectDataManagement::L19_Oi::F3);
QCOMPARE(feuerstellungsdaten.feuereinheit.oi, ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3);
QCOMPARE(feuerstellungsdaten.mittelpunkt.koordinate.latitude, 53.37791);
QCOMPARE(feuerstellungsdaten.mittelpunkt.koordinate.longitude, 8.759);
QCOMPARE(feuerstellungsdaten.mittelpunkt.hoehe, 20);
@@ -163,7 +163,7 @@ void MsgCompares::compareWaffensystemdaten(const AdlerJson::Waffensystemdaten &w
QCOMPARE(waffensystemdaten.status, ProjectDataManagement::L28_Status::NichtEinsatzbereit);
QCOMPARE(waffensystemdaten.einheit.verein, QStringLiteral("AB7X"));
QCOMPARE(waffensystemdaten.einheit.r, 6);
QCOMPARE(waffensystemdaten.einheit.oi, ProjectDataManagement::L19_Oi::F6);
QCOMPARE(waffensystemdaten.einheit.oi, ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F6);
MsgCompares::compareGeschosse(waffensystemdaten.geschosse);
QCOMPARE(waffensystemdaten.koordinate.koordinate.latitude, 53.088354);
QCOMPARE(waffensystemdaten.koordinate.koordinate.longitude, 8.853092);
@@ -176,7 +176,7 @@ void MsgCompares::compareWaffensystemdaten(const AdlerJson::Waffensystemdaten &w
void MsgCompares::compareLadeplatzdaten(const AdlerJson::Ladeplatzdaten &ladeplatzdaten)
{
QCOMPARE(ladeplatzdaten.einheit.oi , ProjectDataManagement::L19_Oi::F3);
QCOMPARE(ladeplatzdaten.einheit.oi , ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3);
QCOMPARE(ladeplatzdaten.einheit.r, 5);
QCOMPARE(ladeplatzdaten.einheit.verein, QStringLiteral("verein StellungsmeldungLP"));
QCOMPARE(ladeplatzdaten.koordinate.koordinate.latitude, 53.37791);
@@ -187,7 +187,7 @@ void MsgCompares::compareWaffensystemdaten(const AdlerJson::Waffensystemdaten &w
void MsgCompares::compareStellungswechseldaten(const AdlerJson::Stellungswechseldaten &stellungswechseldaten)
{
QCOMPARE(stellungswechseldaten.oi, ProjectDataManagement::L19_Oi::F3);
QCOMPARE(stellungswechseldaten.oi, ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3);
QCOMPARE(stellungswechseldaten.r, 5);
QCOMPARE(stellungswechseldaten.verein, QStringLiteral("verein ExStellungswechsel"));
}
qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/generatetelegrams.cpp
+7 -7
View File
@@ -474,7 +474,7 @@ void GenerateTelegrams::generateFeuerhalt(AdlerJson::ExFeuerhalt &req)
{
req.feuerHaltDaten.verein = QStringLiteral("123456");
req.feuerHaltDaten.kenner = ProjectDataManagement::L27_EffectorId::A;
req.feuerHaltDaten.kategorie = ProjectDataManagement::L22_FireHaltCategory::R;
req.feuerHaltDaten.kategorie = ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_R;
req.feuerHaltDaten.feuerkampfReferenz = QStringLiteral("feuerHaltDaten");
req.feuerHaltDaten.zpNummer = 5;
req.feuerHaltDaten.koordinate.latitude = 53.11172;
@@ -489,7 +489,7 @@ void GenerateTelegrams::generateStellungsmeldungFS(AdlerJson::ExFeuerstellungFS
req.feuerstellungsdaten.status = ProjectDataManagement::L28_Status::Einsatzbereit;
req.feuerstellungsdaten.feuereinheit.verein = QStringLiteral("verein ExFeuerstellungFS");
req.feuerstellungsdaten.feuereinheit.r = 5;
req.feuerstellungsdaten.feuereinheit.oi = ProjectDataManagement::L19_Oi::F3;
req.feuerstellungsdaten.feuereinheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3;
req.feuerstellungsdaten.mittelpunkt.koordinate.latitude = 53.37791;
req.feuerstellungsdaten.mittelpunkt.koordinate.longitude = 8.759;
req.feuerstellungsdaten.mittelpunkt.hoehe = 20;
@@ -526,7 +526,7 @@ void GenerateTelegrams::generateStellungsmeldungWS(AdlerJson::ExFeuerstellungWS
req.waffensystemdaten.status = ProjectDataManagement::L28_Status::Einsatzbereit;
req.waffensystemdaten.einheit.verein = QStringLiteral("AB7X");
req.waffensystemdaten.einheit.r = 6;
req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::F6;
req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F6;
AdlerJson::Geschoss geschoss1;
AdlerJson::Geschoss geschoss2;
@@ -558,7 +558,7 @@ void GenerateTelegrams::generateStellungsmeldungWS_Gmlrs(AdlerJson::ExFeuerstell
req.waffensystemdaten.status = ProjectDataManagement::L28_Status::NichtEinsatzbereit;
req.waffensystemdaten.einheit.verein = QStringLiteral("AB13X");
req.waffensystemdaten.einheit.r = 6;
req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::F6;
req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F6;
AdlerJson::Geschoss geschoss1;
AdlerJson::Geschoss geschoss2;
@@ -591,7 +591,7 @@ void GenerateTelegrams::generateStellungsmeldungWS_Dm72(AdlerJson::ExFeuerstellu
req.waffensystemdaten.status = ProjectDataManagement::L28_Status::NichtEinsatzbereit;
req.waffensystemdaten.einheit.verein = QStringLiteral("AB72X");
req.waffensystemdaten.einheit.r = 1;
req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::F1;
req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F1;
AdlerJson::Geschoss geschoss1;
AdlerJson::Geschoss geschoss2;
@@ -622,7 +622,7 @@ void GenerateTelegrams::generateStellungsmeldungLP(AdlerJson::ExFeuerstellungLP
{
req.ladeplatzdaten.einheit.r = 5;
req.ladeplatzdaten.einheit.verein = QStringLiteral("verein StellungsmeldungLP");
req.ladeplatzdaten.einheit.oi = ProjectDataManagement::L19_Oi::F3;
req.ladeplatzdaten.einheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3;
req.ladeplatzdaten.koordinate.koordinate.latitude = 53.37791;
req.ladeplatzdaten.koordinate.koordinate.longitude = 8.759;
@@ -644,7 +644,7 @@ void GenerateTelegrams::generateStellungsmeldungLP(AdlerJson::ExFeuerstellungLP
void GenerateTelegrams::generateStellungswechsel(AdlerJson::ExStellungswechsel &req)
{
req.stellungswechseldaten.oi = ProjectDataManagement::L19_Oi::F3;
req.stellungswechseldaten.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3;
req.stellungswechseldaten.r = 5;
req.stellungswechseldaten.verein = QStringLiteral("verein ExStellungswechsel");
}
qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp
+1 -1
View File
@@ -645,7 +645,7 @@ void JsonDispatcher::onSSAEXFIREHALT(const int wsId, const FeuerHaltDaten &feuer
const bool bRet = m_mainDispatcher->aesHandler()->getFtc()->effectClusterFireHaltRequest(req);
if (bRet && kategorie == ProjectDataManagement::L22_FireHaltCategory::E && !feuerhaltdaten.entladenSchuss)
if (bRet && kategorie == ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_E && !feuerhaltdaten.entladenSchuss)
{
Feuerkampfdaten fkd;
fkd.feuerkampfReferenz = feuerhaltdaten.feuerkampfReferenz;
qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.cpp
+1 -1
View File
@@ -80,7 +80,7 @@ bool MainDispatcher::init()
void MainDispatcher::onWebsocketConnected(quint16 port)
{
ERROR_LOG(m_logger) << "ApAdler started, Domain Id: " << QString::number(port);
m_ddsHandler->pacemaker()->addPort(port, Core::PortType::WebSocketAdlerServer);
m_ddsHandler->pacemaker()->addPort(port, Core::CorePortType::WebSocketAdlerServer);
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
}
qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/telegrams.h
+16 -16
View File
@@ -1439,17 +1439,17 @@ const QMap<QString, ProjectDataManagement::L7_Request> ForderungMap = {
const QMap<QString, ProjectDataManagement::L19_Oi> ortsIdMap = {
{QStringLiteral("Empty"), ProjectDataManagement::L19_Oi::Empty},
{QStringLiteral("F1"), ProjectDataManagement::L19_Oi::F1},
{QStringLiteral("F2"), ProjectDataManagement::L19_Oi::F2},
{QStringLiteral("F3"), ProjectDataManagement::L19_Oi::F3},
{QStringLiteral("F4"), ProjectDataManagement::L19_Oi::F4},
{QStringLiteral("F5"), ProjectDataManagement::L19_Oi::F5},
{QStringLiteral("F6"), ProjectDataManagement::L19_Oi::F6},
{QStringLiteral("F7"), ProjectDataManagement::L19_Oi::F7},
{QStringLiteral("F8"), ProjectDataManagement::L19_Oi::F8},
{QStringLiteral("F9"), ProjectDataManagement::L19_Oi::F9},
{QStringLiteral("L"), ProjectDataManagement::L19_Oi::L}
{QStringLiteral("Empty"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_Empty},
{QStringLiteral("F1"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F1},
{QStringLiteral("F2"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F2},
{QStringLiteral("F3"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3},
{QStringLiteral("F4"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F4},
{QStringLiteral("F5"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F5},
{QStringLiteral("F6"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F6},
{QStringLiteral("F7"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F7},
{QStringLiteral("F8"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F8},
{QStringLiteral("F9"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F9},
{QStringLiteral("L"), ProjectDataManagement::L19_Oi::L19_Oi_L}
};
@@ -1457,11 +1457,11 @@ const QMap<QString, ProjectDataManagement::L19_Oi> ortsIdMap = {
const QMap<QString, ProjectDataManagement::L22_FireHaltCategory> feuerHaltKategorieMap = {
{QStringLiteral("A"), ProjectDataManagement::L22_FireHaltCategory::A},
{QStringLiteral("R"), ProjectDataManagement::L22_FireHaltCategory::R},
{QStringLiteral("E"), ProjectDataManagement::L22_FireHaltCategory::E},
{QStringLiteral("C"), ProjectDataManagement::L22_FireHaltCategory::C},
{QStringLiteral("F"), ProjectDataManagement::L22_FireHaltCategory::F},
{QStringLiteral("A"), ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_A},
{QStringLiteral("R"), ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_R},
{QStringLiteral("E"), ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_E},
{QStringLiteral("C"), ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_C},
{QStringLiteral("F"), ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_F},
};
qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp
+1 -1
View File
@@ -138,7 +138,7 @@ bool MainHandler::init(int domainId, int exerciseId)
ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
return false;
}
m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::PortType::WebSocketServer, QStringLiteral("{\"id\":\"TAB\"}"));
m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::CorePortType::WebSocketServer, QStringLiteral("{\"id\":\"TAB\"}"));
DEBUG_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler successful.";
qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.cpp
+2 -2
View File
@@ -101,7 +101,7 @@ ProjectDataManagement::ChargeType PdmHandler::chargeTypeFromId(int chargeTypeId)
ProjectDataManagement::GearClass PdmHandler::gearClassFromChargeTypeId(int chargeTypeId)
{
if (chargeTypeId <= 0)
return ProjectDataManagement::GearClass::Unknown;
return ProjectDataManagement::GearClass::GearClass_Unknown;
initializePdm();
@@ -113,7 +113,7 @@ ProjectDataManagement::GearClass PdmHandler::gearClassFromChargeTypeId(int charg
return gearType.gearClassId();
}
}
return ProjectDataManagement::GearClass::Unknown;
return ProjectDataManagement::GearClass::GearClass_Unknown;
}
ProjectDataManagement::RadioGroup PdmHandler::radioGroup(int radioGroupId)
qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp
+8 -8
View File
@@ -250,7 +250,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
{
DEBUG_LOG(m_logger) << "onSendCesHitRequest: " << request.equipmentNumber() << " - " << request.effectTime()
<< " request.chargeTypeId=" << request.chargeTypeId()
<< " request.eventType()=" << request.eventType()
<< " request.pdmEventType()=" << request.pdmEventType()
<< " request.aesId()=" << request.aesId()
<< " aesTypeFromId=" << m_mainHandler->aesHandler()->aesTypeFromId(request.aesId());
@@ -283,7 +283,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
if ((request.eventType() == ProjectDataManagement::EventType::HitBuilding) && (ct.legacyId() > 0))
if ((request.pdmEventType() == ProjectDataManagement::PdmEventType::HitBuilding) && (ct.legacyId() > 0))
{
data.chargeTasCodeDirect = 201;
data.chargeTasCodeIndirect = 201;
@@ -309,14 +309,14 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
if ((request.eventType() == ProjectDataManagement::EventType::LeaveHazardDistance) ||
(request.eventType() == ProjectDataManagement::EventType::EnterHazardDistance))
if ((request.pdmEventType() == ProjectDataManagement::PdmEventType::LeaveHazardDistance) ||
(request.pdmEventType() == ProjectDataManagement::PdmEventType::EnterHazardDistance))
{
INFO_LOG(m_logger) << "HarzardArea: " << request.effectTime();
data.reserve1 = request.mineId();
data.aesType = TetraIcd::AreaEffectSimulationType::DangerZoneExplosion;
}
else if (request.eventType() == ProjectDataManagement::EventType::AirSupport)
else if (request.pdmEventType() == ProjectDataManagement::PdmEventType::AirSupport)
{
data.aesType = TetraIcd::AreaEffectSimulationType::AirSupport;
}
@@ -333,12 +333,12 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
if (m_mainHandler->pdmHandler()->isSmartChargeType({request.chargeTypeId(),0,0}))
data.remainEffectTasCodeDirect = calculateRemainEffectTasCode(ct.id(), request.remainEffectPercent());
else if ((request.eventType() == ProjectDataManagement::EventType::HitBuilding) ||
(request.eventType() == ProjectDataManagement::EventType::HitEffectSimulation)
else if ((request.pdmEventType() == ProjectDataManagement::PdmEventType::HitBuilding) ||
(request.pdmEventType() == ProjectDataManagement::PdmEventType::HitEffectSimulation)
)
{
data.remainEffectTasCodeDirect = calculateRemainEffectTasCode(ct.id(), request.remainEffectPercent());
DEBUG_LOG(m_logger) << "PDM::EventType = " << request.eventType()
DEBUG_LOG(m_logger) << "PDM::EventType = " << request.pdmEventType()
<< " equipmentNumber=" << request.equipmentNumber()
<< " originatorEquipmentNumber=" << data.originatorEquipmentNumber
<< " chargeType=" << ct.id()
qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.cpp
+19 -19
View File
@@ -254,8 +254,8 @@ void SendToDds::rxData(const TetraIcd::StateChangeDirect &inData)
if (gearClass == ProjectDataManagement::GearClass::MineSingle ||
gearClass == ProjectDataManagement::GearClass::MineArea)
if (gearClass == ProjectDataManagement::GearClass::GearClass_MineSingle ||
gearClass == ProjectDataManagement::GearClass::GearClass_MineArea)
{
TetraIcd::MineTriggered mt;
mt.header.timeStamp = inData.header.timeStamp;
@@ -935,22 +935,22 @@ void SendToDds::rxData(const TetraIcd::UAVRadioLinkConnectionStatus &inData)
switch (inData.uavConnectionState)
{
case TetraIcd::UAVRadioLinkConnectionStatusType::Connected:
outData.connectionStatus(ProjectDataManagement::UasState::On);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_On);
break;
case TetraIcd::UAVRadioLinkConnectionStatusType::Disconnected:
outData.connectionStatus(ProjectDataManagement::UasState::Off);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_Off);
break;
case TetraIcd::UAVRadioLinkConnectionStatusType::Connecting:
outData.connectionStatus(ProjectDataManagement::UasState::Init);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_Init);
break;
case TetraIcd::UAVRadioLinkConnectionStatusType::Diconnecting:
outData.connectionStatus(ProjectDataManagement::UasState::Shutdown);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_Shutdown);
break;
case TetraIcd::UAVRadioLinkConnectionStatusType::Error:
outData.connectionStatus(ProjectDataManagement::UasState::Undefined);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_Undefined);
break;
case TetraIcd::UAVRadioLinkConnectionStatusType::Undefined:
outData.connectionStatus(ProjectDataManagement::UasState::Undefined);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_Undefined);
break;
}
@@ -988,37 +988,37 @@ void SendToDds::rxData(const TetraIcd::UAVStatus &inData)
switch (inData.uavState)
{
case TetraIcd::UAVState::On:
outData.uasState(ProjectDataManagement::UasState::On);
outData.uasState(ProjectDataManagement::UasState::UasState_On);
break;
case TetraIcd::UAVState::Off:
outData.uasState(ProjectDataManagement::UasState::Off);
outData.uasState(ProjectDataManagement::UasState::UasState_Off);
break;
case TetraIcd::UAVState::Init:
outData.uasState(ProjectDataManagement::UasState::Init);
outData.uasState(ProjectDataManagement::UasState::UasState_Init);
break;
case TetraIcd::UAVState::Shutdown:
outData.uasState(ProjectDataManagement::UasState::Shutdown);
outData.uasState(ProjectDataManagement::UasState::UasState_Shutdown);
break;
case TetraIcd::UAVState::Calibrating:
outData.uasState(ProjectDataManagement::UasState::Calibrating);
outData.uasState(ProjectDataManagement::UasState::UasState_Calibrating);
break;
case TetraIcd::UAVState::Manual:
outData.uasState(ProjectDataManagement::UasState::Manual);
outData.uasState(ProjectDataManagement::UasState::UasState_Manual);
break;
case TetraIcd::UAVState::Maintenance:
outData.uasState(ProjectDataManagement::UasState::Maintenance);
outData.uasState(ProjectDataManagement::UasState::UasState_Maintenance);
break;
case TetraIcd::UAVState::Standby:
outData.uasState(ProjectDataManagement::UasState::Standby);
outData.uasState(ProjectDataManagement::UasState::UasState_Standby);
break;
case TetraIcd::UAVState::Normal:
outData.uasState(ProjectDataManagement::UasState::Normal);
outData.uasState(ProjectDataManagement::UasState::UasState_Normal);
break;
case TetraIcd::UAVState::Auto:
outData.uasState(ProjectDataManagement::UasState::Auto);
outData.uasState(ProjectDataManagement::UasState::UasState_Auto);
break;
case TetraIcd::UAVState::Undefined:
outData.uasState(ProjectDataManagement::UasState::Undefined);
outData.uasState(ProjectDataManagement::UasState::UasState_Undefined);
break;
}
qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_service.xml
+20 -20
View File
@@ -695,7 +695,7 @@
<column name="remainEffectPercent" idlType="long"/>
<column name="position" idlType="TabPosition"/>
<column name="effectTime" idlType="long long"/>
<column name="eventType" idlType="ProjectDataManagement::EventType"/>
<column name="pdmEventType" idlType="ProjectDataManagement::PdmEventType"/>
<column name="partyId" idlType="long"/>
<column name="mineId" idlType="long"/>
</topicType>
@@ -885,7 +885,7 @@
<attribute key="withHelmetWithVest" value="3"/>
</enumeration>
<enumeration name="FaultPositionHandling">
<attribute key="NoChange" value="0"/>
<attribute key="FaultPositionHandling_NoChange" value="0"/>
<attribute key="NoPositions" value="1"/>
<attribute key="InvalidPositionValue" value="2"/>
<attribute key="EstimatedPosition" value="3"/>
@@ -896,24 +896,24 @@
<attribute key="FirSpzMarder" value="2"/>
</enumeration>
<enumeration name="L19_Oi">
<attribute key="Empty" value="1"/>
<attribute key="F1" value="2"/>
<attribute key="F2" value="3"/>
<attribute key="F3" value="4"/>
<attribute key="F4" value="5"/>
<attribute key="F5" value="6"/>
<attribute key="F6" value="7"/>
<attribute key="F7" value="8"/>
<attribute key="F8" value="9"/>
<attribute key="F9" value="10"/>
<attribute key="L" value="11"/>
<attribute key="L19_Oi_Empty" value="1"/>
<attribute key="L19_Oi_F1" value="2"/>
<attribute key="L19_Oi_F2" value="3"/>
<attribute key="L19_Oi_F3" value="4"/>
<attribute key="L19_Oi_F4" value="5"/>
<attribute key="L19_Oi_F5" value="6"/>
<attribute key="L19_Oi_F6" value="7"/>
<attribute key="L19_Oi_F7" value="8"/>
<attribute key="L19_Oi_F8" value="9"/>
<attribute key="L19_Oi_F9" value="10"/>
<attribute key="L19_Oi_L" value="11"/>
</enumeration>
<enumeration name="L22_FireHaltCategory">
<attribute key="A" value="1"/>
<attribute key="R" value="2"/>
<attribute key="E" value="3"/>
<attribute key="C" value="4"/>
<attribute key="F" value="5"/>
<attribute key="L22_FireHaltCategory_A" value="1"/>
<attribute key="L22_FireHaltCategory_R" value="2"/>
<attribute key="L22_FireHaltCategory_E" value="3"/>
<attribute key="L22_FireHaltCategory_C" value="4"/>
<attribute key="L22_FireHaltCategory_F" value="5"/>
</enumeration>
<enumeration name="L25_KindGuidingLine">
<attribute key="FFA" value="1"/>
@@ -1082,7 +1082,7 @@
<attribute key="MinelayerThrower" value="2"/>
</enumeration>
<enumeration name="OpticalCode">
<attribute key="NoChange" value="0"/>
<attribute key="OpticalCode_NoChange" value="0"/>
<attribute key="Osag10" value="1"/>
<attribute key="Osag20Basic" value="2"/>
<attribute key="SisoStandard" value="3"/>
@@ -1110,7 +1110,7 @@
<attribute key="MRF" value="7"/>
</enumeration>
<enumeration name="SwitichingPositionIntervall">
<attribute key="NoChange" value="0"/>
<attribute key="SwitichingPositionIntervall_NoChange" value="0"/>
<attribute key="On" value="1"/>
<attribute key="Off" value="2"/>
</enumeration>
qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp
+3 -3
View File
@@ -733,9 +733,9 @@ bool get(const QJsonObject &obj, const QString &key, ParticipantModeBase::Intern
get(obj, key, iVal, bOptional);
switch (static_cast<ParticipantModeBase::InternationalMode>(iVal))
{
case ParticipantModeBase::InternationalMode::NoChange:
case ParticipantModeBase::InternationalMode::On:
case ParticipantModeBase::InternationalMode::Off:
case ParticipantModeBase::InternationalMode::InternationalMode_NoChange:
case ParticipantModeBase::InternationalMode::InternationalMode_On:
case ParticipantModeBase::InternationalMode::InternationalMode_Off:
val = static_cast<ParticipantModeBase::InternationalMode>(iVal);
return true;
}
qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.h
+1 -1
View File
@@ -1863,7 +1863,7 @@ struct ParticipantModeBase
NoChange = 0,
Off = 1,
On = 2
} internationalMode = InternationalMode::NoChange;
} internationalMode = InternationalMode::InternationalMode_NoChange;
enum class ABCProtectionMode
{
qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/ModuleTests/alm_tests.cpp
+5 -5
View File
@@ -111,12 +111,12 @@ void AlmTests::tryConfigureAlarms()
alarms[0].setMarker(true);
alarms[0].messageWindow(true);
alarms[0].vulnerabilityState(-1);
alarms[0].eventTypeId(ProjectDataManagement::EventType_def::Hit);
alarms[0].eventTypeId(ProjectDataManagement::PdmEventType_def::Hit);
alarms[1].setMarker(true);
alarms[1].messageWindow(true);
alarms[1].vulnerabilityState(0);
alarms[1].eventTypeId(ProjectDataManagement::EventType_def::EnterNuclear);
alarms[1].eventTypeId(ProjectDataManagement::PdmEventType_def::EnterNuclear);
std::vector<int32_t> participantIds;
participantIds.push_back(0);
@@ -173,13 +173,13 @@ void AlmTests::tryConfigureAlarmsList()
alarms[0].setMarker(true);
alarms[0].messageWindow(true);
alarms[0].eventTypeId(ProjectDataManagement::EventType_def::Hit);
alarms[0].eventTypeId(ProjectDataManagement::PdmEventType_def::Hit);
alarms[0].vulnerabilityState(-1);
alarms[1].setMarker(true);
alarms[1].messageWindow(true);
alarms[1].vulnerabilityState(-1);
alarms[1].eventTypeId(ProjectDataManagement::EventType_def::WeaponAssignment);
alarms[1].eventTypeId(ProjectDataManagement::PdmEventType_def::WeaponAssignment);
std::vector<int32_t> participantIds;
participantIds.push_back(1);
@@ -204,7 +204,7 @@ void AlmTests::trySendEvent()
// publish new Event data here
pe.id(100);
//pe.aesItemId(5);
pe.eventTypeId(ProjectDataManagement::EventType_def::Hit); // same as eventTypeId in ConfigureAlarms
pe.eventTypeId(ProjectDataManagement::PdmEventType_def::Hit); // same as eventTypeId in ConfigureAlarms
pe.participantId(2);
pe.equipmentNumber(55);
pe.sampleTime(QDateTime::currentMSecsSinceEpoch());
qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.cpp
+6 -6
View File
@@ -103,7 +103,7 @@ void HandlerConfigureAlarms::removeAlarmConfig(int operatorId,
<< " eventTypeId=" << i.value().eventTypeId.underlying();
if ((operatorId == i.value().operatorId)
&& (participantId == i.value().participantId)
&& (eventTypeId == ProjectDataManagement::EventType_def::Unknown || eventTypeId == i.value().eventTypeId.underlying()))
&& (eventTypeId == ProjectDataManagement::PdmEventType_def::Unknown || eventTypeId == i.value().eventTypeId.underlying()))
{
const int key = i.key();
DEBUG_LOG(m_logger) << "found alarm to remove: " << key << ", eventTypeId: " << eventTypeId;
@@ -256,10 +256,10 @@ void HandlerConfigureAlarms::onEventChanged(const ExerciseEventManagement::Event
<< " friendyFire =" << friendlyFireBool;*/
if ((alarm.eventTypeId == eventDatalocal.eventTypeId().underlying()) ||
(alarm.eventTypeId == ProjectDataManagement::EventType_def::FriendlyFire && friendlyFireBool))
(alarm.eventTypeId == ProjectDataManagement::PdmEventType_def::FriendlyFire && friendlyFireBool))
{
if (friendlyFireBool && eventDatalocal.eventTypeId() == ProjectDataManagement::EventType_def::FireEvent)
eventDatalocal.eventTypeId(ProjectDataManagement::EventType_def::FriendlyFire);
if (friendlyFireBool && eventDatalocal.eventTypeId() == ProjectDataManagement::PdmEventType_def::FireEvent)
eventDatalocal.eventTypeId(ProjectDataManagement::PdmEventType_def::FriendlyFire);
participants.clear();
if (alarm.participantId.isValid())
@@ -316,8 +316,8 @@ void HandlerConfigureAlarms::sendWindow(const ExerciseEventManagement::Event &ev
wi.time(eventData.sampleTime());
wi.eventId(eventData.id());
if (eventData.eventTypeId() == ProjectDataManagement::EventType_def::CrossGlobalBorderline
|| eventData.eventTypeId() == ProjectDataManagement::EventType_def::CrossLocalBorderline)
if (eventData.eventTypeId() == ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline
|| eventData.eventTypeId() == ProjectDataManagement::PdmEventType_def::CrossLocalBorderline)
{
if (eventObject.contains(QStringLiteral("Global")))
obj[QStringLiteral("Global")] = eventObject.value(QStringLiteral("Global"));
qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp
+1 -1
View File
@@ -142,7 +142,7 @@ void ModuleTestLimits::testAirSupports()
const auto &items = m_aesDtc->explosionClusters();
for (const auto &item : qAsConst(items))
{
if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() && m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct().chargeTypeId()) == ProjectDataManagement::GearClass::AirSupport)
if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() && m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct().chargeTypeId()) == ProjectDataManagement::GearClass::GearClass_AirSupport)
++counter;
}
qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp
+10 -10
View File
@@ -90,7 +90,7 @@ bool HandlerEffectCluster::init()
}
// Context NASAT: check via chargeTypeId:
const bool bChargeIsAirSupport = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(ifs->data().chargeTypeId) == ProjectDataManagement::GearClass::AirSupport;
const bool bChargeIsAirSupport = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(ifs->data().chargeTypeId) == ProjectDataManagement::GearClass::GearClass_AirSupport;
ifs->setAirSupportSource(bChargeIsAirSupport);
// Charge Effects are alwazs Central!
@@ -488,7 +488,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterCreateRequest(const
// Context NASAT: check via chargeTypeId:
const bool bChargeIsAirSupport = gearClass == ProjectDataManagement::GearClass::AirSupport;
const bool bChargeIsAirSupport = gearClass == ProjectDataManagement::GearClass::GearClass_AirSupport;
ifs->setAirSupportSource(bChargeIsAirSupport);
// Now we always need to send fire ready, never without
newData.effectorState = AesEffectorState::EsNotReadyToFire;
@@ -503,7 +503,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterCreateRequest(const
DEBUG_LOG(m_logger) << "New EffectCluster";
if (gearClass == ProjectDataManagement::GearClass::AirSupport)
if (gearClass == ProjectDataManagement::GearClass::GearClass_AirSupport)
{
if (s_currentAirSupportCount >= s_maxAirSupportCount)
{
@@ -571,7 +571,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterModifyRequest(const
// Context NASAT: check via chargeTypeId:
const ProjectDataManagement::GearClass gc = m_mainHandler->gearClassOfChargeTypeId(request.effectors().at(0).chargeStruct().chargeTypeId());
const bool bChargeIsAirSupport = (gc == ProjectDataManagement::GearClass::AirSupport);
const bool bChargeIsAirSupport = (gc == ProjectDataManagement::GearClass::GearClass_AirSupport);
ifs->setAirSupportSource(bChargeIsAirSupport);
// For counting, only Elements being at least prepared are important:
if (request.effectStart().is_set() && ifs->isObjectModifiable()) // ToDo: check
@@ -636,7 +636,7 @@ void HandlerEffectCluster::recountActiveAreas()
{
if (area->isObjectInTrainingArea()) // meanwhile an ugly name, means EsPrepared, EsActivated, EsPaused
{
if (m_mainHandler->gearClassOfChargeTypeId(area->data().chargeTypeId) == ProjectDataManagement::GearClass::AirSupport)
if (m_mainHandler->gearClassOfChargeTypeId(area->data().chargeTypeId) == ProjectDataManagement::GearClass::GearClass_AirSupport)
++s_currentAirSupportCount;
}
}
@@ -698,7 +698,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
switch (categorie.underlying())
{
case ProjectDataManagement::L22_FireHaltCategory::A: // Feuer Halt Allgemein
case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_A: // Feuer Halt Allgemein
{
// all control operations are halted
for (auto *ifs : qAsConst(effectClusterPartyMap))
@@ -714,7 +714,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
break;
}
case ProjectDataManagement::L22_FireHaltCategory::R: // Feuer Halt Referenziert
case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_R: // Feuer Halt Referenziert
{
// Ongoing combat operations are halted after comparing the extent of
// the fire hold with the corresponding target coordinate and circular area.
@@ -740,7 +740,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
}
break;
}
case ProjectDataManagement::L22_FireHaltCategory::E: // Feuer Einstellen
case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_E: // Feuer Einstellen
{
// Cease Fire (Category E) messages are issued when continuing an engagement is no longer viable.
// Unlike "Check Fire" (Feuer Halt), any rounds already loaded in a Panzerhaubitze (PzH) are still fired,
@@ -754,7 +754,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
}
break;
}
case ProjectDataManagement::L22_FireHaltCategory::C: // Aufheben Feuer Halt Allgemein
case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_C: // Aufheben Feuer Halt Allgemein
for (auto *ifs : qAsConst(effectClusterPartyMap))
{
DEBUG_LOG(m_logger) << "[Aufheben Feuer Halt Allgemein] " << "effectClusterId: " << ifs->data().id;
@@ -766,7 +766,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
ifs->resumePause(req);
}
break;
case ProjectDataManagement::L22_FireHaltCategory::F: // Aufheben Feuer Halt Referenziert
case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_F: // Aufheben Feuer Halt Referenziert
{
for (auto *ifs : qAsConst(effectClusterPartyMap))
{
qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.cpp
+5 -5
View File
@@ -52,7 +52,7 @@ bool HandlerExplosionCluster::init()
}
// Context NASAT: check via chargeTypeId:
const bool bChargeIsAirSupport = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(ifs->data().chargeTypeId) == ProjectDataManagement::GearClass::AirSupport;
const bool bChargeIsAirSupport = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(ifs->data().chargeTypeId) == ProjectDataManagement::GearClass::GearClass_AirSupport;
ifs->setAirSupportSource(bChargeIsAirSupport);
if(!ifs->data().isCentral)
@@ -369,7 +369,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterCreateRequest
// Context NASAT: check via chargeTypeId:
const ProjectDataManagement::GearClass gc = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(request.chargeStruct().chargeTypeId());
const bool bChargeIsAirSupport = gc == ProjectDataManagement::GearClass::AirSupport;
const bool bChargeIsAirSupport = gc == ProjectDataManagement::GearClass::GearClass_AirSupport;
ifs->setAirSupportSource(bChargeIsAirSupport);
const Core::FunctionReplyObject ret = ifs->createObject(newData);
@@ -385,7 +385,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterCreateRequest
if (ifs->data().isCentral)
{
DEBUG_LOG(m_logger) << "New cen ExplosionCluster";
if(gearClass == ProjectDataManagement::GearClass::AirSupport)
if(gearClass == ProjectDataManagement::GearClass::GearClass_AirSupport)
{
if (s_currentAirSupportCount >= s_maxAirSupportCount)
{
@@ -471,7 +471,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterModifyRequest
// Context NASAT: check via chargeTypeId:
const ProjectDataManagement::GearClass gc = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(request.chargeStruct().chargeTypeId());
const bool bChargeIsAirSupport = (gc == ProjectDataManagement::GearClass::AirSupport);
const bool bChargeIsAirSupport = (gc == ProjectDataManagement::GearClass::GearClass_AirSupport);
ifs->setAirSupportSource(bChargeIsAirSupport);
// For counting, only Elements being at least prepared are important:
@@ -615,7 +615,7 @@ void HandlerExplosionCluster::recountActiveAreas()
{
if (area->isObjectInTrainingArea()) // meanwhile an ugly name, means EsPrepared, EsActivated, EsPaused
{
if (m_mainHandler->gearClassOfChargeTypeId(area->data().chargeTypeId) == ProjectDataManagement::GearClass::AirSupport)
if (m_mainHandler->gearClassOfChargeTypeId(area->data().chargeTypeId) == ProjectDataManagement::GearClass::GearClass_AirSupport)
++s_currentAirSupportCount;
}
}
qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h
+1 -1
View File
@@ -360,7 +360,7 @@ template <typename T> class ObjectBaseTmpl : public ObjectBase
if (static_cast<MineClass::type>(m_mainHandler->dds()->pdmDtc()->mineClass(m_data.chargeTypeId, m_data.igniterTypeId, m_data.igniterFunctionId)) == MineClass::VirtualSingle)
return true;
if (m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(m_data.chargeTypeId) == ProjectDataManagement::GearClass::AirSupport)
if (m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(m_data.chargeTypeId) == ProjectDataManagement::GearClass::GearClass_AirSupport)
return true;
// Laser-Guidable Weapons must always be calculated by CES
qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp
+3 -3
View File
@@ -2769,13 +2769,13 @@ void ObjectEffectCluster::sendCalculateTrajectoryAdlerRequest(const QVector<Data
const ProjectDataManagement::GearClass &gc = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(m_data.chargeTypeId);
switch (gc.underlying())
{
case ProjectDataManagement::GearClass::Artillery:
case ProjectDataManagement::GearClass::GearClass_Artillery:
request.weaponSystemType(TrainingAreaBase::WeaponSystemType::PZH);
break;
case ProjectDataManagement::GearClass::Mortar:
case ProjectDataManagement::GearClass::GearClass_Mortar:
request.weaponSystemType(TrainingAreaBase::WeaponSystemType::MRS);
break;
case ProjectDataManagement::GearClass::Rocket:
case ProjectDataManagement::GearClass::GearClass_Rocket:
request.weaponSystemType(TrainingAreaBase::WeaponSystemType::MARS);
break;
default:
qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/main_handler.cpp
+1 -1
View File
@@ -149,7 +149,7 @@ bool MainHandler::initAsmHandler()
ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
return false;
}
m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::PortType::WebSocketServer);
m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::CorePortType::WebSocketServer);
DEBUG_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler succesful.";
return true;
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.cpp
+6 -6
View File
@@ -944,24 +944,24 @@ void CesTests::onSendCesHitRequest(const rti::core::SampleIdentity &cookie,
void CesTests::checkParticipantEvent()
{
ProjectDataManagement::EventType expectedType = ProjectDataManagement::EventType::Unknown;
ProjectDataManagement::PdmEventType expectedType = ProjectDataManagement::PdmEventType::Unknown;
switch (m_testId)
{
case 8:
expectedType = ProjectDataManagement::EventType::EnterMineArea;
expectedType = ProjectDataManagement::PdmEventType::EnterMineArea;
break;
case 10:
expectedType = ProjectDataManagement::EventType::EnterFunctionalArea;
expectedType = ProjectDataManagement::PdmEventType::EnterFunctionalArea;
break;
case 11:
case 12:
expectedType = ProjectDataManagement::EventType::LeaveFunctionalArea;
expectedType = ProjectDataManagement::PdmEventType::LeaveFunctionalArea;
break;
case 13:
expectedType = ProjectDataManagement::EventType::CrossLocalBorderline;
expectedType = ProjectDataManagement::PdmEventType::CrossLocalBorderline;
break;
case 14:
expectedType = ProjectDataManagement::EventType::EnterDangerArea;
expectedType = ProjectDataManagement::PdmEventType::EnterDangerArea;
break;
default:
// nothing
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.cpp
+1 -1
View File
@@ -303,7 +303,7 @@ void CesTestsBoobyTrap::onEventChanged(const CentralEffectSimulation::Participan
if (modType == DataModification::eRemoved ||
modType == DataModification::eModified)
return;
if (eventData.eventTypeId() == ProjectDataManagement::EventType_def::HitMine)
if (eventData.eventTypeId() == ProjectDataManagement::PdmEventType_def::HitMine)
{
m_countEventBoobyTrap ++;
DEBUG_LOG(m_logger) << "m_countEventBoobyTrap=" << m_countEventBoobyTrap
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.cpp
+1 -1
View File
@@ -360,7 +360,7 @@ void CesTestsGasPipe::onEventChanged(const CentralEffectSimulation::ParticipantE
if (modType == DataModification::eRemoved ||
modType == DataModification::eModified)
return;
if (eventData.eventTypeId() == ProjectDataManagement::EventType_def::HitGasPipe)
if (eventData.eventTypeId() == ProjectDataManagement::PdmEventType_def::HitGasPipe)
{
m_countEventGasPipe ++;
DEBUG_LOG(m_logger) << "m_countEventGasPipe=" << m_countEventGasPipe;
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.cpp
+1 -1
View File
@@ -399,7 +399,7 @@ void CesTestsMineAreas::onEventChanged(const CentralEffectSimulation::Participan
if (modType == DataModification::eRemoved ||
modType == DataModification::eModified)
return;
if (eventData.eventTypeId() == ProjectDataManagement::EventType_def::HitGasPipe)
if (eventData.eventTypeId() == ProjectDataManagement::PdmEventType_def::HitGasPipe)
{
m_countEventMineAreas ++;
DEBUG_LOG(m_logger) << "m_countEventMineAreas=" << m_countEventMineAreas;
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_simulated_movement.cpp
+2 -2
View File
@@ -110,8 +110,8 @@ void cesTestsSimulatedMovement::checkParticipantEvent()
{
case 1:
case 2:
if (participantEvent0.eventTypeId() == ProjectDataManagement::EventType::HitEffectSimulation
&& participantEvent1.eventTypeId() == ProjectDataManagement::EventType::HitEffectSimulation)
if (participantEvent0.eventTypeId() == ProjectDataManagement::PdmEventType::HitEffectSimulation
&& participantEvent1.eventTypeId() == ProjectDataManagement::PdmEventType::HitEffectSimulation)
ExitSuccess();
break;
default:
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.cpp
+2 -2
View File
@@ -255,8 +255,8 @@ void CesTestsSmart::checkParticipantEvent()
switch (m_testId)
{
case 1:
if ( participantEvent0.eventTypeId()==ProjectDataManagement::EventType::HitEffectSimulation
&& participantEvent1.eventTypeId()==ProjectDataManagement::EventType::HitEffectSimulation)
if ( participantEvent0.eventTypeId()==ProjectDataManagement::PdmEventType::HitEffectSimulation
&& participantEvent1.eventTypeId()==ProjectDataManagement::PdmEventType::HitEffectSimulation)
{
ExitSuccess();
}
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp
+3 -3
View File
@@ -142,9 +142,9 @@ void HandlerParticipantBorderline::onParticipantPositionChanged(const CentralEff
if (result)
{
if (borderline.operatorId <= 0)
sendParticipantEvent(borderline, partPos, ProjectDataManagement::EventType_def::CrossGlobalBorderline);
sendParticipantEvent(borderline, partPos, ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline);
else
sendParticipantEvent(borderline, partPos, ProjectDataManagement::EventType_def::CrossLocalBorderline);
sendParticipantEvent(borderline, partPos, ProjectDataManagement::PdmEventType_def::CrossLocalBorderline);
}
}
} // end of onParticipantPositionChanged()
@@ -159,7 +159,7 @@ void HandlerParticipantBorderline::onParticipantPositionChanged(const CentralEff
void HandlerParticipantBorderline::sendParticipantEvent(const BorderlineUtm &borderline,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType)
const ProjectDataManagement::PdmEventType eventType)
{
ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId());
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.h
+1 -1
View File
@@ -69,7 +69,7 @@ private Q_SLOTS:
private: // methoden
void sendParticipantEvent(const BorderlineUtm &borderline,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType);
const ProjectDataManagement::PdmEventType eventType);
bool intersect(const QPolygonF &polygonf, const QLineF &linef) const;
private: // attributes
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp
+52 -52
View File
@@ -23,7 +23,7 @@ namespace dds
{
namespace core
{
inline uint qHash(ProjectDataManagement::EventType et)
inline uint qHash(ProjectDataManagement::PdmEventType et)
{
return ::qHash(et.underlying());
}
@@ -483,11 +483,11 @@ void HandlerParticipantArea::deleteFunctionalArea(const int aesItemId)
// Same as leave FunctionArea
if (itemView.aesTypeId == AreaEffectSimulation::AesType_def::AtFunctionalArea)
{
sendParticipantEvent(itemView, participantPos, ProjectDataManagement::EventType_def::LeaveFunctionalArea);
sendParticipantEvent(itemView, participantPos, ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea);
sendEffectTypeEvent(itemView, participantPos, EffectType::FunctionalAreaLeave, -1, -1);
}
else
sendParticipantEvent(itemView, participantPos, ProjectDataManagement::EventType_def::LeaveDangerArea);
sendParticipantEvent(itemView, participantPos, ProjectDataManagement::PdmEventType_def::LeaveDangerArea);
DEBUG_LOG(m_logger) << "Participant inside id=" << participantPos.participantId();
} // for all Participants
} // deleteFunctionalArea
@@ -630,19 +630,19 @@ bool HandlerParticipantArea::inFormCheck(const CentralEffectSimulation::AesItemV
sendEffectTypeEvent(itemView, participantPosition, effectTypeForBCContaminationArea(itemView, participantPosUtmPoint), -1, -1);
break;
case AreaEffectSimulation::AesType_def::AtDangerArea:
sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::EventType_def::EnterDangerArea);
sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType_def::EnterDangerArea);
break;
case AreaEffectSimulation::AesType_def::AtExplosionArea:
break;
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::EventType_def::EnterFunctionalArea);
sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType_def::EnterFunctionalArea);
sendEffectTypeEvent(itemView, participantPosition, EffectType::FunctionalAreaEnter, -1, -1);
break;
case AreaEffectSimulation::AesType_def::AtMineArea:
sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::EventType_def::EnterMineArea);
sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType_def::EnterMineArea);
break;
case AreaEffectSimulation::AesType_def::AtNContamination:
sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::EventType_def::EnterNuclear);
sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType_def::EnterNuclear);
sendEffectTypeEvent(itemView, participantPosition, effectTypeForNContaminationArea(itemView, participantPosUtmPoint, participantPosition.sampleTime()), -1, -1);
break;
default:
@@ -659,19 +659,19 @@ bool HandlerParticipantArea::inFormCheck(const CentralEffectSimulation::AesItemV
sendEffectTypeEvent(itemView, participantPosition, EffectType::BCContaminationLeave, -1, -1);
break;
case AreaEffectSimulation::AesType_def::AtDangerArea:
sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::EventType_def::LeaveDangerArea);
sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType_def::LeaveDangerArea);
break;
case AreaEffectSimulation::AesType_def::AtExplosionArea:
break;
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::EventType_def::LeaveFunctionalArea);
sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea);
sendEffectTypeEvent(itemView, participantPosition, EffectType::FunctionalAreaLeave, -1, -1);
break;
case AreaEffectSimulation::AesType_def::AtMineArea:
sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::EventType_def::LeaveMineArea);
sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType_def::LeaveMineArea);
break;
case AreaEffectSimulation::AesType_def::AtNContamination:
sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::EventType_def::LeaveNuclear);
sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType_def::LeaveNuclear);
sendEffectTypeEvent(itemView, participantPosition, EffectType::NContaminationLeave, -1, -1);
break;
default:
@@ -1087,7 +1087,7 @@ void HandlerParticipantArea::sendCesHitRequest(const AreaEffectSimulation::AesIt
void HandlerParticipantArea::sendParticipantEvent(const CentralEffectSimulation::AesItemViewUtm &itemView,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType)
const ProjectDataManagement::PdmEventType eventType)
{
bool calculateAes = false;
ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId());
@@ -1131,12 +1131,12 @@ void HandlerParticipantArea::sendParticipantEvent(const CentralEffectSimulation:
}
// send hit events only with central AES Simulation
if (calculateAes
&& (eventType == ProjectDataManagement::EventType_def::HitB
|| eventType == ProjectDataManagement::EventType_def::HitC
|| eventType == ProjectDataManagement::EventType_def::Hit
|| eventType == ProjectDataManagement::EventType_def::HitEffectSimulation
|| eventType == ProjectDataManagement::EventType_def::HitMine
|| eventType == ProjectDataManagement::EventType_def::HitN))
&& (eventType == ProjectDataManagement::PdmEventType_def::HitB
|| eventType == ProjectDataManagement::PdmEventType_def::HitC
|| eventType == ProjectDataManagement::PdmEventType_def::Hit
|| eventType == ProjectDataManagement::PdmEventType_def::HitEffectSimulation
|| eventType == ProjectDataManagement::PdmEventType_def::HitMine
|| eventType == ProjectDataManagement::PdmEventType_def::HitN))
{
DEBUG_LOG(m_logger) << "send hit events only with central AES Simulation participant=" << participantPosition.participantId();
return;
@@ -1169,14 +1169,14 @@ void HandlerParticipantArea::sendParticipantEvent(const CentralEffectSimulation:
// Criterion for friendly Fire:
if (itemView.partyId != -1
&& ((eventType == ProjectDataManagement::EventType_def::EnterMineArea
|| eventType == ProjectDataManagement::EventType_def::EnterNuclear
|| eventType == ProjectDataManagement::EventType_def::HitB
|| eventType == ProjectDataManagement::EventType_def::HitC
|| eventType == ProjectDataManagement::EventType_def::Hit
|| eventType == ProjectDataManagement::EventType_def::HitEffectSimulation
|| eventType == ProjectDataManagement::EventType_def::HitMine
|| eventType == ProjectDataManagement::EventType_def::HitN)
&& ((eventType == ProjectDataManagement::PdmEventType_def::EnterMineArea
|| eventType == ProjectDataManagement::PdmEventType_def::EnterNuclear
|| eventType == ProjectDataManagement::PdmEventType_def::HitB
|| eventType == ProjectDataManagement::PdmEventType_def::HitC
|| eventType == ProjectDataManagement::PdmEventType_def::Hit
|| eventType == ProjectDataManagement::PdmEventType_def::HitEffectSimulation
|| eventType == ProjectDataManagement::PdmEventType_def::HitMine
|| eventType == ProjectDataManagement::PdmEventType_def::HitN)
&& itemView.partyId == participantPosition.partyId()))
pe.friendlyFire(true);
else
@@ -1252,10 +1252,10 @@ void HandlerParticipantArea::sendEffectTypeEvent(const CentralEffectSimulation::
bool HandlerParticipantArea::eventMustBeSend(int aesItemId,
int participantId,
const ProjectDataManagement::EventType eventType)
const ProjectDataManagement::PdmEventType eventType)
{
// end enter-leave only once
QSet<ProjectDataManagement::EventType> &activeEvents = m_eventStates[aesItemId][participantId]; // reference!
QSet<ProjectDataManagement::PdmEventType> &activeEvents = m_eventStates[aesItemId][participantId]; // reference!
// - only send event if it was not already sent
if (activeEvents.contains(eventType))
{
@@ -1268,29 +1268,29 @@ bool HandlerParticipantArea::eventMustBeSend(int aesItemId,
// - remove opposite events (e.g remove Enter event when we leave the area)
switch (eventType.underlying())
{
case ProjectDataManagement::EventType_def::EnterDangerArea:
activeEvents.remove(ProjectDataManagement::EventType_def::LeaveDangerArea);
case ProjectDataManagement::PdmEventType_def::EnterDangerArea:
activeEvents.remove(ProjectDataManagement::PdmEventType_def::LeaveDangerArea);
break;
case ProjectDataManagement::EventType_def::LeaveDangerArea:
activeEvents.remove(ProjectDataManagement::EventType_def::EnterDangerArea);
case ProjectDataManagement::PdmEventType_def::LeaveDangerArea:
activeEvents.remove(ProjectDataManagement::PdmEventType_def::EnterDangerArea);
break;
case ProjectDataManagement::EventType_def::EnterMineArea:
activeEvents.remove(ProjectDataManagement::EventType_def::LeaveMineArea);
case ProjectDataManagement::PdmEventType_def::EnterMineArea:
activeEvents.remove(ProjectDataManagement::PdmEventType_def::LeaveMineArea);
break;
case ProjectDataManagement::EventType_def::LeaveMineArea:
activeEvents.remove(ProjectDataManagement::EventType_def::EnterMineArea);
case ProjectDataManagement::PdmEventType_def::LeaveMineArea:
activeEvents.remove(ProjectDataManagement::PdmEventType_def::EnterMineArea);
break;
case ProjectDataManagement::EventType_def::EnterFunctionalArea:
activeEvents.remove(ProjectDataManagement::EventType_def::LeaveFunctionalArea);
case ProjectDataManagement::PdmEventType_def::EnterFunctionalArea:
activeEvents.remove(ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea);
break;
case ProjectDataManagement::EventType_def::LeaveFunctionalArea:
activeEvents.remove(ProjectDataManagement::EventType_def::EnterFunctionalArea);
case ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea:
activeEvents.remove(ProjectDataManagement::PdmEventType_def::EnterFunctionalArea);
break;
case ProjectDataManagement::EventType_def::EnterNuclear:
activeEvents.remove(ProjectDataManagement::EventType_def::LeaveNuclear);
case ProjectDataManagement::PdmEventType_def::EnterNuclear:
activeEvents.remove(ProjectDataManagement::PdmEventType_def::LeaveNuclear);
break;
case ProjectDataManagement::EventType_def::LeaveNuclear:
activeEvents.remove(ProjectDataManagement::EventType_def::EnterNuclear);
case ProjectDataManagement::PdmEventType_def::LeaveNuclear:
activeEvents.remove(ProjectDataManagement::PdmEventType_def::EnterNuclear);
break;
default:
break;
@@ -1420,22 +1420,22 @@ bool HandlerParticipantArea::inCircle(const QPointF &centerUtm, const double rad
return (squareDist < squareRadius);
} // inCircle
ProjectDataManagement::EventType HandlerParticipantArea::leaveEventTypeForAesType(AreaEffectSimulation::AesType aesTypeId)
ProjectDataManagement::PdmEventType HandlerParticipantArea::leaveEventTypeForAesType(AreaEffectSimulation::AesType aesTypeId)
{
switch (aesTypeId.underlying())
{
case AreaEffectSimulation::AesType_def::AtDangerArea:
return ProjectDataManagement::EventType::LeaveDangerArea;
return ProjectDataManagement::PdmEventType::LeaveDangerArea;
case AreaEffectSimulation::AesType_def::AtMineArea:
return ProjectDataManagement::EventType::LeaveMineArea;
return ProjectDataManagement::PdmEventType::LeaveMineArea;
case AreaEffectSimulation::AesType_def::AtNContamination:
return ProjectDataManagement::EventType::LeaveNuclear;
return ProjectDataManagement::PdmEventType::LeaveNuclear;
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
return ProjectDataManagement::EventType::LeaveFunctionalArea;
return ProjectDataManagement::PdmEventType::LeaveFunctionalArea;
default:
break;
}
return ProjectDataManagement::EventType::Unknown;
return ProjectDataManagement::PdmEventType::Unknown;
}
EffectType HandlerParticipantArea::leaveEffectTypeForAesType(AreaEffectSimulation::AesType aesTypeId)
@@ -1511,13 +1511,13 @@ void HandlerParticipantArea::aesItemViewRemoved(int aesItemId)
}
}
const auto eventTypeLeave = leaveEventTypeForAesType(aiv.aesTypeId);
if (eventTypeLeave != ProjectDataManagement::EventType::Unknown)
if (eventTypeLeave != ProjectDataManagement::PdmEventType::Unknown)
{
DEBUG_LOG(m_logger) << "aesItemViewRemoved, leaveEventType: " << eventTypeLeave;
auto it = m_eventStates.find(aesItemId);
if (it != m_eventStates.end())
{
const QHash<int, QSet<ProjectDataManagement::EventType>> &participants = it.value();
const QHash<int, QSet<ProjectDataManagement::PdmEventType>> &participants = it.value();
DEBUG_LOG(m_logger) << "aesItemViewRemoved, sending leave events to " << participants.size()
<< " participants";
for (auto itP = participants.begin(); itP != participants.end(); ++ itP)
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.h
+4 -4
View File
@@ -114,7 +114,7 @@ private: // methoden
int mineFieldBitIndex = 0);
void sendParticipantEvent(const CentralEffectSimulation::AesItemViewUtm &itemView,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType);
const ProjectDataManagement::PdmEventType eventType);
void sendEffectTypeEvent(const CentralEffectSimulation::AesItemViewUtm &itemView,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
EffectType effectType,
@@ -123,7 +123,7 @@ private: // methoden
bool eventMustBeSend(int aesItemId,
int participantId,
const ProjectDataManagement::EventType eventType);
const ProjectDataManagement::PdmEventType eventType);
bool effectTypeMustBeSend(int aesItemId,
int participantId,
@@ -131,7 +131,7 @@ private: // methoden
int mineFieldBitIndex,
bool insideBuilding);
ProjectDataManagement::EventType leaveEventTypeForAesType(AreaEffectSimulation::AesType aesTypeId);
ProjectDataManagement::PdmEventType leaveEventTypeForAesType(AreaEffectSimulation::AesType aesTypeId);
EffectType leaveEffectTypeForAesType(AreaEffectSimulation::AesType aesTypeId);
EffectType effectTypeForNContaminationArea(const CentralEffectSimulation::AesItemViewUtm &itemView, const QPointF &participantPosUtmPoint, qint64 partPosSampleTime);
EffectType effectTypeForBCContaminationArea(const CentralEffectSimulation::AesItemViewUtm &itemView, const QPointF &participantPosUtmPoint);
@@ -153,7 +153,7 @@ private: // attributes
QQueue<TrainingAreaBase::SendCesHitRequest> m_sendCesHitRequestQueue;
QHash<int, AreaEffectSimulation::AesEffectState> m_explosionSingleStates; // key = id value = state
QHash<int, AreaEffectSimulation::AesEffectState> m_explosionSingleCentralStates;
QHash<int, QHash<int, QSet<ProjectDataManagement::EventType>>> m_eventStates; // QHash<aesItemId, QHash<participantId, QSet<EventType>>>
QHash<int, QHash<int, QSet<ProjectDataManagement::PdmEventType>>> m_eventStates; // QHash<aesItemId, QHash<participantId, QSet<EventType>>>
QHash<int, QHash<int, QSet<EffectType>>> m_effectTypeStates; // QHash<aesItemId, QHash<participantId, QSet<effectStates>>>
QHash<int, QHash<int, QSet<int>>> m_effectTypeBitFieldIndexes; // QHash<aesItemId, QHash<participantId, QSet<mineFieldBitIdx>>>
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp
+21 -21
View File
@@ -405,7 +405,7 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect
requestTab.remainEffectPercent(remainEffectPercent);
requestTab.position(tabPosition);
requestTab.effectTime(data.effectStart() / 1000);
requestTab.eventType(ProjectDataManagement::EventType_def::FireEvent);
requestTab.eventType(ProjectDataManagement::PdmEventType_def::FireEvent);
ParticipantManagement::Participant originator = m_ddsHandler->dtcPpm()->participant(data.originatorId());
requestTab.partyId(originator.partyId());
requestTab.mineId(0);
@@ -994,10 +994,10 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
{
DEBUG_LOG(m_logger) << "size=1";
// send two single fire to the same vehicle
sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime , 100, ProjectDataManagement::EventType_def::HitEffectSimulation); // 100 Percent
sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime + 1000, 100, ProjectDataManagement::EventType_def::HitEffectSimulation); // 100 Percent
sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, ProjectDataManagement::EventType_def::HitEffectSimulation);
sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, ProjectDataManagement::EventType_def::HitEffectSimulation);
sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime , 100, ProjectDataManagement::PdmEventType_def::HitEffectSimulation); // 100 Percent
sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime + 1000, 100, ProjectDataManagement::PdmEventType_def::HitEffectSimulation); // 100 Percent
sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, ProjectDataManagement::PdmEventType_def::HitEffectSimulation);
sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, ProjectDataManagement::PdmEventType_def::HitEffectSimulation);
}
else
{
@@ -1011,10 +1011,10 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
};
std::sort(vehiclesInSmartExplosion.begin(), vehiclesInSmartExplosion.end(), mapSortLessThan);
sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.at(0).participantPosition, impactTime, 100, ProjectDataManagement::EventType_def::HitEffectSimulation); // 100 Percent
sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.at(1).participantPosition, impactTime, 100, ProjectDataManagement::EventType_def::HitEffectSimulation); // 100 Percent
sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.at(0).participantPosition, ProjectDataManagement::EventType_def::HitEffectSimulation);
sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.at(1).participantPosition, ProjectDataManagement::EventType_def::HitEffectSimulation);
sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.at(0).participantPosition, impactTime, 100, ProjectDataManagement::PdmEventType_def::HitEffectSimulation); // 100 Percent
sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.at(1).participantPosition, impactTime, 100, ProjectDataManagement::PdmEventType_def::HitEffectSimulation); // 100 Percent
sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.at(0).participantPosition, ProjectDataManagement::PdmEventType_def::HitEffectSimulation);
sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.at(1).participantPosition, ProjectDataManagement::PdmEventType_def::HitEffectSimulation);
}
} // calculateSmartExplosion
@@ -1205,7 +1205,7 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
effect = 3; // hazardDistance
DEBUG_LOG(m_logger) << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << ", effect=" << effect;
sendCesHitRequest(itemView, participantPosition, QDateTime::currentMSecsSinceEpoch(),
effect, ProjectDataManagement::EventType_def::EnterHazardDistance);
effect, ProjectDataManagement::PdmEventType_def::EnterHazardDistance);
}
break;
case RANGE::NON_LETHAL:
@@ -1230,14 +1230,14 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
{
DEBUG_LOG(m_logger) << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << ", effect=" << effect;
sendCesHitRequest(itemView, participantPosition, QDateTime::currentMSecsSinceEpoch(),
effect, ProjectDataManagement::EventType_def::AirSupport); // AirSupport for both: LETHAL_RADIUS, NONLETHAL_RADIUS
effect, ProjectDataManagement::PdmEventType_def::AirSupport); // AirSupport for both: LETHAL_RADIUS, NONLETHAL_RADIUS
}
#ifdef GUEZE_3136_IMPLEMENTED
else
{
DEBUG_LOG(m_logger) << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << " (Verdeckung -> EnterHazardDistance)";
sendCesHitRequest(itemView, participantPosition, QDateTime::currentMSecsSinceEpoch(),
effect, ProjectDataManagement::EventType_def::EnterHazardDistance);
effect, ProjectDataManagement::PdmEventType_def::EnterHazardDistance);
}
#endif // GUEZE_3136_IMPLEMENTED
} // case
@@ -1510,7 +1510,7 @@ void HandlerExplosions::sendEffectTypeEvent(const CentralEffectSimulation::AesIt
//effectTime >= 0 ? effectTime : participantPosition.sampleTime(),
QDateTime::currentMSecsSinceEpoch(),
ctasEffectType,
ProjectDataManagement::EventType_def::HitEffectSimulation);
ProjectDataManagement::PdmEventType_def::HitEffectSimulation);
}
// Send via TAB-Proxy to battlefield
@@ -1518,7 +1518,7 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const qint64 effectTime,
const int remaining,
const ProjectDataManagement::EventType eventType)
const ProjectDataManagement::PdmEventType eventType)
{
int32_t legacyChargeTypeId = 0;
legacyChargeTypeId = m_ddsHandler->getLegacyIdFromChargeTypeId(itemView.chargeStruct);
@@ -1575,7 +1575,7 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem
// mineFieldBitIndex wird als reserve2 uebertragen und hier wird die Wirkbeginn uebertragen.
int effectTime2 = 0;
if (eventType == ProjectDataManagement::EventType::EnterHazardDistance)
if (eventType == ProjectDataManagement::PdmEventType::EnterHazardDistance)
{
const auto &ec = m_ddsHandler->dtcAes().get()->explosionCluster(itemView.aesItemId);
if (ec.effectStart().is_set())
@@ -1605,7 +1605,7 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem
DEBUG_LOG(m_logger) << "ftcTab->SendCesHitRequest: " << requestTab;
m_ddsHandler->ftcTab()->sendCesHitRequest(requestTab, this);
if (!m_ddsHandler->isSmartChargeType(itemView.chargeStruct))
sendParticipantEvent(m_aesItemViewsUtm.value(itemView.aesItemId), participantPosition, ProjectDataManagement::EventType_def::HitEffectSimulation);
sendParticipantEvent(m_aesItemViewsUtm.value(itemView.aesItemId), participantPosition, ProjectDataManagement::PdmEventType_def::HitEffectSimulation);
}
double HandlerExplosions::getSquareDistance(const QPointF &centerUtm, const QPointF &pointUtm)
@@ -1632,13 +1632,13 @@ void HandlerExplosions::sendEnterHazardDistance(const int participantId, const i
m_enteredHazardDistanceStore.participantEnteringArea(participantId, aesItemId);
ProjectDataManagement::EventType eventType = ProjectDataManagement::EventType_def::EnterHazardDistance;
ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::EnterHazardDistance;
sendCesHitRequest(m_aesItemViewsUtm.value(aesItemId),
cesParticipantData,
QDateTime::currentMSecsSinceEpoch(),
ctasEffectType,
eventType);
sendParticipantEvent(m_aesItemViewsUtm.value(aesItemId), cesParticipantData, ProjectDataManagement::EventType_def::EnterHazardDistance);
sendParticipantEvent(m_aesItemViewsUtm.value(aesItemId), cesParticipantData, ProjectDataManagement::PdmEventType_def::EnterHazardDistance);
}
void HandlerExplosions::sendLeaveHazardDistance(const int participantId, const int aesItemId, const int remaining)
@@ -1658,13 +1658,13 @@ void HandlerExplosions::sendLeaveHazardDistance(const int participantId, const i
cesParticipantData,
QDateTime::currentMSecsSinceEpoch(),
ctasEffectType,
ProjectDataManagement::EventType_def::LeaveHazardDistance);
sendParticipantEvent(itemView, cesParticipantData, ProjectDataManagement::EventType_def::LeaveHazardDistance);
ProjectDataManagement::PdmEventType_def::LeaveHazardDistance);
sendParticipantEvent(itemView, cesParticipantData, ProjectDataManagement::PdmEventType_def::LeaveHazardDistance);
}
void HandlerExplosions::sendParticipantEvent(const CentralEffectSimulation::AesItemViewUtm &item,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType)
const ProjectDataManagement::PdmEventType eventType)
{
DEBUG_LOG(m_logger) << "sendParticipantEvent participantId=" << participantPosition.participantId();
ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId());
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.h
+2 -2
View File
@@ -185,7 +185,7 @@ private: // methoden
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const qint64 effectTime,
const int remaining,
const ProjectDataManagement::EventType eventType);
const ProjectDataManagement::PdmEventType eventType);
double getSquareDistance(const QPointF &centerUtm, const QPointF &pointUtm);
void sendEnterHazardDistance(const int participantId, const int aesItemId);
@@ -195,7 +195,7 @@ private: // methoden
void sendParticipantEvent(const CentralEffectSimulation::AesItemViewUtm &item,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType);
const ProjectDataManagement::PdmEventType eventType);
void startTimer(int id, int msec);
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp
+10 -10
View File
@@ -19,7 +19,7 @@ namespace dds
{
namespace core
{
inline uint qHash(ProjectDataManagement::EventType et)
inline uint qHash(ProjectDataManagement::PdmEventType et)
{
return ::qHash(et.underlying());
}
@@ -467,7 +467,7 @@ bool HandlerFunctionalAreas::inFormCheck(const CentralEffectSimulation::AesItemV
// Send via TAB-Proxy to battlefield
void HandlerFunctionalAreas::sendCesHitRequest(const CentralEffectSimulation::AesItemViewUtm &itemView,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData,
ProjectDataManagement::EventType eventType)
ProjectDataManagement::PdmEventType eventType)
{
qint64 effectTime = QDateTime::currentMSecsSinceEpoch();
@@ -476,11 +476,11 @@ void HandlerFunctionalAreas::sendCesHitRequest(const CentralEffectSimulation::Ae
switch (eventType.underlying())
{
case ProjectDataManagement::EventType_def::EnterFunctionalArea:
case ProjectDataManagement::PdmEventType_def::EnterFunctionalArea:
DEBUG_LOG(m_logger) << "-------------- EnterFunctionalArea itemView =" << itemView.aesItemId;
remaining = 1;
break;
case ProjectDataManagement::EventType_def::LeaveFunctionalArea:
case ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea:
remaining = 0;
DEBUG_LOG(m_logger) << "-------------- LeaveFunctionalArea itemView =" << itemView.aesItemId;
break;
@@ -564,7 +564,7 @@ void HandlerFunctionalAreas::sendCesHitRequest(const CentralEffectSimulation::Ae
void HandlerFunctionalAreas::sendParticipantEvent(const CentralEffectSimulation::AesItemViewUtm &itemView,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData,
const ProjectDataManagement::EventType eventType)
const ProjectDataManagement::PdmEventType eventType)
{
ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantData.participantTypeId());
// can happen since the positions are collected for all participants (no check if it is a SupportEntity or similar)
@@ -676,7 +676,7 @@ void HandlerFunctionalAreas::sendEnterLeave(const CentralEffectSimulation::AesIt
if (inForm)
{
enterLeaveType.eventType = ProjectDataManagement::EventType_def::EnterFunctionalArea;
enterLeaveType.eventType = ProjectDataManagement::PdmEventType_def::EnterFunctionalArea;
if (itemView.isSupplyTruck)
{
enterLeaveType.isAlreadySupplied = true;
@@ -695,8 +695,8 @@ void HandlerFunctionalAreas::sendEnterLeave(const CentralEffectSimulation::AesIt
}
else
{
enterLeaveType.eventType = ProjectDataManagement::EventType_def::LeaveFunctionalArea;
if (itemView.isSupplyTruck && lastEnterLeaveType.eventType == ProjectDataManagement::EventType_def::EnterFunctionalArea)
enterLeaveType.eventType = ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea;
if (itemView.isSupplyTruck && lastEnterLeaveType.eventType == ProjectDataManagement::PdmEventType_def::EnterFunctionalArea)
{
DEBUG_LOG(m_logger) << "sendEnterLeave.stopSupplyTimer";
enterLeaveType.isAlreadySupplied = false;
@@ -710,8 +710,8 @@ void HandlerFunctionalAreas::sendEnterLeave(const CentralEffectSimulation::AesIt
}
}
if ((inForm && lastEnterLeaveType.eventType != ProjectDataManagement::EventType_def::EnterFunctionalArea)
|| (!inForm && lastEnterLeaveType.eventType == ProjectDataManagement::EventType_def::EnterFunctionalArea))
if ((inForm && lastEnterLeaveType.eventType != ProjectDataManagement::PdmEventType_def::EnterFunctionalArea)
|| (!inForm && lastEnterLeaveType.eventType == ProjectDataManagement::PdmEventType_def::EnterFunctionalArea))
{
CentralEffectSimulation::HandlerParticipant::CesParticipantData cesParticipantData = m_handlerParticipant.get()->getParticipantPosition(participantId);
sendParticipantEvent(itemView, cesParticipantData, enterLeaveType.eventType);
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.h
+4 -4
View File
@@ -54,7 +54,7 @@ struct ParticipantDistance
struct EnterLeaveType
{
ProjectDataManagement::EventType eventType = ProjectDataManagement::EventType_def::Unknown;
ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::Unknown;
bool isAlreadySupplied = false;
};
@@ -100,13 +100,13 @@ private: // methoden
bool inFormCheck(const CentralEffectSimulation::AesItemViewUtm &itemView, const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData);
void sendCesHitRequest(const CentralEffectSimulation::AesItemViewUtm &itemView,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData,
ProjectDataManagement::EventType eventType);
ProjectDataManagement::PdmEventType eventType);
void sendParticipantEvent(const CentralEffectSimulation::AesItemViewUtm &itemView,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData,
const ProjectDataManagement::EventType eventType);
const ProjectDataManagement::PdmEventType eventType);
ProjectDataManagement::EventType leaveEventTypeForAesType(AreaEffectSimulation::AesType aesTypeId);
ProjectDataManagement::PdmEventType leaveEventTypeForAesType(AreaEffectSimulation::AesType aesTypeId);
EffectType leaveEffectTypeForAesType(AreaEffectSimulation::AesType aesTypeId);
EffectType effectTypeForNContaminationArea(const CentralEffectSimulation::AesItemViewUtm &itemView, const QPointF &participantPosUtmPoint, qint64 partPosSampleTime);
EffectType effectTypeForBCContaminationArea(const CentralEffectSimulation::AesItemViewUtm &itemView, const QPointF &participantPosUtmPoint);
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp
+5 -5
View File
@@ -184,9 +184,9 @@ void HandlerParticipantGasPipe::calculateGasPipeParticipant(const CentralEffectS
if (result)
{
DEBUG_LOG(m_logger) << "sendParticipantEvent";
sendParticipantEvent(gasPipe, participantPosition, ProjectDataManagement::EventType_def::HitGasPipe);
sendParticipantEvent(gasPipe, participantPosition, ProjectDataManagement::PdmEventType_def::HitGasPipe);
DEBUG_LOG(m_logger) << "sendParticipantHit";
sendParticipantHit(gasPipe, participantPosition, ProjectDataManagement::EventType_def::HitGasPipe);
sendParticipantHit(gasPipe, participantPosition, ProjectDataManagement::PdmEventType_def::HitGasPipe);
}
}
@@ -217,7 +217,7 @@ void HandlerParticipantGasPipe::onParticipantPositionChanged(const CentralEffect
result = insideGasPipeArea(gasPipe.form, partPosGeo);
DEBUG_LOG(m_logger) << "result gasPipe Explosion = " << result<< gasPipe.aesItemId;
if (result)
sendParticipantEvent(gasPipe, partPos, ProjectDataManagement::EventType_def::HitGasPipe);
sendParticipantEvent(gasPipe, partPos, ProjectDataManagement::PdmEventType_def::HitGasPipe);
}
} // end of onParticipantPositionChanged()
//-----------------------------------------------------------------------------
@@ -231,7 +231,7 @@ void HandlerParticipantGasPipe::onParticipantPositionChanged(const CentralEffect
void HandlerParticipantGasPipe::sendParticipantEvent(const CentralEffectSimulation::AesItemViewUtm &gasPipe,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType)
const ProjectDataManagement::PdmEventType eventType)
{
ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId());
@@ -270,7 +270,7 @@ void HandlerParticipantGasPipe::sendParticipantEvent(const CentralEffectSimulati
void HandlerParticipantGasPipe::sendParticipantHit(const CentralEffectSimulation::AesItemViewUtm &gasPipe,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType)
const ProjectDataManagement::PdmEventType eventType)
{
const int equipNo = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.h
+2 -2
View File
@@ -67,10 +67,10 @@ private Q_SLOTS:
private: // methoden
void sendParticipantEvent(const CentralEffectSimulation::AesItemViewUtm &gasPipe,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType);
const ProjectDataManagement::PdmEventType eventType);
void sendParticipantHit(const CentralEffectSimulation::AesItemViewUtm &gasPipe,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType);
const ProjectDataManagement::PdmEventType eventType);
bool insideGasPipeArea(const QPolygonF &polygonf, const QPointF &participantPos) const;
void calculateGasPipeParticipant(const CentralEffectSimulation::AesItemViewUtm &gasPipe,
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp
+2 -2
View File
@@ -22,7 +22,7 @@ namespace dds
{
namespace core
{
inline uint qHash(ProjectDataManagement::EventType et)
inline uint qHash(ProjectDataManagement::PdmEventType et)
{
return ::qHash(et.underlying());
}
@@ -216,7 +216,7 @@ void HandlerJamming::sendCesHitRequest(const int chargeTypeId,
remaining, // remainEffectPercent ( no protection outside Building )
pos,
effectTime, // effectTime
ProjectDataManagement::EventType::Jamming, // EventType
ProjectDataManagement::PdmEventType::Jamming, // EventType
originatorPartyId, // originPartyId
mineId
);
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.h
+2 -2
View File
@@ -34,7 +34,7 @@ struct ParticipantDistance
struct EnterLeaveType
{
ProjectDataManagement::EventType eventType = ProjectDataManagement::EventType_def::Unknown;
ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::Unknown;
bool isAlreadySupplied = false;
};
@@ -73,7 +73,7 @@ private: // methoden
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData);
ProjectDataManagement::EventType leaveEventTypeForAesType(AreaEffectSimulation::AesType aesTypeId);
ProjectDataManagement::PdmEventType leaveEventTypeForAesType(AreaEffectSimulation::AesType aesTypeId);
private: // attributes
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp
+14 -14
View File
@@ -22,7 +22,7 @@ namespace dds
{
namespace core
{
inline uint qHash(ProjectDataManagement::EventType et)
inline uint qHash(ProjectDataManagement::PdmEventType et)
{
return ::qHash(et.underlying());
}
@@ -346,7 +346,7 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
// DEBUG_LOG(m_logger) << "minePosGeo lat=" << minePosGeo.lat()
// << " lon=" << minePosGeo.lon()
// << " z=" << minePosGeo.z();
sendParticipantEvent(m_aesItemViews[aesItemId], minePosition, ProjectDataManagement::EventType_def::HitMine);
sendParticipantEvent(m_aesItemViews[aesItemId], minePosition, ProjectDataManagement::PdmEventType_def::HitMine);
m_mineLists[participantPosition.participantId()].remove(index);
@@ -542,7 +542,7 @@ bool HandlerMineAreas::intersectMineRadiusCheck(const CentralEffectSimulation::A
// DEBUG_LOG(m_logger) << "minePosGeo lat=" << minePosGeo.lat()
// << " lon=" << minePosGeo.lon()
// << " z=" << minePosGeo.z();
sendParticipantEvent(itemView, minePosition, ProjectDataManagement::EventType_def::HitMine);
sendParticipantEvent(itemView, minePosition, ProjectDataManagement::PdmEventType_def::HitMine);
// aktuell verarbeitete Mine aus der Liste entfernen.
m_mineLists[participantPosition.participantId()].remove(mineListItemIndex);
}
@@ -815,7 +815,7 @@ void HandlerMineAreas::sendCesHitRequest(const CentralEffectSimulation::AesItemV
participantPosition.roomId());
const int originatorEquipNo = m_ddsHandler->participantId2EquipNo(originatorParticipantId);
const ProjectDataManagement::EventType eventType = ProjectDataManagement::EventType_def::Unknown;
const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::Unknown;
TrainingAreaBase::SendCesHitRequest requestTab(
equipNo, // equipmentNumber
@@ -878,7 +878,7 @@ void HandlerMineAreas::sendCesHitRequest(const AreaEffectSimulation::AesItemView
participantPosition.pos(), Core::PositionReportingSource_def::Gps, participantPosition.buildingId(),
participantPosition.roomId()
);
const ProjectDataManagement::EventType eventType = ProjectDataManagement::EventType_def::Unknown;
const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::Unknown;
TrainingAreaBase::SendCesHitRequest requestTab(
equipmentNumber, participantPosition.participantId(), legacyChargeTypeId, itemView.aesItemId(), originatorEquipmentNumber,
@@ -900,30 +900,30 @@ void HandlerMineAreas::sendParticipantEventEnterLeave(const CentralEffectSimulat
const bool inFormCheckResult)
{
const ProjectDataManagement::EventType &lastEvent = m_eventStates[itemView.aesItemId][participantPosition.participantId()];
const ProjectDataManagement::PdmEventType &lastEvent = m_eventStates[itemView.aesItemId][participantPosition.participantId()];
ProjectDataManagement::EventType eventType = ProjectDataManagement::EventType_def::EnterMineArea;
ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::EnterMineArea;
if (inFormCheckResult)
{
if (lastEvent == ProjectDataManagement::EventType_def::EnterMineArea)
if (lastEvent == ProjectDataManagement::PdmEventType_def::EnterMineArea)
return;
else
{
eventType = ProjectDataManagement::EventType_def::EnterMineArea;
m_eventStates[itemView.aesItemId][participantPosition.participantId()] = ProjectDataManagement::EventType_def::EnterMineArea;
eventType = ProjectDataManagement::PdmEventType_def::EnterMineArea;
m_eventStates[itemView.aesItemId][participantPosition.participantId()] = ProjectDataManagement::PdmEventType_def::EnterMineArea;
}
}
else
{
if (lastEvent == ProjectDataManagement::EventType_def::LeaveMineArea)
if (lastEvent == ProjectDataManagement::PdmEventType_def::LeaveMineArea)
return;
else
{
eventType = ProjectDataManagement::EventType_def::LeaveMineArea;
m_eventStates[itemView.aesItemId][participantPosition.participantId()] = ProjectDataManagement::EventType_def::LeaveMineArea;
eventType = ProjectDataManagement::PdmEventType_def::LeaveMineArea;
m_eventStates[itemView.aesItemId][participantPosition.participantId()] = ProjectDataManagement::PdmEventType_def::LeaveMineArea;
}
}
@@ -933,7 +933,7 @@ void HandlerMineAreas::sendParticipantEventEnterLeave(const CentralEffectSimulat
void HandlerMineAreas::sendParticipantEvent(const CentralEffectSimulation::AesItemViewUtm &itemView,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType)
const ProjectDataManagement::PdmEventType eventType)
{
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.h
+3 -3
View File
@@ -118,14 +118,14 @@ private: // methoden
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const bool inFormCheckResult);
void sendParticipantEvent(const CentralEffectSimulation::AesItemViewUtm &itemView,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition, const ProjectDataManagement::EventType eventType);
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition, const ProjectDataManagement::PdmEventType eventType);
void sendEffectTypeEvent(const CentralEffectSimulation::AesItemViewUtm &itemView,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
EffectType effectType,
int mineFieldBitIndex,
qint64 effectTime);
ProjectDataManagement::EventType leaveEventTypeForAesType(AreaEffectSimulation::AesType aesTypeId);
ProjectDataManagement::PdmEventType leaveEventTypeForAesType(AreaEffectSimulation::AesType aesTypeId);
EffectType leaveEffectTypeForAesType(AreaEffectSimulation::AesType aesTypeId);
void aesItemViewRemoved(int aesItemId);
@@ -143,7 +143,7 @@ private: // attributes
// AES-Values
QHash<int, CentralEffectSimulation::AesItemViewUtm> m_aesItemViews; // key = aesItemId
QQueue<TrainingAreaBase::SendCesHitRequest> m_sendCesHitRequestQueue;
QHash<int, QHash<int, ProjectDataManagement::EventType>> m_eventStates; // QHash<aesItemId, QHash<participantId, QSet<EventType>>>
QHash<int, QHash<int, ProjectDataManagement::PdmEventType>> m_eventStates; // QHash<aesItemId, QHash<participantId, QSet<EventType>>>
QHash<int, QHash<int, QSet<EffectType>>> m_effectTypeStates; // QHash<aesItemId, QHash<participantId, QSet<effectStates>>>
QHash<int, QHash<int, QSet<int>>> m_effectTypeBitFieldIndexes; // QHash<aesItemId, QHash<participantId, QSet<mineFieldBitIdx>>>
QHash<int, QVector<MineListItem>> m_mineLists; // Key = ParticipantId
Loaded 100 of 135 files, more files were not shown because too many files have changed in this diff. Show more