To implement GetMemorySize method for the other VISU presentations

diff --git a/src/OBJECT/VISU_MeshAct.cxx b/src/OBJECT/VISU_MeshAct.cxx
index c7a09833e811faf7302fbeee57025bf18398d4aa..e98f301957566977d8b209c645f54af174d41ff0 100644 (file)
--- a/src/OBJECT/VISU_MeshAct.cxx
+++ b/src/OBJECT/VISU_MeshAct.cxx
@@ -232,18 +232,28 @@ unsigned long int
 VISU_MeshAct
 ::GetMemorySize()
 {
+  vtkDataSet* aDataSet;
   unsigned long int aSize = Superclass::GetMemorySize();
   {
-    vtkDataSet* aDataSet = mySurfaceActor->GetMapper()->GetInput();
+    aDataSet = mySurfaceActor->GetInput();
     aSize += aDataSet->GetActualMemorySize() * 1024;
+
+    aDataSet = mySurfaceActor->GetMapper()->GetInput();
+    aSize += aDataSet->GetActualMemorySize() * 1024 * 2;
   }
   {
-    vtkDataSet* aDataSet = myEdgeActor->GetMapper()->GetInput();
+    aDataSet = myEdgeActor->GetInput();
     aSize += aDataSet->GetActualMemorySize() * 1024;
+
+    aDataSet = myEdgeActor->GetMapper()->GetInput();
+    aSize += aDataSet->GetActualMemorySize() * 1024 * 2;
   }
   {
-    vtkDataSet* aDataSet = myNodeActor->GetMapper()->GetInput();
+    aDataSet = myNodeActor->GetInput();
     aSize += aDataSet->GetActualMemorySize() * 1024;
+
+    aDataSet = myNodeActor->GetMapper()->GetInput();
+    aSize += aDataSet->GetActualMemorySize() * 1024 * 2;
   }
   return aSize;
 }

diff --git a/src/OBJECT/VISU_VectorsAct.cxx b/src/OBJECT/VISU_VectorsAct.cxx
index 6fc38567287e87d8a716892c115d4ea94a70844b..9666b5689ffd82bcb0d9e5977e5e953c77c09c42 100644 (file)
--- a/src/OBJECT/VISU_VectorsAct.cxx
+++ b/src/OBJECT/VISU_VectorsAct.cxx
@@ -105,3 +105,17 @@ VISU_VectorsAct
   }
   vtkLODActor::SetMapper(theMapper);
 }
+
+
+//----------------------------------------------------------------------------
+unsigned long int
+VISU_VectorsAct
+::GetMemorySize()
+{
+  vtkDataSet* aDataSet;
+  unsigned long int aSize = Superclass::GetMemorySize();
+
+  aSize += GetPipeLine()->GetMemorySize();
+
+  return aSize;
+}

diff --git a/src/OBJECT/VISU_VectorsAct.h b/src/OBJECT/VISU_VectorsAct.h
index d4c4ce7719c52701d461988bbe21f499812fab1b..06436cc4f5525409b1576f895de0fe039928abf8 100644 (file)
--- a/src/OBJECT/VISU_VectorsAct.h
+++ b/src/OBJECT/VISU_VectorsAct.h
@@ -59,6 +59,11 @@ class VTKOCC_EXPORT VISU_VectorsAct : public VISU_ScalarMapAct
   void
   SetMapper(vtkMapper* theMapper); 
 
+  //! Gets memory size used by the instance (bytes).
+  virtual
+  unsigned long int
+  GetMemorySize();
+ 
  protected:
   VISU_VectorsAct();
   ~VISU_VectorsAct();

