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
+36
-35
@@ -5,16 +5,17 @@
|
||||
#include "ui_ppm_uas_edit_dialog.h"
|
||||
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
#include <ParticipantManagement/logger.h>
|
||||
#include <ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
|
||||
#include <flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <FileManagement/flm_translation.h>
|
||||
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
|
||||
#include <QtWidgets/QInputDialog>
|
||||
@@ -82,7 +83,7 @@ void UasEditDialog::init(LtsSession::LtsSession *session, const UAS &data)
|
||||
|
||||
QString UasEditDialog::dialogIdentifier() const
|
||||
{
|
||||
return m_data.id() <= 0 ? tr("Add UAS") : tr("Edit UAS %1").arg(m_data.id());
|
||||
return m_data.id <= 0 ? tr("Add UAS") : tr("Edit UAS %1").arg(m_data.id);
|
||||
}
|
||||
|
||||
|
||||
@@ -99,10 +100,10 @@ bool UasEditDialog::apply()
|
||||
void UasEditDialog::onCreateModifyUasReply(const Core::FunctionReplyObject &reply)
|
||||
{
|
||||
m_requestHelper->requestReply(reply);
|
||||
if (m_data.id() <= 0)
|
||||
if (m_data.id <= 0)
|
||||
return;
|
||||
|
||||
const auto &newData = m_ppmDtc->uAS(m_data.id());
|
||||
const auto &newData = m_ppmDtc->uAS(m_data.id);
|
||||
m_data = newData;
|
||||
fillData();
|
||||
|
||||
@@ -117,18 +118,18 @@ void UasEditDialog::fillParticipantCbx()
|
||||
QMap<int, Participant> part_map;
|
||||
for (const auto &part : m_ppmDtc->participants())
|
||||
{
|
||||
if (m_ppmDtc->isTypeUas(part.typeId()) && !part.isDeleted())
|
||||
if (m_ppmDtc->isTypeUas(part.typeId) && !part.isDeleted)
|
||||
{
|
||||
part_map.insert(part.id(), part);
|
||||
part_map.insert(part.id, part);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
for (const auto &uav : m_ppmDtc->uASs())
|
||||
{
|
||||
if (uav.exerciseId() == m_session->exerciseId() && uav.participantId() != m_data.participantId())
|
||||
if (uav.exerciseId == m_session->exerciseId() && uav.participantId != m_data.participantId)
|
||||
{
|
||||
part_map.remove(uav.participantId());
|
||||
part_map.remove(uav.participantId);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -136,8 +137,8 @@ void UasEditDialog::fillParticipantCbx()
|
||||
for (const auto &uavPart : part_map)
|
||||
{
|
||||
QPixmap pix = QPixmap(10,10);
|
||||
pix.fill(QColor::fromRgb(m_ppmDtc->party(uavPart.partyId()).color()));
|
||||
m_ui->cbParticpant->insertItem(uavPart.id(), pix, m_ppmDtc->hierarchyFromParticipant(uavPart.id()), uavPart.id());
|
||||
pix.fill(QColor::fromRgb(m_ppmDtc->party(uavPart.partyId).color));
|
||||
m_ui->cbParticpant->insertItem(uavPart.id, pix, m_ppmDtc->hierarchyFromParticipant(uavPart.id), uavPart.id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -153,9 +154,9 @@ void UasEditDialog::fillData()
|
||||
else
|
||||
{
|
||||
fillParticipantCbx();
|
||||
if (m_data.participantId() > 0)
|
||||
if (m_data.participantId > 0)
|
||||
{
|
||||
m_ui->cbParticpant->setCurrentIndex(m_ui->cbParticpant->findData(m_data.participantId()));
|
||||
m_ui->cbParticpant->setCurrentIndex(m_ui->cbParticpant->findData(m_data.participantId));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -165,39 +166,39 @@ void UasEditDialog::fillData()
|
||||
|
||||
QSignalBlocker s(m_ui->cbParticpant);
|
||||
m_ui->cbParticpant->clear();
|
||||
if(m_data.participantId() == 0 || m_data.exerciseId() == 0)
|
||||
if(m_data.participantId == 0 || m_data.exerciseId == 0)
|
||||
{
|
||||
m_ui->cbParticpant->insertItem(0, QStringLiteral("-"));
|
||||
}
|
||||
else if (m_data.exerciseId() != m_session->exerciseId())
|
||||
else if (m_data.exerciseId != m_session->exerciseId())
|
||||
{
|
||||
|
||||
|
||||
m_ui->cbParticpant->insertItem(0, tr("Participant from exercise %1").arg(QString::fromStdString(m_exmDtc->exercise(m_data.exerciseId()).name())));
|
||||
m_ui->cbParticpant->insertItem(0, tr("Participant from exercise %1").arg(QString::fromStdString(m_exmDtc->exercise(m_data.exerciseId).name)));
|
||||
}
|
||||
m_ui->cbParticpant->setEnabled(false);
|
||||
}
|
||||
|
||||
m_ui->leIdentifier->setText(QString::fromStdString(m_data.deviceIdentifier()));
|
||||
m_ui->leHost->setText(QString::fromStdString(m_data.hostname()));
|
||||
m_ui->lePort->setText(QString::number(m_data.hostport()));
|
||||
m_ui->pbUnlink->setEnabled(m_data.exerciseId() > 0);
|
||||
m_ui->leIdentifier->setText(QString::fromStdString(m_data.deviceIdentifier));
|
||||
m_ui->leHost->setText(QString::fromStdString(m_data.hostname));
|
||||
m_ui->lePort->setText(QString::number(m_data.hostport));
|
||||
m_ui->pbUnlink->setEnabled(m_data.exerciseId > 0);
|
||||
|
||||
m_ui->tcpRadioBtn->setChecked(m_data.useTcp());
|
||||
m_ui->udpRadioBtn->setChecked(!m_data.useTcp());
|
||||
m_ui->tcpRadioBtn->setChecked(m_data.useTcp);
|
||||
m_ui->udpRadioBtn->setChecked(!m_data.useTcp);
|
||||
|
||||
}
|
||||
|
||||
bool UasEditDialog::sendData()
|
||||
{
|
||||
CreateModifyUasRequest req;
|
||||
req.id(m_data.id());
|
||||
req.deviceIdentifier(m_ui->leIdentifier->text().toStdString());
|
||||
req.participantId(m_data.participantId());
|
||||
req.exerciseId(m_data.exerciseId());
|
||||
req.hostname(m_ui->leHost->text().toStdString());
|
||||
req.hostport(m_ui->lePort->text().toInt());
|
||||
req.useTcp(m_ui->tcpRadioBtn->isChecked());
|
||||
req.id = m_data.id;
|
||||
req.deviceIdentifier = m_ui->leIdentifier->text().toStdString();
|
||||
req.participantId = m_data.participantId;
|
||||
req.exerciseId = m_data.exerciseId;
|
||||
req.hostname = m_ui->leHost->text().toStdString();
|
||||
req.hostport = m_ui->lePort->text().toInt();
|
||||
req.useTcp = m_ui->tcpRadioBtn->isChecked();
|
||||
|
||||
m_requestHelper->addRequest([this, req]()
|
||||
{
|
||||
@@ -214,8 +215,8 @@ void UasEditDialog::onUnlinkClicked()
|
||||
QMessageBox::Yes | QMessageBox::Cancel);
|
||||
if(ret == QMessageBox::Yes)
|
||||
{
|
||||
m_data.exerciseId() = 0;
|
||||
m_data.participantId() = 0;
|
||||
m_data.exerciseId = 0;
|
||||
m_data.participantId = 0;
|
||||
sendData();
|
||||
}
|
||||
}
|
||||
@@ -224,13 +225,13 @@ void UasEditDialog::onUAVParticipantChanged()
|
||||
{
|
||||
if (m_ui->cbParticpant->currentData().toInt() > 0)
|
||||
{
|
||||
m_data.exerciseId() = m_session->exerciseId();
|
||||
m_data.participantId() = m_ui->cbParticpant->currentData().toInt();
|
||||
m_data.exerciseId = m_session->exerciseId();
|
||||
m_data.participantId = m_ui->cbParticpant->currentData().toInt();
|
||||
}
|
||||
else
|
||||
{
|
||||
m_data.exerciseId() = 0;
|
||||
m_data.participantId() = 0;
|
||||
m_data.exerciseId = 0;
|
||||
m_data.participantId = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+4
-3
@@ -23,6 +23,7 @@ UasListDialog::UasListDialog(LtsSession::LtsSession *session, QWidget *parent)
|
||||
, m_session(session)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::UasListDialog)
|
||||
, m_logger(getLogger("UasListDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -91,9 +92,9 @@ void UasListDialog::enaDisa()
|
||||
QModelIndex currentIndex = m_ui->ldvUas->currentIndex();
|
||||
const auto &uasData = m_uasListModel->uasData(m_ui->ldvUas->currentIndex());
|
||||
bool isEditable = true;
|
||||
if (m_session->isExercisePartition() && uasData.exerciseId() > 0)
|
||||
if (m_session->isExercisePartition() && uasData.exerciseId > 0)
|
||||
{
|
||||
isEditable = (uasData.exerciseId() == m_session->exerciseId());
|
||||
isEditable = (uasData.exerciseId == m_session->exerciseId());
|
||||
}
|
||||
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, currentIndex.isValid() && isEditable);
|
||||
@@ -127,7 +128,7 @@ void UasListDialog::onRemoveClicked()
|
||||
if (!m_uasListModel)
|
||||
return;
|
||||
|
||||
int idToRemove =m_uasListModel->uasData(m_ui->ldvUas->currentIndex()).id();
|
||||
int idToRemove =m_uasListModel->uasData(m_ui->ldvUas->currentIndex()).id;
|
||||
const RemoveUasRequest req(idToRemove);
|
||||
m_requestHelper->addRequest([this, req]()
|
||||
{
|
||||
|
||||
+12
-11
@@ -30,6 +30,7 @@ UasListModel::UasListModel(QObject *parent)
|
||||
tr("Linked Participant")
|
||||
},
|
||||
parent)
|
||||
, m_logger(getLogger("UasListModel"))
|
||||
{}
|
||||
|
||||
|
||||
@@ -74,27 +75,27 @@ QVariant UasListModel::data(const QModelIndex &index, int role) const
|
||||
switch (index.column())
|
||||
{
|
||||
case ColUavId:
|
||||
return uas.id();
|
||||
return uas.id;
|
||||
case ColIdentifier:
|
||||
return QString::fromStdString(uas.deviceIdentifier());
|
||||
return QString::fromStdString(uas.deviceIdentifier);
|
||||
case ColUavState:
|
||||
return ProjectDataManagement::toString(uas.uasState());
|
||||
return ProjectDataManagement::toString(uas.uasState);
|
||||
case ColHostname:
|
||||
return QString::fromStdString(uas.hostname());
|
||||
return QString::fromStdString(uas.hostname);
|
||||
case ColHostport:
|
||||
return uas.hostport();
|
||||
return uas.hostport;
|
||||
case ColParticipant:
|
||||
{
|
||||
if(uas.participantId() == 0 ||
|
||||
uas.exerciseId() == 0)
|
||||
if(uas.participantId == 0 ||
|
||||
uas.exerciseId == 0)
|
||||
return QStringLiteral("-");
|
||||
|
||||
|
||||
if (uas.exerciseId() != m_exerciseId)
|
||||
return tr("Participant from exercise %1").arg(QString::fromStdString(m_exmDtc->exercise(uas.exerciseId()).name()));
|
||||
if (uas.exerciseId != m_exerciseId)
|
||||
return tr("Participant from exercise %1").arg(QString::fromStdString(m_exmDtc->exercise(uas.exerciseId).name));
|
||||
|
||||
|
||||
return m_ppmDtc->hierarchyFromParticipant(uas.participantId());
|
||||
return m_ppmDtc->hierarchyFromParticipant(uas.participantId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -111,7 +112,7 @@ UAS UasListModel::uasData(const QModelIndex &index)
|
||||
|
||||
void UasListModel::onUasChanged(const UAS &data, const DataModification modType)
|
||||
{
|
||||
int row = findRowForId(data.id());
|
||||
int row = findRowForId(data.id);
|
||||
|
||||
switch (modType)
|
||||
{
|
||||
|
||||
+1
@@ -4,6 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/logger.h>
|
||||
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
|
||||
Reference in new issue
Block a user