IMP 0021064: correct implementation

[modules/geom.git] / src / GEOMImpl / GEOMImpl_VectorDriver.cxx

diff --git a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx
index 312fe4b23e7489a4464176cb8d23848f2775f298..98a9a600e90318bfbf48669a9f7b64e4b535243a 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx
@@ -1,9 +1,30 @@
-
-using namespace std;
-#include "GEOMImpl_VectorDriver.hxx"
-#include "GEOMImpl_IVector.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+//  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 <Standard_Stream.hxx>
+
+#include <GEOMImpl_VectorDriver.hxx>
+#include <GEOMImpl_IVector.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRep_Tool.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
@@ -15,6 +36,8 @@ using namespace std;
 
 #include <gp_Pnt.hxx>
 #include <Precision.hxx>
+#include <Geom_Curve.hxx>
+#include <gp_Vec.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <Standard_ConstructionError.hxx>
 
@@ -48,7 +71,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;
 
@@ -71,13 +94,40 @@ Standard_Integer GEOMImpl_VectorDriver::Execute(TFunction_Logbook& log) const
     if (aShape1.IsSame(aShape2)) {
       Standard_ConstructionError::Raise("The end points must be different");
     }
-    gp_Pnt P1 = BRep_Tool::Pnt(TopoDS::Vertex(aShape1));
-    gp_Pnt P2 = BRep_Tool::Pnt(TopoDS::Vertex(aShape2));
+    TopoDS_Vertex V1 = TopoDS::Vertex(aShape1);
+    TopoDS_Vertex V2 = TopoDS::Vertex(aShape2);
+    gp_Pnt P1 = BRep_Tool::Pnt(V1);
+    gp_Pnt P2 = BRep_Tool::Pnt(V2);
     if (P1.Distance(P2) < Precision::Confusion()) {
       Standard_ConstructionError::Raise("The end points are too close");
     }
-    aShape = BRepBuilderAPI_MakeEdge(P1, P2).Shape();
-  } else {
+    aShape = BRepBuilderAPI_MakeEdge(V1, V2).Shape();
+  } 
+  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;
@@ -107,10 +157,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;
 }