To improve memory size calculation

diff --git a/src/PIPELINE/VISU_ColoredPL.cxx b/src/PIPELINE/VISU_ColoredPL.cxx
index e96225c5b85d88cec9fe0952cd1d97a1e5208c32..2a6f8a51a1087f0ff3e198c187d8f7399d264d2d 100644 (file)
--- a/src/PIPELINE/VISU_ColoredPL.cxx
+++ b/src/PIPELINE/VISU_ColoredPL.cxx
@@ -220,7 +220,7 @@ unsigned long int
 VISU_ColoredPL
 ::GetMemorySize()
 {
-  unsigned long int aSize = 0;
+  unsigned long int aSize = Superclass::GetMemorySize();
 
   if(vtkDataSet* aDataSet = myExtractor->GetInput())
     aSize = aDataSet->GetActualMemorySize() * 1024;
@@ -228,8 +228,6 @@ VISU_ColoredPL
   if(vtkDataSet* aDataSet = myFieldTransform->GetInput())
     aSize += aDataSet->GetActualMemorySize() * 1024;
   
-  aSize += Superclass::GetMemorySize();
-
   return aSize;
 }
 

diff --git a/src/PIPELINE/VISU_CutPlanesPL.cxx b/src/PIPELINE/VISU_CutPlanesPL.cxx
index 80e3a329b89b9642306b3d7afae05e03f507b00a..ea2b5647047178832e679078a578a7a89f871122 100644 (file)
--- a/src/PIPELINE/VISU_CutPlanesPL.cxx
+++ b/src/PIPELINE/VISU_CutPlanesPL.cxx
@@ -152,16 +152,15 @@ unsigned long int
 VISU_CutPlanesPL
 ::GetMemorySize()
 {
-  vtkDataSet* aDataSet = myAppendPolyData->GetOutput();
-  unsigned long int aSize = aDataSet->GetActualMemorySize() * 1024;
+  unsigned long int aSize = Superclass::GetMemorySize();
+
+  if(vtkDataSet* aDataSet = myAppendPolyData->GetOutput())
+    aSize += aDataSet->GetActualMemorySize() * 1024;
   
   int anEnd = myAppendPolyData->GetNumberOfInputs();
-  for(int anId = 0; anId < anEnd; anId++){
-    aDataSet = myAppendPolyData->GetInput(anId);
-    aSize += aDataSet->GetActualMemorySize() * 1024;
-  }
-
-  aSize += Superclass::GetMemorySize();
+  for(int anId = 0; anId < anEnd; anId++)
+    if(vtkDataSet* aDataSet = myAppendPolyData->GetInput(anId))
+      aSize += aDataSet->GetActualMemorySize() * 1024;
 
   return aSize;
 }

diff --git a/src/PIPELINE/VISU_DataSetMapperHolder.cxx b/src/PIPELINE/VISU_DataSetMapperHolder.cxx
index 65a3caadae5bf867965eafa3fb9ea1ee5bc84d6d..7ead8b3792641ab0960505d8244c678206ee85f0 100644 (file)
--- a/src/PIPELINE/VISU_DataSetMapperHolder.cxx
+++ b/src/PIPELINE/VISU_DataSetMapperHolder.cxx
@@ -101,14 +101,12 @@ unsigned long int
 VISU_DataSetMapperHolder
 ::GetMemorySize()
 {
-  unsigned long int aSize = 0;
+  unsigned long int aSize = Superclass::GetMemorySize();
 
   if(myExtractGeometry->GetInput())
     if(vtkDataSet* aDataSet = myExtractGeometry->GetOutput())
       aSize = aDataSet->GetActualMemorySize() * 1024;
   
-  aSize += Superclass::GetMemorySize();
-
   return aSize;
 }
 

diff --git a/src/PIPELINE/VISU_DeformedShapePL.cxx b/src/PIPELINE/VISU_DeformedShapePL.cxx
index 4c9fbe95e9c3677f723885043fd21a78fb26dba9..2c21bf189a97a259c8359c64af2294881a70f22b 100644 (file)
--- a/src/PIPELINE/VISU_DeformedShapePL.cxx
+++ b/src/PIPELINE/VISU_DeformedShapePL.cxx
@@ -159,7 +159,8 @@ unsigned long int
 VISU_DeformedShapePL
 ::GetMemorySize()
 {
-  unsigned long int aSize = 0;
+  unsigned long int aSize = Superclass::GetMemorySize();
+
   if(myWarpVector->GetInput())
     if(vtkDataSet* aDataSet = myWarpVector->GetOutput())
       aSize += aDataSet->GetActualMemorySize() * 1024;
@@ -168,8 +169,6 @@ VISU_DeformedShapePL
     if(vtkDataSet* aDataSet = myCellDataToPointData->GetOutput())
       aSize += aDataSet->GetActualMemorySize() * 1024;
 
-  aSize += Superclass::GetMemorySize();
-
   return aSize;
 }
 

