Store data::ElementPtr in CoinLayer.elements

source/RobotAPI/components/ArViz/Coin/Visualizer.cpp

@@ -155,8 +155,8 @@ namespace armarx::viz
             data::Element const& updatedElement = *updatedElementPtr;
 
             std::type_index elementType = typeid(updatedElement);
-            int visuIndex;
-            int visuSize = (int)elementVisualizersTypes.size();
+            size_t visuIndex;
+            size_t visuSize = elementVisualizersTypes.size();
             for (visuIndex = 0; visuIndex < visuSize; ++visuIndex)
             {
                 if (elementVisualizersTypes[visuIndex] == elementType)
@@ -179,7 +179,7 @@ namespace armarx::viz
             if (oldElementIter != layer.elements.end())
             {
                 // Element already exists
-                coin::ElementVisualization& oldElement = *oldElementIter->second;
+                coin::ElementVisualization& oldElement = *oldElementIter->second.visu;
                 oldElement.wasUpdated = true;
 
                 bool updated = visualizer->update(updatedElement, &oldElement);
@@ -211,7 +211,7 @@ namespace armarx::viz
             if (elementVisu->separator)
             {
                 layer.node->addChild(elementVisu->separator);
-                layer.elements[updatedElement.id] = std::move(elementVisu);
+                layer.elements[updatedElement.id] = CoinLayerElement{updatedElementPtr, std::move(elementVisu)};
             }
             else
             {
@@ -226,7 +226,7 @@ namespace armarx::viz
         // Remove the elements which were not contained in the update
         for (auto iter = layer.elements.begin(); iter != layer.elements.end();)
         {
-            auto& elementVisu = *iter->second;
+            auto& elementVisu = *iter->second.visu;
             if (elementVisu.wasUpdated)
             {
                 elementVisu.wasUpdated = false;

source/RobotAPI/components/ArViz/Coin/Visualizer.h

@@ -18,6 +18,14 @@ namespace armarx::viz
 {
     using CoinLayerID = std::pair<std::string, std::string>;
 
+
+    struct CoinLayerElement
+    {
+        data::ElementPtr data;
+        std::unique_ptr<coin::ElementVisualization> visu;
+    };
+
+
     struct CoinLayer
     {
         CoinLayer(SoSeparator* node)
@@ -52,7 +60,7 @@ namespace armarx::viz
         }
 
         SoSeparator* node = nullptr;
-        std::map<std::string, std::unique_ptr<coin::ElementVisualization>> elements;
+        std::map<std::string, CoinLayerElement> elements;
     };
 
     enum class CoinVisualizerState