X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_Boolean.h;h=1b07fabae681eb16649c8339cbc421c83683972a;hb=5e2855aa69f9a63236c331efcb57ba433f92e901;hp=6a8f9c657f155d3783933181a3aea02dc246f7b5;hpb=ea948b36a6cc9163da5d2324b04572c9dddd5fd5;p=modules%2Fshaper.git

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h b/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
index 6a8f9c657..1b07fabae 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
@@ -1,44 +1,63 @@
-// File:        GeomAlgoAPI_Boolean.h
-// Created:     02 Sept 2014
-// Author:      Vitaly Smetannikov
+// 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
+// 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef GeomAlgoAPI_Boolean_H_
 #define GeomAlgoAPI_Boolean_H_
 
 #include <GeomAlgoAPI.h>
+#include <GeomAlgoAPI_MakeShape.h>
+#include <GeomAlgoAPI_Tools.h>
+
 #include <GeomAPI_Shape.h>
-#include <boost/shared_ptr.hpp>
 
-/**\class GeomAlgoAPI_Boolean
- * \ingroup DataAlgo
- * \brief Allows to perform of boolean operations
- */
-class GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean
+/// \class GeomAlgoAPI_Boolean
+/// \ingroup DataAlgo
+/// \brief Allows to perform of boolean operations
+class GeomAlgoAPI_Boolean : public GeomAlgoAPI_MakeShape
 {
- public:
-  /* \brief Creates cut boolean operation
-   * \param[in] theShape the main shape
-   * \param[in] theTool  toole shape for boolean
-   * \return a solid as result of operation
-   */
-  static boost::shared_ptr<GeomAPI_Shape> makeCut(boost::shared_ptr<GeomAPI_Shape> theShape,
-                                                        boost::shared_ptr<GeomAPI_Shape> theTool);
-
-  /* \brief Creates fuse boolean operation
-   * \param[in] theShape the main shape
-   * \param[in] theTool  second shape
-   * \return a solid as result of operation
-   */
-  static boost::shared_ptr<GeomAPI_Shape> makeFuse(boost::shared_ptr<GeomAPI_Shape> theShape,
-                                                   boost::shared_ptr<GeomAPI_Shape> theTool);
-
-  /* \brief Creates common boolean operation
-   * \param[in] theShape the main shape
-   * \param[in] theTool  second shape
-   * \return a solid as result of operation
-   */
-  static boost::shared_ptr<GeomAPI_Shape> makeCommon(boost::shared_ptr<GeomAPI_Shape> theShape,
-                                                     boost::shared_ptr<GeomAPI_Shape> theTool);
+public:
+
+  /// Constructor.
+  GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean(const GeomShapePtr theObject,
+                                         const GeomShapePtr theTool,
+                                         const GeomAlgoAPI_Tools::BOPType theOperationType);
+
+  /// Constructor.
+  GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean(const GeomShapePtr theObject,
+                                         const ListOfShape& theTools,
+                                         const GeomAlgoAPI_Tools::BOPType theOperationType);
+
+
+  /// Constructor.
+  GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean(const ListOfShape& theObjects,
+                                         const ListOfShape& theTools,
+                                         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 GeomAlgoAPI_Tools::BOPType theOperationType);
 };
 
 #endif