Qt6 Migration: Complete migration with DDS/RTI support and build validation
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>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,56 @@
|
||||
/**
|
||||
* Convert internal gear and charge id to and from tas ids
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2016-04-14
|
||||
*/
|
||||
|
||||
#include "pdm_handler.h"
|
||||
#include "main_handler.h"
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
|
||||
namespace Buildings
|
||||
{
|
||||
PdmHandler::PdmHandler(MainHandler *mainHandler)
|
||||
: m_mainHandler(mainHandler)
|
||||
, m_bPdmInitialized(false)
|
||||
, m_logger(getLogger("PdmHandler"))
|
||||
{}
|
||||
|
||||
PdmHandler::~PdmHandler()
|
||||
{}
|
||||
void PdmHandler::initializePdm()
|
||||
{
|
||||
if (m_bPdmInitialized)
|
||||
return;
|
||||
|
||||
m_bPdmInitialized = true;
|
||||
auto dtcPdm = ProjectDataManagement::Interface::Dtc::create(m_mainHandler->ddsHandler()->ddsConnector());
|
||||
if (!dtcPdm->enableChargeType() ||
|
||||
!dtcPdm->enableBuildingChargeEffect() ||
|
||||
!dtcPdm->waitForHistoricalDataChargeType(20000) ||
|
||||
!dtcPdm->waitForHistoricalDataBuildingChargeEffect(20000)) // 20s - more to load
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not read charge/gear types from PDM";
|
||||
m_bPdmInitialized = false;
|
||||
return;
|
||||
}
|
||||
m_buildingChargeEffects = dtcPdm->buildingChargeEffects();
|
||||
m_chargeTypes = dtcPdm->chargeTypes();
|
||||
}
|
||||
|
||||
QMap<int, ProjectDataManagement::BuildingChargeEffect> PdmHandler::buildingChargeEffects()
|
||||
{
|
||||
initializePdm();
|
||||
return m_buildingChargeEffects;
|
||||
}
|
||||
|
||||
QMap<int, ProjectDataManagement::ChargeType> PdmHandler::chargeTypes()
|
||||
{
|
||||
initializePdm();
|
||||
return m_chargeTypes;
|
||||
}
|
||||
|
||||
|
||||
} // namespace Buildings
|
||||
Reference in new issue
Block a user