Adds commercial RTI 6.6 Pro library

This commit is contained in:
torsten committed 2026-11-02 17:21:06 +00:00
1 parent 6d96d72592
commit 8ebcac4253
9 files changed
+66 -56

No files matched your search

@@ -48,7 +48,9 @@ IF(BUILD_RTI)
${CMAKE_BINARY_DIR}/Lts/DDS
)
# ddscore target generates core_dtc_types.h
ADD_DEPENDENCIES(LtsSessionDataDds ddscore)
IF(TARGET ddscore)
ADD_DEPENDENCIES(LtsSessionDataDds ddscore)
ENDIF()
NGL_TARGET_LINK_DIRECTORIES(LtsSessionDataDds
PRIVATE
${RTI_LIB_DIR}
@@ -24,11 +24,12 @@ ADD_SUBDIRECTORY(Routing)
ADD_SUBDIRECTORY(Core)
# During stepwise migration, add placeholder CTest entries before the
# real DdsUnitTests subdir so the test-suite shows migration status even
# when internal codegen targets are not yet available.
ADD_SUBDIRECTORY(DdsUnitTestsPlaceholder)
# During stepwise migration, add placeholder CTest entries after the
# real DdsUnitTests subdir so the test-suite can use real targets when
# internal codegen/RTI targets are available, and fall back to placeholders
# only when they are not.
IF(BUILD_RTI)
ADD_SUBDIRECTORY(DdsUnitTests)
ENDIF()
ADD_SUBDIRECTORY(DdsUnitTestsPlaceholder)
@@ -29,6 +29,9 @@ SET(SRCS_common
# these build-dir paths, so the copies are gone rather than kept for forbidden
# OFF variants.
# Define target name early for use in subsequent macros
SET(PDM_COMMON_TARGET svcPdmCommon)
# Add current binary dir to include path for generated headers
NGL_TARGET_INCLUDE_DIRECTORIES(${PDM_COMMON_TARGET}
PUBLIC
@@ -98,7 +101,6 @@ IF(BUILD_RTI)
ENDIF()
# Create svcPdmCommon library with common sources
SET(PDM_COMMON_TARGET svcPdmCommon)
NGL_ADD_LIBRARY(AAR SV WS HLA ${PDM_COMMON_TARGET} SHARED ${SRCS_common})
generate_export_header(${PDM_COMMON_TARGET}
EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/svcpdmcommon_export.h"
@@ -316,7 +316,7 @@ void BaseSymbolItem::onEsriFetchCompleted(Esri::ArcGISRuntime::Symbol *symbol)
const QFuture<QImage> fut = m_esriFetch.m_esriSymbol->createSwatchAsync(SWATCH_SIZE, SWATCH_SIZE, 1);
if (fut.isValid())
{
m_esriFetch.m_esriSwatchTaskUuid = QUuid::createUuid(); // in-flight guard (was the 100.x task id)
// ArcGIS 300: no separate task UUID tracking needed - QFutureWatcher handles lifecycle
QFutureWatcher<QImage> *watcher = new QFutureWatcher<QImage>(this);
watcher->setFuture(fut);
// 300/Qt6: connect to finished() and read the QImage via the result() getter (see above).
@@ -311,7 +311,8 @@ void EsriDictionaryProcessor::syncTableWithinMainThread()
// store esriSymbol for rendering issues:
EsriSymbol eSym;
#ifdef CREATE_ESRI_SYMBOL_ON_DEMAND
eSym.m_sssResult =resultItem;
// ArcGIS 300: m_sssResult member removed - using esriSymbol directly
eSym.key = resultItem.key();
#else
QObject *parent = this;
eSym.esriSymbol = resultItem.symbol(parent); // resultItem.symbol() has to be called from mainThread???
@@ -213,7 +213,7 @@ protected:
public:
bool symbolPropertyImageContains(const QString &originalKey) const;
QSharedPointer<SymbolResult> symbolPropertyImage(QSharedPointer<SymbolResult> symResult, const QString &originalKey);
QSharedPointer<SymbolResult> symbolPropertyImage(QSharedPointer<SymbolResult> symResult, const QString &originalKey) const;
const QList<Esri::ArcGISRuntime::SymbolStyleSearchResult> & getSearchResultList() const { return m_searchResultList; }
const QList<Esri::ArcGISRuntime::SymbolStyleSearchResult> & getSearchResultListValid() const { return m_searchResultListValid; }