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>
83 lines
2.1 KiB
C++
83 lines
2.1 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* ProxyBuilding to handle access to HandlerBuildingModelInterface
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Norbert Thoden, ESVG, 2024-09-09
|
|
*/
|
|
|
|
#include "proxy_building.h"
|
|
|
|
|
|
|
|
|
|
namespace CentralEffectSimulation
|
|
{
|
|
|
|
#define LOG_ERROR_NO_HNDL_BLDG_MDL ERROR_LOG(m_logger) << LOGFUNCTION << " no handlerBuildingModel"
|
|
#define CHECK_HNDL_BLDG_MDL_RETVAL if (!(isSet_handlerBuildingModel())) { LOG_ERROR_NO_HNDL_BLDG_MDL; return {}; }
|
|
|
|
|
|
class ProxyBuilding::Private
|
|
{
|
|
public:
|
|
Private()
|
|
{}
|
|
|
|
~Private()
|
|
{}
|
|
|
|
std::weak_ptr<CesBuildings::HandlerBuildingModelInterface> m_handlerBuildingModel_wPtr;
|
|
|
|
}; // class ProxyBuilding::Private
|
|
//-----------------------------------------------------------------------------
|
|
|
|
|
|
ProxyBuilding::ProxyBuilding(QObject *parent)
|
|
: BaseClass(parent)
|
|
, d(new Private)
|
|
, m_logger(CentralEffectSimulation::getLogger("ProxyBuilding"))
|
|
{
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
|
}
|
|
//-----------------------------------------------------------------------------
|
|
|
|
ProxyBuilding::~ProxyBuilding()
|
|
{
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
|
delete d;
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
|
}
|
|
|
|
void ProxyBuilding::set_handlerBuildingModel(std::shared_ptr<CesBuildings::HandlerBuildingModelInterface> handlerBuildingModel)
|
|
{
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
|
INFO_LOG(m_logger) << LOGFUNCTION << " set handlerBuildingModel to: " << handlerBuildingModel;
|
|
d->m_handlerBuildingModel_wPtr = handlerBuildingModel;
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
|
}
|
|
|
|
void ProxyBuilding::clear_handlerBuildingModel()
|
|
{
|
|
d->m_handlerBuildingModel_wPtr.reset();
|
|
}
|
|
|
|
bool ProxyBuilding::isSet_handlerBuildingModel() const
|
|
{
|
|
auto sp = d->m_handlerBuildingModel_wPtr.lock();
|
|
return sp.get(); // return sp; no viable conversion
|
|
}
|
|
|
|
std::shared_ptr<CesBuildings::HandlerBuildingModelInterface> ProxyBuilding::handlerBuildingModelInterface()
|
|
{
|
|
auto sp = d->m_handlerBuildingModel_wPtr.lock();
|
|
return sp;
|
|
}
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
}
|
|
|