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>
64 lines
2.1 KiB
C++
Executable File
64 lines
2.1 KiB
C++
Executable File
/**
|
|
* Exercise object
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
#pragma once
|
|
|
|
#include <DDS/Core/function_reply_object.h>
|
|
#include <QSet>
|
|
|
|
// Generated
|
|
#include <OperatorManagement/opm_db.h>
|
|
#include <OperatorManagement/opm.hpp>
|
|
|
|
namespace OperatorManagement
|
|
{
|
|
class MainHandler;
|
|
|
|
class ObjectOperator final
|
|
{
|
|
public:
|
|
explicit ObjectOperator(MainHandler *mainHandler);
|
|
~ObjectOperator();
|
|
|
|
Core::FunctionReplyObject createObject(const Database::OpmOperator &data, const QVector<Database::OpmOperatorExercise> &vec);
|
|
Core::FunctionReplyObject updateObject(const Database::OpmOperator &data);
|
|
Core::FunctionReplyObject updateOperatorExercise(const Database::OpmOperatorExercise &data);
|
|
|
|
Core::FunctionReplyObject updateEffectiveAcls(const QSet<int> &effectiveAcls);
|
|
Core::FunctionReplyObject updateExercises(const std::vector<int> &exercises, bool dontUpdateDb = false);
|
|
Core::FunctionReplyObject removeObject();
|
|
Core::FunctionReplyObject setPrimaryGroupId(int primaryGroupId);
|
|
|
|
bool saveSettings(const QByteArray &settings);
|
|
bool loadSettings(QByteArray &settings);
|
|
|
|
int getId() const { return m_data.id; }
|
|
const Database::OpmOperator &data() const { return m_data; }
|
|
QString name() const { return m_data.name; }
|
|
QSet<int> effectiveAcls() const { return m_effectiveAcls; }
|
|
void reloadAcls(bool force = false);
|
|
protected:
|
|
void onPublishData();
|
|
|
|
private:
|
|
QSet<int> calculateEffectiveAcls() const;
|
|
|
|
|
|
MainHandler *m_mainHandler;
|
|
Database::OpmOperator m_data;
|
|
QVector<Database::OpmOperatorExercise> m_dataExercise;
|
|
|
|
Database::OpmSettings m_settings;
|
|
QSet<int> m_effectiveAcls;
|
|
std::vector<int> m_exercises;
|
|
int m_originalPrimaryGroupId;
|
|
NGL::INGLLogger &m_logger;
|
|
|
|
//Database::OpmOperatorExercise toDbData(const PartiesByExercise &ddsData);
|
|
std::vector<OperatorManagement::PartiesByExercise> toDdsData(const QVector<Database::OpmOperatorExercise> &dbData);
|
|
};
|
|
}
|