Porting to VTK 6.

[modules/visu.git] / src / OBJECT / VISU_Actor.cxx

diff --git a/src/OBJECT/VISU_Actor.cxx b/src/OBJECT/VISU_Actor.cxx
index 884560cb756a01d2138de340cc34d7dec9a0d2ce..958d9bb50feeacc4da3c48daaea4f4c309b7b99f 100644 (file)
--- a/src/OBJECT/VISU_Actor.cxx
+++ b/src/OBJECT/VISU_Actor.cxx
@@ -139,7 +139,7 @@ VISU_Actor
   myShrinkFilter->SetStoreMapping(true);
 
   myAnnotationMapper->Delete();
-  myAnnotationActor->SetMapper(myAnnotationMapper.GetPointer());
+  myAnnotationActor->vtkActor2D::SetMapper(myAnnotationMapper.GetPointer()); // OUV_PORTING: to check
 
   myAnnotationActor->Delete();
   myAnnotationActor->SetVisibility(0);
@@ -164,17 +164,17 @@ VISU_Actor
   myValLblDataSet = vtkUnstructuredGrid::New();
 
   myValCellCenters = VTKViewer_CellCenters::New();
-  myValCellCenters->SetInput(myValLblDataSet);
+  myValCellCenters->SetInputData(myValLblDataSet);
 
   myValUsedPoints = VISU_UsedPointsFilter::New();
-  myValUsedPoints->SetInput(myValLblDataSet);
+  myValUsedPoints->SetInputData(myValLblDataSet);
 
   myValMaskPoints = vtkMaskPoints::New();
-  myValMaskPoints->SetInput(myValCellCenters->GetOutput());
+  myValMaskPoints->SetInputConnection(myValCellCenters->GetOutputPort());
   myValMaskPoints->SetOnRatio(1);
 
   myValSelectVisiblePoints = VISU_SelectVisiblePoints::New();
-  myValSelectVisiblePoints->SetInput(myValMaskPoints->GetOutput());
+  myValSelectVisiblePoints->SetInputConnection(myValMaskPoints->GetOutputPort());
   myValSelectVisiblePoints->SelectInvisibleOff();
   myValSelectVisiblePoints->SetTolerance(0.1);
 
@@ -188,7 +188,7 @@ VISU_Actor
   }
 
   myValLabeledDataMapper = vtkLabeledDataMapper::New();
-  myValLabeledDataMapper->SetInput(myValSelectVisiblePoints->GetOutput());
+  myValLabeledDataMapper->SetInputConnection(myValSelectVisiblePoints->GetOutputPort());
   //myValLabeledDataMapper->SetLabelFormat("%g");
   //myValLabeledDataMapper->SetLabelFormat("%.20g");
   myValLabeledDataMapper->SetLabelFormat(aFormat);
@@ -351,9 +351,9 @@ VISU_Actor
 {
   if(!myIsShrinkable)
     return;
-  if(vtkDataSet* aDataSet = myPassFilter[0]->GetOutput()){
-    myShrinkFilter->SetInput(aDataSet);
-    myPassFilter[1]->SetInput(myShrinkFilter->GetOutput());
+  if(vtkAlgorithmOutput* aDataSet = myPassFilter[0]->GetOutputPort()){
+    myShrinkFilter->SetInputConnection(aDataSet);
+    myPassFilter[1]->SetInputConnection(myShrinkFilter->GetOutputPort());
     myIsShrunk = true;
   }
 }
@@ -364,8 +364,8 @@ VISU_Actor
 {
   if(!myIsShrunk)
     return;
-  if(vtkDataSet* aDataSet = myPassFilter[0]->GetOutput()){
-    myPassFilter[1]->SetInput(aDataSet);
+  if(vtkAlgorithmOutput* aDataSet = myPassFilter[0]->GetOutputPort()){
+    myPassFilter[1]->SetInputConnection(aDataSet);
     myPassFilter[1]->Modified();
     myIsShrunk = false;
     Modified();
@@ -438,17 +438,18 @@ VISU_Actor
   if ( !myIsFeatureEdgesAllowed || myIsFeatureEdgesEnabled == theIsFeatureEdgesEnabled )
     return;
 
-  if ( vtkPolyData* aPolyData = myPassFilter[ 2 ]->GetPolyDataOutput() )
+  //if ( vtkPolyData* aPolyData = myPassFilter[ 2 ]->GetPolyDataOutput() )
+  if ( vtkAlgorithmOutput* aPolyData = myPassFilter[ 2 ]->GetOutputPort() ) // OUV_PORTING: to check
   {
     if( theIsFeatureEdgesEnabled )
     {
-      myFeatureEdges->SetInput( aPolyData );
-      myPassFilter[ 3 ]->SetInput( myFeatureEdges->GetOutput() );
+      myFeatureEdges->SetInputConnection( aPolyData );
+      myPassFilter[ 3 ]->SetInputConnection( myFeatureEdges->GetOutputPort() );
       myIsFeatureEdgesEnabled = true;
     }
     else
     {
-      myPassFilter[3]->SetInput( aPolyData );
+      myPassFilter[3]->SetInputConnection( aPolyData );
       myPassFilter[3]->Modified();
       myIsFeatureEdgesEnabled = false;
       Modified();
@@ -1279,13 +1280,13 @@ void VISU_Actor::SetValuesLabeled( const bool theIsValLabeled )
 
     if ( isOnCell )
     {
-      myValCellCenters->SetInput( aDataSet );
-      myValMaskPoints->SetInput( myValCellCenters->GetOutput() );
+      myValCellCenters->SetInputData( aDataSet );
+      myValMaskPoints->SetInputConnection( myValCellCenters->GetOutputPort() );
     }
     else if ( isOnPnt )
     {
-      myValUsedPoints->SetInput( aDataSet );
-      myValMaskPoints->SetInput( myValUsedPoints->GetOutput() );
+      myValUsedPoints->SetInputData( aDataSet );
+      myValMaskPoints->SetInputConnection( myValUsedPoints->GetOutputPort() );
     }
 
     myValLabels->SetVisibility( GetVisibility() );