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);
|
||||
}
|
||||
|
||||
}
|
||||
+1
@@ -20,6 +20,7 @@ SfmMessagesDialog::SfmMessagesDialog(QWidget *parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_ui(new Ui::SfmMessagesDialog)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("MessagingDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
|
||||
|
||||
+4
-4
@@ -72,8 +72,8 @@ void InterfaceImpl::handleNewData(const FreeText &data, DataModification modType
|
||||
{
|
||||
if (modType != DataModification::eAdded || m_unreadCounterIsLocked)
|
||||
return;
|
||||
if (data.timeStamp() < (QDateTime::currentMSecsSinceEpoch() - (60 * 60 * 1000 * 1))
|
||||
|| data.timeStamp() < m_lastClearTime)
|
||||
if (data.timeStamp < (QDateTime::currentMSecsSinceEpoch() - (60 * 60 * 1000 * 1))
|
||||
|| data.timeStamp < m_lastClearTime)
|
||||
return;
|
||||
++m_unread;
|
||||
updateUnreadCount();
|
||||
@@ -83,8 +83,8 @@ void InterfaceImpl::handleNewData(const ShortMessage &data, DataModification mod
|
||||
{
|
||||
if (modType != DataModification::eAdded || m_unreadCounterIsLocked)
|
||||
return;
|
||||
if (data.timeStamp() < (QDateTime::currentMSecsSinceEpoch() - (60 * 60 * 1000 * 1))
|
||||
|| data.timeStamp() < m_lastClearTime)
|
||||
if (data.timeStamp < (QDateTime::currentMSecsSinceEpoch() - (60 * 60 * 1000 * 1))
|
||||
|| data.timeStamp < m_lastClearTime)
|
||||
return;
|
||||
++m_unread;
|
||||
updateUnreadCount();
|
||||
|
||||
+8
-8
@@ -20,6 +20,7 @@ MessagingModel::MessagingModel(QObject *parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_operatorId(0)
|
||||
, m_lastClearTime(0)
|
||||
, m_logger(getLogger("MessagingModel"))
|
||||
{}
|
||||
|
||||
|
||||
@@ -47,15 +48,15 @@ void MessagingModel::insertData(const TrainingAreaBaseOC::FreeText &data, DataMo
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
|
||||
if (dontAdd(data.timeStamp()))
|
||||
if (dontAdd(data.timeStamp))
|
||||
return;
|
||||
|
||||
QString text = QString::fromStdString(data.text().c_str());
|
||||
QString text = QString::fromStdString(data.text.c_str());
|
||||
if (text.size() > 1)
|
||||
text.chop(1);
|
||||
QString msg = tr("Text: %1").arg(text);
|
||||
|
||||
insertRow({QDateTime::fromMSecsSinceEpoch(data.timeStamp()), msg});
|
||||
insertRow({QDateTime::fromMSecsSinceEpoch(data.timeStamp), msg});
|
||||
}
|
||||
|
||||
void MessagingModel::insertData(const TrainingAreaBaseOC::ShortMessage &data, DataModification modType)
|
||||
@@ -63,16 +64,15 @@ void MessagingModel::insertData(const TrainingAreaBaseOC::ShortMessage &data, Da
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
|
||||
if (dontAdd(data.timeStamp()))
|
||||
if (dontAdd(data.timeStamp))
|
||||
return;
|
||||
|
||||
|
||||
|
||||
QString msg = tr("Type: %1 - %2")
|
||||
.arg(textTypeToString(static_cast<TextType>(data.textType())),
|
||||
vbgVbaIndexToText(data.textType(), data.indexVbg()));
|
||||
.arg(textTypeToString(static_cast<TextType>(data.textType)),
|
||||
vbgVbaIndexToText(data.textType, data.indexVbg));
|
||||
|
||||
insertRow({QDateTime::fromMSecsSinceEpoch(data.timeStamp()), msg});
|
||||
insertRow({QDateTime::fromMSecsSinceEpoch(data.timeStamp), msg});
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user