#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 397295f78e440712ac7b19b98653a4b1e9337378..1ed82f0fca438d0aff166978bb4ba2ce1d85164e 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.cxx
@@ -42,7 +42,6 @@
 =========================================================================*/
 #include "vtkClosePolyData.h"
 
-#include "vtkObjectFactory.h"
 #include "vtkPolyData.h"
 #include "vtkFeatureEdges.h"
 #include "vtkStripper.h"
@@ -54,9 +53,12 @@
 
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
-vtkCxxRevisionMacro(vtkClosePolyData, "$Revision: 1.3 $");
+  vtkCxxRevisionMacro(vtkClosePolyData, "$Revision: 1.3 $");
 #else
-  //...
+  #include "vtkDataObject.h"
+  #include "vtkInformation.h"
+  #include "vtkDemandDrivenPipeline.h"
+  #include "vtkInformationVector.h"
 #endif
 
 vtkStandardNewMacro(vtkClosePolyData);
@@ -111,7 +113,7 @@ vtkClosePolyData::~vtkClosePolyData()
          append->AddInput( input );
          append->AddInput( triangle->GetOutput());
          triangle->Delete();
-             
+             vtkInformation
          vtkCleanPolyData *clean = vtkCleanPolyData::New();
          clean->SetInput( append->GetOutput());
          append->Delete();
@@ -124,12 +126,79 @@ vtkClosePolyData::~vtkClosePolyData()
        }
 
 #else
+/*
        int vtkClosePolyData::ProcessRequest(   vtkInformation *request, 
                                                                                        vtkInformationVector **inputVector, 
                                                                                        vtkInformationVector *outputVector)
        {
-printf("EED Warning ERROR ! vtkClosePolyData::ProcessRequest  not implemented  VTK7 migration")
+printf("EED Warning ERROR ! vtkClosePolyData::ProcessRequest  not implemented  VTK7 migration");
+               // generate the data
+               if(request->Has(vtkDemandDrivenPipeline::REQUEST_INFORMATION()))
+               {
+                       // specify that the output (only one for this filter) will be double
+                       vtkInformation* outInfo = outputVector->GetInformationObject(0);
+                       outInfo->Set(vtkDataObject::SCALAR_TYPE(),VTK_DOUBLE);
+                       return 1;
+               }
+               return this->Superclass::ProcessRequest(request,inputVector,outputVector);
        }
+*/
+
+int vtkClosePolyData::RequestData(  vtkInformation *vtkNotUsed(request),  vtkInformationVector **inputVector,  vtkInformationVector *outputVector)
+{
+
+       // get the info objects
+       vtkInformation *inInfo = inputVector[0]->GetInformationObject(0);
+       vtkInformation *outInfo = outputVector->GetInformationObject(0);
+
+       // get the input and output
+       vtkPolyData *input = vtkPolyData::SafeDownCast(    inInfo->Get(vtkDataObject::DATA_OBJECT()));
+       vtkPolyData *output = vtkPolyData::SafeDownCast(    outInfo->Get(vtkDataObject::DATA_OBJECT()));
+
+       //#closing the polydata see : close.py for details
+       vtkFeatureEdges *boundary = vtkFeatureEdges::New();
+       boundary->SetInputData( input );
+       boundary->BoundaryEdgesOn ();
+       boundary->FeatureEdgesOff ();
+       boundary->NonManifoldEdgesOff ();
+       boundary->ManifoldEdgesOff ();
+       //boundary->ColoringOff ();
+
+       vtkStripper *stripper = vtkStripper::New();
+       stripper->SetInputData( 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->SetInputData( pd );
+       pd->Delete();
+
+       vtkAppendPolyData *append = vtkAppendPolyData::New();
+       append->AddInputData( input );
+       append->AddInputData( triangle->GetOutput());
+       triangle->Delete();
+
+       vtkCleanPolyData *clean = vtkCleanPolyData::New();
+       clean->SetInputData( 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();
+
+       return 1;
+}
+
+
+
 
 #endif