]> Creatis software - creaMaracasVisu.git/commitdiff
#3109 creaMaracasVisu Bug New Normal - branch vtk7itk4 compilation with vtk7
authorEduardo DAVILA <davila@localhost.localdomain>
Wed, 6 Sep 2017 09:37:12 +0000 (11:37 +0200)
committerEduardo DAVILA <davila@localhost.localdomain>
Wed, 6 Sep 2017 09:37:12 +0000 (11:37 +0200)
lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.cxx

index 3ef680a78b55906f4f360abb179e7be922bbb78e..9073c5df7dd4c7276acf740415ab48efb3ea46aa 100644 (file)
@@ -127,17 +127,14 @@ vtkClosePolyData::~vtkClosePolyData()
 
 #else
 
-int vtkClosePolyData::RequestData(  vtkInformation *vtkNotUsed(request),  vtkInformationVector **inputVector,  vtkInformationVector *outputVector)
+int vtkClosePolyData::RequestData( vtkInformation *vtkNotUsed(request), vtkInformationVector **inputVector, vtkInformationVector *outputVector)
 {
-
        // get the info objects
-       vtkInformation *inInfo = inputVector[0]->GetInformationObject(0);
+       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()));
-
+       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 );
@@ -146,37 +143,30 @@ int vtkClosePolyData::RequestData(  vtkInformation *vtkNotUsed(request),  vtkInf
        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() );
+       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());
+       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;
 }