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,81 @@
|
||||
/**
|
||||
* Subscribe to MeteoDataManagement and provide the correct weather for the given position
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "handler_mdm_data.h"
|
||||
#include "initialization.h"
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include "settings.h"
|
||||
|
||||
using namespace EffectShowManagement;
|
||||
//=============================================================================
|
||||
HandlerMdmData::HandlerMdmData(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_logger(getLogger("HandlerMdmData"))
|
||||
{
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
bool HandlerMdmData::init()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "init() HandlerMdmData";
|
||||
auto dtcMdm = m_ddsHandler->dtcMdm();
|
||||
|
||||
connect(dtcMdm.get(), &MeteoDataManagement::Interface::Dtc::meteoDataChanged,
|
||||
this, &HandlerMdmData::onMeteoDataChanged);
|
||||
|
||||
// Get current data for all weather data
|
||||
{
|
||||
auto cb = [this](const MeteoDataManagement::MeteoData & meteoData)
|
||||
{
|
||||
onMeteoDataChanged(meteoData, DataModification::eAdded);
|
||||
};
|
||||
if (!dtcMdm->meteoDatas(cb))
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
//=============================================================================
|
||||
bool HandlerMdmData::getNearestWeather(const Core::GeoPosition2D &pos,
|
||||
MeteoDataManagement::MeteoData &data) const
|
||||
{
|
||||
const LtsCoordTrans::UtmCoordinate utm(LtsCoordTrans::UtmCoordinate::fromGeographic(pos.lon(), pos.lat()));
|
||||
double nearestDistanceSquared = std::numeric_limits<double>::max();
|
||||
|
||||
bool found = false;
|
||||
for (const auto &md : qAsConst(m_meteoData))
|
||||
{
|
||||
if (md.isStaticMeteoData())
|
||||
continue;
|
||||
|
||||
const double distanceSquared = LtsCoordTrans::squareDistance(utm, md.pos().lon(), md.pos().lat());
|
||||
|
||||
if (distanceSquared < nearestDistanceSquared)
|
||||
{
|
||||
found = true;
|
||||
data = md;
|
||||
nearestDistanceSquared = distanceSquared;
|
||||
}
|
||||
}
|
||||
return found;
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerMdmData::onMeteoDataChanged(const MeteoDataManagement::MeteoData &data, DataModification modType)
|
||||
{
|
||||
switch (modType)
|
||||
{
|
||||
case DataModification::eRemoved:
|
||||
m_meteoData.remove(data.id());
|
||||
break;
|
||||
case DataModification::eAdded:
|
||||
case DataModification::eModified:
|
||||
m_meteoData[data.id()] = data;
|
||||
break;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user