diff --git a/src/PIPELINE/VISU_DeformedShapePL.cxx b/src/PIPELINE/VISU_DeformedShapePL.cxx
index c714e076763a6fefbfc46ab2bc11e16ff989df98..8a8cc06db51acf93985cc98f277111bfe7271ca9 100644 (file)
--- a/src/PIPELINE/VISU_DeformedShapePL.cxx
+++ b/src/PIPELINE/VISU_DeformedShapePL.cxx
@@ -140,13 +140,14 @@ unsigned long int
 VISU_DeformedShapePL
 ::GetMemorySize()
 {
-  vtkDataSet* aDataSet = myWarpVector->GetOutput();
-  unsigned long int aSize = aDataSet->GetActualMemorySize() * 1024;
+  unsigned long int aSize = 0;
+  if(vtkDataSet* aDataSet = myWarpVector->GetInput())
+    if(vtkDataSet* aDataSet = myWarpVector->GetOutput())
+      aSize += aDataSet->GetActualMemorySize() * 1024;
   
-  if(myCellDataToPointData->GetInput()){
-    aDataSet = myCellDataToPointData->GetOutput();
-    aSize += aDataSet->GetActualMemorySize() * 1024;
-  }
+  if(myCellDataToPointData->GetInput())
+    if(vtkDataSet* aDataSet = myCellDataToPointData->GetOutput())
+      aSize += aDataSet->GetActualMemorySize() * 1024;
 
   aSize += Superclass::GetMemorySize();
 

diff --git a/src/PIPELINE/VISU_IsoSurfacesPL.cxx b/src/PIPELINE/VISU_IsoSurfacesPL.cxx
index 2d0be6cc83452081ab4c9762f4c50bee04728b05..aa932005fa2c10c130b6558688667488619f501a 100644 (file)
--- a/src/PIPELINE/VISU_IsoSurfacesPL.cxx
+++ b/src/PIPELINE/VISU_IsoSurfacesPL.cxx
@@ -142,6 +142,26 @@ VISU_IsoSurfacesPL
   VISU_ScalarMapPL::Update();
 }
 
+//----------------------------------------------------------------------------
+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;
+  }
+
+  aSize += Superclass::GetMemorySize();
+
+  return aSize;
+}
+
+
+//----------------------------------------------------------------------------
 void
 VISU_IsoSurfacesPL
 ::SetMapScale(vtkFloatingPointType theMapScale)

diff --git a/src/PIPELINE/VISU_IsoSurfacesPL.hxx b/src/PIPELINE/VISU_IsoSurfacesPL.hxx
index 2049a761a832a6fd97594048077f6b02fb19e798..1ecc5ed0487bbb36b380599aaeecfe61be2bc05f 100644 (file)
--- a/src/PIPELINE/VISU_IsoSurfacesPL.hxx
+++ b/src/PIPELINE/VISU_IsoSurfacesPL.hxx
@@ -85,6 +85,11 @@ public:
   void
   Update();
 
+  //! Gets memory size used by the instance (bytes).
+  virtual
+  unsigned long int
+  GetMemorySize();
+
   virtual
   THook* 
   DoHook();

diff --git a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx b/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx
index 16759ec68e6c385467bbb2310d33cc38461d4213..ec75b0877a3b7436c6dd1a34c3254256ac6ada9c 100644 (file)
--- a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx
+++ b/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx
@@ -151,6 +151,32 @@ VISU_ScalarMapOnDeformedShapePL
   VISU_PipeLine::Update();
 }
 
