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:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent eb1d949edc
commit 815e16368e
1718 files changed
+126739 -18495

No files matched your search

@@ -6,7 +6,7 @@
#include <LtsSession/lts_session_data.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsUtils/dds_vector_to_pixmap.h>
#include <LtsUtils/LtsUtilsCore/dds_vector_to_pixmap.h>
#include <LtsUtilsSettings/settings.h>
#include <LtsWidgets/lts_message_dialog.h>
#include <PluginInterfaces/gui_plugin_interface.h>
@@ -29,11 +29,12 @@ Core::GeoPosition2D convert(const QPointF& coord)
QPointF convert(const Core::GeoPosition2D& geoPos)
{
return QPointF(geoPos.lon(), geoPos.lat());
return QPointF(geoPos.lon, geoPos.lat);
}
AsmEditTrainingAreaDialog::AsmEditTrainingAreaDialog(QWidget* parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel),
m_logger(getLogger("AssetManangementEditDialog")),
m_ui(new Ui::AsmEditTrainingAreaDialog), m_requestHelper(new LtsUtils::RequestHelper(this)), m_menuGroup()
{
m_ui->setupUi(this);
@@ -79,22 +80,22 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds* session, con
if (trainingAreaId == 0)
{
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " New training area ";
ta.id() = 0;
ta.name() = QStringLiteral("newArea").toStdString();
ta.width() = 12800;
ta.height() = 12800;
ta.id = 0;
ta.name = QStringLiteral("newArea").toStdString();
ta.width = 12800;
ta.height = 12800;
m_dialogTitle = tr("New Training Area");
}
else
{
ta = m_asmDtc->trainingArea(trainingAreaId);
if (ta.id() <= 0)
if (ta.id <= 0)
{
ERROR_LOG(m_logger) << Q_FUNC_INFO << " training area not valid id: " << trainingAreaId;
return false;
}
m_dialogTitle = tr("Edit Training Area: %1").arg(QString::fromStdString(ta.name()));
m_dialogTitle = tr("Edit Training Area: %1").arg(QString::fromStdString(ta.name));
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " edit training area " << trainingAreaId;
}
@@ -108,7 +109,7 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds* session, con
{
m_ui->pbPosition->setEnabled(false);
}
m_ui->name_lineEdit->setText(QString::fromStdString(m_trainingArea.name()));
m_ui->name_lineEdit->setText(QString::fromStdString(m_trainingArea.name));
connect(m_ui->pbClear, &QPushButton::clicked, m_ui->positionEdit, &LtsCoordWidget::LtsCoordWidget::clear);
@@ -170,9 +171,9 @@ void AsmEditTrainingAreaDialog::onRectData(const QPointF& centerPoint, double wi
m_ui->positionEdit->setCoordinate(centerPoint.x(), centerPoint.y());
m_ui->sbWidth->setValue(width);
m_ui->sbHeight->setValue(height);
m_trainingArea.height() = height;
m_trainingArea.width() = width;
m_trainingArea.bottomLeft() = convert(btmLeft);
m_trainingArea.height = height;
m_trainingArea.width = width;
m_trainingArea.bottomLeft = convert(btmLeft);
DEBUG_LOG(m_logger) << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width
<< " H: " << height;
@@ -205,9 +206,9 @@ void AsmEditTrainingAreaDialog::onCoordinate(const QPointF& centerPoint)
m_ui->sbWidth->setValue(width);
m_ui->sbHeight->setValue(height);
m_trainingArea.height() = height;
m_trainingArea.width() = width;
m_trainingArea.bottomLeft() = convert(btmLeft);
m_trainingArea.height = height;
m_trainingArea.width = width;
m_trainingArea.bottomLeft = convert(btmLeft);
DEBUG_LOG(m_logger) << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width
<< " H: " << height;
@@ -218,9 +219,9 @@ void AsmEditTrainingAreaDialog::onCoordinate(const QPointF& centerPoint)
void AsmEditTrainingAreaDialog::onEditClicked()
{
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START Editing..";
if (!m_sitMapGuiIfc || m_trainingArea.id() < 0)
if (!m_sitMapGuiIfc || m_trainingArea.id < 0)
{
ERROR_LOG(m_logger) << "onEditClicked: sitMapGuiIfc or trainingArea_id: " << m_trainingArea.id()
ERROR_LOG(m_logger) << "onEditClicked: sitMapGuiIfc or trainingArea_id: " << m_trainingArea.id
<< " invalid! ";
return;
}
@@ -255,9 +256,9 @@ QPointF AsmEditTrainingAreaDialog::getCentPos(TrainingArea ta)
{
LtsCoordTrans::UtmCoordinate utmCoordinate =
LtsCoordTrans::UtmCoordinate::fromGeographic(ta.bottomLeft().lon(), ta.bottomLeft().lat());
LtsCoordTrans::UtmCoordinate::fromGeographic(ta.bottomLeft.lon, ta.bottomLeft.lat);
QPointF centerPoint = utmCoordinate.geographic((ta.width() / 2.0), ta.height() / 2.0);
QPointF centerPoint = utmCoordinate.geographic((ta.width / 2.0), ta.height / 2.0);
TRACE_LOG(m_logger) << Q_FUNC_INFO << " coord: x: " << centerPoint.x() << " y: " << centerPoint.y();
return centerPoint;
@@ -279,10 +280,10 @@ bool AsmEditTrainingAreaDialog::apply()
TrainingArea req = m_trainingArea;
req.name() = m_ui->name_lineEdit->text().toStdString();
req.width() = m_ui->sbWidth->value();
req.height() = m_ui->sbHeight->value();
req.bottomLeft(convert(btmLeft));
req.name = m_ui->name_lineEdit->text().toStdString();
req.width = m_ui->sbWidth->value();
req.height = m_ui->sbHeight->value();
req.bottomLeft = convert(btmLeft);
bool success =
m_requestHelper->startSingleRequest([this, req]() { return m_asmFtc->trainingAreaModifyRequest(req, this); });
@@ -293,13 +294,13 @@ bool AsmEditTrainingAreaDialog::apply()
void AsmEditTrainingAreaDialog::setData()
{
if (m_trainingArea.id() > 0)
if (m_trainingArea.id > 0)
{
m_ui->name_lineEdit->setText(QString::fromStdString(m_trainingArea.name()));
m_ui->name_lineEdit->setText(QString::fromStdString(m_trainingArea.name));
QPointF coord = getCentPos(m_trainingArea);
m_ui->positionEdit->setCoordinate(coord.x(), coord.y());
m_ui->sbWidth->setValue(m_trainingArea.width());
m_ui->sbHeight->setValue(m_trainingArea.height());
m_ui->sbWidth->setValue(m_trainingArea.width);
m_ui->sbHeight->setValue(m_trainingArea.height);
}
}
@@ -314,14 +315,14 @@ QPolygonF AsmEditTrainingAreaDialog::getTrainingArea(const TrainingArea& ta)
AssetManagement::TrainingArea ddsTrainingArea = ta;
LtsCoordTrans::UtmCoordinate utmCoordinate = LtsCoordTrans::UtmCoordinate::fromGeographic(
ddsTrainingArea.bottomLeft().lon(), ddsTrainingArea.bottomLeft().lat());
polygonF.push_back(QPointF((ddsTrainingArea.bottomLeft().lon()), (ddsTrainingArea.bottomLeft().lat())));
ddsTrainingArea.bottomLeft.lon, ddsTrainingArea.bottomLeft.lat);
polygonF.push_back(QPointF((ddsTrainingArea.bottomLeft.lon), (ddsTrainingArea.bottomLeft.lat)));
polygonF.push_back(utmCoordinate.geographic(ddsTrainingArea.width()));
polygonF.push_back(utmCoordinate.geographic(ddsTrainingArea.width));
polygonF.push_back(utmCoordinate.geographic(ddsTrainingArea.width(), ddsTrainingArea.height()));
polygonF.push_back(utmCoordinate.geographic(ddsTrainingArea.width, ddsTrainingArea.height));
polygonF.push_back(utmCoordinate.geographic(0, ddsTrainingArea.height()));
polygonF.push_back(utmCoordinate.geographic(0, ddsTrainingArea.height));
return polygonF;
}
@@ -19,8 +19,9 @@ namespace AssetManagement
{
AsmTrainingAreaDialog::AsmTrainingAreaDialog(const QString& menuGroup, QWidget* parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_ui(new Ui::AsmTrainingAreaDialog),
m_session(nullptr), m_menuGroup(menuGroup), m_requestHelper(new LtsUtils::RequestHelper(this))
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_logger(getLogger("AsmTrainingAreaDialog")),
m_ui(new Ui::AsmTrainingAreaDialog), m_session(nullptr), m_menuGroup(menuGroup),
m_requestHelper(new LtsUtils::RequestHelper(this))
{
m_ui->setupUi(this);
setOnlineHelpFilename(QStringLiteral("Asset_Management-Training_Area"));
@@ -139,15 +140,15 @@ void AsmTrainingAreaDialog::onRemoveTrainingArea()
return;
TrainingArea req = m_model->getRowData(indexList.front().row());
if (req.id() < 0)
if (req.id < 0)
{
ERROR_LOG(m_logger) << Q_FUNC_INFO << " invalid id:bt" << req.id();
ERROR_LOG(m_logger) << Q_FUNC_INFO << " invalid id:bt" << req.id;
return;
}
if (!m_viewedTaIds.contains(req.id()))
if (!m_viewedTaIds.contains(req.id))
{
bool success = m_requestHelper->startSingleRequest(
[this, req]() { return m_asmFtc->trainingAreaRemoveRequest(TrainingAreaRemoveRequest(req.id()), this); });
[this, req]() { return m_asmFtc->trainingAreaRemoveRequest(TrainingAreaRemoveRequest(req.id), this); });
TRACE_LOG(m_logger) << Q_FUNC_INFO << " success = " << success;
}
@@ -166,13 +167,13 @@ void AsmTrainingAreaDialog::onEditTrainingArea()
if (indexList.size() == 0)
return;
TrainingArea taItem = m_model->getRowData(indexList.front().row());
if (taItem.id() < 0)
if (taItem.id < 0)
{
ERROR_LOG(m_logger) << "onEditTrainingArea invalid id = " << taItem.id();
ERROR_LOG(m_logger) << "onEditTrainingArea invalid id = " << taItem.id;
return;
}
const QString identifier = QStringLiteral("AsmEditTrainingArea_%1").arg(taItem.id());
const QString identifier = QStringLiteral("AsmEditTrainingArea_%1").arg(taItem.id);
if (focusDialog(m_menuGroup, identifier, LtsWidgets::LayoutArea::eDialogTab))
{
return;
@@ -180,7 +181,7 @@ void AsmTrainingAreaDialog::onEditTrainingArea()
AsmEditTrainingAreaDialog* dialog = new AsmEditTrainingAreaDialog(this);
if (!dialog->init(m_session, taItem.id(), m_sitMapGuiIfc, m_menuGroup))
if (!dialog->init(m_session, taItem.id, m_sitMapGuiIfc, m_menuGroup))
{
delete dialog;
return;
@@ -201,14 +202,14 @@ void AsmTrainingAreaDialog::onSelectionChanged()
return;
AssetManagement::TrainingArea taItem = m_model->getRowData(curIdx.row());
DEBUG_LOG(m_logger) << "onSelectionChanged() selected training area id: " << taItem.id();
if (taItem.id() < 0)
DEBUG_LOG(m_logger) << "onSelectionChanged() selected training area id: " << taItem.id;
if (taItem.id < 0)
{
ERROR_LOG(m_logger) << "onEditTrainingArea invalid id" << taItem.id();
ERROR_LOG(m_logger) << "onEditTrainingArea invalid id" << taItem.id;
return;
}
m_previewPolygon = getTrainingArea(taItem.id());
m_previewPolygon = getTrainingArea(taItem.id);
showPreviewObject();
}
@@ -229,7 +230,7 @@ QPolygonF AsmTrainingAreaDialog::getTrainingArea(int trainingAreaId)
return {};
}
const AssetManagement::TrainingArea& ddsTrainingArea = m_asmDtc->trainingArea(trainingAreaId);
if (ddsTrainingArea.id() != trainingAreaId)
if (ddsTrainingArea.id != trainingAreaId)
{
ERROR_LOG(m_logger) << Q_FUNC_INFO << " TrainingArea not found, trainingAreaId = " << trainingAreaId;
return {};
@@ -243,14 +244,14 @@ QPolygonF AsmTrainingAreaDialog::getTrainingArea(const TrainingArea& ddsTraining
QPolygonF polygonF;
LtsCoordTrans::UtmCoordinate utmCoordinate = LtsCoordTrans::UtmCoordinate::fromGeographic(
ddsTrainingArea.bottomLeft().lon(), ddsTrainingArea.bottomLeft().lat());
polygonF.push_back(QPointF((ddsTrainingArea.bottomLeft().lon()), (ddsTrainingArea.bottomLeft().lat())));
ddsTrainingArea.bottomLeft.lon, ddsTrainingArea.bottomLeft.lat);
polygonF.push_back(QPointF((ddsTrainingArea.bottomLeft.lon), (ddsTrainingArea.bottomLeft.lat)));
polygonF.push_back(utmCoordinate.geographic(ddsTrainingArea.width()));
polygonF.push_back(utmCoordinate.geographic(ddsTrainingArea.width));
polygonF.push_back(utmCoordinate.geographic(ddsTrainingArea.width(), ddsTrainingArea.height()));
polygonF.push_back(utmCoordinate.geographic(ddsTrainingArea.width, ddsTrainingArea.height));
polygonF.push_back(utmCoordinate.geographic(0, ddsTrainingArea.height()));
polygonF.push_back(utmCoordinate.geographic(0, ddsTrainingArea.height));
return polygonF;
}
@@ -8,7 +8,7 @@ AsmTrainingAreaDialogModel::AsmTrainingAreaDialogModel(QObject* parent)
{tr("Id"), tr("Name"), tr("Botton Left x"), tr("Bottom Left y"), tr("Height"), tr("Width")},
parent),
m_asmDtc(nullptr)
m_logger(getLogger("AsmTrainingAreaDialogModel")), m_asmDtc(nullptr)
{
}
@@ -45,17 +45,17 @@ QVariant AsmTrainingAreaDialogModel::data(const QModelIndex& index, int role) co
switch (index.column())
{
case Id:
return asmTrainingArea.id();
return asmTrainingArea.id;
case Name:
return QString::fromStdString(asmTrainingArea.name());
return QString::fromStdString(asmTrainingArea.name);
case BottomLeft_x:
return asmTrainingArea.bottomLeft().lon();
return asmTrainingArea.bottomLeft.lon;
case BottomLeft_y:
return asmTrainingArea.bottomLeft().lat();
return asmTrainingArea.bottomLeft.lat;
case Height:
return asmTrainingArea.height();
return asmTrainingArea.height;
case Width:
return asmTrainingArea.width();
return asmTrainingArea.width;
}
}
return QVariant();