Salome HOME
Merge V8_4_BR branch.
[modules/geom.git] / src / GEOMImpl / GEOMImpl_BooleanDriver.cxx
index 78d277f2a823f44c2c7b4745a3ac4c2f0f123d99..abfc738eaa38435dfec6a0ef047022f51eaf918d 100644 (file)
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GEOMImpl_BooleanDriver.hxx>
 #include <GEOMImpl_IBoolean.hxx>
 #include <GEOMImpl_GlueDriver.hxx>
 #include <GEOM_Function.hxx>
 #include <GEOMUtils.hxx>
+#include <BlockFix_BlockFixAPI.hxx>
+#include <ShHealOper_ShapeProcess.hxx>
 
 #include <TNaming_CopyShape.hxx>
 
-#include <ShapeFix_ShapeTolerance.hxx>
-#include <ShapeFix_Shape.hxx>
-
 #include <BRep_Builder.hxx>
-#include <BRepAlgo.hxx>
 #include <BRepAlgoAPI_Common.hxx>
 #include <BRepAlgoAPI_Cut.hxx>
 #include <BRepAlgoAPI_Fuse.hxx>
 #include <BRepAlgoAPI_Section.hxx>
-#include <BRepCheck_Analyzer.hxx>
+#include <BOPAlgo_CheckerSI.hxx>
+#include <BOPDS_DS.hxx>
+#include <BOPTools_AlgoTools.hxx>
 
 #include <TopExp_Explorer.hxx>
-#include <TopoDS_Shape.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <StdFail_NotDone.hxx>
 
+// Depth of self-intersection check (see BOPAlgo_CheckerSI::SetLevelOfCheck() for more details)
+// Default value for BOPAlgo_CheckerSI gives very long computation when checking face-to-face intersections;
+// here check level is decreased to more appropriate value to avoid problems with performance).
+#define BOP_SELF_INTERSECTIONS_LEVEL 4
+
+/**
+ * This function performs extra edges removal.
+ *
+ * \param theShape the shape to be processed.
+ * \return the modified shape or null shape in case of failure.
+ */
+static TopoDS_Shape RemoveExtraEdges(const TopoDS_Shape &theShape)
+{
+  TopoDS_Shape aResult;
+
+  if (!theShape.IsNull()) {
+    BlockFix_BlockFixAPI aTool;
+
+    aTool.OptimumNbFaces() = 0;
+    aTool.SetShape(theShape);
+    aTool.Perform();
+    TopoDS_Shape aShape = aTool.Shape();
+
+    if (GEOMUtils::CheckShape(aShape)) {
+      aResult = aShape;
+    }
+    else {
+      TopoDS_Shape aFixed;
+      ShHealOper_ShapeProcess aHealer;
+      aHealer.Perform(aShape, aFixed);
+      if (aHealer.isDone() && GEOMUtils::CheckShape(aFixed))
+        aResult = aFixed;
+    }
+  }
+
+  return aResult;
+}
+
 //=======================================================================
 //function : GetID
 //purpose  :
@@ -76,134 +114,323 @@ GEOMImpl_BooleanDriver::GEOMImpl_BooleanDriver()
 //function : Execute
 //purpose  :
 //=======================================================================
