From: apo <apo@opencascade.com>
Date: Tue, 16 Jan 2007 13:34:55 +0000 (+0000)
Subject: Fix regressions with Geometrical Spheres
X-Git-Tag: WP1_2_3_17-01-2007_Data_format_at_entry_of_visualization_pipeline~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4f722995f9660d73fc250025bc9092fcf9d92def;p=modules%2Fvisu.git

Fix regressions with Geometrical Spheres
---

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();
 }