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>
85 lines
1.4 KiB
C++
85 lines
1.4 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* MapNotifier
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
|
|
// Own
|
|
#include "map_notifier.h"
|
|
#include "map.h"
|
|
|
|
|
|
// Qt
|
|
|
|
|
|
namespace SituationMap
|
|
{
|
|
QPointer<MapNotifier> MapNotifier::createMapNotifier(Map *map, QObject *parent)
|
|
{
|
|
if (!map)
|
|
return nullptr;
|
|
if (!parent)
|
|
return nullptr;
|
|
|
|
MapNotifier *ptr = new MapNotifier(parent);
|
|
ptr->setMap(map);
|
|
return ptr;
|
|
}
|
|
|
|
void MapNotifier::run()
|
|
{
|
|
if (m_map.isNull())
|
|
{
|
|
qCritical() << "no map";
|
|
return;
|
|
}
|
|
|
|
//
|
|
// signal mapReady
|
|
//
|
|
if (m_map->isReady())
|
|
onMapReady();
|
|
else
|
|
connect(m_map.data(), &SituationMap::Map::mapReady,
|
|
this, &MapNotifier::onMapReady, Qt::UniqueConnection);
|
|
|
|
//
|
|
// signal mapReadyAndSymbolDictionaryLoaded
|
|
//
|
|
if (m_map->isReady() && m_map->isSymbolDictionaryLoaded())
|
|
onMapReadyAndSymbolDictionaryLoaded();
|
|
else
|
|
connect(m_map.data(), &SituationMap::Map::mapReadyAndSymbolDictionaryLoaded,
|
|
this, &MapNotifier::onMapReadyAndSymbolDictionaryLoaded, Qt::UniqueConnection);
|
|
}
|
|
|
|
|
|
void MapNotifier::setMap(Map *map)
|
|
{
|
|
m_map = map;
|
|
}
|
|
|
|
const QPointer<Map> MapNotifier::map()
|
|
{
|
|
return m_map;
|
|
}
|
|
|
|
void MapNotifier::onMapReady()
|
|
{
|
|
// qCritical() << "emit mapReady()";
|
|
emit mapReady();
|
|
}
|
|
|
|
void MapNotifier::onMapReadyAndSymbolDictionaryLoaded()
|
|
{
|
|
// qCritical() << "emit mapReadyAndSymbolDictionaryLoaded(), this=" << this;
|
|
emit mapReadyAndSymbolDictionaryLoaded();
|
|
}
|
|
|
|
|
|
} // namespace SituationMap
|
|
|