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

Part: [skip ci] for Part::Torus primitive use TopoShape::makeTorus

Browse Source
This commit is contained in:
wmayer
2020-12-03 14:52:13 +01:00
parent c578f9747a
commit 88de941d1b
1 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,6 @@
# include <BRepPrimAPI_MakePrism.hxx>
# include <BRepPrimAPI_MakeRevol.hxx>
# include <BRepPrimAPI_MakeSphere.hxx>
# include <BRepPrimAPI_MakeTorus.hxx>
# include <BRepPrim_Wedge.hxx>
# include <BRepBuilderAPI_MakeEdge.hxx>
# include <BRepBuilderAPI_MakeFace.hxx>
@@ -775,34 +774,14 @@ App::DocumentObjectExecReturn *Torus::execute(void)
if (Radius2.getValue() < Precision::Confusion())
return new App::DocumentObjectExecReturn("Radius of torus too small");
try {
#if 1
// Build a torus
gp_Circ circle;
circle.SetRadius(Radius2.getValue());
gp_Pnt pos(Radius1.getValue(),0,0);
gp_Dir dir(0,1,0);
circle.SetAxis(gp_Ax1(pos, dir));
BRepBuilderAPI_MakeEdge mkEdge(circle, Base::toRadians<double>(Angle1.getValue()+180.0f),
Base::toRadians<double>(Angle2.getValue()+180.0f));
BRepBuilderAPI_MakeWire mkWire;
mkWire.Add(mkEdge.Edge());
BRepBuilderAPI_MakeFace mkFace(mkWire.Wire());
BRepPrimAPI_MakeRevol mkRevol(mkFace.Face(), gp_Ax1(gp_Pnt(0,0,0), gp_Dir(0,0,1)),
Base::toRadians<double>(Angle3.getValue()), Standard_True);
TopoDS_Shape ResultShape = mkRevol.Shape();
#else
BRepPrimAPI_MakeTorus mkTorus(Radius1.getValue(),
Radius2.getValue(),
Angle1.getValue()/180.0f*Standard_PI,
Angle2.getValue()/180.0f*Standard_PI,
Angle3.getValue()/180.0f*Standard_PI);
const TopoDS_Solid& ResultShape = mkTorus.Solid();
#endif
this->Shape.setValue(ResultShape);
TopoShape shape;
this->Shape.setValue(shape.makeTorus(Radius1.getValue(),
Radius2.getValue(),
Angle1.getValue(),
Angle2.getValue(),
Angle3.getValue()));
}
catch (Standard_Failure& e) {
return new App::DocumentObjectExecReturn(e.GetMessageString());
}