[CAM] separate tolerance variable used for arc fitting from tolerance used for section height offsets
This commit is contained in:
@@ -50,11 +50,11 @@ double CArc::IncludedAngle() const
|
||||
bool CArc::AlmostALine() const
|
||||
{
|
||||
Point mid_point = MidParam(0.5);
|
||||
if (Line(m_s, m_e - m_s).Dist(mid_point) <= Point::tolerance) {
|
||||
if (Line(m_s, m_e - m_s).Dist(mid_point) <= Point::arc_tolerance) {
|
||||
return true;
|
||||
}
|
||||
|
||||
const double max_arc_radius = 1.0 / Point::tolerance;
|
||||
const double max_arc_radius = 1.0 / Point::arc_tolerance;
|
||||
double radius = m_c.dist(m_s);
|
||||
if (radius > max_arc_radius) {
|
||||
return true; // We don't want to produce an arc whose radius is too large.
|
||||
|
||||
@@ -14,6 +14,7 @@ const Point operator*(const double& d, const Point& p)
|
||||
return p * d;
|
||||
}
|
||||
double Point::tolerance = 0.001;
|
||||
double Point::arc_tolerance = 0.001;
|
||||
|
||||
// static const double PI = 3.1415926535897932; duplicated in kurve/geometry.h
|
||||
|
||||
|
||||
@@ -58,6 +58,7 @@ public:
|
||||
{} // vector from p0 to p1
|
||||
|
||||
static double tolerance;
|
||||
static double arc_tolerance;
|
||||
|
||||
const Point operator+(const Point& p) const
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user