#3109 creaMaracasVisu Bug New Normal - branch vtk7itk4 compilation with vtk7

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / vtkClosePolyData.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.cxx
index 4b0aef797825d3695f89eb07c8d3e1b0885c1ae9..397295f78e440712ac7b19b98653a4b1e9337378 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.cxx
@@ -51,7 +51,14 @@
 #include "vtkAppendPolyData.h"
 #include "vtkCleanPolyData.h"
 
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 vtkCxxRevisionMacro(vtkClosePolyData, "$Revision: 1.3 $");
+#else
+  //...
+#endif
+
 vtkStandardNewMacro(vtkClosePolyData);
 
 //----------------------------------------------------------------------------
@@ -64,53 +71,67 @@ vtkClosePolyData::~vtkClosePolyData()
 {
 }
 
+
 //----------------------------------------------------------------------------
-// This method is much too long, and has to be broken up!
-// Furthermore we are loosing the normals !!!
-void vtkClosePolyData::Execute()
-{
-  vtkPolyData *input = this->GetInput();
-  vtkPolyData *output = this->GetOutput();
-  
-   //#closing the polydata see : close.py for details
-  vtkFeatureEdges *boundary = vtkFeatureEdges::New();
-  boundary->SetInput( input );
-  boundary->BoundaryEdgesOn ();
-  boundary->FeatureEdgesOff ();
-  boundary->NonManifoldEdgesOff ();
-  boundary->ManifoldEdgesOff ();
-  //boundary->ColoringOff ();
-
-  vtkStripper *stripper = vtkStripper::New();
-  stripper->SetInput( boundary->GetOutput() );
-  stripper->Update(); //important
-  boundary->Delete();
-
-  vtkPolyData *pd = vtkPolyData::New();
-  pd->SetPoints ( stripper->GetOutput()->GetPoints() );
-  pd->SetPolys  ( stripper->GetOutput()->GetLines() );
-  stripper->Delete();
-    
-  //vtkGLUTesselatorTriangleFilter *triangle = vtkGLUTesselatorTriangleFilter::New();
-  vtkTriangleFilter *triangle = vtkTriangleFilter::New();
-  triangle->SetInput( pd );
-  pd->Delete();
-    
-  vtkAppendPolyData *append = vtkAppendPolyData::New();
-  append->AddInput( input );
-  append->AddInput( triangle->GetOutput());
-  triangle->Delete();
-      
-  vtkCleanPolyData *clean = vtkCleanPolyData::New();
-  clean->SetInput( append->GetOutput());
-  append->Delete();
-    
-  // When all optimizations are complete, this squeeze will be unecessary.
-  // (But it does not seem to cost much.)
-  clean->Update();  //important before ShallowCopy
-  output->ShallowCopy( clean->GetOutput() );
-  clean->Delete();
-}
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+       // This method is much too long, and has to be broken up!
+       // Furthermore we are loosing the normals !!!
+       void vtkClosePolyData::Execute()
+       {
+         vtkPolyData *input = this->GetInput();
+         vtkPolyData *output = this->GetOutput();
+         
+          //#closing the polydata see : close.py for details
+         vtkFeatureEdges *boundary = vtkFeatureEdges::New();
+         boundary->SetInput( input );
+         boundary->BoundaryEdgesOn ();
+         boundary->FeatureEdgesOff ();
+         boundary->NonManifoldEdgesOff ();
+         boundary->ManifoldEdgesOff ();
+         //boundary->ColoringOff ();
+
+         vtkStripper *stripper = vtkStripper::New();
+         stripper->SetInput( boundary->GetOutput() );
+         stripper->Update(); //important
+         boundary->Delete();
+
+         vtkPolyData *pd = vtkPolyData::New();
+         pd->SetPoints ( stripper->GetOutput()->GetPoints() );
+         pd->SetPolys  ( stripper->GetOutput()->GetLines() );
+         stripper->Delete();
+           
+         //vtkGLUTesselatorTriangleFilter *triangle = vtkGLUTesselatorTriangleFilter::New();
+         vtkTriangleFilter *triangle = vtkTriangleFilter::New();
+         triangle->SetInput( pd );
+         pd->Delete();
+           
+         vtkAppendPolyData *append = vtkAppendPolyData::New();
+         append->AddInput( input );
+         append->AddInput( triangle->GetOutput());
+         triangle->Delete();
+             
+         vtkCleanPolyData *clean = vtkCleanPolyData::New();
+         clean->SetInput( append->GetOutput());
+         append->Delete();
+           
+         // When all optimizations are complete, this squeeze will be unecessary.
+         // (But it does not seem to cost much.)
+         clean->Update();  //important before ShallowCopy
+         output->ShallowCopy( clean->GetOutput() );
+         clean->Delete();
+       }
+
+#else
+       int vtkClosePolyData::ProcessRequest(   vtkInformation *request, 
+                                                                                       vtkInformationVector **inputVector, 
+                                                                                       vtkInformationVector *outputVector)
+       {
+printf("EED Warning ERROR ! vtkClosePolyData::ProcessRequest  not implemented  VTK7 migration")
+       }
+
+#endif
 
 //----------------------------------------------------------------------------
 void vtkClosePolyData::PrintSelf(ostream& os, vtkIndent indent)