diff --git a/src/PIPELINE/VISU_GaussPointsPL.cxx b/src/PIPELINE/VISU_GaussPointsPL.cxx
index 343bedb21ec8af45b57a50066bbd085956f46398..9373d4973b438423999183736a2e7a736af18224 100644 (file)
--- a/src/PIPELINE/VISU_GaussPointsPL.cxx
+++ b/src/PIPELINE/VISU_GaussPointsPL.cxx
@@ -265,7 +265,7 @@ unsigned long int
 VISU_GaussPointsPL
 ::GetMemorySize()
 {
-  unsigned long int aSize = 0;
+  unsigned long int aSize = Superclass::GetMemorySize();
   
   if(GetIsDeformed())
     if(vtkDataSet* aDataSet = myWarpVector->GetOutput())

diff --git a/src/PIPELINE/VISU_IsoSurfacesPL.cxx b/src/PIPELINE/VISU_IsoSurfacesPL.cxx
index d812182c943fc0816b164c04d40a1a4b7e9671e3..950330c2330465140f3667c32dc3c3cd1ade7976 100644 (file)
--- a/src/PIPELINE/VISU_IsoSurfacesPL.cxx
+++ b/src/PIPELINE/VISU_IsoSurfacesPL.cxx
@@ -183,15 +183,14 @@ unsigned long int
 VISU_IsoSurfacesPL
 ::GetMemorySize()
 {
-  vtkDataSet* aDataSet = myContourFilter->GetOutput();
-  unsigned long int aSize = aDataSet->GetActualMemorySize() * 1024;
-  
-  if(myCellDataToPointData->GetInput()){
-    aDataSet = myCellDataToPointData->GetOutput();
-    aSize += aDataSet->GetActualMemorySize() * 1024;
-  }
+  unsigned long int aSize = Superclass::GetMemorySize();
 
-  aSize += Superclass::GetMemorySize();
+  if(vtkDataSet* aDataSet = myContourFilter->GetOutput())
+    aSize += aDataSet->GetActualMemorySize() * 1024;
+  
+  if(myCellDataToPointData->GetInput())
+    if(vtkDataSet* aDataSet = myCellDataToPointData->GetOutput())
+      aSize += aDataSet->GetActualMemorySize() * 1024;
 
   return aSize;
 }

diff --git a/src/PIPELINE/VISU_Plot3DPL.cxx b/src/PIPELINE/VISU_Plot3DPL.cxx
index 42724887c886cc293959e7854ad67c6ae0dbeaac..f1b9c6ffb8d22bca02e1d99dfa20bb64c1f7567b 100644 (file)
--- a/src/PIPELINE/VISU_Plot3DPL.cxx
+++ b/src/PIPELINE/VISU_Plot3DPL.cxx
@@ -250,7 +250,8 @@ unsigned long int
 VISU_Plot3DPL
 ::GetMemorySize()
 {
-  unsigned long int aSize = 0;
+  unsigned long int aSize = Superclass::GetMemorySize();
+
   if(vtkDataSet* aDataSet = myGeometryFilter->GetInput())
     aSize += aDataSet->GetActualMemorySize() * 1024;
   
@@ -270,8 +271,6 @@ VISU_Plot3DPL
       aSize += aDataSet->GetActualMemorySize() * 1024;
   }
 
-  aSize += Superclass::GetMemorySize();
-
   return aSize;
 }
 

diff --git a/src/PIPELINE/VISU_PolyDataMapperHolder.cxx b/src/PIPELINE/VISU_PolyDataMapperHolder.cxx
index 4a8c2e39c1ec5e3f1b535d142040ba26df254370..2045f71293157bc0d44459c522b7209d921867a9 100644 (file)
--- a/src/PIPELINE/VISU_PolyDataMapperHolder.cxx
+++ b/src/PIPELINE/VISU_PolyDataMapperHolder.cxx
@@ -101,13 +101,11 @@ unsigned long int
 VISU_PolyDataMapperHolder
 ::GetMemorySize()
 {
-  unsigned long int aSize = 0;
+  unsigned long int aSize = Superclass::GetMemorySize();
 
   if(myExtractPolyDataGeometry->GetInput())
     if(vtkDataSet* aDataSet = myExtractPolyDataGeometry->GetOutput())
       aSize = aDataSet->GetActualMemorySize() * 1024;
-  
-  aSize += Superclass::GetMemorySize();
 
   return aSize;
 }

