X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_Boolean.h;h=32224162bc0d10a1d38f0f3571be27ded0212f2e;hb=f813e863f0a60ee69846227f99f0dd6a84f8498c;hp=54a5d9428a870195917546d05739b6c065bb14af;hpb=a7a6f0422622aefc5cc8e397b54a207c19ce2b67;p=modules%2Fshaper.git

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h b/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
index 54a5d9428..32224162b 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,9 @@
 //
 // 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #ifndef GeomAlgoAPI_Boolean_H_
@@ -23,6 +22,7 @@
 
 #include <GeomAlgoAPI.h>
 #include <GeomAlgoAPI_MakeShape.h>
+#include <GeomAlgoAPI_Tools.h>
 
 #include <GeomAPI_Shape.h>
 
@@ -31,37 +31,33 @@
 /// \brief Allows to perform of boolean operations
 class GeomAlgoAPI_Boolean : public GeomAlgoAPI_MakeShape
 {
-public:
-  /// Type of booelan operation
-  enum OperationType {
-    BOOL_CUT,   ///< Cut objects
-    BOOL_FUSE,  ///< Fuse objects
-    BOOL_COMMON ///< Take common part of objects
-  };
-
 public:
 
   /// Constructor.
   GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean(const GeomShapePtr theObject,
                                          const GeomShapePtr theTool,
-                                         const OperationType theOperationType);
+                                         const GeomAlgoAPI_Tools::BOPType theOperationType);
 
   /// Constructor.
   GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean(const GeomShapePtr theObject,
                                          const ListOfShape& theTools,
-                                         const OperationType theOperationType);
+                                         const GeomAlgoAPI_Tools::BOPType theOperationType);
 
 
   /// Constructor.
   GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean(const ListOfShape& theObjects,
                                          const ListOfShape& theTools,
-                                         const OperationType theOperationType);
+                                         const GeomAlgoAPI_Tools::BOPType theOperationType);
+
+  /// Redefinition of the generic method for the Fuse problem: OCCT 30481
+  GEOMALGOAPI_EXPORT virtual void modified(const GeomShapePtr theOldShape,
+    ListOfShape& theNewShapes);
 
 private:
   /// Builds resulting shape.
   void build(const ListOfShape& theObjects,
              const ListOfShape& theTools,
-             const OperationType theOperationType);
+             const GeomAlgoAPI_Tools::BOPType theOperationType);
 };
 
 #endif