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,91 @@
|
||||
/**
|
||||
* Handler for table-io message data request
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by hjl, SLSE, 2016-10-12
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
#include <alm_db.h>
|
||||
|
||||
#include <AlarmManagement/alm_fts.h>
|
||||
#include <AlarmManagement/alm_ftc.h>
|
||||
#include <AlarmManagement/alm_dtc.h>
|
||||
#include <AlarmManagement/alm_dts.h>
|
||||
|
||||
#include <ExerciseEventManagement/eem_dtc.h>
|
||||
#include <MarkerManagement/mrk_ftc.h>
|
||||
#include <handler_participant.h>
|
||||
|
||||
namespace AlarmManagement
|
||||
{
|
||||
class Initialization;
|
||||
|
||||
class HandlerConfigureAlarms final
|
||||
: public QObject
|
||||
, protected Interface::Fts::ConfigureAlarmsRequestHandler
|
||||
, protected MarkerManagement::Interface::Ftc::MarkerModifyReplyHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit HandlerConfigureAlarms(Initialization *mainHandler);
|
||||
|
||||
~HandlerConfigureAlarms();
|
||||
|
||||
bool init();
|
||||
|
||||
void onMarkerModifyReply(const Core::FunctionReplyObject &replyObject) override final;
|
||||
void incrementWindowIndex() { m_windowIndex++; }
|
||||
int getWindowIndex() const { return m_windowIndex; }
|
||||
|
||||
|
||||
private Q_SLOTS:
|
||||
void onEventChanged(const ExerciseEventManagement::Event &eventData, DataModification modType);
|
||||
|
||||
private: // methods
|
||||
void onConfigureAlarmsRequest(const rti::core::SampleIdentity &cookie,
|
||||
const ConfigureAlarmsRequest &request) override;
|
||||
void sendWindow(const ExerciseEventManagement::Event &eventData,
|
||||
const Database::AlmConfig &config);
|
||||
void sendMarker(const ExerciseEventManagement::Event &eventData,
|
||||
const Database::AlmConfig &config);
|
||||
static QJsonObject getEventProperties(const ExerciseEventManagement::Event &eventData);
|
||||
|
||||
void removeAlarmConfig(int operatorId, int participantId, int eventTypeId);
|
||||
void removeGlobalAlarmConfig(int operatorId);
|
||||
|
||||
private: // attributes
|
||||
Initialization *m_mainHandler;
|
||||
|
||||
struct AlarmKey
|
||||
{
|
||||
int operatorId = 0;
|
||||
int participantId = 0;
|
||||
AlarmKey() = default;
|
||||
explicit AlarmKey(const Database::AlmConfig &db)
|
||||
: operatorId(db.operatorId)
|
||||
, participantId(db.participantId.isNull() ? 0 : db.participantId.toInt())
|
||||
{}
|
||||
explicit AlarmKey(int operatorId_, int participantId_)
|
||||
: operatorId(operatorId_)
|
||||
, participantId(participantId_)
|
||||
{}
|
||||
|
||||
bool operator<(const AlarmKey &o) const
|
||||
{
|
||||
if (operatorId != o.operatorId)
|
||||
return operatorId < o.operatorId;
|
||||
return participantId < o.participantId;
|
||||
}
|
||||
};
|
||||
QMap<int, Database::AlmConfig> m_alarms; // Key = almConfig.id
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
int m_windowIndex;
|
||||
};
|
||||
} // namespace AlarmManagement
|
||||
Reference in new issue
Block a user