-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// 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
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
#include <Standard_Stream.hxx>
#include <GEOMImpl_EllipseDriver.hxx>
TopoDS_Shape aShapePnt = aRefPoint->GetValue();
if (aShapePnt.ShapeType() != TopAbs_VERTEX) {
Standard_ConstructionError::Raise
- ("Circle creation aborted: invalid center argument, must be a point");
+ ("Ellipse creation aborted: invalid center argument, must be a point");
}
aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
}
TopoDS_Shape aShapeVec = aRefVector->GetValue();
if (aShapeVec.ShapeType() != TopAbs_EDGE) {
Standard_ConstructionError::Raise
- ("Circle creation aborted: invalid vector argument, must be a vector or an edge");
+ ("Ellipse creation aborted: invalid normal vector argument, must be a vector or an edge");
}
TopoDS_Edge anE = TopoDS::Edge(aShapeVec);
TopoDS_Vertex V1, V2;
aV = gp_Vec(BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2));
if (aV.Magnitude() < gp::Resolution()) {
Standard_ConstructionError::Raise
- ("Circle creation aborted: vector of zero length is given");
+ ("Ellipse creation aborted: normal vector of zero length is given");
}
}
}
+
// Axes
gp_Ax2 anAxes (aP, aV);
+
+ // Main Axis vector
+ Handle(GEOM_Function) aRefVectorMaj = aCI.GetVectorMajor();
+ if (!aRefVectorMaj.IsNull()) {
+ TopoDS_Shape aShapeVec = aRefVectorMaj->GetValue();
+ if (aShapeVec.ShapeType() != TopAbs_EDGE) {
+ Standard_ConstructionError::Raise
+ ("Ellipse creation aborted: invalid major axis vector argument, must be a vector or an edge");
+ }
+ TopoDS_Edge anE = TopoDS::Edge(aShapeVec);
+ TopoDS_Vertex V1, V2;
+ TopExp::Vertices(anE, V1, V2, Standard_True);
+ if (!V1.IsNull() && !V2.IsNull()) {
+ gp_Vec aVM (BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2));
+ if (aVM.Magnitude() < gp::Resolution()) {
+ Standard_ConstructionError::Raise
+ ("Ellipse creation aborted: major axis vector of zero length is given");
+ }
+ if (aV.IsParallel(aVM, Precision::Angular())) {
+ Standard_ConstructionError::Raise
+ ("Ellipse creation aborted: normal and major axis vectors are parallel");
+ }
+ // Axes defined with main axis vector
+ anAxes = gp_Ax2 (aP, aV, aVM);
+ }
+ }
+
// Ellipse
gp_Elips anEll (anAxes, aCI.GetRMajor(), aCI.GetRMinor());
aShape = BRepBuilderAPI_MakeEdge(anEll).Edge();
static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_EllipseDriver",
- sizeof(GEOMImpl_EllipseDriver),
- 1,
- (Standard_Address)_Ancestors,
- (Standard_Address)NULL);
+ sizeof(GEOMImpl_EllipseDriver),
+ 1,
+ (Standard_Address)_Ancestors,
+ (Standard_Address)NULL);
return _aType;
}