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,85 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Class LayerParameter
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
// Own
|
||||
#include "situation_map_types.h"
|
||||
#include <Common/situation_map_logging.h>
|
||||
#include <situation_map_export.h>
|
||||
|
||||
// Qt
|
||||
#include <QString>
|
||||
#include <QUrl>
|
||||
|
||||
class QJsonObject;
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
namespace SituationMap
|
||||
{
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
/**
|
||||
* @brief The LayerParameter struct contains parameter of a layer
|
||||
* like visibility, opacity, brightness ....
|
||||
*/
|
||||
class SITUATIONMAP_EXPORT LayerParameter
|
||||
{
|
||||
public:
|
||||
static const uint UNDEFINED_SCALE = 0; // neg. value are not defined/allowed (will be ignored by Esri -> errorprone)
|
||||
|
||||
public:
|
||||
LayerParameter();
|
||||
~LayerParameter() = default;
|
||||
|
||||
void resetView();
|
||||
|
||||
bool minScaleValid() const { return (minScale >= 0); }
|
||||
bool maxScaleValid() const { return (maxScale >= 0); }
|
||||
bool minMaxScaleValid() const { return minScaleValid() && maxScaleValid(); }
|
||||
|
||||
bool operator==(const LayerParameter &other) const;
|
||||
bool operator!=(const LayerParameter &other) const;
|
||||
|
||||
static LayerParameter read(const QJsonObject &json);
|
||||
QJsonObject toJsonObject() const;
|
||||
|
||||
QString toString() const;
|
||||
|
||||
|
||||
bool visible = true;
|
||||
int opacity = 100; ///< value range: 0..100; 100 everything is visible
|
||||
int brightness = 0; ///< value range: -100 .. 100
|
||||
int contrast = 0; ///< value range: -100 .. 100
|
||||
int gamma = 0; ///< value range: -100 .. 100
|
||||
|
||||
// Context Basemaplayer: value of -1 is the indicator, that the layer is NOT loaded yet:
|
||||
double minScale = -1; ///< big value (e.g. 10000000) limiting zoomOut 1:10000000 -> 0.0000001 ; '0' without function
|
||||
double maxScale = -1; ///< small value (e.g. 1000) limiting zoomIn 1:1000 -> 0.001 ; '0' without function
|
||||
|
||||
|
||||
BasemapType basemapType = BasemapType::Undefined;
|
||||
|
||||
QString displayName;
|
||||
QString description;
|
||||
QImage previewImage;
|
||||
|
||||
|
||||
|
||||
// following member won`t be 'set/written' to EsriLayer:
|
||||
QUrl url;
|
||||
QString svcDescription;
|
||||
};
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
SITUATIONMAP_EXPORT std::ostream &operator<< (std::ostream &stream,
|
||||
const LayerParameter &value);
|
||||
|
||||
} // namespace SituationMap
|
||||
|
||||
Q_DECLARE_METATYPE(SituationMap::LayerParameter)
|
||||
Reference in new issue
Block a user