From: apo <apo@opencascade.com>
Date: Wed, 29 Nov 2006 11:34:55 +0000 (+0000)
Subject: To improve memory size calculation
X-Git-Tag: WP1_2_3_05-12-2006_cache_system~33
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5a12d554f043b5e96a333c2b7d6dd055713f70d7;p=modules%2Fvisu.git

To improve memory size calculation
---

diff --git a/src/VISU_I/VISU_Prs3d_i.cc b/src/VISU_I/VISU_Prs3d_i.cc
index 1c84445e..1ee0f33d 100644
--- a/src/VISU_I/VISU_Prs3d_i.cc
+++ b/src/VISU_I/VISU_Prs3d_i.cc
@@ -602,15 +602,19 @@ VISU::Prs3d_i
 ::GetMemorySize()
 {
   static int INCMEMORY = 4;
-  vtkDataSet* aDataSet = GetPipeLine()->GetInput();
-  CORBA::Float aSize = aDataSet->GetActualMemorySize() * (INCMEMORY - 1);
+  vtkDataSet* aDataSet = GetPipeLine()->GetMapper()->GetInput();
+  CORBA::Float aSize = aDataSet->GetActualMemorySize() * INCMEMORY * 1024.0;
+  //cout<<"Prs3d_i::GetMemorySize - "<<this<<"; aDataSet = "<<aSize / (1024.0 * 1024.0)<<endl;
 
   int anEnd = myActorCollection->GetNumberOfItems();
   for(int anId = 0; anId < anEnd; anId++)
     if(vtkObject* anObject = myActorCollection->GetItemAsObject(anId))
-      if(VISU_Actor* anActor = dynamic_cast<VISU_Actor*>(anObject))
+      if(VISU_Actor* anActor = dynamic_cast<VISU_Actor*>(anObject)){
 	aSize += anActor->GetMemorySize();
-  
+	//cout<<"Prs3d_i::GetMemorySize - "<<this<<"; anActor = "<<anActor->GetMemorySize() / (1024.0 * 1024.0)<<endl;
+      }
+
+  //cout<<"Prs3d_i::GetMemorySize - "<<this<<"; aSize = "<<aSize / (1024.0 * 1024.0)<<endl;
   return aSize / (1024.0 * 1024.0);
 }