Merge from BR_new_bop4 (porting to new OCCT BOP) 13/09/2013

[modules/geom.git] / src / GEOMAlgo / GEOMAlgo_SolidSolid.cxx

diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx
index 3082261dd82c2ee2d329397245345bf7dc7c3624..49eab63ec4802916b387a006982f8ab5765ed135 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx
@@ -37,8 +37,6 @@
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <BooleanOperations_ShapesDataStructure.hxx>
-#include <BOPTools_DSFiller.hxx>
 
 #include <GEOMAlgo_IndexedDataMapOfShapeState.hxx>
 
@@ -86,19 +84,11 @@ void GEOMAlgo_SolidSolid::Perform()
       myErrorStatus=10;
       return;
     }
-    if(!myDSFiller->IsDone()) {
+    if(myDSFiller->ErrorStatus()) {
       myErrorStatus=11;
       return;
     }
     //
-    Standard_Boolean bIsNewFiller;
-    //
-    bIsNewFiller=myDSFiller->IsNewFiller();
-    if (bIsNewFiller) {
-      Prepare();
-      myDSFiller->SetNewFiller(!bIsNewFiller);
-    }
-    //
     myRank=2;
     BuildResult();
   }
@@ -122,7 +112,7 @@ void GEOMAlgo_SolidSolid::BuildResult()
   GEOMAlgo_IndexedDataMapOfShapeState aMFS;
   //
   // 1. classify the faces
-  GEOMAlgo_ShellSolid::BuildResult();
+  GEOMAlgo_ShellSolid::Perform();
   //
   // 2. fill Shape-State map
   aIt.Initialize(myLSIN);
@@ -140,6 +130,7 @@ void GEOMAlgo_SolidSolid::BuildResult()
     const TopoDS_Shape& aF=aIt.Value();
     aMFS.Add(aF, TopAbs_ON);
   }
+  //
   myLSIN.Clear();
   myLSON.Clear();
   myLSOUT.Clear();