Revert "Merge branch 'Pre_2.8.0_development'"

[modules/shaper.git] / src / GeomAPI / GeomAPI_Edge.cpp

diff --git a/src/GeomAPI/GeomAPI_Edge.cpp b/src/GeomAPI/GeomAPI_Edge.cpp
index 594829f8cbb90c0af9422be90d989aa6770f2e18..c336050f9c08bdd5f35cf56cd3e08e8a090303da 100644 (file)
--- a/src/GeomAPI/GeomAPI_Edge.cpp
+++ b/src/GeomAPI/GeomAPI_Edge.cpp
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomAPI_Edge.cpp
-// Created:     24 Jul 2014
-// Author:      Artem ZHIDKOV
+// Copyright (C) 2014-2017  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<mailto:webmaster.salome@opencascade.com>
+//
 
 #include<GeomAPI_Edge.h>
 #include<GeomAPI_Pln.h>
@@ -11,6 +25,8 @@
 #include<GeomAPI_Dir.h>
 #include<GeomAPI_Lin.h>
 
+#include <BRepAdaptor_Curve.hxx>
+
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS.hxx>
@@ -23,6 +39,8 @@
 #include <gp_Ax1.hxx>
 #include <gp_Pln.hxx>
 
+#include <GCPnts_AbscissaPoint.hxx>
+
 GeomAPI_Edge::GeomAPI_Edge()
 {
   TopoDS_Edge* anEdge = new TopoDS_Edge;
@@ -171,7 +189,7 @@ bool GeomAPI_Edge::isEqual(const std::shared_ptr<GeomAPI_Shape> theEdge) const
   gp_Pnt aInPnt1 = aInAdaptor.Value(aInStart);
   gp_Pnt aInPnt2 = aInAdaptor.Value(aInEnd);
 
-  if ((!aMyPnt1.IsEqual(aInPnt1, Precision::Confusion())) || 
+  if ((!aMyPnt1.IsEqual(aInPnt1, Precision::Confusion())) ||
     (!aMyPnt2.IsEqual(aInPnt2, Precision::Confusion())))
     return false;
 
@@ -189,6 +207,8 @@ bool GeomAPI_Edge::isInPlane(std::shared_ptr<GeomAPI_Pln> thePlane) const
   double aFirst, aLast;
   const TopoDS_Shape& aShape = const_cast<GeomAPI_Edge*>(this)->impl<TopoDS_Shape>();
   Handle(Geom_Curve) aCurve = BRep_Tool::Curve((const TopoDS_Edge&)aShape, aFirst, aLast);
+  if (aCurve.IsNull())
+    return false;
 
   double A, B, C, D;
   thePlane->coefficients(A, B, C, D);
@@ -219,3 +239,11 @@ bool GeomAPI_Edge::isInPlane(std::shared_ptr<GeomAPI_Pln> thePlane) const
   }
   return inPlane;
 }
+
+double GeomAPI_Edge::length() const
+{
+  const TopoDS_Edge& anEdge = TopoDS::Edge(impl<TopoDS_Shape>());
+  BRepAdaptor_Curve aBRepAdaptor = BRepAdaptor_Curve(anEdge);
+  Adaptor3d_Curve* anAdaptor3d = &aBRepAdaptor;
+  return GCPnts_AbscissaPoint::Length(*anAdaptor3d);
+}