-Standard_Integer GEOMImpl_BooleanDriver::Execute (TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_BooleanDriver::Execute(Handle(TFunction_Logbook)& log) const
 {
   if (Label().IsNull()) return 0;
   Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
 
   GEOMImpl_IBoolean aCI (aFunction);
   Standard_Integer aType = aFunction->GetType();
+  const Standard_Boolean isCheckSelfInte = aCI.GetCheckSelfIntersection();
+  const Standard_Boolean isRmExtraEdges  = aCI.GetRmExtraEdges();
 
   TopoDS_Shape aShape;
 
-  Handle(GEOM_Function) aRefShape1 = aCI.GetShape1();
-  Handle(GEOM_Function) aRefShape2 = aCI.GetShape2();
-  TopoDS_Shape aShape1 = aRefShape1->GetValue();
-  TopoDS_Shape aShape2 = aRefShape2->GetValue();
-
-  if (!aShape1.IsNull() && !aShape2.IsNull()) {
-    // check arguments for Mantis issue 0021019
-    BRepCheck_Analyzer ana (aShape1, Standard_True);
-    if (!ana.IsValid())
-      StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
-    ana.Init(aShape2);
-    if (!ana.IsValid())
-      StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
-
-    // perform COMMON operation
-    if (aType == BOOLEAN_COMMON) {
-      BRep_Builder B;
-      TopoDS_Compound C;
-      B.MakeCompound(C);
-
-      TopTools_ListOfShape listShape1, listShape2;
-      GEOMUtils::AddSimpleShapes(aShape1, listShape1);
-      GEOMUtils::AddSimpleShapes(aShape2, listShape2);
-
-      Standard_Boolean isCompound =
-        (listShape1.Extent() > 1 || listShape2.Extent() > 1);
-
-      TopTools_ListIteratorOfListOfShape itSub1 (listShape1);
-      for (; itSub1.More(); itSub1.Next()) {
-        TopoDS_Shape aValue1 = itSub1.Value();
-        TopTools_ListIteratorOfListOfShape itSub2 (listShape2);
-        for (; itSub2.More(); itSub2.Next()) {
-          TopoDS_Shape aValue2 = itSub2.Value();
-          BRepAlgoAPI_Common BO (aValue1, aValue2);
-          if (!BO.IsDone()) {
-            StdFail_NotDone::Raise("Common operation can not be performed on the given shapes");
+  switch (aType) {
+  case BOOLEAN_COMMON:
+  case BOOLEAN_CUT:
+  case BOOLEAN_FUSE:
+  case BOOLEAN_SECTION:
+    {
+      Handle(GEOM_Function) aRefShape1 = aCI.GetShape1();
+      Handle(GEOM_Function) aRefShape2 = aCI.GetShape2();
+      TopoDS_Shape aShape1 = aRefShape1->GetValue();
+      TopoDS_Shape aShape2 = aRefShape2->GetValue();
+
+      if (!aShape1.IsNull() && !aShape2.IsNull()) {
+        // check arguments for Mantis issue 0021019
+        if (!GEOMUtils::CheckShape(aShape1, true) || !GEOMUtils::CheckShape(aShape2, true))
+          StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
+
+        if (isCheckSelfInte) {
+          BOPAlgo_CheckerSI aCSI;  // checker of self-interferences
+          aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL);
+          BOPCol_ListOfShape aList1, aList2;
+          aList1.Append(aShape1);
+          aList2.Append(aShape2);
+          aCSI.SetArguments(aList1);
+          aCSI.Perform();
+          if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0)
+            StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
+          aCSI.SetArguments(aList2);
+          aCSI.Perform();
+          if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0)
+            StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
+        }
+
+        // Make a copy to prevent the original shape changes.
+        TopoDS_Shape aShapeCopy1;
+        TopoDS_Shape aShapeCopy2;
+        TColStd_IndexedDataMapOfTransientTransient aMapTShapes;
+        TNaming_CopyShape::CopyTool(aShape1, aMapTShapes, aShapeCopy1);
+        TNaming_CopyShape::CopyTool(aShape2, aMapTShapes, aShapeCopy2);
+
+        aShape = performOperation (aShapeCopy1, aShapeCopy2, aType);
+
+        if (isRmExtraEdges) {
+          aShape = RemoveExtraEdges(aShape);
+        }
+
+        if (aShape.IsNull()) {
+          return 0;
+        }
+      }
+    }
+    break;
+  case BOOLEAN_COMMON_LIST:
+  case BOOLEAN_FUSE_LIST:
+    {
+      Handle(TColStd_HSequenceOfTransient) aShapes = aCI.GetShapes();
+      const Standard_Integer nbShapes = aShapes->Length();
+      Standard_Integer i;
+      Handle(GEOM_Function) aRefShape;
+      TopoDS_Shape aShape2;
+      Standard_Integer aSimpleType =
+        (aType == BOOLEAN_FUSE_LIST ? BOOLEAN_FUSE : BOOLEAN_COMMON);
+
+      if (nbShapes > 0) {
+        aRefShape = Handle(GEOM_Function)::DownCast(aShapes->Value(1));
+        aShape = aRefShape->GetValue();
+
+        if (!aShape.IsNull()) {
+          // check arguments for Mantis issue 0021019
+          if (!GEOMUtils::CheckShape(aShape, true))
+            StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
+
+          BOPAlgo_CheckerSI aCSI;  // checker of self-interferences
+
+          if (isCheckSelfInte) {
+            aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL);
+            BOPCol_ListOfShape aList1;
+            aList1.Append(aShape);
+            aCSI.SetArguments(aList1);
+            aCSI.Perform();
+            if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
+              StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
+            }
           }
-          if (isCompound) {
-            TopoDS_Shape aStepResult = BO.Shape();
-
-            // check result of this step: if it is a compound (boolean operations
-            // allways return a compound), we add all sub-shapes of it.
-            // This allows to avoid adding empty compounds,
-            // resulting from COMMON on two non-intersecting shapes.
-            if (aStepResult.ShapeType() == TopAbs_COMPOUND) {
-              TopoDS_Iterator aCompIter (aStepResult);
-              for (; aCompIter.More(); aCompIter.Next()) {
-                // add shape in a result
-                B.Add(C, aCompIter.Value());
+
+          // Copy shape
+          TopoDS_Shape aShapeCopy;
+          TColStd_IndexedDataMapOfTransientTransient aMapTShapes;
+
+          TNaming_CopyShape::CopyTool(aShape, aMapTShapes, aShapeCopy);
+          aShape = aShapeCopy;
+
+          for (i = 2; i <= nbShapes; i++) {
+            aRefShape = Handle(GEOM_Function)::DownCast(aShapes->Value(i));
+            aShape2 = aRefShape->GetValue();
+
+            if (!GEOMUtils::CheckShape(aShape2, true))
+              StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
+
+            if (isCheckSelfInte) {
+              BOPCol_ListOfShape aList2;
+              aList2.Append(aShape2);
+              aCSI.SetArguments(aList2);
+              aCSI.Perform();
+             if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
+                StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
               }
             }
-            else {
-              // add shape in a result
-              B.Add(C, aStepResult);
+
+            // Copy shape
+            aShapeCopy.Nullify();
+            TNaming_CopyShape::CopyTool(aShape2, aMapTShapes, aShapeCopy);
+            aShape = performOperation (aShape, aShapeCopy, aSimpleType);
+
+            if (isRmExtraEdges) {
+              aShape = RemoveExtraEdges(aShape);
+            }
+
+            if (aShape.IsNull()) {
+              return 0;
             }
           }
-          else
-            aShape = BO.Shape();
         }
       }
-
-      if (isCompound) {
-        /*
-        TopTools_ListOfShape listShapeC;
-        GEOMUtils::AddSimpleShapes(C, listShapeC);
-        TopTools_ListIteratorOfListOfShape itSubC (listShapeC);
-        bool isOnlySolids = true;
-        for (; itSubC.More(); itSubC.Next()) {
-          TopoDS_Shape aValueC = itSubC.Value();
-          if (aValueC.ShapeType() != TopAbs_SOLID) isOnlySolids = false;
+    }
+    break;
+  case BOOLEAN_CUT_LIST:
+    {
+      Handle(GEOM_Function) aRefObject = aCI.GetShape1();
+
+      aShape = aRefObject->GetValue();
+
+      if (!aShape.IsNull()) {
+        // check arguments for Mantis issue 0021019
+        if (!GEOMUtils::CheckShape(aShape, true))
+          StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
+
+        BOPAlgo_CheckerSI aCSI;  // checker of self-interferences
+
+        if (isCheckSelfInte) {
+          aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL);
+          BOPCol_ListOfShape aList1;
+          aList1.Append(aShape);
+          aCSI.SetArguments(aList1);
+          aCSI.Perform();
+         if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
+            StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
+          }
         }
-        if (isOnlySolids)
-          aShape = GEOMImpl_GlueDriver::GlueFaces(C, Precision::Confusion());
-        else
-          aShape = C;
-        */
 
-        // As GlueFaces has been improved to keep all kind of shapes
-        TopExp_Explorer anExp (C, TopAbs_VERTEX);
-        if (anExp.More())
-          aShape = GEOMImpl_GlueDriver::GlueFaces(C, Precision::Confusion(), Standard_True);
-        else
-          aShape = C;
+        // Copy shape
+        TopoDS_Shape aShapeCopy;
+        TColStd_IndexedDataMapOfTransientTransient aMapTShapes;
+
+        TNaming_CopyShape::CopyTool(aShape, aMapTShapes, aShapeCopy);
+        aShape = aShapeCopy;
+
+        Handle(TColStd_HSequenceOfTransient) aTools = aCI.GetShapes();
+        const Standard_Integer nbShapes = aTools->Length();
+        Standard_Integer i;
+        Handle(GEOM_Function) aRefTool;
+        TopoDS_Shape aTool;
+
+        for (i = 1; i <= nbShapes; i++) {
+          aRefTool = Handle(GEOM_Function)::DownCast(aTools->Value(i));
+          aTool = aRefTool->GetValue();
+
+          if (!GEOMUtils::CheckShape(aTool, true))
+            StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
+
+          if (isCheckSelfInte) {
+            BOPCol_ListOfShape aList2;
+            aList2.Append(aTool);
+            aCSI.SetArguments(aList2);
+            aCSI.Perform();
+           if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
+              StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
+            }
+          }
+
+          // Copy shape
+          aShapeCopy.Nullify();
+          TNaming_CopyShape::CopyTool(aTool, aMapTShapes, aShapeCopy);
+          aShape = performOperation (aShape, aShapeCopy, BOOLEAN_CUT);
+
+          if (aShape.IsNull()) {
+            return 0;
+          }
+        }
       }
     }
+    break;
+  default:
+    break;
+  }
 
-    // perform CUT operation
-    else if (aType == BOOLEAN_CUT) {
-      BRep_Builder B;
-      TopoDS_Compound C;
-      B.MakeCompound(C);
-
-      TopTools_ListOfShape listShapes, listTools;
-      GEOMUtils::AddSimpleShapes(aShape1, listShapes);
-      GEOMUtils::AddSimpleShapes(aShape2, listTools);
-
-      Standard_Boolean isCompound = (listShapes.Extent() > 1);
-
-      TopTools_ListIteratorOfListOfShape itSub1 (listShapes);
-      for (; itSub1.More(); itSub1.Next()) {
-        TopoDS_Shape aCut = itSub1.Value();
-        // tools
-        TopTools_ListIteratorOfListOfShape itSub2 (listTools);
-        for (; itSub2.More(); itSub2.Next()) {
-          TopoDS_Shape aTool = itSub2.Value();
-          BRepAlgoAPI_Cut BO (aCut, aTool);
-          if (!BO.IsDone()) {
-            StdFail_NotDone::Raise("Cut operation can not be performed on the given shapes");
-          }
-          aCut = BO.Shape();
+  aFunction->SetValue(aShape);
+
+  log->SetTouched(Label());
+
+  return 1;
+}
+
+//=======================================================================
+//function : makeCompoundShellFromFaces
+//purpose  :
+//=======================================================================
+TopoDS_Shape GEOMImpl_BooleanDriver::makeCompoundShellFromFaces
+                               (const TopoDS_Shape theShape)const
+{
+  if (theShape.ShapeType() != TopAbs_COMPOUND)
+    return theShape;
+
+  BRep_Builder B;
+  TopoDS_Compound aFaces;
+  B.MakeCompound(aFaces);
+
+  // simplify compound structure for
+  // Mantis issue 0023419 (note 0021712)
+  TopExp_Explorer aExp;
+  TopTools_MapOfShape aMapFaces;
+  aExp.Init(theShape, TopAbs_FACE);
+  for (; aExp.More(); aExp.Next()) {
+    const TopoDS_Shape& aFace = aExp.Current();
+    if (aMapFaces.Add(aFace)) {
+      B.Add(aFaces, aFace);
+    }
+  }
+
+  BOPCol_ListOfShape aListShapes;
+  BOPTools_AlgoTools::MakeConnexityBlocks(aFaces, TopAbs_EDGE, TopAbs_FACE, aListShapes);
+
+  if (aListShapes.IsEmpty())
+    return theShape;
+
+  TopoDS_Compound aResult;
+  B.MakeCompound(aResult);
+  BOPCol_ListIteratorOfListOfShape anIter(aListShapes);
+
+  for (; anIter.More(); anIter.Next()) {
+    TopoDS_Shell aShell;
+    B.MakeShell(aShell);
+    TopoDS_Shape aShapeFromFaces = anIter.Value();
+    aExp.Init(aShapeFromFaces, TopAbs_FACE);
+    for (; aExp.More(); aExp.Next()) {
+      const TopoDS_Shape& aFace = aExp.Current();
+      B.Add(aShell, aFace);
+    }
+    if (!aShell.IsNull()) {
+      BOPTools_AlgoTools::OrientFacesOnShell(aShell);
+      B.Add(aResult, aShell);
+    }
+    else
+      B.Add(aResult, aShapeFromFaces);
+  }
+
+  return aResult;
+}
+
+//=======================================================================
+//function : performOperation
+//purpose  :
+//=======================================================================
+TopoDS_Shape GEOMImpl_BooleanDriver::performOperation
+                               (const TopoDS_Shape theShape1,
+                                const TopoDS_Shape theShape2,
+                                const Standard_Integer theType)const
+{
+  TopoDS_Shape aShape;
+
+  // perform COMMON operation
+  if (theType == BOOLEAN_COMMON) {
+    BRep_Builder B;
+    TopoDS_Compound C;
+    B.MakeCompound(C);
+
+    TopTools_ListOfShape listShape1, listShape2;
+    GEOMUtils::AddSimpleShapes(theShape1, listShape1);
+    GEOMUtils::AddSimpleShapes(theShape2, listShape2);
+
+    Standard_Boolean isCompound =
+      (listShape1.Extent() > 1 || listShape2.Extent() > 1);
+
+    TopTools_ListIteratorOfListOfShape itSub1 (listShape1);
+    for (; itSub1.More(); itSub1.Next()) {
+      TopoDS_Shape aValue1 = itSub1.Value();
+      TopTools_ListIteratorOfListOfShape itSub2 (listShape2);
+      for (; itSub2.More(); itSub2.Next()) {
+        TopoDS_Shape aValue2 = itSub2.Value();
+        BRepAlgoAPI_Common BO (aValue1, aValue2);
+        if (!BO.IsDone()) {
+          StdFail_NotDone::Raise("Common operation can not be performed on the given shapes");
         }
         if (isCompound) {
+          TopoDS_Shape aStepResult = BO.Shape();
+
           // check result of this step: if it is a compound (boolean operations
-          // allways return a compound), we add all sub-shapes of it.
+          // always return a compound), we add all sub-shapes of it.
           // This allows to avoid adding empty compounds,
-          // resulting from CUT of parts
-          if (aCut.ShapeType() == TopAbs_COMPOUND) {
-            TopoDS_Iterator aCompIter (aCut);
+          // resulting from COMMON on two non-intersecting shapes.
+          if (aStepResult.ShapeType() == TopAbs_COMPOUND) {
+            if ((aValue1.ShapeType() == TopAbs_FACE || aValue1.ShapeType() == TopAbs_SHELL) &&
+                (aValue2.ShapeType() == TopAbs_FACE || aValue2.ShapeType() == TopAbs_SHELL)) {
+              aStepResult = makeCompoundShellFromFaces(aStepResult);
+            }
+            TopoDS_Iterator aCompIter (aStepResult);
             for (; aCompIter.More(); aCompIter.Next()) {
               // add shape in a result
               B.Add(C, aCompIter.Value());
@@ -211,200 +438,187 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute (TFunction_Logbook& log) const
           }
           else {
             // add shape in a result
-            B.Add(C, aCut);
+            B.Add(C, aStepResult);
           }
         }
         else
-          aShape = aCut;
+          aShape = BO.Shape();
       }
+    }
 
-      if (isCompound) {
-        /*
-        TopTools_ListOfShape listShapeC;
-        GEOMUtils::AddSimpleShapes(C, listShapeC);
-        TopTools_ListIteratorOfListOfShape itSubC (listShapeC);
-        bool isOnlySolids = true;
-        for (; itSubC.More(); itSubC.Next()) {
-          TopoDS_Shape aValueC = itSubC.Value();
-          if (aValueC.ShapeType() != TopAbs_SOLID) isOnlySolids = false;
-        }
-        if (isOnlySolids)
-          aShape = GEOMImpl_GlueDriver::GlueFaces(C, Precision::Confusion());
-        else
-          aShape = C;
-        */
-
-        // As GlueFaces has been improved to keep all kind of shapes
-        TopExp_Explorer anExp (C, TopAbs_VERTEX);
-        if (anExp.More())
-          aShape = GEOMImpl_GlueDriver::GlueFaces(C, Precision::Confusion(), Standard_True);
-        else
-          aShape = C;
-      }
+    if (isCompound) {
+      // As GlueFaces has been improved to keep all kind of shapes
+      TopExp_Explorer anExp (C, TopAbs_VERTEX);
+      if (anExp.More())
+        aShape = GEOMImpl_GlueDriver::GlueFaces(C, Precision::Confusion(), Standard_True);
+      else
+        aShape = C;
     }
+  }
 
-    // perform FUSE operation
-    else if (aType == BOOLEAN_FUSE) {
-      /* Fix for NPAL15379: refused
-      // Check arguments
-      TopTools_ListOfShape listShape1, listShape2;
-      GEOMUtils::AddSimpleShapes(aShape1, listShape1);
-      GEOMUtils::AddSimpleShapes(aShape2, listShape2);
-
-      Standard_Boolean isIntersect = Standard_False;
-
-      if (listShape1.Extent() > 1 && !isIntersect) {
-        // check intersections inside the first compound
-        TopTools_ListIteratorOfListOfShape it1 (listShape1);
-        for (; it1.More() && !isIntersect; it1.Next()) {
-          TopoDS_Shape aValue1 = it1.Value();
-          TopTools_ListIteratorOfListOfShape it2 (listShape1);
-          for (; it2.More() && !isIntersect; it2.Next()) {
-            TopoDS_Shape aValue2 = it2.Value();
-            if (aValue2 != aValue1) {
-              BRepAlgoAPI_Section BO (aValue1, aValue2);
-              if (BO.IsDone()) {
-                TopoDS_Shape aSect = BO.Shape();
-                TopExp_Explorer anExp (aSect, TopAbs_EDGE);
-                if (anExp.More()) {
-                  isIntersect = Standard_True;
-                }
-              }
-            }
-          }
+  // perform CUT operation
+  else if (theType == BOOLEAN_CUT) {
+    BRep_Builder B;
+    TopoDS_Compound C;
+    B.MakeCompound(C);
+
+    TopTools_ListOfShape listShapes, listTools;
+    GEOMUtils::AddSimpleShapes(theShape1, listShapes);
+    GEOMUtils::AddSimpleShapes(theShape2, listTools);
+
+    Standard_Boolean isCompound = (listShapes.Extent() > 1);
+
+    TopTools_ListIteratorOfListOfShape itSub1 (listShapes);
+    for (; itSub1.More(); itSub1.Next()) {
+      TopoDS_Shape aCut = itSub1.Value();
+      // tools
+      TopTools_ListIteratorOfListOfShape itSub2 (listTools);
+      for (; itSub2.More(); itSub2.Next()) {
+        TopoDS_Shape aTool = itSub2.Value();
+        BRepAlgoAPI_Cut BO (aCut, aTool);
+        if (!BO.IsDone()) {
+          StdFail_NotDone::Raise("Cut operation can not be performed on the given shapes");
         }
+        aCut = BO.Shape();
       }
-
-      if (listShape2.Extent() > 1 && !isIntersect) {
-        // check intersections inside the second compound
-        TopTools_ListIteratorOfListOfShape it1 (listShape2);
-        for (; it1.More() && !isIntersect; it1.Next()) {
-          TopoDS_Shape aValue1 = it1.Value();
-          TopTools_ListIteratorOfListOfShape it2 (listShape2);
-          for (; it2.More() && !isIntersect; it2.Next()) {
-            TopoDS_Shape aValue2 = it2.Value();
-            if (aValue2 != aValue1) {
-              BRepAlgoAPI_Section BO (aValue1, aValue2);
-              if (BO.IsDone()) {
-                TopoDS_Shape aSect = BO.Shape();
-                TopExp_Explorer anExp (aSect, TopAbs_EDGE);
-                if (anExp.More()) {
-                  isIntersect = Standard_True;
-                }
-              }
-            }
+      if (isCompound) {
+        // check result of this step: if it is a compound (boolean operations
+        // always return a compound), we add all sub-shapes of it.
+        // This allows to avoid adding empty compounds,
+        // resulting from CUT of parts
+        if (aCut.ShapeType() == TopAbs_COMPOUND) {
+          if (itSub1.Value().ShapeType() == TopAbs_FACE ||
+              itSub1.Value().ShapeType() == TopAbs_SHELL) {
+            aCut = makeCompoundShellFromFaces(aCut);
           }
+          TopoDS_Iterator aCompIter (aCut);
+          for (; aCompIter.More(); aCompIter.Next()) {
+            // add shape in a result
+            B.Add(C, aCompIter.Value());
+          }
+        }
+        else {
+          // add shape in a result
+          B.Add(C, aCut);
         }
       }
+      else
+        aShape = aCut;
+    }
 
-      if (isIntersect) {
-        // have intersections inside compounds
-        // check intersections between compounds
-        TopTools_ListIteratorOfListOfShape it1 (listShape1);
-        for (; it1.More(); it1.Next()) {
-          TopoDS_Shape aValue1 = it1.Value();
-          TopTools_ListIteratorOfListOfShape it2 (listShape2);
-          for (; it2.More(); it2.Next()) {
-            TopoDS_Shape aValue2 = it2.Value();
-            if (aValue2 != aValue1) {
-              BRepAlgoAPI_Section BO (aValue1, aValue2);
-              if (BO.IsDone()) {
-                TopoDS_Shape aSect = BO.Shape();
-                TopExp_Explorer anExp (aSect, TopAbs_EDGE);
-                if (anExp.More()) {
-                  StdFail_NotDone::Raise("Bad argument for Fuse: compound with intersecting sub-shapes");
-                }
-              }
-            }
-          }
+    if (isCompound) {
+      // As GlueFaces has been improved to keep all kind of shapes
+      TopExp_Explorer anExp (C, TopAbs_VERTEX);
+      if (anExp.More())
+        aShape = GEOMImpl_GlueDriver::GlueFaces(C, Precision::Confusion(), Standard_True);
+      else
+        aShape = C;
+    }
+  }
+
+  // perform FUSE operation
+  else if (theType == BOOLEAN_FUSE) {
+    Standard_Boolean isFaces = Standard_False;
+    TopTools_ListOfShape listShape1, listShape2;
+    GEOMUtils::AddSimpleShapes(theShape1, listShape1);
+    GEOMUtils::AddSimpleShapes(theShape2, listShape2);
+
+    TopTools_ListIteratorOfListOfShape itSub1 (listShape1);
+    for (; itSub1.More(); itSub1.Next()) {
+      TopoDS_Shape aValue1 = itSub1.Value();
+      TopTools_ListIteratorOfListOfShape itSub2 (listShape2);
+      for (; itSub2.More(); itSub2.Next()) {
+        TopoDS_Shape aValue2 = itSub2.Value();
+        if ((aValue1.ShapeType() == TopAbs_FACE || aValue1.ShapeType() == TopAbs_SHELL) &&
+            (aValue2.ShapeType() == TopAbs_FACE || aValue2.ShapeType() == TopAbs_SHELL)) {
+          isFaces = Standard_True;
         }
       }
-      */
+    }
 
-      // Perform
-      BRepAlgoAPI_Fuse BO (aShape1, aShape2);
-      if (!BO.IsDone()) {
-        StdFail_NotDone::Raise("Fuse operation can not be performed on the given shapes");
-      }
-      aShape = BO.Shape();
+    // Perform
+    BRepAlgoAPI_Fuse BO (theShape1, theShape2);
+    if (!BO.IsDone()) {
+      StdFail_NotDone::Raise("Fuse operation can not be performed on the given shapes");
     }
+    aShape = BO.Shape();
+    if (isFaces)
+      aShape = makeCompoundShellFromFaces(aShape);
+  }
 
-    // perform SECTION operation
-    else if (aType == BOOLEAN_SECTION) {
-      BRep_Builder B;
-      TopoDS_Compound C;
-      B.MakeCompound(C);
-
-      TopTools_ListOfShape listShape1, listShape2;
-      GEOMUtils::AddSimpleShapes(aShape1, listShape1);
-      GEOMUtils::AddSimpleShapes(aShape2, listShape2);
-
-      Standard_Boolean isCompound =
-        (listShape1.Extent() > 1 || listShape2.Extent() > 1);
-
-      TopTools_ListIteratorOfListOfShape itSub1 (listShape1);
-      for (; itSub1.More(); itSub1.Next()) {
-        TopoDS_Shape aValue1 = itSub1.Value();
-        TopTools_ListIteratorOfListOfShape itSub2 (listShape2);
-        for (; itSub2.More(); itSub2.Next()) {
-          TopoDS_Shape aValue2 = itSub2.Value();
-          BRepAlgoAPI_Section BO (aValue1, aValue2, Standard_False);
-          // Set approximation to have an attached 3D BSpline geometry to each edge,
-          // where analytic curve is not possible. Without this flag in some cases
-          // we obtain BSpline curve of degree 1 (C0), which is slowly
-          // processed by some algorithms (Partition for example).
-          BO.Approximation(Standard_True);
-         //modified by NIZNHY-PKV Tue Oct 18 14:34:16 2011f
-         BO.ComputePCurveOn1(Standard_True);
-         BO.ComputePCurveOn2(Standard_True);
-         //modified by NIZNHY-PKV Tue Oct 18 14:34:18 2011t
-         
-          BO.Build();
-          if (!BO.IsDone()) {
-            StdFail_NotDone::Raise("Section operation can not be performed on the given shapes");
-          }
-          if (isCompound) {
-            TopoDS_Shape aStepResult = BO.Shape();
-
-            // check result of this step: if it is a compound (boolean operations
-            // allways return a compound), we add all sub-shapes of it.
-            // This allows to avoid adding empty compounds,
-            // resulting from SECTION on two non-intersecting shapes.
-            if (aStepResult.ShapeType() == TopAbs_COMPOUND) {
-              TopoDS_Iterator aCompIter (aStepResult);
-              for (; aCompIter.More(); aCompIter.Next()) {
-                // add shape in a result
-                B.Add(C, aCompIter.Value());
-              }
-            }
-            else {
+  // perform SECTION operation
+  else if (theType == BOOLEAN_SECTION) {
+    BRep_Builder B;
+    TopoDS_Compound C;
+    B.MakeCompound(C);
+
+    TopTools_ListOfShape listShape1, listShape2;
+    GEOMUtils::AddSimpleShapes(theShape1, listShape1);
+    GEOMUtils::AddSimpleShapes(theShape2, listShape2);
+
+    Standard_Boolean isCompound =
+      (listShape1.Extent() > 1 || listShape2.Extent() > 1);
+
+    TopTools_ListIteratorOfListOfShape itSub1 (listShape1);
+    for (; itSub1.More(); itSub1.Next()) {
+      TopoDS_Shape aValue1 = itSub1.Value();
+      TopTools_ListIteratorOfListOfShape itSub2 (listShape2);
+      for (; itSub2.More(); itSub2.Next()) {
+        TopoDS_Shape aValue2 = itSub2.Value();
+        BRepAlgoAPI_Section BO (aValue1, aValue2, Standard_False);
+        // Set approximation to have an attached 3D BSpline geometry to each edge,
+        // where analytic curve is not possible. Without this flag in some cases
+        // we obtain BSpline curve of degree 1 (C0), which is slowly
+        // processed by some algorithms (Partition for example).
+        BO.Approximation(Standard_True);
+        //modified by NIZNHY-PKV Tue Oct 18 14:34:16 2011f
+        BO.ComputePCurveOn1(Standard_True);
+        BO.ComputePCurveOn2(Standard_True);
+        //modified by NIZNHY-PKV Tue Oct 18 14:34:18 2011t
+
+        BO.Build();
+        if (!BO.IsDone()) {
+          StdFail_NotDone::Raise("Section operation can not be performed on the given shapes");
+        }
+        if (isCompound) {
+          TopoDS_Shape aStepResult = BO.Shape();
+
+          // check result of this step: if it is a compound (boolean operations
+          // always return a compound), we add all sub-shapes of it.
+          // This allows to avoid adding empty compounds,
+          // resulting from SECTION on two non-intersecting shapes.
+          if (aStepResult.ShapeType() == TopAbs_COMPOUND) {
+            TopoDS_Iterator aCompIter (aStepResult);
+            for (; aCompIter.More(); aCompIter.Next()) {
               // add shape in a result
-              B.Add(C, aStepResult);
+              B.Add(C, aCompIter.Value());
             }
           }
-          else
-            aShape = BO.Shape();
+          else {
+            // add shape in a result
+            B.Add(C, aStepResult);
+          }
         }
-      }
-
-      if (isCompound) {
-        //aShape = C;
-
-        // As GlueFaces has been improved to keep all kind of shapes
-        TopExp_Explorer anExp (C, TopAbs_VERTEX);
-        if (anExp.More())
-          aShape = GEOMImpl_GlueDriver::GlueFaces(C, Precision::Confusion(), Standard_True);
         else
-          aShape = C;
+          aShape = BO.Shape();
       }
     }
 
-    // UNKNOWN operation
-    else {
+    if (isCompound) {
+      // As GlueFaces has been improved to keep all kind of shapes
+      TopExp_Explorer anExp (C, TopAbs_VERTEX);
+      if (anExp.More())
+        aShape = GEOMImpl_GlueDriver::GlueFaces(C, Precision::Confusion(), Standard_True);
+      else
+        aShape = C;
     }
   }
 
-  if (aShape.IsNull()) return 0;
+  // UNKNOWN operation
+  else {
+  }
+
+  if (aShape.IsNull()) return aShape;
 
   // as boolean operations always produce compound, lets simplify it
   // for the case, if it contains only one sub-shape
@@ -412,153 +626,81 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute (TFunction_Logbook& log) const
   GEOMUtils::AddSimpleShapes(aShape, listShapeRes);
   if (listShapeRes.Extent() == 1) {
     aShape = listShapeRes.First();
-    if (aShape.IsNull()) return 0;
+    if (aShape.IsNull()) return aShape;
   }
 
   // 08.07.2008 skl for bug 19761 from Mantis
-  BRepCheck_Analyzer ana (aShape, Standard_True);
-  ana.Init(aShape);
-  if (!ana.IsValid()) {
-    ShapeFix_ShapeTolerance aSFT;
-    aSFT.LimitTolerance(aShape, Precision::Confusion(),
-                        Precision::Confusion(), TopAbs_SHAPE);
-    Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape);
-    aSfs->Perform();
-    aShape = aSfs->Shape();
-    ana.Init(aShape);
-    if (!ana.IsValid())
-      Standard_ConstructionError::Raise("Boolean operation aborted : non valid shape result");
-  }
-  //if (!BRepAlgo::IsValid(aShape)) {
-  //  Standard_ConstructionError::Raise("Boolean operation aborted : non valid shape result");
-  //}
-
-  // BEGIN: Mantis issue 0021060: always limit tolerance of BOP result
-  // 1. Get shape parameters for comparison
-  int nbTypes [TopAbs_SHAPE];
-  {
-    for (int iType = 0; iType < TopAbs_SHAPE; ++iType)
-      nbTypes[iType] = 0;
-    nbTypes[aShape.ShapeType()]++;
-
-    TopTools_MapOfShape aMapOfShape;
-    aMapOfShape.Add(aShape);
-    TopTools_ListOfShape aListOfShape;
-    aListOfShape.Append(aShape);
-
-    TopTools_ListIteratorOfListOfShape itL (aListOfShape);
-    for (; itL.More(); itL.Next()) {
-      TopoDS_Iterator it (itL.Value());
-      for (; it.More(); it.Next()) {
-        TopoDS_Shape s = it.Value();
-        if (aMapOfShape.Add(s)) {
-          aListOfShape.Append(s);
-          nbTypes[s.ShapeType()]++;
-        }
-      }
-    }
-  }
-
-  // 2. Limit tolerance
-  TopoDS_Shape aShapeCopy;
-  TColStd_IndexedDataMapOfTransientTransient aMapTShapes;
-  TNaming_CopyShape::CopyTool(aShape, aMapTShapes, aShapeCopy);
-  ShapeFix_ShapeTolerance aSFT;
-  aSFT.LimitTolerance(aShapeCopy, Precision::Confusion(), Precision::Confusion(), TopAbs_SHAPE);
-  Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape (aShapeCopy);
-  aSfs->Perform();
-  aShapeCopy = aSfs->Shape();
-
-  // 3. Check parameters
-  ana.Init(aShapeCopy);
-  if (ana.IsValid()) {
-    int iType, nbTypesCopy [TopAbs_SHAPE];
-
-    for (iType = 0; iType < TopAbs_SHAPE; ++iType)
-      nbTypesCopy[iType] = 0;
-    nbTypesCopy[aShapeCopy.ShapeType()]++;
-
-    TopTools_MapOfShape aMapOfShape;
-    aMapOfShape.Add(aShapeCopy);
-    TopTools_ListOfShape aListOfShape;
-    aListOfShape.Append(aShapeCopy);
-
-    TopTools_ListIteratorOfListOfShape itL (aListOfShape);
-    for (; itL.More(); itL.Next()) {
-      TopoDS_Iterator it (itL.Value());
-      for (; it.More(); it.Next()) {
-        TopoDS_Shape s = it.Value();
-        if (aMapOfShape.Add(s)) {
-          aListOfShape.Append(s);
-          nbTypesCopy[s.ShapeType()]++;
-        }
-      }
-    }
-
-    bool isEqual = true;
-    for (iType = 0; iType < TopAbs_SHAPE && isEqual; ++iType) {
-      if (nbTypes[iType] != nbTypesCopy[iType])
-        isEqual = false;
-    }
-    if (isEqual)
-      aShape = aShapeCopy;
-  }
-  // END: Mantis issue 0021060
-
-  //Alternative case to check shape result Mantis 0020604: EDF 1172
-/*  TopoDS_Iterator It (aShape, Standard_True, Standard_True);
-  int nbSubshapes=0;
-  for (; It.More(); It.Next())
-    nbSubshapes++;
-  if (!nbSubshapes)
-    Standard_ConstructionError::Raise("Boolean operation aborted : result object is empty compound");*/
-  //end of 0020604: EDF 1172
-  //! the changes temporary commented because of customer needs (see the same mantis bug)
-
-  aFunction->SetValue(aShape);
-
-  log.SetTouched(Label());
+  if ( !GEOMUtils::CheckShape(aShape, true) && !GEOMUtils::FixShapeTolerance(aShape) )
+    Standard_ConstructionError::Raise("Boolean operation aborted : non valid shape result");
 
-  return 1;
+  return aShape;
 }
 
+//================================================================================
+/*!
+ * \brief Returns a name of creation operation and names and values of creation parameters
+ */
+//================================================================================
 
-//=======================================================================
-//function :  GEOMImpl_BooleanDriver_Type_
-//purpose  :
-//=======================================================================
-Standard_EXPORT Handle_Standard_Type& GEOMImpl_BooleanDriver_Type_()
+bool GEOMImpl_BooleanDriver::
+GetCreationInformation(std::string&             theOperationName,
+                       std::vector<GEOM_Param>& theParams)
 {
-  static Handle_Standard_Type aType1 = STANDARD_TYPE(TFunction_Driver);
-  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(TFunction_Driver);
-  static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
-  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
-  static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
-  if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
-
-  static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
-  static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_BooleanDriver",
-                                                         sizeof(GEOMImpl_BooleanDriver),
-                                                         1,
-                                                         (Standard_Address)_Ancestors,
-                                                         (Standard_Address)NULL);
-
-  return _aType;
-}
-
-//=======================================================================
-//function : DownCast
-//purpose  :
-//=======================================================================
-const Handle(GEOMImpl_BooleanDriver) Handle(GEOMImpl_BooleanDriver)::DownCast(const Handle(Standard_Transient)& AnObject)
-{
-  Handle(GEOMImpl_BooleanDriver) _anOtherObject;
-
-  if (!AnObject.IsNull()) {
-    if (AnObject->IsKind(STANDARD_TYPE(GEOMImpl_BooleanDriver))) {
-      _anOtherObject = Handle(GEOMImpl_BooleanDriver)((Handle(GEOMImpl_BooleanDriver)&)AnObject);
-    }
+  if (Label().IsNull()) return 0;
+  Handle(GEOM_Function) function = GEOM_Function::GetFunction(Label());
+
+  GEOMImpl_IBoolean aCI (function);
+  Standard_Integer aType = function->GetType();
+  Standard_Boolean isCheckSelfInte = aCI.GetCheckSelfIntersection();
+
+  switch ( aType ) {
+  case BOOLEAN_COMMON:
+    theOperationName = "COMMON";
+    AddParam( theParams, "Object 1", aCI.GetShape1() );
+    AddParam( theParams, "Object 2", aCI.GetShape2() );
+    AddParam( theParams, "Check self-intersections", isCheckSelfInte );
+    break;
+  case BOOLEAN_CUT:
+    theOperationName = "CUT";
+    AddParam( theParams, "Main Object", aCI.GetShape1() );
+    AddParam( theParams, "Tool Object", aCI.GetShape2() );
+    AddParam( theParams, "Check self-intersections", isCheckSelfInte );
+    break;
+  case BOOLEAN_FUSE:
+    theOperationName = "FUSE";
+    AddParam( theParams, "Object 1", aCI.GetShape1() );
+    AddParam( theParams, "Object 2", aCI.GetShape2() );
+    AddParam( theParams, "Check self-intersections", isCheckSelfInte );
+    AddParam( theParams, "Remove extra edges", aCI.GetRmExtraEdges() );
+    break;
+  case BOOLEAN_SECTION:
+    theOperationName = "SECTION";
+    AddParam( theParams, "Object 1", aCI.GetShape1() );
+    AddParam( theParams, "Object 2", aCI.GetShape2() );
+    AddParam( theParams, "Check self-intersections", isCheckSelfInte );
+    break;
+  case BOOLEAN_COMMON_LIST:
+    theOperationName = "COMMON";
+    AddParam( theParams, "Selected objects", aCI.GetShapes() );
+    AddParam( theParams, "Check self-intersections", isCheckSelfInte );
+    break;
+  case BOOLEAN_FUSE_LIST:
+    theOperationName = "FUSE";
+    AddParam( theParams, "Selected objects", aCI.GetShapes() );
+    AddParam( theParams, "Check self-intersections", isCheckSelfInte );
+    AddParam( theParams, "Remove extra edges", aCI.GetRmExtraEdges() );
+    break;
+  case BOOLEAN_CUT_LIST:
+    theOperationName = "CUT";
+    AddParam( theParams, "Main Object", aCI.GetShape1() );
+    AddParam( theParams, "Tool Objects", aCI.GetShapes() );
+    AddParam( theParams, "Check self-intersections", isCheckSelfInte );
+    break;
+  default:
+    return false;
   }
 
-  return _anOtherObject;
+  return true;
 }
+
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BooleanDriver,GEOM_BaseDriver);