X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMImpl%2FGEOMImpl_IBooleanOperations.hxx;h=75c230e2c33c53ade3a2b1361336e39a2c212dac;hb=ed87a1f7c81ec39992aff1f463d73dc81e5791e0;hp=6dc82d7be23d005e30b99069b6e4b5c2730b23c9;hpb=239f8109c64fa0c5a2e1d87a420bad5529b57f48;p=modules%2Fgeom.git

diff --git a/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx b/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx
index 6dc82d7be..75c230e2c 100644
--- a/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx
@@ -1,18 +1,20 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2014  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
-// 
+//
 // 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.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+// License as published by the Free Software Foundation; either
+// 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Lesser General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
@@ -34,9 +36,31 @@ class GEOMImpl_IBooleanOperations : public GEOM_IOperations {
   Standard_EXPORT GEOMImpl_IBooleanOperations(GEOM_Engine* theEngine, int theDocID);
   Standard_EXPORT ~GEOMImpl_IBooleanOperations();
 
-  Standard_EXPORT Handle(GEOM_Object) MakeBoolean (Handle(GEOM_Object) theShape1,
-                                                   Handle(GEOM_Object) theShape2,
-                                                   Standard_Integer    theOp);
+  Standard_EXPORT Handle(GEOM_Object) MakeBoolean
+                                (Handle(GEOM_Object)    theShape1,
+                                 Handle(GEOM_Object)    theShape2,
+                                 const Standard_Integer theOp,
+                                 const Standard_Boolean IsCheckSelfInte);
+
+  Standard_EXPORT Handle(GEOM_Object) MakeFuse
+                                (Handle(GEOM_Object) theShape1,
+                                 Handle(GEOM_Object) theShape2,
+                                 const bool          IsCheckSelfInte,
+                                 const bool          IsRmExtraEdges);
+
+  Standard_EXPORT Handle(GEOM_Object) MakeFuseList
+                  (const Handle(TColStd_HSequenceOfTransient)& theShapes,
+                   const bool                                  IsCheckSelfInte,
+                   const bool                                  IsRmExtraEdges);
+
+  Standard_EXPORT Handle(GEOM_Object) MakeCommonList
+                  (const Handle(TColStd_HSequenceOfTransient)& theShapes,
+                   const Standard_Boolean IsCheckSelfInte);
+
+  Standard_EXPORT Handle(GEOM_Object) MakeCutList
+                  (Handle(GEOM_Object) theMainShape,
+                   const Handle(TColStd_HSequenceOfTransient)& theShapes,
+                   const Standard_Boolean IsCheckSelfInte);
 
   Standard_EXPORT Handle(GEOM_Object) MakePartition
                   (const Handle(TColStd_HSequenceOfTransient)& theShapes,
@@ -46,11 +70,19 @@ class GEOMImpl_IBooleanOperations : public GEOM_IOperations {
                    const Standard_Integer                      theLimit,
                    const Standard_Boolean                      theRemoveWebs,
                    const Handle(TColStd_HArray1OfInteger)&     theMaterials,
-		   const Standard_Integer theKeepNonlimitShapes,
-		   const Standard_Boolean thePerformSelfIntersections);
+                   const Standard_Integer theKeepNonlimitShapes,
+                   const Standard_Boolean thePerformSelfIntersections,
+                   const Standard_Boolean IsCheckSelfInte);
+
+  Standard_EXPORT Handle(GEOM_Object) MakeHalfPartition (Handle(GEOM_Object)    theShape,
+                                                         Handle(GEOM_Object)    thePlane);
+
+private:
+
+  Handle(TColStd_HSequenceOfTransient) getShapeFunctions
+                  (const Handle(TColStd_HSequenceOfTransient)& theObjects,
+                         TCollection_AsciiString &theDescription);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeHalfPartition (Handle(GEOM_Object) theShape,
-                                                         Handle(GEOM_Object) thePlane);
 };
 
 #endif