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>
64 lines
2.9 KiB
C++
64 lines
2.9 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* ISM Handler Instrumentation Assets
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Iuliana Ojog, SLSE, 2016-11-26
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <QHash>
|
|
|
|
#include "base.h"
|
|
|
|
//-------------------------------------------------------------------------------------------------------------
|
|
namespace InfrastructureManagement
|
|
{
|
|
class ObjectInstrumentationAsset;
|
|
class MainHandler;
|
|
class HandlerInstrumentationAsset final : public Base
|
|
, protected Interface::Fts::InstrumentationAssetModifyRequestHandler
|
|
, protected Interface::Fts::InstrumentationAssetRemoveRequestHandler
|
|
, protected Interface::Fts::InstrumentationAssetSetStateRequestHandler
|
|
, protected Interface::Fts::InstrumentationAssetUnmountRequestHandler
|
|
{
|
|
public:
|
|
explicit HandlerInstrumentationAsset(MainHandler *mainHandler);
|
|
~HandlerInstrumentationAsset();
|
|
|
|
bool init();
|
|
|
|
ObjectInstrumentationAsset *createInstrumentationAssetForMse(int buildingId, int structureElementId);
|
|
bool removeInstrumentationAssetForMse(int assetId);
|
|
bool setAssetState(int assetId, InstrumentationAssetState state);
|
|
bool setAssetAvailableInExercise(int32_t assetId, const std::vector<int32_t> &exercises);
|
|
|
|
QHash<int, ObjectInstrumentationAsset *> getObjectInstrumentationAssetMap() const
|
|
{
|
|
return m_ObjectInstrumentationAssetMap;
|
|
}
|
|
ObjectInstrumentationAsset *getAssetFromBarcode(const QString &barcode) const;
|
|
ObjectInstrumentationAsset *getAssetFromId(int32_t assetId) const ;
|
|
ObjectInstrumentationAsset *getAssetFromBarcodeAndId(const QString &barcode, int32_t assetId) const;
|
|
private:
|
|
void onInstrumentationAssetModifyRequest(const rti::core::SampleIdentity &cookie,
|
|
const InstrumentationAssetModifyRequest &request) override;
|
|
Core::FunctionReplyObject instrumentationAssetCreate(const InstrumentationAssetModifyRequest &request, int *assetId = nullptr);
|
|
Core::FunctionReplyObject instrumentationAssetModify(const InstrumentationAssetModifyRequest &request);
|
|
void onInstrumentationAssetRemoveRequest(const rti::core::SampleIdentity &cookie,
|
|
const Core::RemoveElementRequest &request) override;
|
|
Core::FunctionReplyObject onInstrumentationAssetRemove(const Core::RemoveElementRequest &request);
|
|
void onInstrumentationAssetSetStateRequest(const rti::core::SampleIdentity &cookie,
|
|
const InstrumentationAssetSetStateRequest &request) override;
|
|
Core::FunctionReplyObject instrumentationAssetSetState(const InstrumentationAssetSetStateRequest &request);
|
|
void onInstrumentationAssetUnmountRequest(const rti::core::SampleIdentity &cookie,
|
|
const InstrumentationAssetUnmountRequest &request) override;
|
|
Core::FunctionReplyObject instrumentationAssetUnmount(const InstrumentationAssetUnmountRequest &request);
|
|
|
|
private:
|
|
QHash<int, ObjectInstrumentationAsset *> m_ObjectInstrumentationAssetMap;
|
|
};
|
|
}
|