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>
94 lines
3.6 KiB
C++
94 lines
3.6 KiB
C++
/**
|
|
* Exercises Handler - checks the avilable exercises and creates subhandlers fort each of them
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Ehrlicher, SLSE, 2016-04-14
|
|
*/
|
|
#pragma once
|
|
|
|
#include <QHash>
|
|
#include <QObject>
|
|
#include <QVector>
|
|
|
|
#include "dds_handler.h"
|
|
#include <ParticipantManagement/ppm.hpp>
|
|
#include <dds/core/Optional.hpp>
|
|
|
|
namespace WarehouseManagement
|
|
{
|
|
struct ParticipantInfoStruct
|
|
{
|
|
int equipmentNumber = 0;
|
|
int participantId = 0;
|
|
int exerciseId = 0;
|
|
};
|
|
inline std::ostream &operator <<(std::ostream &stream, const ParticipantInfoStruct &pis)
|
|
{
|
|
stream << "exerciseId = " << pis.exerciseId
|
|
<< ", participantId = " << pis.participantId
|
|
<< ", equipmentNumber = " << pis.equipmentNumber;
|
|
return stream;
|
|
}
|
|
|
|
class ExerciseParticipantHandler;
|
|
class ExercisesHandler : public QObject,
|
|
protected ParticipantManagement::Interface::Ftc::ModifyEquipmentTypeDataReplyHandler
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
ExercisesHandler(const std::shared_ptr<DdsHandler> &ddsHandler);
|
|
~ExercisesHandler();
|
|
|
|
bool init();
|
|
|
|
QMap<qint32, ExerciseManagement::Exercise> getExercises() const;
|
|
ParticipantManagement::Party getParty(int partyId, int exerciseId) const;
|
|
ParticipantManagement::Participant getParticipant(int participantId, int exerciseId) const;
|
|
QString getHierarchyFromParticipant(int participantId, int exerciseId, const QMap<int, ParticipantManagement::Participant> &allParticipants) const;
|
|
QMap<qint32, ParticipantManagement::Participant> getParticipants(int exerciseId) const;
|
|
ParticipantManagement::Type participantType(int typeId) const;
|
|
ParticipantManagement::TypeClass typeClassIdFromEquipmentTypeId(int equipTypeId) const;
|
|
|
|
bool registerParticipant(int exerciseId, qint32 participantId,
|
|
ParticipantManagement::ParticipantAssignState assignState,
|
|
const dds::core::optional<int> &equipNo,
|
|
const dds::core::optional<QString> &identification,
|
|
const dds::core::optional<QString> &info);
|
|
|
|
bool unregisterParticipant(int exerciseId, qint32 equipNo);
|
|
|
|
bool modifyEquipmentTypes(const std::vector<ParticipantManagement::EquipmentType> &vectorEquipTypes);
|
|
|
|
// key is the equipment number + exerciseId
|
|
bool addParticipant(const ParticipantInfoStruct &pis);
|
|
// key is the equipment number + exerciseId
|
|
bool modifyParticipant(const ParticipantInfoStruct &pis);
|
|
// key is the equipment number + exerciseId
|
|
bool removeParticipant(const ParticipantInfoStruct &pis);
|
|
|
|
QVector<ParticipantInfoStruct> infoStructForEquipment(int equipmentNumber) const;
|
|
|
|
Q_SIGNALS:
|
|
void registrationReturnValue(int exerciseId, qint32 participantId, ParticipantManagement::RegisterReturnValue retValue);
|
|
void participantChanged(const ParticipantManagement::Participant &data, DataModification modType, int exerciseId);
|
|
void exerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType);
|
|
|
|
private:
|
|
void exerciseAdded(int exerciseId);
|
|
void exerciseRemoved(int exerciseId);
|
|
QMultiHash<int, ParticipantInfoStruct>::iterator findParticipant(const ParticipantInfoStruct &pis);
|
|
private Q_SLOTS:
|
|
void onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType);
|
|
void onModifyEquipmentTypeDataReply(const Core::FunctionReplyObject &replyObject) override;
|
|
|
|
private:
|
|
std::shared_ptr<DdsHandler> m_ddsHandler;
|
|
|
|
QHash<int, ExerciseParticipantHandler *> m_exerciseHandler;
|
|
// QMultiMap<equipmentNumber, ParticipantInfoStruct>
|
|
QMultiHash<int, ParticipantInfoStruct> m_participants;
|
|
NGL::INGLLogger &m_logger;
|
|
};
|
|
} // namespace WarehouseManagement
|