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
+9
-9
@@ -49,7 +49,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
|
||||
m_notiPos->setAction([this]()
|
||||
{
|
||||
|
||||
int participantId = m_ppmDtc->participantIdByEquipmentNumber(m_dtc->specificsEquipment(1).equipmentNumber());
|
||||
int participantId = m_ppmDtc->participantIdByEquipmentNumber(m_dtc->specificsEquipment(1).equipmentNumber);
|
||||
if (participantId > 0)
|
||||
m_sitMapGuiIfc->centerMapToParticipant(participantId);
|
||||
}
|
||||
@@ -109,11 +109,11 @@ void InterfaceImpl::clearInterfaces()
|
||||
void InterfaceImpl::onStatusSfmChanged(const TechnicalStateSfm &data, DataModification modType)
|
||||
{
|
||||
Q_UNUSED(modType)
|
||||
setRadioStatus(data.radioAvailable(), data.licensed());
|
||||
setSfmStatus(data.sfmConnected());
|
||||
setRadioStatus(data.radioAvailable, data.licensed);
|
||||
setSfmStatus(data.sfmConnected);
|
||||
|
||||
if (m_notiRadio != nullptr)
|
||||
m_notiRadio->setToolTip(data.licensed() ? tr("Licensed") : tr("Not Licensed"));
|
||||
m_notiRadio->setToolTip(data.licensed ? tr("Licensed") : tr("Not Licensed"));
|
||||
}
|
||||
|
||||
void InterfaceImpl::setRadioStatus(bool isAvilable, bool isLicensed)
|
||||
@@ -177,7 +177,7 @@ void InterfaceImpl::onInitDone()
|
||||
connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::participantPositionChanged, this, &InterfaceImpl::onPositionChanged);
|
||||
connect(m_dtc.get(), &TrainingAreaBaseOC::Interface::Dtc::specificsEquipmentChanged, this, &InterfaceImpl::onSpecificsEquipmentChanged);
|
||||
|
||||
m_curParticipantId = m_ppmDtc->participantIdByEquipmentNumber(m_dtc->specificsEquipment(1).equipmentNumber());
|
||||
m_curParticipantId = m_ppmDtc->participantIdByEquipmentNumber(m_dtc->specificsEquipment(1).equipmentNumber);
|
||||
if (m_curParticipantId)
|
||||
onPositionChanged(m_ppmDtc->participantPosition(m_curParticipantId), DataModification::eAdded);
|
||||
|
||||
@@ -189,12 +189,12 @@ void InterfaceImpl::onPositionChanged(const ParticipantManagement::ParticipantPo
|
||||
return;
|
||||
|
||||
if (m_curParticipantId <= 0)
|
||||
m_curParticipantId = m_ppmDtc->participantIdByEquipmentNumber(m_dtc->specificsEquipment(1).equipmentNumber());
|
||||
m_curParticipantId = m_ppmDtc->participantIdByEquipmentNumber(m_dtc->specificsEquipment(1).equipmentNumber);
|
||||
|
||||
if (data.participantId() == m_curParticipantId)
|
||||
if (data.participantId == m_curParticipantId)
|
||||
{
|
||||
if (LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("ObserverController"), QStringLiteral("MovingMapToSelf"), false).toBool())
|
||||
m_sitMapGuiIfc->setCenterPoint(QPointF(data.pos().lon(), data.pos().lat()));
|
||||
m_sitMapGuiIfc->setCenterPoint(QPointF(data.pos.lon, data.pos.lat));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -202,7 +202,7 @@ void InterfaceImpl::onSpecificsEquipmentChanged(const TrainingAreaBaseOC::Specif
|
||||
{
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
m_curParticipantId = m_ppmDtc->participantIdByEquipmentNumber(data.equipmentNumber());
|
||||
m_curParticipantId = m_ppmDtc->participantIdByEquipmentNumber(data.equipmentNumber);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user