+//----------------------------------------------------------------------------
+unsigned long int
+VISU_ScalarMapOnDeformedShapePL
+::GetMemorySize()
+{
+  vtkDataSet* aDataSet = myDeformVectors->GetOutput();
+  unsigned long int aSize = aDataSet->GetActualMemorySize() * 1024;
+  
+  aDataSet = myExtractorScalars->GetOutput();
+  aSize += aDataSet->GetActualMemorySize() * 1024;
+
+  aDataSet = myMergeFilter->GetOutput();
+  aSize += aDataSet->GetActualMemorySize() * 1024;
+
+  if(myCellDataToPointData->GetInput()){
+    aDataSet = myCellDataToPointData->GetOutput();
+    aSize += aDataSet->GetActualMemorySize() * 1024;
+  }
+
+  aSize += Superclass::GetMemorySize();
+
+  return aSize;
+}
+
+
+//----------------------------------------------------------------------------
 /*!
  * Update scalars method.
  * Put scalars to merge filter.

diff --git a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.hxx b/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.hxx
index 6abcf103a7411bbb75151a1cc4a96d2bd76546f0..fa990596007fde3b9c87539c4ca980d3e76a5beb 100644 (file)
--- a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.hxx
+++ b/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.hxx
@@ -98,6 +98,11 @@ public:
   void
   Update();
 
+  //! Gets memory size used by the instance (bytes).
+  virtual
+  unsigned long int
+  GetMemorySize();
+
   //! Update scalars.
   void
   UpdateScalars();

diff --git a/src/PIPELINE/VISU_StreamLinesPL.cxx b/src/PIPELINE/VISU_StreamLinesPL.cxx
index ac9d8c7f9540e89868a5520fecdb5f7551dd3ba0..03298fcc5da4ee6c683aba2f9aa6a997253e924c 100644 (file)
--- a/src/PIPELINE/VISU_StreamLinesPL.cxx
+++ b/src/PIPELINE/VISU_StreamLinesPL.cxx
@@ -522,6 +522,29 @@ VISU_StreamLinesPL
   VISU_ScalarMapPL::Update();
 }
 
+//----------------------------------------------------------------------------
+unsigned long int
+VISU_StreamLinesPL
+::GetMemorySize()
+{
+  vtkDataSet* aDataSet = myStream->GetOutput();
+  unsigned long int aSize = aDataSet->GetActualMemorySize() * 1024;
+  
+  aDataSet = myGeomFilter->GetOutput();
+  aSize += aDataSet->GetActualMemorySize() * 1024;
+
+  if(myCellDataToPointData->GetInput()){
+    aDataSet = myCellDataToPointData->GetOutput();
+    aSize += aDataSet->GetActualMemorySize() * 1024;
+  }
+
+  aSize += Superclass::GetMemorySize();
+
+  return aSize;
+}
+
+
+//----------------------------------------------------------------------------
 void
 VISU_StreamLinesPL
 ::SetMapScale(vtkFloatingPointType theMapScale)

diff --git a/src/PIPELINE/VISU_StreamLinesPL.hxx b/src/PIPELINE/VISU_StreamLinesPL.hxx
index 67c6ab3f8ddc32cb92bdf158ea57f20dc833669a..5ea3455be77e8a6c6ccb429382c1553c7c7680fa 100644 (file)
--- a/src/PIPELINE/VISU_StreamLinesPL.hxx
+++ b/src/PIPELINE/VISU_StreamLinesPL.hxx
@@ -140,6 +140,11 @@ public:
   void
   Update();
 
+  //! Gets memory size used by the instance (bytes).
+  virtual
+  unsigned long int
+  GetMemorySize();
+
   virtual
   void
   SetMapScale(vtkFloatingPointType theMapScale = 1.0);

diff --git a/src/PIPELINE/VISU_VectorsPL.cxx b/src/PIPELINE/VISU_VectorsPL.cxx
index 2cc2880503f6c2164a10291f617883ff579c1af1..f6976ad33432648b506e0b1c609bd1cdea041637 100644 (file)
--- a/src/PIPELINE/VISU_VectorsPL.cxx
+++ b/src/PIPELINE/VISU_VectorsPL.cxx
@@ -249,6 +249,32 @@ VISU_VectorsPL
 }
 
 
+//----------------------------------------------------------------------------
+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;
+
+  if(myCellDataToPointData->GetInput()){
+    aDataSet = myCellDataToPointData->GetOutput();
+    aSize += aDataSet->GetActualMemorySize() * 1024;
+  }
+
+  aSize += Superclass::GetMemorySize();
+
+  return aSize;
+}
+
+
+//----------------------------------------------------------------------------
 void
 VISU_VectorsPL
 ::SetMapScale(vtkFloatingPointType theMapScale)

diff --git a/src/PIPELINE/VISU_VectorsPL.hxx b/src/PIPELINE/VISU_VectorsPL.hxx
index 8c3f4d78714de7a1286e8b99634750388f305136..38f8baaa379738f4d67963146fef77fdd17ba693 100644 (file)
--- a/src/PIPELINE/VISU_VectorsPL.hxx
+++ b/src/PIPELINE/VISU_VectorsPL.hxx
@@ -96,6 +96,11 @@ public:
   void
   Update();
 
+  //! Gets memory size used by the instance (bytes).
+  virtual
+  unsigned long int
+  GetMemorySize();
+
   vtkDataSet* 
   GetOutput();