X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fsrc%2FbbcreaVtkBooleanOperationPolyDataFilter.cxx;h=f610d86ac5c7b249268a24a67a14d9acea0f8e44;hb=ece1f7458a2d249d0a77fc6bc383386f188ae47b;hp=9017e5bdcb66b9ef2683d8d05139f6fe920a18d1;hpb=b146797e0ad985788de697dcb3e6a48f4a2a488a;p=creaVtk.git

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx
index 9017e5b..f610d86 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx
@@ -4,9 +4,14 @@
 #include "bbcreaVtkBooleanOperationPolyDataFilter.h"
 #include "bbcreaVtkPackage.h"
 
-#include "vtkBooleanOperationPolyDataFilter.h"
+// #include "vtkBooleanOperationPolyDataFilter.h"
+#include "vtkPolyDataBooleanFilter.h"
+#include "vtkPoints.h"
+
 #include "vtkCleanPolyData.h"
 #include "vtkTriangleFilter.h"
+#include "vtkFillHolesFilter.h"
+
 
 namespace bbcreaVtk
 {
@@ -35,89 +40,118 @@ void BooleanOperationPolyDataFilter::Process()
   
 	if ((bbGetInputIn1()!=NULL)  && (bbGetInputIn2()!=NULL) )
 	{
+	//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();
 
-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();
+//        booleanOperation->SetInputData(0, triangle1->GetOutput() );
+//        booleanOperation->SetInputData(1, triangle2->GetOutput() );
 
+        booleanOperation->SetInputData(0, bbGetInputIn1() );
+        booleanOperation->SetInputData(1, bbGetInputIn2() );
+
+        if (bbGetInputOperation()==0 )
+        {
+            booleanOperation->SetOperModeToUnion();
+        }
+        if (bbGetInputOperation()==1 )
+        {
+            booleanOperation->SetOperModeToIntersection();
+        }
+        if (bbGetInputOperation()==2 )
+        {
+            booleanOperation->SetOperModeToDifference();
+        }
+
+/*
 		vtkBooleanOperationPolyDataFilter *booleanOperation = vtkBooleanOperationPolyDataFilter::New();
 		booleanOperation->SetInputData(0, triangle1->GetOutput() );
 		booleanOperation->SetInputData(1, triangle2->GetOutput() );
-
 		if (bbGetInputOperation()==0 )
 		{
 			booleanOperation->SetOperationToUnion();
 		}
 		if (bbGetInputOperation()==1 )
 		{
-			booleanOperation->SetOperationToIntersection();
+            booleanOperation->SetOperationToIntersection();
 		}
 		if (bbGetInputOperation()==2 )
 		{
-			booleanOperation->SetOperationToDifference();  
-		}
-		booleanOperation->Update();
-		bbSetOutputOut( booleanOperation->GetOutput() );
+            booleanOperation->SetOperationToDifference();
+            booleanOperation->SetReorientDifferenceCells( bbGetInputReorientDifferenceCells() );
+        }
+ */
+        
+        booleanOperation->Update();
+
+        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() );
+			
+			/*
+			*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
+        
 	} else {
+        bbSetOutputOut( NULL );
 		printf("EED Warnning!  BooleanOperationPolyDataFilter::Process   vtkPolyData In1 or In2  is EMPTY\n");
 	} // if In1 In2 != NULL
 }
+
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
 void BooleanOperationPolyDataFilter::bbUserSetDefaultValues()
 {
-
 //  SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX 
 //    Here we initialize the input 'In' to 0
    bbSetInputIn1(NULL);
    bbSetInputIn2(NULL);
    bbSetInputOperation(0);
-  
+   bbSetInputReorientDifferenceCells(true);
+   bbSetOutputOut(NULL);
 }
+
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
 void BooleanOperationPolyDataFilter::bbUserInitializeProcessing()
 {
-
 //  THE INITIALIZATION METHOD BODY :
 //    Here does nothing 
 //    but this is where you should allocate the internal/output pointers 
-//    if any 
-
-  
+//    if any
 }
+
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
 void BooleanOperationPolyDataFilter::bbUserFinalizeProcessing()
 {
-
 //  THE FINALIZATION METHOD BODY :
 //    Here does nothing 
 //    but this is where you should desallocate the internal/output pointers 
 //    if any
-  
 }
-}
-// EO namespace bbcreaVtk
+
+} // EO namespace bbcreaVtk