Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
+4
-4
@@ -71,20 +71,20 @@ if(QT6_GUI_AVAILABLE)
|
||||
LtsSession
|
||||
${Qt6_Widgets}
|
||||
NGLLogger
|
||||
AsbDataPluginInterface
|
||||
ExmDataPluginInterface
|
||||
advancedSymbologyGui
|
||||
LtsUtilsSettings
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
${Qt6_Gui}
|
||||
nglwidgets
|
||||
svcPpmCommon
|
||||
LtsDataView
|
||||
LtsUtilsGuiDds
|
||||
)
|
||||
endif()
|
||||
|
||||
# Optional: External dependencies (not available in migration context)
|
||||
# target_link_libraries(PpmCommon PRIVATE AsbDataPluginInterface ExmDataPluginInterface advancedSymbologyGui)
|
||||
# target_link_libraries(PpmCommon PUBLIC svcPpmCommon)
|
||||
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(PpmCommon
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../../..
|
||||
|
||||
+2
-2
@@ -47,7 +47,7 @@ DistypeEditor::DistypeEditor(QWidget *parent,
|
||||
}
|
||||
|
||||
for (const auto &typeClassId : setTypeClasses)
|
||||
mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeClassId), typeClassId.underlying());
|
||||
mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeClassId), typeClassId);
|
||||
|
||||
slotTypeClassChanged();
|
||||
|
||||
@@ -111,7 +111,7 @@ void DistypeEditor::slotTypeClassChanged()
|
||||
|
||||
for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
|
||||
{
|
||||
if (type.typeClass().underlying() != currentTypeClass)
|
||||
if (type.typeClass() != currentTypeClass)
|
||||
continue;
|
||||
|
||||
mUi->m_ltsComboBox_type->addItem(LtsUtils::str2QString(type.name()), type.id());
|
||||
|
||||
+1
@@ -9,6 +9,7 @@
|
||||
#include <memory>
|
||||
#include <Common/participant_dis_type_edit.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
|
||||
+7
-7
@@ -38,19 +38,19 @@ DISTypeEdit::DISTypeEdit(QWidget *parent,
|
||||
|
||||
auto cbTypes = [this] (const ParticipantManagement::Type &type)
|
||||
{
|
||||
m_mapTypes[type.id()] = type;
|
||||
const ParticipantManagement::TypeClass &typeClassId = type.typeClass();
|
||||
m_mapTypes[type.id] = type;
|
||||
const ParticipantManagement::TypeClass &typeClassId = type.typeClass;
|
||||
|
||||
if (typeClassId == ParticipantManagement::TypeClass::SupportUnit || typeClassId == ParticipantManagement::TypeClass::SupportEntity)
|
||||
return;
|
||||
|
||||
|
||||
for (const auto &disId : type.disEntities())
|
||||
for (const auto &disId : type.disEntities)
|
||||
{
|
||||
if (m_usedDisTypes.contains(disId))
|
||||
continue;
|
||||
|
||||
m_DisEntitiesByType[type.id()] << disId;
|
||||
m_DisEntitiesByType[type.id] << disId;
|
||||
|
||||
|
||||
|
||||
@@ -122,9 +122,9 @@ bool DISTypeEdit::apply()
|
||||
for(int32_t typeId : std::as_const(m_setTouchedTypes))
|
||||
{
|
||||
Type &touchedType = m_mapTypes[typeId];
|
||||
touchedType.disEntities().clear();
|
||||
touchedType.disEntities.clear();
|
||||
for (int64_t disId : std::as_const(m_DisEntitiesByType[typeId]))
|
||||
touchedType.disEntities().push_back(disId);
|
||||
touchedType.disEntities.push_back(disId);
|
||||
|
||||
m_requestHelper->addRequest([this, touchedType]()
|
||||
{
|
||||
@@ -211,7 +211,7 @@ void DISTypeEdit::slotAddDistype()
|
||||
{
|
||||
const ParticipantManagement::Type& type = m_mapTypes[oldTypeId];
|
||||
|
||||
LtsWidgets::Button button = LtsWidgets::LtsMessageDialog::showMessage(this, tr("Specified DIS type is already mapped to:\nType id: %1\nName: \"%2\"\nType class: \"%3\".\nDo you want to change this mapping?").arg(QString::number(type.id()), QString::fromStdString(type.name()), ParticipantManagement::toString(type.typeClass())), tr("DIS type already in use"),
|
||||
LtsWidgets::Button button = LtsWidgets::LtsMessageDialog::showMessage(this, tr("Specified DIS type is already mapped to:\nType id: %1\nName: \"%2\"\nType class: \"%3\".\nDo you want to change this mapping?").arg(QString::number(type.id), QString::fromStdString(type.name), ParticipantManagement::toString(type.typeClass)), tr("DIS type already in use"),
|
||||
LtsWidgets::Behaviour::Modal, LtsWidgets::Button::Yes | LtsWidgets::Button::No);
|
||||
|
||||
if (button == LtsWidgets::Button::No)
|
||||
|
||||
+1
@@ -4,6 +4,7 @@
|
||||
|
||||
#include <ppmcommon_export.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <Services/ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
+4
-4
@@ -37,7 +37,7 @@ DistypeEditor::DistypeEditor(QWidget *parent,
|
||||
|
||||
for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
|
||||
{
|
||||
const ParticipantManagement::TypeClass typeClassId = type.typeClass();
|
||||
const ParticipantManagement::TypeClass typeClassId = type.typeClass;
|
||||
|
||||
if (typeClassId == ParticipantManagement::TypeClass::SupportUnit || typeClassId == ParticipantManagement::TypeClass::SupportEntity)
|
||||
continue;
|
||||
@@ -46,7 +46,7 @@ DistypeEditor::DistypeEditor(QWidget *parent,
|
||||
}
|
||||
|
||||
for (const auto &typeClassId : setTypeClasses)
|
||||
mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeClassId), typeClassId.underlying());
|
||||
mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeClassId), static_cast<int>(typeClassId));
|
||||
|
||||
slotTypeClassChanged();
|
||||
|
||||
@@ -110,10 +110,10 @@ void DistypeEditor::slotTypeClassChanged()
|
||||
|
||||
for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
|
||||
{
|
||||
if (type.typeClass().underlying() != currentTypeClass)
|
||||
if (static_cast<int>(type.typeClass) != currentTypeClass)
|
||||
continue;
|
||||
|
||||
mUi->m_ltsComboBox_type->addItem(QString::fromStdString(type.name()), type.id());
|
||||
mUi->m_ltsComboBox_type->addItem(QString::fromStdString(type.name), type.id);
|
||||
}
|
||||
|
||||
slotTypeChanged();
|
||||
|
||||
+1
@@ -8,6 +8,7 @@
|
||||
#include <memory>
|
||||
#include <Common/participant_dis_type_edit.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
|
||||
+57
-57
@@ -36,9 +36,9 @@ bool ParticipantEditItemWidget::init(const QModelIndex &workingIndex,
|
||||
{
|
||||
m_isOrgChart = isOrgChart;
|
||||
m_editData = data;
|
||||
m_currentAssignState = data.assignState();
|
||||
m_currentAssignState = data.assignState;
|
||||
m_partyId = partyId;
|
||||
m_bEditMode = m_editData.typeId() > 0;
|
||||
m_bEditMode = m_editData.typeId > 0;
|
||||
m_workingIndex = workingIndex;
|
||||
m_alreadyAddedEquipmentNumbers = usedEquipmentNumbers;
|
||||
|
||||
@@ -63,8 +63,8 @@ void ParticipantEditItemWidget::setFiringUnitRestrictions(ParticipantEditModel *
|
||||
if (allowedType == Type())
|
||||
return;
|
||||
|
||||
m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(allowedType.typeClass().underlying()));
|
||||
m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(allowedType.id()));
|
||||
m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(static_cast<int>(allowedType.typeClass)));
|
||||
m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(allowedType.id));
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -77,27 +77,27 @@ void ParticipantEditItemWidget::setFiringUnitRestrictions(ParticipantEditModel *
|
||||
const QVector<Type> allowedTypes = firingUnitValidator->artilleryParticipantTypes();
|
||||
|
||||
m_ui->cbTypeClass->setDisabled(true);
|
||||
m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(allowedTypes.at(0).typeClass().underlying()));
|
||||
m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(static_cast<int>(allowedTypes.at(0).typeClass)));
|
||||
|
||||
m_ui->cbType->clear();
|
||||
|
||||
std::function<bool(Type)> funcIsSameGearType = [=](const Type &t)
|
||||
{
|
||||
if (m_isAdler)
|
||||
return m_dtc->isAdlerType(t.id()) && (firingUnitValidator->getGearClassType(t.id()) == unitGearClassType);
|
||||
return firingUnitValidator->getGearClassType(t.id()) == unitGearClassType;
|
||||
return m_dtc->isAdlerType(t.id) && (static_cast<int>(firingUnitValidator->getGearClassType(t.id)) == unitGearClassType);
|
||||
return static_cast<int>(firingUnitValidator->getGearClassType(t.id)) == unitGearClassType;
|
||||
};
|
||||
QVector<Type>::ConstIterator typeIterator = std::find_if(allowedTypes.begin(), allowedTypes.end(), funcIsSameGearType);
|
||||
|
||||
if(typeIterator != allowedTypes.end())
|
||||
{
|
||||
m_ui->cbType->setDisabled(true);
|
||||
m_ui->cbType->addItem(ParticipantManagement::trTypeName(typeIterator->name()), typeIterator->id());
|
||||
m_ui->cbType->addItem(ParticipantManagement::trTypeName(typeIterator->name), typeIterator->id);
|
||||
}
|
||||
else
|
||||
{
|
||||
for (const Type ¤tType : allowedTypes)
|
||||
m_ui->cbType->addItem(ParticipantManagement::trTypeName(currentType.name()), currentType.id());
|
||||
m_ui->cbType->addItem(ParticipantManagement::trTypeName(currentType.name), currentType.id);
|
||||
m_ui->cbType->model()->sort(0);
|
||||
}
|
||||
|
||||
@@ -151,44 +151,44 @@ void ParticipantEditItemWidget::setFiringUnitRestrictions(ParticipantEditModel *
|
||||
|
||||
void ParticipantEditItemWidget::setData()
|
||||
{
|
||||
m_ui->leDesignator->setText(QString::fromStdString(m_editData.designator()));
|
||||
m_ui->leTactIdent->setText(QString::fromStdString(m_editData.tacticalIdentifier()));
|
||||
m_ui->leInfo->setText(QString::fromStdString(m_editData.info()));
|
||||
m_ui->leSign->setText(QString::fromStdString(m_editData.identification()));
|
||||
m_ui->cbExternal->setChecked(m_editData.externalId() > 0);
|
||||
m_ui->leVerein->setText(QString::fromStdString(m_editData.name()));
|
||||
m_ui->leDesignator->setText(QString::fromStdString(m_editData.designator));
|
||||
m_ui->leTactIdent->setText(QString::fromStdString(m_editData.tacticalIdentifier));
|
||||
m_ui->leInfo->setText(QString::fromStdString(m_editData.info));
|
||||
m_ui->leSign->setText(QString::fromStdString(m_editData.identification));
|
||||
m_ui->cbExternal->setChecked(m_editData.externalId > 0);
|
||||
m_ui->leVerein->setText(QString::fromStdString(m_editData.name));
|
||||
|
||||
Type type = m_dtc->type(m_editData.typeId());
|
||||
m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(type.typeClass().underlying()));
|
||||
m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(type.id()));
|
||||
Type type = m_dtc->type(m_editData.typeId);
|
||||
m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(static_cast<int>(type.typeClass)));
|
||||
m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(type.id));
|
||||
|
||||
|
||||
setAssignmentButton();
|
||||
|
||||
if (isUnitType(m_editData.typeId()))
|
||||
if (isUnitType(m_editData.typeId))
|
||||
{
|
||||
m_ui->cbTypeClass->setEnabled(false);
|
||||
m_ui->sbEquipNr->setEnabled(false);
|
||||
m_ui->tbAssignment->setEnabled(false);
|
||||
|
||||
bool showVerein = m_dtc->isAdlerType(m_editData.typeId());
|
||||
bool showVerein = m_dtc->isAdlerType(m_editData.typeId);
|
||||
m_ui->lblVerein->setVisible(showVerein);
|
||||
m_ui->leVerein->setVisible(showVerein);
|
||||
}
|
||||
else
|
||||
{
|
||||
const bool isEquipped = m_editData.equipmentNumber().is_set() && m_editData.equipmentNumber().get() > 0;
|
||||
const bool isEquipped = m_editData.equipmentNumber.has_value() && m_editData.equipmentNumber.get() > 0;
|
||||
m_ui->cbTypeClass->setEnabled(!isEquipped);
|
||||
m_ui->cbType->setEnabled(!isEquipped);
|
||||
m_ui->sbEquipNr->setEnabled(m_editData.typeId() > 0);
|
||||
m_ui->sbEquipNr->setEnabled(m_editData.typeId > 0);
|
||||
}
|
||||
|
||||
if (m_editData.equipmentNumber().is_set())
|
||||
m_ui->sbEquipNr->setValue(m_editData.equipmentNumber().get());
|
||||
onChangeSymbol(QString::fromStdString(m_editData.symbol()));
|
||||
if (m_editData.equipmentNumber.has_value())
|
||||
m_ui->sbEquipNr->setValue(m_editData.equipmentNumber.get());
|
||||
onChangeSymbol(QString::fromStdString(m_editData.symbol));
|
||||
|
||||
|
||||
if (m_editData.externalId() > 0)
|
||||
if (m_editData.externalId > 0)
|
||||
{
|
||||
m_ui->leTactIdent->setEnabled(false);
|
||||
m_ui->sbEquipNr->setEnabled(false);
|
||||
@@ -200,8 +200,8 @@ void ParticipantEditItemWidget::setData()
|
||||
|
||||
void ParticipantEditItemWidget::setDesignatorData()
|
||||
{
|
||||
m_ui->leDesignator->setText(QString::fromStdString(m_editData.designator()));
|
||||
m_ui->leTactIdent->setText(QString::fromStdString(m_editData.tacticalIdentifier()));
|
||||
m_ui->leDesignator->setText(QString::fromStdString(m_editData.designator));
|
||||
m_ui->leTactIdent->setText(QString::fromStdString(m_editData.tacticalIdentifier));
|
||||
}
|
||||
|
||||
void ParticipantEditItemWidget::onAddItem()
|
||||
@@ -210,8 +210,8 @@ void ParticipantEditItemWidget::onAddItem()
|
||||
if (!collectParticipantData(newParticipantData))
|
||||
return;
|
||||
|
||||
if (newParticipantData.equipmentNumber().is_set())
|
||||
m_alreadyAddedEquipmentNumbers.append(newParticipantData.equipmentNumber().get());
|
||||
if (newParticipantData.equipmentNumber.has_value())
|
||||
m_alreadyAddedEquipmentNumbers.append(newParticipantData.equipmentNumber.get());
|
||||
|
||||
DEBUG_LOG(m_logger) << "add item: " << newParticipantData;
|
||||
if (m_workingIndex.isValid() || m_isOrgChart)
|
||||
@@ -226,7 +226,7 @@ bool ParticipantEditItemWidget::onEditItem()
|
||||
if (!collectParticipantData(newParticipantData))
|
||||
return false;
|
||||
m_editData = newParticipantData;
|
||||
m_currentAssignState = newParticipantData.assignState();
|
||||
m_currentAssignState = newParticipantData.assignState;
|
||||
|
||||
DEBUG_LOG(m_logger) << "edit item: " << m_editData;
|
||||
if (m_workingIndex.isValid() || m_isOrgChart)
|
||||
@@ -239,17 +239,17 @@ bool ParticipantEditItemWidget::collectParticipantData(ParticipantManagement::Pa
|
||||
{
|
||||
const int newEquipmentNumber = m_ui->sbEquipNr->value();
|
||||
|
||||
data.designator(m_ui->leDesignator->text().toStdString());
|
||||
data.tacticalIdentifier(m_ui->leTactIdent->text().toStdString());
|
||||
data.symbol(m_sidc.toStdString());
|
||||
data.typeId(m_ui->cbType->currentData().toInt());
|
||||
data.partyId(m_partyId);
|
||||
data.identification(m_ui->leSign->text().toStdString());
|
||||
data.info(m_ui->leInfo->text().toStdString());
|
||||
data.assignState(m_currentAssignState);
|
||||
data.designator = m_ui->leDesignator->text().toStdString();
|
||||
data.tacticalIdentifier = m_ui->leTactIdent->text().toStdString();
|
||||
data.symbol = m_sidc.toStdString();
|
||||
data.typeId = m_ui->cbType->currentData().toInt();
|
||||
data.partyId = m_partyId;
|
||||
data.identification = m_ui->leSign->text().toStdString();
|
||||
data.info = m_ui->leInfo->text().toStdString();
|
||||
data.assignState = m_currentAssignState;
|
||||
|
||||
|
||||
data.name(m_ui->leVerein->text().toStdString());
|
||||
data.name = m_ui->leVerein->text().toStdString();
|
||||
|
||||
if (newEquipmentNumber > 0)
|
||||
{
|
||||
@@ -258,7 +258,7 @@ bool ParticipantEditItemWidget::collectParticipantData(ParticipantManagement::Pa
|
||||
m_ui->lbMinMaxEquipNr->setText(QStringLiteral("<span style=\"color:#aa0000;\">%1</span>").arg(m_ui->lbMinMaxEquipNr->text()));
|
||||
return false;
|
||||
}
|
||||
if (m_editData.equipmentNumber() != newEquipmentNumber)
|
||||
if (m_editData.equipmentNumber != newEquipmentNumber)
|
||||
{
|
||||
int exerciseId = 0;
|
||||
if (!m_dtc->isEquipmentExerciseMappingEnabled())
|
||||
@@ -284,21 +284,21 @@ bool ParticipantEditItemWidget::collectParticipantData(ParticipantManagement::Pa
|
||||
}
|
||||
}
|
||||
}
|
||||
data.equipmentNumber(newEquipmentNumber);
|
||||
data.externalId(m_ui->cbExternal->isChecked() ? newEquipmentNumber : 0);
|
||||
data.equipmentNumber = newEquipmentNumber;
|
||||
data.externalId = m_ui->cbExternal->isChecked() ? newEquipmentNumber : 0;
|
||||
m_ui->sbEquipNr->setValue(newEquipmentNumber + 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
data.equipmentNumber().reset();
|
||||
data.externalId(0);
|
||||
data.equipmentNumber.reset();
|
||||
data.externalId = 0;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void ParticipantEditItemWidget::onTbAssignmentClicked()
|
||||
{
|
||||
switch (m_currentAssignState.underlying())
|
||||
switch (m_currentAssignState)
|
||||
{
|
||||
case ParticipantManagement::ParticipantAssignState::AssignedWms:
|
||||
m_currentAssignState = ParticipantManagement::ParticipantAssignState::HandoutExcon;
|
||||
@@ -314,8 +314,8 @@ void ParticipantEditItemWidget::onTbAssignmentClicked()
|
||||
m_ui->sbEquipNr->setValue(0);
|
||||
break;
|
||||
case ParticipantManagement::ParticipantAssignState::NotAssigned:
|
||||
if (m_editData.assignState() == ParticipantManagement::ParticipantAssignState::ExconWmsOverruled ||
|
||||
m_editData.assignState() == ParticipantManagement::ParticipantAssignState::HandoutWms)
|
||||
if (m_editData.assignState == ParticipantManagement::ParticipantAssignState::ExconWmsOverruled ||
|
||||
m_editData.assignState == ParticipantManagement::ParticipantAssignState::HandoutWms)
|
||||
m_currentAssignState = ParticipantManagement::ParticipantAssignState::ExconWmsOverruled;
|
||||
else
|
||||
m_currentAssignState = ParticipantManagement::ParticipantAssignState::HandoutExcon;
|
||||
@@ -333,16 +333,16 @@ void ParticipantEditItemWidget::onEqNoChanged()
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_editData.assignState() == ParticipantManagement::ParticipantAssignState::AssignedWms)
|
||||
if (m_editData.assignState == ParticipantManagement::ParticipantAssignState::AssignedWms)
|
||||
{
|
||||
if (m_editData.equipmentNumber().is_set() && m_editData.equipmentNumber().get() == m_ui->sbEquipNr->value())
|
||||
if (m_editData.equipmentNumber.has_value() && m_editData.equipmentNumber.get() == m_ui->sbEquipNr->value())
|
||||
m_currentAssignState = ParticipantManagement::ParticipantAssignState::AssignedWms;
|
||||
else
|
||||
m_currentAssignState = ParticipantManagement::ParticipantAssignState::HandoutExcon;
|
||||
}
|
||||
else if (m_editData.assignState() == ParticipantManagement::ParticipantAssignState::HandoutWms)
|
||||
else if (m_editData.assignState == ParticipantManagement::ParticipantAssignState::HandoutWms)
|
||||
{
|
||||
if (m_editData.equipmentNumber().is_set() && m_editData.equipmentNumber().get() == m_ui->sbEquipNr->value())
|
||||
if (m_editData.equipmentNumber.has_value() && m_editData.equipmentNumber.get() == m_ui->sbEquipNr->value())
|
||||
m_currentAssignState = ParticipantManagement::ParticipantAssignState::HandoutWms;
|
||||
else
|
||||
m_currentAssignState = ParticipantManagement::ParticipantAssignState::ExconWmsOverruled;
|
||||
@@ -352,12 +352,12 @@ void ParticipantEditItemWidget::onEqNoChanged()
|
||||
|
||||
void ParticipantEditItemWidget::setAssignmentButton()
|
||||
{
|
||||
switch (m_currentAssignState.underlying())
|
||||
switch (m_currentAssignState)
|
||||
{
|
||||
case ParticipantManagement::ParticipantAssignState::AssignedWms:
|
||||
case ParticipantManagement::ParticipantAssignState::HandoutWms:
|
||||
{
|
||||
if (m_editData.assignState().underlying() == ParticipantManagement::ParticipantAssignState::AssignedWms)
|
||||
if (m_editData.assignState == ParticipantManagement::ParticipantAssignState::AssignedWms)
|
||||
m_ui->tbAssignment->setText(tr("WH(A)"));
|
||||
else
|
||||
m_ui->tbAssignment->setText(tr("WH(H)"));
|
||||
@@ -383,7 +383,7 @@ void ParticipantEditItemWidget::setAssignmentButton()
|
||||
}
|
||||
|
||||
|
||||
if (m_editData.externalId() > 0 && m_ui->cbExternal->isChecked())
|
||||
if (m_editData.externalId > 0 && m_ui->cbExternal->isChecked())
|
||||
{
|
||||
m_ui->tbAssignment->setEnabled(false);
|
||||
m_ui->sbEquipNr->setEnabled(false);
|
||||
@@ -440,7 +440,7 @@ bool ParticipantEditItem::init(const QModelIndex &workingIndex,
|
||||
layout->addWidget(m_buttonBox);
|
||||
setLayout(layout);
|
||||
|
||||
if (data.typeId() > 0)
|
||||
if (data.typeId > 0)
|
||||
{
|
||||
m_buttonBox->connectButton(LtsWidgets::DialogButton::Edit, m_editItemWidget, &ParticipantEditItemWidget::onEditItem);
|
||||
m_buttonBox->getButton(LtsWidgets::DialogButton::Edit)->setText(tr("Apply"));
|
||||
@@ -494,7 +494,7 @@ bool ParticipantEditItemTab::init(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
const ParticipantData &data,
|
||||
bool isOrgChart)
|
||||
{
|
||||
if (!m_editItemWidget->init(QModelIndex(), data.partyId(), dtc, ppmGuiCbxIfc, asb, data, isOrgChart))
|
||||
if (!m_editItemWidget->init(QModelIndex(), data.partyId, dtc, ppmGuiCbxIfc, asb, data, isOrgChart))
|
||||
return false;
|
||||
|
||||
QVBoxLayout *layout = new QVBoxLayout;
|
||||
|
||||
+2
-2
@@ -55,8 +55,8 @@ protected Q_SLOTS:
|
||||
void onEqNoChanged();
|
||||
|
||||
protected:
|
||||
int editTypeId() const override { return m_editData.typeId(); }
|
||||
int currentPartyId() const override { return m_editData.partyId() > 1 ? m_editData.partyId() : m_partyId; }
|
||||
int editTypeId() const override { return m_editData.typeId; }
|
||||
int currentPartyId() const override { return m_editData.partyId > 1 ? m_editData.partyId : m_partyId; }
|
||||
private:
|
||||
ParticipantManagement::ParticipantAssignState getAssignmentState() const;
|
||||
|
||||
|
||||
+13
-12
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "participant_edit_item.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "ui_participant_edit_item_widget_base.h"
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <AdvancedSymbology/asb_data_plugin_interface.h>
|
||||
@@ -18,7 +19,7 @@ namespace ParticipantManagement
|
||||
|
||||
|
||||
|
||||
static int s_lastTypeClassUsed = ParticipantManagement::TypeClass::Human;
|
||||
static int s_lastTypeClassUsed = static_cast<int>(ParticipantManagement::TypeClass::Human);
|
||||
static int s_lastTypeUsed = -1;
|
||||
|
||||
ParticipantEditItemWidgetBase::ParticipantEditItemWidgetBase(bool asSupportService,
|
||||
@@ -56,7 +57,7 @@ ParticipantEditItemWidgetBase::ParticipantEditItemWidgetBase(bool asSupportServi
|
||||
const bool hasHlaInterface = (LtsUtils::ProjectSettings::isFunctionEnabled(QStringLiteral("Exercises"),
|
||||
QStringLiteral("HasHlaInterface"))
|
||||
&& exmDtc
|
||||
&& exmDtc->exercise(m_session->exerciseId()).hasHlaInterface());
|
||||
&& exmDtc->exercise(m_session->exerciseId()).hasHlaInterface);
|
||||
if (!hasHlaInterface)
|
||||
{
|
||||
m_ui->cbExternal->hide();
|
||||
@@ -169,22 +170,22 @@ void ParticipantEditItemWidgetBase::onFillTypeCb()
|
||||
void ParticipantEditItemWidgetBase::onChangeMinMax()
|
||||
{
|
||||
const ParticipantManagement::Type type = m_dtc->type(m_ui->cbType->currentData().toInt());
|
||||
const ParticipantManagement::EquipmentType eqType = m_dtc->equipmentType(type.equipmentTypeId());
|
||||
m_ui->lbMinMaxEquipNr->setText(QString::number(getUnsignedShortValue(eqType.minEquipNo())) + QLatin1Char(':') + QString::number(getUnsignedShortValue(eqType.maxEquipNo())));
|
||||
m_ui->sbEquipNr->setMaximum(getUnsignedShortValue(eqType.maxEquipNo()));
|
||||
m_typeMinimum = eqType.minEquipNo();
|
||||
bool isNoUnit = type.typeClass() != TypeClass::SupportUnit && type.typeClass() != TypeClass::Unit;
|
||||
const ParticipantManagement::EquipmentType eqType = m_dtc->equipmentType(type.equipmentTypeId);
|
||||
m_ui->lbMinMaxEquipNr->setText(QString::number(getUnsignedShortValue(eqType.minEquipNo)) + QLatin1Char(':') + QString::number(getUnsignedShortValue(eqType.maxEquipNo)));
|
||||
m_ui->sbEquipNr->setMaximum(getUnsignedShortValue(eqType.maxEquipNo));
|
||||
m_typeMinimum = eqType.minEquipNo;
|
||||
bool isNoUnit = type.typeClass != TypeClass::SupportUnit && type.typeClass != TypeClass::Unit;
|
||||
if (!isNoUnit)
|
||||
m_ui->sbEquipNr->setValue(0);
|
||||
m_ui->sbEquipNr->setEnabled(isNoUnit);
|
||||
m_ui->tbAssignment->setEnabled(isNoUnit);
|
||||
|
||||
|
||||
bool showVerein = m_dtc->isAdlerType(type.id());
|
||||
bool showVerein = m_dtc->isAdlerType(type.id);
|
||||
m_ui->lblVerein->setVisible(showVerein);
|
||||
m_ui->leVerein->setVisible(showVerein);
|
||||
|
||||
onChangeSymbol(QString::fromStdString(type.symbol()));
|
||||
onChangeSymbol(QString::fromStdString(type.symbol));
|
||||
}
|
||||
|
||||
void ParticipantEditItemWidgetBase::onSymbolSelection()
|
||||
@@ -230,8 +231,8 @@ void ParticipantEditItemWidgetBase::onChangeSymbol(const QString &sidc)
|
||||
|
||||
if (currentPartyId())
|
||||
{
|
||||
symDataToRender.role = AdvancedSymbology::roleToRole<>((m_dtc->party(currentPartyId()).role()));
|
||||
symDataToRender.fillColor = QColor::fromRgb(QRgb(m_dtc->party(currentPartyId()).color()));
|
||||
symDataToRender.role = AdvancedSymbology::roleToRole<>(m_dtc->party(currentPartyId()).role);
|
||||
symDataToRender.fillColor = QColor::fromRgb(QRgb(m_dtc->party(currentPartyId()).color));
|
||||
symDataToRender.fillColorReplace = true;
|
||||
} else {
|
||||
|
||||
@@ -269,7 +270,7 @@ ParticipantManagement::TypeClass ParticipantEditItemWidgetBase::typeClassIdFromT
|
||||
return it.value();
|
||||
auto cbTypes = [this](const ParticipantManagement::Type &type)
|
||||
{
|
||||
m_type2TypeClass[type.id()] = type.typeClass();
|
||||
m_type2TypeClass[type.id] = type.typeClass;
|
||||
};
|
||||
m_dtc->types(cbTypes);
|
||||
return m_type2TypeClass.value(typeId);
|
||||
|
||||
+1
@@ -4,6 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <Services/ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
+156
-153
@@ -2,8 +2,10 @@
|
||||
|
||||
|
||||
#include "participant_edit_model.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <utility>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <ParticipantManagement/logger.h>
|
||||
#include <AdvancedSymbology/asb_data_plugin_interface.h>
|
||||
#include <Symbology/symbol_data_to_render_role.h>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
@@ -24,7 +26,7 @@ namespace core
|
||||
{
|
||||
static inline uint qHash(const ParticipantManagement::TypeClass &tc)
|
||||
{
|
||||
return ::qHash(tc.underlying());
|
||||
return ::qHash(tc);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -40,23 +42,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<qint64>(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;
|
||||
}
|
||||
@@ -88,24 +90,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;
|
||||
}
|
||||
@@ -124,7 +126,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;
|
||||
}
|
||||
|
||||
@@ -156,6 +158,7 @@ ParticipantEditModel::ParticipantEditModel(QObject *parent,
|
||||
, m_bUnitsSelectable(true)
|
||||
, m_missingSuperiorIdTimer(new QTimer(this))
|
||||
, m_firingUnitValidator(new FiringUnitValidator(ppmDtc, this))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
connect(this, &ParticipantEditModel::signalDataDropped,
|
||||
this, &ParticipantEditModel::internalDataChanged);
|
||||
@@ -179,7 +182,7 @@ Qt::ItemFlags ParticipantEditModel::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())
|
||||
@@ -205,7 +208,7 @@ QVariant ParticipantEditModel::headerData(int section, Qt::Orientation orientati
|
||||
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);
|
||||
}
|
||||
}
|
||||
@@ -213,7 +216,7 @@ QVariant ParticipantEditModel::headerData(int section, Qt::Orientation orientati
|
||||
{
|
||||
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);
|
||||
}
|
||||
@@ -267,38 +270,38 @@ QVariant ParticipantEditModel::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 ColParticipantId:
|
||||
return participantData.id();
|
||||
return participantData.id;
|
||||
|
||||
case ColInfo:
|
||||
return QString::fromStdString(participantData.info());
|
||||
return QString::fromStdString(participantData.info);
|
||||
|
||||
case ColSign:
|
||||
return QString::fromStdString(participantData.identification());
|
||||
return QString::fromStdString(participantData.identification);
|
||||
|
||||
default:
|
||||
Q_UNREACHABLE();
|
||||
@@ -312,9 +315,9 @@ QVariant ParticipantEditModel::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:
|
||||
@@ -357,7 +360,7 @@ bool ParticipantEditModel::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: "
|
||||
@@ -375,7 +378,7 @@ bool ParticipantEditModel::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;
|
||||
|
||||
@@ -383,9 +386,9 @@ bool ParticipantEditModel::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))
|
||||
{
|
||||
@@ -399,11 +402,11 @@ bool ParticipantEditModel::canDropMimeData(const QMimeData *data,
|
||||
FiringUnitValidator::FiringUnitRestrictions restrictions = m_firingUnitValidator->getRestrictions(this, parent);
|
||||
|
||||
|
||||
if (m_dtc->isAdlerVerbund(pdSource.typeId()))
|
||||
if (m_dtc->isAdlerVerbund(pdSource.typeId))
|
||||
{
|
||||
const Type &type = m_dtc->type(pdSource.typeId());
|
||||
const Type &type = m_dtc->type(pdSource.typeId);
|
||||
|
||||
if (type.typeClass() != TypeClass::Unit)
|
||||
if (type.typeClass != TypeClass::Unit)
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -414,16 +417,16 @@ bool ParticipantEditModel::canDropMimeData(const QMimeData *data,
|
||||
|
||||
if (restrictions.testFlag(FiringUnitValidator::ONLY_SAME_GEAR_CLASS_ARTILLERY_ALLOWED))
|
||||
{
|
||||
if (!m_firingUnitValidator->isSameGearClassArtillery(parentItem->participant.typeId(), pdSource.typeId()))
|
||||
if (!m_firingUnitValidator->isSameGearClassArtillery(parentItem->participant.typeId, pdSource.typeId))
|
||||
return false;
|
||||
|
||||
if (m_firingUnitValidator->isArtilleryUnit(parentItem->participant.typeId()) && m_firingUnitValidator->isArtilleryUnit(pdSource.typeId()))
|
||||
if (m_firingUnitValidator->isArtilleryUnit(parentItem->participant.typeId) && m_firingUnitValidator->isArtilleryUnit(pdSource.typeId))
|
||||
return false;
|
||||
}
|
||||
|
||||
if (restrictions.testFlag(FiringUnitValidator::NO_ARTILLERY_PARTICIPANTS_ALLOWED))
|
||||
{
|
||||
if (m_firingUnitValidator->isArtilleryWeaponSystem(pdSource.typeId()))
|
||||
if (m_firingUnitValidator->isArtilleryWeaponSystem(pdSource.typeId))
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -431,17 +434,17 @@ bool ParticipantEditModel::canDropMimeData(const QMimeData *data,
|
||||
{
|
||||
const Type allowedType = m_firingUnitValidator->getAllowedType(this, parent);
|
||||
|
||||
if (pdSource.typeId() != allowedType.id())
|
||||
if (pdSource.typeId != allowedType.id)
|
||||
return false;
|
||||
|
||||
if (m_dtc->isAdlerVerbund(pdSource.typeId()))
|
||||
if (m_dtc->isAdlerVerbund(pdSource.typeId))
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (m_dtc->isAdlerVerbund(pdSource.typeId()) && parentItem->participant.partyId() != pdSource.partyId())
|
||||
if (m_dtc->isAdlerVerbund(pdSource.typeId) && parentItem->participant.partyId != pdSource.partyId)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
@@ -463,7 +466,7 @@ bool ParticipantEditModel::dropMimeData(const QMimeData *data, Qt::DropAction ac
|
||||
{
|
||||
CheckedTreeItem *child = static_cast<CheckedTreeItem *>(cti->child(r));
|
||||
|
||||
child->participant.hierarchyNumber(r + 1);
|
||||
child->participant.hierarchyNumber = r + 1;
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -480,8 +483,8 @@ bool ParticipantEditModel::onReinitModel(int partyId, const QSet<int> &checkedPa
|
||||
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();
|
||||
|
||||
@@ -513,7 +516,7 @@ bool ParticipantEditModel::isRowRemovable(const CheckedTreeItem *parentItem) con
|
||||
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++)
|
||||
@@ -559,7 +562,7 @@ void ParticipantEditModel::processMissingSuperiorId()
|
||||
if (!tmap.contains(id))
|
||||
continue;
|
||||
const ParticipantManagement::Participant &p = m_dtc->participant(id);
|
||||
if (p.id() != id)
|
||||
if (p.id != id)
|
||||
continue;
|
||||
onParticipantChanged(p, DataModification::eModified);
|
||||
|
||||
@@ -570,7 +573,7 @@ void ParticipantEditModel::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);
|
||||
}
|
||||
@@ -588,7 +591,7 @@ void ParticipantEditModel::selectItemByParticipantId(int participantId, const st
|
||||
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;
|
||||
@@ -605,7 +608,7 @@ QModelIndexList ParticipantEditModel::getIndexesByParticipantIds(const std::vect
|
||||
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);
|
||||
}
|
||||
@@ -696,7 +699,7 @@ QString ParticipantEditModel::getHierarchyFromIndex(const QModelIndex &index) co
|
||||
if (!index.isValid())
|
||||
return QString();
|
||||
const ParticipantManagement::ParticipantData &participantData = privateData(index)->participant;
|
||||
return m_dtc->hierarchyFromParticipant(participantData.id());
|
||||
return m_dtc->hierarchyFromParticipant(participantData.id);
|
||||
}
|
||||
|
||||
|
||||
@@ -707,16 +710,16 @@ void ParticipantEditModel::gatherParticipants(QHash<int, ParticipantData> &tmap,
|
||||
{
|
||||
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);
|
||||
}
|
||||
@@ -730,16 +733,16 @@ std::vector<ParticipantData> ParticipantEditModel::getChildrenOf(NGLTreeItem *it
|
||||
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());
|
||||
}
|
||||
|
||||
@@ -760,28 +763,28 @@ bool ParticipantEditModel::updateChildrenOf(int parentId,
|
||||
{
|
||||
ParticipantEditModel::CheckedTreeItem *childItem = static_cast<ParticipantEditModel::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;
|
||||
@@ -806,13 +809,13 @@ void ParticipantEditModel::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
|
||||
@@ -825,20 +828,20 @@ void ParticipantEditModel::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;
|
||||
if ( data.id() == 0 && data.hierarchyNumber() == 0)
|
||||
if ( data.id == 0 && data.hierarchyNumber == 0)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "avoid endless loop in recursion";
|
||||
return;
|
||||
}
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -849,7 +852,7 @@ bool ParticipantEditModel::isParentOf(const NGLTreeItem *item, int participantId
|
||||
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);
|
||||
}
|
||||
@@ -921,7 +924,7 @@ void ParticipantEditModel::setCheckState(CheckedTreeItem *parentItem, const QSet
|
||||
|
||||
QModelIndex ParticipantEditModel::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)
|
||||
{
|
||||
@@ -935,13 +938,13 @@ QModelIndex ParticipantEditModel::indexFromParticipantId(int participantId, cons
|
||||
int ParticipantEditModel::participantIdFromItem(NGLTreeItem *item) const
|
||||
{
|
||||
const CheckedTreeItem *cti = static_cast<CheckedTreeItem *>(item);
|
||||
return cti->participant.id();
|
||||
return cti->participant.id;
|
||||
}
|
||||
|
||||
int ParticipantEditModel::equipmentNumberFromItem(NGLTreeItem *item) const
|
||||
{
|
||||
const CheckedTreeItem *cti = static_cast<CheckedTreeItem *>(item);
|
||||
return cti->participant.equipmentNumber().is_set() ? cti->participant.equipmentNumber().get() : 0;
|
||||
return cti->participant.equipmentNumber.has_value() ? cti->participant.equipmentNumber.get() : 0;
|
||||
}
|
||||
|
||||
ParticipantEditModel::CheckedTreeItem *ParticipantEditModel::searchParticipant(const NGLTreeItem *parentItem, int participantId) const
|
||||
@@ -950,7 +953,7 @@ ParticipantEditModel::CheckedTreeItem *ParticipantEditModel::searchParticipant(c
|
||||
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)
|
||||
@@ -965,10 +968,10 @@ NGLTreeItem *ParticipantEditModel::createItem(const QVariant &data, const QIcon
|
||||
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<ParticipantEditModel *>(this);
|
||||
that->tryRenderSymbol(QString::fromStdString(cti->participant.symbol()), cti);
|
||||
that->tryRenderSymbol(QString::fromStdString(cti->participant.symbol), cti);
|
||||
}
|
||||
|
||||
return cti;
|
||||
@@ -990,17 +993,17 @@ int ParticipantEditModel::insertParticipant(const QModelIndex &parent, Participa
|
||||
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;
|
||||
}
|
||||
@@ -1020,8 +1023,8 @@ bool ParticipantEditModel::onUpdateRow(const QModelIndex &index, const Participa
|
||||
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;
|
||||
@@ -1036,10 +1039,10 @@ bool ParticipantEditModel::onDeleteRow(const QModelIndex &idx, bool isFirstItem)
|
||||
{
|
||||
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());
|
||||
@@ -1049,12 +1052,12 @@ bool ParticipantEditModel::onDeleteRow(const QModelIndex &idx, bool isFirstItem)
|
||||
|
||||
void ParticipantEditModel::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);
|
||||
@@ -1062,16 +1065,16 @@ void ParticipantEditModel::onParticipantChanged(const ParticipantManagement::Par
|
||||
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;
|
||||
@@ -1086,17 +1089,17 @@ void ParticipantEditModel::onParticipantChanged(const ParticipantManagement::Par
|
||||
|
||||
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();
|
||||
}
|
||||
|
||||
@@ -1139,31 +1142,31 @@ bool ParticipantTreeFilterProxyModel::lessThan(const QModelIndex &source_left, c
|
||||
switch (source_left.column())
|
||||
{
|
||||
case ParticipantEditModel::ColDesignator:
|
||||
return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
|
||||
return left->participant.hierarchyNumber < right->participant.hierarchyNumber;
|
||||
case ParticipantEditModel::ColIdentifier:
|
||||
return compareStrings(left->participant.tacticalIdentifier(),
|
||||
right->participant.tacticalIdentifier(),
|
||||
return compareStrings(left->participant.tacticalIdentifier,
|
||||
right->participant.tacticalIdentifier,
|
||||
left, right);
|
||||
case ParticipantEditModel::ColTypeClass:
|
||||
case ParticipantEditModel::ColType:
|
||||
break;
|
||||
case ParticipantEditModel::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 ParticipantEditModel::ColParticipantId:
|
||||
return left->participant.id() < right->participant.id();
|
||||
return left->participant.id < right->participant.id;
|
||||
case ParticipantEditModel::ColInfo:
|
||||
return compareStrings(left->participant.info(),
|
||||
right->participant.info(),
|
||||
return compareStrings(left->participant.info,
|
||||
right->participant.info,
|
||||
left, right);
|
||||
case ParticipantEditModel::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);
|
||||
@@ -1182,7 +1185,7 @@ bool ParticipantTreeFilterProxyModel::filterAcceptsRow(int source_row, const QMo
|
||||
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
|
||||
|
||||
@@ -1334,32 +1337,32 @@ bool ParticipantTableFilterProxyModel::lessThan(const QModelIndex &sourceLeft, c
|
||||
switch (sourceLeft.column())
|
||||
{
|
||||
case ParticipantEditModel::ColDesignator:
|
||||
return left->participant.hierarchyNumber() < right->participant.hierarchyNumber();
|
||||
return left->participant.hierarchyNumber < right->participant.hierarchyNumber;
|
||||
|
||||
case ParticipantEditModel::ColIdentifier:
|
||||
return compareStrings(left->participant.tacticalIdentifier(), right->participant.tacticalIdentifier(), left, right);
|
||||
return compareStrings(left->participant.tacticalIdentifier, right->participant.tacticalIdentifier, left, right);
|
||||
|
||||
case ParticipantEditModel::ColTypeClass:
|
||||
case ParticipantEditModel::ColType:
|
||||
return LtsWidgets::LtsColumnFilterProxyModel::lessThan(sourceLeft, sourceRight);
|
||||
|
||||
case ParticipantEditModel::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 ParticipantEditModel::ColParticipantId:
|
||||
return left->participant.id() < right->participant.id();
|
||||
return left->participant.id < right->participant.id;
|
||||
|
||||
case ParticipantEditModel::ColInfo:
|
||||
return compareStrings(left->participant.info(), right->participant.info(), left, right);
|
||||
return compareStrings(left->participant.info, right->participant.info, left, right);
|
||||
|
||||
case ParticipantEditModel::ColSign:
|
||||
return compareStrings(left->participant.identification(), right->participant.identification(), left, right);
|
||||
return compareStrings(left->participant.identification, right->participant.identification, left, right);
|
||||
|
||||
default:
|
||||
return false;
|
||||
|
||||
+1
-2
@@ -177,7 +177,6 @@ public:
|
||||
int partyId() const { return m_sourceModel ? m_sourceModel->partyId() : -1; }
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;
|
||||
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
|
||||
|
||||
@@ -283,4 +282,4 @@ private:
|
||||
|
||||
}
|
||||
|
||||
Q_DECLARE_METATYPE(ParticipantManagement::ParticipantData)
|
||||
// Q_DECLARE_METATYPE(ParticipantManagement::ParticipantData) omitted: Qt6 raises "specialization after instantiation / redefinition". ParticipantData is stored as a tree-item member and converted via participantToQVariant() (not QVariant-by-value), so the metatype is unneeded (legacy Qt5 tolerated the duplicate declaration).
|
||||
+11
-11
@@ -26,7 +26,7 @@ QVector<Type> FiringUnitValidator::artilleryParticipantTypes() const
|
||||
|
||||
std::function<void(const Type &)> getArtilleryType = [this, &artilleryParticipantTypes](const Type &type)
|
||||
{
|
||||
if (!m_artilleryParticipantTypeIds.contains(type.id()))
|
||||
if (!m_artilleryParticipantTypeIds.contains(type.id))
|
||||
return;
|
||||
|
||||
artilleryParticipantTypes.append(type);
|
||||
@@ -53,7 +53,7 @@ int FiringUnitValidator::getTypeId(const ParticipantEditModel *model, const QMod
|
||||
|
||||
const ParticipantData data = model->getParticipantData(index);
|
||||
|
||||
return data.typeId();
|
||||
return data.typeId;
|
||||
}
|
||||
|
||||
int FiringUnitValidator::getTypeId(const ParticipantTemplateEditModel *model, const QModelIndex &index) const
|
||||
@@ -63,7 +63,7 @@ int FiringUnitValidator::getTypeId(const ParticipantTemplateEditModel *model, co
|
||||
|
||||
const TemplateData data = model->getTemplateData(index);
|
||||
|
||||
return data.typeId();
|
||||
return data.typeId;
|
||||
}
|
||||
|
||||
void FiringUnitValidator::fetchArtilleryTypes()
|
||||
@@ -76,10 +76,10 @@ void FiringUnitValidator::fetchArtilleryTypes()
|
||||
if (!isArtilleryType(type))
|
||||
return;
|
||||
|
||||
if (type.typeClass() == ParticipantManagement::TypeClass::Unit)
|
||||
m_firingUnitTypeIds.insert(type.id());
|
||||
if (type.typeClass == ParticipantManagement::TypeClass::Unit)
|
||||
m_firingUnitTypeIds.insert(type.id);
|
||||
else
|
||||
m_artilleryParticipantTypeIds.insert(type.id());
|
||||
m_artilleryParticipantTypeIds.insert(type.id);
|
||||
};
|
||||
|
||||
m_ppmDtc->types(getArtilleryTypes);
|
||||
@@ -87,7 +87,7 @@ void FiringUnitValidator::fetchArtilleryTypes()
|
||||
|
||||
bool FiringUnitValidator::isArtilleryType(int typeId) const { return m_ppmDtc->isArtilleryType(typeId) && !m_ppmDtc->isAdlerVerbund(typeId); }
|
||||
|
||||
bool FiringUnitValidator::isArtilleryType(const Type &type) const { return isArtilleryType(type.id()); }
|
||||
bool FiringUnitValidator::isArtilleryType(const Type &type) const { return isArtilleryType(type.id); }
|
||||
|
||||
bool FiringUnitValidator::isArtilleryUnit(int typeId) const
|
||||
{
|
||||
@@ -96,7 +96,7 @@ bool FiringUnitValidator::isArtilleryUnit(int typeId) const
|
||||
|
||||
const ParticipantManagement::Type &type = m_ppmDtc->type(typeId);
|
||||
|
||||
return type.typeClass() == ParticipantManagement::TypeClass::Unit;
|
||||
return type.typeClass == ParticipantManagement::TypeClass::Unit;
|
||||
}
|
||||
|
||||
bool FiringUnitValidator::isArtilleryWeaponSystem(int typeId) const
|
||||
@@ -106,7 +106,7 @@ bool FiringUnitValidator::isArtilleryWeaponSystem(int typeId) const
|
||||
|
||||
const ParticipantManagement::Type &type = m_ppmDtc->type(typeId);
|
||||
|
||||
return type.typeClass() == ParticipantManagement::TypeClass::WeaponSystem;
|
||||
return type.typeClass == ParticipantManagement::TypeClass::WeaponSystem;
|
||||
}
|
||||
|
||||
bool FiringUnitValidator::isSameGearClassArtillery(int typeIdA, int typeIdB) const
|
||||
@@ -124,9 +124,9 @@ bool FiringUnitValidator::isSameGearClassArtillery(int typeIdA, int typeIdB) con
|
||||
ProjectDataManagement::GearClass FiringUnitValidator::getGearClassType(int typeId) const
|
||||
{
|
||||
const Type type = m_ppmDtc->type(typeId);
|
||||
const QJsonDocument properties = QJsonDocument::fromJson(QByteArray::fromStdString(type.properties()));
|
||||
const QJsonDocument properties = QJsonDocument::fromJson(QByteArray::fromStdString(type.properties));
|
||||
const QJsonObject propertiesObject = properties.object();
|
||||
const int gearClassId = propertiesObject.value(QStringLiteral("gearClassId")).toInt(ProjectDataManagement::GearClass::GearClass_Unknown);
|
||||
const int gearClassId = propertiesObject.value(QStringLiteral("gearClassId")).toInt(static_cast<int>(ProjectDataManagement::GearClass::GearClass_Unknown));
|
||||
|
||||
return static_cast<ProjectDataManagement::GearClass>(gearClassId);
|
||||
}
|
||||
|
||||
+1
@@ -6,6 +6,7 @@
|
||||
#include <memory>
|
||||
#include <ppmcommon_export.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include "participant_edit_model.h"
|
||||
#include "participant_template_edit_model.h"
|
||||
|
||||
|
||||
+6
-5
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "participant_icon_model_base.h"
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <AdvancedSymbology/asb_data_plugin_interface.h>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
#include <QtCore/QHash>
|
||||
@@ -40,17 +41,17 @@ void ParticipantIconModelBase::onTypeChanged(const ParticipantManagement::Type &
|
||||
{
|
||||
if (modType == DataModification::eRemoved)
|
||||
{
|
||||
m_types.remove(data.id());
|
||||
m_types.remove(data.id);
|
||||
return;
|
||||
}
|
||||
|
||||
m_types[data.id()] = data;
|
||||
m_types[data.id] = data;
|
||||
}
|
||||
|
||||
|
||||
ParticipantManagement::TypeClass ParticipantIconModelBase::typeClassIdFromTypeId(int typeId) const
|
||||
{
|
||||
return m_types.value(typeId).typeClass();
|
||||
return m_types.value(typeId).typeClass;
|
||||
}
|
||||
|
||||
QString ParticipantIconModelBase::typeClassStringFromTypeId(int typeId) const
|
||||
@@ -58,7 +59,7 @@ QString ParticipantIconModelBase::typeClassStringFromTypeId(int typeId) const
|
||||
auto it = m_types.find(typeId);
|
||||
if (it == m_types.end())
|
||||
return QString();
|
||||
return ParticipantManagement::toString(it.value().typeClass());
|
||||
return ParticipantManagement::toString(it.value().typeClass);
|
||||
}
|
||||
|
||||
bool ParticipantIconModelBase::isUnitType(int typeId) const
|
||||
@@ -108,7 +109,7 @@ void ParticipantIconModelBase::tryRenderSymbol(const QString &symbol, NGLTreeIte
|
||||
SymbolResultData symResData;
|
||||
symResData.result = symRes;
|
||||
symResData.treeItems.push_back(item);
|
||||
m_symbolResultMapping.insertMulti(symResPtr, symResData);
|
||||
m_symbolResultMapping.insert(symResPtr, symResData);
|
||||
QPointer<AdvancedSymbology::SymbolResult> qPointer(symResPtr);
|
||||
|
||||
|
||||
|
||||
+1
@@ -5,6 +5,7 @@
|
||||
|
||||
#include <ppmcommon_export.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <nglwidgets/ngltreemodel.h>
|
||||
|
||||
#include <QtGui/QColor>
|
||||
|
||||
+10
-10
@@ -32,11 +32,11 @@ bool ParticipantSearchModal::init(const std::shared_ptr<ParticipantManagement::I
|
||||
|
||||
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,
|
||||
@@ -63,27 +63,27 @@ void ParticipantSearchModal::onOkay()
|
||||
|
||||
void ParticipantSearchModal::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);
|
||||
}
|
||||
|
||||
+29
-29
@@ -36,7 +36,7 @@ bool ParticipantTemplateEditItemWidget::init(const QModelIndex &workingIndex,
|
||||
{
|
||||
m_workingIndex = workingIndex;
|
||||
m_editData = data;
|
||||
m_bEditMode = m_editData.typeId() > 0;
|
||||
m_bEditMode = m_editData.typeId > 0;
|
||||
|
||||
return ParticipantEditItemWidgetBase::init(dtc, ppmGuiCbxIfc, asb, addItem);
|
||||
}
|
||||
@@ -59,8 +59,8 @@ void ParticipantTemplateEditItemWidget::setFiringUnitRestrictions(ParticipantTem
|
||||
if (allowedType == Type())
|
||||
return;
|
||||
|
||||
m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(allowedType.typeClass().underlying()));
|
||||
m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(allowedType.id()));
|
||||
m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(static_cast<int>(allowedType.typeClass)));
|
||||
m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(allowedType.id));
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -73,7 +73,7 @@ void ParticipantTemplateEditItemWidget::setFiringUnitRestrictions(ParticipantTem
|
||||
const QVector<Type> allowedTypes = firingUnitValidator->artilleryParticipantTypes();
|
||||
|
||||
m_ui->cbTypeClass->setDisabled(true);
|
||||
m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(allowedTypes.at(0).typeClass().underlying()));
|
||||
m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(static_cast<int>(allowedTypes.at(0).typeClass)));
|
||||
|
||||
QSignalBlocker typeSignalBlocker(m_ui->cbType);
|
||||
|
||||
@@ -83,20 +83,20 @@ void ParticipantTemplateEditItemWidget::setFiringUnitRestrictions(ParticipantTem
|
||||
std::function<bool(Type)> funcIsSameGearType = [=](const Type &t)
|
||||
{
|
||||
if (m_isAdler)
|
||||
return m_dtc->isAdlerType(t.id()) && (firingUnitValidator->getGearClassType(t.id()) == unitGearClassType);
|
||||
return firingUnitValidator->getGearClassType(t.id()) == unitGearClassType;
|
||||
return m_dtc->isAdlerType(t.id) && (static_cast<int>(firingUnitValidator->getGearClassType(t.id)) == unitGearClassType);
|
||||
return static_cast<int>(firingUnitValidator->getGearClassType(t.id)) == unitGearClassType;
|
||||
};
|
||||
QVector<Type>::ConstIterator typeIterator = std::find_if(allowedTypes.begin(), allowedTypes.end(), funcIsSameGearType);
|
||||
|
||||
if(typeIterator != allowedTypes.end())
|
||||
{
|
||||
m_ui->cbType->setDisabled(true);
|
||||
m_ui->cbType->addItem(ParticipantManagement::trTypeName(typeIterator->name()), typeIterator->id());
|
||||
m_ui->cbType->addItem(ParticipantManagement::trTypeName(typeIterator->name), typeIterator->id);
|
||||
}
|
||||
else
|
||||
{
|
||||
for (const Type ¤tType : allowedTypes)
|
||||
m_ui->cbType->addItem(ParticipantManagement::trTypeName(currentType.name()), currentType.id());
|
||||
m_ui->cbType->addItem(ParticipantManagement::trTypeName(currentType.name), currentType.id);
|
||||
m_ui->cbType->model()->sort(0);
|
||||
}
|
||||
|
||||
@@ -149,15 +149,15 @@ void ParticipantTemplateEditItemWidget::setFiringUnitRestrictions(ParticipantTem
|
||||
|
||||
void ParticipantTemplateEditItemWidget::setData()
|
||||
{
|
||||
m_ui->leDesignator->setText(QString::fromStdString(m_editData.designator()));
|
||||
m_ui->leTactIdent->setText(QString::fromStdString(m_editData.tacticalIdentifier()));
|
||||
m_ui->leDesignator->setText(QString::fromStdString(m_editData.designator));
|
||||
m_ui->leTactIdent->setText(QString::fromStdString(m_editData.tacticalIdentifier));
|
||||
|
||||
Type type = m_dtc->type(m_editData.typeId());
|
||||
m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(type.typeClass().underlying()));
|
||||
m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(type.id()));
|
||||
Type type = m_dtc->type(m_editData.typeId);
|
||||
m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(static_cast<int>(type.typeClass)));
|
||||
m_ui->cbType->setCurrentIndex(m_ui->cbType->findData(type.id));
|
||||
|
||||
|
||||
m_ui->sbEquipNr->setValue(m_editData.equipmentNumber());
|
||||
m_ui->sbEquipNr->setValue(m_editData.equipmentNumber);
|
||||
|
||||
|
||||
m_ui->cbExternal->hide();
|
||||
@@ -165,27 +165,27 @@ void ParticipantTemplateEditItemWidget::setData()
|
||||
m_ui->lblExternal->hide();
|
||||
|
||||
|
||||
onChangeSymbol(QString::fromStdString(m_editData.symbol()));
|
||||
onChangeSymbol(QString::fromStdString(m_editData.symbol));
|
||||
}
|
||||
|
||||
void ParticipantTemplateEditItemWidget::setDesignatorData()
|
||||
{
|
||||
m_ui->leDesignator->setText(QString::fromStdString(m_editData.designator()));
|
||||
m_ui->leTactIdent->setText(QString::fromStdString(m_editData.tacticalIdentifier()));
|
||||
m_ui->leDesignator->setText(QString::fromStdString(m_editData.designator));
|
||||
m_ui->leTactIdent->setText(QString::fromStdString(m_editData.tacticalIdentifier));
|
||||
}
|
||||
|
||||
void ParticipantTemplateEditItemWidget::onAddItem()
|
||||
{
|
||||
ParticipantManagement::TemplateData newTemplateParticipant;
|
||||
newTemplateParticipant.designator() = m_ui->leDesignator->text().toStdString();
|
||||
newTemplateParticipant.tacticalIdentifier() = m_ui->leTactIdent->text().toStdString();
|
||||
newTemplateParticipant.symbol(m_sidc.toStdString());
|
||||
newTemplateParticipant.typeId(m_ui->cbType->currentData().toInt());
|
||||
newTemplateParticipant.designator = m_ui->leDesignator->text().toStdString();
|
||||
newTemplateParticipant.tacticalIdentifier = m_ui->leTactIdent->text().toStdString();
|
||||
newTemplateParticipant.symbol = m_sidc.toStdString();
|
||||
newTemplateParticipant.typeId = m_ui->cbType->currentData().toInt();
|
||||
|
||||
const int equipNo = m_ui->sbEquipNr->value();
|
||||
if (!checkEquipNo(equipNo))
|
||||
return;
|
||||
newTemplateParticipant.equipmentNumber(equipNo);
|
||||
newTemplateParticipant.equipmentNumber = equipNo;
|
||||
|
||||
DEBUG_LOG(m_logger) << "adding item: " << newTemplateParticipant;
|
||||
emit addItem(m_workingIndex, newTemplateParticipant);
|
||||
@@ -196,16 +196,16 @@ void ParticipantTemplateEditItemWidget::onAddItem()
|
||||
|
||||
bool ParticipantTemplateEditItemWidget::onEditItem()
|
||||
{
|
||||
m_editData.designator() = m_ui->leDesignator->text().toStdString();
|
||||
m_editData.tacticalIdentifier() = m_ui->leTactIdent->text().toStdString();
|
||||
m_editData.symbol(m_sidc.toStdString());
|
||||
m_editData.typeId(m_ui->cbType->currentData().toInt());
|
||||
m_editData.designator = m_ui->leDesignator->text().toStdString();
|
||||
m_editData.tacticalIdentifier = m_ui->leTactIdent->text().toStdString();
|
||||
m_editData.symbol = m_sidc.toStdString();
|
||||
m_editData.typeId = m_ui->cbType->currentData().toInt();
|
||||
|
||||
|
||||
const int equipNo = m_ui->sbEquipNr->value();
|
||||
if (!checkEquipNo(equipNo))
|
||||
return false;
|
||||
m_editData.equipmentNumber(equipNo);
|
||||
m_editData.equipmentNumber = equipNo;
|
||||
|
||||
DEBUG_LOG(m_logger) << "edit item: " << m_editData;
|
||||
emit updateItem(m_workingIndex, m_editData);
|
||||
@@ -223,7 +223,7 @@ bool ParticipantTemplateEditItemWidget::checkEquipNo(int equipNo)
|
||||
m_ui->lbMinMaxEquipNr->setText(QStringLiteral("<span style=\"color:#aa0000;\">%1</span>").arg(equipNo));
|
||||
return false;
|
||||
}
|
||||
if (m_editData.equipmentNumber() != equipNo)
|
||||
if (m_editData.equipmentNumber != equipNo)
|
||||
{
|
||||
|
||||
if (m_usedEquipmentNumbers.contains(equipNo))
|
||||
@@ -280,7 +280,7 @@ bool ParticipantTemplateEditItem::init(const QModelIndex &workingIndex,
|
||||
layout->addWidget(m_buttonBox);
|
||||
setLayout(layout);
|
||||
|
||||
if (data.typeId() > 0)
|
||||
if (data.typeId > 0)
|
||||
{
|
||||
m_buttonBox->connectButton(LtsWidgets::DialogButton::Edit, m_editItemWidget, &ParticipantTemplateEditItemWidget::onEditItem);
|
||||
m_buttonBox->getButton(LtsWidgets::DialogButton::Edit)->setText(tr("Apply"));
|
||||
|
||||
+1
-1
@@ -39,7 +39,7 @@ public:
|
||||
bool onEditItem() override;
|
||||
|
||||
protected:
|
||||
int editTypeId() const override { return m_editData.typeId(); }
|
||||
int editTypeId() const override { return m_editData.typeId; }
|
||||
int currentPartyId() const override { return 0; }
|
||||
|
||||
bool checkEquipNo(int equipNo);
|
||||
|
||||
+64
-63
@@ -4,6 +4,7 @@
|
||||
#include "participant_template_edit_model.h"
|
||||
#include <utility>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <ParticipantManagement/logger.h>
|
||||
#include "participant_firing_unit_validator.h"
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
#include <QtCore/QSet>
|
||||
@@ -12,18 +13,18 @@ namespace ParticipantManagement
|
||||
{
|
||||
QDataStream &operator<<(QDataStream &ds, const TemplateData &td)
|
||||
{
|
||||
ds << td.templateId()
|
||||
<< td.hierarchyNumber()
|
||||
<< td.equipmentNumber()
|
||||
<< td.typeId()
|
||||
<< QString::fromStdString(td.symbol())
|
||||
<< QString::fromStdString(td.name())
|
||||
<< QString::fromStdString(td.designator())
|
||||
<< QString::fromStdString(td.tacticalIdentifier())
|
||||
<< QString::fromStdString(td.info())
|
||||
<< td.modId()
|
||||
<< td.superiorModId()
|
||||
<< td.isDeleted();
|
||||
ds << td.templateId
|
||||
<< td.hierarchyNumber
|
||||
<< td.equipmentNumber
|
||||
<< td.typeId
|
||||
<< QString::fromStdString(td.symbol)
|
||||
<< QString::fromStdString(td.name)
|
||||
<< QString::fromStdString(td.designator)
|
||||
<< QString::fromStdString(td.tacticalIdentifier)
|
||||
<< QString::fromStdString(td.info)
|
||||
<< td.modId
|
||||
<< td.superiorModId
|
||||
<< td.isDeleted;
|
||||
|
||||
return ds;
|
||||
}
|
||||
@@ -46,17 +47,17 @@ QDataStream &operator>>(QDataStream &ds, TemplateData &td)
|
||||
>> superiorModId
|
||||
>> isDeleted;
|
||||
|
||||
td.templateId(templateId);
|
||||
td.equipmentNumber(equipmentNumber);
|
||||
td.typeId(typeId);
|
||||
td.symbol(symbol.toStdString());
|
||||
td.name(name.toStdString());
|
||||
td.designator(designator.toStdString());
|
||||
td.tacticalIdentifier(tacticalIdentifier.toStdString());
|
||||
td.info(info.toStdString());
|
||||
td.modId(modId);
|
||||
td.superiorModId(superiorModId);
|
||||
td.isDeleted(isDeleted);
|
||||
td.templateId = templateId;
|
||||
td.equipmentNumber = equipmentNumber;
|
||||
td.typeId = typeId;
|
||||
td.symbol = symbol.toStdString();
|
||||
td.name = name.toStdString();
|
||||
td.designator = designator.toStdString();
|
||||
td.tacticalIdentifier = tacticalIdentifier.toStdString();
|
||||
td.info = info.toStdString();
|
||||
td.modId = modId;
|
||||
td.superiorModId = superiorModId;
|
||||
td.isDeleted = isDeleted;
|
||||
|
||||
return ds;
|
||||
}
|
||||
@@ -78,7 +79,7 @@ ParticipantTemplateEditModel::ParticipantTemplateEditModel(QObject *parent,
|
||||
{
|
||||
connect(this, &ParticipantTemplateEditModel::signalDataDropped,
|
||||
this, &ParticipantTemplateEditModel::internalDataChanged);
|
||||
qRegisterMetaTypeStreamOperators<ParticipantManagement::TemplateData>();
|
||||
qRegisterMetaType<ParticipantManagement::TemplateData>();
|
||||
setMimeType(QStringLiteral("ParticipantTemplateEditModel_%1").arg(qlonglong(this)));
|
||||
|
||||
init();
|
||||
@@ -97,19 +98,19 @@ QVariant ParticipantTemplateEditModel::data(const QModelIndex &index, int role)
|
||||
switch (index.column())
|
||||
{
|
||||
case ColDesignator:
|
||||
return QString::fromStdString(templateData.designator());
|
||||
return QString::fromStdString(templateData.designator);
|
||||
case ColIdentifier:
|
||||
return QString::fromStdString(templateData.tacticalIdentifier());
|
||||
return QString::fromStdString(templateData.tacticalIdentifier);
|
||||
case ColTypeClass:
|
||||
return typeClassStringFromTypeId(templateData.typeId());
|
||||
return typeClassStringFromTypeId(templateData.typeId);
|
||||
case ColType:
|
||||
return ParticipantManagement::trTypeName(m_types.value(templateData.typeId()).name());
|
||||
return ParticipantManagement::trTypeName(m_types.value(templateData.typeId).name);
|
||||
case ColEquipmentNumber:
|
||||
if (templateData.equipmentNumber() != 0)
|
||||
return templateData.equipmentNumber();
|
||||
if (templateData.equipmentNumber != 0)
|
||||
return templateData.equipmentNumber;
|
||||
return QVariant();
|
||||
case ColTemplateId:
|
||||
return templateData.templateId();
|
||||
return templateData.templateId;
|
||||
}
|
||||
}
|
||||
return NGLTreeModel::data(index, role);
|
||||
@@ -143,15 +144,15 @@ std::vector<TemplateData> ParticipantTemplateEditModel::getChildrenOf(NGLTreeIte
|
||||
|
||||
std::vector<TemplateData> ret;
|
||||
ParticipantManagement::TemplateData templateData = item->data().value<ParticipantManagement::TemplateData>();
|
||||
templateData.superiorModId(parentId);
|
||||
templateData.hierarchyNumber(hierarchyNumber);
|
||||
if (templateData.modId() == 0)
|
||||
templateData.modId(++highestModId);
|
||||
templateData.superiorModId = parentId;
|
||||
templateData.hierarchyNumber = hierarchyNumber;
|
||||
if (templateData.modId == 0)
|
||||
templateData.modId = ++highestModId;
|
||||
|
||||
|
||||
for (int i = 0; i < item->childCount(); i++)
|
||||
{
|
||||
const auto c = getChildrenOf(item->child(i), templateData.modId(), i + 1, bOnlyModified, highestModId);
|
||||
const auto c = getChildrenOf(item->child(i), templateData.modId, i + 1, bOnlyModified, highestModId);
|
||||
ret.insert(ret.end(), c.begin(), c.end());
|
||||
}
|
||||
|
||||
@@ -165,8 +166,8 @@ std::vector<TemplateData> ParticipantTemplateEditModel::getChildrenOf(NGLTreeIte
|
||||
|
||||
bool ParticipantTemplateEditModel::onInsertRow(const QModelIndex &parent, ParticipantManagement::TemplateData templateData)
|
||||
{
|
||||
templateData.templateId(0);
|
||||
templateData.modId(0);
|
||||
templateData.templateId = 0;
|
||||
templateData.modId = 0;
|
||||
|
||||
QVariant data;
|
||||
data.setValue(templateData);
|
||||
@@ -186,7 +187,7 @@ bool ParticipantTemplateEditModel::onUpdateRow(const QModelIndex &index, const P
|
||||
data.setValue(templateData);
|
||||
NGLTreeItem *item = privateData(index);
|
||||
item->setIcon(QIcon());
|
||||
tryRenderSymbol(QString::fromStdString(templateData.symbol()), item);
|
||||
tryRenderSymbol(QString::fromStdString(templateData.symbol), item);
|
||||
|
||||
emit internalDataChanged();
|
||||
return setItemData(index, data, item->icon());
|
||||
@@ -201,9 +202,9 @@ bool ParticipantTemplateEditModel::onDeleteRow(const QModelIndex &idx, bool isFi
|
||||
{
|
||||
NGLTreeItem *item = privateData(idx);
|
||||
ParticipantManagement::TemplateData data = item->data().value<ParticipantManagement::TemplateData>();
|
||||
if (data.modId() != 0)
|
||||
if (data.modId != 0)
|
||||
{
|
||||
data.isDeleted(true);
|
||||
data.isDeleted = true;
|
||||
m_dataToDelete.append(data);
|
||||
}
|
||||
}
|
||||
@@ -238,7 +239,7 @@ std::vector<ParticipantManagement::TemplateData> ParticipantTemplateEditModel::t
|
||||
{
|
||||
|
||||
for (auto &templ : templateDatas)
|
||||
templ.templateId(0);
|
||||
templ.templateId = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -268,8 +269,8 @@ QSet<int> ParticipantTemplateEditModel::usedEquipmentNumbers(NGLTreeItem *item)
|
||||
{
|
||||
QSet<int> ret;
|
||||
const TemplateData data = item->data().value<ParticipantManagement::TemplateData>();
|
||||
if (data.equipmentNumber() != 0)
|
||||
ret += data.equipmentNumber();
|
||||
if (data.equipmentNumber != 0)
|
||||
ret += data.equipmentNumber;
|
||||
|
||||
for (int i = 0; i < item->childCount(); ++i)
|
||||
ret += usedEquipmentNumbers(item->child(i));
|
||||
@@ -308,7 +309,7 @@ bool ParticipantTemplateEditModel::canDropMimeData(const QMimeData *data,
|
||||
return false;
|
||||
|
||||
const TemplateData &parentItem = getTemplateData(parent);
|
||||
if (!isUnitType(parentItem.typeId()))
|
||||
if (!isUnitType(parentItem.typeId))
|
||||
return false;
|
||||
|
||||
DEBUG_LOG(m_logger) << "can drop on " << row << ", " << column << ", parent: "
|
||||
@@ -337,16 +338,16 @@ bool ParticipantTemplateEditModel::canDropMimeData(const QMimeData *data,
|
||||
|
||||
if (restrictions.testFlag(FiringUnitValidator::ONLY_SAME_GEAR_CLASS_ARTILLERY_ALLOWED))
|
||||
{
|
||||
if (!m_firingUnitValidator->isSameGearClassArtillery(parentItem.typeId(), pdSource.typeId()))
|
||||
if (!m_firingUnitValidator->isSameGearClassArtillery(parentItem.typeId, pdSource.typeId))
|
||||
return false;
|
||||
|
||||
if (m_firingUnitValidator->isArtilleryUnit(parentItem.typeId()) && m_firingUnitValidator->isArtilleryUnit(pdSource.typeId()))
|
||||
if (m_firingUnitValidator->isArtilleryUnit(parentItem.typeId) && m_firingUnitValidator->isArtilleryUnit(pdSource.typeId))
|
||||
return false;
|
||||
}
|
||||
|
||||
if (restrictions.testFlag(FiringUnitValidator::NO_ARTILLERY_PARTICIPANTS_ALLOWED))
|
||||
{
|
||||
if (m_firingUnitValidator->isArtilleryWeaponSystem(pdSource.typeId()))
|
||||
if (m_firingUnitValidator->isArtilleryWeaponSystem(pdSource.typeId))
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -354,10 +355,10 @@ bool ParticipantTemplateEditModel::canDropMimeData(const QMimeData *data,
|
||||
{
|
||||
const Type allowedType = m_firingUnitValidator->getAllowedType(this, parent);
|
||||
|
||||
if (pdSource.typeId() != allowedType.id())
|
||||
if (pdSource.typeId != allowedType.id)
|
||||
return false;
|
||||
|
||||
if (m_dtc->isAdlerVerbund(pdSource.typeId()))
|
||||
if (m_dtc->isAdlerVerbund(pdSource.typeId))
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -383,20 +384,20 @@ bool ParticipantTemplateEditModel::onInsertTemplate(int rootId,
|
||||
for (const ParticipantManagement::TemplateParticipant &tmpl : std::as_const(templateMap))
|
||||
{
|
||||
|
||||
if (!tmpl.templateId())
|
||||
if (!tmpl.templateId)
|
||||
continue;
|
||||
|
||||
parentId2id[tmpl.superiorTemplateId()] += tmpl.templateId();
|
||||
parentId2id[tmpl.superiorTemplateId] += tmpl.templateId;
|
||||
|
||||
auto data = m_dtc->convertFromParticipantTemplateToTemplateData(tmpl);
|
||||
if (asCopy)
|
||||
{
|
||||
data.templateId(0);
|
||||
data.modId(0);
|
||||
data.templateId = 0;
|
||||
data.modId = 0;
|
||||
}
|
||||
if (usedEquipNo.contains(data.equipmentNumber()))
|
||||
data.equipmentNumber(0);
|
||||
tmap.insert(tmpl.templateId(), data);
|
||||
if (usedEquipNo.contains(data.equipmentNumber))
|
||||
data.equipmentNumber = 0;
|
||||
tmap.insert(tmpl.templateId, data);
|
||||
}
|
||||
|
||||
NGLTreeItem *root = parentIndex.isValid() ? privateData(parentIndex) : m_rootItem;
|
||||
@@ -430,16 +431,16 @@ void ParticipantTemplateEditModel::insertChildrenOf(int parentId,
|
||||
const int templateId = it.key();
|
||||
const TemplateData &data = it.value();
|
||||
|
||||
if (data.hierarchyNumber() <= 0)
|
||||
if (data.hierarchyNumber <= 0)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Invalid / no hierarchy number set for participant " << data.templateId() << " - ignoring";
|
||||
WARNING_LOG(m_logger) << "Invalid / no hierarchy number set for participant " << data.templateId << " - ignoring";
|
||||
continue;
|
||||
}
|
||||
auto hierIt = currentHierachyNumbers.insert(data.hierarchyNumber(), data.hierarchyNumber());
|
||||
auto hierIt = currentHierachyNumbers.insert(data.hierarchyNumber, data.hierarchyNumber);
|
||||
const int insertPos = std::distance(currentHierachyNumbers.begin(), hierIt);
|
||||
|
||||
NGLTreeItem *childItem = createItem(QVariant::fromValue(data), QIcon());
|
||||
DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.templateId() << ", " << data.hierarchyNumber()
|
||||
DEBUG_LOG(m_logger) << "insert Child " << childItem << "(" << data.templateId << ", " << data.hierarchyNumber
|
||||
<< ") to parent " << parent << " at pos " << insertPos;
|
||||
insertRow(insertPos, parentIdx, childItem);
|
||||
const QModelIndex childIdx = index(insertPos, 0, parentIdx);
|
||||
@@ -452,11 +453,11 @@ NGLTreeItem *ParticipantTemplateEditModel::createItem(const QVariant &data, cons
|
||||
{
|
||||
auto ret = NGLTreeModel::createItem(data, icon);
|
||||
const TemplateData templateData = data.value<TemplateData>();
|
||||
if (templateData.symbol().size() != 0)
|
||||
if (templateData.symbol.size() != 0)
|
||||
{
|
||||
ParticipantTemplateEditModel *that = const_cast<ParticipantTemplateEditModel*>(this);
|
||||
|
||||
that->tryRenderSymbol(QString::fromStdString(templateData.symbol()), ret);
|
||||
that->tryRenderSymbol(QString::fromStdString(templateData.symbol), ret);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
+10
-10
@@ -40,7 +40,7 @@ bool ParticipantTimePointModel::onReinitModel(int partyId, const QSet<int> &chec
|
||||
return true;
|
||||
|
||||
m_partyId = partyId;
|
||||
m_partyColor = QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color()));
|
||||
m_partyColor = QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color));
|
||||
|
||||
m_checkedParticipantsTimepointModel = checkedParticipants;
|
||||
m_csTimePointModel = cs;
|
||||
@@ -52,8 +52,8 @@ bool ParticipantTimePointModel::onReinitModel(int partyId, const QSet<int> &chec
|
||||
void ParticipantTimePointModel::startRequest()
|
||||
{
|
||||
ParticipantManagement::GetParticipantsRequest req;
|
||||
req.partyId(partyId());
|
||||
req.timeStamp(m_currentTimePoint);
|
||||
req.partyId = partyId();
|
||||
req.timeStamp = m_currentTimePoint;
|
||||
|
||||
m_requestHelper.startSingleRequest([this, req]() { return m_ppmFtc->getParticipantsRequest(req, this); });
|
||||
}
|
||||
@@ -66,21 +66,21 @@ void ParticipantTimePointModel::onGetParticipantsReply(const GetParticipantsRepl
|
||||
|
||||
QHash<int, ParticipantData> tmap;
|
||||
QHash<int, QSet<int>> parentId2id;
|
||||
tmap.reserve(reply.participants().size());
|
||||
parentId2id.reserve(reply.participants().size());
|
||||
tmap.reserve(reply.participants.size());
|
||||
parentId2id.reserve(reply.participants.size());
|
||||
|
||||
for (const auto &part : reply.participants())
|
||||
for (const auto &part : reply.participants)
|
||||
{
|
||||
if (part.isDeleted())
|
||||
if (part.isDeleted)
|
||||
continue;
|
||||
|
||||
if (part.partyId() != m_partyId)
|
||||
if (part.partyId != m_partyId)
|
||||
continue;
|
||||
|
||||
|
||||
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));
|
||||
};
|
||||
|
||||
|
||||
|
||||
+5
-5
@@ -53,14 +53,14 @@ bool ParticipantTreeEditHandler::isContainer() const
|
||||
const QModelIndex idx = selectedIndexView();
|
||||
if (!idx.isValid())
|
||||
return false;
|
||||
const int typeId = m_model->privateData(idx)->participant.typeId();
|
||||
const int typeId = m_model->privateData(idx)->participant.typeId;
|
||||
if (typeId <= 0)
|
||||
return false;
|
||||
|
||||
if (m_asSupportService)
|
||||
return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::SupportUnit;
|
||||
return m_dtc->type(typeId).typeClass == ParticipantManagement::TypeClass::SupportUnit;
|
||||
|
||||
return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::Unit;
|
||||
return m_dtc->type(typeId).typeClass == ParticipantManagement::TypeClass::Unit;
|
||||
}
|
||||
|
||||
QVector<int> ParticipantTreeEditHandler::usedEquipmentNumbers() const
|
||||
@@ -128,8 +128,8 @@ void ParticipantTreeEditHandler::partyHasChanged(int newPartyId, bool keepExpand
|
||||
bool ParticipantTreeEditHandler::onApplyChanges()
|
||||
{
|
||||
ModifyParticipantDataRequest req;
|
||||
req.data(m_model->participantData());
|
||||
if (req.data().size() == 0)
|
||||
req.data = m_model->participantData();
|
||||
if (req.data.size() == 0)
|
||||
return true;
|
||||
|
||||
if (!m_requestHelper)
|
||||
|
||||
+1
@@ -9,6 +9,7 @@
|
||||
#include <ppmcommon_export.h>
|
||||
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
|
||||
+5
-5
@@ -12,7 +12,7 @@ namespace ParticipantManagement
|
||||
|
||||
static ProjectDataManagement::VulnerabilityClass vulnerabilityClassFromTypeClass(TypeClass tc)
|
||||
{
|
||||
switch (tc.underlying())
|
||||
switch (tc)
|
||||
{
|
||||
case TypeClass::Human:
|
||||
return ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries;
|
||||
@@ -54,7 +54,7 @@ QVector<ProjectDataManagement::VulnerabilityState> vulnerabilityStatesForTypeCla
|
||||
const bool hasVulnerabilityStateTemporarySeverance = ps->value(QStringLiteral("ppm"),
|
||||
QStringLiteral("hasVulnerabilityStateTemporarySeverance")).toBool();
|
||||
|
||||
switch (tc.underlying())
|
||||
switch (tc)
|
||||
{
|
||||
case TypeClass::Human:
|
||||
{
|
||||
@@ -128,7 +128,7 @@ QVector<ProjectDataManagement::OcCode> ocCodeForTypeClass(TypeClass tc)
|
||||
const bool hasOcCodeOptimalTreatment = ps->value(QStringLiteral("ppm"),
|
||||
QStringLiteral("hasOcCodeOptimalTreatment")).toBool();
|
||||
|
||||
switch (tc.underlying())
|
||||
switch (tc)
|
||||
{
|
||||
case TypeClass::Human:
|
||||
{
|
||||
@@ -165,12 +165,12 @@ void insertVulnerabilityStates(QComboBox *cbx, TypeClass tc)
|
||||
VulnerabilityClass cls = vulnerabilityClassFromTypeClass(tc);
|
||||
const auto vec = vulnerabilityStatesForTypeClass(tc);
|
||||
for (const auto vs : vec)
|
||||
cbx->addItem(toString(vs, cls), vs.underlying());
|
||||
cbx->addItem(toString(vs, cls), static_cast<int>(vs));
|
||||
|
||||
|
||||
const auto ocVec = ocCodeForTypeClass(tc);
|
||||
for (const auto vs : ocVec)
|
||||
cbx->addItem(toString(vs), vs.underlying()+100);
|
||||
cbx->addItem(toString(vs), static_cast<int>(vs)+100);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user