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@
|
||||
* ConfigCnr
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Fröbel, NLE, 2019-08-05
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "WebSocketInterface/Messages/reply_message.h"
|
||||
#include "logger.h"
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
#include <boost/optional.hpp>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
namespace Interface
|
||||
{
|
||||
class Dtc;
|
||||
}
|
||||
|
||||
class ActiveFrequencyPlanning;
|
||||
class FrequencyPlanning;
|
||||
class CnrConfig;
|
||||
|
||||
}
|
||||
|
||||
namespace InfrastructureManagement
|
||||
{
|
||||
namespace Interface
|
||||
{
|
||||
class Dtc;
|
||||
}
|
||||
}
|
||||
|
||||
enum class DataModification;
|
||||
|
||||
namespace CombatNetRadio
|
||||
{
|
||||
|
||||
/**
|
||||
* Will be constructed for each active Exercise in order to build the corresponding data
|
||||
* for the Exercise's active FrequencyPlanning.
|
||||
* The associated Exercise need not have an active FrequencyPlanning.
|
||||
*
|
||||
* @author Christian Fröbel
|
||||
*/
|
||||
class ConfigCnr : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit ConfigCnr(int exerciseId, AudioVideoManagement::Interface::Dtc *avmDtc, InfrastructureManagement::Interface::Dtc *ismDtc);
|
||||
|
||||
bool hasActiveFrequencyPlanning() const { return !m_configCnrData.radioCircuit.empty(); }
|
||||
|
||||
/** Must only be called when hasActiveFrequencyPlanning() == true. */
|
||||
const WebSocketInterface::Messages::ConfigCnrMessage::ConfigCnrData &data() const;
|
||||
|
||||
signals:
|
||||
void changed();
|
||||
|
||||
private:
|
||||
void buildConfigCnrData();
|
||||
boost::optional<AudioVideoManagement::FrequencyPlanning> activePlan() const;
|
||||
|
||||
void onActiveFrequencyPlanningChanged(const AudioVideoManagement::ActiveFrequencyPlanning &data, DataModification modType);
|
||||
void onFrequencyPlanningChanged(const AudioVideoManagement::FrequencyPlanning &data, DataModification modType);
|
||||
void onCnrConfigChanged(const AudioVideoManagement::CnrConfig &data, DataModification modType);
|
||||
bool isInActiveFrequencyPlanning(const AudioVideoManagement::CnrConfig &data);
|
||||
|
||||
int m_exerciseId;
|
||||
AudioVideoManagement::Interface::Dtc *m_avmDtc;
|
||||
InfrastructureManagement::Interface::Dtc *m_ismDtc;
|
||||
WebSocketInterface::Messages::ConfigCnrMessage::ConfigCnrData m_configCnrData;
|
||||
QTimer m_timer;
|
||||
LOGGER_T m_logger;
|
||||
LOGGER_T m_loggerJson;
|
||||
};
|
||||
|
||||
} // namespace CombatNetRadio
|
||||
Reference in new issue
Block a user