-// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015 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
if (aCI.GetH() < 0.0) aV.Reverse();
gp_Ax2 anAxes (aP, aV);
- bool switchAngleVar;
- if(aType == CYLINDER_R_H || aType == CYLINDER_PNT_VEC_R_H) switchAngleVar = false;
- else if(aType == CYLINDER_R_H_A || aType == CYLINDER_PNT_VEC_R_H_A) switchAngleVar = true;
- else return 0;
+
TopoDS_Shape aShape;
- switch (switchAngleVar) {
- case false:
- {
- BRepPrimAPI_MakeCylinder MC (anAxes, aCI.GetR(), Abs(aCI.GetH()));
- MC.Build();
- if (!MC.IsDone()) {
- StdFail_NotDone::Raise("Cylinder can't be computed from the given parameters");
+ switch (aType) {
+ case CYLINDER_R_H:
+ case CYLINDER_PNT_VEC_R_H:
+ {
+ BRepPrimAPI_MakeCylinder MC (anAxes, aCI.GetR(), Abs(aCI.GetH()));
+ MC.Build();
+ if (!MC.IsDone()) {
+ StdFail_NotDone::Raise("Cylinder can't be computed from the given parameters");
+ }
+ aShape = MC.Shape();
+ break;
}
- aShape = MC.Shape();
- break;
- }
- case true:
- {
- BRepPrimAPI_MakeCylinder MCA (anAxes, aCI.GetR(), Abs(aCI.GetH()), aCI.GetA());
- MCA.Build();
- if (!MCA.IsDone()) {
- StdFail_NotDone::Raise("Cylinder can't be computed from the given parameters. Failure.");
- return 0;
+ case CYLINDER_R_H_A:
+ case CYLINDER_PNT_VEC_R_H_A:
+ {
+ BRepPrimAPI_MakeCylinder MC (anAxes, aCI.GetR(), Abs(aCI.GetH()), aCI.GetA());
+ MC.Build();
+ if (!MC.IsDone()) {
+ StdFail_NotDone::Raise("Cylinder can't be computed from the given parameters. Failure.");
+ }
+ aShape = MC.Shape();
+ break;
}
- aShape = MCA.Shape();
- break;
- }
default:
- return 0;
+ break;
}
+
if (aShape.IsNull()) return 0;
aFunction->SetValue(aShape);
AddParam( theParams, "Radius", aCI.GetR() );
AddParam( theParams, "Height", aCI.GetH() );
break;
- case CONE_PNT_VEC_R1_R2_H:
+ case CYLINDER_R_H_A:
+ AddParam( theParams, "Radius", aCI.GetR() );
+ AddParam( theParams, "Height", aCI.GetH() );
+ AddParam( theParams, "Angle", aCI.GetA() );
+ break;
+ case CYLINDER_PNT_VEC_R_H:
AddParam( theParams, "Base Point", aCI.GetPoint() );
AddParam( theParams, "Vector", aCI.GetVector() );
AddParam( theParams, "Radius", aCI.GetR() );
AddParam( theParams, "Height", aCI.GetH() );
break;
+ case CYLINDER_PNT_VEC_R_H_A:
+ AddParam( theParams, "Base Point", aCI.GetPoint() );
+ AddParam( theParams, "Vector", aCI.GetVector() );
+ AddParam( theParams, "Radius", aCI.GetR() );
+ AddParam( theParams, "Height", aCI.GetH() );
+ AddParam( theParams, "Angle", aCI.GetA() );
+ break;
default:
return false;
}
-
+
return true;
}