Merge branch 'master' into feature/plugin_description_markdown

ManiVaultStudio · Dec 18, 2024 · 871aa46 · 871aa46
2 parents aaa63d7 + 4c22067
commit 871aa46
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git 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")

diff --git 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
@@ -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