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

Fix BSpline/Circle conversion

Browse Source
This commit is contained in:
wandererfan
2018-10-29 20:21:48 -04:00
committed by wmayer
parent 47f4a9dacb
commit 3ec9b798bf
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/TechDraw/App/Geometry.cpp
View File

@@ -623,8 +623,8 @@ bool BSpline::isCircle()
Base::Vector3d center;
bool isArc = false;
getCircleParms(result,radius,center,isArc);
Base::Console().Message("TRACE - GEO::BS::isCircle - result: %d radius: %.3f center: %s isArc %d\n",
result,radius,DrawUtil::formatVector(center).c_str(),isArc);
// Base::Console().Message("TRACE - GEO::BS::isCircle - result: %d radius: %.3f center: %s isArc %d\n",
// result,radius,DrawUtil::formatVector(center).c_str(),isArc);
return result;
}
@@ -756,12 +756,14 @@ TopoDS_Edge BSpline::isCircle2(bool& arc)
gp_Pnt center2 = circle2.Location();
Base::Vector3d vc2 = DrawUtil::gpPnt2V3(center2);
// test circle creation and compare radii
// test circle creation and compare radii & centers
double allowError = 0.0008; //trial and error 8/10,000mm printer resolution is 0.085mm
double radius;
Base::Vector3d center;
if ( (gce_circ1.Status() == gce_Done) &&
(gce_circ2.Status() == gce_Done) &&
(!DrawUtil::fpCompare(radius2,radius1)) ) {
(DrawUtil::fpCompare(radius2,radius1, allowError)) &&
(vc1.IsEqual(vc2,allowError))) {
if (arc) {
GC_MakeArcOfCircle makeArc(s,pcm,e);
Handle(Geom_TrimmedCurve) tCurve = makeArc.Value();