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

libarea: disable max arc points parameter

Browse Source 
It is soly used to limit excessive arc accuracy used by ClipperLib, and
seems to have some negative effect. We disabled it here, and simply rely
on user to choose a sensible arc 'accuracy' parameter.
This commit is contained in:
Zheng, Lei
2017-11-30 11:59:10 +08:00
parent 8bbcfd6dce
commit 7249365823
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Path/App/AreaParams.h
View File

@@ -89,7 +89,7 @@
((double,accuracy,Accuracy,0.01,"Arc fitting accuracy",App::PropertyPrecision))\
((double,units,Unit,1.0,"Scaling factor for conversion to inch",App::PropertyFloat))\
((short,min_arc_points,MinArcPoints,4,"Minimum segments for arc discretization"))\
((short,max_arc_points,MaxArcPoints,100,"Maximum segments for arc discretization"))\
((short,max_arc_points,MaxArcPoints,100,"Maximum segments for arc discretization (ignored currently)"))\
((double,clipper_scale,ClipperScale,1e7,\
"ClipperLib operate on intergers. This is the scale factor to convert\n"\
"floating points.",App::PropertyFloat))

8
src/Mod/Path/libarea/AreaClipper.cpp
View File

@@ -83,8 +83,8 @@ static void AddVertex(const CVertex& vertex, const CVertex* prev_vertex)
if (Segments < CArea::m_min_arc_points)
Segments = CArea::m_min_arc_points;
if (Segments > CArea::m_max_arc_points)
Segments=CArea::m_max_arc_points;
// if (Segments > CArea::m_max_arc_points)
// Segments=CArea::m_max_arc_points;
dphi=phit/(Segments);
@@ -521,8 +521,8 @@ void CArea::OffsetWithClipper(double offset,
int Segments=(int)ceil(PI/dphi);
if (Segments < 2*CArea::m_min_arc_points)
Segments = 2*CArea::m_min_arc_points;
if (Segments > CArea::m_max_arc_points)
Segments=CArea::m_max_arc_points;
// if (Segments > CArea::m_max_arc_points)
// Segments=CArea::m_max_arc_points;
dphi = PI/Segments;
roundPrecision = (1.0-cos(dphi))*fabs(offset);
}else