-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014 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.
+// 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
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#include <Standard_Stream.hxx>
-
#include <GEOMImpl_CircleDriver.hxx>
+
#include <GEOMImpl_ICircle.hxx>
#include <GEOMImpl_Types.hxx>
+
#include <GEOM_Function.hxx>
+#include <GEOMUtils.hxx>
+
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRep_Tool.hxx>
+
#include <TopoDS.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Edge.hxx>
//=======================================================================
//function : GetID
//purpose :
-//=======================================================================
+//=======================================================================
const Standard_GUID& GEOMImpl_CircleDriver::GetID()
{
static Standard_GUID aCircleDriver("FF1BBB32-5D14-4df2-980B-3A668264EA16");
- return aCircleDriver;
+ return aCircleDriver;
}
//=======================================================================
//function : GEOMImpl_CircleDriver
-//purpose :
+//purpose :
//=======================================================================
-GEOMImpl_CircleDriver::GEOMImpl_CircleDriver()
+GEOMImpl_CircleDriver::GEOMImpl_CircleDriver()
{
}
//=======================================================================
//function : Execute
//purpose :
-//=======================================================================
+//=======================================================================
Standard_Integer GEOMImpl_CircleDriver::Execute(TFunction_Logbook& log) const
{
- if (Label().IsNull()) return 0;
+ if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
GEOMImpl_ICircle aCI (aFunction);
Handle(GEOM_Function) aRefVector = aCI.GetVector();
if (!aRefVector.IsNull()) {
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");
- }
- TopoDS_Edge anE = TopoDS::Edge(aShapeVec);
- TopoDS_Vertex V1, V2;
- TopExp::Vertices(anE, V1, V2, Standard_True);
- if (!V1.IsNull() && !V2.IsNull()) {
- 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");
- }
- }
+ // take orientation of edge into account to avoid regressions, as it was implemented so
+ aV = GEOMUtils::GetVector(aShapeVec, Standard_True);
}
// Axes
gp_Ax2 anAxes (aP, aV);
//Make Circle
gp_Ax2 anAxes (aP1, aDir);
gp_Circ aCirc (anAxes, aRadius);
- aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
+ aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
}
}
else if (aType == CIRCLE_THREE_PNT) {
Standard_ConstructionError::Raise("Circle creation aborted: points lay on one line");
Handle(Geom_Circle) aCirc = GC_MakeCircle(aP1, aP2, aP3).Value();
aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
- }
+ }
}
else {
}
aFunction->SetValue(aShape);
- log.SetTouched(Label());
+ log.SetTouched(Label());
- return 1;
+ return 1;
}
+//================================================================================
+/*!
+ * \brief Returns a name of creation operation and names and values of creation parameters
+ */
+//================================================================================
-//=======================================================================
-//function : GEOMImpl_CircleDriver_Type_
-//purpose :
-//=======================================================================
-Standard_EXPORT Handle_Standard_Type& GEOMImpl_CircleDriver_Type_()
+bool GEOMImpl_CircleDriver::
+GetCreationInformation(std::string& theOperationName,
+ std::vector<GEOM_Param>& theParams)
{
-
- static Handle_Standard_Type aType1 = STANDARD_TYPE(TFunction_Driver);
- if ( aType1.IsNull()) aType1 = STANDARD_TYPE(TFunction_Driver);
- static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
- if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
- static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
- if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
-
-
- static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
- static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_CircleDriver",
- sizeof(GEOMImpl_CircleDriver),
- 1,
- (Standard_Address)_Ancestors,
- (Standard_Address)NULL);
-
- return _aType;
+ if (Label().IsNull()) return 0;
+ Handle(GEOM_Function) function = GEOM_Function::GetFunction(Label());
+
+ GEOMImpl_ICircle aCI( function );
+ Standard_Integer aType = function->GetType();
+
+ theOperationName = "CIRCLE";
+
+ switch ( aType ) {
+ case CIRCLE_PNT_VEC_R:
+ AddParam( theParams, "Center Point", aCI.GetCenter(), "Origin" );
+ AddParam( theParams, "Vector", aCI.GetVector(), "Z axis" );
+ AddParam( theParams, "Radius", aCI.GetRadius() );
+ break;
+ case CIRCLE_CENTER_TWO_PNT:
+ AddParam( theParams, "Center Point", aCI.GetPoint1() );
+ AddParam( theParams, "Point 1", aCI.GetPoint2() );
+ AddParam( theParams, "Point 2", aCI.GetPoint3() );
+ break;
+ case CIRCLE_THREE_PNT:
+ AddParam( theParams, "Point 1", aCI.GetPoint1() );
+ AddParam( theParams, "Point 2", aCI.GetPoint2() );
+ AddParam( theParams, "Point 3", aCI.GetPoint3() );
+ break;
+ default:
+ return false;
+ }
+
+ return true;
}
-//=======================================================================
-//function : DownCast
-//purpose :
-//=======================================================================
-const Handle(GEOMImpl_CircleDriver) Handle(GEOMImpl_CircleDriver)::DownCast(const Handle(Standard_Transient)& AnObject)
-{
- Handle(GEOMImpl_CircleDriver) _anOtherObject;
+IMPLEMENT_STANDARD_HANDLE (GEOMImpl_CircleDriver,GEOM_BaseDriver);
- if (!AnObject.IsNull()) {
- if (AnObject->IsKind(STANDARD_TYPE(GEOMImpl_CircleDriver))) {
- _anOtherObject = Handle(GEOMImpl_CircleDriver)((Handle(GEOMImpl_CircleDriver)&)AnObject);
- }
- }
-
- return _anOtherObject ;
-}
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CircleDriver,GEOM_BaseDriver);