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:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent eb1d949edc
commit 815e16368e
1718 files changed
+126739 -18495

No files matched your search

@@ -24,6 +24,7 @@ ParticipantBiteDialog::ParticipantBiteDialog(int ddsId, QWidget *parent)
, m_ui(new Ui::ParticipantBiteDialog)
, m_ccsMap()
, m_bctMap()
, m_logger(getLogger("ParticipantBiteDialog"))
{
m_ui->setupUi(this);
setUnchangeable();
@@ -62,8 +63,8 @@ bool ParticipantBiteDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
if (detailData.isEmpty())
{
Participant participant = m_dtc->participant(m_ddsId);
if (participant.equipmentNumber().is_set())
m_eqipNr = participant.equipmentNumber().get();
if (participant.equipmentNumber.has_value())
m_eqipNr = participant.equipmentNumber.get();
connect(m_dtc.get(), &Interface::Dtc::biteChanged, this, &ParticipantBiteDialog::onBiteChanged);
@@ -85,21 +86,21 @@ bool ParticipantBiteDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
const QJsonArray biteErrors(detailData[QStringLiteral("BiteErrors")].toArray());
Bite bite;
bite.batteryState(detailData[QStringLiteral("BatteryState")].toInt());
bite.biteState(detailData[QStringLiteral("BiteState")].toInt());
bite.configState(detailData[QStringLiteral("ConfigState")].toInt());
bite.batteryState = detailData[QStringLiteral("BatteryState")].toInt();
bite.biteState = detailData[QStringLiteral("BiteState")].toInt();
bite.configState = detailData[QStringLiteral("ConfigState")].toInt();
BiteError biteError;
bite.biteErrors().reserve(biteErrors.size());
bite.biteErrors.reserve(biteErrors.size());
for (const QJsonValue &biteErrorValue : biteErrors)
{
const QJsonObject biteErrorObject(biteErrorValue.toObject());
biteError.errorNumber(biteErrorObject[QStringLiteral("ErrorNo")].toInt());
biteError.canDeviceNumber(biteErrorObject[QStringLiteral("CanDeviceNumber")].toInt());
biteError.subdeviceNumber(biteErrorObject[QStringLiteral("SubdeviceNumber")].toInt());
biteError.uniqueId(biteErrorObject[QStringLiteral("UniqueId")].toInt());
biteError.errorNumber = biteErrorObject[QStringLiteral("ErrorNo")].toInt();
biteError.canDeviceNumber = biteErrorObject[QStringLiteral("CanDeviceNumber")].toInt();
biteError.subdeviceNumber = biteErrorObject[QStringLiteral("SubdeviceNumber")].toInt();
biteError.uniqueId = biteErrorObject[QStringLiteral("UniqueId")].toInt();
bite.biteErrors().push_back(biteError);
bite.biteErrors.push_back(biteError);
}
onBiteChanged(bite);
}
@@ -116,9 +117,9 @@ int ParticipantBiteDialog::checkArguments(bool available, bool statusOk, qint64
QString name;
for (const ProjectDataManagement::CanComponentString &ccs : std::as_const(m_ccsMap))
{
if (ccs.bitMask() == bitValue)
if (ccs.pdm_bitMask == bitValue)
{
name = m_pdmDtc->trCanComponentStringName(ccs.id());
name = m_pdmDtc->trCanComponentStringName(ccs.id);
break;
}
}
@@ -172,10 +173,10 @@ void ParticipantBiteDialog::addLabel(const QString &text, int row, int column, L
void ParticipantBiteDialog::onBiteChanged(const Bite &bite)
{
if (bite.equipmentNumber() != m_eqipNr && !m_fromDetailData)
if (bite.equipmentNumber != m_eqipNr && !m_fromDetailData)
return;
m_ui->lblLastChange->setText(DTG::toStringMSec(bite.sampleTime()));
m_ui->lblLastChange->setText(DTG::toStringMSec(bite.sampleTime));
delete m_ui->scrollAreaWidgetContents->layout();
m_layout = new QGridLayout(m_ui->scrollAreaWidgetContents);
@@ -187,30 +188,30 @@ void ParticipantBiteDialog::onBiteChanged(const Bite &bite)
for (int it = 0 ; it < 32; it++)
{
quint32 bitValue = 1U << it;
row = checkArguments(((bite.biteState() & bitValue) == bitValue),
((bite.configState() & bitValue) == bitValue), bitValue, row);
row = checkArguments(((bite.biteState & bitValue) == bitValue),
((bite.configState & bitValue) == bitValue), bitValue, row);
}
row = checkArgument(bite.configError() != 0, tr("Configcheck error", "BITE CAN"), row);
row = checkArgument(bite.configError != 0, tr("Configcheck error", "BITE CAN"), row);
if (row > 0)
m_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Fixed, QSizePolicy::Fixed), row++, 0);
row = checkArgument(bite.batteryState() != 0, tr("Battery Warning", "BITE CAN"), row);
row = checkArgument(bite.batteryState != 0, tr("Battery Warning", "BITE CAN"), row);
m_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Fixed, QSizePolicy::Fixed), row++, 0);
for (const auto &bitEr : bite.biteErrors())
for (const auto &bitEr : bite.biteErrors)
{
QLabel *labl = nullptr;
if (bitEr.subdeviceNumber() != 0)
if (bitEr.subdeviceNumber != 0)
labl = new QLabel(tr("Error: %1 \nComponent: %2 \nSubdev: %3 \nUId: %4 ")
.arg(getErrorString(bitEr),
getCanDeviceName(bitEr.canDeviceNumber()),
getSubDeviceName(bitEr.subdeviceNumber()))
.arg(QString::number( bitEr.uniqueId(), 16 ).toUpper()));
getCanDeviceName(bitEr.canDeviceNumber),
getSubDeviceName(bitEr.subdeviceNumber))
.arg(QString::number( bitEr.uniqueId, 16 ).toUpper()));
else if (bitEr.canDeviceNumber() != 0)
else if (bitEr.canDeviceNumber != 0)
labl = new QLabel(tr("Error: %1 \nComponent: %2")
.arg(getErrorString(bitEr),
getCanDeviceName(bitEr.canDeviceNumber())));
getCanDeviceName(bitEr.canDeviceNumber)));
if (labl)
{
@@ -224,23 +225,23 @@ void ParticipantBiteDialog::onBiteChanged(const Bite &bite)
QString ParticipantBiteDialog::getErrorString(const ParticipantManagement::BiteError &error) const
{
const bool subDevice = (error.subdeviceNumber() != 0);
const bool subDevice = (error.subdeviceNumber != 0);
for (const ProjectDataManagement::BiteComponentText &bct : m_bctMap)
{
if (((subDevice && bct.subDeviceId() == error.subdeviceNumber()) ||
(bct.canDeviceId() == error.canDeviceNumber())) &&
(bct.errorNumber() == error.errorNumber()))
return m_pdmDtc->trBiteComponentTextName(bct.id());
if (((subDevice && bct.subDeviceId == error.subdeviceNumber) ||
(bct.canDeviceId == error.canDeviceNumber)) &&
(bct.errorNumber == error.errorNumber))
return m_pdmDtc->trBiteComponentTextName(bct.id);
}
return tr("Unknown (%1)").arg(error.errorNumber());
return tr("Unknown (%1)").arg(error.errorNumber);
}
QString ParticipantBiteDialog::getCanDeviceName(int id) const
{
for (const ProjectDataManagement::CanComponentString &ccs : m_ccsMap)
{
if (ccs.canDeviceId() == id)
return m_pdmDtc->trCanComponentStringName(ccs.id());
if (ccs.canDeviceId == id)
return m_pdmDtc->trCanComponentStringName(ccs.id);
}
return tr("Unknown (%1)").arg(id);
}
@@ -249,8 +250,8 @@ QString ParticipantBiteDialog::getSubDeviceName(int id) const
{
for (const ProjectDataManagement::CanComponentString &ccs : m_ccsMap)
{
if (ccs.subDeviceId() == id)
return m_pdmDtc->trCanComponentStringName(ccs.id());
if (ccs.subDeviceId == id)
return m_pdmDtc->trCanComponentStringName(ccs.id);
}
return tr("Unknown (%1)").arg(id);
}
@@ -10,6 +10,7 @@
#include <ParticipantManagement/logger.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_ftc.h>
#include <ProjectDataManagement/pdm_data_plugin_interface.h>
@@ -33,6 +33,7 @@ ParticipantConfigDialog::ParticipantConfigDialog(int ddsId, DialogType type, QWi
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_ui(new Ui::ParticipantConfigDialog)
, m_isTarget(false)
, m_logger(getLogger("ParticipantConfigDialog"))
{
m_ui->setupUi(this);
connect(m_ui->cbStatus, &LtsWidgets::LtsComboBox::currentTextChanged, this, &ParticipantConfigDialog::onStateAreaChanged);
@@ -85,7 +86,7 @@ ParticipantConfigDialog::ParticipantConfigDialog(int ddsId, DialogType type, QWi
m_buttonBox->getButton(LtsWidgets::DialogButton::Apply)->setText(tr("Send"));
m_ui->lblCharsLeft->setText(tr("Characters left: %1").arg(m_maxChars));
QFontMetricsF fm(m_ui->lblCharsLeft->font());
m_ui->lblCharsLeft->setFixedWidth(fm.width(m_ui->lblCharsLeft->text()));
m_ui->lblCharsLeft->setFixedWidth(fm.horizontalAdvance(m_ui->lblCharsLeft->text()));
const bool bEnableProtectionLevel = LtsUtils::ProjectSettings::isFunctionEnabled(QStringLiteral("ParticipantStatus"),
QStringLiteral("ProtectionLevel"));
@@ -203,11 +204,11 @@ bool ParticipantConfigDialog::init(LtsSession::LtsSession *session,
if (m_ddsId > 0)
{
const Participant participant = m_dtc->participant(m_ddsId);
if (participant.equipmentNumber().is_set())
m_eqId = participant.equipmentNumber().get();
if (participant.equipmentNumber.has_value())
m_eqId = participant.equipmentNumber.get();
if (!m_eqId && (m_dialogType == Config || m_dialogType == Message))
return false;
m_typeClass = m_dtc->type(participant.typeId()).typeClass();
m_typeClass = m_dtc->type(participant.typeId).typeClass;
}
else
{
@@ -238,7 +239,7 @@ bool ParticipantConfigDialog::init(LtsSession::LtsSession *session,
m_maxChars = 16;
m_ui->lblCharsLeft->setText(tr("Characters left: %1").arg(m_maxChars));
QFontMetricsF fm(m_ui->lblCharsLeft->font());
m_ui->lblCharsLeft->setFixedWidth(fm.width(m_ui->lblCharsLeft->text()));
m_ui->lblCharsLeft->setFixedWidth(fm.horizontalAdvance(m_ui->lblCharsLeft->text()));
}
if (m_dialogType == MessageMulti)
@@ -246,7 +247,7 @@ bool ParticipantConfigDialog::init(LtsSession::LtsSession *session,
m_maxChars = 16;
m_ui->lblCharsLeft->setText(tr("Characters left: %1").arg(m_maxChars));
QFontMetricsF fm(m_ui->lblCharsLeft->font());
m_ui->lblCharsLeft->setFixedWidth(fm.width(m_ui->lblCharsLeft->text()));
m_ui->lblCharsLeft->setFixedWidth(fm.horizontalAdvance(m_ui->lblCharsLeft->text()));
}
m_modeChanged = false;
@@ -278,12 +279,12 @@ bool ParticipantConfigDialog::init(LtsSession::LtsSession *session,
{
const Participant participant = m_dtc->participant(m_ddsId);
if (participant.equipmentNumber().is_set())
if (participant.equipmentNumber.has_value())
{
const Type type = m_dtc->type(participant.typeId());
const EquipmentType eqType = m_dtc->equipmentType(type.equipmentTypeId());
if (eqType.wmsTypeClass() == WmsTypeClass::TargetHuman ||
eqType.wmsTypeClass() == WmsTypeClass::TargetVehicle)
const Type type = m_dtc->type(participant.typeId);
const EquipmentType eqType = m_dtc->equipmentType(type.equipmentTypeId);
if (eqType.wmsTypeClass == WmsTypeClass::TargetHuman ||
eqType.wmsTypeClass == WmsTypeClass::TargetVehicle)
{
NOTICE_LOG(m_logger) << "isTarget = true";
m_ui->gbMode->setHidden(true);
@@ -292,7 +293,7 @@ bool ParticipantConfigDialog::init(LtsSession::LtsSession *session,
}
}
if (m_dtc->isTypeUas(participant.typeId()) && m_ddsId > 0)
if (m_dtc->isTypeUas(participant.typeId) && m_ddsId > 0)
{
m_ui->cbResetManipulation->hide();
m_ui->cbResetGearCharge->hide();
@@ -348,7 +349,7 @@ void ParticipantConfigDialog::onSelectionChanged()
{
DEBUG_LOG(m_logger) << "setChildrenSelected row =" << index.row() << " column=" << index.column();
ParticipantManagement::ParticipantData data = m_model->getParticipantData(index);
TypeClass tc = m_dtc->type(data.typeId()).typeClass();
TypeClass tc = m_dtc->type(data.typeId).typeClass;
if (tc != TypeClass::Human && tc != TypeClass::Unit)
{
@@ -381,8 +382,8 @@ void ParticipantConfigDialog::fillCbx()
m_ui->cbStatus->addItem(tr("No Change"), -1);
if ( m_isTarget)
{
m_ui->cbStatus->addItem(tr("CombatReady"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
m_ui->cbStatus->addItem(tr("Catastrophic Kill / Killed"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill);
m_ui->cbStatus->addItem(tr("CombatReady"), static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady));
m_ui->cbStatus->addItem(tr("Catastrophic Kill / Killed"), static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill));
}
else
insertVulnerabilityStates(m_ui->cbStatus, m_typeClass);
@@ -424,7 +425,7 @@ void ParticipantConfigDialog::fillVitalityCbx()
return;
bool setEnabled = false;
if (m_dialogType == Config && m_dtc->type(m_dtc->participant(m_ddsId).typeId()).typeClass() == TypeClass::Human)
if (m_dialogType == Config && m_dtc->type(m_dtc->participant(m_ddsId).typeId).typeClass == TypeClass::Human)
setEnabled = true;
switch (m_ui->cbStatus->currentData().toInt())
{
@@ -433,25 +434,25 @@ void ParticipantConfigDialog::fillVitalityCbx()
m_ui->cbVitality->setEnabled(false);
break;
}
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage:
case static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage):
{
for (int i = 90 ; i >= 70; i -= 10)
m_ui->cbVitality->addItem(QString::number(i), i);
break;
}
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage:
case static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage):
{
for (int i = 60 ; i >= 40; i -= 10)
m_ui->cbVitality->addItem(QString::number(i), i);
break;
}
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage:
case static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage):
{
for (int i = 30 ; i >= 10; i -= 10)
m_ui->cbVitality->addItem(QString::number(i), i);
break;
}
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
case static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady):
{
m_ui->cbVitality->removeItem(0);
m_ui->cbVitality->addItem(QString::number(100), 100);
@@ -501,29 +502,29 @@ void ParticipantConfigDialog::fillCbxWithActualValue()
int partId = m_dtc->participantIdByEquipmentNumber(m_eqId);
ParticipantManagement::ParticipantMode mode = m_dtc->participantMode(partId);
m_ui->cbHelmet->setCurrentIndex(m_ui->cbHelmet->findData(mode.modeHelmet().underlying()));
m_ui->cbLanguage->setCurrentIndex(m_ui->cbLanguage->findData(mode.language().underlying()));
m_ui->cbPersonalProtection->setCurrentIndex(m_ui->cbPersonalProtection->findData(mode.modePersonalProtection().underlying()));
m_ui->cbProtectionLevel->setCurrentIndex(m_ui->cbProtectionLevel->findData(mode.protectionLevel().underlying()));
m_ui->cbGrenadeSearchMode->setCurrentIndex(m_ui->cbGrenadeSearchMode->findData(mode.handgrenadeSearchMode().underlying()));
m_ui->cbInternationalMode->setCurrentIndex(m_ui->cbInternationalMode->findData(mode.internationalMode().underlying()));
m_ui->cbABCProtectionMode->setCurrentIndex(m_ui->cbABCProtectionMode->findData(mode.abcProtectionMode().underlying()));
m_ui->cbVest->setCurrentIndex(m_ui->cbVest->findData(mode.modeVest().underlying()));
m_ui->cbHelmet->setCurrentIndex(m_ui->cbHelmet->findData(static_cast<int>(mode.modeHelmet)));
m_ui->cbLanguage->setCurrentIndex(m_ui->cbLanguage->findData(static_cast<int>(mode.language)));
m_ui->cbPersonalProtection->setCurrentIndex(m_ui->cbPersonalProtection->findData(static_cast<int>(mode.modePersonalProtection)));
m_ui->cbProtectionLevel->setCurrentIndex(m_ui->cbProtectionLevel->findData(static_cast<int>(mode.protectionLevel)));
m_ui->cbGrenadeSearchMode->setCurrentIndex(m_ui->cbGrenadeSearchMode->findData(static_cast<int>(mode.handgrenadeSearchMode)));
m_ui->cbInternationalMode->setCurrentIndex(m_ui->cbInternationalMode->findData(static_cast<int>(mode.internationalMode)));
m_ui->cbABCProtectionMode->setCurrentIndex(m_ui->cbABCProtectionMode->findData(static_cast<int>(mode.abcProtectionMode)));
m_ui->cbVest->setCurrentIndex(m_ui->cbVest->findData(static_cast<int>(mode.modeVest)));
m_modeChanged = false;
m_ui->cbStatus->setCurrentIndex(0);
m_ui->cbVitality->setCurrentIndex(0);
std::vector< ParticipantManagement::StateInformation> stateHistory = m_dtc->dynamicParticipantData(partId).stateHistory();
std::vector< ParticipantManagement::StateInformation> stateHistory = m_dtc->dynamicParticipantData(partId).stateHistory;
if (stateHistory.size() > 0)
{
auto stateInfo = m_dtc->youngestStateInformation(stateHistory);
int statusIndex = m_ui->cbStatus->findData(stateInfo.vulnerabilityState().underlying());
int statusIndex = m_ui->cbStatus->findData(static_cast<int>(stateInfo.vulnerabilityState));
if(statusIndex != -1)
m_ui->cbStatus->setCurrentIndex(statusIndex);
int vitalityIndex = m_ui->cbVitality->findData(stateInfo.vitality());
int vitalityIndex = m_ui->cbVitality->findData(stateInfo.vitality);
if(vitalityIndex != -1)
m_ui->cbVitality->setCurrentIndex(vitalityIndex);
@@ -578,8 +579,8 @@ bool ParticipantConfigDialog::apply()
{
OcCommandRequest req;
req.action(m_ui->cbStatus->currentData().toInt() - 100);
req.participantIds(participantIds);
req.action = m_ui->cbStatus->currentData().toInt() - 100;
req.participantIds = participantIds;
m_ftc->ocCommandRequest(req);
}
@@ -592,12 +593,12 @@ bool ParticipantConfigDialog::apply()
m_ui->cbResetManipulation->isChecked())
{
InitParticipantRequest req;
req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
req.restockCharges(m_ui->cbResetGearCharge->isChecked());
req.resetManipulation(m_ui->cbResetManipulation->isChecked());
req.resetVulnerabilityState(state == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
req.restockSanitationMaterial(m_ui->cbResetMedSupplies->isChecked());
req.participantIds(participantIds);
req.workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
req.restockCharges = m_ui->cbResetGearCharge->isChecked();
req.resetManipulation = m_ui->cbResetManipulation->isChecked();
req.resetVulnerabilityState = state == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
req.restockSanitationMaterial = m_ui->cbResetMedSupplies->isChecked();
req.participantIds = participantIds;
m_requestHelper->addRequest([req, this]()
{
return m_ftc->initParticipantRequest(req, this);
@@ -609,12 +610,12 @@ bool ParticipantConfigDialog::apply()
if (m_ui->cbStatus->currentData().toInt() != -1 || m_ui->cbVitality->currentData().toInt() != 0)
{
ModifyStateRequest req;
req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
req.vulnerabilityState(state == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange ? ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady : state);
req.participantIds(participantIds);
req.vitality(m_ui->cbVitality->currentData().toInt());
if(req.vitality() > 0)
req.vulnerabilityKind(2048);
req.workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
req.vulnerabilityState = state == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange ? ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady : state;
req.participantIds = participantIds;
req.vitality = m_ui->cbVitality->currentData().toInt();
if(req.vitality > 0)
req.vulnerabilityKind = 2048;
m_requestHelper->addRequest([req, this]()
{
return m_ftc->modifyStateRequest(req, this);
@@ -639,7 +640,7 @@ bool ParticipantConfigDialog::apply()
}
else
{
grenadeSearch = ProjectDataManagement::HandgrenadeSearchMode::NoChange;
grenadeSearch = ProjectDataManagement::HandgrenadeSearchMode::HandgrenadeSearchMode_NoChange;
}
ProjectDataManagement::InternationalMode internationalMode = static_cast<ProjectDataManagement::InternationalMode>(m_ui->cbInternationalMode->currentData().toInt());
@@ -667,11 +668,11 @@ bool ParticipantConfigDialog::apply()
if(participantId != 0)
{
auto data = m_dtc->participant(participantId);
TypeClass tc = m_dtc->type(data.typeId()).typeClass();
TypeClass tc = m_dtc->type(data.typeId).typeClass;
if (tc != TypeClass::Human)
continue;
}
req.participantId(participantId);
req.participantId = participantId;
m_requestHelper->addRequest([req, this]()
{
return m_ftc->setParticipantModeRequest(req, this);
@@ -686,8 +687,8 @@ bool ParticipantConfigDialog::apply()
case MessageMulti:
{
SendMessageRequest req;
req.message(m_ui->teMail->toPlainText().toStdString());
req.participantIds(participantIds);
req.message = m_ui->teMail->toPlainText().toStdString();
req.participantIds = participantIds;
m_requestHelper->addRequest([req, this]()
{
return m_ftc->sendMessageRequest(req, this);
@@ -793,8 +794,8 @@ QVector<int> ParticipantConfigDialog::getParticipantIds(const QModelIndex &paren
QVector<int> ret;
const ParticipantManagement::ParticipantData dataParent(m_model->getParticipantData(parent));
if (dataParent.equipmentNumber().is_set())
ret.append(dataParent.id());
if (dataParent.equipmentNumber.has_value())
ret.append(dataParent.id);
@@ -19,6 +19,7 @@
#include <PluginInterfaces/gui_plugin_interface.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_ftc.h>
#include <ProjectDataManagement/pdm_gui_plugin_interface.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
@@ -23,7 +23,7 @@ namespace core
{
static inline uint qHash(const ParticipantManagement::TypeClass &tc)
{
return ::qHash(tc.underlying());
return ::qHash(tc);
}
}
}
@@ -39,23 +39,23 @@ static QVariant participantToQVariant(const ParticipantData &pd)
{
QByteArray ba;
QDataStream ds(&ba, QIODevice::WriteOnly);
ds << pd.id()
<< pd.partyId()
<< pd.hierarchyNumber()
<< (pd.equipmentNumber().is_set() ? pd.equipmentNumber().get() : -1)
<< pd.typeId()
<< pd.externalId()
<< QString::fromStdString(pd.symbol())
<< QString::fromStdString(pd.name())
<< QString::fromStdString(pd.identification())
<< QString::fromStdString(pd.designator())
<< QString::fromStdString(pd.tacticalIdentifier())
<< QString::fromStdString(pd.info())
<< pd.assignState().underlying()
<< pd.isSimulated()
<< pd.isDeleted()
<< pd.modId()
<< pd.superiorModId();
ds << pd.id
<< pd.partyId
<< pd.hierarchyNumber
<< (pd.equipmentNumber.has_value() ? pd.equipmentNumber.get() : -1)
<< pd.typeId
<< static_cast<long long>(pd.externalId)
<< QString::fromStdString(pd.symbol)
<< QString::fromStdString(pd.name)
<< QString::fromStdString(pd.identification)
<< QString::fromStdString(pd.designator)
<< QString::fromStdString(pd.tacticalIdentifier)
<< QString::fromStdString(pd.info)
<< pd.assignState
<< pd.isSimulated
<< pd.isDeleted
<< pd.modId
<< pd.superiorModId;
return ba;
}
@@ -87,24 +87,24 @@ static ParticipantData qVariantToParticipant(const QVariant &data)
>> modId
>> superiorModId;
pd.id(id);
pd.partyId(partyId);
pd.hierarchyNumber(hierarchyNumber);
pd.id = id;
pd.partyId = partyId;
pd.hierarchyNumber = hierarchyNumber;
if (equipmentNumber >= 0)
pd.equipmentNumber(equipmentNumber);
pd.typeId(typeId);
pd.externalId(externalId);
pd.symbol(symbol.toStdString());
pd.name(name.toStdString());
pd.identification(identification.toStdString());
pd.designator(designator.toStdString());
pd.tacticalIdentifier(tacticalIdentifier.toStdString());
pd.info(info.toStdString());
pd.assignState(static_cast<ParticipantManagement::ParticipantAssignState>(assignState));
pd.isSimulated(isSimulated);
pd.isDeleted(isDeleted);
pd.modId(modId);
pd.superiorModId(superiorModId);
pd.equipmentNumber = equipmentNumber;
pd.typeId = typeId;
pd.externalId = externalId;
pd.symbol = symbol.toStdString();
pd.name = name.toStdString();
pd.identification = identification.toStdString();
pd.designator = designator.toStdString();
pd.tacticalIdentifier = tacticalIdentifier.toStdString();
pd.info = info.toStdString();
pd.assignState = static_cast<ParticipantManagement::ParticipantAssignState>(assignState);
pd.isSimulated = isSimulated;
pd.isDeleted = isDeleted;
pd.modId = modId;
pd.superiorModId = superiorModId;
return pd;
}
@@ -123,7 +123,7 @@ bool compareStrings(const std::string &s1, const std::string &s2,
{
const int iRet = strcmp(s1.c_str(), s2.c_str());
if (iRet == 0)
return p1->participant.hierarchyNumber() < p2->participant.hierarchyNumber();
return p1->participant.hierarchyNumber < p2->participant.hierarchyNumber;
return iRet < 0;
}
@@ -151,6 +151,7 @@ ParticipantConfigModel::ParticipantConfigModel(QObject *parent,
parent,
getLogger("ParticipantConfigModel")
)
, m_logger(getLogger("ParticipantConfigModel"))
, m_partyId(-1)
, m_bRowsAreCheckable(false)
, m_bUnitsSelectable(true)
@@ -178,7 +179,7 @@ Qt::ItemFlags ParticipantConfigModel::flags(const QModelIndex &index) const
ret |= Qt::ItemIsUserCheckable;
if (!m_bUnitsSelectable && isUnitType(privateData(index)->participant.typeId()))
if (!m_bUnitsSelectable && isUnitType(privateData(index)->participant.typeId))
ret &= ~Qt::ItemIsSelectable;
if (index.column() != 0 || !index.parent().isValid())
@@ -204,7 +205,7 @@ QVariant ParticipantConfigModel::headerData(int section, Qt::Orientation orienta
for (const int typeId : m_usedTypeIds)
{
cfd.data = typeId;
cfd.text = ParticipantManagement::trTypeName(m_types.value(typeId).name());
cfd.text = ParticipantManagement::trTypeName(m_types.value(typeId).name);
cfc.data.push_back(cfd);
}
}
@@ -212,7 +213,7 @@ QVariant ParticipantConfigModel::headerData(int section, Qt::Orientation orienta
{
for (const auto &typeClassId : m_usedTypeClassIds)
{
cfd.data = typeClassId.underlying();
cfd.data = static_cast<int>(typeClassId);
cfd.text = ParticipantManagement::toString(typeClassId);
cfc.data.push_back(cfd);
}
@@ -266,47 +267,47 @@ QVariant ParticipantConfigModel::data(const QModelIndex &index, int role) const
switch (index.column())
{
case ColDesignator:
return QString::fromStdString(participantData.designator());
return QString::fromStdString(participantData.designator);
case ColIdentifier:
return QString::fromStdString(participantData.tacticalIdentifier());
return QString::fromStdString(participantData.tacticalIdentifier);
case ColTypeClass:
return typeClassStringFromTypeId(participantData.typeId());
return typeClassStringFromTypeId(participantData.typeId);
case ColType:
return ParticipantManagement::trTypeName(m_types.value(participantData.typeId()).name());
return ParticipantManagement::trTypeName(m_types.value(participantData.typeId).name);
case ColEquipmentNumber:
if (!participantData.equipmentNumber().is_set())
if (!participantData.equipmentNumber.has_value())
{
if (participantData.assignState() == ParticipantAssignState::HandoutExcon)
if (participantData.assignState == ParticipantAssignState::HandoutExcon)
return 0;
return QVariant();
}
if (participantData.assignState() == ParticipantAssignState::ExconWmsOverruled)
return tr("%1 (+)").arg(participantData.equipmentNumber().get());
if (participantData.externalId() > 0)
return tr("%1 (external)").arg(participantData.equipmentNumber().get());
return participantData.equipmentNumber().get();
if (participantData.assignState == ParticipantAssignState::ExconWmsOverruled)
return tr("%1 (+)").arg(participantData.equipmentNumber.get());
if (participantData.externalId > 0)
return tr("%1 (external)").arg(participantData.equipmentNumber.get());
return participantData.equipmentNumber.get();
case ColInfo:
return QString::fromStdString(participantData.info());
return QString::fromStdString(participantData.info);
case ColSign:
return QString::fromStdString(participantData.identification());
return QString::fromStdString(participantData.identification);
case ColProtection:
if (participantData.equipmentNumber().is_set() && m_dtc->type(participantData.typeId()).typeClass() == TypeClass::Human)
if (participantData.equipmentNumber.has_value() && m_dtc->type(participantData.typeId).typeClass == TypeClass::Human)
{
return buildProtectionString(m_dtc->participantMode(participantData.id()));
return buildProtectionString(m_dtc->participantMode(participantData.id));
}
else return QVariant();
case ColInternationalMode:
if (participantData.equipmentNumber().is_set() && m_dtc->type(participantData.typeId()).typeClass() == TypeClass::Human)
if (participantData.equipmentNumber.has_value() && m_dtc->type(participantData.typeId).typeClass == TypeClass::Human)
{
return buildInternationalModeString(m_dtc->participantMode(participantData.id()).internationalMode());
return buildInternationalModeString(m_dtc->participantMode(participantData.id).internationalMode);
}
else
return QVariant();
@@ -322,9 +323,9 @@ QVariant ParticipantConfigModel::data(const QModelIndex &index, int role) const
case LtsWidgets::LtsColumnFilterProxyModel::ComboboxFilterRole:
if (index.column() == ColTypeClass)
return typeClassIdFromTypeId(participantData.typeId()).underlying();
return static_cast<int>(typeClassIdFromTypeId(participantData.typeId));
if (index.column() == ColType)
return participantData.typeId();
return participantData.typeId;
return QVariant();
default:
@@ -367,7 +368,7 @@ bool ParticipantConfigModel::canDropMimeData(const QMimeData *data,
return false;
const CheckedTreeItem *parentItem = privateData(parent);
if (!isUnitType(parentItem->participant.typeId()))
if (!isUnitType(parentItem->participant.typeId))
return false;
DEBUG_LOG(m_logger) << "can drop on " << row << ", " << column << ", parent: "
@@ -385,7 +386,7 @@ bool ParticipantConfigModel::canDropMimeData(const QMimeData *data,
const ParticipantData pdSource = static_cast<CheckedTreeItem *>(tiSources.first())->participant;
qDeleteAll(tiSources);
TypeClass dataTypeClass = typeClassIdFromTypeId(pdSource.typeId());
TypeClass dataTypeClass = typeClassIdFromTypeId(pdSource.typeId);
bool isDataTypeClassSupport = dataTypeClass == TypeClass::SupportEntity || dataTypeClass == TypeClass::SupportUnit;
bool isOwnTypeClassSupport = m_partyId == 1;
@@ -393,9 +394,9 @@ bool ParticipantConfigModel::canDropMimeData(const QMimeData *data,
return false;
if (pdSource.partyId() == parentItem->participant.partyId())
if (pdSource.partyId == parentItem->participant.partyId)
{
const int idSource = pdSource.id();
const int idSource = pdSource.id;
if (idSource != 0 && isParentOf(parentItem, idSource))
{
@@ -425,7 +426,7 @@ bool ParticipantConfigModel::dropMimeData(const QMimeData *data, Qt::DropAction
{
CheckedTreeItem *child = static_cast<CheckedTreeItem *>(cti->child(r));
child->participant.hierarchyNumber(r + 1);
child->participant.hierarchyNumber = r + 1;
}
return true;
@@ -442,8 +443,8 @@ bool ParticipantConfigModel::onReinitModel(int partyId, const QSet<int> &checked
m_partyId = partyId;
const ParticipantManagement::Party &party = m_dtc->party(m_partyId);
m_partyRole = AdvancedSymbology::roleToRole<>(party.role());
m_partyColor = QColor::fromRgb(QRgb(party.color()));
m_partyRole = AdvancedSymbology::roleToRole<>(party.role);
m_partyColor = QColor::fromRgb(QRgb(party.color));
ParticipantIconModelBase::resetModel();
@@ -475,7 +476,7 @@ bool ParticipantConfigModel::isRowRemovable(const CheckedTreeItem *parentItem) c
if (!parentItem)
return false;
const ParticipantManagement::ParticipantData &participantData = parentItem->participant;
if (participantData.equipmentNumber().is_set() && participantData.equipmentNumber().get() > 0)
if (participantData.equipmentNumber.has_value() && participantData.equipmentNumber.get() > 0)
return false;
for (int i = 0; i < parentItem->childCount(); i++)
@@ -521,7 +522,7 @@ void ParticipantConfigModel::processMissingSuperiorId()
if (!tmap.contains(id))
continue;
const ParticipantManagement::Participant &participant = m_dtc->participant(id);
if (participant.id() != id)
if (participant.id != id)
continue;
onParticipantChanged(participant, DataModification::eModified);
@@ -532,7 +533,7 @@ void ParticipantConfigModel::processMissingSuperiorId()
for (int childId : std::as_const(childIds))
{
const ParticipantManagement::Participant &p = m_dtc->participant(childId);
if (p.id() != childId)
if (p.id != childId)
continue;
onParticipantChanged(p, DataModification::eModified);
}
@@ -550,7 +551,7 @@ void ParticipantConfigModel::selectItemByParticipantId(int participantId, const
const ParticipantManagement::ParticipantData &data = privateData(idx)->participant;
if (hasChildren(idx))
selectItemByParticipantId(participantId, selectItem, idx);
if (data.id() == participantId)
if (data.id == participantId)
return selectItem(idx);
}
return;
@@ -567,7 +568,7 @@ QModelIndexList ParticipantConfigModel::getIndexesByParticipantIds(const std::ve
if (hasChildren(idx))
indexes += getIndexesByParticipantIds(participantIds, idx);
auto it = std::find(participantIds.begin(), participantIds.end(), data.id());
auto it = std::find(participantIds.begin(), participantIds.end(), data.id);
if (it != participantIds.end())
indexes.append(idx);
}
@@ -653,7 +654,7 @@ QString ParticipantConfigModel::getHierarchyFromIndex(const QModelIndex &index)
if (!index.isValid())
return QString();
const ParticipantManagement::ParticipantData &participantData = privateData(index)->participant;
return m_dtc->hierarchyFromParticipant(participantData.id());
return m_dtc->hierarchyFromParticipant(participantData.id);
}
@@ -664,16 +665,16 @@ void ParticipantConfigModel::gatherParticipants(QHash<int, ParticipantData> &tma
{
auto cb = [this, &tmap, &parentId2id](const Participant & part)
{
if (part.isDeleted())
if (part.isDeleted)
return;
if (part.partyId() != m_partyId)
if (part.partyId != m_partyId)
return;
parentId2id[part.superiorId()] += part.id();
parentId2id[part.superiorId] += part.id;
tmap.insert(part.id(), m_dtc->convertParticipantToParticipantData(part));
tmap.insert(part.id, m_dtc->convertParticipantToParticipantData(part));
};
m_dtc->participants(cb);
}
@@ -687,16 +688,16 @@ std::vector<ParticipantData> ParticipantConfigModel::getChildrenOf(NGLTreeItem *
std::vector<ParticipantData> ret;
const CheckedTreeItem *cti = static_cast<CheckedTreeItem *>(item);
ParticipantManagement::ParticipantData participantData = cti->participant;
participantData.superiorModId(parentId);
participantData.hierarchyNumber(hierarchyNumber);
participantData.partyId(m_partyId);
if (participantData.modId() == 0)
participantData.modId(++highestModId);
participantData.superiorModId = parentId;
participantData.hierarchyNumber = hierarchyNumber;
participantData.partyId = m_partyId;
if (participantData.modId == 0)
participantData.modId = ++highestModId;
for (int i = 0; i < item->childCount(); i++)
{
const auto c = getChildrenOf(item->child(i), participantData.modId(), i + 1, bOnlyModifed, highestModId);
const auto c = getChildrenOf(item->child(i), participantData.modId, i + 1, bOnlyModifed, highestModId);
ret.insert(ret.end(), c.begin(), c.end());
}
@@ -717,28 +718,28 @@ bool ParticipantConfigModel::updateChildrenOf(int parentId,
{
ParticipantConfigModel::CheckedTreeItem *childItem = static_cast<ParticipantConfigModel::CheckedTreeItem *>(parent->child(i));
ParticipantData &pdItem = childItem->participant;
m_usedTypeIds += pdItem.typeId();
m_usedTypeClassIds += typeClassIdFromTypeId(pdItem.typeId());
if (pdItem.id() == 0)
m_usedTypeIds += pdItem.typeId;
m_usedTypeClassIds += typeClassIdFromTypeId(pdItem.typeId);
if (pdItem.id == 0)
{
const QSet<int> &childIds = parentId2id.value(parentId);
for (int childId : childIds)
{
const auto &childData = tmap.value(childId);
if (childData.hierarchyNumber() - 1 == i)
if (childData.hierarchyNumber - 1 == i)
{
pdItem.id(childData.id());
pdItem.id = childData.id;
childItem->setModified(false);
break;
}
}
}
if (!pdItem.id())
if (!pdItem.id)
{
bRet = false;
continue;
}
if (!updateChildrenOf(pdItem.id(), childItem, parentId2id, tmap))
if (!updateChildrenOf(pdItem.id, childItem, parentId2id, tmap))
bRet = false;
}
return bRet;
@@ -763,13 +764,13 @@ void ParticipantConfigModel::insertChildrenOf(int parentId,
continue;
}
const ParticipantData &data = it.value();
m_usedTypeIds += data.typeId();
m_usedTypeClassIds += typeClassIdFromTypeId(data.typeId());
m_usedTypeIds += data.typeId;
m_usedTypeClassIds += typeClassIdFromTypeId(data.typeId);
int insertPos = 0;
if (data.hierarchyNumber() > 0)
if (data.hierarchyNumber > 0)
{
auto hierIt = currentHierachyNumbers.insert(data.hierarchyNumber(), data.hierarchyNumber());
auto hierIt = currentHierachyNumbers.insert(data.hierarchyNumber, data.hierarchyNumber);
insertPos = std::distance(currentHierachyNumbers.begin(), hierIt);
}
else
@@ -782,15 +783,15 @@ void ParticipantConfigModel::insertChildrenOf(int parentId,
CheckedTreeItem *childItem = static_cast<CheckedTreeItem *>(createItem(QVariant(), QIcon()));
childItem->participant = data;
childItem->bIsChecked = isChecked(checkedParticipants.contains(data.id()), cs);
childItem->bIsChecked = isChecked(checkedParticipants.contains(data.id), cs);
DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id() << ", " << data.hierarchyNumber()
DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id << ", " << data.hierarchyNumber
<< ") to parent " << parent << " at pos " << insertPos;
insertRow(insertPos, parentIdx, childItem);
tryRenderSymbol(QString::fromStdString(data.symbol()), childItem);
tryRenderSymbol(QString::fromStdString(data.symbol), childItem);
const QModelIndex childIdx = index(insertPos, 0, parentIdx);
insertChildrenOf(data.id(), childItem, childIdx, parentId2id, tmap, checkedParticipants, cs);
insertChildrenOf(data.id, childItem, childIdx, parentId2id, tmap, checkedParticipants, cs);
}
}
@@ -801,7 +802,7 @@ bool ParticipantConfigModel::isParentOf(const NGLTreeItem *item, int participant
return false;
const CheckedTreeItem *cti = static_cast<const CheckedTreeItem *>(item);
if (cti->participant.id() == participantId)
if (cti->participant.id == participantId)
return true;
return isParentOf(item->parent(), participantId);
}
@@ -856,7 +857,7 @@ void ParticipantConfigModel::setCheckState(CheckedTreeItem *parentItem, const QS
QModelIndex ParticipantConfigModel::indexFromParticipantId(int participantId, const CheckedTreeItem *cti) const
{
if (cti->participant.id() == participantId)
if (cti->participant.id == participantId)
return indexFromItem(cti);
for (int row = 0; row < cti->childCount(); ++row)
{
@@ -870,7 +871,7 @@ QModelIndex ParticipantConfigModel::indexFromParticipantId(int participantId, co
int ParticipantConfigModel::participantIdFromItem(NGLTreeItem *item) const
{
const CheckedTreeItem *cti = static_cast<CheckedTreeItem *>(item);
return cti->participant.id();
return cti->participant.id;
}
ParticipantConfigModel::CheckedTreeItem *ParticipantConfigModel::searchParticipant(const NGLTreeItem *parentItem, int participantId) const
@@ -879,7 +880,7 @@ ParticipantConfigModel::CheckedTreeItem *ParticipantConfigModel::searchParticipa
for (int r = 0; r < rowCount; ++r)
{
CheckedTreeItem *child = static_cast<CheckedTreeItem *>(parentItem->child(r));
if (child->participant.id() == participantId)
if (child->participant.id == participantId)
return child;
child = searchParticipant(child, participantId);
if (child)
@@ -894,10 +895,10 @@ NGLTreeItem *ParticipantConfigModel::createItem(const QVariant &data, const QIco
CheckedTreeItem *cti = new CheckedTreeItem(data, icon);
cti->participant = qVariantToParticipant(data);
if (cti->participant.symbol().size() != 0)
if (cti->participant.symbol.size() != 0)
{
auto *that = const_cast<ParticipantConfigModel *>(this);
that->tryRenderSymbol(QString::fromStdString(cti->participant.symbol()), cti);
that->tryRenderSymbol(QString::fromStdString(cti->participant.symbol), cti);
}
return cti;
@@ -913,21 +914,21 @@ QVariant ParticipantConfigModel::getItemData(const NGLTreeItem *item) const
QString ParticipantConfigModel::buildProtectionString(const ParticipantMode &mode) const
{
QString protLevel;
switch(mode.protectionLevel().underlying())
switch(mode.protectionLevel)
{
case ProjectDataManagement::ProtectionLevel::IdzEs:
case ProjectDataManagement::ProtectionLevel::ProtectionLevel_IdzEs:
protLevel = tr("IdzEs");
break;
case ProjectDataManagement::ProtectionLevel::IdzBs:
case ProjectDataManagement::ProtectionLevel::ProtectionLevel_IdzBs:
protLevel = tr("IdzBs");
break;
case ProjectDataManagement::ProtectionLevel::Ksk:
case ProjectDataManagement::ProtectionLevel::ProtectionLevel_Ksk:
protLevel = tr("Ksk");
break;
case ProjectDataManagement::ProtectionLevel::SoldierWithBodyArmor:
case ProjectDataManagement::ProtectionLevel::ProtectionLevel_SoldierWithBodyArmor:
protLevel = tr("SoldierWithBodyArmor");
break;
case ProjectDataManagement::ProtectionLevel::SoldierActor:
case ProjectDataManagement::ProtectionLevel::ProtectionLevel_SoldierActor:
protLevel = tr("SoldierActor");
break;
default:
@@ -936,18 +937,18 @@ QString ParticipantConfigModel::buildProtectionString(const ParticipantMode &mod
}
return tr("%1 / %2 / %3")
.arg(buildWphModeString(mode.modeHelmet()))
.arg(buildWphModeString(mode.modeVest()))
.arg(buildWphModeString(mode.modeHelmet))
.arg(buildWphModeString(mode.modeVest))
.arg(protLevel);
}
QString ParticipantConfigModel::buildWphModeString(const ProjectDataManagement::WphMode &wphMode) const
{
switch(wphMode.underlying())
switch(wphMode)
{
case ProjectDataManagement::WphMode::Without:
case ProjectDataManagement::WphMode::WphMode_Without:
return tr("Without");
case ProjectDataManagement::WphMode::With:
case ProjectDataManagement::WphMode::WphMode_With:
return tr("With");
default:
return tr("No Change");
@@ -957,7 +958,7 @@ QString ParticipantConfigModel::buildWphModeString(const ProjectDataManagement::
QString ParticipantConfigModel::buildInternationalModeString(const ProjectDataManagement::InternationalMode &inMode) const
{
switch(inMode.underlying())
switch(inMode)
{
case ProjectDataManagement::InternationalMode::InternationalMode_On:
return tr("On");
@@ -978,17 +979,17 @@ int ParticipantConfigModel::insertParticipant(const QModelIndex &parent, Partici
const int row = rowCount(parentCol0);
if (bNewParticipant)
{
participantData.id(0);
participantData.modId(0);
participantData.id = 0;
participantData.modId = 0;
}
participantData.partyId(m_partyId);
participantData.hierarchyNumber(row + 1);
participantData.partyId = m_partyId;
participantData.hierarchyNumber = row + 1;
CheckedTreeItem *item = static_cast<CheckedTreeItem *>(createItem(participantToQVariant(participantData), QIcon()));
item->setModified(true);
if (!insertRow(row, parentCol0, item))
return -1;
tryRenderSymbol(QString::fromStdString(participantData.symbol()), item);
tryRenderSymbol(QString::fromStdString(participantData.symbol), item);
emit internalDataChanged();
return row;
}
@@ -1008,8 +1009,8 @@ bool ParticipantConfigModel::onUpdateRow(const QModelIndex &index, const Partici
if (participantData == oldData)
return true;
if (oldData.symbol() != participantData.symbol())
tryRenderSymbol(QString::fromStdString(participantData.symbol()), item);
if (oldData.symbol != participantData.symbol)
tryRenderSymbol(QString::fromStdString(participantData.symbol), item);
emit internalDataChanged();
item->participant = participantData;
@@ -1024,10 +1025,10 @@ bool ParticipantConfigModel::onDeleteRow(const QModelIndex &idx, bool isFirstIte
{
CheckedTreeItem *item = privateData(idx);
ParticipantManagement::ParticipantData data = item->participant;
data.isDeleted(true);
data.assignState() = ParticipantAssignState::NotAssigned;
data.equipmentNumber().reset();
if (data.modId() != 0)
data.isDeleted = true;
data.assignState = ParticipantAssignState::NotAssigned;
data.equipmentNumber.reset();
if (data.modId != 0)
m_dataToDelete.push_back(std::move(data));
}
removeRow(idx.row(), idx.parent());
@@ -1037,12 +1038,12 @@ bool ParticipantConfigModel::onDeleteRow(const QModelIndex &idx, bool isFirstIte
void ParticipantConfigModel::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
{
if (data.partyId() != m_partyId)
if (data.partyId != m_partyId)
return;
Q_UNUSED(modType);
CheckedTreeItem *cti = searchParticipant(m_rootItem, data.id());
CheckedTreeItem *cti = searchParticipant(m_rootItem, data.id);
if (cti)
{
cti->participant = m_dtc->convertParticipantToParticipantData(data);
@@ -1050,16 +1051,16 @@ void ParticipantConfigModel::onParticipantChanged(const ParticipantManagement::P
return;
}
CheckedTreeItem *ctiParent = searchParticipant(m_rootItem, data.superiorId());
CheckedTreeItem *ctiParent = searchParticipant(m_rootItem, data.superiorId);
if (ctiParent)
{
int insertPos = 0;
if (data.hierarchyNumber() > 0)
if (data.hierarchyNumber > 0)
{
for (int i = 0; i < ctiParent->childCount(); ++i)
{
CheckedTreeItem *child = static_cast<CheckedTreeItem *>(ctiParent->child(i));
if (child->participant.hierarchyNumber() > data.hierarchyNumber())
if (child->participant.hierarchyNumber > data.hierarchyNumber)
{
insertPos = i;
break;
@@ -1074,17 +1075,17 @@ void ParticipantConfigModel::onParticipantChanged(const ParticipantManagement::P
CheckedTreeItem *childItem = static_cast<CheckedTreeItem *>(createItem(QVariant(), QIcon()));
childItem->participant = m_dtc->convertParticipantToParticipantData(data);
DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id() << ", " << data.hierarchyNumber()
DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.id << ", " << data.hierarchyNumber
<< ") to parent " << ctiParent << " at pos " << insertPos;
insertRow(insertPos, indexFromItem(ctiParent), childItem);
tryRenderSymbol(QString::fromStdString(data.symbol()), childItem);
tryRenderSymbol(QString::fromStdString(data.symbol), childItem);
return;
}
else
{
m_missingSuperiorId.insert(data.superiorId());
m_missingSuperiorId.insert(data.superiorId);
m_missingSuperiorIdTimer->start();
}
@@ -1127,30 +1128,30 @@ bool ParticipantTreeFilterProxyConfigModel::lessThan(const QModelIndex &source_l
switch (source_left.column())
{
case ParticipantConfigModel::ColDesignator:
return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
return left->participant.hierarchyNumber < right->participant.hierarchyNumber;
case ParticipantConfigModel::ColIdentifier:
return compareStrings(left->participant.tacticalIdentifier(),
right->participant.tacticalIdentifier(),
return compareStrings(left->participant.tacticalIdentifier,
right->participant.tacticalIdentifier,
left, right);
case ParticipantConfigModel::ColTypeClass:
case ParticipantConfigModel::ColType:
break;
case ParticipantConfigModel::ColEquipmentNumber:
if (!left->participant.equipmentNumber().is_set() && !right->participant.equipmentNumber().is_set())
return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
if (!left->participant.equipmentNumber().is_set())
if (!left->participant.equipmentNumber.has_value() && !right->participant.equipmentNumber.has_value())
return left->participant.hierarchyNumber < right->participant.hierarchyNumber;
if (!left->participant.equipmentNumber.has_value())
return true;
if (!right->participant.equipmentNumber().is_set())
if (!right->participant.equipmentNumber.has_value())
return false;
return left->participant.equipmentNumber().get() < right->participant.equipmentNumber().get();
return left->participant.equipmentNumber.get() < right->participant.equipmentNumber.get();
case ParticipantConfigModel::ColInfo:
return compareStrings(left->participant.info(),
right->participant.info(),
return compareStrings(left->participant.info,
right->participant.info,
left, right);
case ParticipantConfigModel::ColSign:
return compareStrings(left->participant.identification(),
right->participant.identification(),
return compareStrings(left->participant.identification,
right->participant.identification,
left, right);
}
return LtsWidgets::LtsColumnFilterProxyModel::lessThan(source_left, source_right);
@@ -1169,7 +1170,7 @@ bool ParticipantTreeFilterProxyConfigModel::filterAcceptsRow(int source_row, con
return false;
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
if (!m_allowedTypes.contains(childItem->participant.typeId()))
if (!m_allowedTypes.contains(childItem->participant.typeId))
return false;
#else
@@ -1321,29 +1322,29 @@ bool ParticipantTableFilterProxyConfigModel::lessThan(const QModelIndex &sourceL
switch (sourceLeft.column())
{
case ParticipantConfigModel::ColDesignator:
return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
return left->participant.hierarchyNumber < right->participant.hierarchyNumber;
case ParticipantConfigModel::ColIdentifier:
return compareStrings(left->participant.tacticalIdentifier(), right->participant.tacticalIdentifier(), left, right);
return compareStrings(left->participant.tacticalIdentifier, right->participant.tacticalIdentifier, left, right);
case ParticipantConfigModel::ColTypeClass:
case ParticipantConfigModel::ColType:
return LtsWidgets::LtsColumnFilterProxyModel::lessThan(sourceLeft, sourceRight);
case ParticipantConfigModel::ColEquipmentNumber:
if (!left->participant.equipmentNumber().is_set() && !right->participant.equipmentNumber().is_set())
return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
if (!left->participant.equipmentNumber().is_set())
if (!left->participant.equipmentNumber.has_value() && !right->participant.equipmentNumber.has_value())
return left->participant.hierarchyNumber < right->participant.hierarchyNumber;
if (!left->participant.equipmentNumber.has_value())
return true;
if (!right->participant.equipmentNumber().is_set())
if (!right->participant.equipmentNumber.has_value())
return false;
return left->participant.equipmentNumber().get() < right->participant.equipmentNumber().get();
return left->participant.equipmentNumber.get() < right->participant.equipmentNumber.get();
case ParticipantConfigModel::ColInfo:
return compareStrings(left->participant.info(), right->participant.info(), left, right);
return compareStrings(left->participant.info, right->participant.info, left, right);
case ParticipantConfigModel::ColSign:
return compareStrings(left->participant.identification(), right->participant.identification(), left, right);
return compareStrings(left->participant.identification, right->participant.identification, left, right);
default:
return false;
@@ -21,6 +21,7 @@ ParticipantFollowDialog::ParticipantFollowDialog(QWidget *parent)
, m_ui(new Ui::ParticipantFollowDialog)
, m_followParticipantId(-1)
, m_followEquipmentNo(-1)
, m_logger(getLogger("ParticipantFollowDialog"))
{
m_ui->setupUi(this);
m_ui->leEquipNo->setValidator(new QIntValidator(0, 100000, m_ui->leEquipNo));
@@ -185,7 +186,7 @@ void ParticipantFollowDialog::updateObjectIndicator()
enadisa();
}
void ParticipantFollowDialog::enterEvent(QEvent *e)
void ParticipantFollowDialog::enterEvent(QEnterEvent *e)
{
BaseClass::enterEvent(e);
updateObjectIndicator();
@@ -211,11 +212,11 @@ int ParticipantFollowDialog::onSelectionChanged()
ParticipantManagement::ParticipantData data;
data = m_model->getParticipantData(index);
if (!data.equipmentNumber().is_set())
if (!data.equipmentNumber.has_value())
return -1;
enadisa();
return data.equipmentNumber().get();
return data.equipmentNumber.get();
}
void ParticipantFollowDialog::onDoubleClicked()
@@ -224,7 +225,7 @@ void ParticipantFollowDialog::onDoubleClicked()
ParticipantManagement::ParticipantData data;
data = m_model->getParticipantData(index);
m_followParticipantId = data.id();
m_followParticipantId = data.id;
m_followEquipmentNo = getEquipmentNumber(m_followParticipantId);
enadisa();
DEBUG_LOG(m_logger) << "onDoubleClicked follow Participant Id =" << m_followParticipantId
@@ -271,8 +272,8 @@ void ParticipantFollowDialog::fillMapFromDtc()
m_participantMap.clear();
auto cb = [this](const Participant & data)
{
if (data.equipmentNumber().is_set())
m_participantMap.insert(data.equipmentNumber().get(), data.id());
if (data.equipmentNumber.has_value())
m_participantMap.insert(data.equipmentNumber.get(), data.id);
};
m_dtc->participants(cb);
}
@@ -331,8 +332,8 @@ void ParticipantFollowDialog::fillParticipantMapFromTree(const QModelIndex &pare
fillParticipantMapFromTree(m_model->index(row, 0, parent));
const ParticipantManagement::ParticipantData data(m_model->getParticipantData(parent));
if (data.equipmentNumber().is_set())
m_participantMap.insert(data.equipmentNumber().get(), data.id());
if (data.equipmentNumber.has_value())
m_participantMap.insert(data.equipmentNumber.get(), data.id);
}
int ParticipantFollowDialog::getEquipmentNumber(const int participantId)
@@ -20,6 +20,7 @@
#include <PluginInterfaces/gui_plugin_interface.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
@@ -54,7 +55,7 @@ Q_SIGNALS:
private slots:
void slotLookup();
void updateObjectIndicator();
void enterEvent(QEvent *e) override;
void enterEvent(QEnterEvent *e) override;
void leaveEvent(QEvent *e) override;
private:
@@ -21,6 +21,7 @@ ParticipantGearRestock::ParticipantGearRestock(int gearId, int gearTypeId, const
, m_participant(participant)
, m_dialogMode(dialogMode)
, m_ui(new Ui::ParticipantGearRestock)
, m_logger(getLogger("ParticipantGearRestock"))
{
m_ui->setupUi(this);
@@ -36,10 +37,10 @@ ParticipantGearRestock::~ParticipantGearRestock()
void ParticipantGearRestock::retranslate()
{
QString eqNoString;
if (m_participant.equipmentNumber().is_set())
eqNoString = QString::number(m_participant.equipmentNumber().get());
if (m_participant.equipmentNumber.has_value())
eqNoString = QString::number(m_participant.equipmentNumber.get());
else
eqNoString = tr("[Participant Id: %1]").arg(m_participant.id());
eqNoString = tr("[Participant Id: %1]").arg(m_participant.id);
if (m_dialogMode == DM_Restock)
translate(m_ui, tr("Set %1's Restock Defaults of Participant %2").arg(m_pdmDtc->trGearTypeName(m_gearTypeId), eqNoString));
@@ -101,10 +102,10 @@ bool ParticipantGearRestock::init(LtsSession::LtsSession *session, bool showAllO
for (const ProjectDataManagement::GearTypeChargeType &gearType2ChargeType : m_pdmDtc->gearTypeChargeTypes())
{
if (gearType2ChargeType.gearTypeId() != m_gearTypeId)
if (gearType2ChargeType.gearTypeId != m_gearTypeId)
continue;
int chargeTypeId = gearType2ChargeType.chargeTypeId();
int chargeTypeId = gearType2ChargeType.chargeTypeId;
int maxCharge = m_pdmDtc->maxCharge(m_gearTypeId, chargeTypeId);
DEBUG_LOG(m_logger) << "maxCharge = " << maxCharge;
@@ -136,17 +137,17 @@ bool ParticipantGearRestock::init(LtsSession::LtsSession *session, bool showAllO
bool ParticipantGearRestock::apply()
{
SelectiveReammunitionRequest req;
req.id(m_participant.id());
req.gearId(m_gearId);
req.id = m_participant.id;
req.gearId = m_gearId;
for (ParticipantGearRestockCharge* pgrc : m_ui->scrollArea->findChildren<ParticipantGearRestockCharge*>())
{
Reammunition ra;
ra.chargeTypeId(pgrc->chargeTypeId());
ra.tracerRatio(0);
ra.newStock((m_dialogMode == DM_Restock || m_ui->cbRestockNow->isChecked()) ? pgrc->value() : 0xfffe);
ra.newDefaultStock(m_dialogMode == DM_SetRestockDefaults ? pgrc->value() : 0xfffe);
ra.chargeTypeId = pgrc->chargeTypeId();
ra.tracerRatio = 0;
ra.newStock = (m_dialogMode == DM_Restock || m_ui->cbRestockNow->isChecked()) ? pgrc->value() : 0xfffe;
ra.newDefaultStock = m_dialogMode == DM_SetRestockDefaults ? pgrc->value() : 0xfffe;
req.reammunition().push_back(ra);
req.reammunition.push_back(ra);
}
return m_requestHelper->startSingleRequest([req, this]()
@@ -14,6 +14,7 @@ ParticipantHistoryDialog::ParticipantHistoryDialog(QWidget *parent)
, m_proxyModel(new ParticipantHistorySortModel(this))
, m_dtc(nullptr)
, m_ui(new Ui::ParticipantHistoryDialog)
, m_logger(getLogger("ParticipantHistoryDialog"))
{
m_proxyModel->setSourceModel(m_model);
m_ui->setupUi(this);
@@ -40,8 +41,8 @@ ParticipantHistoryDialog::~ParticipantHistoryDialog()
void ParticipantHistoryDialog::retranslate()
{
const dds::core::optional<int32_t> eqId = m_dtc->participant(m_ddsId).equipmentNumber();
const QString id = (eqId.is_set() ? QString::number(eqId.get()) : QString());
const dds::core::optional<int32_t> eqId = m_dtc->participant(m_ddsId).equipmentNumber;
const QString id = (eqId.has_value() ? QString::number(eqId.get()) : QString());
translate(m_ui, id, false, tr("Participant History"));
}
@@ -62,7 +63,7 @@ bool ParticipantHistoryDialog::init(int ddsId,
if (m_model->initModel(m_ddsId, m_dtc, pdmDtc, aesDtc))
{
m_ui->tvHistory->syncSearchHeaderAndTableContentColumnSize();
bool isHuman = m_dtc->type(m_dtc->participant(m_ddsId).typeId()).typeClass() == ParticipantManagement::TypeClass::Human;
bool isHuman = m_dtc->type(m_dtc->participant(m_ddsId).typeId).typeClass == ParticipantManagement::TypeClass::Human;
const bool showPvSan = LtsUtils::ProjectSettings::isFunctionEnabled(QStringLiteral("ParticipantInformation"),
QStringLiteral("HasPvSan"));
@@ -9,6 +9,7 @@
#include <ParticipantManagement/logger.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ProjectDataManagement/pdm_data_plugin_interface.h>
#include <AreaEffectSimulation/aes_data_plugin_interface.h>
#include "participant_history_dialog_model.h"
@@ -30,6 +30,7 @@ ParticipantHistoryDialogModel::ParticipantHistoryDialogModel(QObject *parent)
, m_vulnerabilityClass(ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries)
, m_dtc(nullptr)
, m_pdmDtc(nullptr)
, m_logger(getLogger("ParticipantHistoryDialogModel"))
{}
bool ParticipantHistoryDialogModel::initModel(int dds_id,
@@ -46,13 +47,13 @@ bool ParticipantHistoryDialogModel::initModel(int dds_id,
this, &ParticipantHistoryDialogModel::onDynamicParticipantDataChanged);
const auto &part = m_dtc->participant(m_ddsId);
const auto typeClass = dtc->type(part.typeId()).typeClass();
const auto typeClass = dtc->type(part.typeId).typeClass;
m_vulnerabilityClass = (typeClass == TypeClass::Human) ?
ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
ProjectDataManagement::VulnerabilityClass::VehicleDamages;
ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries :
ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages;
reinitModel(m_dtc->dynamicParticipantData(m_ddsId).stateHistory());
reinitModel(m_dtc->dynamicParticipantData(m_ddsId).stateHistory);
return true;
}
@@ -62,19 +63,19 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c
switch (index.column())
{
case Time:
return QDateTime::fromMSecsSinceEpoch(data.stateTime());
return QDateTime::fromMSecsSinceEpoch(data.stateTime);
case VulnerabilityState:
{
if(data.originatorType().underlying() == ProjectDataManagement::StateChangeOriginator::Sanitation)
if(data.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation)
return {};
if (data.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady)
if (data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady)
return {};
std::bitset<sizeof(data.vulnerabilityBits()) * 8> bits(data.vulnerabilityBits());
bits.set(data.vulnerabilityState().underlying());
std::bitset<sizeof(data.vulnerabilityBits) * 8> bits(data.vulnerabilityBits);
bits.set(static_cast<int>(data.vulnerabilityState));
for (int i = ProjectDataManagement::VulnerabilityState::HeavyDamage; i >= 0; --i)
for (int i = static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage); i >= 0; --i)
{
if (!bits.test(i))
continue;
@@ -83,15 +84,15 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c
break;
}
if (bits.test(ProjectDataManagement::VulnerabilityState::CatastrophicKill))
if (bits.test(static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)))
{
for (int j = 0; j < ProjectDataManagement::VulnerabilityState::CatastrophicKill; ++j)
for (int j = 0; j < static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill); ++j)
bits.reset(j);
bits.reset(ProjectDataManagement::VulnerabilityState::TemporarySeverance);
bits.reset(static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance));
}
QStringList sl;
for (int i = 0; i <= ProjectDataManagement::VulnerabilityState::CContamination; ++i)
for (int i = 0; i <= static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CContamination); ++i)
{
if (!bits.test(i))
continue;
@@ -103,36 +104,36 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c
}
case Originator:
{
QString originatorType(ProjectDataManagement::toString(data.originatorType()));
QString originatorType(ProjectDataManagement::toString(data.originatorType));
QString originator;
switch (data.originatorType().underlying())
switch (data.originatorType)
{
case ProjectDataManagement::StateChangeOriginator::DusMine:
case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice:
originator = QString::number(data.originatorId() < 0 ? 0 - data.originatorId() : data.originatorId());
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_DusMine:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ImprovisedExplosiveDevice:
originator = QString::number(data.originatorId < 0 ? 0 - data.originatorId : data.originatorId);
break;
case ProjectDataManagement::StateChangeOriginator::Participant:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant:
{
if (data.originatorId() < 0)
if (data.originatorId < 0)
{
originator = QString::number(-data.originatorId());
originator = QString::number(-data.originatorId);
}
else
{
const Participant participant = m_dtc->participant(data.originatorId());
if (participant.equipmentNumber().is_set())
originator = QString::number(participant.equipmentNumber().get());
const Participant participant = m_dtc->participant(data.originatorId);
if (participant.equipmentNumber.has_value())
originator = QString::number(participant.equipmentNumber.get());
}
break;
}
case ProjectDataManagement::StateChangeOriginator::Party:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Party:
{
const Party party = m_dtc->party(data.originatorId());
originator = QString::fromStdString(party.name());
const Party party = m_dtc->party(data.originatorId);
originator = QString::fromStdString(party.name);
break;
}
case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation:
case ProjectDataManagement::StateChangeOriginator::FunctionalArea:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea:
{
if (m_aesDtc)
{
@@ -140,10 +141,10 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c
originator = m_aesDtc->aesItemNameFromEntityId(data.originatorId());
originator = m_aesDtc->aesItemNameFromEntityId(data.originatorId);
}
if (data.originatorId() == 0 && data.originatorType().underlying() == ProjectDataManagement::StateChangeOriginator::FunctionalArea)
if (data.originatorId == 0 && data.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea)
{
originatorType = tr("Autoreset");
@@ -151,45 +152,45 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c
}
break;
}
case ProjectDataManagement::StateChangeOriginator::Sanitation:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation:
{
const Participant participant = m_dtc->participant(data.originatorId());
if (participant.equipmentNumber().is_set())
originator = QString::number(participant.equipmentNumber().get());
else if (data.originatorId() < 0)
originator = QString::number(-data.originatorId());
else if (data.originatorId() == 0)
const Participant participant = m_dtc->participant(data.originatorId);
if (participant.equipmentNumber.has_value())
originator = QString::number(participant.equipmentNumber.get());
else if (data.originatorId < 0)
originator = QString::number(-data.originatorId);
else if (data.originatorId == 0)
originator = tr("Exercise Control");
QStringList san;
san += QStringLiteral("%1 (%2 - %3) - ").arg(tr("Treatment"), originator, ParticipantManagement::toString(static_cast<Qualification>(data.originatorChargeTypeId())));
san += m_pdmDtc->sanitationProceduresList(data.sanitationProceduresTaken());
san += QStringLiteral("%1 (%2 - %3) - ").arg(tr("Treatment"), originator, ParticipantManagement::toString(static_cast<Qualification>(data.originatorChargeTypeId)));
san += m_pdmDtc->sanitationProceduresList(data.sanitationProceduresTaken);
return san;
}
case ProjectDataManagement::StateChangeOriginator::ObserverController:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController:
{
QString oc;
if (data.originatorChargeTypeId() == 1 )
if (data.originatorChargeTypeId == 1 )
{
oc = tr ("9-Liner created");
}
else if (data.originatorChargeTypeId() == 2)
else if (data.originatorChargeTypeId == 2)
{
oc = tr("Qualif. Transport initiated");
}
else
oc = ProjectDataManagement::toString(data.originatorType());
oc = ProjectDataManagement::toString(data.originatorType);
if (data.originatorChargeTypeId() == 8)
if (data.originatorChargeTypeId == 8)
oc.append(tr( " - Wound increase paused"));
else if (data.originatorChargeTypeId() == 35)
else if (data.originatorChargeTypeId == 35)
oc.append(tr( " - Wound increase continued"));
return oc;
}
#ifdef GUEZ_MODE
case ProjectDataManagement::StateChangeOriginator::MedicalTimeout:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout:
{
QString mo = tr("Injury increased - ");
switch(data.sanitationResult().underlying())
switch(data.sanitationResult)
{
case SanitationResult::Unhandled:
mo.append(tr("No Care"));
@@ -204,20 +205,20 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c
mo.append(tr("Optimal Care"));
break;
default:
mo.append(ProjectDataManagement::toString(data.originatorType()));
mo.append(ProjectDataManagement::toString(data.originatorType));
}
return mo;
}
#endif
case ProjectDataManagement::StateChangeOriginator::ExerciseControl:
case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice:
case ProjectDataManagement::StateChangeOriginator::MaintainanceDevice:
case ProjectDataManagement::StateChangeOriginator::Initialization:
case ProjectDataManagement::StateChangeOriginator::Unknown:
return ProjectDataManagement::toString(data.originatorType());
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_WoundTreatmentDevice:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MaintainanceDevice:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown:
return ProjectDataManagement::toString(data.originatorType);
}
QString chargeType = m_pdmDtc->trChargeTypeShortName(data.originatorChargeTypeId());
QString chargeType = m_pdmDtc->trChargeTypeShortName(data.originatorChargeTypeId);
if (!originator.isEmpty() && !chargeType.isEmpty())
originatorType += QStringLiteral("(%1 - %2)").arg(originator, chargeType);
else if (!originator.isEmpty())
@@ -227,21 +228,21 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c
return originatorType;
}
case Vulnerability:
if(data.originatorType().underlying() == ProjectDataManagement::StateChangeOriginator::Sanitation)
if(data.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation)
return {};
if (data.vulnerabilityKindId() == 459286 && !((data.vulnerabilityBits() >> 7) & 1))
if (data.vulnerabilityKindId == 459286 && !((data.vulnerabilityBits >> 7) & 1))
return QLatin1String("-");
return m_pdmDtc->trVulnerabilityKindName(data.vulnerabilityKindId(), m_vulnerabilityClass);
return m_pdmDtc->trVulnerabilityKindName(data.vulnerabilityKindId, m_vulnerabilityClass);
case VulnerabilityBits:
return QString::number(data.vulnerabilityBits(), 16).toUpper().prepend(QStringLiteral("0x"));
return QString::number(data.vulnerabilityBits, 16).toUpper().prepend(QStringLiteral("0x"));
case Vitality:
if (data.vitality() <= 100)
return QString::number(data.vitality());
if (data.vitality <= 100)
return QString::number(data.vitality);
return QStringLiteral("--");
}
return {};
@@ -281,7 +282,7 @@ QVariant ParticipantHistoryDialogModel::data(const QModelIndex &index, int role)
void ParticipantHistoryDialogModel::onDynamicParticipantDataChanged(const DynamicParticipantData &data, DataModification modType)
{
if (m_ddsId != data.participantId())
if (m_ddsId != data.participantId)
return;
if (modType == DataModification::eRemoved)
@@ -290,7 +291,7 @@ void ParticipantHistoryDialogModel::onDynamicParticipantDataChanged(const Dynami
return;
}
reinitModel(data.stateHistory());
reinitModel(data.stateHistory);
}
void ParticipantHistoryDialogModel::reinitModel(const std::vector<ParticipantManagement::StateInformation> &newData)
@@ -321,20 +322,20 @@ bool ParticipantHistorySortModel::lessThan(const QModelIndex &source_left, const
const StateInformation &siRight = m_sourceModel->m_vecData.at(source_right.row());
if (source_left.column() == ParticipantHistoryDialogModel::Time)
{
if (siLeft.stateTime() != siRight.stateTime())
return siLeft.stateTime() < siRight.stateTime();
if (siLeft.stateTime != siRight.stateTime)
return siLeft.stateTime < siRight.stateTime;
if ( siRight.vulnerabilityState().underlying() == 8)
if ( static_cast<int>(siRight.vulnerabilityState) == 8)
return true;
if ( siLeft.vulnerabilityState().underlying() == 8)
if ( static_cast<int>(siLeft.vulnerabilityState) == 8)
return false;
return siLeft.vulnerabilityState() < siRight.vulnerabilityState();
return siLeft.vulnerabilityState < siRight.vulnerabilityState;
}
if (source_left.column() == ParticipantHistoryDialogModel::Vulnerability)
{
if (siLeft.vulnerabilityState() != siRight.vulnerabilityState())
return siLeft.vulnerabilityState() < siRight.vulnerabilityState();
return siLeft.stateTime() < siRight.stateTime();
if (siLeft.vulnerabilityState != siRight.vulnerabilityState)
return siLeft.vulnerabilityState < siRight.vulnerabilityState;
return siLeft.stateTime < siRight.stateTime;
}
return LtsWidgets::LtsColumnFilterProxyModel::lessThan(source_left, source_right);
}
@@ -6,6 +6,7 @@
#include <LtsWidgets/lts_abstract_table_model.h>
#include <LtsWidgets/lts_column_filter_proxy_model.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/logger.h>
#include <ProjectDataManagement/pdm_dtc.h>
#include <ProjectDataManagement/pdm_data_plugin_interface.h>
@@ -22,6 +22,7 @@ HitLineInfoDialog::HitLineInfoDialog(int hitLineId, QWidget *parent)
, m_pdmDtc(nullptr)
, m_sitMapGuiIfc(nullptr)
, m_ui(new Ui::HitLineInfoDialog)
, m_logger(getLogger("ParticipantHitLineInfoDialog"))
{
m_ui->setupUi(this);
@@ -67,14 +68,14 @@ bool HitLineInfoDialog::init(const std::shared_ptr<ParticipantManagement::Interf
m_dtc->hitLineInfos([this](const ParticipantManagement::HitLineInfo & data)
{
if (data.id() == m_hitLineId)
if (data.id == m_hitLineId)
{
DEBUG_LOG(m_logger) << "Found HitLine Id: " << data.id();
DEBUG_LOG(m_logger) << "Found HitLine Id: " << data.id;
m_hitLineInfo = data;
m_participantOriginator = m_dtc->participant(data.originatorParticipantId());
m_participantInjury = m_dtc->participant(data.injuryParticipantId());
m_participantOriginator = m_dtc->participant(data.originatorParticipantId);
m_participantInjury = m_dtc->participant(data.injuryParticipantId);
showHitLineInfos();
}
@@ -90,66 +91,66 @@ void HitLineInfoDialog::showHitLineInfos()
{
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id:" << m_hitLineId;
if (m_participantOriginator.id() <= 0 || m_participantInjury.id() <= 0)
if (m_participantOriginator.id <= 0 || m_participantInjury.id <= 0)
return;
m_ui->lblHitLineId->setText(QString::number(m_hitLineId));
m_ui->lblSampleTime->setText(DTG::toStringMSec(m_hitLineInfo.sampleTime()));
m_ui->lblSampleTime->setText(DTG::toStringMSec(m_hitLineInfo.sampleTime));
Participant participant = m_dtc->participant(m_participantOriginator.id());
m_ui->lblOriginatorEquipNr->setText(QString::number(participant.equipmentNumber().get()));
Participant participant = m_dtc->participant(m_participantOriginator.id);
m_ui->lblOriginatorEquipNr->setText(QString::number(participant.equipmentNumber.get()));
m_ui->lblOriginatorParty->setText(ParticipantManagement::trPartyName(m_dtc->party(m_hitLineInfo.originatorPartyId()).name()));
m_ui->lblOriginatorParty->setText(ParticipantManagement::trPartyName(m_dtc->party(m_hitLineInfo.originatorPartyId).name));
m_ui->lblOriginatorDesignator->setText(QString::fromStdString(m_participantOriginator.designator()));
m_ui->lblOriginatorDesignator->setText(QString::fromStdString(m_participantOriginator.designator));
m_ui->lblOriginatorTactIdentifier->setText(QString::fromStdString(m_participantOriginator.tacticalIdentifier()));
m_ui->lblOriginatorTactIdentifier->setText(QString::fromStdString(m_participantOriginator.tacticalIdentifier));
m_ui->lblOriginatorType->setText(ParticipantManagement::trTypeName(m_dtc->type(m_participantOriginator.typeId()).name()));
m_ui->lblOriginatorType->setText(ParticipantManagement::trTypeName(m_dtc->type(m_participantOriginator.typeId).name));
QString mgrs = LtsCoordTrans::mgrsFromGeographic(m_hitLineInfo.originatorPos().lon(), m_hitLineInfo.originatorPos().lat());
if (qFuzzyIsNull(m_hitLineInfo.originatorPos().z()))
QString mgrs = LtsCoordTrans::mgrsFromGeographic(m_hitLineInfo.originatorPos.lon, m_hitLineInfo.originatorPos.lat);
if (qFuzzyIsNull(m_hitLineInfo.originatorPos.z))
m_ui->lblOriginatorPos->setText(tr("Position: %1").arg(mgrs));
else
m_ui->lblOriginatorPos->setText(tr("Position: %1 %2").arg(mgrs).arg(m_hitLineInfo.originatorPos().z()));
m_ui->lblOriginatorPos->setText(tr("Position: %1 %2").arg(mgrs).arg(m_hitLineInfo.originatorPos.z));
participant = m_dtc->participant(m_participantInjury.id());
m_ui->lblInjuryEquipNr->setText(QString::number(participant.equipmentNumber().get()));
participant = m_dtc->participant(m_participantInjury.id);
m_ui->lblInjuryEquipNr->setText(QString::number(participant.equipmentNumber.get()));
m_ui->lblInjuryParty->setText(ParticipantManagement::trPartyName(m_dtc->party(m_participantInjury.partyId()).name()));
m_ui->lblInjuryParty->setText(ParticipantManagement::trPartyName(m_dtc->party(m_participantInjury.partyId).name));
m_ui->lblInjuryDesignator->setText(QString::fromStdString(m_participantInjury.designator()));
m_ui->lblInjuryDesignator->setText(QString::fromStdString(m_participantInjury.designator));
m_ui->lblInjuryTactIdentifier->setText(QString::fromStdString(m_participantInjury.tacticalIdentifier()));
m_ui->lblInjuryTactIdentifier->setText(QString::fromStdString(m_participantInjury.tacticalIdentifier));
m_ui->lblInjuryType->setText(ParticipantManagement::trTypeName(m_dtc->type(m_participantInjury.typeId()).name()));
m_ui->lblInjuryType->setText(ParticipantManagement::trTypeName(m_dtc->type(m_participantInjury.typeId).name));
mgrs = LtsCoordTrans::mgrsFromGeographic(m_hitLineInfo.injuryPos().lon(), m_hitLineInfo.injuryPos().lat());
if (qFuzzyIsNull(m_hitLineInfo.injuryPos().z()))
mgrs = LtsCoordTrans::mgrsFromGeographic(m_hitLineInfo.injuryPos.lon, m_hitLineInfo.injuryPos.lat);
if (qFuzzyIsNull(m_hitLineInfo.injuryPos.z))
m_ui->lblInjuryPos->setText(tr("Position: %1").arg(mgrs));
else
m_ui->lblInjuryPos->setText(tr("Position: %1 %2").arg(mgrs).arg(m_hitLineInfo.injuryPos().z()));
m_ui->lblInjuryPos->setText(tr("Position: %1 %2").arg(mgrs).arg(m_hitLineInfo.injuryPos.z));
m_typeClass = m_dtc->type(m_participantInjury.typeId()).typeClass();
m_typeClass = m_dtc->type(m_participantInjury.typeId).typeClass;
ParticipantManagement::DynamicParticipantData data = m_dtc->dynamicParticipantData(m_participantInjury.id());
ParticipantManagement::DynamicParticipantData data = m_dtc->dynamicParticipantData(m_participantInjury.id);
const ProjectDataManagement::VulnerabilityClass vc = m_typeClass == TypeClass::Human ?
ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
ProjectDataManagement::VulnerabilityClass::VehicleDamages;
ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries :
ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages;
const StateInformation &lastState = m_dtc->youngestStateInformation(data.stateHistory());
m_ui->lblInjuryStatus->setText(ProjectDataManagement::toString(lastState.vulnerabilityState(), vc));
const StateInformation &lastState = m_dtc->youngestStateInformation(data.stateHistory);
m_ui->lblInjuryStatus->setText(ProjectDataManagement::toString(lastState.vulnerabilityState, vc));
m_ui->lblChargeTypeId->setText(QString::number(m_hitLineInfo.chargeTypeId()));
m_ui->lblChargeTypeId->setText(QString::number(m_hitLineInfo.chargeTypeId));
m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(m_hitLineInfo.chargeTypeId()));
m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(m_hitLineInfo.chargeTypeId()));
m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(m_hitLineInfo.chargeTypeId));
m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(m_hitLineInfo.chargeTypeId));
m_isInitialized = true;
}
@@ -157,13 +158,13 @@ void HitLineInfoDialog::showHitLineInfos()
void HitLineInfoDialog::onFindOriginatorOnMap()
{
findOnMap(m_participantOriginator.id());
findOnMap(m_participantOriginator.id);
}
void HitLineInfoDialog::onFindInjuryOnMap()
{
findOnMap(m_participantInjury.id());
findOnMap(m_participantInjury.id);
}
@@ -9,6 +9,7 @@
#include <ParticipantManagement/logger.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ProjectDataManagement/pdm_dtc.h>
@@ -479,43 +479,43 @@ void InterfaceImpl::onNewFollowEquipment(const int equipmentNumber, const int pa
void InterfaceImpl::onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType)
{
DEBUG_LOG(m_logger) << "onParticipantPositionChanged id=" << data.participantId()
DEBUG_LOG(m_logger) << "onParticipantPositionChanged id=" << data.participantId
<< " m_followParticipantId=" << m_followParticipantId ;
if (m_followParticipantId == 0)
return;
if (modType == DataModification::eRemoved)
{
DEBUG_LOG(m_logger) << "m_participantsOutsideMap.remove participantId: " << data.participantId();
DEBUG_LOG(m_logger) << "m_participantsOutsideMap.remove participantId: " << data.participantId;
}
else
{
if (data.participantId() == m_followParticipantId)
if (data.participantId == m_followParticipantId)
{
DEBUG_LOG(m_logger) << "Center Map to participantId=" << data.participantId();
DEBUG_LOG(m_logger) << "Center Map to participantId=" << data.participantId;
DEBUG_LOG(m_logger) << "onParticipantPositionChanged()"
<< " participantId; " << data.participantId()
<< " participantTypeId: " << data.participantTypeId()
<< " partyId: " << data.partyId();
<< " participantId; " << data.participantId
<< " participantTypeId: " << data.participantTypeId
<< " partyId: " << data.partyId;
if (m_sitMapGuiIfc)
m_sitMapGuiIfc->setCenterPoint(QPointF(data.pos().lon(), data.pos().lat()));
m_sitMapGuiIfc->setCenterPoint(QPointF(data.pos.lon, data.pos.lat));
}
}
}
void InterfaceImpl::onUnitPositionChanged(const ParticipantManagement::UnitPosition &data, DataModification modType)
{
DEBUG_LOG(m_logger) << "onUnitPositionChanged id=" << data.participantId()
DEBUG_LOG(m_logger) << "onUnitPositionChanged id=" << data.participantId
<< " m_followParticipantId=" << m_followParticipantId ;
if (m_followParticipantId == 0)
return;
if (modType == DataModification::eRemoved)
return;
if (data.participantId() == m_followParticipantId)
if (data.participantId == m_followParticipantId)
{
DEBUG_LOG(m_logger) << "Center Map to participantId=" << data.participantId()
DEBUG_LOG(m_logger) << "Center Map to participantId=" << data.participantId
<< ", onUnitPositionChanged()"
<< " participantId; " << data.participantId();
<< " participantId; " << data.participantId;
if (m_sitMapGuiIfc)
{
const int operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
@@ -525,9 +525,9 @@ void InterfaceImpl::onUnitPositionChanged(const ParticipantManagement::UnitPosit
const bool bCenter = m_symbolAppearanceSettings &&
(m_symbolAppearanceSettings->settings().symbolSettings.unitSymbolPosition == FilterManagement::SymbolAppearanceSettings::UnitSymbolPosition::Center);
if (bCenter)
m_sitMapGuiIfc->setCenterPoint(QPointF(data.positionCenter().lon(), data.positionCenter().lat()));
m_sitMapGuiIfc->setCenterPoint(QPointF(data.positionCenter.lon, data.positionCenter.lat));
else
m_sitMapGuiIfc->setCenterPoint(QPointF(data.positionLeader().lon(), data.positionLeader().lat()));
m_sitMapGuiIfc->setCenterPoint(QPointF(data.positionLeader.lon, data.positionLeader.lat));
}
}
}
@@ -3,6 +3,7 @@
#pragma once
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
namespace ParticipantManagement
@@ -11,15 +12,15 @@ namespace ParticipantManagement
inline bool compareGear(const GearInformation &a,
const GearInformation &b)
{
if (a.gearId() != b.gearId())
return a.gearId() < b.gearId();
return a.chargeTypeId() < b.chargeTypeId();
if (a.gearId != b.gearId)
return a.gearId < b.gearId;
return a.chargeTypeId < b.chargeTypeId;
}
inline bool compareSanMat(const SanitationMaterial &a,
const SanitationMaterial &b)
{
return a.materialId() < b.materialId();
return a.materialId < b.materialId;
}
}
@@ -2,9 +2,11 @@
#include "participant_info_ltd_gear_component.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <QtWidgets/QTableWidget>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <LtsWidgets/lts_led_widget.h>
@@ -26,7 +28,7 @@ void ParticipantInfoLtdGearComponent::updateData(const std::vector<LaserDesignat
for (const LaserDesignation &laserDesignation : newData)
{
if (m_rowPerGearId.contains(laserDesignation.gearId()))
if (m_rowPerGearId.contains(laserDesignation.gearId))
updateRow(laserDesignation);
}
@@ -61,11 +63,11 @@ void ParticipantInfoLtdGearComponent::updateRow(const LaserDesignation &laserDes
{
TRACE_LOG(m_logger) << Q_FUNC_INFO << ": " << laserDesignation;
if (!m_rowPerGearId.contains(laserDesignation.gearId()) || !m_rowPerGearId.value(laserDesignation.gearId()).isValid())
if (!m_rowPerGearId.contains(laserDesignation.gearId) || !m_rowPerGearId.value(laserDesignation.gearId).isValid())
return;
m_rowPerGearId.value(laserDesignation.gearId()).chargeType->setText(QString::number(laserDesignation.code()));
m_rowPerGearId.value(laserDesignation.gearId()).remain->setStatus(laserDesignation.outputPower());
m_rowPerGearId.value(laserDesignation.gearId).chargeType->setText(QString::number(laserDesignation.code));
m_rowPerGearId.value(laserDesignation.gearId).remain->setStatus(laserDesignation.outputPower);
}
void ParticipantInfoLtdGearComponent::removeOutdatedData(const std::vector<LaserDesignation> &newData)
@@ -77,7 +79,7 @@ void ParticipantInfoLtdGearComponent::removeOutdatedData(const std::vector<Laser
for (auto it = m_rowPerGearId.constBegin(); it != m_rowPerGearId.constEnd(); ++it)
{
auto findIt = std::find_if(newData.begin(), newData.end(), [it](const LaserDesignation &laserDesignation) { return laserDesignation.gearId() == it.key(); });
auto findIt = std::find_if(newData.begin(), newData.end(), [it](const LaserDesignation &laserDesignation) { return laserDesignation.gearId == it.key(); });
if (findIt == newData.end())
updateRow({it.key(), {}, 0, .0});
@@ -21,6 +21,7 @@ ParticipantInfoTableDialog::ParticipantInfoTableDialog(const QString &menuGroup,
, m_infoTableModel(nullptr)
, m_sortFilterProxyModel(nullptr)
, m_visibleColumns()
, m_logger(getLogger("ParticipantInfoTableDialog"))
{
m_ui->setupUi(this);
@@ -13,6 +13,7 @@
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_participant_info_gui_plugin_interface.h>
@@ -28,6 +28,7 @@ ParticipantInfoTableModel::ParticipantInfoTableModel(QObject *parent)
, m_partitionTime(0)
, m_timeoutCheckTimer(new QTimer(this))
, m_bWithPositionandBiteResult(true)
, m_logger(getLogger("ParticipantInfoTableModel"))
{
m_timeoutCheckTimer->setSingleShot(false);
connect(m_timeoutCheckTimer, &QTimer::timeout,
@@ -83,7 +84,7 @@ void ParticipantInfoTableModel::initializeDataView()
m_vecData.clear();
auto cb = [this](const Participant &p)
{
if (!p.equipmentNumber().is_set() || p.equipmentNumber().get() == 0)
if (!p.equipmentNumber.has_value() || p.equipmentNumber.get() == 0)
return;
m_vecData += setInfoData(p);
};
@@ -131,7 +132,7 @@ QVariant ParticipantInfoTableModel::data(const QModelIndex &index, int role) con
static const QIcon yellow(QLatin1String("icon:yellow_light.svg"));
static const QIcon red(QLatin1String("icon:red_light.svg"));
switch (data.vulnerabilityState.underlying())
switch (data.vulnerabilityState)
{
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
return green;
@@ -194,7 +195,7 @@ void ParticipantInfoTableModel::updateDataView(const QSet<int> &participantIds)
std::function<bool(const ParticipantManagement::Participant &)> cb =
[this, &participantIdsToAdd](const ParticipantManagement::Participant &part)
{
auto it = participantIdsToAdd.find(part.id());
auto it = participantIdsToAdd.find(part.id);
if (it != participantIdsToAdd.end())
{
participantIdsToAdd.erase(it);
@@ -212,7 +213,7 @@ void ParticipantInfoTableModel::onParticipantChanged(const ParticipantManagement
{
DEBUG_LOG(m_logger) << "**** participantDataChanged";
const int row = findRowForId(data.participantId());
const int row = findRowForId(data.participantId);
if (row < 0)
return;
@@ -222,11 +223,11 @@ void ParticipantInfoTableModel::onParticipantChanged(const ParticipantManagement
case DataModification::eModified:
{
ParticipantInfo info = getRowData(row);
if (info.participantId != data.participantId())
if (info.participantId != data.participantId)
fillParticipantContent(info, data);
info.vulnerabilityState = m_ppmDtc->youngestStateInformation(data.stateHistory()).vulnerabilityState();
info.isManipulated = data.manipulation().size();
info.vulnerabilityState = m_ppmDtc->youngestStateInformation(data.stateHistory).vulnerabilityState;
info.isManipulated = data.manipulation.size();
setRowData(row, info);
break;
}
@@ -240,7 +241,7 @@ ParticipantInfo ParticipantInfoTableModel::setInfoData(const Participant &part)
{
ParticipantInfo data;
const int participantId = part.id();
const int participantId = part.id;
fillParticipantContent(data, part);
if (m_bWithPositionandBiteResult)
@@ -249,19 +250,19 @@ ParticipantInfo ParticipantInfoTableModel::setInfoData(const Participant &part)
std::function<bool(const ParticipantManagement::Bite &)> cbBite =
[&participantBite, participantId](const ParticipantManagement::Bite &bite)
{
if (participantId != bite.participantId())
if (participantId != bite.participantId)
return false;
participantBite = bite;
return true;
};
m_ppmDtc->bites(cbBite);
data.biteResult = biteStringFromBite(participantBite);
data.biteSampleTime = participantBite.sampleTime();
data.biteSampleTime = participantBite.sampleTime;
std::function<bool(const ParticipantManagement::ParticipantPosition &data)> cbPos =
[this, &data, participantId](const ParticipantManagement::ParticipantPosition &pos)
{
if (participantId != pos.participantId())
if (participantId != pos.participantId)
return false;
updatePosition(data, pos);
return true;
@@ -270,10 +271,10 @@ ParticipantInfo ParticipantInfoTableModel::setInfoData(const Participant &part)
}
const auto dynPart = m_ppmDtc->dynamicParticipantData(participantId);
data.vulnerabilityState = m_ppmDtc->youngestStateInformation(dynPart.stateHistory()).vulnerabilityState();
data.isManipulated = dynPart.manipulation().size() != 0;
data.designator = QString::fromStdString(part.designator());
data.tacticalIdentifier = QString::fromStdString(part.tacticalIdentifier());
data.vulnerabilityState = m_ppmDtc->youngestStateInformation(dynPart.stateHistory).vulnerabilityState;
data.isManipulated = dynPart.manipulation.size() != 0;
data.designator = QString::fromStdString(part.designator);
data.tacticalIdentifier = QString::fromStdString(part.tacticalIdentifier);
return data;
}
@@ -285,7 +286,7 @@ void ParticipantInfoTableModel::onPositionChanged(const ParticipantManagement::P
(modType != DataModification::eModified))
return;
const int row = findRowForId(position.participantId());
const int row = findRowForId(position.participantId);
if (row < 0)
return;
ParticipantInfo &info = m_vecData[row];
@@ -300,11 +301,11 @@ void ParticipantInfoTableModel::onBiteChanged(const ParticipantManagement::Bite
(modType != DataModification::eModified))
return;
const int row = findRowForId(bite.participantId());
const int row = findRowForId(bite.participantId);
if (row < 0)
return;
ParticipantInfo &info = m_vecData[row];
info.biteSampleTime = bite.sampleTime();
info.biteSampleTime = bite.sampleTime;
info.biteResult = biteStringFromBite(bite);
emit dataChanged(index(row, BiteResult), index(row, BiteResult), {Qt::BackgroundRole, Qt::DisplayRole});
@@ -321,7 +322,7 @@ void ParticipantInfoTableModel::onPartyChanged(const ParticipantManagement::Part
if (modType == DataModification::eRemoved)
return;
if (m_ppmGuiCbxIfc)
m_partyIcons[party.id()] = m_ppmGuiCbxIfc->pixmapFromParty(QColor::fromRgb(QRgb(party.color())));
m_partyIcons[party.id] = m_ppmGuiCbxIfc->pixmapFromParty(QColor::fromRgb(QRgb(party.color)));
}
void ParticipantInfoTableModel::onTimeoutCheck()
@@ -343,32 +344,32 @@ void ParticipantInfoTableModel::onTimeoutCheck()
void ParticipantInfoTableModel::fillParticipantContent(ParticipantInfo &info,
const ParticipantManagement::DynamicParticipantData &data) const
{
fillParticipantContent(info, m_ppmDtc->participant(data.participantId()));
fillParticipantContent(info, m_ppmDtc->participant(data.participantId));
}
void ParticipantInfoTableModel::fillParticipantContent(ParticipantInfo &info,
const ParticipantManagement::Participant &part) const
{
info.participantId = part.id();
info.equipmentNumber = part.equipmentNumber().is_set() ? part.equipmentNumber().get() : 0;
info.partyId = part.partyId();
info.typeClass = m_ppmDtc->type(part.typeId()).typeClass();
info.participantId = part.id;
info.equipmentNumber = part.equipmentNumber.has_value() ? part.equipmentNumber.get() : 0;
info.partyId = part.partyId;
info.typeClass = m_ppmDtc->type(part.typeId).typeClass;
}
void ParticipantInfoTableModel::updatePosition(ParticipantInfo &info,
const ParticipantManagement::ParticipantPosition &position) const
{
if (!std::isnan(position.pos().lon()) && !std::isnan(position.pos().lat()))
if (!std::isnan(position.pos.lon) && !std::isnan(position.pos.lat))
{
info.positionString = LtsCoordTrans::mgrsFromGeographic(position.pos().lon(),
position.pos().lat());
if (!qFuzzyIsNull(position.pos().z()))
info.positionString.append(QStringLiteral(" ") + QString::number(position.pos().z(), 'f', 2));
info.positionString = LtsCoordTrans::mgrsFromGeographic(position.pos.lon,
position.pos.lat);
if (!qFuzzyIsNull(position.pos.z))
info.positionString.append(QStringLiteral(" ") + QString::number(position.pos.z, 'f', 2));
}
else
info.positionString = tr("Invalid position");
info.positionSampleTime = position.sampleTime();
info.positionSampleTime = position.sampleTime;
info.isOutdated = isOutdated(info.positionSampleTime);
}
@@ -379,12 +380,12 @@ bool ParticipantInfoTableModel::isOutdated(qint64 sampleTime) const
QString ParticipantInfoTableModel::biteStringFromBite(const ParticipantManagement::Bite &bite) const
{
if (!(bite.sampleTime() > 0))
if (!(bite.sampleTime > 0))
return tr("--");
bool bitStat = bite.biteState() != bite.configState();
bool batW = bite.batteryState() > 0;
bool confError = bite.configError();
bool bitStat = bite.biteState != bite.configState;
bool batW = bite.batteryState > 0;
bool confError = bite.configError;
if (!bitStat && !batW && !confError )
return tr("Ok");
@@ -401,8 +402,8 @@ QString ParticipantInfoTableModel::biteStringFromBite(const ParticipantManagemen
QString ParticipantInfoTableModel::vulnerabilityStateString(const ParticipantInfo &data)
{
const ProjectDataManagement::VulnerabilityClass vc = data.typeClass == ParticipantManagement::TypeClass::Human ?
ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
ProjectDataManagement::VulnerabilityClass::VehicleDamages;
ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries :
ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages;
return ProjectDataManagement::toString(data.vulnerabilityState, vc);
}
@@ -19,6 +19,7 @@ ParticipantSearchDialog::ParticipantSearchDialog(QWidget *parent)
, m_dtc(nullptr)
, m_ppmCbxIfc(nullptr)
, m_ui(new Ui::ParticipantSearchDialog)
, m_logger(getLogger("ParticipantSearchDialog"))
{
m_ui->setupUi(this);
m_ui->leEquipNo->setValidator(new QIntValidator(0, 100000, m_ui->leEquipNo));
@@ -172,7 +173,7 @@ void ParticipantSearchDialog::updateObjectIndicator()
m_sitMapGuiIfc->removeObjectIndicator();
}
void ParticipantSearchDialog::enterEvent(QEvent *e)
void ParticipantSearchDialog::enterEvent(QEnterEvent *e)
{
BaseClass::enterEvent(e);
updateObjectIndicator();
@@ -198,10 +199,10 @@ int ParticipantSearchDialog::onSelectionChanged()
ParticipantManagement::ParticipantData data;
data = m_model->getParticipantData(index);
if (!data.equipmentNumber().is_set())
if (!data.equipmentNumber.has_value())
return -1;
return data.equipmentNumber().get();
return data.equipmentNumber.get();
}
void ParticipantSearchDialog::onDoubleClicked()
@@ -212,9 +213,9 @@ void ParticipantSearchDialog::onDoubleClicked()
data = m_model->getParticipantData(index);
if (m_ppmGuiIfc)
m_ppmGuiIfc->showParticipantInfoWindow(data.id());
m_ppmGuiIfc->showParticipantInfoWindow(data.id);
if (m_ocParticipantInfoIfc)
m_ocParticipantInfoIfc->showOcParticipantInfoWindow(data.id());
m_ocParticipantInfoIfc->showOcParticipantInfoWindow(data.id);
}
void ParticipantSearchDialog::clearSelections()
@@ -257,8 +258,8 @@ void ParticipantSearchDialog::fillMapFromDtc()
m_participantMap.clear();
auto cb = [this](const Participant & data)
{
if (data.equipmentNumber().is_set())
m_participantMap.insert(data.equipmentNumber().get(), data.id());
if (data.equipmentNumber.has_value())
m_participantMap.insert(data.equipmentNumber.get(), data.id);
};
m_dtc->participants(cb);
}
@@ -317,8 +318,8 @@ void ParticipantSearchDialog::fillParticipantMapFromTree(const QModelIndex &pare
fillParticipantMapFromTree(m_model->index(row, 0, parent));
const ParticipantManagement::ParticipantData data(m_model->getParticipantData(parent));
if (data.equipmentNumber().is_set())
m_participantMap.insert(data.equipmentNumber().get(), data.id());
if (data.equipmentNumber.has_value())
m_participantMap.insert(data.equipmentNumber.get(), data.id);
}
@@ -20,6 +20,7 @@
#include <PluginInterfaces/gui_plugin_interface.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
@@ -52,7 +53,7 @@ public:
private slots:
void slotLookup();
void updateObjectIndicator();
void enterEvent(QEvent *e) override;
void enterEvent(QEnterEvent *e) override;
void leaveEvent(QEvent *e) override;
private:
@@ -25,27 +25,27 @@ void ParticipantSearchWidget::onOkay()
}
void ParticipantSearchWidget::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
{
const int newEqId = data.equipmentNumber().is_set() ? data.equipmentNumber().get() : 0;
const int newEqId = data.equipmentNumber.has_value() ? data.equipmentNumber.get() : 0;
switch (modType)
{
case DataModification::eAdded:
case DataModification::eModified:
{
const int oldEqId = m_partId2EqId.value(data.id());
const int oldEqId = m_partId2EqId.value(data.id);
if (oldEqId == newEqId)
return;
if (oldEqId != 0)
m_eqId2PartId.remove(oldEqId);
if (newEqId == 0)
return;
m_partId2EqId[data.id()] = newEqId;
m_eqId2PartId[newEqId] = data.id();
m_partId2EqId[data.id] = newEqId;
m_eqId2PartId[newEqId] = data.id;
break;
}
case DataModification::eRemoved:
{
const int oldEqId = m_partId2EqId.value(data.id());
m_partId2EqId.remove(data.id());
const int oldEqId = m_partId2EqId.value(data.id);
m_partId2EqId.remove(data.id);
if (oldEqId != 0)
m_eqId2PartId.remove(oldEqId);
}
@@ -59,11 +59,11 @@ bool ParticipantSearchWidget::init(const std::shared_ptr<ParticipantManagement::
auto cb = [this](const Participant &data)
{
if (!data.equipmentNumber().is_set())
if (!data.equipmentNumber.has_value())
return;
const int newEqId = data.equipmentNumber().get();
m_partId2EqId[data.id()] = newEqId;
m_eqId2PartId[newEqId] = data.id();
const int newEqId = data.equipmentNumber.get();
m_partId2EqId[data.id] = newEqId;
m_eqId2PartId[newEqId] = data.id;
};
dtc->participants(cb);
connect(dtc.get(), &Interface::Dtc::participantChanged,
@@ -6,6 +6,7 @@
#include <QtCore/QMap>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_ftc.h>
enum class DataModification;
@@ -27,6 +27,7 @@ ParticipantSetInjuryDialog::ParticipantSetInjuryDialog(int participantId, QWidge
, m_bgBodypart(nullptr)
, m_bgSide(nullptr)
, m_ui(new Ui::ParticipantSetInjuryDialog)
, m_logger(getLogger("ParticipantSetInjuryDialog"))
{
m_ui->setupUi(this);
}
@@ -57,10 +58,10 @@ bool ParticipantSetInjuryDialog::init(LtsSession::LtsSession *session,
m_dtcPdm->waitForHistoricalDataSanitationInjuryPlace2(1000);
const Participant participant = m_dtc->participant(m_participantId);
if (participant.equipmentNumber().is_set())
m_eqId = participant.equipmentNumber().get();
if (participant.equipmentNumber.has_value())
m_eqId = participant.equipmentNumber.get();
if (m_dtc->type(participant.typeId()).typeClass() != TypeClass::Human)
if (m_dtc->type(participant.typeId).typeClass != TypeClass::Human)
return false;
auto vec = vulnerabilityStatesForTypeClass(TypeClass::Human);
if (!vec.contains(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage)
@@ -127,8 +128,8 @@ void ParticipantSetInjuryDialog::createButtonGroups()
m_bgInjury = new QButtonGroup(this);
for (const auto &injuryKind : std::as_const(m_injuryKind))
{
rb = new QRadioButton(ProjectDataManagement::trSanitationInjuryKindName(injuryKind.name()), this);
m_bgInjury->addButton(rb, injuryKind.id());
rb = new QRadioButton(ProjectDataManagement::trSanitationInjuryKindName(injuryKind.name), this);
m_bgInjury->addButton(rb, injuryKind.id);
m_ui->gbInjury->layout()->addWidget(rb);
}
@@ -139,8 +140,8 @@ void ParticipantSetInjuryDialog::createButtonGroups()
m_bgBodypart = new QButtonGroup(this);
for (const auto &injuryplace1 : std::as_const(m_injuryPlace1))
{
rb = new QRadioButton(ProjectDataManagement::trSanitationInjuryPlace1Name(injuryplace1.name()), this);
m_bgBodypart->addButton(rb, injuryplace1.id());
rb = new QRadioButton(ProjectDataManagement::trSanitationInjuryPlace1Name(injuryplace1.name), this);
m_bgBodypart->addButton(rb, injuryplace1.id);
m_ui->gbBodyPart->layout()->addWidget(rb);
}
@@ -151,29 +152,29 @@ void ParticipantSetInjuryDialog::createButtonGroups()
m_bgSide = new QButtonGroup(this);
for (const auto &injuryplace2 : std::as_const(m_injuryPlace2))
{
rb = new QRadioButton(ProjectDataManagement::trSanitationInjuryPlace2Name(injuryplace2.name()), this);
m_bgSide->addButton(rb, injuryplace2.id());
rb = new QRadioButton(ProjectDataManagement::trSanitationInjuryPlace2Name(injuryplace2.name), this);
m_bgSide->addButton(rb, injuryplace2.id);
m_ui->gbSide->layout()->addWidget(rb);
}
item = new QSpacerItem(2,2,QSizePolicy::Minimum, QSizePolicy::MinimumExpanding);
m_ui->gbSide->layout()->addItem(item);
connect(m_bgInjury, QOverload<int>::of(&QButtonGroup::buttonClicked), this, &ParticipantSetInjuryDialog::checkRadioStatesBody);
connect(m_bgBodypart, QOverload<int>::of(&QButtonGroup::buttonClicked), this, &ParticipantSetInjuryDialog::checkRadioStatesSides);
connect(m_bgInjury, &QButtonGroup::buttonClicked, this, &ParticipantSetInjuryDialog::checkRadioStatesBody);
connect(m_bgBodypart, &QButtonGroup::buttonClicked, this, &ParticipantSetInjuryDialog::checkRadioStatesSides);
}
void ParticipantSetInjuryDialog::setOldData(const DynamicParticipantData &data)
{
if (data.stateHistory().size() == 0)
if (data.stateHistory.size() == 0)
return;
const StateInformation &lastState = m_dtc->youngestStateInformation(data.stateHistory());
const StateInformation &lastState = m_dtc->youngestStateInformation(data.stateHistory);
int index = m_ui->cbState->findData(lastState.vulnerabilityState().underlying());
int index = m_ui->cbState->findData(static_cast<int>(lastState.vulnerabilityState));
DEBUG_LOG(m_logger) << "Old vulnerability state = " << index;
@@ -206,14 +207,14 @@ void ParticipantSetInjuryDialog::checkRadioStatesBody()
bool firstAvailable = true;
for (const ProjectDataManagement::SanitationInjury& injury : std::as_const(m_injuries))
{
if (injury.kind() == m_bgInjury->checkedId())
if (injury.kind == m_bgInjury->checkedId())
{
if (firstAvailable)
{
m_bgBodypart->button(injury.place1())->setChecked(true);
m_bgBodypart->button(injury.place1)->setChecked(true);
firstAvailable = false;
}
m_bgBodypart->button(injury.place1())->setEnabled(true);
m_bgBodypart->button(injury.place1)->setEnabled(true);
}
}
@@ -230,8 +231,8 @@ void ParticipantSetInjuryDialog::checkRadioStatesSides()
for (const ProjectDataManagement::SanitationInjury& injury : std::as_const(m_injuries))
{
if (injury.kind() == m_bgInjury->checkedId() && injury.place1() == m_bgBodypart->checkedId())
m_bgSide->button(injury.place2())->setEnabled(true);
if (injury.kind == m_bgInjury->checkedId() && injury.place1 == m_bgBodypart->checkedId())
m_bgSide->button(injury.place2)->setEnabled(true);
}
if(!m_bgSide->button(1)->isEnabled())
m_bgSide->button(0)->setChecked(true);
@@ -261,27 +262,27 @@ void ParticipantSetInjuryDialog::checkState()
for (const ProjectDataManagement::SanitationInjury& injury : std::as_const(m_injuries))
{
if (injury.kind() == m_bgInjury->checkedId() && injury.place1() == m_bgBodypart->checkedId() && injury.place2() == m_bgSide->checkedId())
if (injury.kind == m_bgInjury->checkedId() && injury.place1 == m_bgBodypart->checkedId() && injury.place2 == m_bgSide->checkedId())
{
switch (injury.vbg())
switch (injury.vbg)
{
case 1:
{
if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState::LightDamage) < 1)
m_ui->cbState->addItem(lightDamage, ProjectDataManagement::VulnerabilityState::LightDamage);
if (m_ui->cbState->findData(static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage)) < 1)
m_ui->cbState->addItem(lightDamage, static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage));
break;
}
case 2:
{
if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState::MediumDamage) < 1)
m_ui->cbState->addItem(mediumDamage, ProjectDataManagement::VulnerabilityState::MediumDamage);
if (m_ui->cbState->findData(static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage)) < 1)
m_ui->cbState->addItem(mediumDamage, static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage));
break;
}
case 3:
{
if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState::HeavyDamage) < 1)
m_ui->cbState->addItem(heavyDamage, ProjectDataManagement::VulnerabilityState::HeavyDamage);
if (m_ui->cbState->findData(static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage)) < 1)
m_ui->cbState->addItem(heavyDamage, static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage));
break;
}
}
@@ -323,13 +324,13 @@ bool ParticipantSetInjuryDialog::apply()
const ProjectDataManagement::VulnerabilityState state = static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cbState->currentData().toInt());
ModifyStateRequest req;
req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
req.vulnerabilityState(state);
req.participantIds({m_participantId});
req.vulnerabilityKind(getInjuryBit());
req.workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
req.vulnerabilityState = state;
req.participantIds = {m_participantId};
req.vulnerabilityKind = getInjuryBit();
DEBUG_LOG(m_logger) << "Saving vulnerability state = " << req.vulnerabilityState();
DEBUG_LOG(m_logger) << "Saving vulnerability kind = " << req.vulnerabilityKind();
DEBUG_LOG(m_logger) << "Saving vulnerability state = " << req.vulnerabilityState;
DEBUG_LOG(m_logger) << "Saving vulnerability kind = " << req.vulnerabilityKind;
return m_requestHelper->startSingleRequest([req, this]()
{
@@ -16,6 +16,7 @@
#include <PluginInterfaces/gui_plugin_interface.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_ftc.h>
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
@@ -18,6 +18,7 @@ ParticipantSetSanitationDialog::ParticipantSetSanitationDialog(int participantId
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_participantId(participantId)
, m_ui(new Ui::ParticipantSetSanitationDialog)
, m_logger(getLogger("ParticipantSetSanitationDialog"))
{
m_ui->setupUi(this);
m_uiRequirements->addRequirement({ m_ui->lbl, [this]()
@@ -60,8 +61,8 @@ bool ParticipantSetSanitationDialog::init(LtsSession::LtsSession *session, const
dtcPdm->waitForHistoricalDataSanitationProcedure(2000);
const Participant participant = m_dtc->participant(m_participantId);
if (participant.equipmentNumber().is_set())
m_eqId = participant.equipmentNumber().get();
if (participant.equipmentNumber.has_value())
m_eqId = participant.equipmentNumber.get();
fillCb();
connect(m_ui->cbQualification, qOverload<int>(&QComboBox::currentIndexChanged), this, &ParticipantSetSanitationDialog::onQualificationChanged);
@@ -95,14 +96,14 @@ void ParticipantSetSanitationDialog::fillCb()
for (const auto &proc : procs)
{
QGroupBox *box = getGroupBox(proc.type());
QGroupBox *box = getGroupBox(proc.type);
if (!box)
continue;
QCheckBox *cbx = new QCheckBox(this);
cbx->setText(ProjectDataManagement::trSanitationProcedureName(proc.name()));
cbx->setProperty("dataCode",proc.dataCode());
cbx->setProperty("qualification",proc.minimumQualification());
cbx->setText(ProjectDataManagement::trSanitationProcedureName(proc.name));
cbx->setProperty("dataCode",static_cast<qint64>(proc.dataCode));
cbx->setProperty("qualification",proc.minimumQualification);
box->layout()->addWidget(cbx);
m_procedures.append(cbx);
}
@@ -190,15 +191,15 @@ bool ParticipantSetSanitationDialog::apply()
{
SetSanitationRequest req;
req.id(m_participantId);
req.id = m_participantId;
SanitationData sanDat;
sanDat.sanitationProceduresTaken(getProcedures());
sanDat.qualification(static_cast<Qualification>(m_ui->cbQualification->currentData().toInt()));
sanDat.originatorEquipmentNumber(0);
req.data(sanDat);
sanDat.sanitationProceduresTaken = getProcedures();
sanDat.qualification = static_cast<Qualification>(m_ui->cbQualification->currentData().toInt());
sanDat.originatorEquipmentNumber = 0;
req.data = sanDat;
DEBUG_LOG(m_logger) << "Medic treatment: qualification = " << sanDat.qualification();
DEBUG_LOG(m_logger) << "Medic treatment: procedures = " << sanDat.sanitationProceduresTaken();
DEBUG_LOG(m_logger) << "Medic treatment: qualification = " << sanDat.qualification;
DEBUG_LOG(m_logger) << "Medic treatment: procedures = " << sanDat.sanitationProceduresTaken;
return m_requestHelper->startSingleRequest([req, this]()
{
@@ -10,6 +10,7 @@
#include <ParticipantManagement/logger.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_ftc.h>
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
@@ -27,15 +27,16 @@ AreaModel::AreaModel(QObject *parent)
tr("Coords")
},
parent)
, m_logger(getLogger("AreaModel"))
{}
bool AreaModel::initModel(const TargetInformation &targetInformation)
{
INFO_LOG(m_logger) << "initModel - #AreaModel: " << targetInformation.shootbackAreas().size();
INFO_LOG(m_logger) << "initModel - #AreaModel: " << targetInformation.shootbackAreas.size();
for (auto singleArea : std::as_const(targetInformation.shootbackAreas()))
for (auto singleArea : std::as_const(targetInformation.shootbackAreas))
onShootbackAreaChanged(singleArea, DataModification::eAdded);
@@ -95,7 +96,7 @@ QVariant AreaModel::data(const QModelIndex &index, int role) const
if (role == LtsWidgets::LtsColumnFilterProxyModel::ComboboxFilterRole)
{
if (index.column() == Name)
return QString::fromStdString(shootbackArea.identifier());
return QString::fromStdString(shootbackArea.identifier);
}
switch (index.column())
@@ -103,7 +104,7 @@ QVariant AreaModel::data(const QModelIndex &index, int role) const
case Id:
return 0;
case Name:
return QString::fromStdString(shootbackArea.identifier());
return QString::fromStdString(shootbackArea.identifier);
case Coords:
{
return QVariant();
@@ -126,7 +127,7 @@ void AreaModel::updateColumnFilter()
{
m_usedNames.clear();
for (const ShootbackArea &item : std::as_const(m_vecData))
m_usedNames.insert(QString::fromStdString(item.identifier()));
m_usedNames.insert(QString::fromStdString(item.identifier));
}
@@ -155,7 +156,7 @@ bool AreaProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex
case AreaModel::Columns::Name:
return left.identifier() < right.identifier();
return left.identifier < right.identifier;
@@ -5,6 +5,7 @@
#include <ParticipantManagement/logger.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <LtsWidgets/lts_abstract_table_model.h>
#include <LtsWidgets/lts_column_filter_proxy_model.h>
@@ -1,6 +1,7 @@
#include "participant_target_config_dialog.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <utility>
#include "ui_participant_target_config_dialog.h"
#include <LtsSession/lts_session_data.h>
@@ -26,7 +27,7 @@ Core::GeoPosition2D convert(const QPointF &coord)
QPointF convert(const Core::GeoPosition2D &geoPos)
{
return QPointF(geoPos.lon(), geoPos.lat());
return QPointF(geoPos.lon, geoPos.lat);
}
@@ -35,6 +36,7 @@ ParticipantTargetConfigurationDialog::ParticipantTargetConfigurationDialog(QWidg
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_ui(new Ui::ParticipantTargetConfigurationDialog)
, m_logger(getLogger("ParticipantTargetConfigurationDialog"))
{
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
m_ui->setupUi(this);
@@ -50,8 +52,8 @@ ParticipantTargetConfigurationDialog::~ParticipantTargetConfigurationDialog()
void ParticipantTargetConfigurationDialog::retranslate()
{
const dds::core::optional<int32_t> eqId = m_dtc->participant(m_participantId).equipmentNumber();
const QString id = (eqId.is_set() ? QString::number(eqId.get()) : QString());
const dds::core::optional<int32_t> eqId = m_dtc->participant(m_participantId).equipmentNumber;
const QString id = (eqId.has_value() ? QString::number(eqId.get()) : QString());
translate(m_ui, id, false, tr("Target Configuration"));
}
@@ -61,7 +63,7 @@ bool ParticipantTargetConfigurationDialog::apply()
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
ModifyTargetInformationRequest req;
req.targetInfo(m_targetInformation);
req.targetInfo = m_targetInformation;
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " update m_targetInformation: " << m_targetInformation;
@@ -129,7 +131,7 @@ bool ParticipantTargetConfigurationDialog::init(int participantId,
pdd.participantId(m_participantId);
pdd.participantId = m_participantId;
connect(m_dtc.get(), &ParticipantManagement::Interface::Dtc::dynamicParticipantDataChanged,
this, &ParticipantTargetConfigurationDialog::onDynamicParticipantDataChanged);
@@ -143,7 +145,7 @@ bool ParticipantTargetConfigurationDialog::init(int participantId,
const std::function<bool(const TargetInformation &data)> cb = [this](const TargetInformation & data) -> bool
{
if (data.participantId() == m_participantId)
if (data.participantId == m_participantId)
{
m_targetInformation = data;
return true;
@@ -152,13 +154,13 @@ bool ParticipantTargetConfigurationDialog::init(int participantId,
};
m_dtc->targetInformations(cb);
if (m_targetInformation.participantId() > 0)
if (m_targetInformation.participantId > 0)
{
onTargetInformationChanged(m_targetInformation, DataModification::eAdded);
} else {
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " targetInformation not found for participantId = " << m_participantId
<< " - use default.";
m_targetInformation.participantId(m_participantId);
m_targetInformation.participantId = m_participantId;
}
setupConnections();
@@ -174,7 +176,7 @@ bool ParticipantTargetConfigurationDialog::init(int participantId,
void ParticipantTargetConfigurationDialog::onDynamicParticipantDataChanged(const DynamicParticipantData &dynData, DataModification modType)
{
if (m_participantId != dynData.participantId())
if (m_participantId != dynData.participantId)
return;
switch (modType)
@@ -185,11 +187,11 @@ void ParticipantTargetConfigurationDialog::onDynamicParticipantDataChanged(const
case DataModification::eAdded:
case DataModification::eModified:
{
const ParticipantManagement::StateInformation &lastState = m_dtc->youngestStateInformation(dynData.stateHistory());
const ProjectDataManagement::VulnerabilityState &vulState = lastState.vulnerabilityState();
const ParticipantManagement::StateInformation &lastState = m_dtc->youngestStateInformation(dynData.stateHistory);
const ProjectDataManagement::VulnerabilityState &vulState = lastState.vulnerabilityState;
const ProjectDataManagement::VulnerabilityState vulStateType = static_cast<ProjectDataManagement::VulnerabilityState>(vulState);
int idx = m_ui->cb_status->findData(vulStateType);
int idx = m_ui->cb_status->findData(static_cast<int>(vulStateType));
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " cb_status: vulState=" << vulState;
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " cb_status: setCurrentIndex idx=" << idx;
m_ui->cb_status->setCurrentIndex(idx);
@@ -201,7 +203,7 @@ void ParticipantTargetConfigurationDialog::onDynamicParticipantDataChanged(const
void ParticipantTargetConfigurationDialog::onTargetInformationChanged(const TargetInformation &data, DataModification modType)
{
if (m_participantId != data.participantId())
if (m_participantId != data.participantId)
return;
switch (modType)
@@ -233,21 +235,21 @@ void ParticipantTargetConfigurationDialog::onStatusChanged()
if (newParticipantState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
{
InitParticipantRequest req;
req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
req.restockCharges(true);
req.resetManipulation(true);
req.resetVulnerabilityState(true);
req.participantIds({m_participantId});
req.workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
req.restockCharges = true;
req.resetManipulation = true;
req.resetVulnerabilityState = true;
req.participantIds = {m_participantId};
m_requestHelper->addRequest([req, this]()
{
return m_ftc->initParticipantRequest(req, this);
});
} else {
ModifyStateRequest req;
req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
req.vulnerabilityState(newParticipantState);
req.workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
req.vulnerabilityState = newParticipantState;
req.participantIds({m_participantId});
req.participantIds = {m_participantId};
m_requestHelper->addRequest([req, this]()
{
return m_ftc->modifyStateRequest(req, this);
@@ -301,16 +303,16 @@ void ParticipantTargetConfigurationDialog::fillStatusComboBox()
{
std::list<ProjectDataManagement::VulnerabilityState> cont;
cont = {
ProjectDataManagement::VulnerabilityState::NoChange,
ProjectDataManagement::VulnerabilityState::CombatReady,
ProjectDataManagement::VulnerabilityState::CatastrophicKill
ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange,
ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady,
ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill
};
m_ui->cb_status->clear();
for (auto item : std::as_const(cont))
{
ProjectDataManagement::VulnerabilityState st = item;
QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VehicleDamages);
QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages);
m_ui->cb_status->addItem(str, static_cast<int>(item));
}
@@ -320,17 +322,17 @@ void ParticipantTargetConfigurationDialog::fillPrewarningEffectComboBox()
{
std::list<ProjectDataManagement::VulnerabilityState> cont;
cont = {
ProjectDataManagement::VulnerabilityState::NoChange,
ProjectDataManagement::VulnerabilityState::MobilityKill,
ProjectDataManagement::VulnerabilityState::NearMiss,
ProjectDataManagement::VulnerabilityState::CatastrophicKill
ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange,
ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill,
ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss,
ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill
};
m_ui->cb_prewarningEffect->clear();
for (auto item : std::as_const(cont))
{
ProjectDataManagement::VulnerabilityState st = item;
QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VehicleDamages);
QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages);
m_ui->cb_prewarningEffect->addItem(str, static_cast<int>(item));
}
m_ui->cb_prewarningEffect->setCurrentIndex(1);
@@ -340,15 +342,15 @@ void ParticipantTargetConfigurationDialog::fillTakeDownEffectComboBox()
{
std::list<ProjectDataManagement::VulnerabilityState> cont;
cont = {
ProjectDataManagement::VulnerabilityState::MobilityKill,
ProjectDataManagement::VulnerabilityState::CatastrophicKill
ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill,
ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill
};
m_ui->cb_takeDownEffect->clear();
for (auto item : std::as_const(cont))
{
ProjectDataManagement::VulnerabilityState st = item;
QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VehicleDamages);
QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages);
m_ui->cb_takeDownEffect->addItem(str, static_cast<int>(item));
}
m_ui->cb_takeDownEffect->setCurrentIndex(1);
@@ -408,24 +410,24 @@ void ParticipantTargetConfigurationDialog::onGuiChanged()
hasChanged |= updateValue(m_targetInformation.silhouette(), m_ui->cb_silhouette->currentData().toInt());
hasChanged |= updateValue(m_targetInformation.silhouette, m_ui->cb_silhouette->currentData().toInt());
hasChanged |= updateValue(m_targetInformation.prewarningEffect(), static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cb_prewarningEffect->currentData().toInt()) );
hasChanged |= updateValue(m_targetInformation.prewarningInterval(), m_ui->sb_prewarningInterval->value());
hasChanged |= updateValue(m_targetInformation.prewarningEffect, static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cb_prewarningEffect->currentData().toInt()) );
hasChanged |= updateValue(m_targetInformation.prewarningInterval, m_ui->sb_prewarningInterval->value());
hasChanged |= updateValue(m_targetInformation.takedownEffect(), static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cb_takeDownEffect->currentData().toInt()) );
hasChanged |= updateValue(m_targetInformation.takedownInterval(), m_ui->sb_takeDownInterval->value());
hasChanged |= updateValue(m_targetInformation.takedownEffect, static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cb_takeDownEffect->currentData().toInt()) );
hasChanged |= updateValue(m_targetInformation.takedownInterval, m_ui->sb_takeDownInterval->value());
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " hasChanged=" << hasChanged;
const std::vector<ParticipantManagement::ShootbackArea> &modelAreasStdVec = m_areaModel.getDataStdVector();
if (modelAreasStdVec != m_targetInformation.shootbackAreas())
if (modelAreasStdVec != m_targetInformation.shootbackAreas)
{
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " hasChanged=" << hasChanged;
hasChanged = true;
m_targetInformation.shootbackAreas(modelAreasStdVec);
m_targetInformation.shootbackAreas = modelAreasStdVec;
}
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " slotChangesMade sChanged=" << hasChanged;
@@ -444,20 +446,20 @@ void ParticipantTargetConfigurationDialog::onDataChanged()
idx = m_ui->cb_silhouette->findData(QVariant(m_targetInformation.silhouette()));
idx = m_ui->cb_silhouette->findData(QVariant(m_targetInformation.silhouette));
m_ui->cb_silhouette->setCurrentIndex(idx);
m_ui->sb_prewarningInterval->setValue(m_targetInformation.prewarningInterval());
idx = m_ui->cb_prewarningEffect->findData(QVariant(m_targetInformation.prewarningEffect().underlying()));
m_ui->sb_prewarningInterval->setValue(m_targetInformation.prewarningInterval);
idx = m_ui->cb_prewarningEffect->findData(QVariant(static_cast<int>(m_targetInformation.prewarningEffect)));
m_ui->cb_prewarningEffect->setCurrentIndex(idx);
m_ui->sb_takeDownInterval->setValue(m_targetInformation.takedownInterval());
idx = m_ui->cb_takeDownEffect->findData(QVariant(m_targetInformation.takedownEffect().underlying()));
m_ui->sb_takeDownInterval->setValue(m_targetInformation.takedownInterval);
idx = m_ui->cb_takeDownEffect->findData(QVariant(static_cast<int>(m_targetInformation.takedownEffect)));
m_ui->cb_takeDownEffect->setCurrentIndex(idx);
const std::vector<ShootbackArea>& areas = m_targetInformation.shootbackAreas();
const std::vector<ShootbackArea>& areas = m_targetInformation.shootbackAreas;
QVector<ShootbackArea> qVec = QVector<ShootbackArea>(areas.begin(), areas.end());
m_areaModel.setData(qVec);
@@ -485,19 +487,19 @@ QPolygonF areaToPolygon(const ShootbackArea &area)
QPolygonF coordinates;
QPointF point;
point = convert(area.coord1());
point = convert(area.coord1);
if (!point.isNull())
coordinates.append(point);
point = convert(area.coord2());
point = convert(area.coord2);
if (!point.isNull())
coordinates.append(point);
point = convert(area.coord3());
point = convert(area.coord3);
if (!point.isNull())
coordinates.append(point);
point = convert(area.coord4());
point = convert(area.coord4);
if (!point.isNull())
coordinates.append(point);
return coordinates;
@@ -613,12 +615,12 @@ void ParticipantTargetConfigurationDialog::onPolygonData(const QPolygonF &poly)
ShootbackArea newArea;
newArea.coord1( convert(poly.at(0)) );
newArea.coord2( convert(poly.at(1)) );
newArea.coord1 = convert(poly.at(0));
newArea.coord2 = convert(poly.at(1));
if (poly.size() > 2)
newArea.coord3( convert(poly.at(2)) );
newArea.coord3 = convert(poly.at(2));
if (poly.size() > 3)
newArea.coord4( convert(poly.at(3)) );
newArea.coord4 = convert(poly.at(3));
if (m_rubberbandEditMode)
{
@@ -626,13 +628,13 @@ void ParticipantTargetConfigurationDialog::onPolygonData(const QPolygonF &poly)
if (!curIdx.isValid())
return;
ShootbackArea temp = m_areaModel.getRowData(curIdx.row());
newArea.identifier(temp.identifier());
newArea.identifier = temp.identifier;
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "updating newArea = " << newArea;
m_areaModel.setRowData(curIdx.row(), newArea);
} else {
int size = m_areaModel.rowCount();
newArea.identifier(QString(QStringLiteral("Area_%1")).arg(size).toStdString());
newArea.identifier = QString(QStringLiteral("Area_%1")).arg(size).toStdString();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " adding tempArea = " << newArea;
m_areaModel.insertRow(newArea);
@@ -9,6 +9,7 @@
#include <ParticipantManagement/logger.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_ftc.h>
#include <ProjectDataManagement/pdm_data_plugin_interface.h>
#include <AreaEffectSimulation/aes_data_plugin_interface.h>
@@ -13,6 +13,7 @@ ParticipantsMountedTableDialog::ParticipantsMountedTableDialog(int32_t carrierId
, m_ppmGuiIfc(nullptr)
, m_mountedTableModel(nullptr)
, m_ui(new Ui::ParticipantsMountedTableDialog)
, m_logger(getLogger("ParticipantsMountedTableDialog"))
{
m_ui->setupUi(this);
}
@@ -47,14 +48,14 @@ void ParticipantsMountedTableDialog::onShowTlnInfo()
DEBUG_LOG(m_logger) << "onDoubleClick --> showTlnInfo";
const QModelIndex idx = m_ui->tvMountedParticipants->currentIndex();
const int id = m_mountedTableModel->getRowData(idx.row()).id();
const int id = m_mountedTableModel->getRowData(idx.row()).id;
m_ppmGuiIfc->showParticipantInfoWindow(id);
}
void ParticipantsMountedTableDialog::retranslate()
{
const dds::core::optional<int32_t> eqId = m_dtc->participant(m_carrierId).equipmentNumber();
const QString id = (eqId.is_set() ? QString::number(eqId.get()) : QString());
const dds::core::optional<int32_t> eqId = m_dtc->participant(m_carrierId).equipmentNumber;
const QString id = (eqId.has_value() ? QString::number(eqId.get()) : QString());
translate(m_ui, id, false, tr("participants on vehicle"));
}
@@ -37,9 +37,9 @@ void ParticipantsMountedTableModel::reInitModel()
ParticipantPosition pos = m_dtc->participantPosition(m_carrierId);
if (pos.mountedParticipants().is_set())
for (size_t idx = 0; idx < pos.mountedParticipants().get().size(); ++idx)
insertRow(m_dtc->participant(pos.mountedParticipants().get().at(idx)));
if (pos.mountedParticipants.has_value())
for (size_t idx = 0; idx < pos.mountedParticipants.get().size(); ++idx)
insertRow(m_dtc->participant(pos.mountedParticipants.get().at(idx)));
}
QVariant ParticipantsMountedTableModel::data(const QModelIndex &index, int role) const
@@ -51,13 +51,13 @@ QVariant ParticipantsMountedTableModel::data(const QModelIndex &index, int role)
switch (index.column())
{
case 0:
return participant.equipmentNumber().is_set()?participant.equipmentNumber().get():0;
return participant.equipmentNumber.has_value()?participant.equipmentNumber.get():0;
case 1:
return ParticipantManagement::trPartyName(m_dtc->party(participant.partyId()).name());
return ParticipantManagement::trPartyName(m_dtc->party(participant.partyId).name);
case 2:
return QString::fromStdString(participant.designator());
return QString::fromStdString(participant.designator);
case 3:
return QString::fromStdString(participant.tacticalIdentifier());
return QString::fromStdString(participant.tacticalIdentifier);
default:
break;
}
@@ -68,7 +68,7 @@ QVariant ParticipantsMountedTableModel::data(const QModelIndex &index, int role)
void ParticipantsMountedTableModel::onPositionChanged(const ParticipantPosition &data, DataModification modType)
{
if (modType != DataModification::eRemoved)
if (data.participantId() == m_carrierId)
if (data.participantId == m_carrierId)
reInitModel();
}
@@ -5,6 +5,7 @@
#include <LtsWidgets/lts_abstract_table_model.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
namespace ParticipantManagement {