From 9489e05243febaf6ac11cf262f41ab730a6ed0d8 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 13 Dec 2024 11:50:06 +0100 Subject: [PATCH 1/2] Update mv_install_dependencies.cmake.in Add libomp.dylib to ignore list --- ManiVault/cmake/mv_install_dependencies.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ManiVault/cmake/mv_install_dependencies.cmake.in b/ManiVault/cmake/mv_install_dependencies.cmake.in index 191f1662e..fb5c59597 100644 --- a/ManiVault/cmake/mv_install_dependencies.cmake.in +++ b/ManiVault/cmake/mv_install_dependencies.cmake.in @@ -4,7 +4,7 @@ install(CODE [[ set(PRE_EXCLUDE "Qt6.*" "api-ms.*" "ext-ms.*" "hvsi.*" "pdmutilities.*" "wpaxholder.*" "dxgi.*" "^uxtheme.*" "d3d11.*" "winmm.*" "wldp.*") set(POST_EXCLUDE ".*[\\/]system32[\\/].*\\.dll" ".*[\\/]Qt6.dll" ".*[\\/]MV_Public.dll" ".*[\\/]PointData.dll" ".*[\\/]ClusterData.dll" ".*[\\/]ColorData.dll" ".*[\\/]ImageData.dll" ".*[\\/]TextData.dll") elseif(APPLE) - set(PRE_EXCLUDE "libQt6.*" "libPointData.dylib" "libMV_Public.dylib" "libClusterData.dylib" "libColorData.dylib" "libImageData.dylib" "libTextData.dylib") + set(PRE_EXCLUDE "libQt6.*" "libomp.dylib" "libPointData.dylib" "libMV_Public.dylib" "libClusterData.dylib" "libColorData.dylib" "libImageData.dylib" "libTextData.dylib") set(POST_EXCLUDE "macos/lib") else() set(PRE_EXCLUDE "libQt6.*" "libMV_Public.so" "libPointData.so" "libClusterData.so" "libColorData.so" "libImageData.so" "libTextData.so") From 4c220677f9f3a5905c244dbc6bea2a647c07c0bd Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 17 Dec 2024 16:32:00 +0100 Subject: [PATCH 2/2] add const getMap (#754) --- ManiVault/src/LinkedData.cpp | 5 ----- ManiVault/src/LinkedData.h | 8 +++++++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ManiVault/src/LinkedData.cpp b/ManiVault/src/LinkedData.cpp index 138605bd1..8408eebd1 100644 --- a/ManiVault/src/LinkedData.cpp +++ b/ManiVault/src/LinkedData.cpp @@ -76,11 +76,6 @@ void SelectionMap::populateMappingIndices(std::uint32_t pointIndex, Indices& ind } } -SelectionMap::Map& SelectionMap::getMap() -{ - return _map; -} - bool SelectionMap::hasMappingForPointIndex(std::uint32_t pointIndex) const { switch (_type) diff --git a/ManiVault/src/LinkedData.h b/ManiVault/src/LinkedData.h index d518cc52e..621dc70c1 100644 --- a/ManiVault/src/LinkedData.h +++ b/ManiVault/src/LinkedData.h @@ -56,7 +56,13 @@ class CORE_EXPORT SelectionMap : public util::Serializable * Get map for indexed pixels * @return Index map */ - Map& getMap(); + Map& getMap() { return _map; }; + + /** + * Get map for indexed pixels + * @return Index map + */ + const Map& getMap() const { return _map; }; /** * Establishes whether a mapping exists for \p pointIndex