X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FGeomAPI%2FGeomAPI_Shape.h;h=2202d022664622308452afc0ec41863a2f40dfab;hb=f3ad05e50c4a462c08c31990706c8cc6acc646ac;hp=66e6a2aad465b963fba77d43aa9bc1f86fb3c32e;hpb=5ff96b13035a4e95572580dbc6aa6f2c526d0a45;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/GeomAPI_Shape.h b/src/GeomAPI/GeomAPI_Shape.h
index 66e6a2aad..2202d0226 100644
--- a/src/GeomAPI/GeomAPI_Shape.h
+++ b/src/GeomAPI/GeomAPI_Shape.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// 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
@@ -12,10 +12,9 @@
 //
 // 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #ifndef GeomAPI_Shape_H_
@@ -27,6 +26,7 @@
 #include <memory>
 #include <list>
 
+class GeomAPI_Pnt;
 class GeomAPI_Vertex;
 class GeomAPI_Edge;
 class GeomAPI_Wire;
@@ -77,6 +77,10 @@ public:
   GEOMAPI_EXPORT
   virtual bool isSame(const std::shared_ptr<GeomAPI_Shape> theShape) const;
 
+  /// Returns \c true if shapes have same underlying geometry
+  GEOMAPI_EXPORT
+  virtual bool isSameGeometry(const std::shared_ptr<GeomAPI_Shape> theShape) const;
+
   /// Returns whether the shape is a vertex
   GEOMAPI_EXPORT
   virtual bool isVertex() const;
@@ -181,6 +185,10 @@ public:
   bool computeSize(double& theXmin, double& theYmin, double& theZmin,
                    double& theXmax, double& theYmax, double& theZmax) const;
 
+  /// Return middle point on the shape
+  GEOMAPI_EXPORT
+  virtual std::shared_ptr<GeomAPI_Pnt> middlePoint() const;
+
   /// Returns the shape as BRep stream
   GEOMAPI_EXPORT
   std::string getShapeStream() const;
@@ -200,6 +208,42 @@ public:
   /// Returns type of shapes in the compound.
   // If shapes are of different type then it will return SHAPE type
   GEOMAPI_EXPORT ShapeType typeOfCompoundShapes() const;
+
+  /// Returns true if shape have self-intersections.
+  /// \param[in] theLevelOfCheck defines which interferences will be checked:<br>
+  /// 0 - only V/V;<br>
+  /// 1 - V/V and V/E;<br>
+  /// 2 - V/V, V/E and E/E;<br>
+  /// 3 - V/V, V/E, E/E and V/F;<br>
+  /// 4 - V/V, V/E, E/E, V/F and E/F;<br>
+  /// 5 - V/V, V/E, E/E, V/F, E/F and F/F;<br>
+  /// 6 - V/V, V/E, E/E, V/F, E/F, F/F and V/S;<br>
+  /// 7 - V/V, V/E, E/E, V/F, E/F, F/F, V/S and E/S;<br>
+  /// 8 - V/V, V/E, E/E, V/F, E/F, F/F, V/S, E/S and F/S;<br>
+  /// 9 - V/V, V/E, E/E, V/F, E/F, F/F, V/S, E/S, F/S and S/S - all interferences (Default value)
+  GEOMAPI_EXPORT bool isSelfIntersected(const int theLevelOfCheck = 9) const;
+
+public:
+  /// \brief Compare addresses of shapes
+  class Comparator
+  {
+  public:
+    /// Return \c true if the address of the first shape is less than the address of the second
+    GEOMAPI_EXPORT
+    bool operator ()(const std::shared_ptr<GeomAPI_Shape>& theShape1,
+                     const std::shared_ptr<GeomAPI_Shape>& theShape2) const;
+  };
+
+  /// \brief Compare addresses of shapes with respect to orientation of shapes.
+  ///        Same TShapes with opposite orientations will be treated as different.
+  class ComparatorWithOri
+  {
+  public:
+    /// Return \c true if the address of the first shape is less than the address of the second
+    GEOMAPI_EXPORT
+      bool operator ()(const std::shared_ptr<GeomAPI_Shape>& theShape1,
+                       const std::shared_ptr<GeomAPI_Shape>& theShape2) const;
+  };
 };
 
 //! Pointer on list of shapes