X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FGeomAPI%2FGeomAPI_PlanarEdges.cpp;h=459ce060e3b2ca1bc05ee68fa4b1f552f35f35d3;hb=b10e938524bfb6bfeaacb049895041f22a179b0e;hp=f7757cf7e94b7b32a3ad5f0a23067ece92cd4381;hpb=f15802c13f98af8d10e7b81cbd4506d3b486da59;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/GeomAPI_PlanarEdges.cpp b/src/GeomAPI/GeomAPI_PlanarEdges.cpp
index f7757cf7e..459ce060e 100644
--- a/src/GeomAPI/GeomAPI_PlanarEdges.cpp
+++ b/src/GeomAPI/GeomAPI_PlanarEdges.cpp
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomAPI_PlanarEdges.cpp
-// Created:     06 Oct 2014
-// Author:      Sergey BELASH
+// 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
+//
 
 #include <GeomAPI_Interface.h>
 #include <GeomAPI_PlanarEdges.h>
@@ -40,7 +53,6 @@ void GeomAPI_PlanarEdges::addEdge(std::shared_ptr<GeomAPI_Shape> theEdge)
 std::list<std::shared_ptr<GeomAPI_Shape> > GeomAPI_PlanarEdges::getEdges()
 {
   TopoDS_Shape& aShape = const_cast<TopoDS_Shape&>(impl<TopoDS_Shape>());
-  //BRepTools_WireExplorer aWireExp(TopoDS::Wire(aShape));
   TopExp_Explorer aWireExp(aShape, TopAbs_EDGE);
   std::list<std::shared_ptr<GeomAPI_Shape> > aResult;
   for (; aWireExp.More(); aWireExp.Next()) {
@@ -63,38 +75,64 @@ bool GeomAPI_PlanarEdges::isEdge() const {
   return false;
 }
 
-std::shared_ptr<GeomAPI_Pnt> GeomAPI_PlanarEdges::origin() const 
+std::shared_ptr<GeomAPI_Pnt> GeomAPI_PlanarEdges::origin() const
 {
   if (hasPlane())
     return myPlane->origin();
   return std::shared_ptr<GeomAPI_Pnt>();
 }
 
-std::shared_ptr<GeomAPI_Dir> GeomAPI_PlanarEdges::dirX() const 
+std::shared_ptr<GeomAPI_Dir> GeomAPI_PlanarEdges::dirX() const
 {
   if (hasPlane())
     return myPlane->dirX();
   return std::shared_ptr<GeomAPI_Dir>();
 }
 
-std::shared_ptr<GeomAPI_Dir> GeomAPI_PlanarEdges::dirY() const 
+std::shared_ptr<GeomAPI_Dir> GeomAPI_PlanarEdges::dirY() const
 {
   if (hasPlane())
     return myPlane->dirY();
   return std::shared_ptr<GeomAPI_Dir>();
 }
 
-std::shared_ptr<GeomAPI_Dir> GeomAPI_PlanarEdges::norm() const 
+std::shared_ptr<GeomAPI_Dir> GeomAPI_PlanarEdges::norm() const
 {
   if (hasPlane())
-    return myPlane->norm();
+    return myPlane->normal();
   return std::shared_ptr<GeomAPI_Dir>();
 }
 
+bool GeomAPI_PlanarEdges::isPlanar() const
+{
+  return true;
+}
+
 void GeomAPI_PlanarEdges::setPlane(const std::shared_ptr<GeomAPI_Pnt>& theOrigin,
                                    const std::shared_ptr<GeomAPI_Dir>& theDirX,
-                                   const std::shared_ptr<GeomAPI_Dir>& theDirY,
                                    const std::shared_ptr<GeomAPI_Dir>& theNorm)
 {
-  myPlane = std::shared_ptr<GeomAPI_Ax3>(new GeomAPI_Ax3(theOrigin, theDirX, theDirY, theNorm));
-}
\ No newline at end of file
+  myPlane = std::shared_ptr<GeomAPI_Ax3>(new GeomAPI_Ax3(theOrigin, theDirX, theNorm));
+}
+
+bool GeomAPI_PlanarEdges::isEqual(const std::shared_ptr<GeomAPI_Shape> theShape) const
+{
+  if (!theShape.get())
+    return false;
+  TopoDS_Shape& aMyShape = const_cast<TopoDS_Shape&>(impl<TopoDS_Shape>());
+  TopoDS_Shape aTheShape = theShape->impl<TopoDS_Shape>();
+  if (aMyShape.ShapeType() != aTheShape.ShapeType()) // to don't confuse by the face of same edges
+    return false;
+  TopExp_Explorer aMyExp(aMyShape, TopAbs_EDGE);
+  TopExp_Explorer aTheExp(aTheShape, TopAbs_EDGE);
+  for (; aMyExp.More() && aTheExp.More(); aMyExp.Next(), aTheExp.Next()) {
+    // check that edge by edge all geometrically matches
+    std::shared_ptr<GeomAPI_Edge> aMyEdge(new GeomAPI_Edge);
+    aMyEdge->setImpl<TopoDS_Shape>(new TopoDS_Shape(aMyExp.Current()));
+    std::shared_ptr<GeomAPI_Edge> aTheEdge(new GeomAPI_Edge);
+    aTheEdge->setImpl<TopoDS_Shape>(new TopoDS_Shape(aTheExp.Current()));
+    if (!aMyEdge->isEqual(aTheEdge))
+      return false;
+  }
+  return !(aMyExp.More() || aTheExp.More());
+}