kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Part & PartDesign Cone: allow equal radii (#12219)

Browse Source 
* PartDesign_Cone: allow equal radii

* fix R2 < R1

* Part_Cone: allow equal radii
This commit is contained in:
Florian Foinant-Willig
2024-02-12 18:21:53 +01:00
committed by GitHub
parent 51f546f1f6
commit 1eb0444bd5
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Mod/Part/App/PrimitiveFeature.cpp
View File

@@ -658,12 +658,21 @@ App::DocumentObjectExecReturn *Cone::execute()
if (Height.getValue() < Precision::Confusion())
return new App::DocumentObjectExecReturn("Height of cone too small");
try {
// Build a cone
BRepPrimAPI_MakeCone mkCone(Radius1.getValue(),
Radius2.getValue(),
Height.getValue(),
Angle.getValue()/180.0f*M_PI);
TopoDS_Shape ResultShape = mkCone.Shape();
TopoDS_Shape ResultShape;
if (std::abs(Radius1.getValue() - Radius2.getValue()) < Precision::Confusion()){
//Build a cylinder
BRepPrimAPI_MakeCylinder mkCylr(Radius1.getValue(),
Height.getValue(),
2.0 * M_PI);
ResultShape = mkCylr.Shape();
} else {
// Build a cone
BRepPrimAPI_MakeCone mkCone(Radius1.getValue(),
Radius2.getValue(),
Height.getValue(),
Angle.getValue()/180.0f*M_PI);
ResultShape = mkCone.Shape();
}
this->Shape.setValue(ResultShape);
}
catch (Standard_Failure& e) {