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:
1718 files changed
+126739
-18495
No files matched your search
+8
-8
@@ -46,14 +46,14 @@ void VulnerabilityStateGenerator::ProxyEmulator::giveInitState(const QMap<qint32
|
||||
{
|
||||
const ParticipantManagement::Participant ¤tParticipant = it.value();
|
||||
|
||||
if (currentParticipant.m_equipmentNumber().is_set())
|
||||
if (currentParticipant.equipmentNumber.has_value())
|
||||
{
|
||||
++participantsWithEquipmentNumber;
|
||||
TrainingAreaBase::EquipmentState state;
|
||||
|
||||
state.m_equipmentNumber(currentParticipant.m_equipmentNumber().get());
|
||||
state.sampleTime(QDateTime::currentMSecsSinceEpoch());
|
||||
state.vulnerabilityState(ProjectDataManagement::VulnerabilityState::CombatReady);
|
||||
state.equipmentNumber = currentParticipant.equipmentNumber.value();
|
||||
state.sampleTime = QDateTime::currentMSecsSinceEpoch();
|
||||
state.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
|
||||
|
||||
m_tabDts->publish(state);
|
||||
}
|
||||
@@ -76,11 +76,11 @@ void VulnerabilityStateGenerator::ProxyEmulator::publishNewState(ProjectDataMana
|
||||
{
|
||||
TrainingAreaBase::EquipmentState state;
|
||||
|
||||
state.m_equipmentNumber(participant.m_equipmentNumber().get());
|
||||
state.sampleTime(QDateTime::currentMSecsSinceEpoch());
|
||||
state.vulnerabilityState(newState);
|
||||
state.equipmentNumber = participant.equipmentNumber.value();
|
||||
state.sampleTime = QDateTime::currentMSecsSinceEpoch();
|
||||
state.vulnerabilityState = newState;
|
||||
|
||||
DEBUG_LOG(m_logger) << "participantId: " << participant.m_id() << ", state: " << newState << ", equipNo: " << participant.m_equipmentNumber().get();
|
||||
DEBUG_LOG(m_logger) << "participantId: " << participant.id << ", state: " << newState << ", equipNo: " << participant.equipmentNumber.value();
|
||||
m_tabDts->publish(state);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user