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>
62 lines
1.7 KiB
C++
62 lines
1.7 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* ISM Handler Special Areas
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Hanna E. Rathje, 2023-07-26
|
|
*/
|
|
|
|
#include "handler_special_area.h"
|
|
#include "object_special_area.h"
|
|
|
|
namespace InfrastructureManagement {
|
|
|
|
//--------------------------------------------------------------------------------------------------------------------------------------------------
|
|
HandlerSpecialArea::HandlerSpecialArea(MainHandler *mainHandler)
|
|
: Base(mainHandler, getLogger("HandlerSpecialArea"))
|
|
{
|
|
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------------------------------------------------------
|
|
HandlerSpecialArea::~HandlerSpecialArea()
|
|
{
|
|
qDeleteAll(m_objectSpecialAreaMap);
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
bool HandlerSpecialArea::init()
|
|
{
|
|
bool bRet = true;
|
|
auto cb = [this, &bRet] (const Database::IsmSpecialArea &data)
|
|
{
|
|
SpecialArea ddsData = ObjectSpecialArea::toDdsData(data);
|
|
ObjectSpecialArea *ifs(new ObjectSpecialArea(m_mainHandler));
|
|
Core::FunctionReplyObject ret = ifs->createObject(ddsData);
|
|
if (ret.error())
|
|
{
|
|
delete ifs;
|
|
ERROR_LOG(m_logger) << ret();
|
|
bRet = false;
|
|
return;
|
|
}
|
|
m_objectSpecialAreaMap.insert(ifs->getId(), ifs);
|
|
DEBUG_LOG(m_logger) << " id=" << ifs->getData().id()
|
|
<< " name=" << ifs->getData().name();
|
|
};
|
|
|
|
// create Asset objects
|
|
if (!db()->select(cb) || !bRet)
|
|
{
|
|
ERROR_LOG(m_logger) << "Error reading data from database!";
|
|
return false;
|
|
}
|
|
|
|
DEBUG_LOG(m_logger) << "m_objectSpecialAreaMap.size() = " << m_objectSpecialAreaMap.size();
|
|
|
|
return true;
|
|
}
|
|
|
|
} // namespace InfrastructureManagement
|