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
@@ -275,14 +275,14 @@ void HandlerOcData::onOcDataChanged(const TrainingAreaBase::OcData &data, DataMo
|
||||
case OcSituation::TelegramId::SituationData:
|
||||
case OcSituation::TelegramId::SituationDataInitial:
|
||||
{
|
||||
if (m_centerEquipmentId > 0 || m_position.is_set()) // is the situation still requested
|
||||
if (m_centerEquipmentId > 0 || m_position.has_value()) // is the situation still requested
|
||||
m_handlerOcSituationData->process(payload, telegramId == OcSituation::TelegramId::SituationDataInitial);
|
||||
break;
|
||||
}
|
||||
case OcSituation::TelegramId::CentralAesData:
|
||||
case OcSituation::TelegramId::CentralAesDataInitial:
|
||||
{
|
||||
if (m_centerEquipmentId > 0 || m_position.is_set())
|
||||
if (m_centerEquipmentId > 0 || m_position.has_value())
|
||||
m_handlerOcCentralAesData->process(payload, telegramId == OcSituation::TelegramId::CentralAesDataInitial);
|
||||
break;
|
||||
}
|
||||
@@ -330,9 +330,9 @@ void HandlerOcData::onOwnPosition(const TrainingAreaBaseOC::OwnPosition &data, D
|
||||
TrainingAreaBase::EquipmentPosition out;
|
||||
out.sampleTime = data.timeStamp;
|
||||
out.position.position = Core::GeoPosition(data.position.lon, data.position.lat, 0);
|
||||
if (data.moutObjectId.is_set())
|
||||
if (data.moutObjectId.has_value())
|
||||
out.position.moutObjectId.set(data.moutObjectId.get());
|
||||
if (data.moutRoomId.is_set())
|
||||
if (data.moutRoomId.has_value())
|
||||
out.position.moutRoomId.set(data.moutRoomId.get());
|
||||
out.equipmentNumber = m_tabocDtc->specificsEquipment(1).equipmentNumber;
|
||||
|
||||
@@ -364,7 +364,7 @@ void HandlerOcData::onOperatorMessageChanged(const Messaging::OperatorMessage &d
|
||||
else
|
||||
{
|
||||
const auto participantEqNo = m_ppmDtc->participant(data.recipientId).equipmentNumber;
|
||||
if (!participantEqNo.is_set())
|
||||
if (!participantEqNo.has_value())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Recipient with id " << data.recipientId << " has no equipment number set - can not send message";
|
||||
return;
|
||||
@@ -422,7 +422,7 @@ void HandlerOcData::onUserChanged(const OperatorManagement::User &data, DataModi
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "User " << m_user.name << " logged out.";
|
||||
|
||||
if (m_centerEquipmentId > 0 || m_position.is_set())
|
||||
if (m_centerEquipmentId > 0 || m_position.has_value())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Stopping situation requests.";
|
||||
|
||||
@@ -454,7 +454,7 @@ void HandlerOcData::onSendEvaluationRequest(const rti::core::SampleIdentity &coo
|
||||
LtsUtils::set1Byte(OcSituation::TelegramId::Evaluation, payload);
|
||||
LtsUtils::set2Byte(request.schemaId, payload);
|
||||
LtsUtils::set4Byte(request.senderOperatorId, payload);
|
||||
if (request.receiverOperatorId.is_set())
|
||||
if (request.receiverOperatorId.has_value())
|
||||
LtsUtils::set4Byte(request.receiverOperatorId.get(), payload);
|
||||
else
|
||||
LtsUtils::set4Byte(0, payload);
|
||||
@@ -564,7 +564,7 @@ void HandlerOcData::demandSituation(bool initial)
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_centerEquipmentId == 0 && !m_position.is_set())
|
||||
if (m_centerEquipmentId == 0 && !m_position.has_value())
|
||||
{
|
||||
m_centerEquipmentId = -1;
|
||||
m_handlerOcSituationData->removeAllPositions();
|
||||
@@ -583,14 +583,14 @@ void HandlerOcData::demandSituation(bool initial)
|
||||
if (m_centerEquipmentId > 0)
|
||||
INFO_LOG(m_logger) << "Demand OC situation around m_centerEquipmentId: " << m_centerEquipmentId
|
||||
<< " radius: " << m_radius;
|
||||
else if (m_position.is_set())
|
||||
else if (m_position.has_value())
|
||||
INFO_LOG(m_logger) << "Demand OC situation around position: " << m_position.get()
|
||||
<< " radius: " << m_radius;
|
||||
|
||||
QByteArray payload;
|
||||
|
||||
LtsUtils::set1Byte(OcSituation::TelegramId::DemandSituation, payload);
|
||||
if (m_position.is_set())
|
||||
if (m_position.has_value())
|
||||
{
|
||||
LtsUtils::set1Byte(OcSituation::SituationCenterType::Position, payload);
|
||||
LtsUtils::set8Byte(m_position.get().lon, payload);
|
||||
|
||||
Reference in new issue
Block a user