Adds initial intermediate qt6 porting state

This commit is contained in:
torsten committed 2026-08-17 17:54:56 +02:00
1 parent 99136e9460
commit d176b5e0d7
11247 files changed
+1891537

No files matched your search

@@ -0,0 +1,27 @@
SET(lt_SRCS
main.cpp
maindialog.h
maindialog.cpp
cod_numeral_code_model.h
cod_numeral_code_model.cpp
ui/maindialog.ui
)
NGL_WRAP_UI(lt_SRCS ui/maindialog.ui)
NGL_ADD_EXECUTABLE(WS CODTest ${lt_SRCS})
NGL_TARGET_LINK_LIBRARIES(CODTest
Qt5::Widgets
Qt5::Core
nglapplication
NGLLogger
)
NGL_INSTALL_TARGET_DEVEL(CODTest)
NGL_INSTALL(WS FILES log4cxx_cod_test.props DESTINATION bin COMPONENT Devel)
@@ -0,0 +1,378 @@
#include "cod_numeral_code_model.h"
#include <QtWidgets/QWidget>
#include <QTime>
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <QtCore/QDebug>
NumeralCodeModel::NumeralCodeModel(QWidget *parent)
: QAbstractTableModel(parent)
, m_isEditMode(false)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("COD_Test_NumeralCodeTableModel"))
{
init();
}
NumeralCodeModel::~NumeralCodeModel()
{
}
bool NumeralCodeModel::init()
{
m_MatrixNumeralSet << '0' << '1' << '2' << '3' << '4'
<< '5' << '6' << '7' << '8' << '9';
m_MatrixCharacterSet1 << 'A' << 'B' << 'C' << 'D' << 'E' << 'F'
<< 'G' << 'H' << 'I' << 'J' << 'K' << 'L'
<< 'M' << 'N' << 'O' << 'P' << 'Q' << 'R'
<< 'S' << 'T' << 'U' << 'V' << 'W' << 'X'
<< 'Y' << 'Z';
m_MatrixCharacterSet2 << 'D' << 'E' << 'G' << 'H' << 'I' << 'L'
<< 'N' << 'O' << 'R' << 'S' << 'T' << 'U';
m_ColumnSelectionValues << 'A' << 'B' << 'C'
<< 'D' << 'E' << 'F'
<< 'G' << 'H' << 'I'
<< 'J' << 'K' << 'L'
<< 'M' ;
m_RowSelectionValues << 'a' << 'b' << 'c'
<< 'd' << 'e' << 'f'
<< 'g' << 'h' << 'i'
<< 'j' << 'k' << 'l'
<< 'm' ;
return initMatrix();
}
bool NumeralCodeModel::setColumnSelectionValues(const QVector <char> &data)
{
m_ColumnSelectionValues = data;
emit dataChanged(createIndex(0, 0), createIndex(0, columnCount() - 1));
return true;
}
bool NumeralCodeModel::setColumnSelectionValuesCSV(const QVector<char> &csvData)
{
QStringList qsList;
for (int i = 0; i < csvData.size(); ++i)
{
if (QLatin1Char(csvData.at(i)) != QLatin1Char(';'))
qsList.append(QString(QLatin1Char(csvData.at(i))));
}
QVector <char> data;
for (int i = 0; i < qsList.size(); ++i)
{
const QString &qs = qsList.at(i);
if (qs.isEmpty())
continue;
char c = qs.at(0).toLatin1();
data.append(c);
}
return setColumnSelectionValues(data);;
}
bool NumeralCodeModel::setRowSelectionValues(const QVector <char> &data)
{
m_RowSelectionValues = data;
emit dataChanged(createIndex(0, 0), createIndex(0, columnCount() - 1));
return true;
}
bool NumeralCodeModel::setRowSelectionValuesCSV(const QVector<char> &csvData)
{
QStringList qsList;
for (int i = 0; i < csvData.size(); ++i)
{
if (QLatin1Char(csvData.at(i)) != QLatin1Char(';'))
qsList.append(QString(QLatin1Char(csvData.at(i))));
}
QVector <char> data;
for (int i = 0; i < qsList.size(); ++i)
{
const QString &qs = qsList.at(i);
if (qs.isEmpty())
continue;
char c = qs.at(0).toLatin1();
data.append(c);
}
return setRowSelectionValues(data);
}
QVector<char> NumeralCodeModel::getHorizontalHeaderCSV() const
{
QVector <char> qVec;
qVec.reserve(m_ColumnSelectionValues.size() * 2);
for (int i = 0; i < m_ColumnSelectionValues.size(); ++i)
{
qVec.append(m_ColumnSelectionValues.at(i));
qVec.append(';');
}
qVec.remove(m_ColumnSelectionValues.size() * 2 - 1);
return qVec;
}
QVector <char> NumeralCodeModel::getVerticalHeaderCSV() const
{
QVector <char> qVec;
qVec.reserve(m_RowSelectionValues.size() * 2);
for (int i = 0; i < m_RowSelectionValues.size(); ++i)
{
qVec.append(m_RowSelectionValues.at(i));
qVec.append(';');
}
qVec.remove(m_RowSelectionValues.size() * 2 - 1);
return qVec;
}
void NumeralCodeModel::setEditMode(bool isEditMode)
{
m_isEditMode = isEditMode;
emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, columnCount() - 1));
}
bool NumeralCodeModel::isEditMode() const
{
return m_isEditMode;
}
int NumeralCodeModel::rowCount(const QModelIndex &parent) const
{
Q_UNUSED(parent)
return 14;
}
int NumeralCodeModel::columnCount(const QModelIndex &parent) const
{
Q_UNUSED(parent)
return 14;
}
QVariant NumeralCodeModel::headerData(int column, Qt::Orientation orientation, int role) const
{
if (role != Qt::DisplayRole)
return QAbstractTableModel::headerData(column, orientation, role);
if (isEditMode())
{
return QVariant();
}
else
{
if (column == 0)
return QVariant();
if (orientation == Qt::Horizontal)
return QChar::fromLatin1(m_ColumnSelectionValues.at(column - 1));
if (orientation == Qt::Vertical)
return QChar::fromLatin1(m_RowSelectionValues.at(column - 1));
}
return QAbstractTableModel::headerData(column, orientation, role);
}
QVariant NumeralCodeModel::data(const QModelIndex &index, int role) const
{
if ((role == Qt::DisplayRole || role == Qt::EditRole))
{
if ((index.column() == 0) && (index.row() == 0))
return QVariant();
if (index.row() == 0)
return QChar::fromLatin1(m_ColumnSelectionValues[index.column() - 1]);
if ((index.column() == 0))
return QChar::fromLatin1(m_RowSelectionValues[index.row() - 1]);
if ((index.column() > 0) && (index.row() > 0))
{
return QChar::fromLatin1(m_matrix[index.row() - 1][index.column() - 1]);
}
}
if (role == Qt::TextAlignmentRole)
return Qt::AlignCenter;
if (role == Qt::BackgroundRole)
{
if ((index.row() > 0) && (index.column() > 0))
{
if (m_isEditMode)
return QColor(Qt::darkRed);
else
return QColor(Qt::darkGray);
}
else
return QColor(Qt::darkYellow);
}
if (role == Qt::ForegroundRole)
{
if ((index.row() == 0) && (index.column() == 0))
return QColor(Qt::red);
}
return QVariant();
}
bool NumeralCodeModel::setData(const QModelIndex &index, const QVariant &value, int role)
{
DEBUG_LOG(m_logger) << "setData() row/col: " << index.row() << "/" << index.column()
<< " char:" << value.toString();
QString tmp = value.toString();
if (tmp.isEmpty())
return false;
const char c = tmp.at(0).toLatin1();
if (role == Qt::EditRole)
{
if (index.row() == 0)
m_ColumnSelectionValues[index.column() - 1] = c;
if (index.column() == 0 && (index.row() > 0))
m_RowSelectionValues[index.row() - 1] = c;
}
return true;
}
Qt::ItemFlags NumeralCodeModel::flags(const QModelIndex &index) const
{
Qt::ItemFlags flags = QAbstractTableModel::flags(index);
if (((index.row() == 0) && (index.column() > 0)) ||
((index.row() > 0) && (index.column() == 0)))
flags |= Qt::ItemIsEditable;
return flags;
}
bool NumeralCodeModel::initMatrix()
{
int lastMatrixValueCnt = 0;
int lastMatrixCharacterCnt = 0;
int lastMatrixCharacterIndex = 0;
int numOfCharacter = 4;
for (int row = 0; row < 13; ++row)
{
if (row > 3)
{
numOfCharacter = 3;
lastMatrixValueCnt -= 1;
}
if (row == 9)
lastMatrixCharacterIndex = 0;
for (int col = 0; col < 13; ++col)
{
if (lastMatrixValueCnt < 10)
{
m_matrix[row][col] = m_MatrixNumeralSet.at(lastMatrixValueCnt);
lastMatrixValueCnt += 1;
if (lastMatrixValueCnt == 10)
lastMatrixCharacterCnt = 0;
}
else
{
if (row < 9)
m_matrix[row][col] = m_MatrixCharacterSet1.at(lastMatrixCharacterIndex);
else
m_matrix[row][col] = m_MatrixCharacterSet2.at(lastMatrixCharacterIndex);
lastMatrixCharacterCnt += 1;
lastMatrixCharacterIndex += 1;
if (lastMatrixCharacterCnt == numOfCharacter)
lastMatrixValueCnt = 0;
}
if ((row < 9) && (lastMatrixCharacterIndex == 26))
lastMatrixCharacterIndex = 0;
if ((row >= 9) && (lastMatrixCharacterIndex == 12))
lastMatrixCharacterIndex = 0;
}
}
QString qs;
for (int row = 0; row < 13; ++row)
{
for (int col = 0; col < 13; ++col)
{
qs.append(QLatin1Char(m_matrix[row][col]));
qs.append(QLatin1String("; "));
}
qs.append(QLatin1String("\n"));
}
QString qs1(QLatin1String("\n"));
qs1.append(qs);
return true;
}
@@ -0,0 +1,90 @@
#pragma once
#include <QAbstractTableModel>
namespace NGL
{
class INGLLogger;
}
class NumeralCodeModel final : public QAbstractTableModel
{
Q_OBJECT
public:
explicit NumeralCodeModel(QWidget *parent);
~NumeralCodeModel();
bool init();
bool setColumnSelectionValues(const QVector<char> &data);
bool setColumnSelectionValuesCSV(const QVector<char> &csvData);
bool setRowSelectionValues(const QVector<char> &data);
bool setRowSelectionValuesCSV(const QVector<char> &csvData);
QVector <char> getHorizontalHeaderCSV() const;
QVector <char> getVerticalHeaderCSV() const;
void setEditMode(bool isEditMode);
bool isEditMode() const;
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant headerData(int column, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
QVariant data(const QModelIndex &index, int role) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role) override;
Qt::ItemFlags flags(const QModelIndex &index) const override;
private:
bool initMatrix();
QVector <char> m_MatrixNumeralSet;
QVector <char> m_MatrixCharacterSet1;
QVector <char> m_MatrixCharacterSet2;
char m_matrix[13][13];
QVector <char> m_RowSelectionValues;
QVector <char> m_ColumnSelectionValues;
bool m_isEditMode;
NGL::INGLLogger &m_logger;
};
@@ -0,0 +1,78 @@
log4j.reset=true
log4j.rootLogger=WARN, file
# Test: Codification
###########################################################
log4j.logger.COD_Test_NumeralCodeTableMainDialog=DEBUG
log4j.logger.COD_Test_NumeralCodeTableModel=DEBUG
log4j.appender.file=org.apache.log4j.RollingFileAppender
log4j.appender.file.MaxFileSize=1MB
log4j.appender.file.MaxBackupIndex=9
log4j.appender.file.file=${LOG4QT_LOGDIR}/${LOG4QT_USER}_cod.log
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d %-5p %c |#| %m (%.50F:%L) %n
# Appnd_Console
###########################################################
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern= %d %p %c %c{1} - %m (%-.30F:%L) %n
# Appnd_Syslog
###########################################################
log4j.appender.syslog=org.apache.log4j.SyslogAppender
log4j.appender.syslog.Threshold=ERROR
log4j.appender.syslog.SysLogHost=localhost
log4j.appender.syslog.Facility=LOCAL7
log4j.appender.syslog.layout=org.apache.log4j.PatternLayout
log4j.appender.syslog.layout.ConversionPattern= %-4r %-5p %c %x - %m
log4j.appender.syslog.LevelRangeFilter.AcceptOnMatch=true
log4j.appender.syslog.LevelRangeFilter.LevelMin=INFO
log4j.appender.syslog.LevelRangeFilter.LevelMax=FATAL
###########################################################
###########################################################
###########################################################
# 1) Available Levels in LOG4CXX Version 0.10.0:
# TRACE,
# DEBUG,
# INFO,
# WARN,
# ERROR
# FATAL
#
# d = date/time
# p = priority (Level)
# c = category/channel
# m = message
# F = file
# L = line
# n = platform dependent line separator character or characters.
# ....
#
# Examples for console:
# a)
# %d %p %c #%m# (%.50F:%L)%n
# date/time
# priority
# category/channel
# #message#
# (Maximal 50Character des Filename von rechts:Line)
# line separator
#
# b)
# %d (%.15F:%L) %-5p %c |#| %m%n
# date/time
# (Maximal 15Character des Filename von rechts:Line)
# priority, Right pad with spaces if the priority name is less than 5 characters long.
# category/channel
# message
# line separator
#
# Examples for files:
@@ -0,0 +1,27 @@
#include <NGLLogger/INGLLogger.h>
#include <nglapplication/nglapplication.h>
#include "maindialog.h"
int main(int argc, char *argv[])
{
NGLApplication app(argc, argv);
QCoreApplication::setApplicationName(QLatin1String("Numeral Codification Table"));
QCoreApplication::setOrganizationName(QLatin1String("RME"));
app.createLogger("CodificationTable", "log4cxx_cod_test.props");
NGL::INGLLogger &logger = app.baseLogger();
STARTUP_LOG(logger);
MainDialog w;
w.init();
w.show();
int retval = app.exec();
SHUTDOWN_LOG(logger);
return retval;
}
@@ -0,0 +1,211 @@
#include "maindialog.h"
#include "ui_maindialog.h"
#include "cod_numeral_code_model.h"
#include <QVector>
#include <NGLLogger/NGLLoggerBootstrap.h>
MainDialog::MainDialog(QWidget *parent)
: QDialog(parent)
, m_ui(new Ui::MainDialog)
, m_numCodeModel(new NumeralCodeModel(parent))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("COD_Test_NumeralCodeTableMainDialog"))
{
m_ui->setupUi(this);
}
MainDialog::~MainDialog()
{
delete m_ui;
}
bool MainDialog::init()
{
bool bOk = initNumeralModel();
connect(m_ui->cbEditMode, &QCheckBox::toggled,
this, &MainDialog::onCbEditModeToggled);
connect(m_ui->pbSetHorizontalHeader, &QPushButton::clicked,
this, &MainDialog::onPbSetHorizontalHeaderCSV);
connect(m_ui->pbSetVerticalHeader, &QPushButton::clicked,
this, &MainDialog::onPbSetVerticalHeaderCSV);
m_ui->cbEditMode->setChecked(false);
onCbEditModeToggled(false);
m_ui->pbSetHorizontalHeader->setEnabled(false);
m_ui->pbSetVerticalHeader->setEnabled(false);
return bOk;
}
bool MainDialog::initNumeralModel()
{
m_ui->tvNumeralCode->setModel(m_numCodeModel);
QHeaderView *header = m_ui->tvNumeralCode->horizontalHeader();
header->setVisible(true);
QHeaderView *vheader = m_ui->tvNumeralCode->verticalHeader();
vheader->setVisible(true);
m_ui->tvNumeralCode->setShowGrid(true);
m_ui->tvNumeralCode->setSelectionMode(QAbstractItemView::SingleSelection);
return true;
}
void MainDialog::onCbEditModeToggled(bool isChecked)
{
m_numCodeModel->setEditMode(isChecked);
QHeaderView *header = m_ui->tvNumeralCode->horizontalHeader();
QHeaderView *vheader = m_ui->tvNumeralCode->verticalHeader();
if (isChecked)
{
header->setVisible(false);
vheader->setVisible(false);
m_ui->tvNumeralCode->setColumnHidden(0, false);
m_ui->tvNumeralCode->setRowHidden(0, false);
m_ui->pbSetHorizontalHeader->setEnabled(true);
m_ui->pbSetVerticalHeader->setEnabled(true);
}
else
{
header->setVisible(true);
vheader->setVisible(true);
m_ui->tvNumeralCode->setColumnHidden(0, true);
m_ui->tvNumeralCode->setRowHidden(0, true);
m_ui->pbSetHorizontalHeader->setEnabled(false);
m_ui->pbSetVerticalHeader->setEnabled(false);
getNumeralCodeHeader();
}
}
void MainDialog::onPbSetHorizontalHeader()
{
QVector <char> columnSelectionValues;
columnSelectionValues << 'h' << 'o' << 'r'
<< 'i' << 'z' << 'o'
<< 'n' << 't' << 'a'
<< 'l' << 'i' << 'd'
<< 'x';
m_numCodeModel->setColumnSelectionValues(columnSelectionValues);
}
void MainDialog::onPbSetHorizontalHeaderCSV()
{
QVector <char> columnSelectionValues;
columnSelectionValues << 'h' << 'o' << 'r'
<< 'i' << 'z' << 'o'
<< 'n' << 't' << 'a'
<< 'l' << 'c' << 's'
<< 'v';
QVector <char> csvVec;
csvVec.reserve(columnSelectionValues.size() * 2);
for (int i = 0; i < columnSelectionValues.size(); ++i)
{
csvVec.append(columnSelectionValues.at(i));
csvVec.append(';');
}
csvVec.remove(columnSelectionValues.size() * 2 - 1);
DEBUG_LOG(m_logger) << "onPbSetHorizontalHeaderCSV() "
<< " csvVec.size(): " << csvVec.size();
m_numCodeModel->setColumnSelectionValuesCSV(csvVec);
}
void MainDialog::onPbSetVerticalHeader()
{
QVector <char> rowSelectionValues;
rowSelectionValues << 'v' << 'e' << 'r'
<< 't' << 'i' << 'c'
<< 'a' << 'l' << 'i'
<< 'n' << 'd' << 'e'
<< 'x' ;
m_numCodeModel->setRowSelectionValues(rowSelectionValues);
}
void MainDialog::onPbSetVerticalHeaderCSV()
{
QVector <char> rowSelectionValues;
rowSelectionValues << 'v' << 'e' << 'r'
<< 't' << 'i' << 'c'
<< 'a' << 'l' << 'i'
<< 'n' << 'c' << 's'
<< 'v';
QVector <char> csvVec;
csvVec.reserve(rowSelectionValues.size() * 2);
for (int i = 0; i < rowSelectionValues.size(); ++i)
{
csvVec.append(rowSelectionValues.at(i));
csvVec.append(';');
}
csvVec.remove(rowSelectionValues.size() * 2 - 1);
DEBUG_LOG(m_logger) << "onPbSetVerticalHeaderCSV() "
<< " csvVec.size(): " << csvVec.size();
m_numCodeModel->setRowSelectionValuesCSV(csvVec);
}
void MainDialog::getNumeralCodeHeader()
{
QVector <char> qVecHH = m_numCodeModel->getHorizontalHeaderCSV();
QByteArray qbaHH;
for (int i = 0; i < qVecHH.size(); ++i)
qbaHH.append(qVecHH.at(i));
QVector <char> qVecVH = m_numCodeModel->getVerticalHeaderCSV();
QByteArray qbaVH;
for (int i = 0; i < qVecVH.size(); ++i)
qbaVH.append(qVecVH.at(i));
DEBUG_LOG(m_logger) << "getNumeralCodeHeader()"
<< " HH: " << qbaHH << " size: " << qbaHH.size()
<< " VH: " << qbaVH << " size: " << qbaVH.size();
}
@@ -0,0 +1,49 @@
#pragma once
#include <QDialog>
namespace Ui
{
class MainDialog;
}
namespace NGL
{
class INGLLogger;
}
class NumeralCodeModel;
class MainDialog : public QDialog
{
Q_OBJECT
public:
explicit MainDialog(QWidget *parent = nullptr);
~MainDialog();
bool init();
bool initNumeralModel();
private Q_SLOTS:
void onCbEditModeToggled(bool isChecked);
void onPbSetHorizontalHeader();
void onPbSetHorizontalHeaderCSV();
void onPbSetVerticalHeader();
void onPbSetVerticalHeaderCSV();
void getNumeralCodeHeader();
private:
Ui::MainDialog *m_ui;
NumeralCodeModel *m_numCodeModel;
NGL::INGLLogger &m_logger;
};
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MainDialog</class>
<widget class="QWidget" name="MainDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>610</width>
<height>513</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>Codification Table</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTableView" name="tvNumeralCode">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
<attribute name="horizontalHeaderDefaultSectionSize">
<number>30</number>
</attribute>
<attribute name="horizontalHeaderMinimumSectionSize">
<number>30</number>
</attribute>
<attribute name="verticalHeaderDefaultSectionSize">
<number>30</number>
</attribute>
<attribute name="verticalHeaderMinimumSectionSize">
<number>30</number>
</attribute>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="cbEditMode">
<property name="text">
<string>Edit&amp;Mode</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pbSetHorizontalHeader">
<property name="text">
<string>Set default horizontal header</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pbSetVerticalHeader">
<property name="text">
<string>Set default vertical header</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>