X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_Boolean.h;h=d5a08376c3d3163fec204e9ca730396703e9788a;hb=b9636a8e25411b3c89aa64801b659bb363278661;hp=a8a5659de8ea2470759c9cd481f87936663de983;hpb=db0e21ea2f1117dd9af3320009ba8b50dc2e828b;p=modules%2Fshaper.git

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h b/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
index a8a5659de..d5a08376c 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
@@ -1,91 +1,70 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// 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 <GeomAPI_Shape.h>
 #include <GeomAlgoAPI_MakeShape.h>
-#include <GeomAPI_DataMapOfShapeShape.h>
-#include <memory>
-
-/**\class GeomAlgoAPI_Boolean
- * \ingroup DataAlgo
- * \brief Allows to perform of boolean operations
- */
-class GeomAlgoAPI_Boolean : public GeomAPI_Interface
-{
- 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
-   */
-  GEOMALGOAPI_EXPORT static std::shared_ptr<GeomAPI_Shape> makeCut(
-	                                          std::shared_ptr<GeomAPI_Shape> theShape,
-                                            std::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
-   */
-  GEOMALGOAPI_EXPORT static std::shared_ptr<GeomAPI_Shape> makeFuse(
-	                                          std::shared_ptr<GeomAPI_Shape> theShape,
-                                              std::shared_ptr<GeomAPI_Shape> theTool);
-
-  /**\brief Creates common boolean operation
-   * \param[in] theObject the main shape
-   * \param[in] theTool  second shape
-   * \return a solid as result of operation
-   */
-  GEOMALGOAPI_EXPORT static std::shared_ptr<GeomAPI_Shape> makeCommon(
-	                                          std::shared_ptr<GeomAPI_Shape> theObject,
-                                              std::shared_ptr<GeomAPI_Shape> theTool);
+#include <GeomAPI_Shape.h>
 
-   enum {
-	BOOL_CUT,
-    BOOL_FUSE,
-    BOOL_COMMON
+/// \class GeomAlgoAPI_Boolean
+/// \ingroup DataAlgo
+/// \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
   };
-  /// Constructor
-  GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean (std::shared_ptr<GeomAPI_Shape> theObject,
-                                          std::shared_ptr<GeomAPI_Shape> theTool,
-										  int theType);
 
-  /// Returns True if algorithm succeed
-  GEOMALGOAPI_EXPORT const bool isDone() const;
+public:
+
+  /// Constructor.
+  GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean(const GeomShapePtr theObject,
+                                         const GeomShapePtr theTool,
+                                         const OperationType theOperationType);
 
-  ///  Returns True if resulting shape is valid
-  GEOMALGOAPI_EXPORT const bool isValid() const;
+  /// Constructor.
+  GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean(const GeomShapePtr theObject,
+                                         const ListOfShape& theTools,
+                                         const OperationType theOperationType);
 
-  /// Returns result of the boolean algorithm which may be a Solid or a Face
-  GEOMALGOAPI_EXPORT const std::shared_ptr<GeomAPI_Shape>& shape () const; 
- 
-  /// Returns map of sub-shapes of the result. To be used for History keeping
-  GEOMALGOAPI_EXPORT void  mapOfShapes (GeomAPI_DataMapOfShapeShape& theMap) const;
 
-  /// Return interface for for History processing
-  GEOMALGOAPI_EXPORT GeomAlgoAPI_MakeShape* makeShape () const;
+  /// Constructor.
+  GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean(const ListOfShape& theObjects,
+                                         const ListOfShape& theTools,
+                                         const OperationType theOperationType);
 
-  ///Destructor
-  GEOMALGOAPI_EXPORT  ~GeomAlgoAPI_Boolean();
+  /// 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(std::shared_ptr<GeomAPI_Shape> theObject,
-             std::shared_ptr<GeomAPI_Shape> theTool);
-  /// fields
-  double mySize;
-  bool myDone;
-  int  myOperation;
-  std::shared_ptr<GeomAPI_Shape> myShape;  
-  GeomAPI_DataMapOfShapeShape myMap;
-  GeomAlgoAPI_MakeShape * myMkShape;
+private:
+  /// Builds resulting shape.
+  void build(const ListOfShape& theObjects,
+             const ListOfShape& theTools,
+             const OperationType theOperationType);
 };
 
 #endif