From: apo Date: Thu, 29 Sep 2005 12:32:56 +0000 (+0000) Subject: To decrease memory usage X-Git-Tag: BR-D5-38-2003_D2005-12-10~109 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f814142e54106b6f0bb2c1ab8c13cc598295c34f;p=modules%2Fvisu.git To decrease memory usage --- diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx index cca667be..5a322872 100644 --- a/src/OBJECT/VISU_GaussPtsAct.cxx +++ b/src/OBJECT/VISU_GaussPtsAct.cxx @@ -220,11 +220,18 @@ VISU_GaussPtsAct //---------------------------------------------------------------------------- -VISU_OpenGLPointSpriteMapper* +vtkMapper* VISU_GaussPtsAct -::GetPSMapper() +::GetMapper() { - return myDeviceActor->GetPSMapper(); + return GetPSMapper(); +} + +float* +VISU_GaussPtsAct +::GetBounds() +{ + return myDeviceActor->GetBounds(); } vtkDataSet* @@ -234,11 +241,11 @@ VISU_GaussPtsAct return GetMapper()->GetInput(); } -vtkMapper* +VISU_OpenGLPointSpriteMapper* VISU_GaussPtsAct -::GetMapper() +::GetPSMapper() { - return GetPSMapper(); + return myDeviceActor->GetPSMapper(); } @@ -370,7 +377,7 @@ VISU_GaussPtsAct if(MYDEBUG) MESSAGE("VISU_GaussPtsAct::SetMapperInput - this = "<SetPipeLine(GetGaussPointsPL()); - vtkLODActor::SetMapper(GetMapper()); + //vtkLODActor::SetMapper(GetMapper()); } void @@ -1021,6 +1028,7 @@ VISU_GaussPtsAct2 if(VISU_GaussPointsPL* aPipeLine = CreatePipeLine(GetGaussPointsPL())){ myDeviceActor->SetPipeLine(aPipeLine); + myPipeLine = aPipeLine; } } @@ -1074,7 +1082,7 @@ VISU_GaussPtsAct2 myDeviceActor->SetVisibility(GetVisibility() && myWidget->IsEnabled()); break; case vtkCommand::EndInteractionEvent: - vtkLODActor::SetMapper(GetMapper()); + //vtkLODActor::SetMapper(GetMapper()); break; default: break; diff --git a/src/OBJECT/VISU_GaussPtsAct.h b/src/OBJECT/VISU_GaussPtsAct.h index 7839f05c..1abf7cfc 100644 --- a/src/OBJECT/VISU_GaussPtsAct.h +++ b/src/OBJECT/VISU_GaussPtsAct.h @@ -121,17 +121,21 @@ class VTKOCC_EXPORT VISU_GaussPtsAct : public VISU_ScalarMapAct ShallowCopyPL(VISU_PipeLine* thePipeLine); //---------------------------------------------------------------------------- - VISU_OpenGLPointSpriteMapper* - GetPSMapper(); - virtual vtkMapper* GetMapper(); + virtual + float* + GetBounds(); + virtual vtkDataSet* GetInput(); + VISU_OpenGLPointSpriteMapper* + GetPSMapper(); + //---------------------------------------------------------------------------- virtual void