From 4f722995f9660d73fc250025bc9092fcf9d92def Mon Sep 17 00:00:00 2001 From: apo Date: Tue, 16 Jan 2007 13:34:55 +0000 Subject: [PATCH] Fix regressions with Geometrical Spheres --- src/PIPELINE/VISU_GaussPointsPL.cxx | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/PIPELINE/VISU_GaussPointsPL.cxx b/src/PIPELINE/VISU_GaussPointsPL.cxx index 104fc333..343bedb2 100644 --- a/src/PIPELINE/VISU_GaussPointsPL.cxx +++ b/src/PIPELINE/VISU_GaussPointsPL.cxx @@ -302,11 +302,11 @@ VISU_GaussPointsPL vtkFloatingPointType aMaxRange = aMinRange + aScaleFactor; vtkFloatingPointType aRange[2] = {aMinRange, aMaxRange}; - if(!VISU::CheckIsSameRange(myGlyph->GetRange(), aRange)){ + if(!VISU::CheckIsSameRange(myGlyph->GetRange(), aRange)) myGlyph->SetRange( aRange ); - if(!VISU::CheckIsSameValue(myGlyph->GetScaleFactor(), 1.0)) - myGlyph->SetScaleFactor( 1.0 ); - } + + if(!VISU::CheckIsSameValue(myGlyph->GetScaleFactor(), 1.0)) + myGlyph->SetScaleFactor( 1.0 ); } else if( GetPointSpriteMapper()->GetPointSpriteMode() == 1 ) // Geometry { @@ -349,9 +349,6 @@ void VISU_GaussPointsPL ::SetIsDeformed( bool theIsDeformed ) { - if(GetIsDeformed() == theIsDeformed) - return; - if(theIsDeformed){ myWarpVector->SetInput( myPassFilter[0]->GetPolyDataOutput() ); myPassFilter[1]->SetInput(myWarpVector->GetOutput()); @@ -408,9 +405,6 @@ void VISU_GaussPointsPL ::SetPrimitiveType(int thePrimitiveType) { - if( GetPrimitiveType() == thePrimitiveType ) - return; - if( thePrimitiveType == VISU_OpenGLPointSpriteMapper::GeomSphere ) { myGlyph->SetInput( myPassFilter[1]->GetOutput() ); @@ -428,6 +422,9 @@ int VISU_GaussPointsPL ::GetPrimitiveType() { + if( myPassFilter[2]->GetInput() != myPassFilter[1]->GetOutput() ) + return VISU_OpenGLPointSpriteMapper::GeomSphere; + return GetPointSpriteMapper()->GetPrimitiveType(); } -- 2.39.2