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
+20
-20
@@ -55,14 +55,14 @@ void HandlerBlockedAreas::onSendParticipantBlockedAreaReply(const Core::Function
|
||||
|
||||
void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimulation::HandlerParticipant::CesParticipantData &partPos)
|
||||
{
|
||||
const int participantId = partPos.participantId();
|
||||
const int participantId = partPos.participantId;
|
||||
int damagePercentBlockedAreas = 90; // From the percentage damage, blocked area applies Todo Config Value
|
||||
DEBUG_LOG(m_logger) << "HandlerBlockedAreas onParticipantPositionChanged participantId=" << participantId;
|
||||
|
||||
TrainingAreaBase::SendParticipantBlockedAreaRequest pba;
|
||||
pba.equipmentNumber(m_ddsHandler->participantId2EquipNo(partPos.participantId()));
|
||||
pba.participantId(partPos.participantId());
|
||||
// if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady)
|
||||
pba.equipmentNumber = m_ddsHandler->participantId2EquipNo(partPos.participantId);
|
||||
pba.participantId = partPos.participantId;
|
||||
// if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
|
||||
// m_blockedAreas.remove(participantId);
|
||||
|
||||
if (!partPos.insideBuilding())
|
||||
@@ -70,8 +70,8 @@ void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimula
|
||||
auto it = m_blockedAreas.find(participantId);
|
||||
if (it != m_blockedAreas.end())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Blocked Area Leave equipment-No. =" << pba.equipmentNumber();
|
||||
pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode::Leave);
|
||||
DEBUG_LOG(m_logger) << "Blocked Area Leave equipment-No. =" << pba.equipmentNumber;
|
||||
pba.blockedAreaMode = TrainingAreaBase::BlockedAreaMode::Leave;
|
||||
m_ddsHandler->ftcTab()->sendParticipantBlockedAreaRequest(pba, this);
|
||||
m_blockedAreas.erase(it);
|
||||
}
|
||||
@@ -81,10 +81,10 @@ void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimula
|
||||
{
|
||||
// check leave
|
||||
if (m_blockedAreas.contains(participantId) &&
|
||||
(m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId()) < damagePercentBlockedAreas))
|
||||
(m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId) < damagePercentBlockedAreas))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Blocked Area Leave equipment-No. =" << pba.equipmentNumber();
|
||||
pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode::Leave);
|
||||
DEBUG_LOG(m_logger) << "Blocked Area Leave equipment-No. =" << pba.equipmentNumber;
|
||||
pba.blockedAreaMode = TrainingAreaBase::BlockedAreaMode::Leave;
|
||||
m_ddsHandler->ftcTab()->sendParticipantBlockedAreaRequest(pba, this);
|
||||
m_blockedAreas.remove(participantId);
|
||||
return;
|
||||
@@ -92,23 +92,23 @@ void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimula
|
||||
}
|
||||
|
||||
|
||||
DEBUG_LOG(m_logger) << "Room =" << partPos.roomId()
|
||||
<< " DamagePercentRoom=" << m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId());
|
||||
DEBUG_LOG(m_logger) << "1: " << m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId())
|
||||
DEBUG_LOG(m_logger) << "Room =" << partPos.roomId
|
||||
<< " DamagePercentRoom=" << m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId);
|
||||
DEBUG_LOG(m_logger) << "1: " << m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId)
|
||||
<< " damagePercentBlockedAreas= " << damagePercentBlockedAreas << "\n"
|
||||
<< " getDamagePercentFromBuilding=" << m_handlerParticipantBuilding->getDamagePercentFromBuilding(partPos.buildingId()) << "\n"
|
||||
<< " getDamagePercentFromBuilding=" << m_handlerParticipantBuilding->getDamagePercentFromBuilding(partPos.buildingId) << "\n"
|
||||
<< "m_blockedAreas.contains(participantId) = " << m_blockedAreas.contains(participantId) ;
|
||||
|
||||
|
||||
|
||||
if ((m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId()) >= damagePercentBlockedAreas
|
||||
|| m_handlerParticipantBuilding->getDamagePercentFromBuilding(partPos.buildingId()) == 100)
|
||||
if ((m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId) >= damagePercentBlockedAreas
|
||||
|| m_handlerParticipantBuilding->getDamagePercentFromBuilding(partPos.buildingId) == 100)
|
||||
&& !m_blockedAreas.contains(participantId))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Send Enter Blocked Area to Participant:" << participantId;
|
||||
pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode::Enter);
|
||||
pba.blockedAreaMode = TrainingAreaBase::BlockedAreaMode::Enter;
|
||||
m_ddsHandler->ftcTab()->sendParticipantBlockedAreaRequest(pba, this);
|
||||
m_blockedAreas.insert(participantId, partPos.roomId());
|
||||
m_blockedAreas.insert(participantId, partPos.roomId);
|
||||
}
|
||||
|
||||
} // end of onParticipantPositionChanged()
|
||||
@@ -126,9 +126,9 @@ void HandlerBlockedAreas::onBuildingStateChanged(const int32_t buildingId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "remove participantId: " << participantId;
|
||||
TrainingAreaBase::SendParticipantBlockedAreaRequest pba;
|
||||
pba.equipmentNumber(m_ddsHandler->participantId2EquipNo(participantId));
|
||||
pba.participantId(participantId);
|
||||
pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode::Leave);
|
||||
pba.equipmentNumber = m_ddsHandler->participantId2EquipNo(participantId);
|
||||
pba.participantId = participantId;
|
||||
pba.blockedAreaMode = TrainingAreaBase::BlockedAreaMode::Leave;
|
||||
m_ddsHandler->ftcTab()->sendParticipantBlockedAreaRequest(pba, this);
|
||||
m_blockedAreas.remove(participantId);
|
||||
}
|
||||
|
||||
+66
-66
@@ -65,7 +65,7 @@ int HandlerParticipantBuilding::getDamagePercentFromBuilding(const int buildingI
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "getDamagePercentFromBuilding buildingId=" << buildingId;
|
||||
auto it = m_buildingStates.find(buildingId);
|
||||
return it != m_buildingStates.end() ? it.value().damagePercent() : 0;
|
||||
return it != m_buildingStates.end() ? it.value().damagePercent : 0;
|
||||
}
|
||||
|
||||
int HandlerParticipantBuilding::getDamagePercentFromRoom(const int roomId) const
|
||||
@@ -110,21 +110,21 @@ void HandlerParticipantBuilding::onBuildingStateChanged(const Buildings::Buildin
|
||||
{
|
||||
if (modType == DataModification::eRemoved)
|
||||
{
|
||||
m_buildingStates.remove(data.id());
|
||||
m_buildingStates.remove(data.id);
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "Got BuildingState originatorParticipantId=" << data.originatorParticipantId()
|
||||
<< ", aesId = " << data.aesId()
|
||||
<< ", chargeTypeId = " << data.chargeTypeId()
|
||||
<< ", sampleTime = " << data.sampleTime()
|
||||
<< ", CountRooms =" << data.roomStates().size()
|
||||
<< ", structureElementId=" << data.structureElementId()
|
||||
<< ", assetId=" << data.assetId()
|
||||
<< ", roomStates.size=" << data.roomStates().size()
|
||||
<< ", damagePercent" << data.damagePercent();
|
||||
DEBUG_LOG(m_logger) << "Got BuildingState originatorParticipantId=" << data.originatorParticipantId
|
||||
<< ", aesId = " << data.aesId
|
||||
<< ", chargeTypeId = " << data.chargeTypeId
|
||||
<< ", sampleTime = " << data.sampleTime
|
||||
<< ", CountRooms =" << data.roomStates.size()
|
||||
<< ", structureElementId=" << data.structureElementId
|
||||
<< ", assetId=" << data.assetId
|
||||
<< ", roomStates.size=" << data.roomStates.size()
|
||||
<< ", damagePercent" << data.damagePercent;
|
||||
|
||||
if ( (data.originatorParticipantId() == 0) && (data.aesId() == 0) && (data.chargeTypeId()==0))
|
||||
if ( (data.originatorParticipantId == 0) && (data.aesId == 0) && (data.chargeTypeId==0))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Not valid return ";
|
||||
return;
|
||||
@@ -132,28 +132,28 @@ void HandlerParticipantBuilding::onBuildingStateChanged(const Buildings::Buildin
|
||||
|
||||
// fill m_roomIdDamageState
|
||||
RoomState rs;
|
||||
rs.buildingId = data.id();
|
||||
m_buildingStates.insert(data.id(), data);
|
||||
DEBUG_LOG(m_logger) << "m_buildingStates.insert id=" << data.id()
|
||||
<< " aesId=" << data.aesId()
|
||||
<< " name=" << data.name();
|
||||
rs.buildingId = data.id;
|
||||
m_buildingStates.insert(data.id, data);
|
||||
DEBUG_LOG(m_logger) << "m_buildingStates.insert id=" << data.id
|
||||
<< " aesId=" << data.aesId
|
||||
<< " name=" << data.name;
|
||||
|
||||
for (const Buildings::RoomState &roomState : data.roomStates())
|
||||
for (const Buildings::RoomState &roomState : data.roomStates)
|
||||
{
|
||||
rs.damagePercent = roomState.damagePercent();
|
||||
m_roomIdDamageState.insert(roomState.id(), rs);
|
||||
rs.damagePercent = roomState.damagePercent;
|
||||
m_roomIdDamageState.insert(roomState.id, rs);
|
||||
DEBUG_LOG(m_logger) << "m_roomIdDamageState.insert"
|
||||
<< " RoomId = " << roomState.id()
|
||||
<< ", BuildingId = " << data.id()
|
||||
<< ", destruction = " << roomState.damagePercent();
|
||||
<< " RoomId = " << roomState.id
|
||||
<< ", BuildingId = " << data.id
|
||||
<< ", destruction = " << roomState.damagePercent;
|
||||
}
|
||||
// init: remove all rooms from Map
|
||||
if (data.damagePercent() == 0)
|
||||
if (data.damagePercent == 0)
|
||||
{
|
||||
auto it = m_roomIdDamageState.begin();
|
||||
while (it != m_roomIdDamageState.end())
|
||||
{
|
||||
if (it.value().buildingId == data.id())
|
||||
if (it.value().buildingId == data.id)
|
||||
it = m_roomIdDamageState.erase(it);
|
||||
else
|
||||
++it;
|
||||
@@ -162,27 +162,27 @@ void HandlerParticipantBuilding::onBuildingStateChanged(const Buildings::Buildin
|
||||
}
|
||||
|
||||
const auto participantsMap = m_handlerParticipant->positions();
|
||||
for (const Buildings::RoomState &roomState : data.roomStates())
|
||||
for (const Buildings::RoomState &roomState : data.roomStates)
|
||||
{
|
||||
if (roomState.damagePercent() <= 0)
|
||||
if (roomState.damagePercent <= 0)
|
||||
continue;
|
||||
// no effect should not burden the radio
|
||||
if (roomState.remainingEffectPercent() == 0)
|
||||
if (roomState.remainingEffectPercent == 0)
|
||||
continue;
|
||||
|
||||
DEBUG_LOG(m_logger) << " RoomId[" << roomState.id() << "]:"
|
||||
<< " remainingEffectPercent = " << roomState.remainingEffectPercent()
|
||||
<< " roomState.damagePercent()=" << roomState.damagePercent()
|
||||
<< " roomState.remainingEffectPercent()=" << roomState.remainingEffectPercent();
|
||||
DEBUG_LOG(m_logger) << " RoomId[" << roomState.id << "]:"
|
||||
<< " remainingEffectPercent = " << roomState.remainingEffectPercent
|
||||
<< " roomState.damagePercent()=" << roomState.damagePercent
|
||||
<< " roomState.remainingEffectPercent()=" << roomState.remainingEffectPercent;
|
||||
// search for participants in each room:
|
||||
// if participant in room sendCESHit to TAB
|
||||
|
||||
for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : participantsMap)
|
||||
{
|
||||
const int participantId = participantPos.participantId();
|
||||
if (participantPos.roomId() != roomState.id())
|
||||
const int participantId = participantPos.participantId;
|
||||
if (participantPos.roomId != roomState.id)
|
||||
continue;
|
||||
if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
|
||||
if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
|
||||
continue;
|
||||
const int equipNo = m_ddsHandler->participantId2EquipNo(participantId);
|
||||
if (equipNo <= 0)
|
||||
@@ -191,22 +191,22 @@ void HandlerParticipantBuilding::onBuildingStateChanged(const Buildings::Buildin
|
||||
continue;
|
||||
|
||||
DEBUG_LOG(m_logger) << " participantId = " << participantId
|
||||
<< " roomId = " << participantPos.roomId()
|
||||
<< " roomState.id=" << roomState.id()
|
||||
<< " roomId = " << participantPos.roomId
|
||||
<< " roomState.id=" << roomState.id
|
||||
<< " participantPos.vulnerabilityState=" << participantPos.vulnerabilityState
|
||||
<< " equipNo=" << m_ddsHandler->participantId2EquipNo(participantId)
|
||||
<< " isOutdated=" << m_handlerParticipant->isOutdated(participantPos);
|
||||
|
||||
DEBUG_LOG(m_logger) << "sendCesHitToParticipant";
|
||||
sendCesHitToParticipant(data, participantId, roomState.remainingEffectPercent());
|
||||
sendCesHitToParticipant(data, participantId, roomState.remainingEffectPercent);
|
||||
}
|
||||
}
|
||||
|
||||
m_buildingStates.insert(data.id(), data);
|
||||
m_buildingStates.insert(data.id, data);
|
||||
if (!m_timer->isActive() && !m_requestMap.isEmpty())
|
||||
m_timer->start(1000);
|
||||
|
||||
emit newBuildingState(data.id());
|
||||
emit newBuildingState(data.id);
|
||||
}
|
||||
|
||||
void HandlerParticipantBuilding::sendCesHitToParticipant(const Buildings::BuildingState &data,
|
||||
@@ -215,7 +215,7 @@ void HandlerParticipantBuilding::sendCesHitToParticipant(const Buildings::Buildi
|
||||
{
|
||||
const int equipNo = m_ddsHandler->participantId2EquipNo(participantId);
|
||||
const QHash<int, CentralEffectSimulation::HandlerParticipant::CesParticipantData> participantsMap = m_handlerParticipant->positions();
|
||||
const int originatorEquipNo = m_ddsHandler->participantId2EquipNo(data.originatorParticipantId());
|
||||
const int originatorEquipNo = m_ddsHandler->participantId2EquipNo(data.originatorParticipantId);
|
||||
|
||||
|
||||
|
||||
@@ -226,36 +226,36 @@ void HandlerParticipantBuilding::sendCesHitToParticipant(const Buildings::Buildi
|
||||
|
||||
|
||||
|
||||
bool itemAvailable = m_ddsHandler->dtcAes()->aesItemFromId(data.aesId(), aesItem);
|
||||
bool itemAvailable = m_ddsHandler->dtcAes()->aesItemFromId(data.aesId, aesItem);
|
||||
if (itemAvailable)
|
||||
DEBUG_LOG(m_logger) << "partyId=" << aesItem.partyId()
|
||||
<< " chargeTypeId=" << aesItem.chargeStruct().chargeTypeId()
|
||||
<< " duration=" << aesItem.effectDuration();
|
||||
DEBUG_LOG(m_logger) << "partyId=" << aesItem.partyId
|
||||
<< " chargeTypeId=" << aesItem.chargeStruct.chargeTypeId
|
||||
<< " duration=" << aesItem.effectDuration;
|
||||
|
||||
// mineFieldBitIndex wird als reserve1 uegertragen und hier wird die Wirkdauer uebertragen.
|
||||
const int duration = aesItem.effectDuration() / 1000;
|
||||
const int duration = aesItem.effectDuration / 1000;
|
||||
|
||||
//int32_t legacyChargeTypeId = 0;
|
||||
//const ProjectDataManagement::FuseType fuseType = m_ddsHandler->dtcAes()->explosionCluster(aesItem.id()).fuseType();
|
||||
const int chargeTypeId = itemAvailable ? aesItem.chargeStruct().chargeTypeId() : data.chargeTypeId();
|
||||
const int chargeTypeId = itemAvailable ? aesItem.chargeStruct.chargeTypeId : data.chargeTypeId;
|
||||
|
||||
// legacyChargeTypeId = m_ddsHandler->getLegacyIdFromChargeTypeId(chargeTypeId, fuseType);
|
||||
// NOTE: igniterTypeId/IgniterFunction = 0 as long as BuildingState does not contain values
|
||||
AreaEffectSimulation::ChargeStruct chargeStruct = { data.chargeTypeId(),0,0};
|
||||
if (itemAvailable) chargeStruct = aesItem.chargeStruct();
|
||||
AreaEffectSimulation::ChargeStruct chargeStruct = { data.chargeTypeId,0,0};
|
||||
if (itemAvailable) chargeStruct = aesItem.chargeStruct;
|
||||
int remainTasCodeIndirect = m_ddsHandler->remainingTasCode(chargeStruct);
|
||||
|
||||
DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant equipNo = " << equipNo
|
||||
<< " participantId=" << participantId
|
||||
<< " chargeTypeId=" << data.chargeTypeId()
|
||||
<< " chargeTypeId=" << data.chargeTypeId
|
||||
<< " originatorEquipNo=" << originatorEquipNo
|
||||
<< " remainingEffectPercent=" << remainingEffectPercent
|
||||
<< " remainTasCodeIndirect=" << remainTasCodeIndirect
|
||||
<< " eventType=" << eventType;
|
||||
const TrainingAreaBase::TabPosition pos(participantPos.pos(),
|
||||
participantPos.reportingSource(),
|
||||
participantPos.buildingId(),
|
||||
participantPos.roomId());
|
||||
const TrainingAreaBase::TabPosition pos(participantPos.pos,
|
||||
participantPos.reportingSource,
|
||||
participantPos.buildingId,
|
||||
participantPos.roomId);
|
||||
|
||||
|
||||
// Bei Nebel soll die Weste nur einmal piepen und nicht regelmaessig. Das wird mit Wirkung = 3 uebertragen
|
||||
@@ -270,20 +270,20 @@ void HandlerParticipantBuilding::sendCesHitToParticipant(const Buildings::Buildi
|
||||
|
||||
TrainingAreaBase::SendCesHitRequest requestTab;
|
||||
|
||||
requestTab.aesId(data.aesId());
|
||||
requestTab.aesId = data.aesId;
|
||||
//requestTab.chargeTypeId(legacyChargeTypeId > 0 ? legacyChargeTypeId : chargeTypeId);
|
||||
requestTab.chargeTypeId(chargeTypeId);
|
||||
requestTab.effectTime(data.sampleTime());
|
||||
requestTab.equipmentNumber(equipNo);
|
||||
requestTab.eventType(eventType);
|
||||
requestTab.mineId(duration);
|
||||
requestTab.originatorEquipmentNumber(originatorEquipNo);
|
||||
requestTab.participantId(participantId);
|
||||
requestTab.chargeTypeId = chargeTypeId;
|
||||
requestTab.effectTime = data.sampleTime;
|
||||
requestTab.equipmentNumber = equipNo;
|
||||
requestTab.pdmEventType = eventType;
|
||||
requestTab.mineId = duration;
|
||||
requestTab.originatorEquipmentNumber = originatorEquipNo;
|
||||
requestTab.participantId = participantId;
|
||||
int32_t partyId = 0;
|
||||
if ( aesItem.partyId.is_set())
|
||||
if ( aesItem.partyId.has_value())
|
||||
partyId = aesItem.partyId.get();
|
||||
requestTab.partyId(partyId);
|
||||
requestTab.position(pos);
|
||||
requestTab.partyId = partyId;
|
||||
requestTab.position = pos;
|
||||
|
||||
// Same like direct Hit
|
||||
// if (aesItem.id() > 0)
|
||||
@@ -294,7 +294,7 @@ void HandlerParticipantBuilding::sendCesHitToParticipant(const Buildings::Buildi
|
||||
// else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "direkter Beschuss remainEffectPercent=" << remainingEffectPercent;
|
||||
requestTab.remainEffectPercent(remainingEffectPercent);
|
||||
requestTab.remainEffectPercent = remainingEffectPercent;
|
||||
}
|
||||
|
||||
m_requestMap.insert(participantId, requestTab);
|
||||
|
||||
Reference in new issue
Block a user