X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fsrc%2FbbcreaVtkBooleanOperationPolyDataFilter.cxx;h=f610d86ac5c7b249268a24a67a14d9acea0f8e44;hb=11f8c0afac719608c751486ff9a5bedf960192ed;hp=564f379457259f14e0509e726a0d9f01d4a8155c;hpb=797e2ddbfbbf4794b08653db4e8ba0b63e077b33;p=creaVtk.git

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx
index 564f379..f610d86 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx
@@ -38,45 +38,21 @@ void BooleanOperationPolyDataFilter::Process()
 //    bbSetOutputOut( bbGetInputIn() );
 //    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
   
-    printf("EED  BooleanOperationPolyDataFilter::Process Start In1=%p     In2=%p\n", bbGetInputIn1(), bbGetInputIn2() );
-
-    
-
 	if ((bbGetInputIn1()!=NULL)  && (bbGetInputIn2()!=NULL) )
 	{
-        
-printf("EED Warnning BooleanOperationPolyDataFilter::Process  Put this code at the end of CreateMesh.. or create 2 new boxes\n");
-printf("EED Warnning BooleanOperationPolyDataFilter::Process  Put this code at the end of CreateMesh.. or create 2 new boxes\n");
-printf("EED Warnning BooleanOperationPolyDataFilter::Process  Put this code at the end of CreateMesh.. or create 2 new boxes\n");
-printf("EED Warnning BooleanOperationPolyDataFilter::Process  Put this code at the end of CreateMesh.. or create 2 new boxes\n");
-printf("EED Warnning BooleanOperationPolyDataFilter::Process  Put this code at the end of CreateMesh.. or create 2 new boxes\n");
-printf("EED Warnning BooleanOperationPolyDataFilter::Process  Put this code at the end of CreateMesh.. or create 2 new boxes\n");
-printf("EED Warnning BooleanOperationPolyDataFilter::Process  Put this code at the end of CreateMesh.. or create 2 new boxes\n");
-printf("EED Warnning BooleanOperationPolyDataFilter::Process  Put this code at the end of CreateMesh.. or create 2 new boxes\n");
-    
-        vtkCleanPolyData *clean1 = vtkCleanPolyData::New();
-		vtkCleanPolyData *clean2 = vtkCleanPolyData::New();
-		clean1->SetInputData( bbGetInputIn1() );
-		clean2->SetInputData( bbGetInputIn2() );
-		clean1->Update();
-		clean2->Update();
-		vtkTriangleFilter *triangle1 = vtkTriangleFilter::New();
-		vtkTriangleFilter *triangle2 = vtkTriangleFilter::New();
-		triangle1->SetInputData( clean1->GetOutput() );
-		triangle2->SetInputData( clean2->GetOutput() );
-		triangle1->Update();
-		triangle2->Update();
+	//TRIANGLE FILTER NOT NEEDED, this can handle non triangle meshes.
+	
 
 //  vtkPolyDataBooleanFilter  is not a vtk filter   (this one yes: vtkBooleanOperationPolyDataFilter )
 //   https://github.com/zippy84/vtkbool
         //  vtkPolyDataBooleanFilter is a local code creaVtk lib
         vtkPolyDataBooleanFilter *booleanOperation = vtkPolyDataBooleanFilter::New();
 
-        booleanOperation->SetInputData(0, triangle1->GetOutput() );
-        booleanOperation->SetInputData(1, triangle2->GetOutput() );
+//        booleanOperation->SetInputData(0, triangle1->GetOutput() );
+//        booleanOperation->SetInputData(1, triangle2->GetOutput() );
 
-//        booleanOperation->SetInputData(0, bbGetInputIn1() );
-//        booleanOperation->SetInputData(1, bbGetInputIn2() );
+        booleanOperation->SetInputData(0, bbGetInputIn1() );
+        booleanOperation->SetInputData(1, bbGetInputIn2() );
 
         if (bbGetInputOperation()==0 )
         {
@@ -115,12 +91,21 @@ printf("EED Warnning BooleanOperationPolyDataFilter::Process  Put this code at t
         vtkPoints *points = booleanOperation->GetOutput()->GetPoints();
         if (points!=NULL)
         {
-            vtkFillHolesFilter *fillHolesFilter = vtkFillHolesFilter::New();
-            fillHolesFilter->SetInputData( booleanOperation->GetOutput() );
-            fillHolesFilter->SetHoleSize(100000.0);
-            fillHolesFilter->Update();
-            bbSetOutputOut( fillHolesFilter->GetOutput() );
-//          bbSetOutputOut( booleanOperation->GetOutput() );
+//            vtkFillHolesFilter *fillHolesFilter = vtkFillHolesFilter::New();
+//            fillHolesFilter->SetInputData( booleanOperation->GetOutput() );
+//            fillHolesFilter->SetHoleSize(100000.0);
+//            fillHolesFilter->Update();
+//            bbSetOutputOut( fillHolesFilter->GetOutput() );
+			
+			/*
+			*Added boxes(triangleFilter and CleanPolyData) to handle this outside the box
+			*
+			vtkTriangleFilter *triangleEnd = vtkTriangleFilter::New();
+			vtkCleanPolyData *cleanEnd = vtkCleanPolyData::New();
+			bbSetOutputOut( cleanEnd->GetOutput() );
+			*/
+			
+            bbSetOutputOut( booleanOperation->GetOutput() );
         } else {
             bbSetOutputOut( NULL );
         } // if points!=NULL