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>
108 lines
2.4 KiB
C++
108 lines
2.4 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Interface for Map
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
// Own
|
|
#include "map.h"
|
|
#include "abstract_map_object.h"
|
|
|
|
#include <MapImpl/map_impl.h>
|
|
#include <MapImpl/grid_impl.h>
|
|
#include "map_notifier.h"
|
|
|
|
namespace SituationMap
|
|
{
|
|
|
|
int AbstractMapObject::s_scaleHasVisibilityValue = 0;
|
|
|
|
|
|
Map::Map(QWidget *parent)
|
|
: QWidget(parent)
|
|
{}
|
|
|
|
bool Map::applyLicense(const QString &licenseStr, const QStringList &extensions)
|
|
{
|
|
return MapImpl::applyLicense(licenseStr, extensions);
|
|
}
|
|
|
|
bool Map::applyNetworkCacheSettings(const EsriNetworkCacheSettings &esriNetworkCacheSettings)
|
|
{
|
|
return MapImpl::applyNetworkCacheSettings(esriNetworkCacheSettings);
|
|
}
|
|
|
|
EsriNetworkCacheSettings Map::networkCacheSettings()
|
|
{
|
|
return MapImpl::networkCacheSettings();
|
|
}
|
|
|
|
|
|
Map *Map::create(QWidget *parent)
|
|
{
|
|
return new SituationMap::MapImpl(parent);
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// output operator:
|
|
//-----------------------------------------------------------------------------
|
|
QString toString(const SituationMap::Mode &value)
|
|
{
|
|
switch (value)
|
|
{
|
|
case SituationMap::Mode::Mode_2D:
|
|
return QLatin1String("Mode_2D");
|
|
case SituationMap::Mode::Mode_3D:
|
|
return QLatin1String("Mode_3D");
|
|
case SituationMap::Mode::Undefined:
|
|
return QLatin1String("Mode_Undefined");
|
|
} // switch
|
|
return QLatin1String("ModeERROR");
|
|
}
|
|
|
|
std::ostream &operator<< (std::ostream &stream,
|
|
const SituationMap::Mode &value)
|
|
{
|
|
stream << toString(value);
|
|
return stream;
|
|
}
|
|
|
|
QString toString(const SituationMap::NavigationConstraint &value)
|
|
{
|
|
switch (value)
|
|
{
|
|
case SituationMap::NavigationConstraint::Undefined:
|
|
return QLatin1String("NavigationConstraint_Undefined");
|
|
case SituationMap::NavigationConstraint::None:
|
|
return QLatin1String("NavigationConstraint_None");
|
|
case SituationMap::NavigationConstraint::StayAbove:
|
|
return QLatin1String("NavigationConstraint_StayAbove");
|
|
} // switch
|
|
return QLatin1String("NavigationConstraintERROR");
|
|
}
|
|
|
|
std::ostream &operator<< (std::ostream &stream,
|
|
const SituationMap::NavigationConstraint &value)
|
|
{
|
|
stream << toString(value);
|
|
return stream;
|
|
}
|
|
|
|
|
|
std::ostream &operator<< (std::ostream &stream,
|
|
const AbstractMapObject &value)
|
|
{
|
|
stream << value.toString();
|
|
return stream;
|
|
}
|
|
|
|
|
|
|
|
} // namespace SituationMap
|