From c6d5dd16497a4625641d3ff436eb9c448c5fbb94 Mon Sep 17 00:00:00 2001 From: twi-devel Date: Tue, 13 Oct 2026 17:42:16 +0200 Subject: [PATCH] Inserts again intermediate migration results to remote repo --- .../abstract_graphical_object.cpp | 8 ++++- .../graphical_object_attributes.cpp | 4 +++ .../graphical_object_cube.cpp | 4 +++ .../graphical_object_ellipse.cpp | 10 +++++-- .../graphical_object_model_scene_marker.cpp | 6 ++++ .../graphical_object_multi_path.cpp | 7 +++++ .../graphical_object_path.cpp | 16 +++++++++- .../graphical_object_picture_marker.cpp | 5 ++++ .../graphical_object_range.cpp | 7 +++++ .../graphical_object_renderer_attributes.cpp | 8 ++++- .../graphical_object_scene_marker.cpp | 7 +++++ .../graphical_object_text.cpp | 4 +++ .../GraphicalObjects/tactical_appearance.cpp | 5 ++++ .../SituationMap/Map/situation_map_utils.cpp | 26 +++++++++++++++++ .../SituationMap/Map/situation_map_utils.h | 4 +++ .../MapImpl/viewshed_analysis.cpp | 2 ++ .../MapImpl/viewshed_geo_processing.cpp | 29 +++++++++++++------ .../MapImpl/viewshed_geo_processing.h | 1 + .../SituationMap/MapImpl/viewshed_impl.cpp | 14 ++++++--- .../SituationMap/MathUtils/path_rasterer.h | 2 -- .../esri_dictionary_processor.cpp | 8 ++--- 21 files changed, 153 insertions(+), 24 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/abstract_graphical_object.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/abstract_graphical_object.cpp index d2ebd3d64..2456310c8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/abstract_graphical_object.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/abstract_graphical_object.cpp @@ -16,6 +16,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include // Qt @@ -87,7 +93,7 @@ AbstractGraphicalObject::~AbstractGraphicalObject() auto graphicCopy = m_graphic; - QObject::connect (m_graphicsLayer->graphics(), &Esri::ArcGISRuntime::GraphicListModel::graphicRemoved, + QObject::connect (m_graphicsLayer->graphics(), &Esri::ArcGISRuntime::GraphicListModel::itemRemoved, m_graphic, [idx, graphicCopy](int index) { if (idx == index) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_attributes.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_attributes.cpp index 589367333..5d48ec369 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_attributes.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_attributes.cpp @@ -16,6 +16,10 @@ // ESRI #include #include +#include +#include +#include +#include // Qt diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_cube.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_cube.cpp index 78ce4bb26..c8fac6381 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_cube.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_cube.cpp @@ -14,6 +14,10 @@ // ESRI #include #include +#include +#include +#include +#include // Qt diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_ellipse.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_ellipse.cpp index 578dc1010..b290c6516 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_ellipse.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_ellipse.cpp @@ -17,6 +17,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include // Qt @@ -162,7 +168,7 @@ void GraphicalObjectEllipse::parameterToInternal() Esri::ArcGISRuntime::Point mapPoint(origin.x(), origin.y(), origin.z(), spatialReference()); // center of ellipse Esri::ArcGISRuntime::Point normalizedPt = - Esri::ArcGISRuntime::GeometryEngine::normalizeCentralMeridian(mapPoint); + static_cast(Esri::ArcGISRuntime::GeometryEngine::normalizeCentralMeridian(mapPoint)); m_internalParameters->setCenter(normalizedPt); // m_internalParameters->setCenter(mapPoint); @@ -269,7 +275,7 @@ bool GraphicalObjectEllipse::createCirclePolygon(const Esri::ArcGISRuntime::Poin const Esri::ArcGISRuntime::Point &mapPoint = originMap; // center of ellipse Esri::ArcGISRuntime::Point normalizedPt = - Esri::ArcGISRuntime::GeometryEngine::normalizeCentralMeridian(mapPoint); + static_cast(Esri::ArcGISRuntime::GeometryEngine::normalizeCentralMeridian(mapPoint)); ePara.setCenter(normalizedPt); // 3, 4 diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_model_scene_marker.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_model_scene_marker.cpp index 52786aeed..c7860127e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_model_scene_marker.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_model_scene_marker.cpp @@ -15,6 +15,12 @@ // ESRI #include #include +#include +#include +#include + +// Local +#include // Qt diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_multi_path.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_multi_path.cpp index 0d7974431..acb52acbb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_multi_path.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_multi_path.cpp @@ -19,6 +19,13 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include // Qt diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_path.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_path.cpp index 729152d5c..bf00ee47e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_path.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_path.cpp @@ -19,6 +19,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include // Qt @@ -220,7 +226,15 @@ bool GraphicalObjectPath::updateViewImpl() break; } // switch - const int count = AbstractGraphicalObject::countOfPolygonFirstPart(m_graphic->geometry()); + // Cast geometry to Multipart for vertex count check + const Esri::ArcGISRuntime::Geometry geom = m_graphic->geometry(); + const Esri::ArcGISRuntime::Multipart* multipart = nullptr; + if (geom.geometryType() == Esri::ArcGISRuntime::GeometryType::Polyline) + multipart = static_cast(&geom); + else if (geom.geometryType() == Esri::ArcGISRuntime::GeometryType::Polygon) + multipart = static_cast(&geom); + + const int count = multipart ? AbstractGraphicalObject::countOfPolygonFirstPart(*multipart) : 0; if (count > 1000) WARNING_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'" << ", huge amount of vertices, countOfPolygonFirstPart = " << count; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_picture_marker.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_picture_marker.cpp index f6c85d5ad..514f61a38 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_picture_marker.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_picture_marker.cpp @@ -18,6 +18,11 @@ #include #include #include +#include +#include +#include +#include +#include // Qt diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_range.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_range.cpp index 2f6725743..f63d147f6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_range.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_range.cpp @@ -16,6 +16,13 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include // Qt diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_renderer_attributes.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_renderer_attributes.cpp index cf24f1add..8a91d0536 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_renderer_attributes.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_renderer_attributes.cpp @@ -15,6 +15,9 @@ // ESRI #include #include +#include +#include +#include // Qt @@ -98,7 +101,10 @@ bool GraphicalObjectRendererAttributes::updateViewImpl() if (m_logger.isDebugEnabled()) qCritical() << " debugInfo='" << m_debugInfo << "'" << ", QVariantMap before unite " << cur; - cur.unite(m_attributeMap.value()); + // Qt6: QMap::unite removed, use insert() loop instead + const QVariantMap attrs = m_attributeMap.value(); + for (auto it = attrs.begin(); it != attrs.end(); ++it) + cur.insert(it.key(), it.value()); if (m_logger.isDebugEnabled()) qCritical() << " debugInfo='" << m_debugInfo << "'" << ", QVariantMap after unite " << cur; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_scene_marker.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_scene_marker.cpp index 18946498d..513fcd48c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_scene_marker.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_scene_marker.cpp @@ -16,6 +16,13 @@ // ESRI #include #include +#include +#include +#include +#include + +// Local +#include // Qt diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_text.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_text.cpp index 6673cfa41..f94141213 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_text.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_text.cpp @@ -15,6 +15,10 @@ #include #include #include +#include +#include +#include +#include // Qt #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/tactical_appearance.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/tactical_appearance.cpp index 796b0739b..d68f020cb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/tactical_appearance.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/tactical_appearance.cpp @@ -20,6 +20,11 @@ // ESRI #include #include +#include +#include +#include +#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.cpp index 5c5bf477f..0a7c230a7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.cpp @@ -623,6 +623,32 @@ QString toString(const Esri::ArcGISRuntime::GraphicsRenderingMode value) +//------------------------------------------------------------------------------ + +std::ostream &operator<< (std::ostream &stream, + const Esri::ArcGISRuntime::GeometryDimension value) +{ + stream << "EsriGD(" << toString(value) << ")"; + return stream; +} + +QString toString(const Esri::ArcGISRuntime::GeometryDimension value) +{ + switch (value) + { + case Esri::ArcGISRuntime::GeometryDimension::Point: + return QStringLiteral("Point"); + case Esri::ArcGISRuntime::GeometryDimension::Curve: + return QStringLiteral("Curve"); + case Esri::ArcGISRuntime::GeometryDimension::Area: + return QStringLiteral("Area"); + case Esri::ArcGISRuntime::GeometryDimension::Volume: + return QStringLiteral("Volume"); + } // switch + Q_ASSERT(false); + return QStringLiteral("Esri-GeometryDimensionERROR"); +} + //------------------------------------------------------------------------------ std::ostream &operator<< (std::ostream &stream, diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.h index 2a5ef816b..08beee6ff 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.h @@ -39,6 +39,7 @@ enum class NetworkCachePolicy; enum class SceneLocationVisibility; enum class ViewpointType; enum class GeometryType; +enum class GeometryDimension; class Viewpoint; class Camera; @@ -112,6 +113,7 @@ SITUATIONMAP_EXPORT QString toString(const Esri::ArcGISRuntime::Error &value); SITUATIONMAP_EXPORT QString toString(const Esri::ArcGISRuntime::ElevationSourceType value); SITUATIONMAP_EXPORT QString toString(const Esri::ArcGISRuntime::GraphicsRenderingMode value); SITUATIONMAP_EXPORT QString toString(const Esri::ArcGISRuntime::GeometryType value); +SITUATIONMAP_EXPORT QString toString(const Esri::ArcGISRuntime::GeometryDimension value); SITUATIONMAP_EXPORT QString toString(const Esri::ArcGISRuntime::LayerType value); SITUATIONMAP_EXPORT QString toString(const Esri::ArcGISRuntime::LicenseStatus value); SITUATIONMAP_EXPORT QString toString(const Esri::ArcGISRuntime::LoadStatus value); @@ -130,6 +132,8 @@ SITUATIONMAP_EXPORT std::ostream &operator<< (std::ostream &stream, const Esri::ArcGISRuntime::ElevationSourceType value); SITUATIONMAP_EXPORT std::ostream &operator<< (std::ostream &stream, const Esri::ArcGISRuntime::GraphicsRenderingMode value); +SITUATIONMAP_EXPORT std::ostream &operator<< (std::ostream &stream, + const Esri::ArcGISRuntime::GeometryDimension value); SITUATIONMAP_EXPORT std::ostream &operator<< (std::ostream &stream, const Esri::ArcGISRuntime::GeometryType value); SITUATIONMAP_EXPORT std::ostream &operator<< (std::ostream &stream, diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_analysis.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_analysis.cpp index c012d0dcc..c3930155b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_analysis.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_analysis.cpp @@ -16,7 +16,9 @@ #include #include +#include #include +#include // Qt #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.cpp index 1c9cc216d..2c1385abf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.cpp @@ -27,19 +27,30 @@ #include #include #include +#include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include +#include +#include // Qt #include #include +#include namespace SituationMap @@ -394,7 +405,14 @@ bool ViewshedGeoProcessing::processRasterResults(Esri::ArcGISRuntime::Geoprocess { DEBUG_LOG(m_logger) << LOGFUNCTION << " viewshedResultRaster -> url = " << viewshedResultRaster->url().toString(); - connect(viewshedResultRaster, &Esri::ArcGISRuntime::GeoprocessingRaster::fetchFileCompleted, this, [this] (QUuid, const QString& filePath) { + QFuture future = viewshedResultRaster->fetchFileAsync(QStringLiteral("/tmp/viewshedFetched.tif")); + if (!future.isValid()) + { + ERROR_LOG(m_logger) << LOGFUNCTION << " m_mapImpl failed"; + return false; + } + + future.then(this, [this] (const QString& filePath) { DEBUG_LOG(m_logger) << LOGFUNCTION << " filePath=" << filePath; Esri::ArcGISRuntime::Raster *raster = new Esri::ArcGISRuntime::Raster(filePath, this); @@ -441,13 +459,6 @@ bool ViewshedGeoProcessing::processRasterResults(Esri::ArcGISRuntime::Geoprocess raster->load(); }); - QFuture future = viewshedResultRaster->fetchFileAsync(QStringLiteral("/tmp/viewshedFetched.tif")); - if (!future.isValid()) - { - ERROR_LOG(m_logger) << LOGFUNCTION << " m_mapImpl failed"; - return false; - } - return true; } @@ -484,7 +495,7 @@ void ViewshedGeoProcessing::createExtentGraphic(const Esri::ArcGISRuntime::Point m_resultsOverlay->graphics()->append(m_extentGraphic); } - const Esri::ArcGISRuntime::Polygon &circlePoly = Esri::ArcGISRuntime::GeometryEngine::buffer(origin, radius); // circlePoly.parts().part(0).pointCount(); -> 96 + const Esri::ArcGISRuntime::Polygon &circlePoly = Esri::ArcGISRuntime::GeometryEngine::buffer(static_cast(origin), radius); // circlePoly.parts().part(0).pointCount(); -> 96 m_extentGraphic->setGeometry(circlePoly); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.h index 53ab8dcaa..f55cda767 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.h @@ -14,6 +14,7 @@ // ESRI #include #include +#include // Qt diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_impl.cpp index edbe46667..29089b978 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_impl.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_impl.cpp @@ -23,6 +23,12 @@ #include "Rubberbands/rubberband_factory.h" +// ESRI +#include +#include +#include +#include + // Qt @@ -707,8 +713,8 @@ void ViewshedImpl::onSightFanRb3DApply(RB::RubberbandBase *rbnd) Esri::ArcGISRuntime::Point geom2(coord.x(), coord.y(), sr); Esri::ArcGISRuntime::GeodeticDistanceResult geodeticDistanceResult = gEngine->distanceGeodetic(geom1, geom2, - Esri::ArcGISRuntime::LinearUnitId::Meters, - Esri::ArcGISRuntime::AngularUnitId::Degrees, + Esri::ArcGISRuntime::LinearUnit(Esri::ArcGISRuntime::LinearUnitId::Meters), + Esri::ArcGISRuntime::AngularUnit(Esri::ArcGISRuntime::AngularUnitId::Degrees), Esri::ArcGISRuntime::GeodeticCurveType::Geodesic); viewshedParameter.outerRadius = geodeticDistanceResult.distance(); @@ -860,8 +866,8 @@ void ViewshedImpl::onRb3DApply(RB::RubberbandBase *rbnd) Esri::ArcGISRuntime::Point geom2(coord.x(), coord.y(), sr); Esri::ArcGISRuntime::GeodeticDistanceResult geodeticDistanceResult = gEngine->distanceGeodetic(geom1, geom2, - Esri::ArcGISRuntime::LinearUnitId::Meters, - Esri::ArcGISRuntime::AngularUnitId::Degrees, + Esri::ArcGISRuntime::LinearUnit(Esri::ArcGISRuntime::LinearUnitId::Meters), + Esri::ArcGISRuntime::AngularUnit(Esri::ArcGISRuntime::AngularUnitId::Degrees), Esri::ArcGISRuntime::GeodeticCurveType::Geodesic); viewshedParameter.outerRadius = geodeticDistanceResult.distance(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/path_rasterer.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/path_rasterer.h index 9f110fda5..f6ad2117d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/path_rasterer.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MathUtils/path_rasterer.h @@ -73,8 +73,6 @@ namespace SituationMap { namespace MathUtils */ void rasterize(qreal tMin, qreal tMax, QVector & vertexList); - void rasterize(qreal tMin, qreal tMax, QList & vertexList); - protected: qreal _eps; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor.cpp index 47d90be19..6d27ebd7b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor.cpp @@ -121,9 +121,9 @@ void EsriDictionaryProcessor::startBaseSymbolCodeToPropertyTable() // A-sync: // (slot is a pure virtual method) - m_baseSymbolCodeToSymbolPropertyTableWatcher = QtConcurrent::run([this]() { + (void)(m_baseSymbolCodeToSymbolPropertyTableWatcher = QtConcurrent::run([this]() { return this->processBaseSymbolCodeToPropertyTable(); - }); + })); // Sync: // processBaseSymbolCodeToPropertyTable(); @@ -137,9 +137,9 @@ void EsriDictionaryProcessor::startModifierTable() // A-sync: // (slot is a pure virtual method) - m_modifierTableWatcher = QtConcurrent::run([this]() { + (void)(m_modifierTableWatcher = QtConcurrent::run([this]() { return this->processModifierTable(); - }); + })); // Sync: // processModifierTable();