From ba6132c4b4121d84c21ecb54235faf2fa19ab00a Mon Sep 17 00:00:00 2001 From: kreso-t Date: Sun, 9 Sep 2018 20:28:45 +0200 Subject: [PATCH] Path: Adaptive - fix for convetional mode detection --- src/Mod/Path/libarea/Adaptive.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Mod/Path/libarea/Adaptive.cpp b/src/Mod/Path/libarea/Adaptive.cpp index f75f273b7e..17596e0f96 100644 --- a/src/Mod/Path/libarea/Adaptive.cpp +++ b/src/Mod/Path/libarea/Adaptive.cpp @@ -967,19 +967,15 @@ namespace AdaptivePath { if(preventConvetional && interPathLen>=RESOLUTION_FACTOR) { // detect conventional mode cut - we want only climb mode - if(!IsPointWithinCutRegion(cleared_paths,c2)) { - if(PointSideOfLine(fpc2,lpc2,c2)<0) { - IntPoint midPoint(long(c2.X + toolRadiusScaled*cos(0.5*(maxFi+minFi))),long(c2.Y + toolRadiusScaled*sin(0.5*(maxFi+minFi)))); - if(PointSideOfLine(fpc2,lpc2,midPoint)>0) { + IntPoint midPoint(long(c2.X + toolRadiusScaled*cos(0.5*(maxFi+minFi))),long(c2.Y + toolRadiusScaled*sin(0.5*(maxFi+minFi)))); + if(PointSideOfLine(c1,c2,midPoint)<0) { area = __DBL_MAX__; Perf_CalcCutArea.Stop(); // #ifdef DEV_MODE // cout << "Break: @(" << double(c2.X)/scaleFactor << "," << double(c2.Y)/scaleFactor << ") conventional mode" << endl; // #endif return area; - } } - } } double scanDistance = 2.5*toolRadiusScaled;