torstenandCopilot
7173785915
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>
118 lines
2.9 KiB
C++
118 lines
2.9 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* DBUpdate
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Iuliana Ojog, 2021-02-17
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <QMainWindow>
|
|
#include <QStandardItemModel>
|
|
#include <QVector>
|
|
#include <QSqlDatabase>
|
|
#include <QProcess>
|
|
|
|
#include "logger.h"
|
|
#include "global_updates_model.h"
|
|
#include "exercises_model.h"
|
|
#include "show_history.h"
|
|
|
|
namespace Ui {
|
|
class DBUpdate;
|
|
}
|
|
|
|
namespace DBUpdate
|
|
{
|
|
struct Update
|
|
{
|
|
QString filename;
|
|
QString info;
|
|
QString project;
|
|
QString version;
|
|
QString date;
|
|
QString global_schemas;
|
|
QString exercise_schemas;
|
|
QString global_sql;
|
|
QString exercise_sql;
|
|
QString generated_sql;
|
|
QString generated_file;
|
|
};
|
|
|
|
class DBUpdate : public QMainWindow
|
|
{
|
|
friend class DBUpdateRun;
|
|
Q_OBJECT
|
|
public:
|
|
explicit DBUpdate(QWidget *parent = nullptr);
|
|
~DBUpdate();
|
|
bool init();
|
|
private slots:
|
|
void onClosedClicked();
|
|
void onUpdateLoad();
|
|
void onUpdateRun();
|
|
void onShowLogFile();
|
|
void onClearLogFile();
|
|
void onShowGlobalHistory(const QModelIndex &idx);
|
|
void onShowExerciseHistory(const QModelIndex &idx);
|
|
void onLoadSQL();
|
|
void onBackupDB();
|
|
private:
|
|
void enaDisa();
|
|
bool parseUpdateFile(const QString &fileName, bool showUi = true);
|
|
void saveUpdateSql();
|
|
private:
|
|
Ui::DBUpdate *m_ui;
|
|
QSqlDatabase m_db;
|
|
Update m_update;
|
|
bool m_showUi {true};
|
|
GlobalUpdatesModel *m_globalUpdatesModel{nullptr};
|
|
GlobalUpdatesProxyModel *m_globalUpdatesProxyModel{nullptr};
|
|
ExercisesModel *m_exercisesModel{nullptr};
|
|
ExercisesProxyModel *m_exercisesProxyModel{nullptr};
|
|
ShowHistory *m_showHistory{nullptr};
|
|
QString m_sql;
|
|
static QString m_defaultPath;
|
|
LOGGER_T m_logger;
|
|
};
|
|
|
|
|
|
class DBUpdateRun : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit DBUpdateRun(const QString &updateFile, bool generateOnly, bool withBackup, QObject *parent = nullptr);
|
|
~DBUpdateRun();
|
|
bool init();
|
|
bool runUpdate();
|
|
bool runPgDump(const QString &dumpFile, const QString &dbHost, const QString &dbName);
|
|
Q_SIGNALS:
|
|
void runSqlFailed();
|
|
void runSqlFinished();
|
|
void runPgDumpFailed();
|
|
void runPgDumpFinished();
|
|
private:
|
|
void onPsqlFinished(int exitCode, QProcess::ExitStatus exitStatus);
|
|
void onPgDumpFinished(int exitCode, QProcess::ExitStatus exitStatus);
|
|
bool parseUpdateFile();
|
|
void generateSql();
|
|
bool runPsql();
|
|
QString executablePath(const QString &program);
|
|
void handleProcInit(const QString &program, const QStringList &args);
|
|
void handleProcFinished(int exitCode, QProcess::ExitStatus exitStatus);
|
|
void onErrorOccured(QProcess::ProcessError error);
|
|
private:
|
|
QSqlDatabase m_db;
|
|
Update m_update;
|
|
bool m_generateOnly;
|
|
bool m_withBackup;
|
|
GlobalUpdatesModel *m_globalUpdatesModel{nullptr};
|
|
ExercisesModel *m_exercisesModel{nullptr};
|
|
QProcess *m_proc;
|
|
LOGGER_T m_logger;
|
|
};
|
|
|
|
} // namespace DBUpdate
|