Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
+60
-60
@@ -50,13 +50,13 @@ ConfigParticipantsDialog::~ConfigParticipantsDialog()
|
||||
|
||||
void ConfigParticipantsDialog::retranslate()
|
||||
{
|
||||
if (!m_participantData.equipmentNumber().is_set())
|
||||
if (!m_participantData.equipmentNumber.has_value())
|
||||
{
|
||||
QString hierarchy = m_ppmDtc->hierarchyFromParticipant(m_participantData.id());
|
||||
QString hierarchy = m_ppmDtc->hierarchyFromParticipant(m_participantData.id);
|
||||
translate(m_ui, m_participantData, hierarchy, tr("Participant Alarm"));
|
||||
}
|
||||
else
|
||||
translate(m_ui, m_participantData, QString::number(m_participantData.equipmentNumber().get()),
|
||||
translate(m_ui, m_participantData, QString::number(m_participantData.equipmentNumber.get()),
|
||||
tr("Participant Alarm"));
|
||||
|
||||
m_uiRequirements->clear();
|
||||
@@ -82,12 +82,12 @@ bool ConfigParticipantsDialog::init(const std::shared_ptr<ParticipantManagement:
|
||||
|
||||
m_operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
|
||||
m_ui->lbHierarchy->setText(m_ppmDtc->hierarchyFromParticipant(m_participantData.id()));
|
||||
m_ui->lbHierarchy->setText(m_ppmDtc->hierarchyFromParticipant(m_participantData.id));
|
||||
|
||||
QString equipmentNumbersStr;
|
||||
if (participantData.equipmentNumber().is_set())
|
||||
if (participantData.equipmentNumber.has_value())
|
||||
{
|
||||
equipmentNumbersStr.append(QString::number(participantData.equipmentNumber().get()));
|
||||
equipmentNumbersStr.append(QString::number(participantData.equipmentNumber.get()));
|
||||
equipmentNumbersStr.append(QStringLiteral(": "));
|
||||
}
|
||||
|
||||
@@ -97,10 +97,10 @@ bool ConfigParticipantsDialog::init(const std::shared_ptr<ParticipantManagement:
|
||||
|
||||
m_ui->equipmentNoContent->setText(equipmentNumbersStr);
|
||||
|
||||
DEBUG_LOG(m_logger) << "current participantId = " << participantData.id();
|
||||
DEBUG_LOG(m_logger) << "current participantId = " << participantData.id;
|
||||
|
||||
m_typeClass = ppmDtc->type(participantData.typeId()).typeClass();
|
||||
DEBUG_LOG(m_logger) << "m_typeClass=" << m_typeClass << " TypeId=" << participantData.typeId();
|
||||
m_typeClass = ppmDtc->type(participantData.typeId).typeClass;
|
||||
DEBUG_LOG(m_logger) << "m_typeClass=" << m_typeClass << " TypeId=" << participantData.typeId;
|
||||
fillCbx();
|
||||
|
||||
m_almDtc->alarmConfigs([this](const AlarmManagement::AlarmConfig& alarm) { setAlaramData(alarm); });
|
||||
@@ -110,21 +110,21 @@ bool ConfigParticipantsDialog::init(const std::shared_ptr<ParticipantManagement:
|
||||
void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig& alarm)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "setAlaramData:" << alarm;
|
||||
if (alarm.operatorId() != m_operatorId || alarm.participantId() != m_participantData.id() || alarm.global())
|
||||
if (alarm.operatorId != m_operatorId || alarm.participantId != m_participantData.id || alarm.global)
|
||||
return;
|
||||
|
||||
switch (alarm.eventTypeId().underlying())
|
||||
switch (alarm.eventTypeId)
|
||||
{
|
||||
case ProjectDataManagement::PdmEventType::EventType_Hit: {
|
||||
DEBUG_LOG(m_logger) << "Hit zuweisen ";
|
||||
m_ui->cbxDirectFire->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
if (alarm.vulnerabilityState() >= 0)
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker);
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
|
||||
if (alarm.vulnerabilityState >= 0)
|
||||
{
|
||||
ProjectDataManagement::VulnerabilityState vulState =
|
||||
static_cast<ProjectDataManagement::VulnerabilityState>(alarm.vulnerabilityState());
|
||||
int index = m_ui->cbStatusDirect->findData(QVariant(vulState.underlying()));
|
||||
static_cast<ProjectDataManagement::VulnerabilityState>(alarm.vulnerabilityState);
|
||||
int index = m_ui->cbStatusDirect->findData(QVariant(static_cast<int>(vulState)));
|
||||
m_ui->cbStatusDirect->setCurrentIndex(index);
|
||||
}
|
||||
break;
|
||||
@@ -132,22 +132,22 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig&
|
||||
case ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation: {
|
||||
DEBUG_LOG(m_logger) << "HitIndirect zuweisen ";
|
||||
m_ui->cbxIndirectFire->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker);
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::PdmEventType::EventType_AirSupport: {
|
||||
DEBUG_LOG(m_logger) << "AirSupport zuweisen ";
|
||||
m_ui->cbxAirSupport->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker);
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::PdmEventType::EventType_HitMine: {
|
||||
DEBUG_LOG(m_logger) << "HitMine zuweisen ";
|
||||
m_ui->cbxMines->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker);
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::PdmEventType::EventType_HitB:
|
||||
@@ -155,20 +155,20 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig&
|
||||
case ProjectDataManagement::PdmEventType::EventType_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());
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker);
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::PdmEventType::EventType_FriendlyFire: {
|
||||
DEBUG_LOG(m_logger) << "FriendlyFire zuweisen ";
|
||||
m_ui->cbxFriendlyFire->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
if (alarm.vulnerabilityState() >= 0)
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker);
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
|
||||
if (alarm.vulnerabilityState >= 0)
|
||||
{
|
||||
ProjectDataManagement::VulnerabilityState vulState =
|
||||
static_cast<ProjectDataManagement::VulnerabilityState>(alarm.vulnerabilityState());
|
||||
int index = m_ui->cbStatusDirect->findData(QVariant(vulState.underlying()));
|
||||
static_cast<ProjectDataManagement::VulnerabilityState>(alarm.vulnerabilityState);
|
||||
int index = m_ui->cbStatusDirect->findData(QVariant(static_cast<int>(vulState)));
|
||||
m_ui->cbStatusFriendly->setCurrentIndex(index);
|
||||
}
|
||||
break;
|
||||
@@ -176,22 +176,22 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig&
|
||||
case ProjectDataManagement::PdmEventType::EventType_Manipulation: {
|
||||
DEBUG_LOG(m_logger) << "Manipulation zuweisen ";
|
||||
m_ui->cbxManipulation->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker);
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline: {
|
||||
DEBUG_LOG(m_logger) << "CrossGlobalBorderline zuweisen ";
|
||||
m_ui->cbxGlobalBorderLine->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker);
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline: {
|
||||
DEBUG_LOG(m_logger) << "CrossLocalBorderline zuweisen ";
|
||||
m_ui->cbxLocalBorderLine->setChecked(true);
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker());
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
|
||||
m_ui->cbxSetMarker->setChecked(alarm.setMarker);
|
||||
m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
@@ -207,68 +207,68 @@ std::vector<AlarmManagement::AlarmAction> ConfigParticipantsDialog::getCheckedVa
|
||||
|
||||
std::vector<AlarmManagement::AlarmAction> alarmsDds;
|
||||
|
||||
alarmActionDds.setMarker(m_ui->cbxSetMarker->isChecked());
|
||||
alarmActionDds.messageWindow(m_ui->cbxMessageWindow->isChecked());
|
||||
alarmActionDds.vulnerabilityState(-1);
|
||||
alarmActionDds.setMarker = m_ui->cbxSetMarker->isChecked();
|
||||
alarmActionDds.messageWindow = m_ui->cbxMessageWindow->isChecked();
|
||||
alarmActionDds.vulnerabilityState = -1;
|
||||
|
||||
if (alarmActionDds.setMarker() || alarmActionDds.messageWindow())
|
||||
if (alarmActionDds.setMarker || alarmActionDds.messageWindow)
|
||||
{
|
||||
if (m_ui->cbxDirectFire->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_Hit);
|
||||
alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Hit;
|
||||
int statusDirect = -1;
|
||||
if (m_ui->cbStatusDirect->currentIndex() > 0)
|
||||
statusDirect = m_ui->cbStatusDirect->currentData().toInt();
|
||||
alarmActionDds.vulnerabilityState(statusDirect);
|
||||
alarmActionDds.vulnerabilityState = statusDirect;
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
}
|
||||
if (m_ui->cbxFriendlyFire->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_FriendlyFire);
|
||||
alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_FriendlyFire;
|
||||
int statusFriendly = -1;
|
||||
if (m_ui->cbStatusFriendly->currentIndex() > 0)
|
||||
statusFriendly = m_ui->cbStatusFriendly->currentData().toInt();
|
||||
alarmActionDds.vulnerabilityState(statusFriendly);
|
||||
alarmActionDds.vulnerabilityState = statusFriendly;
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
}
|
||||
alarmActionDds.vulnerabilityState(-1);
|
||||
alarmActionDds.vulnerabilityState = -1;
|
||||
if (m_ui->cbxIndirectFire->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation);
|
||||
alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation;
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
}
|
||||
if (m_ui->cbxAirSupport->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_AirSupport);
|
||||
alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_AirSupport;
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
}
|
||||
if (m_ui->cbxMines->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitMine);
|
||||
alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitMine;
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
}
|
||||
if (m_ui->cbxNbcAgent->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitN);
|
||||
alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitN;
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitB);
|
||||
alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitB;
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitC);
|
||||
alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitC;
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
}
|
||||
if (m_ui->cbxManipulation->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_Manipulation);
|
||||
alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Manipulation;
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
}
|
||||
if (m_ui->cbxGlobalBorderLine->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline);
|
||||
alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline;
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
}
|
||||
if (m_ui->cbxLocalBorderLine->isChecked())
|
||||
{
|
||||
alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline);
|
||||
alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline;
|
||||
alarmsDds.push_back(alarmActionDds);
|
||||
}
|
||||
}
|
||||
@@ -279,11 +279,11 @@ bool ConfigParticipantsDialog::apply()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "apply";
|
||||
AlarmManagement::ConfigureAlarmsRequest req;
|
||||
req.participantIds(m_participantVector);
|
||||
req.alarms(getCheckedValues());
|
||||
req.operatorId(m_operatorId);
|
||||
req.global(false);
|
||||
req.remove(false);
|
||||
req.participantIds = m_participantVector;
|
||||
req.alarms = getCheckedValues();
|
||||
req.operatorId = m_operatorId;
|
||||
req.global = false;
|
||||
req.remove = false;
|
||||
|
||||
return m_requestHelper->startSingleRequest([req, this]() { return m_almFtc->configureAlarmsRequest(req, this); });
|
||||
}
|
||||
@@ -298,9 +298,9 @@ void ConfigParticipantsDialog::fillCbx()
|
||||
ParticipantManagement::insertVulnerabilityStates(m_ui->cbStatusDirect, m_typeClass);
|
||||
ParticipantManagement::insertVulnerabilityStates(m_ui->cbStatusFriendly, m_typeClass);
|
||||
m_ui->cbStatusDirect->removeItem(
|
||||
m_ui->cbStatusDirect->findData(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance));
|
||||
m_ui->cbStatusDirect->findData(static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance)));
|
||||
m_ui->cbStatusFriendly->removeItem(
|
||||
m_ui->cbStatusDirect->findData(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance));
|
||||
m_ui->cbStatusDirect->findData(static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance)));
|
||||
}
|
||||
|
||||
} // namespace ParticipantAlarms
|
||||
+10
-10
@@ -99,8 +99,8 @@ void ParticipantsDialog::onSelectionChanged()
|
||||
for (const QModelIndex& index : currentlySelectedParticipants)
|
||||
{
|
||||
const ParticipantManagement::ParticipantData data(m_participantModel->getParticipantData(index));
|
||||
if ((data.equipmentNumber().is_set() && data.equipmentNumber().get() > 0) ||
|
||||
m_ppmDtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass::Unit)
|
||||
if ((data.equipmentNumber.has_value() && data.equipmentNumber.get() > 0) ||
|
||||
m_ppmDtc->type(data.typeId).typeClass == ParticipantManagement::TypeClass::Unit)
|
||||
configureAlarms = true;
|
||||
DEBUG_LOG(m_logger) << "setChildrenSelected row =" << index.row() << " column=" << index.column();
|
||||
}
|
||||
@@ -138,13 +138,13 @@ void ParticipantsDialog::onAddButtonClicked()
|
||||
|
||||
QModelIndex participantIndex = m_ui->dvParticipants->currentIndex();
|
||||
ParticipantManagement::ParticipantData data = m_participantModel->getParticipantData(participantIndex);
|
||||
DEBUG_LOG(m_logger) << "current participantId = " << data.id();
|
||||
m_participantVector.push_back(data.id());
|
||||
DEBUG_LOG(m_logger) << "current participantId = " << data.id;
|
||||
m_participantVector.push_back(data.id);
|
||||
|
||||
const auto partData = m_participantModel->getParticipantData(participantIndex);
|
||||
addDialog(LtsWidgets::initDialog(new ConfigParticipantsDialog(this), m_ppmDtc, m_almDtc, m_almFtc, partData,
|
||||
m_participantVector, m_equipmentVector),
|
||||
m_menuGroup, QStringLiteral("ConfigAlarms%1").arg(partData.id()));
|
||||
m_menuGroup, QStringLiteral("ConfigAlarms%1").arg(partData.id));
|
||||
}
|
||||
|
||||
void ParticipantsDialog::onPrint()
|
||||
@@ -168,12 +168,12 @@ void ParticipantsDialog::setChildrenSelected(const QModelIndex& parent)
|
||||
DEBUG_LOG(m_logger) << "Setting row " << childIndex.row() << " selected";
|
||||
|
||||
ParticipantManagement::ParticipantData data = m_participantModel->getParticipantData(childIndex);
|
||||
DEBUG_LOG(m_logger) << "append participantId = " << data.id();
|
||||
m_participantVector.push_back(data.id());
|
||||
if (data.equipmentNumber().is_set())
|
||||
DEBUG_LOG(m_logger) << "append participantId = " << data.id;
|
||||
m_participantVector.push_back(data.id);
|
||||
if (data.equipmentNumber.has_value())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "append equipmentNumber = " << data.equipmentNumber().get();
|
||||
m_equipmentVector.push_back(data.equipmentNumber().get());
|
||||
DEBUG_LOG(m_logger) << "append equipmentNumber = " << data.equipmentNumber.get();
|
||||
m_equipmentVector.push_back(data.equipmentNumber.get());
|
||||
}
|
||||
|
||||
m_ui->dvParticipants->selectionModel()->select(m_participantProxyModel->mapFromSource(childIndex),
|
||||
|
||||
+1
@@ -8,6 +8,7 @@
|
||||
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <AlarmManagement/alm_ftc.h>
|
||||
#include <AlarmManagement/alm_dtc.h>
|
||||
|
||||
|
||||
+8
-8
@@ -37,10 +37,10 @@ void ParticipantAlarmModel::onParticipantChanged(const ParticipantManagement::Pa
|
||||
DataModification modType)
|
||||
{
|
||||
Q_UNUSED(modType);
|
||||
if (data.partyId() != partyId())
|
||||
if (data.partyId != partyId())
|
||||
return;
|
||||
|
||||
INFO_LOG(m_logger) << "onParticipantChanged isSimulated=" << data.isSimulated();
|
||||
INFO_LOG(m_logger) << "onParticipantChanged isSimulated=" << data.isSimulated;
|
||||
onReinitModel(partyId());
|
||||
emit newData();
|
||||
}
|
||||
@@ -50,17 +50,17 @@ bool ParticipantAlarmModel::isSelectableByAlarm(const QModelIndex& index, bool*
|
||||
bool isSimulatable = false;
|
||||
const ParticipantManagement::ParticipantData data(getParticipantData(index));
|
||||
|
||||
if ((data.equipmentNumber().is_set() && data.equipmentNumber().get() > 0) ||
|
||||
m_dtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass::Unit)
|
||||
if ((data.equipmentNumber.has_value() && data.equipmentNumber.get() > 0) ||
|
||||
m_dtc->type(data.typeId).typeClass == ParticipantManagement::TypeClass::Unit)
|
||||
isSimulatable = true;
|
||||
|
||||
DEBUG_LOG(m_logger) << "ParticipantId: " << data.id() << " isSimulated:" << data.isSimulated()
|
||||
<< " equipmentNo:" << data.equipmentNumber() << " typeId=" << data.typeId()
|
||||
<< " modId=" << data.modId() << " typeClass=" << m_dtc->type(data.typeId()).typeClass()
|
||||
DEBUG_LOG(m_logger) << "ParticipantId: " << data.id << " isSimulated:" << data.isSimulated
|
||||
<< " equipmentNo:" << data.equipmentNumber << " typeId=" << data.typeId
|
||||
<< " modId=" << data.modId << " typeClass=" << m_dtc->type(data.typeId).typeClass
|
||||
<< " isSimulatable=" << isSimulatable;
|
||||
|
||||
if (bIsSimulated)
|
||||
*bIsSimulated = data.isSimulated();
|
||||
*bIsSimulated = data.isSimulated;
|
||||
|
||||
return isSimulatable;
|
||||
}
|
||||
|
||||
+9
-9
@@ -96,28 +96,28 @@ void ParticipantShowConfigView::onShowAlarm()
|
||||
void ParticipantShowConfigView::onRemoveAlarm()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onRemoveAlarm"
|
||||
<< " id = " << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).id()
|
||||
<< " id = " << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).id
|
||||
<< " eventTypeId = "
|
||||
<< m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).eventTypeId()
|
||||
<< m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).eventTypeId
|
||||
<< " operatorId = "
|
||||
<< m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).operatorId()
|
||||
<< m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).operatorId
|
||||
<< " participantId = "
|
||||
<< m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).participantId();
|
||||
<< m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).participantId;
|
||||
|
||||
const QModelIndex curIdx = m_ui->widget->currentIndex();
|
||||
if (!curIdx.isValid())
|
||||
return;
|
||||
const AlarmManagement::AlarmConfig& rowdata = m_configAlarmModel->getRowData(curIdx.row());
|
||||
int operatorId = rowdata.operatorId();
|
||||
int operatorId = rowdata.operatorId;
|
||||
std::vector<int32_t> ddsParticipantIds;
|
||||
ddsParticipantIds.push_back(rowdata.participantId());
|
||||
ddsParticipantIds.push_back(rowdata.participantId);
|
||||
bool globalEvent = true;
|
||||
bool remove = true;
|
||||
std::vector<AlarmManagement::AlarmAction> alarmsDds;
|
||||
alarmsDds.resize(1);
|
||||
alarmsDds[0].setMarker(false);
|
||||
alarmsDds[0].messageWindow(false);
|
||||
alarmsDds[0].eventTypeId(rowdata.eventTypeId());
|
||||
alarmsDds[0].setMarker = false;
|
||||
alarmsDds[0].messageWindow = false;
|
||||
alarmsDds[0].eventTypeId = rowdata.eventTypeId;
|
||||
AlarmManagement::ConfigureAlarmsRequest request(alarmsDds, operatorId, ddsParticipantIds, globalEvent, remove);
|
||||
|
||||
m_requestHelper->startSingleRequest([request, this]() {
|
||||
|
||||
+3
-3
@@ -6,7 +6,7 @@
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <AlarmManagement/Common/alm_config_alarm_model.h>
|
||||
#include <AlarmManagement/Gui/Common/alm_config_alarm_model.h>
|
||||
#include <AlarmManagement/alm_dtc.h>
|
||||
#include <AlarmManagement/alm_ftc.h>
|
||||
|
||||
@@ -41,7 +41,6 @@ class ParticipantShowConfigView : public LtsWidgets::LtsDialog,
|
||||
void onPrint();
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger& m_logger;
|
||||
void onConfigureAlarmsReply(const Core::FunctionReplyObject& replyObject) override final;
|
||||
|
||||
private:
|
||||
@@ -57,7 +56,8 @@ class ParticipantShowConfigView : public LtsWidgets::LtsDialog,
|
||||
Ui::ParticipantShowConfigView* m_ui;
|
||||
LtsUtils::RequestHelper* m_requestHelper;
|
||||
|
||||
AlarmManagement::
|
||||
AlarmManagement::LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
|
||||
} // namespace ParticipantAlarms
|
||||
Reference in new issue
Block a user