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:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
+7
-5
@@ -1,6 +1,7 @@
|
||||
|
||||
|
||||
#include "san_nine_liner_dialog.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include "san_nine_liner_dialog_model.h"
|
||||
#include "san_nine_liner_edit_dialog.h"
|
||||
@@ -16,6 +17,7 @@ namespace Evaluations
|
||||
SanNineLinerDialog::SanNineLinerDialog(const QString& menuGroup, QWidget* parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_ui(new Ui::SanNineLinerDialog),
|
||||
m_menuGroup(menuGroup), m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
setOnlineHelpFilename(QStringLiteral("Situation-SanNineLiner"));
|
||||
@@ -90,7 +92,7 @@ void SanNineLinerDialog::onRemoveSanNineLiner()
|
||||
const QModelIndex curIdx = m_ui->widget->currentIndex();
|
||||
if (!curIdx.isValid())
|
||||
return;
|
||||
const int sanNineLinerId = m_model->getRowData(curIdx.row()).id();
|
||||
const int sanNineLinerId = m_model->getRowData(curIdx.row()).id;
|
||||
|
||||
Core::RemoveElementRequest req(sanNineLinerId);
|
||||
m_requestHelper->startSingleRequest([req, this]() { return m_ftc->sanNineLinerRemoveRequest(req, this); });
|
||||
@@ -101,14 +103,14 @@ void SanNineLinerDialog::onEditSanNineLiner()
|
||||
const QModelIndex idx = m_ui->widget->currentIndex();
|
||||
const Evaluations::SanNineLiner san = m_model->getRowData(idx.row());
|
||||
|
||||
if (san.id() <= 0)
|
||||
if (san.id <= 0)
|
||||
return;
|
||||
DEBUG_LOG(m_logger) << "current SanNineLinerId: " << san.id();
|
||||
DEBUG_LOG(m_logger) << "current SanNineLinerId: " << san.id;
|
||||
|
||||
SanNineLinerEditDialog* dialog = new SanNineLinerEditDialog(this);
|
||||
|
||||
dialog->init(m_session, m_menuGroup, san.id());
|
||||
const QString identifier = QStringLiteral("EditSanNineLiner%1").arg(san.id());
|
||||
dialog->init(m_session, m_menuGroup, san.id);
|
||||
const QString identifier = QStringLiteral("EditSanNineLiner%1").arg(san.id);
|
||||
|
||||
addDialog(dialog, m_menuGroup, identifier);
|
||||
}
|
||||
|
||||
+7
-5
@@ -1,6 +1,7 @@
|
||||
|
||||
|
||||
#include "san_nine_liner_dialog_model.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <Evaluations/evl_translation.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
@@ -13,6 +14,7 @@ namespace Evaluations
|
||||
SanNineLinerDialogModel::SanNineLinerDialogModel(QObject* parent)
|
||||
: LtsWidgets::LtsAbstractTableModel<Evaluations::SanNineLiner>(
|
||||
{tr("Id"), tr("Created"), tr("Position"), tr("Radio frequency / Call Sign / Suffix")}, parent)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
}
|
||||
|
||||
@@ -39,16 +41,16 @@ QVariant SanNineLinerDialogModel::data(const QModelIndex& index, int role) const
|
||||
switch (index.column())
|
||||
{
|
||||
case SanNineLinerDialogModel::Columns::Id:
|
||||
return san.id();
|
||||
return san.id;
|
||||
case SanNineLinerDialogModel::Columns::Created:
|
||||
return QDateTime::fromMSecsSinceEpoch(san.lastModified());
|
||||
return QDateTime::fromMSecsSinceEpoch(san.lastModified);
|
||||
case SanNineLinerDialogModel::Columns::Position: {
|
||||
if (std::isnan(san.line1_position().lat()) || std::isnan(san.line1_position().lon()))
|
||||
if (std::isnan(san.line1_position.lat) || std::isnan(san.line1_position.lon))
|
||||
return tr("---");
|
||||
return LtsCoordTrans::mgrsFromGeographic(san.line1_position().lon(), san.line1_position().lat());
|
||||
return LtsCoordTrans::mgrsFromGeographic(san.line1_position.lon, san.line1_position.lat);
|
||||
}
|
||||
case SanNineLinerDialogModel::Columns::RadioFrequencyCallSignSuffix:
|
||||
return QString::fromStdString(san.line2_RadioFrequencyCallSignSuffix());
|
||||
return QString::fromStdString(san.line2_RadioFrequencyCallSignSuffix);
|
||||
default:
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
-1
@@ -37,7 +37,6 @@ class SanNineLinerProxyModel final : public LtsWidgets::LtsColumnFilterProxyMode
|
||||
void setSourceModel(QAbstractItemModel* sourceModel) override;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger& m_logger;
|
||||
SanNineLinerDialogModel* m_sourceModel{nullptr};
|
||||
};
|
||||
} // namespace Evaluations
|
||||
+14
-12
@@ -1,6 +1,7 @@
|
||||
|
||||
|
||||
#include "san_nine_liner_edit_dialog.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include "ui_san_nine_liner_edit_dialog.h"
|
||||
|
||||
@@ -24,6 +25,7 @@ namespace Evaluations
|
||||
SanNineLinerEditDialog::SanNineLinerEditDialog(QWidget* parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_ui(new Ui::SanNineLinerEditDialog),
|
||||
m_validator(new QIntValidator(this)), m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -82,16 +84,16 @@ bool SanNineLinerEditDialog::init(LtsSession::LtsSessionDataDds* session, const
|
||||
|
||||
Evaluations::SanNineLiner data = m_dtc->sanNineLiner(sanNineLinerId);
|
||||
|
||||
if (data.id() > 0)
|
||||
if (data.id > 0)
|
||||
{
|
||||
m_ui->dtTime->setMsecsSinceEpoch(data.lastModified());
|
||||
m_ui->dtTime->setMsecsSinceEpoch(data.lastModified);
|
||||
m_ui->leRadioFrequencyCallSignSuffix->setText(
|
||||
QString::fromStdString(data.line2_RadioFrequencyCallSignSuffix()));
|
||||
QPointF position(data.line1_position().lon(), data.line1_position().lat());
|
||||
QString::fromStdString(data.line2_RadioFrequencyCallSignSuffix));
|
||||
QPointF position(data.line1_position.lon, data.line1_position.lat);
|
||||
if (!position.isNull())
|
||||
m_ui->positionEdit->setCoordinate(position);
|
||||
|
||||
QVector<Database::SanCategoryLine> linesCategory = SanCategoryLine::fromJson(data.lines(), data.id());
|
||||
QVector<Database::SanCategoryLine> linesCategory = SanCategoryLine::fromJson(data.lines, data.id);
|
||||
|
||||
INFO_LOG(m_logger) << "linesCategory size: " << linesCategory.size();
|
||||
|
||||
@@ -165,13 +167,13 @@ bool SanNineLinerEditDialog::apply()
|
||||
{
|
||||
|
||||
SanNineLinerModifyRequest request;
|
||||
request.id(m_sanNineLinerId);
|
||||
request.id = m_sanNineLinerId;
|
||||
|
||||
request.id(m_sanNineLinerId);
|
||||
request.lastModified(m_ui->dtTime->msecsSinceEpoch());
|
||||
request.id = m_sanNineLinerId;
|
||||
request.lastModified = m_ui->dtTime->msecsSinceEpoch();
|
||||
const Core::GeoPosition2D pos(m_ui->positionEdit->coordinate().x(), m_ui->positionEdit->coordinate().y());
|
||||
request.line1_position(pos);
|
||||
request.line2_radioFrequencyCallSignSuffix(m_ui->leRadioFrequencyCallSignSuffix->text().toStdString());
|
||||
request.line1_position = pos;
|
||||
request.line2_radioFrequencyCallSignSuffix = m_ui->leRadioFrequencyCallSignSuffix->text().toStdString();
|
||||
|
||||
m_vecCategoryLine.clear();
|
||||
|
||||
@@ -218,13 +220,13 @@ bool SanNineLinerEditDialog::apply()
|
||||
setCategoryLine(line, QStringLiteral("None"), m_ui->cbx9None);
|
||||
|
||||
QJsonDocument doc = SanCategoryLine::toJson(m_vecCategoryLine);
|
||||
request.lines(doc.toJson().toStdString());
|
||||
request.lines = doc.toJson().toStdString();
|
||||
|
||||
if (!m_requestHelper->startSingleRequest(
|
||||
[this, request]() { return m_ftc->sanNineLinerModifyRequest(request, this); }))
|
||||
return false;
|
||||
|
||||
if (request.id() <= 0)
|
||||
if (request.id <= 0)
|
||||
{
|
||||
m_sanNineLinerId = m_requestHelper->getRepliedId();
|
||||
ERROR_LOG(m_logger) << "Created new san nine liner with id " << m_sanNineLinerId;
|
||||
|
||||
Reference in new issue
Block a user