To implement more accurate memory size calculation

diff --git a/src/CONVERTOR/VISU_Convertor_impl.cxx b/src/CONVERTOR/VISU_Convertor_impl.cxx
index 4bfe9a5be946dc44c1be099a5b455d676dd9b753..ac3462d5cee26df737141eb45c87d4c738aea016 100644 (file)
--- a/src/CONVERTOR/VISU_Convertor_impl.cxx
+++ b/src/CONVERTOR/VISU_Convertor_impl.cxx
@@ -452,8 +452,13 @@ namespace VISU
     size_t aSize = TAppendFilter::GetMemorySize();
     aSize += myNamedPointCoords->GetMemorySize();
     aSize += myElemObj2VTKID.size() * 2 * sizeof(vtkIdType);
-    for(size_t anId = 0; anId < mySubProfileArr.size(); anId++)
-      aSize += mySubProfileArr[anId]->GetMemorySize();
+    TGeom2SubProfile::const_iterator anIter = myGeom2SubProfile.begin();
+    TGeom2SubProfile::const_iterator anIterEnd = myGeom2SubProfile.end();
+    for(; anIter != anIterEnd; anIter++){
+      const PSubProfileImpl& aSubProfile = anIter->second;
+      aSize += aSubProfile->GetMemorySize();
+      aSize += sizeof(EGeometry);
+    }
     return aSize;
   }
 
@@ -642,8 +647,13 @@ namespace VISU
   {
     size_t aSize = TAppendFilter::GetMemorySize();
     aSize += mySource.GetMemorySize();
-    for(size_t anId = 0; anId < myGaussSubMeshArr.size(); anId++)
-      aSize += myGaussSubMeshArr[anId]->GetMemorySize();
+    TGeom2GaussSubMesh::const_iterator anIter = myGeom2GaussSubMesh.begin();
+    TGeom2GaussSubMesh::const_iterator anIterEnd = myGeom2GaussSubMesh.end();
+    for(; anIter != anIterEnd; anIter++){
+      const PGaussSubMeshImpl& aGaussSubMesh = anIter->second;
+      aSize += aGaussSubMesh->GetMemorySize();
+      aSize += sizeof(EGeometry);
+    }
     return aSize;
   }
 
@@ -764,9 +774,12 @@ namespace VISU
     size_t aSize = TAppendFilter::GetMemorySize();
     aSize += myNamedPointCoords->GetMemorySize();
     aSize += myElemObj2VTKID.size() * 2 * sizeof(vtkIdType);
-    for(size_t anId = 0; anId < mySubMeshArr.size(); anId++){
-      const PSubMeshImpl& aSubMesh = mySubMeshArr[anId];
+    TGeom2SubMesh::const_iterator anIter = myGeom2SubMesh.begin();
+    TGeom2SubMesh::const_iterator anIterEnd = myGeom2SubMesh.end();
+    for(; anIter != anIterEnd; anIter++){
+      const PSubMeshImpl& aSubMesh = anIter->second;
       aSize += aSubMesh->GetMemorySize();
+      aSize += sizeof(EGeometry);
     }
     return aSize;
   }