X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMImpl%2FGEOMImpl_VectorDriver.cxx;h=c7a67168f59f06ec54800cf538e013ee786abec7;hb=3059f9d5521dd7c91c35c50afbd6beb18b8826fd;hp=1c9602cc98e06e224f23742af6c8dd2315883a4b;hpb=e2dcf4323c7d7c36e8e1a4fda4dd6cf86c99be81;p=modules%2Fgeom.git diff --git a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx index 1c9602cc9..c7a67168f 100644 --- a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx @@ -1,3 +1,25 @@ +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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. +// +// 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 #include @@ -15,6 +37,8 @@ #include #include +#include +#include #include #include @@ -48,7 +72,7 @@ Standard_Integer GEOMImpl_VectorDriver::Execute(TFunction_Logbook& log) const GEOMImpl_IVector aPI (aFunction); Standard_Integer aType = aFunction->GetType(); - if (aType != VECTOR_DX_DY_DZ && aType != VECTOR_TWO_PNT) return 0; + if (aType != VECTOR_DX_DY_DZ && aType != VECTOR_TWO_PNT && aType != VECTOR_TANGENT_CURVE_PAR) return 0; TopoDS_Shape aShape; @@ -79,7 +103,32 @@ Standard_Integer GEOMImpl_VectorDriver::Execute(TFunction_Logbook& log) const Standard_ConstructionError::Raise("The end points are too close"); } aShape = BRepBuilderAPI_MakeEdge(V1, V2).Shape(); - } else { + } + else if(aType == VECTOR_TANGENT_CURVE_PAR) { + Handle(GEOM_Function) aRefCurve = aPI.GetCurve(); + TopoDS_Shape aRefShape = aRefCurve->GetValue(); + if (aRefShape.ShapeType() != TopAbs_EDGE) { + Standard_TypeMismatch::Raise + ("Tangent On Curve creation aborted : curve shape is not an edge"); + } + Standard_Real aFParam =0., aLParam =0., aParam =0.; + Handle(Geom_Curve) aCurve = BRep_Tool::Curve(TopoDS::Edge(aRefShape), aFParam, aLParam); + if(aCurve.IsNull()) { + Standard_TypeMismatch::Raise + ("Tangent On Curve creation aborted : curve is null"); + } + + aParam = aFParam + (aLParam - aFParam) * aPI.GetParameter(); + gp_Pnt aPoint1,aPoint2; + gp_Vec aVec; + aCurve->D1(aParam,aPoint1,aVec); + if(aVec.Magnitude() < gp::Resolution()) + Standard_TypeMismatch::Raise + ("Tangent On Curve creation aborted : invalid value of tangent"); + aPoint2.SetXYZ(aPoint1.XYZ() + aVec.XYZ()); + BRepBuilderAPI_MakeEdge aBuilder(aPoint1,aPoint2); + if(aBuilder.IsDone()) + aShape = aBuilder.Shape(); } if (aShape.IsNull()) return 0; @@ -109,10 +158,10 @@ Standard_EXPORT Handle_Standard_Type& GEOMImpl_VectorDriver_Type_() static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL}; static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_VectorDriver", - sizeof(GEOMImpl_VectorDriver), - 1, - (Standard_Address)_Ancestors, - (Standard_Address)NULL); + sizeof(GEOMImpl_VectorDriver), + 1, + (Standard_Address)_Ancestors, + (Standard_Address)NULL); return _aType; }