Migrates residual Lts sources to generated rtiddsgen API
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
1 parent
5485a90385
commit
881d44f4dd
512 files changed
+6887
-6426
No files matched your search
+2
-2
@@ -18,7 +18,7 @@ namespace ParticipantManagement
|
||||
|
||||
|
||||
|
||||
static int s_lastTypeClassUsed = ParticipantManagement::TypeClass_def::Human;
|
||||
static int s_lastTypeClassUsed = ParticipantManagement::TypeClass::Human;
|
||||
static int s_lastTypeUsed = -1;
|
||||
|
||||
ParticipantEditItemWidgetBase::ParticipantEditItemWidgetBase(bool asSupportService,
|
||||
@@ -140,7 +140,7 @@ void ParticipantEditItemWidgetBase::onFillTypeCb()
|
||||
{
|
||||
QSignalBlocker blocker(m_ui->cbType);
|
||||
|
||||
TypeClass currentClass(static_cast<TypeClass_def::type>(m_ui->cbTypeClass->currentData().toInt()));
|
||||
TypeClass currentClass(static_cast<TypeClass>(m_ui->cbTypeClass->currentData().toInt()));
|
||||
m_ppmGuiCbxIfc->fillTypeComboBox(m_ui->cbType, currentClass);
|
||||
|
||||
if (!m_disabledTypeIds.isEmpty())
|
||||
|
||||
+2
-2
@@ -101,7 +101,7 @@ static ParticipantData qVariantToParticipant(const QVariant &data)
|
||||
pd.designator(designator.toStdString());
|
||||
pd.tacticalIdentifier(tacticalIdentifier.toStdString());
|
||||
pd.info(info.toStdString());
|
||||
pd.assignState(static_cast<ParticipantManagement::ParticipantAssignState::inner_enum>(assignState));
|
||||
pd.assignState(static_cast<ParticipantManagement::ParticipantAssignState>(assignState));
|
||||
pd.isSimulated(isSimulated);
|
||||
pd.isDeleted(isDeleted);
|
||||
pd.modId(modId);
|
||||
@@ -376,7 +376,7 @@ bool ParticipantEditModel::canDropMimeData(const QMimeData *data,
|
||||
qDeleteAll(tiSources);
|
||||
|
||||
TypeClass dataTypeClass = typeClassIdFromTypeId(pdSource.typeId());
|
||||
bool isDataTypeClassSupport = dataTypeClass == TypeClass::inner_enum::SupportEntity || dataTypeClass == TypeClass::inner_enum::SupportUnit;
|
||||
bool isDataTypeClassSupport = dataTypeClass == TypeClass::SupportEntity || dataTypeClass == TypeClass::SupportUnit;
|
||||
bool isOwnTypeClassSupport = m_partyId == 1;
|
||||
|
||||
if (isOwnTypeClassSupport != isDataTypeClassSupport)
|
||||
|
||||
+5
-5
@@ -76,7 +76,7 @@ void FiringUnitValidator::fetchArtilleryTypes()
|
||||
if (!isArtilleryType(type))
|
||||
return;
|
||||
|
||||
if (type.typeClass() == ParticipantManagement::TypeClass::inner_enum::Unit)
|
||||
if (type.typeClass() == ParticipantManagement::TypeClass::Unit)
|
||||
m_firingUnitTypeIds.insert(type.id());
|
||||
else
|
||||
m_artilleryParticipantTypeIds.insert(type.id());
|
||||
@@ -111,24 +111,24 @@ bool FiringUnitValidator::isArtilleryWeaponSystem(int typeId) const
|
||||
|
||||
bool FiringUnitValidator::isSameGearClassArtillery(int typeIdA, int typeIdB) const
|
||||
{
|
||||
const ProjectDataManagement::GearClass::type gearClassA = getGearClassType(typeIdA);
|
||||
const ProjectDataManagement::GearClass gearClassA = getGearClassType(typeIdA);
|
||||
|
||||
if (gearClassA == ProjectDataManagement::GearClass::GearClass_Unknown)
|
||||
return false;
|
||||
|
||||
const ProjectDataManagement::GearClass::type gearClassB = getGearClassType(typeIdB);
|
||||
const ProjectDataManagement::GearClass gearClassB = getGearClassType(typeIdB);
|
||||
|
||||
return gearClassA == gearClassB;
|
||||
}
|
||||
|
||||
ProjectDataManagement::GearClass::type FiringUnitValidator::getGearClassType(int typeId) const
|
||||
ProjectDataManagement::GearClass FiringUnitValidator::getGearClassType(int typeId) const
|
||||
{
|
||||
const Type type = m_ppmDtc->type(typeId);
|
||||
const QJsonDocument properties = QJsonDocument::fromJson(QByteArray::fromStdString(type.properties()));
|
||||
const QJsonObject propertiesObject = properties.object();
|
||||
const int gearClassId = propertiesObject.value(QStringLiteral("gearClassId")).toInt(ProjectDataManagement::GearClass::GearClass_Unknown);
|
||||
|
||||
return static_cast<ProjectDataManagement::GearClass::type>(gearClassId);
|
||||
return static_cast<ProjectDataManagement::GearClass>(gearClassId);
|
||||
}
|
||||
|
||||
}
|
||||
+2
-2
@@ -43,7 +43,7 @@ public:
|
||||
return !restrictions.testFlag(IS_AT_MAX_CAPACITY);
|
||||
}
|
||||
template<typename T>
|
||||
ProjectDataManagement::GearClass::type getGearClassType(const T *model, const QModelIndex &participantIndex) const
|
||||
ProjectDataManagement::GearClass getGearClassType(const T *model, const QModelIndex &participantIndex) const
|
||||
{
|
||||
if (!model)
|
||||
return {};
|
||||
@@ -127,7 +127,7 @@ public:
|
||||
bool isArtilleryWeaponSystem(int typeId) const;
|
||||
bool isSameGearClassArtillery(int typeIdA, int typeIdB) const;
|
||||
|
||||
ProjectDataManagement::GearClass::type getGearClassType(int typeId) const;
|
||||
ProjectDataManagement::GearClass getGearClassType(int typeId) const;
|
||||
|
||||
private:
|
||||
int getTypeId(const ParticipantEditModel *model, const QModelIndex &index) const;
|
||||
|
||||
+2
-2
@@ -58,9 +58,9 @@ bool ParticipantTreeEditHandler::isContainer() const
|
||||
return false;
|
||||
|
||||
if (m_asSupportService)
|
||||
return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass_def::SupportUnit;
|
||||
return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::SupportUnit;
|
||||
|
||||
return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass_def::Unit;
|
||||
return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::Unit;
|
||||
}
|
||||
|
||||
QVector<int> ParticipantTreeEditHandler::usedEquipmentNumbers() const
|
||||
|
||||
+23
-23
@@ -15,21 +15,21 @@ static ProjectDataManagement::VulnerabilityClass vulnerabilityClassFromTypeClass
|
||||
switch (tc.underlying())
|
||||
{
|
||||
case TypeClass::Human:
|
||||
return ProjectDataManagement::VulnerabilityClass::SoldierInjuries;
|
||||
return ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries;
|
||||
case TypeClass::GroundVehicle:
|
||||
case TypeClass::Vessel:
|
||||
case TypeClass::VehicleWithGear:
|
||||
case TypeClass::WeaponSystem:
|
||||
return ProjectDataManagement::VulnerabilityClass::VehicleDamages;
|
||||
return ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages;
|
||||
case TypeClass::SupportEntity:
|
||||
case TypeClass::SupportUnit:
|
||||
case TypeClass::Unit:
|
||||
case TypeClass::Unknown:
|
||||
case TypeClass::Aircraft:
|
||||
return ProjectDataManagement::VulnerabilityClass::Unknown;
|
||||
return ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_Unknown;
|
||||
}
|
||||
Q_ASSERT(false);
|
||||
return ProjectDataManagement::VulnerabilityClass::Unknown;
|
||||
return ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_Unknown;
|
||||
}
|
||||
|
||||
|
||||
@@ -60,20 +60,20 @@ QVector<ProjectDataManagement::VulnerabilityState> vulnerabilityStatesForTypeCla
|
||||
{
|
||||
QVector<ProjectDataManagement::VulnerabilityState> ret;
|
||||
|
||||
ret += VulnerabilityState::CombatReady;
|
||||
ret += VulnerabilityState::VulnerabilityState_CombatReady;
|
||||
if (hasVulnerabilityStateLightDamage)
|
||||
ret += VulnerabilityState::LightDamage;
|
||||
ret += VulnerabilityState::VulnerabilityState_LightDamage;
|
||||
if (hasVulnerabilityStateMediumDamage)
|
||||
ret += VulnerabilityState::MediumDamage;
|
||||
ret += VulnerabilityState::VulnerabilityState_MediumDamage;
|
||||
if (hasVulnerabilityStateHeavyDamage)
|
||||
ret += VulnerabilityState::HeavyDamage;
|
||||
ret += VulnerabilityState::VulnerabilityState_HeavyDamage;
|
||||
if (hasVulnerabilityStateWeaponSystemDamage)
|
||||
ret += VulnerabilityState::WeaponSystemDamage;
|
||||
ret += VulnerabilityState::VulnerabilityState_WeaponSystemDamage;
|
||||
if (hasVulnerabilityStateVisibleWeaponSystemDamage)
|
||||
ret += VulnerabilityState::VisibleWeaponSystemDamage;
|
||||
ret += VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage;
|
||||
if (hasVulnerabilityStateTemporarySeverance)
|
||||
ret += VulnerabilityState::TemporarySeverance;
|
||||
ret += VulnerabilityState::CatastrophicKill;
|
||||
ret += VulnerabilityState::VulnerabilityState_TemporarySeverance;
|
||||
ret += VulnerabilityState::VulnerabilityState_CatastrophicKill;
|
||||
return ret;
|
||||
}
|
||||
case TypeClass::GroundVehicle:
|
||||
@@ -84,24 +84,24 @@ QVector<ProjectDataManagement::VulnerabilityState> vulnerabilityStatesForTypeCla
|
||||
|
||||
QVector<ProjectDataManagement::VulnerabilityState> ret;
|
||||
|
||||
ret += VulnerabilityState::CombatReady;
|
||||
ret += VulnerabilityState::VulnerabilityState_CombatReady;
|
||||
if (hasVulnerabilityStateLightDamage)
|
||||
ret += VulnerabilityState::LightDamage;
|
||||
ret += VulnerabilityState::VulnerabilityState_LightDamage;
|
||||
if (hasVulnerabilityStateMediumDamage)
|
||||
ret += VulnerabilityState::MediumDamage;
|
||||
ret += VulnerabilityState::VulnerabilityState_MediumDamage;
|
||||
if (hasVulnerabilityStateHeavyDamage)
|
||||
ret += VulnerabilityState::HeavyDamage;
|
||||
ret += VulnerabilityState::VulnerabilityState_HeavyDamage;
|
||||
if (hasVulnerabilityStateMobilityKill)
|
||||
ret += VulnerabilityState::MobilityKill;
|
||||
ret += VulnerabilityState::VulnerabilityState_MobilityKill;
|
||||
if (hasVulnerabilityStateVisibleMobilityKill)
|
||||
ret += VulnerabilityState::VisibleMobilityKill;
|
||||
ret += VulnerabilityState::VulnerabilityState_VisibleMobilityKill;
|
||||
if (hasVulnerabilityStateWeaponSystemDamage)
|
||||
ret += VulnerabilityState::WeaponSystemDamage;
|
||||
ret += VulnerabilityState::VulnerabilityState_WeaponSystemDamage;
|
||||
if (hasVulnerabilityStateVisibleWeaponSystemDamage)
|
||||
ret += VulnerabilityState::VisibleWeaponSystemDamage;
|
||||
ret += VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage;
|
||||
if (hasVulnerabilityStateTemporarySeverance)
|
||||
ret += VulnerabilityState::TemporarySeverance;
|
||||
ret += VulnerabilityState::CatastrophicKill;
|
||||
ret += VulnerabilityState::VulnerabilityState_TemporarySeverance;
|
||||
ret += VulnerabilityState::VulnerabilityState_CatastrophicKill;
|
||||
return ret;
|
||||
}
|
||||
case TypeClass::SupportEntity:
|
||||
@@ -110,7 +110,7 @@ QVector<ProjectDataManagement::VulnerabilityState> vulnerabilityStatesForTypeCla
|
||||
return {};
|
||||
case TypeClass::Unknown:
|
||||
case TypeClass::Aircraft:
|
||||
return { VulnerabilityState::CombatReady, VulnerabilityState::CatastrophicKill };
|
||||
return { VulnerabilityState::VulnerabilityState_CombatReady, VulnerabilityState::VulnerabilityState_CatastrophicKill };
|
||||
}
|
||||
Q_ASSERT(false);
|
||||
return {};
|
||||
|
||||
+3
-3
@@ -221,11 +221,11 @@ msdl_1::MilitaryScenarioType::ForceSides_type Private::createTagForceSides(const
|
||||
ParticipantManagement::Role role = itRelationship.value().role();
|
||||
|
||||
msdl_1::ForceSideType::Associations_type::Association_type::Relationship_type relType = msdl_1::ForceSideType::Associations_type::Association_type::Relationship_type::UNK;
|
||||
if (role == ParticipantManagement::Role_def::Enemy)
|
||||
if (role == ParticipantManagement::Role::Enemy)
|
||||
relType = msdl_1::ForceSideType::Associations_type::Association_type::Relationship_type::HO;
|
||||
else if (role == ParticipantManagement::Role_def::Friend)
|
||||
else if (role == ParticipantManagement::Role::Friend)
|
||||
relType = msdl_1::ForceSideType::Associations_type::Association_type::Relationship_type::FR;
|
||||
else if (role == ParticipantManagement::Role_def::Neutral)
|
||||
else if (role == ParticipantManagement::Role::Neutral)
|
||||
relType = msdl_1::ForceSideType::Associations_type::Association_type::Relationship_type::NEUTRL;
|
||||
|
||||
msdl_1::ForceSideType::Associations_type::Association_type aType(itRelationship.key().toStdString().c_str(), relType);
|
||||
|
||||
+2
-2
@@ -375,9 +375,9 @@ bool ParticipantPoolModel::isValidTypeClass(int typeId) const
|
||||
const TypeClass tc = m_dtc->type(typeId).typeClass();
|
||||
switch (tc.underlying())
|
||||
{
|
||||
case TypeClass_def::Unit:
|
||||
case TypeClass::Unit:
|
||||
return !m_asSupportService;
|
||||
case TypeClass_def::SupportUnit:
|
||||
case TypeClass::SupportUnit:
|
||||
return m_asSupportService;
|
||||
default:
|
||||
break;
|
||||
|
||||
+18
-18
@@ -381,8 +381,8 @@ void ParticipantConfigDialog::fillCbx()
|
||||
m_ui->cbStatus->addItem(tr("No Change"), -1);
|
||||
if ( m_isTarget)
|
||||
{
|
||||
m_ui->cbStatus->addItem(tr("CombatReady"), ProjectDataManagement::VulnerabilityState::CombatReady);
|
||||
m_ui->cbStatus->addItem(tr("Catastrophic Kill / Killed"), ProjectDataManagement::VulnerabilityState::CatastrophicKill);
|
||||
m_ui->cbStatus->addItem(tr("CombatReady"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
|
||||
m_ui->cbStatus->addItem(tr("Catastrophic Kill / Killed"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill);
|
||||
}
|
||||
else
|
||||
insertVulnerabilityStates(m_ui->cbStatus, m_typeClass);
|
||||
@@ -433,25 +433,25 @@ void ParticipantConfigDialog::fillVitalityCbx()
|
||||
m_ui->cbVitality->setEnabled(false);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::VulnerabilityState::LightDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage:
|
||||
{
|
||||
for (int i = 90 ; i >= 70; i -= 10)
|
||||
m_ui->cbVitality->addItem(QString::number(i), i);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::VulnerabilityState::MediumDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage:
|
||||
{
|
||||
for (int i = 60 ; i >= 40; i -= 10)
|
||||
m_ui->cbVitality->addItem(QString::number(i), i);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::VulnerabilityState::HeavyDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage:
|
||||
{
|
||||
for (int i = 30 ; i >= 10; i -= 10)
|
||||
m_ui->cbVitality->addItem(QString::number(i), i);
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::VulnerabilityState::CombatReady:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
|
||||
{
|
||||
m_ui->cbVitality->removeItem(0);
|
||||
m_ui->cbVitality->addItem(QString::number(100), 100);
|
||||
@@ -585,7 +585,7 @@ bool ParticipantConfigDialog::apply()
|
||||
}
|
||||
else
|
||||
{
|
||||
const ProjectDataManagement::VulnerabilityState state = static_cast<ProjectDataManagement::VulnerabilityState_def::type>(m_ui->cbStatus->currentData().toInt());
|
||||
const ProjectDataManagement::VulnerabilityState state = static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cbStatus->currentData().toInt());
|
||||
if (m_ui->cbStatus->currentIndex() == 1 ||
|
||||
m_ui->cbResetGearCharge->isChecked() ||
|
||||
m_ui->cbResetMedSupplies->isChecked() ||
|
||||
@@ -595,7 +595,7 @@ bool ParticipantConfigDialog::apply()
|
||||
req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
|
||||
req.restockCharges(m_ui->cbResetGearCharge->isChecked());
|
||||
req.resetManipulation(m_ui->cbResetManipulation->isChecked());
|
||||
req.resetVulnerabilityState(state == ProjectDataManagement::VulnerabilityState::CombatReady);
|
||||
req.resetVulnerabilityState(state == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
|
||||
req.restockSanitationMaterial(m_ui->cbResetMedSupplies->isChecked());
|
||||
req.participantIds(participantIds);
|
||||
m_requestHelper->addRequest([req, this]()
|
||||
@@ -610,7 +610,7 @@ bool ParticipantConfigDialog::apply()
|
||||
{
|
||||
ModifyStateRequest req;
|
||||
req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
|
||||
req.vulnerabilityState(state == ProjectDataManagement::VulnerabilityState::NoChange ? ProjectDataManagement::VulnerabilityState::CombatReady : state);
|
||||
req.vulnerabilityState(state == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange ? ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady : state);
|
||||
req.participantIds(participantIds);
|
||||
req.vitality(m_ui->cbVitality->currentData().toInt());
|
||||
if(req.vitality() > 0)
|
||||
@@ -626,24 +626,24 @@ bool ParticipantConfigDialog::apply()
|
||||
|
||||
if (m_modeChanged)
|
||||
{
|
||||
ProjectDataManagement::LanguageConfiguration lang = static_cast<ProjectDataManagement::LanguageConfiguration_def::type>(m_ui->cbLanguage->currentData().toInt());
|
||||
ProjectDataManagement::OperationMode opMode = static_cast<ProjectDataManagement::OperationMode_def::type>(m_ui->cbCheating->currentData().toInt());
|
||||
ProjectDataManagement::WphMode helmet = static_cast<ProjectDataManagement::WphMode_def::type>(m_ui->cbHelmet->currentData().toInt());
|
||||
ProjectDataManagement::WphMode vest = static_cast<ProjectDataManagement::WphMode_def::type>(m_ui->cbVest->currentData().toInt());
|
||||
ProjectDataManagement::PersonalProtection personalProtection = static_cast<ProjectDataManagement::PersonalProtection_def::type>(m_ui->cbPersonalProtection->currentData().toInt());
|
||||
ProjectDataManagement::ProtectionLevel protectionLevel = static_cast<ProjectDataManagement::ProtectionLevel_def::type>(m_ui->cbProtectionLevel->currentData().toInt());
|
||||
ProjectDataManagement::LanguageConfiguration lang = static_cast<ProjectDataManagement::LanguageConfiguration>(m_ui->cbLanguage->currentData().toInt());
|
||||
ProjectDataManagement::OperationMode opMode = static_cast<ProjectDataManagement::OperationMode>(m_ui->cbCheating->currentData().toInt());
|
||||
ProjectDataManagement::WphMode helmet = static_cast<ProjectDataManagement::WphMode>(m_ui->cbHelmet->currentData().toInt());
|
||||
ProjectDataManagement::WphMode vest = static_cast<ProjectDataManagement::WphMode>(m_ui->cbVest->currentData().toInt());
|
||||
ProjectDataManagement::PersonalProtection personalProtection = static_cast<ProjectDataManagement::PersonalProtection>(m_ui->cbPersonalProtection->currentData().toInt());
|
||||
ProjectDataManagement::ProtectionLevel protectionLevel = static_cast<ProjectDataManagement::ProtectionLevel>(m_ui->cbProtectionLevel->currentData().toInt());
|
||||
ProjectDataManagement::HandgrenadeSearchMode grenadeSearch;
|
||||
if(!m_ui->cbGrenadeSearchMode->isHidden())
|
||||
{
|
||||
grenadeSearch = static_cast<ProjectDataManagement::HandgrenadeSearchMode_def::type>(m_ui->cbGrenadeSearchMode->currentData().toInt());
|
||||
grenadeSearch = static_cast<ProjectDataManagement::HandgrenadeSearchMode>(m_ui->cbGrenadeSearchMode->currentData().toInt());
|
||||
}
|
||||
else
|
||||
{
|
||||
grenadeSearch = ProjectDataManagement::HandgrenadeSearchMode::NoChange;
|
||||
}
|
||||
|
||||
ProjectDataManagement::InternationalMode internationalMode = static_cast<ProjectDataManagement::InternationalMode_def::type>(m_ui->cbInternationalMode->currentData().toInt());
|
||||
ProjectDataManagement::ABCProtectionMode abcProtectionMode = static_cast<ProjectDataManagement::ABCProtectionMode_def::type>(m_ui->cbABCProtectionMode->currentData().toInt());
|
||||
ProjectDataManagement::InternationalMode internationalMode = static_cast<ProjectDataManagement::InternationalMode>(m_ui->cbInternationalMode->currentData().toInt());
|
||||
ProjectDataManagement::ABCProtectionMode abcProtectionMode = static_cast<ProjectDataManagement::ABCProtectionMode>(m_ui->cbABCProtectionMode->currentData().toInt());
|
||||
|
||||
int reactDecontMinutes = m_ui->slDecontamination->value() * 10;
|
||||
int reactMaintenanceMinutes = m_ui->slMaintenance->value() * 10;
|
||||
|
||||
+2
-2
@@ -100,7 +100,7 @@ static ParticipantData qVariantToParticipant(const QVariant &data)
|
||||
pd.designator(designator.toStdString());
|
||||
pd.tacticalIdentifier(tacticalIdentifier.toStdString());
|
||||
pd.info(info.toStdString());
|
||||
pd.assignState(static_cast<ParticipantManagement::ParticipantAssignState::inner_enum>(assignState));
|
||||
pd.assignState(static_cast<ParticipantManagement::ParticipantAssignState>(assignState));
|
||||
pd.isSimulated(isSimulated);
|
||||
pd.isDeleted(isDeleted);
|
||||
pd.modId(modId);
|
||||
@@ -386,7 +386,7 @@ bool ParticipantConfigModel::canDropMimeData(const QMimeData *data,
|
||||
qDeleteAll(tiSources);
|
||||
|
||||
TypeClass dataTypeClass = typeClassIdFromTypeId(pdSource.typeId());
|
||||
bool isDataTypeClassSupport = dataTypeClass == TypeClass::inner_enum::SupportEntity || dataTypeClass == TypeClass::inner_enum::SupportUnit;
|
||||
bool isDataTypeClassSupport = dataTypeClass == TypeClass::SupportEntity || dataTypeClass == TypeClass::SupportUnit;
|
||||
bool isOwnTypeClassSupport = m_partyId == 1;
|
||||
|
||||
if (isOwnTypeClassSupport != isDataTypeClassSupport)
|
||||
|
||||
+11
-11
@@ -27,7 +27,7 @@ ParticipantHistoryDialogModel::ParticipantHistoryDialogModel(QObject *parent)
|
||||
},
|
||||
parent)
|
||||
, m_ddsId(-1)
|
||||
, m_vulnerabilityClass(ProjectDataManagement::VulnerabilityClass::SoldierInjuries)
|
||||
, m_vulnerabilityClass(ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries)
|
||||
, m_dtc(nullptr)
|
||||
, m_pdmDtc(nullptr)
|
||||
{}
|
||||
@@ -49,8 +49,8 @@ bool ParticipantHistoryDialogModel::initModel(int dds_id,
|
||||
const auto typeClass = dtc->type(part.typeId()).typeClass();
|
||||
|
||||
m_vulnerabilityClass = (typeClass == TypeClass::Human) ?
|
||||
ProjectDataManagement::VulnerabilityClass_def::SoldierInjuries :
|
||||
ProjectDataManagement::VulnerabilityClass_def::VehicleDamages;
|
||||
ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
|
||||
ProjectDataManagement::VulnerabilityClass::VehicleDamages;
|
||||
|
||||
reinitModel(m_dtc->dynamicParticipantData(m_ddsId).stateHistory());
|
||||
return true;
|
||||
@@ -68,13 +68,13 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c
|
||||
if(data.originatorType().underlying() == ProjectDataManagement::StateChangeOriginator::Sanitation)
|
||||
return {};
|
||||
|
||||
if (data.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::NotReady)
|
||||
if (data.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady)
|
||||
return {};
|
||||
|
||||
std::bitset<sizeof(data.vulnerabilityBits()) * 8> bits(data.vulnerabilityBits());
|
||||
bits.set(data.vulnerabilityState().underlying());
|
||||
|
||||
for (int i = ProjectDataManagement::VulnerabilityState_def::HeavyDamage; i >= 0; --i)
|
||||
for (int i = ProjectDataManagement::VulnerabilityState::HeavyDamage; i >= 0; --i)
|
||||
{
|
||||
if (!bits.test(i))
|
||||
continue;
|
||||
@@ -83,19 +83,19 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c
|
||||
break;
|
||||
}
|
||||
|
||||
if (bits.test(ProjectDataManagement::VulnerabilityState_def::CatastrophicKill))
|
||||
if (bits.test(ProjectDataManagement::VulnerabilityState::CatastrophicKill))
|
||||
{
|
||||
for (int j = 0; j < ProjectDataManagement::VulnerabilityState_def::CatastrophicKill; ++j)
|
||||
for (int j = 0; j < ProjectDataManagement::VulnerabilityState::CatastrophicKill; ++j)
|
||||
bits.reset(j);
|
||||
bits.reset(ProjectDataManagement::VulnerabilityState_def::TemporarySeverance);
|
||||
bits.reset(ProjectDataManagement::VulnerabilityState::TemporarySeverance);
|
||||
}
|
||||
|
||||
QStringList sl;
|
||||
for (int i = 0; i <= ProjectDataManagement::VulnerabilityState_def::CContamination; ++i)
|
||||
for (int i = 0; i <= ProjectDataManagement::VulnerabilityState::CContamination; ++i)
|
||||
{
|
||||
if (!bits.test(i))
|
||||
continue;
|
||||
const ProjectDataManagement::VulnerabilityState vs(static_cast<ProjectDataManagement::VulnerabilityState_def::type>(i));
|
||||
const ProjectDataManagement::VulnerabilityState vs(static_cast<ProjectDataManagement::VulnerabilityState>(i));
|
||||
sl += ProjectDataManagement::toString(vs, m_vulnerabilityClass);
|
||||
}
|
||||
sl.prepend(QLatin1String());
|
||||
@@ -161,7 +161,7 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c
|
||||
else if (data.originatorId() == 0)
|
||||
originator = tr("Exercise Control");
|
||||
QStringList san;
|
||||
san += QStringLiteral("%1 (%2 - %3) - ").arg(tr("Treatment"), originator, ParticipantManagement::toString(static_cast<Qualification::inner_enum>(data.originatorChargeTypeId())));
|
||||
san += QStringLiteral("%1 (%2 - %3) - ").arg(tr("Treatment"), originator, ParticipantManagement::toString(static_cast<Qualification>(data.originatorChargeTypeId())));
|
||||
san += m_pdmDtc->sanitationProceduresList(data.sanitationProceduresTaken());
|
||||
return san;
|
||||
}
|
||||
|
||||
+2
-2
@@ -139,8 +139,8 @@ void HitLineInfoDialog::showHitLineInfos()
|
||||
ParticipantManagement::DynamicParticipantData data = m_dtc->dynamicParticipantData(m_participantInjury.id());
|
||||
|
||||
const ProjectDataManagement::VulnerabilityClass vc = m_typeClass == TypeClass::Human ?
|
||||
ProjectDataManagement::VulnerabilityClass_def::SoldierInjuries :
|
||||
ProjectDataManagement::VulnerabilityClass_def::VehicleDamages;
|
||||
ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
|
||||
ProjectDataManagement::VulnerabilityClass::VehicleDamages;
|
||||
|
||||
const StateInformation &lastState = m_dtc->youngestStateInformation(data.stateHistory());
|
||||
m_ui->lblInjuryStatus->setText(ProjectDataManagement::toString(lastState.vulnerabilityState(), vc));
|
||||
|
||||
+70
-70
@@ -530,8 +530,8 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
|
||||
if (!data.stateHistory().empty())
|
||||
{
|
||||
const ProjectDataManagement::VulnerabilityClass vc = m_typeClass == TypeClass::Human ?
|
||||
ProjectDataManagement::VulnerabilityClass_def::SoldierInjuries :
|
||||
ProjectDataManagement::VulnerabilityClass_def::VehicleDamages;
|
||||
ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
|
||||
ProjectDataManagement::VulnerabilityClass::VehicleDamages;
|
||||
|
||||
//#define FAKE_HISTORY
|
||||
#ifdef FAKE_HISTORY
|
||||
@@ -591,7 +591,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "append N";
|
||||
|
||||
const ProjectDataManagement::VulnerabilityState vs(static_cast<ProjectDataManagement::VulnerabilityState_def::type>(14));
|
||||
const ProjectDataManagement::VulnerabilityState vs(static_cast<ProjectDataManagement::VulnerabilityState>(14));
|
||||
QString fullName = ProjectDataManagement::toString(vs);
|
||||
QString shortName;
|
||||
shortName.append(fullName[0]);
|
||||
@@ -602,7 +602,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "append B";
|
||||
|
||||
const ProjectDataManagement::VulnerabilityState vs(static_cast<ProjectDataManagement::VulnerabilityState_def::type>(15));
|
||||
const ProjectDataManagement::VulnerabilityState vs(static_cast<ProjectDataManagement::VulnerabilityState>(15));
|
||||
QString fullName = ProjectDataManagement::toString(vs);
|
||||
QString shortName;
|
||||
shortName.append(fullName[0]);
|
||||
@@ -613,7 +613,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "append C";
|
||||
|
||||
const ProjectDataManagement::VulnerabilityState vs(static_cast<ProjectDataManagement::VulnerabilityState_def::type>(16));
|
||||
const ProjectDataManagement::VulnerabilityState vs(static_cast<ProjectDataManagement::VulnerabilityState>(16));
|
||||
QString fullName = ProjectDataManagement::toString(vs);
|
||||
QString shortName;
|
||||
shortName.append(fullName[0]);
|
||||
@@ -628,10 +628,10 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
|
||||
m_ui->lblKind->setText(QLatin1String("-"));
|
||||
else
|
||||
m_ui->lblKind->setText(m_pdmDtc->trVulnerabilityKindName(lastState.vulnerabilityKindId(), vc));
|
||||
if (m_showPvSan && vc == ProjectDataManagement::VulnerabilityClass_def::SoldierInjuries )
|
||||
if (m_showPvSan && vc == ProjectDataManagement::VulnerabilityClass::SoldierInjuries )
|
||||
{
|
||||
if (lastState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::CombatReady ) //Maybe there is some side effect to this like
|
||||
//if (data.stateHistory().size() == 1 && lastState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::CombatReady)
|
||||
if (lastState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady ) //Maybe there is some side effect to this like
|
||||
//if (data.stateHistory().size() == 1 && lastState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
|
||||
{
|
||||
QPalette pal = QApplication::palette(m_ui->lbKind);
|
||||
m_ui->lblKind->setPalette(pal);
|
||||
@@ -666,7 +666,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
|
||||
}
|
||||
else
|
||||
{
|
||||
if (m_typeClass == TypeClass_def::Aircraft)
|
||||
if (m_typeClass == TypeClass::Aircraft)
|
||||
{
|
||||
/*
|
||||
CTC_Apache_Sensor_DiffCorrections = 0x01, // Has GPS Differential Corrections
|
||||
@@ -917,74 +917,74 @@ void ParticipantInfoDialog::showSpecialSensorData(int specialSensorData)
|
||||
QString strSpecialSensorData;
|
||||
switch (specialSensorDataState)
|
||||
{
|
||||
case SpecialSensorStatus_def::ChemicalDetectionFunction_NotOperational:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::ChemicalDetectionFunction_NotOperational);
|
||||
case SpecialSensorStatus::ChemicalDetectionFunction_NotOperational:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::ChemicalDetectionFunction_NotOperational);
|
||||
break;
|
||||
case SpecialSensorStatus_def::ChemicalDetectionFunction_Detecting:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::ChemicalDetectionFunction_Detecting);
|
||||
case SpecialSensorStatus::ChemicalDetectionFunction_Detecting:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::ChemicalDetectionFunction_Detecting);
|
||||
break;
|
||||
case SpecialSensorStatus_def::NBCDetectionAccessory_NotOperational:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::NBCDetectionAccessory_NotOperational);
|
||||
case SpecialSensorStatus::NBCDetectionAccessory_NotOperational:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::NBCDetectionAccessory_NotOperational);
|
||||
break;
|
||||
case SpecialSensorStatus_def::NBCDetectionAccessory_Test:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::NBCDetectionAccessory_Test);
|
||||
case SpecialSensorStatus::NBCDetectionAccessory_Test:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::NBCDetectionAccessory_Test);
|
||||
break;
|
||||
case SpecialSensorStatus_def::NBCDetectionAccessory_DetectingAir:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::NBCDetectionAccessory_DetectingAir);
|
||||
case SpecialSensorStatus::NBCDetectionAccessory_DetectingAir:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::NBCDetectionAccessory_DetectingAir);
|
||||
break;
|
||||
case SpecialSensorStatus_def::AVLB_Mounted:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::AVLB_Mounted);
|
||||
case SpecialSensorStatus::AVLB_Mounted:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::AVLB_Mounted);
|
||||
break;
|
||||
case SpecialSensorStatus_def::AVLB_Deployed:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::AVLB_Deployed);
|
||||
case SpecialSensorStatus::AVLB_Deployed:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::AVLB_Deployed);
|
||||
break;
|
||||
case SpecialSensorStatus_def::AVLB_Mounting:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::AVLB_Mounting);
|
||||
case SpecialSensorStatus::AVLB_Mounting:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::AVLB_Mounting);
|
||||
break;
|
||||
case SpecialSensorStatus_def::AVLB_Deploying:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::AVLB_Deploying);
|
||||
case SpecialSensorStatus::AVLB_Deploying:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::AVLB_Deploying);
|
||||
break;
|
||||
case SpecialSensorStatus_def::MineLayer_Operational:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::MineLayer_Operational);
|
||||
case SpecialSensorStatus::MineLayer_Operational:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::MineLayer_Operational);
|
||||
break;
|
||||
case SpecialSensorStatus_def::MineLayer_Laying:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::MineLayer_Laying);
|
||||
case SpecialSensorStatus::MineLayer_Laying:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::MineLayer_Laying);
|
||||
break;
|
||||
case SpecialSensorStatus_def::MineClearingFunction_March:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::MineClearingFunction_March);
|
||||
case SpecialSensorStatus::MineClearingFunction_March:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::MineClearingFunction_March);
|
||||
break;
|
||||
case SpecialSensorStatus_def::MineClearingFunction_ReadyToClear:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::MineClearingFunction_ReadyToClear);
|
||||
case SpecialSensorStatus::MineClearingFunction_ReadyToClear:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::MineClearingFunction_ReadyToClear);
|
||||
break;
|
||||
case SpecialSensorStatus_def::MineClearingFunction_Clearing:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::MineClearingFunction_Clearing);
|
||||
case SpecialSensorStatus::MineClearingFunction_Clearing:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::MineClearingFunction_Clearing);
|
||||
break;
|
||||
case SpecialSensorStatus_def::MineTrowingFunction_NotOperational:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::MineTrowingFunction_NotOperational);
|
||||
case SpecialSensorStatus::MineTrowingFunction_NotOperational:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_NotOperational);
|
||||
break;
|
||||
case SpecialSensorStatus_def::MineTrowingFunction_ParameterInput:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::MineTrowingFunction_ParameterInput);
|
||||
case SpecialSensorStatus::MineTrowingFunction_ParameterInput:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_ParameterInput);
|
||||
break;
|
||||
case SpecialSensorStatus_def::MineTrowingFunction_ReadyToDeploy:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::MineTrowingFunction_ReadyToDeploy);
|
||||
case SpecialSensorStatus::MineTrowingFunction_ReadyToDeploy:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_ReadyToDeploy);
|
||||
break;
|
||||
case SpecialSensorStatus_def::MineTrowingFunction_Deploying:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::MineTrowingFunction_Deploying);
|
||||
case SpecialSensorStatus::MineTrowingFunction_Deploying:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_Deploying);
|
||||
break;
|
||||
case SpecialSensorStatus_def::MineTrowingFunction_Resupply:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::MineTrowingFunction_Resupply);
|
||||
case SpecialSensorStatus::MineTrowingFunction_Resupply:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_Resupply);
|
||||
break;
|
||||
case SpecialSensorStatus_def::MineTrowingFunction_FinishDeploying:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::MineTrowingFunction_FinishDeploying);
|
||||
case SpecialSensorStatus::MineTrowingFunction_FinishDeploying:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_FinishDeploying);
|
||||
break;
|
||||
case SpecialSensorStatus_def::ADLER_Operational:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::ADLER_Operational);
|
||||
case SpecialSensorStatus::ADLER_Operational:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::ADLER_Operational);
|
||||
break;
|
||||
case SpecialSensorStatus_def::ADLER_ConditionallyOperational:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::ADLER_ConditionallyOperational);
|
||||
case SpecialSensorStatus::ADLER_ConditionallyOperational:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::ADLER_ConditionallyOperational);
|
||||
break;
|
||||
case SpecialSensorStatus_def::ADLER_NotOperational:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus_def::ADLER_NotOperational);
|
||||
case SpecialSensorStatus::ADLER_NotOperational:
|
||||
strSpecialSensorData = toString(SpecialSensorStatus::ADLER_NotOperational);
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -1083,7 +1083,7 @@ void ParticipantInfoDialog::onPositionChanged(const ParticipantPosition &positio
|
||||
if (room.id() == position.roomId())
|
||||
{
|
||||
// In the case of external OPS transmitters, the building name was output twice
|
||||
if ( room.structureElementTypeId() != InfrastructureManagement::StructureElementType_def::Room )
|
||||
if ( room.structureElementTypeId() != InfrastructureManagement::StructureElementType::Room )
|
||||
continue;
|
||||
roomName = QString::fromStdString(room.displayName());
|
||||
break;
|
||||
@@ -1181,7 +1181,7 @@ void ParticipantInfoDialog::onParticipantChanged(const Participant &participant,
|
||||
m_ui->lblType->setText(ParticipantManagement::trTypeName(m_dtc->type(participant.typeId()).name()));
|
||||
TypeClass typeClass = m_dtc->type(participant.typeId()).typeClass();
|
||||
// If TypeClass changes, close window. Shouldn't ever happen, but for initialization.
|
||||
if (m_typeClass != TypeClass_def::Unknown && m_typeClass != typeClass)
|
||||
if (m_typeClass != TypeClass::Unknown && m_typeClass != typeClass)
|
||||
{
|
||||
m_buttonBox->getButton(LtsWidgets::DialogButton::Close)->click();
|
||||
}
|
||||
@@ -1513,14 +1513,14 @@ bool ParticipantInfoDialog::initTargetConfig(bool bShow)
|
||||
m_ui->cbTargetWeapon->addItem(QStringLiteral("Shotgun"), 7);
|
||||
|
||||
// Combobox Mode:
|
||||
m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode_def::Deactivated),
|
||||
TargetManagement::Mode_def::Deactivated);
|
||||
m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode_def::ShootBack),
|
||||
TargetManagement::Mode_def::ShootBack);
|
||||
m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode_def::ShootFirst),
|
||||
TargetManagement::Mode_def::ShootFirst);
|
||||
m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode_def::NoWeapon),
|
||||
TargetManagement::Mode_def::NoWeapon);
|
||||
m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode::Deactivated),
|
||||
TargetManagement::Mode::Deactivated);
|
||||
m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode::ShootBack),
|
||||
TargetManagement::Mode::ShootBack);
|
||||
m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode::ShootFirst),
|
||||
TargetManagement::Mode::ShootFirst);
|
||||
m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode::NoWeapon),
|
||||
TargetManagement::Mode::NoWeapon);
|
||||
|
||||
connect(m_ui->btTarget, &QToolButton::clicked, this, &ParticipantInfoDialog::onTargetConfig);
|
||||
connect(m_ui->cbTargetMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||
@@ -1571,7 +1571,7 @@ void ParticipantInfoDialog::onTargetConfig()
|
||||
|
||||
request.id(0);
|
||||
request.participantId(m_participant.id());
|
||||
request.tgtCommand(TargetManagement::TgtCommand_def::RequestTechnicalState);
|
||||
request.tgtCommand(TargetManagement::TgtCommand::RequestTechnicalState);
|
||||
|
||||
auto cb = [request, this]()
|
||||
{
|
||||
@@ -1606,9 +1606,9 @@ void ParticipantInfoDialog::onTargetModeChangeed()
|
||||
|
||||
request.id(0);
|
||||
request.participantId(m_participant.id());
|
||||
request.tgtCommand(TargetManagement::TgtCommand_def::SetMode);
|
||||
request.tgtCommand(TargetManagement::TgtCommand::SetMode);
|
||||
int modeInt = m_ui->cbTargetMode->currentData().toInt();
|
||||
TargetManagement::Mode mode = static_cast <TargetManagement::Mode_def::type>(modeInt);
|
||||
TargetManagement::Mode mode = static_cast <TargetManagement::Mode>(modeInt);
|
||||
INFO_LOG(m_logger) << "onTargetModeChangeed=" << mode;
|
||||
request.mode(mode);
|
||||
|
||||
@@ -1627,7 +1627,7 @@ void ParticipantInfoDialog::onTargetWeaponChanged()
|
||||
|
||||
request.id(0);
|
||||
request.participantId(m_participant.id());
|
||||
request.tgtCommand(TargetManagement::TgtCommand_def::SetWeapon);
|
||||
request.tgtCommand(TargetManagement::TgtCommand::SetWeapon);
|
||||
request.weapon(m_ui->cbTargetWeapon->currentData().toInt());
|
||||
INFO_LOG(m_logger) << "onTargetWeaponChangeed = " << request.weapon();
|
||||
|
||||
@@ -1754,7 +1754,7 @@ void ParticipantInfoDialog::onUnlockUAS()
|
||||
}
|
||||
ModifyUasStateRequest req;
|
||||
req.uasId(uas.id());
|
||||
req.uasState(ProjectDataManagement::UasState_def::Auto);
|
||||
req.uasState(ProjectDataManagement::UasState::Auto);
|
||||
req.equipmentNumber(m_participant.equipmentNumber().get());
|
||||
auto cb = [req, this]()
|
||||
{
|
||||
|
||||
+4
-4
@@ -133,9 +133,9 @@ QVariant ParticipantInfoTableModel::data(const QModelIndex &index, int role) con
|
||||
|
||||
switch (data.vulnerabilityState.underlying())
|
||||
{
|
||||
case ProjectDataManagement::VulnerabilityState::CombatReady:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
|
||||
return green;
|
||||
case ProjectDataManagement::VulnerabilityState::CatastrophicKill:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill:
|
||||
return red;
|
||||
default:
|
||||
return yellow;
|
||||
@@ -401,8 +401,8 @@ QString ParticipantInfoTableModel::biteStringFromBite(const ParticipantManagemen
|
||||
QString ParticipantInfoTableModel::vulnerabilityStateString(const ParticipantInfo &data)
|
||||
{
|
||||
const ProjectDataManagement::VulnerabilityClass vc = data.typeClass == ParticipantManagement::TypeClass::Human ?
|
||||
ProjectDataManagement::VulnerabilityClass_def::SoldierInjuries :
|
||||
ProjectDataManagement::VulnerabilityClass_def::VehicleDamages;
|
||||
ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
|
||||
ProjectDataManagement::VulnerabilityClass::VehicleDamages;
|
||||
|
||||
return ProjectDataManagement::toString(data.vulnerabilityState, vc);
|
||||
}
|
||||
|
||||
+10
-10
@@ -63,9 +63,9 @@ bool ParticipantSetInjuryDialog::init(LtsSession::LtsSession *session,
|
||||
if (m_dtc->type(participant.typeId()).typeClass() != TypeClass::Human)
|
||||
return false;
|
||||
auto vec = vulnerabilityStatesForTypeClass(TypeClass::Human);
|
||||
if (!vec.contains(ProjectDataManagement::VulnerabilityState::LightDamage)
|
||||
|| !vec.contains(ProjectDataManagement::VulnerabilityState::MediumDamage)
|
||||
|| !vec.contains(ProjectDataManagement::VulnerabilityState::HeavyDamage))
|
||||
if (!vec.contains(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage)
|
||||
|| !vec.contains(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage)
|
||||
|| !vec.contains(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage))
|
||||
return false;
|
||||
|
||||
m_injuries = m_dtcPdm->sanitationInjurys();
|
||||
@@ -268,20 +268,20 @@ void ParticipantSetInjuryDialog::checkState()
|
||||
{
|
||||
case 1:
|
||||
{
|
||||
if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState_def::LightDamage) < 1)
|
||||
m_ui->cbState->addItem(lightDamage, ProjectDataManagement::VulnerabilityState_def::LightDamage);
|
||||
if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState::LightDamage) < 1)
|
||||
m_ui->cbState->addItem(lightDamage, ProjectDataManagement::VulnerabilityState::LightDamage);
|
||||
break;
|
||||
}
|
||||
case 2:
|
||||
{
|
||||
if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState_def::MediumDamage) < 1)
|
||||
m_ui->cbState->addItem(mediumDamage, ProjectDataManagement::VulnerabilityState_def::MediumDamage);
|
||||
if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState::MediumDamage) < 1)
|
||||
m_ui->cbState->addItem(mediumDamage, ProjectDataManagement::VulnerabilityState::MediumDamage);
|
||||
break;
|
||||
}
|
||||
case 3:
|
||||
{
|
||||
if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState_def::HeavyDamage) < 1)
|
||||
m_ui->cbState->addItem(heavyDamage, ProjectDataManagement::VulnerabilityState_def::HeavyDamage);
|
||||
if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState::HeavyDamage) < 1)
|
||||
m_ui->cbState->addItem(heavyDamage, ProjectDataManagement::VulnerabilityState::HeavyDamage);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -320,7 +320,7 @@ bool ParticipantSetInjuryDialog::apply()
|
||||
if (m_ui->cbState->currentData().toInt() <= 0)
|
||||
return false;
|
||||
|
||||
const ProjectDataManagement::VulnerabilityState state = static_cast<ProjectDataManagement::VulnerabilityState_def::type>(m_ui->cbState->currentData().toInt());
|
||||
const ProjectDataManagement::VulnerabilityState state = static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cbState->currentData().toInt());
|
||||
|
||||
ModifyStateRequest req;
|
||||
req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
|
||||
|
||||
+1
-1
@@ -193,7 +193,7 @@ bool ParticipantSetSanitationDialog::apply()
|
||||
req.id(m_participantId);
|
||||
SanitationData sanDat;
|
||||
sanDat.sanitationProceduresTaken(getProcedures());
|
||||
sanDat.qualification(static_cast<Qualification::inner_enum>(m_ui->cbQualification->currentData().toInt()));
|
||||
sanDat.qualification(static_cast<Qualification>(m_ui->cbQualification->currentData().toInt()));
|
||||
sanDat.originatorEquipmentNumber(0);
|
||||
req.data(sanDat);
|
||||
|
||||
|
||||
+21
-21
@@ -187,7 +187,7 @@ void ParticipantTargetConfigurationDialog::onDynamicParticipantDataChanged(const
|
||||
{
|
||||
const ParticipantManagement::StateInformation &lastState = m_dtc->youngestStateInformation(dynData.stateHistory());
|
||||
const ProjectDataManagement::VulnerabilityState &vulState = lastState.vulnerabilityState();
|
||||
const ProjectDataManagement::VulnerabilityState_def::type vulStateType = vulState.underlying();
|
||||
const ProjectDataManagement::VulnerabilityState vulStateType = static_cast<ProjectDataManagement::VulnerabilityState>(vulState);
|
||||
|
||||
int idx = m_ui->cb_status->findData(vulStateType);
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " cb_status: vulState=" << vulState;
|
||||
@@ -228,9 +228,9 @@ void ParticipantTargetConfigurationDialog::onStatusChanged()
|
||||
|
||||
m_ui->cb_status->setEnabled(false);
|
||||
|
||||
const ProjectDataManagement::VulnerabilityState newParticipantState = static_cast<ProjectDataManagement::VulnerabilityState_def::type>(m_ui->cb_status->currentData().toInt());
|
||||
const ProjectDataManagement::VulnerabilityState newParticipantState = static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cb_status->currentData().toInt());
|
||||
|
||||
if (newParticipantState == ProjectDataManagement::VulnerabilityState::CombatReady)
|
||||
if (newParticipantState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
|
||||
{
|
||||
InitParticipantRequest req;
|
||||
req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId());
|
||||
@@ -299,18 +299,18 @@ void ParticipantTargetConfigurationDialog::onStatusChanged()
|
||||
|
||||
void ParticipantTargetConfigurationDialog::fillStatusComboBox()
|
||||
{
|
||||
std::list<ProjectDataManagement::VulnerabilityState_def::type> cont;
|
||||
std::list<ProjectDataManagement::VulnerabilityState> cont;
|
||||
cont = {
|
||||
ProjectDataManagement::VulnerabilityState_def::NoChange,
|
||||
ProjectDataManagement::VulnerabilityState_def::CombatReady,
|
||||
ProjectDataManagement::VulnerabilityState_def::CatastrophicKill
|
||||
ProjectDataManagement::VulnerabilityState::NoChange,
|
||||
ProjectDataManagement::VulnerabilityState::CombatReady,
|
||||
ProjectDataManagement::VulnerabilityState::CatastrophicKill
|
||||
};
|
||||
|
||||
m_ui->cb_status->clear();
|
||||
for (auto item : std::as_const(cont))
|
||||
{
|
||||
ProjectDataManagement::VulnerabilityState st = item;
|
||||
QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass_def::VehicleDamages);
|
||||
QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VehicleDamages);
|
||||
m_ui->cb_status->addItem(str, static_cast<int>(item));
|
||||
}
|
||||
|
||||
@@ -318,19 +318,19 @@ void ParticipantTargetConfigurationDialog::fillStatusComboBox()
|
||||
|
||||
void ParticipantTargetConfigurationDialog::fillPrewarningEffectComboBox()
|
||||
{
|
||||
std::list<ProjectDataManagement::VulnerabilityState_def::type> cont;
|
||||
std::list<ProjectDataManagement::VulnerabilityState> cont;
|
||||
cont = {
|
||||
ProjectDataManagement::VulnerabilityState_def::NoChange,
|
||||
ProjectDataManagement::VulnerabilityState_def::MobilityKill,
|
||||
ProjectDataManagement::VulnerabilityState_def::NearMiss,
|
||||
ProjectDataManagement::VulnerabilityState_def::CatastrophicKill
|
||||
ProjectDataManagement::VulnerabilityState::NoChange,
|
||||
ProjectDataManagement::VulnerabilityState::MobilityKill,
|
||||
ProjectDataManagement::VulnerabilityState::NearMiss,
|
||||
ProjectDataManagement::VulnerabilityState::CatastrophicKill
|
||||
};
|
||||
|
||||
m_ui->cb_prewarningEffect->clear();
|
||||
for (auto item : std::as_const(cont))
|
||||
{
|
||||
ProjectDataManagement::VulnerabilityState st = item;
|
||||
QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass_def::VehicleDamages);
|
||||
QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VehicleDamages);
|
||||
m_ui->cb_prewarningEffect->addItem(str, static_cast<int>(item));
|
||||
}
|
||||
m_ui->cb_prewarningEffect->setCurrentIndex(1);
|
||||
@@ -338,17 +338,17 @@ void ParticipantTargetConfigurationDialog::fillPrewarningEffectComboBox()
|
||||
|
||||
void ParticipantTargetConfigurationDialog::fillTakeDownEffectComboBox()
|
||||
{
|
||||
std::list<ProjectDataManagement::VulnerabilityState_def::type> cont;
|
||||
std::list<ProjectDataManagement::VulnerabilityState> cont;
|
||||
cont = {
|
||||
ProjectDataManagement::VulnerabilityState_def::MobilityKill,
|
||||
ProjectDataManagement::VulnerabilityState_def::CatastrophicKill
|
||||
ProjectDataManagement::VulnerabilityState::MobilityKill,
|
||||
ProjectDataManagement::VulnerabilityState::CatastrophicKill
|
||||
};
|
||||
|
||||
m_ui->cb_takeDownEffect->clear();
|
||||
for (auto item : std::as_const(cont))
|
||||
{
|
||||
ProjectDataManagement::VulnerabilityState st = item;
|
||||
QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass_def::VehicleDamages);
|
||||
QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VehicleDamages);
|
||||
m_ui->cb_takeDownEffect->addItem(str, static_cast<int>(item));
|
||||
}
|
||||
m_ui->cb_takeDownEffect->setCurrentIndex(1);
|
||||
@@ -391,7 +391,7 @@ bool updateValue(int& oldValueRef, int newValue)
|
||||
return hasChanged;
|
||||
}
|
||||
|
||||
bool updateValue(ProjectDataManagement::VulnerabilityState& oldValueRef, ProjectDataManagement::VulnerabilityState_def::type newValue)
|
||||
bool updateValue(ProjectDataManagement::VulnerabilityState& oldValueRef, ProjectDataManagement::VulnerabilityState newValue)
|
||||
{
|
||||
bool hasChanged = oldValueRef != newValue;
|
||||
oldValueRef = newValue;
|
||||
@@ -411,10 +411,10 @@ void ParticipantTargetConfigurationDialog::onGuiChanged()
|
||||
hasChanged |= updateValue(m_targetInformation.silhouette(), m_ui->cb_silhouette->currentData().toInt());
|
||||
|
||||
|
||||
hasChanged |= updateValue(m_targetInformation.prewarningEffect(), static_cast<ProjectDataManagement::VulnerabilityState_def::type>(m_ui->cb_prewarningEffect->currentData().toInt()) );
|
||||
hasChanged |= updateValue(m_targetInformation.prewarningEffect(), static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cb_prewarningEffect->currentData().toInt()) );
|
||||
hasChanged |= updateValue(m_targetInformation.prewarningInterval(), m_ui->sb_prewarningInterval->value());
|
||||
|
||||
hasChanged |= updateValue(m_targetInformation.takedownEffect(), static_cast<ProjectDataManagement::VulnerabilityState_def::type>(m_ui->cb_takeDownEffect->currentData().toInt()) );
|
||||
hasChanged |= updateValue(m_targetInformation.takedownEffect(), static_cast<ProjectDataManagement::VulnerabilityState>(m_ui->cb_takeDownEffect->currentData().toInt()) );
|
||||
hasChanged |= updateValue(m_targetInformation.takedownInterval(), m_ui->sb_takeDownInterval->value());
|
||||
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " hasChanged=" << hasChanged;
|
||||
|
||||
+2
-2
@@ -450,7 +450,7 @@ QVector<ParticipantData> OrgChartMain::getDataOf(const QJsonObject &obj, int sup
|
||||
pData.tacticalIdentifier() = obj.value(QStringLiteral("tactIdentifier")).toString().toStdString();
|
||||
pData.typeId(obj.value(QStringLiteral("typeId")).toInt());
|
||||
if (obj.value(QStringLiteral("assignState")).toInt() >= 0)
|
||||
pData.assignState(static_cast<ParticipantAssignState_def::type>(obj.value(QStringLiteral("assignState")).toInt()));
|
||||
pData.assignState(static_cast<ParticipantAssignState>(obj.value(QStringLiteral("assignState")).toInt()));
|
||||
QJsonArray arr = obj.value(QStringLiteral("children")).toArray();
|
||||
int hierarNr = 1;
|
||||
for (auto arrItem = arr.constBegin(); arrItem != arr.constEnd(); ++arrItem)
|
||||
@@ -510,7 +510,7 @@ ParticipantData OrgChartMain::convertFromJson(const QJsonObject &obj)
|
||||
pData.partyId(m_party);
|
||||
pData.id(obj.value(QStringLiteral("ddsId")).toInt());
|
||||
if (obj.value(QStringLiteral("assignState")).toInt() >= 0)
|
||||
pData.assignState(static_cast<ParticipantAssignState_def::type>(obj.value(QStringLiteral("assignState")).toInt()));
|
||||
pData.assignState(static_cast<ParticipantAssignState>(obj.value(QStringLiteral("assignState")).toInt()));
|
||||
pData.symbol(obj.value(QStringLiteral("symbol")).toString().toStdString());
|
||||
return pData;
|
||||
}
|
||||
|
||||
+13
-13
@@ -301,26 +301,26 @@ AdvancedSymbology::Injury ParticipantOrgChart_MimeDataHelper::stateToInjury(cons
|
||||
{
|
||||
switch (state.underlying())
|
||||
{
|
||||
case ProjectDataManagement::VulnerabilityState::CombatReady:
|
||||
case ProjectDataManagement::VulnerabilityState::TemporarySeverance:
|
||||
case ProjectDataManagement::VulnerabilityState::NearMiss:
|
||||
case ProjectDataManagement::VulnerabilityState::HitWithNoEffect:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect:
|
||||
return AdvancedSymbology::Injury::NoInjury;
|
||||
break;
|
||||
case ProjectDataManagement::VulnerabilityState::LightDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::MediumDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::HeavyDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::NotReady:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady:
|
||||
return AdvancedSymbology::Injury::Hit;
|
||||
break;
|
||||
case ProjectDataManagement::VulnerabilityState::MobilityKill:
|
||||
case ProjectDataManagement::VulnerabilityState::VisibleMobilityKill:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill:
|
||||
return AdvancedSymbology::Injury::MobilityKill;
|
||||
break;
|
||||
case ProjectDataManagement::VulnerabilityState::WeaponSystemDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage:
|
||||
return AdvancedSymbology::Injury::WeaponKill;
|
||||
case ProjectDataManagement::VulnerabilityState::CatastrophicKill:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill:
|
||||
return AdvancedSymbology::Injury::TotalKill;
|
||||
default:
|
||||
return AdvancedSymbology::Injury::NoInjury;
|
||||
|
||||
+1
-1
@@ -100,7 +100,7 @@ static ParticipantData qVariantToParticipant(const QVariant &data)
|
||||
pd.designator(designator.toStdString());
|
||||
pd.tacticalIdentifier(tacticalIdentifier.toStdString());
|
||||
pd.info(info.toStdString());
|
||||
pd.assignState(static_cast<ParticipantManagement::ParticipantAssignState::inner_enum>(assignState));
|
||||
pd.assignState(static_cast<ParticipantManagement::ParticipantAssignState>(assignState));
|
||||
pd.isSimulated(isSimulated);
|
||||
pd.isDeleted(isDeleted);
|
||||
pd.modId(modId);
|
||||
|
||||
+2
-2
@@ -169,9 +169,9 @@ bool ParticipantTemplateEdit::isContainer(const QModelIndex &index)
|
||||
return false;
|
||||
|
||||
if (m_asSupportService)
|
||||
return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass_def::SupportUnit;
|
||||
return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::SupportUnit;
|
||||
else
|
||||
return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass_def::Unit;
|
||||
return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::Unit;
|
||||
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -75,7 +75,7 @@ void ParticipantManagement::TemplateUnitNamer::onSetUnitName()
|
||||
|
||||
void TemplateUnitNamer::onTypeClassChanged()
|
||||
{
|
||||
TypeClass currentClass(static_cast<TypeClass_def::type>(m_ui->cbxTypeClass->currentData().toInt()));
|
||||
TypeClass currentClass(static_cast<TypeClass>(m_ui->cbxTypeClass->currentData().toInt()));
|
||||
m_ppmGuiCbxIfc->fillTypeComboBox(m_ui->cbxType, currentClass);
|
||||
|
||||
enaDisa();
|
||||
|
||||
+9
-9
@@ -152,8 +152,8 @@ bool PartyEdit::apply()
|
||||
{
|
||||
if (!m_partiallyUnchangeable)
|
||||
{
|
||||
ParticipantManagement::Role role = static_cast<ParticipantManagement::Role_def::type>(m_ui->cbRole->currentData().toInt());
|
||||
ParticipantManagement::HlaForceIdentifierEnum hlaIdentfier = static_cast<ParticipantManagement::HlaForceIdentifierEnum_def::type>(m_ui->cbHlaForceIdentifier->currentData().toInt());
|
||||
ParticipantManagement::Role role = static_cast<ParticipantManagement::Role>(m_ui->cbRole->currentData().toInt());
|
||||
ParticipantManagement::HlaForceIdentifierEnum hlaIdentfier = static_cast<ParticipantManagement::HlaForceIdentifierEnum>(m_ui->cbHlaForceIdentifier->currentData().toInt());
|
||||
Party req;
|
||||
|
||||
req.id(m_partyId);
|
||||
@@ -283,7 +283,7 @@ void PartyEdit::fillJsonSuppressNotifications( QJsonArray ¬if, NotificationMa
|
||||
{
|
||||
QJsonObject suppNotif;
|
||||
suppNotif[QStringLiteral("partyId")] = m_partyId;
|
||||
suppNotif[QStringLiteral("AddressType")] = NotificationManagement::AddressType_def::Service;
|
||||
suppNotif[QStringLiteral("AddressType")] = NotificationManagement::AddressType::Service;
|
||||
suppNotif[QStringLiteral("Address")] = AreaEffectSimulation::Offset;
|
||||
|
||||
QCheckBox *cbNotif = findCheckBoxByNotificationType(notifType);
|
||||
@@ -339,8 +339,8 @@ void PartyEdit::fillOpmProperties( QJsonObject &opmProperties)
|
||||
int indexToReplace = -1;
|
||||
if (arrExercises.isEmpty())
|
||||
{
|
||||
fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType_def::AdlerNotification);
|
||||
fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType_def::CombatOrder);
|
||||
fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType::AdlerNotification);
|
||||
fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType::CombatOrder);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -350,8 +350,8 @@ void PartyEdit::fillOpmProperties( QJsonObject &opmProperties)
|
||||
if (objExe[QStringLiteral("exerciseId")] == m_session->exerciseId())
|
||||
{
|
||||
notif = objExe[QStringLiteral("suppressNotifications")].toArray();
|
||||
fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType_def::AdlerNotification);
|
||||
fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType_def::CombatOrder);
|
||||
fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType::AdlerNotification);
|
||||
fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType::CombatOrder);
|
||||
indexToReplace = i;
|
||||
break;
|
||||
}
|
||||
@@ -390,8 +390,8 @@ void PartyEdit::notificationCheck()
|
||||
|
||||
// Here add another NotificationType, everything else will happen automatically
|
||||
// CheckBox insert in Ui
|
||||
const QList<NotificationManagement::NotificationType> notifTypes { NotificationManagement::NotificationType_def::AdlerNotification,
|
||||
NotificationManagement::NotificationType_def::CombatOrder};
|
||||
const QList<NotificationManagement::NotificationType> notifTypes { NotificationManagement::NotificationType::AdlerNotification,
|
||||
NotificationManagement::NotificationType::CombatOrder};
|
||||
|
||||
for (int i=0; i < arrExercises.size(); ++i)
|
||||
{
|
||||
|
||||
+3
-3
@@ -138,7 +138,7 @@ bool TypeEdit::apply()
|
||||
}
|
||||
|
||||
const Type req(m_type.id(),
|
||||
static_cast<TypeClass_def::type>(m_ui->cbTypeClass->currentData().toInt()),
|
||||
static_cast<TypeClass>(m_ui->cbTypeClass->currentData().toInt()),
|
||||
equipType,
|
||||
m_symbolSidc.toStdString(),
|
||||
m_ui->leName->text().toStdString(),
|
||||
@@ -346,8 +346,8 @@ void TypeEdit::updateEquipMinMaxLabel(const EquipmentType &eqType)
|
||||
|
||||
bool TypeEdit::isUnitTypeClass() const
|
||||
{
|
||||
auto tc = static_cast<TypeClass_def::type>(m_ui->cbTypeClass->currentData().toInt());
|
||||
return tc == TypeClass_def::Unit || tc == TypeClass_def::SupportUnit;
|
||||
auto tc = static_cast<TypeClass>(m_ui->cbTypeClass->currentData().toInt());
|
||||
return tc == TypeClass::Unit || tc == TypeClass::SupportUnit;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user