diff --git a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx b/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx
index 583642a3707aabec553de8c519c2908c47e0ef08..dad8e54798ecbbab4754f112dde6165976176240 100644 (file)
--- a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx
+++ b/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx
@@ -162,21 +162,20 @@ unsigned long int
 VISU_ScalarMapOnDeformedShapePL
 ::GetMemorySize()
 {
-  vtkDataSet* aDataSet = myDeformVectors->GetOutput();
-  unsigned long int aSize = aDataSet->GetActualMemorySize() * 1024;
-  
-  aDataSet = myExtractorScalars->GetOutput();
-  aSize += aDataSet->GetActualMemorySize() * 1024;
+  unsigned long int aSize = Superclass::GetMemorySize();
 
-  aDataSet = myMergeFilter->GetOutput();
-  aSize += aDataSet->GetActualMemorySize() * 1024;
+  if(vtkDataSet* aDataSet = myDeformVectors->GetOutput())
+    aSize += aDataSet->GetActualMemorySize() * 1024;
+  
+  if(vtkDataSet* aDataSet = myExtractorScalars->GetOutput())
+    aSize += aDataSet->GetActualMemorySize() * 1024;
 
-  if(myCellDataToPointData->GetInput()){
-    aDataSet = myCellDataToPointData->GetOutput();
+  if(vtkDataSet* aDataSet = myMergeFilter->GetOutput())
     aSize += aDataSet->GetActualMemorySize() * 1024;
-  }
 
-  aSize += Superclass::GetMemorySize();
+  if(myCellDataToPointData->GetInput())
+    if(vtkDataSet* aDataSet = myCellDataToPointData->GetOutput())
+      aSize += aDataSet->GetActualMemorySize() * 1024;
 
   return aSize;
 }

diff --git a/src/PIPELINE/VISU_StreamLinesPL.cxx b/src/PIPELINE/VISU_StreamLinesPL.cxx
index e47a0f38e6ddb7dc4170e19a6f44a05e66cd1463..cd46cdb8051ed8f6addf40fd52b8a8b3c2dcaeb1 100644 (file)
--- a/src/PIPELINE/VISU_StreamLinesPL.cxx
+++ b/src/PIPELINE/VISU_StreamLinesPL.cxx
@@ -666,18 +666,17 @@ unsigned long int
 VISU_StreamLinesPL
 ::GetMemorySize()
 {
-  vtkDataSet* aDataSet = myStream->GetOutput();
-  unsigned long int aSize = aDataSet->GetActualMemorySize() * 1024;
-  
-  aDataSet = myGeomFilter->GetOutput();
-  aSize += aDataSet->GetActualMemorySize() * 1024;
+  unsigned long int aSize = Superclass::GetMemorySize();
 
-  if(myCellDataToPointData->GetInput()){
-    aDataSet = myCellDataToPointData->GetOutput();
+  if(vtkDataSet* aDataSet = myStream->GetOutput())
+    aSize += aDataSet->GetActualMemorySize() * 1024;
+  
+  if(vtkDataSet* aDataSet = myGeomFilter->GetOutput())
     aSize += aDataSet->GetActualMemorySize() * 1024;
-  }
 
-  aSize += Superclass::GetMemorySize();
+  if(myCellDataToPointData->GetInput())
+    if(vtkDataSet* aDataSet = myCellDataToPointData->GetOutput())
+      aSize += aDataSet->GetActualMemorySize() * 1024;
 
   return aSize;
 }

diff --git a/src/PIPELINE/VISU_VectorsPL.cxx b/src/PIPELINE/VISU_VectorsPL.cxx
index 43afae0a4d525baf34268ab24cc89ae0254164e3..66ad29faa82fbfbd29b4271eeffaaea4ba0cee61 100644 (file)
--- a/src/PIPELINE/VISU_VectorsPL.cxx
+++ b/src/PIPELINE/VISU_VectorsPL.cxx
@@ -289,21 +289,20 @@ unsigned long int
 VISU_VectorsPL
 ::GetMemorySize()
 {
-  vtkDataSet* aDataSet = myBaseGlyph->GetOutput();
-  unsigned long int aSize = aDataSet->GetActualMemorySize() * 1024;
-  
-  aDataSet = myTransformedGlyph->GetOutput();
-  aSize += aDataSet->GetActualMemorySize() * 1024;
-  
-  aDataSet = myCenters->GetOutput();
-  aSize += aDataSet->GetActualMemorySize() * 1024;
+  unsigned long int aSize = Superclass::GetMemorySize();
 
-  if(myCellDataToPointData->GetInput()){
-    aDataSet = myCellDataToPointData->GetOutput();
+  if(vtkDataSet* aDataSet = myBaseGlyph->GetOutput())
+    aSize += aDataSet->GetActualMemorySize() * 1024;
+
+  if(vtkDataSet* aDataSet = myTransformedGlyph->GetOutput())
+    aSize += aDataSet->GetActualMemorySize() * 1024;
+  
+  if(vtkDataSet* aDataSet = myCenters->GetOutput())
     aSize += aDataSet->GetActualMemorySize() * 1024;
-  }
 
-  aSize += Superclass::GetMemorySize();
+  if(myCellDataToPointData->GetInput())
+    if(vtkDataSet* aDataSet = myCellDataToPointData->GetOutput())
+      aSize += aDataSet->GetActualMemorySize() * 1024;
 
   return aSize;
 }