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,78 @@
|
||||
/**
|
||||
* Handler for all Language HMI objects
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Hanna E. Rathje, SLSE, 2015-09-03
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QMap>
|
||||
#include "handler_vehicle.h"
|
||||
#include "dds_handler.h"
|
||||
#include "control_unit_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
namespace EffectShowClient
|
||||
{
|
||||
class MainHandler;
|
||||
class HandlerOperatingCondition : public QObject
|
||||
, protected Interface::Fts::SendAmmunitionRequestHandler
|
||||
, protected Interface::Fts::SendSafetyRevokeRequestHandler
|
||||
, protected Interface::Fts::SendReadinessRequestHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit HandlerOperatingCondition(MainHandler *mainHandler,
|
||||
QObject *parent = nullptr);
|
||||
|
||||
~HandlerOperatingCondition();
|
||||
|
||||
bool init();
|
||||
void sendStatus();
|
||||
|
||||
private slots:
|
||||
void onVehicleBattery(double battery);
|
||||
void onVehicleSmokeCardridgesFireStatus(const CardRidges &fireStatus);
|
||||
void onVehicleSmokeCardridgesStatus(const CardRidges &fireStatus);
|
||||
void onVehicleFireUnits(const CardRidges &fireStatus);
|
||||
void onVehicleErrorStatus(const CardRidges &errorStatus);
|
||||
void onVehicleType(const EffectShowManagement::Feature_e &type);
|
||||
void onConnectionToSerial();
|
||||
void onSafetyStatus(const SafetyStatus &status);
|
||||
void onVehicleRoundCount(int loadedRounds);
|
||||
void onVolleyRounds(int usedRounds);
|
||||
void onOperationalStatusTimeout();
|
||||
|
||||
/**
|
||||
* @brief Get vehicle status
|
||||
* @param vehicleStatus Status of the vehicle needed by telegram: DMF-Einsatzbereitschafts-Status
|
||||
*/
|
||||
void getVehicleStatus(ConvertToTab::VehicleStatus_t &vehicleStatus);
|
||||
|
||||
|
||||
private:
|
||||
void onSendAmmunitionRequest(const rti::core::SampleIdentity &cookie,
|
||||
const SendAmmunitionRequest &request);
|
||||
void onSendSafetyRevokeRequest(const rti::core::SampleIdentity &cookie,
|
||||
const SendSafetyRevokeRequest &request);
|
||||
void onSendReadinessRequest(const rti::core::SampleIdentity &cookie,
|
||||
const SendReadinessRequest &request);
|
||||
|
||||
bool isErrorDmf();
|
||||
|
||||
private:
|
||||
MainHandler *m_mainHandler{nullptr};
|
||||
CardRidges m_readyCardridges;
|
||||
CardRidges m_smokingCardridges;
|
||||
bool m_isOperational;
|
||||
bool m_oldErrorState;
|
||||
|
||||
QTimer *m_operationalStatusTimer{nullptr};
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
EffectShowClient::OperatingConditionEntity m_operatingCondition;
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user