Porting to VTK 6.

[modules/visu.git] / src / PIPELINE / VISU_GaussPointsPL.cxx

diff --git a/src/PIPELINE/VISU_GaussPointsPL.cxx b/src/PIPELINE/VISU_GaussPointsPL.cxx
index 0cd861ddb79531081a64acefff739f75d05db272..ef82008431b46324e4df138e8199113494455ca6 100644 (file)
--- a/src/PIPELINE/VISU_GaussPointsPL.cxx
+++ b/src/PIPELINE/VISU_GaussPointsPL.cxx
@@ -71,7 +71,7 @@ VISU_GaussPointsPL
   mySphereSource = vtkSphereSource::New();
   mySphereSource->SetThetaResolution( 8 );
   mySphereSource->SetPhiResolution( 8 );
-  myGlyph->SetSource( mySphereSource->GetOutput() );
+  myGlyph->SetSourceConnection( mySphereSource->GetOutputPort() );
 
   for(int i = 0; i < 3; i++)
     myPassFilter.push_back(vtkPassThroughFilter::New());
@@ -283,14 +283,15 @@ VISU_GaussPointsPL
 
   myMergeFilter->SetGaussPtsIDMapper(GetGaussPtsIDMapper());
   
-  myPassFilter[0]->SetInput(InsertCustomPL());
+  myPassFilter[0]->SetInputData(InsertCustomPL());
 
-  myPassFilter[1]->SetInput(myPassFilter[0]->GetOutput());
+  myPassFilter[1]->SetInputConnection(myPassFilter[0]->GetOutputPort());
 
   // Geometrical Sphere
-  myPassFilter[2]->SetInput(myPassFilter[1]->GetOutput());
+  myPassFilter[2]->SetInputConnection(myPassFilter[1]->GetOutputPort());
   
-  GetPointSpriteMapper()->SetInput( myPassFilter[2]->GetPolyDataOutput() );
+  //GetPointSpriteMapper()->SetInputConnection( myPassFilter[2]->GetPolyDataOutput() );
+  GetPointSpriteMapper()->SetInputConnection( myPassFilter[2]->GetOutputPort() ); // OUV_PORTING: to check
 
   // Update according the current state
   SetIsDeformed(GetIsDeformed());
@@ -306,10 +307,10 @@ VISU_GaussPointsPL
 {
   if(IsExternalGeometryUsed() || GetNumberOfGeometry() > 1 ){
     myMergeFilter->Update();
-    myPassFilter[0]->SetInput(myMergeFilter->GetOutput());
+    myPassFilter[0]->SetInputConnection(myMergeFilter->GetOutputPort());
   }
   else{
-    myPassFilter[0]->SetInput(GetFieldTransformFilter()->GetOutput());
+    myPassFilter[0]->SetInputConnection(GetFieldTransformFilter()->GetOutputPort());
   }
 
   SetAverageCellSize( VISU_DeformedShapePL::GetScaleFactor( GetParentMesh() ) );
@@ -410,11 +411,12 @@ void
 VISU_GaussPointsPL
 ::SetIsDeformed( bool theIsDeformed )
 {
-  if(theIsDeformed){
-    myWarpVector->SetInput( myPassFilter[0]->GetPolyDataOutput() );
-    myPassFilter[1]->SetInput(myWarpVector->GetOutput());
+  if(theIsDeformed){ 
+    //myWarpVector->SetInput( myPassFilter[0]->GetPolyDataOutput() );
+    myWarpVector->SetInputConnection( myPassFilter[0]->GetOutputPort() ); // OUV_PORTING: to check
+    myPassFilter[1]->SetInputConnection(myWarpVector->GetOutputPort());
   }else
-    myPassFilter[1]->SetInput(myPassFilter[0]->GetOutput());
+    myPassFilter[1]->SetInputConnection(myPassFilter[0]->GetOutputPort());
 }
 
 //----------------------------------------------------------------------------
@@ -468,11 +470,11 @@ VISU_GaussPointsPL
 {
   if( thePrimitiveType == VISU_OpenGLPointSpriteMapper::GeomSphere )
   {
-    myGlyph->SetInput( myPassFilter[1]->GetOutput() );
-    myPassFilter[2]->SetInput(myGlyph->GetOutput());
+    myGlyph->SetInputConnection( myPassFilter[1]->GetOutputPort() );
+    myPassFilter[2]->SetInputConnection(myGlyph->GetOutputPort());
   }
   else
-    myPassFilter[2]->SetInput(myPassFilter[1]->GetOutput());
+    myPassFilter[2]->SetInputConnection(myPassFilter[1]->GetOutputPort());
 
   GetPointSpriteMapper()->SetPrimitiveType( thePrimitiveType );
   
@@ -766,9 +768,7 @@ VISU_GaussPointsPL
 
   int aNbCompositeComponents = 4;
   aCompositeImageData->SetDimensions(aMainImageSize);
-  aCompositeImageData->SetScalarTypeToUnsignedChar();        
-  aCompositeImageData->SetNumberOfScalarComponents(aNbCompositeComponents);
-  aCompositeImageData->AllocateScalars();
+  aCompositeImageData->AllocateScalars( VTK_UNSIGNED_CHAR, aNbCompositeComponents );
 
   unsigned char* aMainDataPtr = (unsigned char*)aMainImageData->GetScalarPointer();
   unsigned char* anAlphaDataPtr = (unsigned char*)anAlphaImageData->GetScalarPointer();
@@ -792,7 +792,7 @@ VISU_GaussPointsPL
   }
   aMainReader->Delete();
   anAlphaReader->Delete();
-  aCompositeImageData->Update();
+  //aCompositeImageData->Update(); // OUV_PORTING
 
   return aCompositeImageData;
 }
@@ -837,7 +837,7 @@ VISU_GaussPointsPL
 {
   if(IsExternalGeometryUsed()){
     ClearGeometry();
-    myAppendFilter->AddInput(GetFieldTransformFilter()->GetOutput());
+    myAppendFilter->AddInputConnection(GetFieldTransformFilter()->GetOutputPort());
   }
 }
 
@@ -856,7 +856,7 @@ VISU_GaussPointsPL
   if(!IsExternalGeometryUsed())
     ClearGeometry();
   AddGeometryName(theGeomName);
-  myAppendFilter->AddInput(theGeometry);
+  myAppendFilter->AddInputData(theGeometry);
   return GetNumberOfGeometry();
 }