X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkClosePolyData.cxx;h=9073c5df7dd4c7276acf740415ab48efb3ea46aa;hb=3f720c906477d6f466d04829ab0f76815fd7117c;hp=1ed82f0fca438d0aff166978bb4ba2ce1d85164e;hpb=ba3bf1e05af2b03d6b013606b9d885d8fb0b2cb4;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.cxx
index 1ed82f0..9073c5d 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClosePolyData.cxx
@@ -126,35 +126,15 @@ vtkClosePolyData::~vtkClosePolyData()
 	}
 
 #else
-/*
-	int vtkClosePolyData::ProcessRequest(	vtkInformation *request, 
-											vtkInformationVector **inputVector, 
-											vtkInformationVector *outputVector)
-	{
-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)
+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 );
@@ -163,43 +143,33 @@ 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;
 }
 
-
-
-
 #endif
 
 //----------------------------------------------------------------------------