lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
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 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.cpp
+6 -4
View File
@@ -1,6 +1,7 @@
#include "cod_assign_codification_data_table.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "cod_codification_data_overview_model.h"
@@ -14,6 +15,7 @@ using namespace CodificationManagement;
AssignCodificationDataTable::AssignCodificationDataTable(QWidget* parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_dtc(nullptr), m_ftc(nullptr),
m_ppmDtc(nullptr), m_ui(new Ui::AssignCodificationDataTable), m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("AssignCodificationDataTable"))
{
m_ui->setupUi(this);
@@ -153,7 +155,7 @@ bool AssignCodificationDataTable::apply()
CodificationManagement::CodificationData codDdsData = m_dtc->codificationData(tableId);
bStartRequests = true;
codDdsData.partyId(partyId);
codDdsData.partyId = partyId;
m_requestHelper->addRequest(
[this, codDdsData]() { return m_ftc->codificationDataModifyRequest(codDdsData, this); });
}
@@ -169,11 +171,11 @@ bool AssignCodificationDataTable::removeAllAssignments()
bool bStartRequests = false;
for (CodificationManagement::CodificationData codData : codMap)
{
if (codData.partyId() < 0)
if (codData.partyId < 0)
continue;
bStartRequests = true;
codData.partyId(-1);
codData.partyId = -1;
m_requestHelper->addRequest([this, codData]() { return m_ftc->codificationDataModifyRequest(codData, this); });
}
if (!bStartRequests)
@@ -185,5 +187,5 @@ bool AssignCodificationDataTable::removeAllAssignments()
bool AssignCodificationDataTable::isTableAlreadyAssigned(int codTableId) const
{
const CodificationManagement::CodificationData& codData = m_dtc->codificationData(codTableId);
return codData.partyId() > 0;
return codData.partyId > 0;
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.h
+1
View File
@@ -9,6 +9,7 @@
#include <LtsWidgets/lts_combo_box.h>
#include <LtsWidgets/lts_dialog.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <CodificationManagement/cod_dtc.h>
#include <CodificationManagement/cod_ftc.h>
qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_authentication_code_model.cpp
+9 -7
View File
@@ -1,6 +1,7 @@
#include "cod_authentication_code_model.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <QtGui/QGuiApplication>
#include <QPalette>
@@ -9,6 +10,7 @@ using namespace CodificationManagement;
AuthenticationCodeModel::AuthenticationCodeModel(QObject* parent)
: QAbstractTableModel(parent), m_dtc(nullptr), m_codificationDataId(0), m_isEditMode(false)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("AuthenticationCodeModel"))
{
memset(m_matrix, 0, sizeof m_matrix);
DEBUG_LOG(m_logger) << "ctor AuthenticationCodeModel";
@@ -63,7 +65,7 @@ bool AuthenticationCodeModel::setMatrixValuesCSV(const QString& csvData)
{
DEBUG_LOG(m_logger) << "setMatrixValuesCSV: " << csvData;
const QVector<QStringRef> slRows = csvData.splitRef(QLatin1Char('\n'));
const QList<QString> slRows = csvData.split(QLatin1Char('\n'));
if (slRows.size() != rowCount())
{
ERROR_LOG(m_logger) << "Invalid row data count." << " codificationDataId: " << m_codificationDataId
@@ -73,7 +75,7 @@ bool AuthenticationCodeModel::setMatrixValuesCSV(const QString& csvData)
for (int row = 0; row < slRows.size(); ++row)
{
const QVector<QStringRef> slColumns = slRows[row].split(QLatin1Char(';'));
const QList<QString> slColumns = slRows[row].split(QLatin1Char(';'));
if (slColumns.size() != columnCount())
{
ERROR_LOG(m_logger) << "Invalid column data count." << " codificationDataId: " << m_codificationDataId
@@ -212,13 +214,13 @@ Qt::ItemFlags AuthenticationCodeModel::flags(const QModelIndex& index) const
void AuthenticationCodeModel::onCodificationDataChanged(const CodificationManagement::CodificationData& data,
DataModification modType)
{
const int id = data.id();
const int id = data.id;
DEBUG_LOG(m_logger) << "onCodificationDataChanged for CodificationData id: " << id
<< " - AuthenticationCodeMatrix data: " << data.authenticationTableMatirx().c_str()
<< " - AuthenticationCodeMatrix data: " << data.authenticationTableMatirx.c_str()
<< " - modType: " << (int)modType;
if (m_codificationDataId != data.id())
if (m_codificationDataId != data.id)
return;
if (modType == DataModification::eRemoved)
@@ -232,9 +234,9 @@ void AuthenticationCodeModel::onCodificationDataChanged(const CodificationManage
if (modType == DataModification::eModified)
{
DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note();
DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note;
QString qs = QString::fromStdString(data.authenticationTableMatirx());
QString qs = QString::fromStdString(data.authenticationTableMatirx);
setMatrixValuesCSV(qs);
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_code_table_edit_delegate.cpp
+1
View File
@@ -3,6 +3,7 @@
#include "cod_code_table_edit_delegate.h"
#include <QtWidgets/QLineEdit>
#include <NGLLogger/NGLLoggerBootstrap.h>
using namespace CodificationManagement;
qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_model.cpp
+25 -23
View File
@@ -1,6 +1,7 @@
#include "cod_codification_data_overview_model.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <ParticipantManagement/ppm_translation.h>
#include <QtGui/QColor>
@@ -19,6 +20,7 @@ CodificationDataOverviewModel::CodificationDataOverviewModel(QObject* parent)
tr("Note")},
parent),
m_codDtc(nullptr)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CodificationDataOverviewModel"))
{
}
@@ -53,43 +55,43 @@ QVariant CodificationDataOverviewModel::data(const QModelIndex& index, int role)
switch (index.column())
{
case Id:
return codificationData.id();
return codificationData.id;
case Identifier:
return QString::fromUtf8(codificationData.identifier().c_str());
return QString::fromUtf8(codificationData.identifier.c_str());
case ValidityTime:
return QDateTime::fromMSecsSinceEpoch(codificationData.validityTime());
return QDateTime::fromMSecsSinceEpoch(codificationData.validityTime);
case PartyId:
if (codificationData.partyId() < 0)
if (codificationData.partyId < 0)
return QStringLiteral("---");
if (codificationData.partyId() == 2)
if (codificationData.partyId == 2)
return tr("OPFOR");
else if (codificationData.partyId() == 3)
else if (codificationData.partyId == 3)
return tr("BLUFOR");
return ParticipantManagement::trPartyName(m_ppmDtc->party(codificationData.partyId()).name());
return ParticipantManagement::trPartyName(m_ppmDtc->party(codificationData.partyId).name);
case PartyIdHiddenColumn:
return codificationData.partyId();
return codificationData.partyId;
case NumeralCodeTableColumnIndex:
return QString::fromUtf8(codificationData.numeralCodeTableColumnIndex().c_str());
return QString::fromUtf8(codificationData.numeralCodeTableColumnIndex.c_str());
case NumeralCodeTableRowIndex:
return QString::fromUtf8(codificationData.numeralCodeTableRowIndex().c_str());
return QString::fromUtf8(codificationData.numeralCodeTableRowIndex.c_str());
case AuthenticationTableColumnIndex:
return QString::fromUtf8(codificationData.authenticationTableColumnIndex().c_str());
return QString::fromUtf8(codificationData.authenticationTableColumnIndex.c_str());
case AuthenticationTableRowIndex:
return QString::fromUtf8(codificationData.authenticationTableRowIndex().c_str());
return QString::fromUtf8(codificationData.authenticationTableRowIndex.c_str());
case AuthenticationTableMatrix:
return QString::fromUtf8(codificationData.authenticationTableMatirx().c_str());
return QString::fromUtf8(codificationData.authenticationTableMatirx.c_str());
case LogisticalTermTableColumnIndex:
return QString::fromUtf8(codificationData.logisticalTermTableColumnIndex().c_str());
return QString::fromUtf8(codificationData.logisticalTermTableColumnIndex.c_str());
case LogisticalTermTableRowIndex:
return QString::fromUtf8(codificationData.logisticalTermTableRowIndex().c_str());
return QString::fromUtf8(codificationData.logisticalTermTableRowIndex.c_str());
case LogisticalTermTableMatrix:
return QString::fromUtf8(codificationData.logisticalTermTableMatrix().c_str());
return QString::fromUtf8(codificationData.logisticalTermTableMatrix.c_str());
case PhraseTable:
return QString::fromUtf8(codificationData.phraseTable().c_str());
return QString::fromUtf8(codificationData.phraseTable.c_str());
case Note:
return QString::fromUtf8(codificationData.note().c_str());
return QString::fromUtf8(codificationData.note.c_str());
}
}
@@ -98,8 +100,8 @@ QVariant CodificationDataOverviewModel::data(const QModelIndex& index, int role)
switch (index.column())
{
case PartyId:
if (codificationData.partyId() >= 0)
return QColor::fromRgb(QRgb(m_ppmDtc->party(codificationData.partyId()).color()));
if (codificationData.partyId >= 0)
return QColor::fromRgb(QRgb(m_ppmDtc->party(codificationData.partyId).color));
break;
default:
break;
@@ -112,8 +114,8 @@ int CodificationDataOverviewModel::getCodTableId(int partyId) const
{
for (const CodificationManagement::CodificationData& codificationData : m_vecData)
{
if (codificationData.partyId() == partyId)
return codificationData.id();
if (codificationData.partyId == partyId)
return codificationData.id;
}
return -1;
}
@@ -134,7 +136,7 @@ bool CodificationDataOverviewProxyModel::lessThan(const QModelIndex& source_left
switch (source_left.column())
{
case CodificationDataOverviewModel::ValidityTime:
return dataLeft.validityTime() < dataRight.validityTime();
return dataLeft.validityTime < dataRight.validityTime;
case CodificationDataOverviewModel::Id:
case CodificationDataOverviewModel::Identifier:
qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_view.cpp
+7 -5
View File
@@ -1,6 +1,7 @@
#include "cod_codification_data_overview_view.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "cod_codification_data_table_edit_view.h"
#include "cod_codification_data_table_view.h"
@@ -16,6 +17,7 @@ CodificationDataOverviewView::CodificationDataOverviewView(const QString& menuGr
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_menuGroup(menuGroup),
m_session(session), m_model(nullptr), m_dtc(nullptr), m_ftc(nullptr),
m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::CodificationDataOverviewView)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CodificationDataOverviewView"))
{
m_ui->setupUi(this);
m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -118,10 +120,10 @@ void CodificationDataOverviewView::onShowCodificationData()
CodificationManagement::CodificationData codificationData = m_model->getRowData(row);
DEBUG_LOG(m_logger) << "--- onShowCodificationData() "
<< " id: " << codificationData.id();
<< " id: " << codificationData.id;
CodificationDataTableView* dialog = new CodificationDataTableView;
dialog->init(m_dtc, m_ftc, m_session, codificationData.partyId(), codificationData.id());
dialog->init(m_dtc, m_ftc, m_session, codificationData.partyId, codificationData.id);
dialog->setUnchangeable(true);
addDialog(dialog, m_menuGroup, QLatin1String("codShowCodificationData"), LtsWidgets::LayoutArea::eDialogTab);
@@ -148,10 +150,10 @@ void CodificationDataOverviewView::onEditCodificationData()
CodificationManagement::CodificationData codificationData = m_model->getRowData(row);
DEBUG_LOG(m_logger) << "--- onEditCodificationData() "
<< " id: " << codificationData.id();
<< " id: " << codificationData.id;
CodificationDataTableEditView* dialog = new CodificationDataTableEditView(this);
dialog->init(m_dtc, m_ftc, m_session, codificationData.id());
dialog->init(m_dtc, m_ftc, m_session, codificationData.id);
addDialog(dialog, m_menuGroup, QLatin1String("codSetCodificationData"), LtsWidgets::LayoutArea::eDialogTab);
}
@@ -160,7 +162,7 @@ void CodificationDataOverviewView::onRemoveCodificationData()
{
const QModelIndex idx = m_ui->widget->currentIndex();
CodificationManagement::CodificationData codificationData = m_model->getRowData(idx.row());
Core::RemoveElementRequest request(codificationData.id());
Core::RemoveElementRequest request(codificationData.id);
m_requestHelper->startSingleRequest(
[request, this]() { return m_ftc->codificationDataRemoveRequest(request, this); });
qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_edit_view.cpp
+35 -33
View File
@@ -1,6 +1,7 @@
#include "cod_codification_data_table_edit_view.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "cod_authentication_code_model.h"
#include "cod_code_table_edit_delegate.h"
@@ -25,6 +26,7 @@ CodificationDataTableEditView::CodificationDataTableEditView(QWidget* parent)
m_authenticationCodeModel(new AuthenticationCodeModel(this)),
m_logisticalTermsModel(new LogisticalTermsModel(this)), m_phraseTableModel(new PhraseTableModel(this)),
m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CodificationDataTableEditView"))
{
m_ui->setupUi(this);
m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &CodificationDataTableEditView::onPrint);
@@ -75,10 +77,10 @@ bool CodificationDataTableEditView::init(const std::shared_ptr<CodificationManag
initLogisticalTermsModel();
initPhraseTableModel();
m_ui->pteNote->setPlainText(QString::fromStdString(m_lastDdsCodificationData.note()));
m_ui->pteNote->setPlainText(QString::fromStdString(m_lastDdsCodificationData.note));
m_ui->leIdentifier->setText(QString::fromStdString(m_lastDdsCodificationData.identifier()));
m_ui->dteValidityTime->setMsecsSinceEpoch(m_lastDdsCodificationData.validityTime());
m_ui->leIdentifier->setText(QString::fromStdString(m_lastDdsCodificationData.identifier));
m_ui->dteValidityTime->setMsecsSinceEpoch(m_lastDdsCodificationData.validityTime);
m_ui->dteValidityTime->setRetrieveCurrentTimeCallback([this]() { return m_session->partitionTime(); });
m_buttonBox->connectButton(LtsWidgets::DialogButton::Load, this,
@@ -174,19 +176,19 @@ void CodificationDataTableEditView::loadCodificationDataFromDatabase()
{
m_lastDdsCodificationData = m_dtc->codificationData(m_codificationDataId);
DEBUG_LOG(m_logger) << "Load from database: ---";
DEBUG_LOG(m_logger) << "NumCodeHorizontalHeader: " << m_lastDdsCodificationData.numeralCodeTableColumnIndex();
DEBUG_LOG(m_logger) << "NumCodeVerticalHeader: " << m_lastDdsCodificationData.numeralCodeTableRowIndex();
DEBUG_LOG(m_logger) << "NumCodeHorizontalHeader: " << m_lastDdsCodificationData.numeralCodeTableColumnIndex;
DEBUG_LOG(m_logger) << "NumCodeVerticalHeader: " << m_lastDdsCodificationData.numeralCodeTableRowIndex;
DEBUG_LOG(m_logger) << "AuthenticationMatrix: " << m_lastDdsCodificationData.authenticationTableMatirx();
DEBUG_LOG(m_logger) << "AuthenticationMatrix: " << m_lastDdsCodificationData.authenticationTableMatirx;
DEBUG_LOG(m_logger) << "LogisticalTermsHorizontalHeader: "
<< m_lastDdsCodificationData.logisticalTermTableColumnIndex();
DEBUG_LOG(m_logger) << "LogisticalTermsVerticalHeader: " << m_lastDdsCodificationData.logisticalTermTableRowIndex();
DEBUG_LOG(m_logger) << "LogisticalTermsMatrix :" << m_lastDdsCodificationData.logisticalTermTableMatrix();
<< m_lastDdsCodificationData.logisticalTermTableColumnIndex;
DEBUG_LOG(m_logger) << "LogisticalTermsVerticalHeader: " << m_lastDdsCodificationData.logisticalTermTableRowIndex;
DEBUG_LOG(m_logger) << "LogisticalTermsMatrix :" << m_lastDdsCodificationData.logisticalTermTableMatrix;
DEBUG_LOG(m_logger) << "PhraseTable :" << m_lastDdsCodificationData.phraseTable();
DEBUG_LOG(m_logger) << "PhraseTable :" << m_lastDdsCodificationData.phraseTable;
DEBUG_LOG(m_logger) << "Note: " << m_lastDdsCodificationData.note();
DEBUG_LOG(m_logger) << "Note: " << m_lastDdsCodificationData.note;
return;
}
@@ -230,10 +232,10 @@ bool CodificationDataTableEditView::initNumeralModel()
if (m_codificationDataId > 0)
{
QString qs = QString::fromStdString(m_lastDdsCodificationData.numeralCodeTableColumnIndex());
QString qs = QString::fromStdString(m_lastDdsCodificationData.numeralCodeTableColumnIndex);
m_numCodeModel->setColumnSelectionValuesCSV(qs);
qs = QString::fromStdString(m_lastDdsCodificationData.numeralCodeTableRowIndex());
qs = QString::fromStdString(m_lastDdsCodificationData.numeralCodeTableRowIndex);
m_numCodeModel->setRowSelectionValuesCSV(qs);
}
return true;
@@ -275,7 +277,7 @@ bool CodificationDataTableEditView::initAuthenticationModel()
if (m_codificationDataId > 0)
m_authenticationCodeModel->setMatrixValuesCSV(
QString::fromStdString(m_lastDdsCodificationData.authenticationTableMatirx()));
QString::fromStdString(m_lastDdsCodificationData.authenticationTableMatirx));
return true;
}
@@ -320,14 +322,14 @@ bool CodificationDataTableEditView::initLogisticalTermsModel()
if (m_codificationDataId > 0)
{
QString qs = QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableColumnIndex());
QString qs = QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableColumnIndex);
m_logisticalTermsModel->setColumnSelectionValuesCSV(qs);
qs = QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableRowIndex());
qs = QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableRowIndex);
m_logisticalTermsModel->setRowSelectionValuesCSV(qs);
m_logisticalTermsModel->setMatrixValuesCSV(
QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableMatrix()));
QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableMatrix));
}
return true;
}
@@ -361,7 +363,7 @@ bool CodificationDataTableEditView::initPhraseTableModel()
m_ui->tvPhraseTable->setMinimumHeight((rectMatrix.height() * 1.3 * 13));
if (m_codificationDataId > 0)
m_phraseTableModel->setMatrixValuesCSV(QString::fromStdString(m_lastDdsCodificationData.phraseTable()));
m_phraseTableModel->setMatrixValuesCSV(QString::fromStdString(m_lastDdsCodificationData.phraseTable));
return true;
}
@@ -383,40 +385,40 @@ bool CodificationDataTableEditView::apply()
CodificationManagement::CodificationData modifiedCodificationData(m_lastDdsCodificationData);
modifiedCodificationData.name(m_ui->leIdentifier->text().toStdString());
modifiedCodificationData.name = m_ui->leIdentifier->text().toStdString();
modifiedCodificationData.numeralCodeTableColumnIndex(m_numCodeModel->getHorizontalHeaderCSVString().toStdString());
modifiedCodificationData.numeralCodeTableRowIndex(m_numCodeModel->getVerticalHeaderCSVString().toStdString());
modifiedCodificationData.numeralCodeTableColumnIndex = m_numCodeModel->getHorizontalHeaderCSVString().toStdString();
modifiedCodificationData.numeralCodeTableRowIndex = m_numCodeModel->getVerticalHeaderCSVString().toStdString();
DEBUG_LOG(m_logger) << "onOkayCodificationData() HH: " << m_numCodeModel->getHorizontalHeaderCSVString();
DEBUG_LOG(m_logger) << "onOkayCodificationData() VH: " << m_numCodeModel->getVerticalHeaderCSVString();
modifiedCodificationData.authenticationTableMatirx(
m_authenticationCodeModel->getMatrixDataCSVString().toStdString());
modifiedCodificationData.authenticationTableMatirx =
m_authenticationCodeModel->getMatrixDataCSVString().toStdString();
DEBUG_LOG(m_logger) << "onOkayCodificationData() authMatrix: "
<< m_authenticationCodeModel->getMatrixDataCSVString();
modifiedCodificationData.logisticalTermTableColumnIndex(
m_logisticalTermsModel->getHorizontalHeaderCSVString().toStdString());
modifiedCodificationData.logisticalTermTableRowIndex(
m_logisticalTermsModel->getVerticalHeaderCSVString().toStdString());
modifiedCodificationData.logisticalTermTableMatrix(m_logisticalTermsModel->getMatrixDataCSVString().toStdString());
modifiedCodificationData.logisticalTermTableColumnIndex =
m_logisticalTermsModel->getHorizontalHeaderCSVString().toStdString();
modifiedCodificationData.logisticalTermTableRowIndex =
m_logisticalTermsModel->getVerticalHeaderCSVString().toStdString();
modifiedCodificationData.logisticalTermTableMatrix = m_logisticalTermsModel->getMatrixDataCSVString().toStdString();
DEBUG_LOG(m_logger) << "onOkayCodificationData() HH: " << m_logisticalTermsModel->getHorizontalHeaderCSVString();
DEBUG_LOG(m_logger) << "onOkayCodificationData() VH: " << m_logisticalTermsModel->getVerticalHeaderCSVString();
DEBUG_LOG(m_logger) << "onOkayCodificationData() logTermsMatrix: "
<< m_logisticalTermsModel->getMatrixDataCSVString();
modifiedCodificationData.phraseTable(m_phraseTableModel->getMatrixDataCSVString().toStdString());
modifiedCodificationData.phraseTable = m_phraseTableModel->getMatrixDataCSVString().toStdString();
DEBUG_LOG(m_logger) << "onOkayCodificationData() phraseTable: " << m_phraseTableModel->getMatrixDataCSVString();
modifiedCodificationData.note(m_ui->pteNote->toPlainText().toStdString());
modifiedCodificationData.note = m_ui->pteNote->toPlainText().toStdString();
DEBUG_LOG(m_logger) << "CodificationDataTableEditView::onOkayCodificationData()";
modifiedCodificationData.identifier(m_ui->leIdentifier->text().toStdString());
modifiedCodificationData.validityTime(m_ui->dteValidityTime->msecsSinceEpoch());
modifiedCodificationData.identifier = m_ui->leIdentifier->text().toStdString();
modifiedCodificationData.validityTime = m_ui->dteValidityTime->msecsSinceEpoch();
if (m_codificationDataId < 1)
modifiedCodificationData.partyId(-1);
modifiedCodificationData.partyId = -1;
m_requestHelper->addRequest([this, modifiedCodificationData]() {
return m_ftc->codificationDataModifyRequest(modifiedCodificationData, this);
qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_view.cpp
+20 -18
View File
@@ -1,6 +1,7 @@
#include "cod_codification_data_table_view.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "cod_authentication_code_model.h"
#include "cod_codification_data_report.h"
@@ -17,6 +18,7 @@ CodificationDataTableView::CodificationDataTableView(QWidget* parent)
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_ui(new Ui::CodificationDataTableView),
m_numCodeModel(new NumeralCodeModel(this)), m_authenticationCodeModel(new AuthenticationCodeModel(this)),
m_logisticalTermsModel(new LogisticalTermsModel(this)), m_phraseTableModel(new PhraseTableModel(this))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CodificationDataTableView"))
{
m_ui->setupUi(this);
m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &CodificationDataTableView::onPrint);
@@ -79,7 +81,7 @@ bool CodificationDataTableView::init(const std::shared_ptr<CodificationManagemen
m_ui->lbDteValidityTime->hide();
m_ui->dteValidityTime->hide();
m_ui->pteNote->setPlainText(QString::fromStdString(m_lastDdsCodificationData.note()));
m_ui->pteNote->setPlainText(QString::fromStdString(m_lastDdsCodificationData.note));
m_ui->pteNote->setReadOnly(true);
connect(m_dtc.get(), &CodificationManagement::Interface::Dtc::codificationDataChanged, this,
@@ -100,19 +102,19 @@ void CodificationDataTableView::loadCodificationDataFromDatabase()
m_lastDdsCodificationData = m_dtc->codificationData(m_codificationDataId);
DEBUG_LOG(m_logger) << "Load from database: ";
DEBUG_LOG(m_logger) << "NumCodeHorizontalHeader: " << m_lastDdsCodificationData.numeralCodeTableColumnIndex();
DEBUG_LOG(m_logger) << "NumCodeVerticalHeader: " << m_lastDdsCodificationData.numeralCodeTableRowIndex();
DEBUG_LOG(m_logger) << "NumCodeHorizontalHeader: " << m_lastDdsCodificationData.numeralCodeTableColumnIndex;
DEBUG_LOG(m_logger) << "NumCodeVerticalHeader: " << m_lastDdsCodificationData.numeralCodeTableRowIndex;
DEBUG_LOG(m_logger) << "LogisticalTermsHorizontalHeader: "
<< m_lastDdsCodificationData.logisticalTermTableColumnIndex();
DEBUG_LOG(m_logger) << "LogisticalTermsVerticalHeader: " << m_lastDdsCodificationData.logisticalTermTableRowIndex();
DEBUG_LOG(m_logger) << "LogisticalTermsMatrix: " << m_lastDdsCodificationData.logisticalTermTableMatrix();
<< m_lastDdsCodificationData.logisticalTermTableColumnIndex;
DEBUG_LOG(m_logger) << "LogisticalTermsVerticalHeader: " << m_lastDdsCodificationData.logisticalTermTableRowIndex;
DEBUG_LOG(m_logger) << "LogisticalTermsMatrix: " << m_lastDdsCodificationData.logisticalTermTableMatrix;
DEBUG_LOG(m_logger) << "AuthenticationMatrix: " << m_lastDdsCodificationData.authenticationTableMatirx();
DEBUG_LOG(m_logger) << "AuthenticationMatrix: " << m_lastDdsCodificationData.authenticationTableMatirx;
DEBUG_LOG(m_logger) << "PhraseTable: " << m_lastDdsCodificationData.phraseTable();
DEBUG_LOG(m_logger) << "PhraseTable: " << m_lastDdsCodificationData.phraseTable;
DEBUG_LOG(m_logger) << "Note: " << m_lastDdsCodificationData.note();
DEBUG_LOG(m_logger) << "Note: " << m_lastDdsCodificationData.note;
return;
}
@@ -161,10 +163,10 @@ bool CodificationDataTableView::initNumeralModel()
if (m_codificationDataId > 0)
{
QString qs = QString::fromStdString(m_lastDdsCodificationData.numeralCodeTableColumnIndex());
QString qs = QString::fromStdString(m_lastDdsCodificationData.numeralCodeTableColumnIndex);
m_numCodeModel->setColumnSelectionValuesCSV(qs);
qs = QString::fromStdString(m_lastDdsCodificationData.numeralCodeTableRowIndex());
qs = QString::fromStdString(m_lastDdsCodificationData.numeralCodeTableRowIndex);
m_numCodeModel->setRowSelectionValuesCSV(qs);
}
return bOk;
@@ -207,7 +209,7 @@ bool CodificationDataTableView::initAuthenticationModel()
if (m_codificationDataId > 0)
{
m_authenticationCodeModel->setMatrixValuesCSV(
QString::fromStdString(m_lastDdsCodificationData.authenticationTableMatirx()));
QString::fromStdString(m_lastDdsCodificationData.authenticationTableMatirx));
}
return bOk;
}
@@ -248,14 +250,14 @@ bool CodificationDataTableView::initLogicalTermsModel()
if (m_codificationDataId > 0)
{
QString qs = QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableColumnIndex());
QString qs = QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableColumnIndex);
m_logisticalTermsModel->setColumnSelectionValuesCSV(qs);
qs = QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableRowIndex());
qs = QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableRowIndex);
m_logisticalTermsModel->setRowSelectionValuesCSV(qs);
m_logisticalTermsModel->setMatrixValuesCSV(
QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableMatrix()));
QString::fromStdString(m_lastDdsCodificationData.logisticalTermTableMatrix));
}
return bOk;
}
@@ -292,7 +294,7 @@ bool CodificationDataTableView::initPhraseTableModel()
if (m_codificationDataId > 0)
{
m_phraseTableModel->setMatrixValuesCSV(QString::fromStdString(m_lastDdsCodificationData.phraseTable()));
m_phraseTableModel->setMatrixValuesCSV(QString::fromStdString(m_lastDdsCodificationData.phraseTable));
}
return bOk;
}
@@ -300,8 +302,8 @@ bool CodificationDataTableView::initPhraseTableModel()
void CodificationDataTableView::onCodificationDataChanged(const CodificationManagement::CodificationData& data,
DataModification modType)
{
if (m_codificationDataId != data.id() || modType == DataModification::eRemoved)
if (m_codificationDataId != data.id || modType == DataModification::eRemoved)
return;
m_ui->pteNote->setPlainText(QString::fromStdString(data.note()));
m_ui->pteNote->setPlainText(QString::fromStdString(data.note));
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_export.cpp
+1
View File
@@ -1,6 +1,7 @@
#include "cod_csv_export.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "cod_authentication_code_model.h"
#include "cod_logistical_terms_model.h"
qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_import.cpp
+1
View File
@@ -1,6 +1,7 @@
#include "cod_csv_import.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "cod_authentication_code_model.h"
#include "cod_logistical_terms_model.h"
qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_logistical_terms_model.cpp
+16 -14
View File
@@ -1,6 +1,7 @@
#include "cod_logistical_terms_model.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <LtsWidgets/lts_message_dialog.h>
#include <QtGui/QGuiApplication>
@@ -12,6 +13,7 @@ static const int s_matrixCount = 5;
LogisticalTermsModel::LogisticalTermsModel(QWidget* parent)
: QAbstractTableModel(parent), m_dtc(nullptr), m_codificationDataId(0), m_isEditMode(false)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("LogisticalTermsModel"))
{
DEBUG_LOG(m_logger) << "ctor LogisticalTermsModel";
m_matrix.resize(s_matrixCount);
@@ -66,7 +68,7 @@ bool LogisticalTermsModel::setColumnSelectionValuesCSV(const QString& csvData)
m_ColumnSelectionValues.clear();
m_ColumnSelectionValues.resize(s_matrixCount);
const QVector<QStringRef> slColumns = csvData.splitRef(QLatin1Char(';'));
const QList<QString> slColumns = csvData.split(QLatin1Char(';'));
if (slColumns.size() != m_ColumnSelectionValues.size())
{
@@ -78,7 +80,7 @@ bool LogisticalTermsModel::setColumnSelectionValuesCSV(const QString& csvData)
for (int i = 0; i < m_ColumnSelectionValues.size(); ++i)
{
const QStringRef& qs = slColumns.at(i);
const QString& qs = slColumns.at(i);
if (qs.size() != 1)
{
ERROR_LOG(m_logger) << "Invalid column data value at id: " << i
@@ -96,7 +98,7 @@ bool LogisticalTermsModel::setRowSelectionValuesCSV(const QString& csvData)
m_RowSelectionValues.clear();
m_RowSelectionValues.resize(s_matrixCount);
const QVector<QStringRef> slRows = csvData.splitRef(QStringLiteral("\n"));
const QList<QString> slRows = csvData.split(QStringLiteral("\n"));
if (slRows.size() != m_RowSelectionValues.size())
{
@@ -109,7 +111,7 @@ bool LogisticalTermsModel::setRowSelectionValuesCSV(const QString& csvData)
for (int i = 0; i < m_RowSelectionValues.size(); ++i)
{
const QStringRef& qs = slRows.at(i);
const QString& qs = slRows.at(i);
if (qs.size() != 1)
{
ERROR_LOG(m_logger) << "Invalid row data value at id: " << i
@@ -144,7 +146,7 @@ bool LogisticalTermsModel::setMatrixValuesCSV(const QString& csvData)
for (int row = 0; row < slRows.size(); ++row)
{
const QVector<QStringRef> slColumns = slRows[row].splitRef(QLatin1Char(';'));
const QList<QString> slColumns = slRows[row].split(QLatin1Char(';'));
if (slColumns.size() != m_matrix.size())
{
ERROR_LOG(m_logger) << "Invalid column data count." << " codificationDataId: " << m_codificationDataId
@@ -153,7 +155,7 @@ bool LogisticalTermsModel::setMatrixValuesCSV(const QString& csvData)
}
for (int column = 0; column < m_matrix.size(); ++column)
m_matrix[row][column] = slColumns.at(column).toString();
m_matrix[row][column] = slColumns.at(column);
}
return true;
}
@@ -353,14 +355,14 @@ Qt::ItemFlags LogisticalTermsModel::flags(const QModelIndex& index) const
void LogisticalTermsModel::onCodificationDataChanged(const CodificationManagement::CodificationData& data,
DataModification modType)
{
const int id = data.id();
const int id = data.id;
DEBUG_LOG(m_logger) << "onCodificationDataChanged for CodificationData id: " << id
<< " - NumCodeColumnIdx data: " << data.numeralCodeTableColumnIndex().c_str()
<< " - NumCodeRowIdx data: " << data.numeralCodeTableRowIndex().c_str()
<< " - NumCodeColumnIdx data: " << data.numeralCodeTableColumnIndex.c_str()
<< " - NumCodeRowIdx data: " << data.numeralCodeTableRowIndex.c_str()
<< " - modType: " << modType;
if (m_codificationDataId != data.id())
if (m_codificationDataId != data.id)
return;
if (modType == DataModification::eRemoved)
@@ -376,15 +378,15 @@ void LogisticalTermsModel::onCodificationDataChanged(const CodificationManagemen
if (modType == DataModification::eModified)
{
DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note();
DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note;
QString qs = QString::fromStdString(data.logisticalTermTableColumnIndex());
QString qs = QString::fromStdString(data.logisticalTermTableColumnIndex);
setColumnSelectionValuesCSV(qs);
qs = QString::fromStdString(data.logisticalTermTableRowIndex());
qs = QString::fromStdString(data.logisticalTermTableRowIndex);
setRowSelectionValuesCSV(qs);
qs = QString::fromStdString(data.logisticalTermTableMatrix());
qs = QString::fromStdString(data.logisticalTermTableMatrix);
setMatrixValuesCSV(qs);
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_numeral_code_model.cpp
+13 -11
View File
@@ -1,6 +1,7 @@
#include "cod_numeral_code_model.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <LtsWidgets/lts_message_dialog.h>
#include <QtGui/QGuiApplication>
@@ -10,6 +11,7 @@ using namespace CodificationManagement;
NumeralCodeModel::NumeralCodeModel(QWidget* parent)
: QAbstractTableModel(parent), m_dtc(nullptr), m_codificationDataId(0), m_isEditMode(false)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("NumeralCodeModel"))
{
}
@@ -57,7 +59,7 @@ bool NumeralCodeModel::setColumnSelectionValuesCSV(const QString& csvData)
{
m_ColumnSelectionValues = QVector<QChar>(columnCount() - 1, QLatin1Char(' '));
const QVector<QStringRef> slColumns = csvData.splitRef(QLatin1Char(';'));
const QList<QString> slColumns = csvData.split(QLatin1Char(';'));
if (slColumns.size() != columnCount() - 1)
{
@@ -68,7 +70,7 @@ bool NumeralCodeModel::setColumnSelectionValuesCSV(const QString& csvData)
for (int i = 0; i < columnCount() - 1; ++i)
{
const QStringRef& qs = slColumns.at(i);
const QString& qs = slColumns.at(i);
if (qs.size() != 1)
{
ERROR_LOG(m_logger) << "Invalid column data value at id: " << i
@@ -84,7 +86,7 @@ bool NumeralCodeModel::setColumnSelectionValuesCSV(const QString& csvData)
bool NumeralCodeModel::setRowSelectionValuesCSV(const QString& csvData)
{
m_RowSelectionValues = QVector<QChar>(rowCount() - 1, QLatin1Char(' '));
const QVector<QStringRef> slRows = csvData.splitRef(QStringLiteral("\n"));
const QList<QString> slRows = csvData.split(QStringLiteral("\n"));
if (slRows.size() != rowCount() - 1)
{
@@ -96,7 +98,7 @@ bool NumeralCodeModel::setRowSelectionValuesCSV(const QString& csvData)
for (int i = 0; i < rowCount() - 1; ++i)
{
const QStringRef& qs = slRows.at(i);
const QString& qs = slRows.at(i);
if (qs.size() != 1)
{
ERROR_LOG(m_logger) << "Invalid row data value at id: " << i
@@ -351,14 +353,14 @@ void NumeralCodeModel::initMatrix()
void NumeralCodeModel::onCodificationDataChanged(const CodificationManagement::CodificationData& data,
DataModification modType)
{
const int id = data.id();
const int id = data.id;
DEBUG_LOG(m_logger) << "onCodificationDataChanged for CodificationData id: " << id
<< " - NumCodeColumnIdx data: " << data.numeralCodeTableColumnIndex().c_str()
<< " - NumCodeRowIdx data: " << data.numeralCodeTableRowIndex().c_str()
<< " - NumCodeColumnIdx data: " << data.numeralCodeTableColumnIndex.c_str()
<< " - NumCodeRowIdx data: " << data.numeralCodeTableRowIndex.c_str()
<< " - modType: " << (int)modType;
if (m_codificationDataId != data.id())
if (m_codificationDataId != data.id)
return;
if (modType == DataModification::eRemoved)
@@ -372,12 +374,12 @@ void NumeralCodeModel::onCodificationDataChanged(const CodificationManagement::C
if (modType == DataModification::eModified)
{
DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note();
DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note;
QString qs = QString::fromStdString(data.numeralCodeTableColumnIndex());
QString qs = QString::fromStdString(data.numeralCodeTableColumnIndex);
setColumnSelectionValuesCSV(qs);
qs = QString::fromStdString(data.numeralCodeTableRowIndex());
qs = QString::fromStdString(data.numeralCodeTableRowIndex);
setRowSelectionValuesCSV(qs);
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_phrase_table_model.cpp
+11 -9
View File
@@ -1,6 +1,7 @@
#include "cod_phrase_table_model.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <LtsWidgets/lts_message_dialog.h>
#include <QtGui/QGuiApplication>
@@ -10,6 +11,7 @@ using namespace CodificationManagement;
PhraseTableModel::PhraseTableModel(QWidget* parent)
: QAbstractTableModel(parent), m_dtc(nullptr), m_codificationDataId(0), m_isEditMode(false)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("PhraseTableModel"))
{
DEBUG_LOG(m_logger) << "ctor PhraseTableModel";
}
@@ -66,7 +68,7 @@ bool PhraseTableModel::setMatrixValuesCSV(const QString& csvData)
{
DEBUG_LOG(m_logger) << "setMatrixValuesCSV() data: " << csvData;
const QVector<QStringRef> slRows = csvData.splitRef(QLatin1Char('\n'));
const QList<QString> slRows = csvData.split(QLatin1Char('\n'));
if (slRows.count() != rowCount())
{
ERROR_LOG(m_logger) << "Invalid row data count." << " codificationDataId: " << m_codificationDataId
@@ -76,7 +78,7 @@ bool PhraseTableModel::setMatrixValuesCSV(const QString& csvData)
for (int row = 0; row < rowCount(); ++row)
{
const QStringList slColumns = splitQuotedString(QLatin1Char(';'), slRows[row].toString());
const QStringList slColumns = splitQuotedString(QLatin1Char(';'), slRows[row]);
if (slColumns.count() != columnCount())
{
ERROR_LOG(m_logger) << "Invalid column data count." << " codificationDataId: " << m_codificationDataId
@@ -225,12 +227,12 @@ Qt::ItemFlags PhraseTableModel::flags(const QModelIndex& index) const
void PhraseTableModel::onCodificationDataChanged(const CodificationManagement::CodificationData& data,
DataModification modType)
{
const int id = data.id();
const int id = data.id;
DEBUG_LOG(m_logger) << "onCodificationDataChanged for CodificationData id: " << id
<< " - PhraseTableModel data: " << data.phraseTable().c_str() << " - modType: " << (int)modType;
<< " - PhraseTableModel data: " << data.phraseTable.c_str() << " - modType: " << (int)modType;
if (m_codificationDataId != data.id())
if (m_codificationDataId != data.id)
return;
if (modType == DataModification::eRemoved)
@@ -244,9 +246,9 @@ void PhraseTableModel::onCodificationDataChanged(const CodificationManagement::C
if (modType == DataModification::eModified)
{
DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note();
DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note;
QString qs = QString::fromStdString(data.phraseTable());
QString qs = QString::fromStdString(data.phraseTable);
setMatrixValuesCSV(qs);
}
}
@@ -261,7 +263,7 @@ QStringList PhraseTableModel::splitQuotedString(const QChar& sep, const QString&
int i = str.indexOf(QLatin1Char('\"'));
QString part = str.left(i);
result += part.split(sep, QString::SkipEmptyParts);
result += part.split(sep, Qt::SkipEmptyParts);
str.remove(0, i + 1);
@@ -270,7 +272,7 @@ QStringList PhraseTableModel::splitQuotedString(const QChar& sep, const QString&
result += str.left(i);
str.remove(0, i + 1);
}
result += str.split(sep, QString::SkipEmptyParts);
result += str.split(sep, Qt::SkipEmptyParts);
return result;
}