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>
94 lines
2.4 KiB
C++
94 lines
2.4 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* DefaultAvMenus
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Fröbel, NLSE, 2018-03-14
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "exercise_context.h"
|
|
#include "handler_video_team.h"
|
|
|
|
#include <AudioVideoManagement/avm_dtc.h>
|
|
#include <QObject>
|
|
#include <map>
|
|
#include <vector>
|
|
#include <memory>
|
|
#include <cstdint>
|
|
|
|
class QTimer;
|
|
|
|
|
|
namespace InfrastructureManagement
|
|
{
|
|
|
|
namespace Interface
|
|
{
|
|
class Dtc;
|
|
}
|
|
|
|
class MainStructureElement;
|
|
|
|
}
|
|
|
|
|
|
namespace AudioVideoManagement
|
|
{
|
|
|
|
namespace Interface
|
|
{
|
|
class Dts;
|
|
}
|
|
|
|
|
|
class Stream;
|
|
class AvMenuEntry;
|
|
|
|
|
|
/**
|
|
* Will be instantiated for each Exercise.
|
|
* It observes the Exercise for new and removed streams and publishes
|
|
* the default Announcement- and VideoMenu accordingly.
|
|
* @author Christian Fröbel
|
|
*/
|
|
class DefaultAvMenus : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
DefaultAvMenus(const ExerciseContext &context, Interface::Dts *dts, HandlerVideoTeam *handlerVideoTeams, InfrastructureManagement::Interface::Dtc *ismDtc);
|
|
virtual ~DefaultAvMenus() override;
|
|
|
|
void onStreamChanged(const Stream &stream);
|
|
void onStreamRemoved(int32_t streamId);
|
|
|
|
|
|
private slots:
|
|
void onStreamMvsChanged();
|
|
void onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType);
|
|
void updateMenus();
|
|
void removeMenus();
|
|
|
|
private:
|
|
void updateMenu(bool isAudio);
|
|
QString getDisplayNameForBuilding(const InfrastructureManagement::MainStructureElement &data);
|
|
std::vector<AvMenuEntry> subMenuForBuilding(const InfrastructureManagement::MainStructureElement &building, bool isAudio);
|
|
std::vector<Stream> streamsForBuilding(const InfrastructureManagement::MainStructureElement &building, bool isAudio);
|
|
|
|
LOGGER_T m_logger;
|
|
int32_t menuStructId(bool isAudio);
|
|
bool m_isInitialized;
|
|
QMap<int,QString> m_buildingDisplayNameForId; //For filtering all onMainStructureElementEvents that are not necessary
|
|
ExerciseContext m_context;
|
|
Interface::Dts *m_dts;
|
|
HandlerVideoTeam *m_videoTeamHandler;
|
|
InfrastructureManagement::Interface::Dtc *m_ismDtc;
|
|
std::map<int32_t, Stream> m_streams; //!< stream-Id -> Stream
|
|
std::unique_ptr<QTimer> m_timer;
|
|
};
|
|
|
|
} // namespace AudioVideoManagement
|