X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_Circ.cpp;h=87662f275a42cdc2e18a4510c50b4bb8ed2621d9;hb=f60dc9dd94d5d4b0ea07e3e3cbfd5b3028f0942d;hp=8988870caa4353d03e5cbeb454513e61837cd08a;hpb=87474d56199326bace66da349e9dc2c44e02d3a7;p=modules%2Fshaper.git diff --git a/src/GeomAPI/GeomAPI_Circ.cpp b/src/GeomAPI/GeomAPI_Circ.cpp index 8988870ca..87662f275 100644 --- a/src/GeomAPI/GeomAPI_Circ.cpp +++ b/src/GeomAPI/GeomAPI_Circ.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: GeomAPI_Circ2cpp -// Created: 24 Jun 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 +// #include @@ -42,6 +56,16 @@ GeomAPI_Circ::GeomAPI_Circ(const std::shared_ptr& theCenter, { } +//================================================================================================= +GeomAPI_Circ::GeomAPI_Circ(const GeomCurvePtr& theCurve) +{ + Handle(Geom_Curve) aCurve = theCurve->impl(); + Handle(Geom_Circle) aCirc = Handle(Geom_Circle)::DownCast(aCurve); + if (aCirc.IsNull()) + throw Standard_ConstructionError("GeomAPI_Circ: Curve is not a circle"); + setImpl(new gp_Circ(aCirc->Circ())); +} + //================================================================================================= const std::shared_ptr GeomAPI_Circ::center() const { @@ -90,7 +114,7 @@ const bool GeomAPI_Circ::parameter(const std::shared_ptr thePoint, double& theParameter) const { Handle(Geom_Circle) aCurve = new Geom_Circle(*MY_CIRC); - return GeomLib_Tool::Parameter(aCurve, thePoint->impl(), + return GeomLib_Tool::Parameter(aCurve, thePoint->impl(), theTolerance, theParameter) == Standard_True; }