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>
123 lines
3.5 KiB
C++
123 lines
3.5 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* AvsMenus
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Fröbel, NLSE, 2018-03-19
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "avm_export.h"
|
|
#include <QObject>
|
|
#include <boost/optional.hpp>
|
|
#include <functional>
|
|
#include <InfrastructureManagement/ism_dtc.h>
|
|
|
|
enum class DataModification;
|
|
|
|
|
|
namespace AudioVideoManagement
|
|
{
|
|
|
|
namespace Interface
|
|
{
|
|
class Dtc;
|
|
}
|
|
|
|
class AvaSession;
|
|
class MenuStruct;
|
|
class RtState;
|
|
|
|
/**
|
|
* This class is responsible for the Announcement- and VideoMenu in AVS_Workstation.
|
|
* Initially the default menus will be set. When the user changes the menu,
|
|
* we keep track of it. When the connection to AVS_Workstation breaks down,
|
|
* the last active menus will be set on reconnect.
|
|
* Also, when the active menu changes (on DDS), the change is published
|
|
* to AVS_Workstation.
|
|
*
|
|
* @author Christian Fröbel
|
|
*/
|
|
class AVM_COMMON_EXPORT AvsMenus : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
AvsMenus(AvaSession *session, Interface::Dtc *dtc, InfrastructureManagement::Interface::Dtc *ismDtc, RtState *rtState);
|
|
|
|
void setAnnouncementMenu(int menuId);
|
|
void setVideoMenu(int menuId);
|
|
|
|
void setAnnouncementUnit(int mountingPointId);
|
|
|
|
/** @return -1 if there is no current menu (yet). */
|
|
int currentAnnouncementMenu() const { return m_announcementMenu.currentMenu(); }
|
|
int currentVideoMenu() const { return m_videoMenu.currentMenu(); }
|
|
|
|
private slots:
|
|
void onSessionEstablished();
|
|
void onMenuStructChanged(const MenuStruct &menu, DataModification modType);
|
|
|
|
private:
|
|
/**
|
|
* @name Callbacks
|
|
* Will be called by Menu in order to send the Menu to AVS_Workstation.
|
|
*/
|
|
///@{
|
|
void sendAnnouncementMenu(const MenuStruct &menu, const boost::optional<int> &mountingPointIdOfSelectedStream);
|
|
void sendVideoMenu(const MenuStruct &menu, const boost::optional<int> &dummy);
|
|
///@}
|
|
|
|
/**
|
|
* Internal helper class to represent the Announcement- and VideoMenu.
|
|
*/
|
|
class Menu
|
|
{
|
|
public:
|
|
using SendMenuCallback = std::function<void(const MenuStruct &, const boost::optional<int> &)>;
|
|
Menu(Interface::Dtc *dtc, InfrastructureManagement::Interface::Dtc *ismDtc, SendMenuCallback cb, bool isAudio);
|
|
|
|
void setMenu(int menuId);
|
|
void replaceMvsEntries(MenuStruct &menu) const;
|
|
/**
|
|
* Special method which is only meaningful for the AnnoucementMenu.
|
|
* Selects the default menu and makes sure that the AnnouncementUnit on the MountingPoint
|
|
* with the given mountingPointId is the first selected Stream.
|
|
*/
|
|
void setAnnouncementUnit(int mountingPointId);
|
|
|
|
|
|
/** @return -1 if there is no current menu (yet). */
|
|
int currentMenu() const { return m_currentMenu.get_value_or(-1); }
|
|
|
|
void onChanged(const MenuStruct &menu, DataModification modType);
|
|
void onSessionEstablished();
|
|
|
|
private:
|
|
void onMenuAdded(MenuStruct menu);
|
|
void onMenuChanged(MenuStruct menu);
|
|
void onMenuRemoved(const MenuStruct &menu);
|
|
void setMenu(const MenuStruct &menu, const boost::optional<int> &mountingPointIdOfSelectedStream = boost::none);
|
|
|
|
Interface::Dtc *m_dtc;
|
|
InfrastructureManagement::Interface::Dtc *m_ismDtc;
|
|
|
|
SendMenuCallback m_sendMenu;
|
|
const bool m_isAudio;
|
|
boost::optional<int> m_defaultMenu;
|
|
boost::optional<int> m_currentMenu;
|
|
};
|
|
|
|
AvaSession *m_session;
|
|
Interface::Dtc *m_dtc;
|
|
InfrastructureManagement::Interface::Dtc *m_ismDtc;
|
|
|
|
RtState *m_rtState;
|
|
Menu m_announcementMenu;
|
|
Menu m_videoMenu;
|
|
};
|
|
|
|
} // namespace AudioVideoManagement
|