X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_Boolean.h;h=1b07fabae681eb16649c8339cbc421c83683972a;hb=cb0a7bdbea9f94ea30879522b230cbe773b60dc3;hp=fc946cc187ad933ac92077cdea05be0407345771;hpb=97917d3698f5a2f7fc9596e7c755ff8f6751e373;p=modules%2Fshaper.git

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h b/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
index fc946cc18..1b07fabae 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
@@ -22,6 +22,7 @@
 
 #include <GeomAlgoAPI.h>
 #include <GeomAlgoAPI_MakeShape.h>
+#include <GeomAlgoAPI_Tools.h>
 
 #include <GeomAPI_Shape.h>
 
@@ -30,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