Issue #2811: Update content of Object node on creation moment

[modules/shaper.git] / src / GeomAlgoAPI / GeomAlgoAPI_Intersection.cpp

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Intersection.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Intersection.cpp
index b458cddf54ac7933792dbd85d7571b64beb6ad80..49b7fe423b9988aafb251eda3b613db08d53869d 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Intersection.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Intersection.cpp
@@ -21,33 +21,32 @@
 #include "GeomAlgoAPI_Intersection.h"
 
 #include <GeomAlgoAPI_DFLoader.h>
-#include <GeomAlgoAPI_ShapeTools.h>
 
-#include <BRepAlgoAPI_Section.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopoDS_Builder.hxx>
+#include <BOPAlgo_PaveFiller.hxx>
+#include <BOPAlgo_Section.hxx>
 
-//=================================================================================================
-GeomAlgoAPI_Intersection::GeomAlgoAPI_Intersection(const ListOfShape& theObjects,
-                                                   const ListOfShape& theTools)
+//==================================================================================================
+GeomAlgoAPI_Intersection::GeomAlgoAPI_Intersection(const ListOfShape& theObjects)
+  : myFiller(0)
 {
-  build(theObjects, theTools);
+  build(theObjects);
 }
 
-//=================================================================================================
-void GeomAlgoAPI_Intersection::build(const ListOfShape& theObjects,
-                                     const ListOfShape& theTools)
+GeomAlgoAPI_Intersection::~GeomAlgoAPI_Intersection() {
+  if (myFiller)
+    delete (BOPAlgo_PaveFiller*)myFiller;
+}
+//==================================================================================================
+void GeomAlgoAPI_Intersection::build(const ListOfShape& theObjects)
 {
-  if (theObjects.empty() || theTools.empty()) {
+  if (theObjects.empty()) {
     return;
   }
 
   // Creating partition operation.
-  BRepAlgoAPI_Section* anOperation = new BRepAlgoAPI_Section;
+  BOPAlgo_Section* anOperation = new BOPAlgo_Section;
   this->setImpl(anOperation);
-  this->setBuilderType(OCCT_BRepBuilderAPI_MakeShape);
-
-  TopAbs_ShapeEnum aShapeType = TopAbs_COMPOUND;
+  this->setBuilderType(OCCT_BOPAlgo_Builder);
 
   // Getting objects.
   TopTools_ListOfShape anObjects;
@@ -58,22 +57,32 @@ void GeomAlgoAPI_Intersection::build(const ListOfShape& theObjects,
       anObjects.Append(aShape);
     }
   }
-  anOperation->SetArguments(anObjects);
 
-  // Getting tools.
-  TopTools_ListOfShape aTools;
-  for (ListOfShape::const_iterator
-    aToolsIt = theTools.begin(); aToolsIt != theTools.end(); aToolsIt++) {
-    const TopoDS_Shape& aShape = (*aToolsIt)->impl<TopoDS_Shape>();
-    if(!aShape.IsNull()) {
-      aTools.Append(aShape);
-    }
+  BOPAlgo_PaveFiller* aDSFiller = new BOPAlgo_PaveFiller;
+  myFiller = aDSFiller;
+  aDSFiller->SetArguments(anObjects);
+
+  aDSFiller->SetRunParallel(false);
+  aDSFiller->SetNonDestructive(false);
+  aDSFiller->SetGlue(BOPAlgo_GlueOff);
+
+  // optimization for the issue #2399
+  BOPAlgo_SectionAttribute theSecAttr(Standard_True,
+                                      Standard_True,
+                                      Standard_True);
+  aDSFiller->SetSectionAttribute(theSecAttr);
+
+  aDSFiller->Perform();
+  if (aDSFiller->HasErrors()) {
+    return;
   }
-  anOperation->SetTools(aTools);
 
-  // Building and getting result.
-  anOperation->Build();
-  if(!anOperation->IsDone()) {
+  anOperation->SetArguments(anObjects);
+  anOperation->SetRunParallel(false);
+  anOperation->SetCheckInverted(true);
+
+  anOperation->PerformWithFiller(*aDSFiller); // it references a filler fields, so keep the filler
+  if(anOperation->HasErrors()) {
     return;
   }
   TopoDS_Shape aResult = anOperation->Shape();