X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_Boolean.h;h=7c315d9a65705800be55bd4eb45d35a32e816bac;hb=32e205a228d74cdc2627143cb32360e9a557d7dc;hp=790e7950c25ede6c4d2b0d6e52f0ad49adc35367;hpb=ba737434252ae41c4bee1b792a0f0bb098ffae87;p=modules%2Fshaper.git

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h b/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
index 790e7950c..7c315d9a6 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
@@ -7,23 +7,84 @@
 
 #include <GeomAlgoAPI.h>
 #include <GeomAPI_Shape.h>
-#include <boost/shared_ptr.hpp>
+#include <GeomAlgoAPI_MakeShape.h>
+#include <GeomAPI_DataMapOfShapeShape.h>
+#include <memory>
 
 /**\class GeomAlgoAPI_Boolean
  * \ingroup DataAlgo
  * \brief Allows to perform of boolean operations
  */
-class GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean
+class GeomAlgoAPI_Boolean : public GeomAPI_Interface
 {
  public:
   /* \brief Creates cut boolean operation
-   * \param[in] theShape face or wire to be extruded
+   * \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);
+  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
+   * \param[in] theType  type of the operation: Fuse, Cut, Common
+   * \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);
+
+   enum {
+	BOOL_CUT,
+    BOOL_FUSE,
+    BOOL_COMMON
+  };
+  /// 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;
+
+  ///  Returns True if resulting shape is valid
+  GEOMALGOAPI_EXPORT const bool isValid() const;
+
+  /// 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;
+
+  ///Destructor
+  GEOMALGOAPI_EXPORT  ~GeomAlgoAPI_Boolean();
+
+  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;
 };
 
 #endif