Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,84 @@
|
||||
/*
|
||||
* @RDE_HEADER@
|
||||
* <short description>
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Malte Schröder, SLSE, 2016-07-14
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QAbstractTableModel>
|
||||
#include <QVariant>
|
||||
#include <QVector>
|
||||
#include <QDateTime>
|
||||
#include <QColor>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
|
||||
class LogViewTableModel : public QAbstractTableModel
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
struct logInformation
|
||||
{
|
||||
QDateTime date;
|
||||
QString level;
|
||||
QString logger;
|
||||
QString data;
|
||||
QString location;
|
||||
};
|
||||
|
||||
struct logColors
|
||||
{
|
||||
QColor date;
|
||||
QMap<QString, QColor> level;
|
||||
QColor logger;
|
||||
QColor data;
|
||||
QColor location;
|
||||
};
|
||||
|
||||
enum Columns
|
||||
{
|
||||
colDate = 0,
|
||||
colLevel = 1,
|
||||
colLogger = 2,
|
||||
colData = 3,
|
||||
colLocation = 4,
|
||||
colLast = colLocation
|
||||
};
|
||||
|
||||
public:
|
||||
explicit LogViewTableModel(QObject *parent = nullptr);
|
||||
|
||||
void setData(const QVector<logInformation> &logData);
|
||||
void addData(const logInformation &logLine);
|
||||
bool reset();
|
||||
|
||||
int rowCount(const QModelIndex &parent) const override final;
|
||||
int columnCount(const QModelIndex &parent) const override final;
|
||||
QVariant data(const QModelIndex &index, int role) const override final;
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role) override final;
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role) const override final;
|
||||
int length() const;
|
||||
QString itemAt(int row, int index) const;
|
||||
|
||||
signals:
|
||||
void startTimeSetted(const QDateTime &dtime);
|
||||
void endTimeSetted(const QDateTime &dtime);
|
||||
|
||||
public slots:
|
||||
void adjustCellColor(const QColor &color, const QString &str);
|
||||
void adjustFontColor(const QColor &color, const QString &str);
|
||||
void startDateTime();
|
||||
void endDateTime();
|
||||
|
||||
private:
|
||||
void setStdColors();
|
||||
|
||||
QVector<logInformation> m_logfile;
|
||||
logColors m_cellColors;
|
||||
logColors m_fontColors;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
Reference in new issue
Block a user