Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

[modules/shaper.git] / src / GeomAPI / GeomAPI_Shape.h

diff --git a/src/GeomAPI/GeomAPI_Shape.h b/src/GeomAPI/GeomAPI_Shape.h
index 55db3759aec02a5e3cc56653910723489a845365..8e2c22f9a41afe72addb07b7cb9c353fb3cf69b7 100644 (file)
--- a/src/GeomAPI/GeomAPI_Shape.h
+++ b/src/GeomAPI/GeomAPI_Shape.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomAPI_Shape.hxx
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
@@ -6,7 +8,7 @@
 #define GeomAPI_Shape_H_
 
 #include <GeomAPI_Interface.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <list>
 
 /**\class GeomAPI_Shape
@@ -19,10 +21,11 @@ class GEOMAPI_EXPORT GeomAPI_Shape : public GeomAPI_Interface
   /// Creation of empty (null) shape
   GeomAPI_Shape();
 
+  /// Returns true if the underlied shape is null
   bool isNull() const;
 
   /// Returns whether the shapes are equal
-  virtual bool isEqual(const boost::shared_ptr<GeomAPI_Shape> theShape) const;
+  virtual bool isEqual(const std::shared_ptr<GeomAPI_Shape> theShape) const;
 
   /// Returns whether the shape is a vertex
   virtual bool isVertex() const;
@@ -30,13 +33,22 @@ class GEOMAPI_EXPORT GeomAPI_Shape : public GeomAPI_Interface
   /// Returns whether the shape is an edge
   virtual bool isEdge() const;
 
+  /// Returns whether the shape is a face
+  virtual bool isFace() const;
+
+  /// Computes boundary dimensions of the shape
+  /// Returns False if it is not possible
+  bool computeSize(double& theXmin, double& theYmin, double& theZmin,
+                   double& theXmax, double& theYmax, double& theZmax) const;
+
+  /// Returns the shape as BRep stream
+  std::string getShapeStream() const;
 };
 
-<<<<<<< HEAD
-typedef std::list<boost::shared_ptr<GeomAPI_Shape>> ListOfShape;
-=======
+//! Pointer on list of shapes
+typedef std::list<std::shared_ptr<GeomAPI_Shape> > ListOfShape;
+
 //! Pointer on attribute object
-typedef boost::shared_ptr<GeomAPI_Shape> GeomShapePtr;
+typedef std::shared_ptr<GeomAPI_Shape> GeomShapePtr;
 
->>>>>>> 01cda8378dd1cff425f88438e8c0085122ed7495
 #endif