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

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx
index 9017e5b..3daea34 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkBooleanOperationPolyDataFilter.cxx
@@ -4,10 +4,13 @@
 #include "bbcreaVtkBooleanOperationPolyDataFilter.h"
 #include "bbcreaVtkPackage.h"
 
-#include "vtkBooleanOperationPolyDataFilter.h"
+// #include "vtkBooleanOperationPolyDataFilter.h"
+#include "vtkPolyDataBooleanFilter.h"
+
 #include "vtkCleanPolyData.h"
 #include "vtkTriangleFilter.h"
 
+
 namespace bbcreaVtk
 {
 
@@ -57,67 +60,84 @@ printf("EED Warnning BooleanOperationPolyDataFilter::Process  Put this code at t
 		triangle1->Update();
 		triangle2->Update();
 
+        vtkPolyDataBooleanFilter *booleanOperation = vtkPolyDataBooleanFilter::New();
+        booleanOperation->SetInputData(0, triangle1->GetOutput() );
+        booleanOperation->SetInputData(1, triangle2->GetOutput() );
+        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->SetOperationToDifference();
+            booleanOperation->SetReorientDifferenceCells( bbGetInputReorientDifferenceCells() );
+        }
+ */
+        
 		booleanOperation->Update();
 		bbSetOutputOut( booleanOperation->GetOutput() );
 	} else {
 		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