From 78983d9dd27bfb14dd07f7fc8f7740e374b21d46 Mon Sep 17 00:00:00 2001 From: sliptonic Date: Fri, 26 May 2017 14:42:16 -0500 Subject: [PATCH] Path: trying to fix unit test again --- src/Mod/Path/PathTests/TestPathPost.py | 2 +- src/Mod/Path/PathTests/test_linuxcnc_00.ngc | 166 +++++++------------- 2 files changed, 54 insertions(+), 114 deletions(-) diff --git a/src/Mod/Path/PathTests/TestPathPost.py b/src/Mod/Path/PathTests/TestPathPost.py index a33f4fad7c..f2b3739ae1 100644 --- a/src/Mod/Path/PathTests/TestPathPost.py +++ b/src/Mod/Path/PathTests/TestPathPost.py @@ -78,7 +78,7 @@ class PathPostTestCases(unittest.TestCase): contour.OffsetExtra = 0.0 contour.Direction = 'CW' contour.ToolController = tc - contour.UseComp = True + contour.UseComp = False PathScripts.PathUtils.addToJob(contour) PathScripts.PathContour.ObjectContour.setDepths(contour.Proxy, contour) self.doc.recompute() diff --git a/src/Mod/Path/PathTests/test_linuxcnc_00.ngc b/src/Mod/Path/PathTests/test_linuxcnc_00.ngc index 5df4c3231f..4859ee3d72 100644 --- a/src/Mod/Path/PathTests/test_linuxcnc_00.ngc +++ b/src/Mod/Path/PathTests/test_linuxcnc_00.ngc @@ -7,123 +7,63 @@ M3 S0.0000 M6 T2.0 M3 S0.0000 (Contour) -(Compensated Tool Path. Diameter: 5.0) +(Uncompensated Tool Path) G0 Z15.0000 G90 G17 G0 X0.0000 Y0.0000 Z15.0000 -G0 X11.7677 Y11.7676 Z15.0000 -G0 X11.7677 Y11.7676 Z10.0000 -G1 X11.7677 Y11.7676 Z9.0000 -G3 X9.9999 Y12.4999 Z9.0000 I-1.7677 J-1.7677 -G1 X0.0001 Y12.4999 Z9.0000 -G3 X-2.4999 Y9.9999 Z9.0000 I-0.0000 J-2.5000 -G1 X-2.4999 Y0.0001 Z9.0000 -G3 X0.0001 Y-2.4999 Z9.0000 I2.5000 J-0.0000 -G1 X9.9999 Y-2.4999 Z9.0000 -G1 X10.4340 Y-2.4619 Z9.0000 -G3 X12.4999 Y0.0001 Z9.0000 I-0.4340 J2.4620 -G1 X12.4999 Y9.9999 Z9.0000 -G3 X11.7677 Y11.7676 Z9.0000 I-2.5000 J0.0000 -G1 X11.7677 Y11.7676 Z8.0000 -G3 X9.9999 Y12.4999 Z8.0000 I-1.7677 J-1.7677 -G1 X0.0001 Y12.4999 Z8.0000 -G3 X-2.4999 Y9.9999 Z8.0000 I-0.0000 J-2.5000 -G1 X-2.4999 Y0.0001 Z8.0000 -G3 X0.0001 Y-2.4999 Z8.0000 I2.5000 J-0.0000 -G1 X9.9999 Y-2.4999 Z8.0000 -G1 X10.4340 Y-2.4619 Z8.0000 -G3 X12.4999 Y0.0001 Z8.0000 I-0.4340 J2.4620 -G1 X12.4999 Y9.9999 Z8.0000 -G3 X11.7677 Y11.7676 Z8.0000 I-2.5000 J0.0000 -G1 X11.7677 Y11.7676 Z7.0000 -G3 X9.9999 Y12.4999 Z7.0000 I-1.7677 J-1.7677 -G1 X0.0001 Y12.4999 Z7.0000 -G3 X-2.4999 Y9.9999 Z7.0000 I-0.0000 J-2.5000 -G1 X-2.4999 Y0.0001 Z7.0000 -G3 X0.0001 Y-2.4999 Z7.0000 I2.5000 J-0.0000 -G1 X9.9999 Y-2.4999 Z7.0000 -G1 X10.4340 Y-2.4619 Z7.0000 -G3 X12.4999 Y0.0001 Z7.0000 I-0.4340 J2.4620 -G1 X12.4999 Y9.9999 Z7.0000 -G3 X11.7677 Y11.7676 Z7.0000 I-2.5000 J0.0000 -G1 X11.7677 Y11.7676 Z6.0000 -G3 X9.9999 Y12.4999 Z6.0000 I-1.7677 J-1.7677 -G1 X0.0001 Y12.4999 Z6.0000 -G3 X-2.4999 Y9.9999 Z6.0000 I-0.0000 J-2.5000 -G1 X-2.4999 Y0.0001 Z6.0000 -G3 X0.0001 Y-2.4999 Z6.0000 I2.5000 J-0.0000 -G1 X9.9999 Y-2.4999 Z6.0000 -G1 X10.4340 Y-2.4619 Z6.0000 -G3 X12.4999 Y0.0001 Z6.0000 I-0.4340 J2.4620 -G1 X12.4999 Y9.9999 Z6.0000 -G3 X11.7677 Y11.7676 Z6.0000 I-2.5000 J0.0000 -G1 X11.7677 Y11.7676 Z5.0000 -G3 X9.9999 Y12.4999 Z5.0000 I-1.7677 J-1.7677 -G1 X0.0001 Y12.4999 Z5.0000 -G3 X-2.4999 Y9.9999 Z5.0000 I-0.0000 J-2.5000 -G1 X-2.4999 Y0.0001 Z5.0000 -G3 X0.0001 Y-2.4999 Z5.0000 I2.5000 J-0.0000 -G1 X9.9999 Y-2.4999 Z5.0000 -G1 X10.4340 Y-2.4619 Z5.0000 -G3 X12.4999 Y0.0001 Z5.0000 I-0.4340 J2.4620 -G1 X12.4999 Y9.9999 Z5.0000 -G3 X11.7677 Y11.7676 Z5.0000 I-2.5000 J0.0000 -G1 X11.7677 Y11.7676 Z4.0000 -G3 X9.9999 Y12.4999 Z4.0000 I-1.7677 J-1.7677 -G1 X0.0001 Y12.4999 Z4.0000 -G3 X-2.4999 Y9.9999 Z4.0000 I-0.0000 J-2.5000 -G1 X-2.4999 Y0.0001 Z4.0000 -G3 X0.0001 Y-2.4999 Z4.0000 I2.5000 J-0.0000 -G1 X9.9999 Y-2.4999 Z4.0000 -G1 X10.4340 Y-2.4619 Z4.0000 -G3 X12.4999 Y0.0001 Z4.0000 I-0.4340 J2.4620 -G1 X12.4999 Y9.9999 Z4.0000 -G3 X11.7677 Y11.7676 Z4.0000 I-2.5000 J0.0000 -G1 X11.7677 Y11.7676 Z3.0000 -G3 X9.9999 Y12.4999 Z3.0000 I-1.7677 J-1.7677 -G1 X0.0001 Y12.4999 Z3.0000 -G3 X-2.4999 Y9.9999 Z3.0000 I-0.0000 J-2.5000 -G1 X-2.4999 Y0.0001 Z3.0000 -G3 X0.0001 Y-2.4999 Z3.0000 I2.5000 J-0.0000 -G1 X9.9999 Y-2.4999 Z3.0000 -G1 X10.4340 Y-2.4619 Z3.0000 -G3 X12.4999 Y0.0001 Z3.0000 I-0.4340 J2.4620 -G1 X12.4999 Y9.9999 Z3.0000 -G3 X11.7677 Y11.7676 Z3.0000 I-2.5000 J0.0000 -G1 X11.7677 Y11.7676 Z2.0000 -G3 X9.9999 Y12.4999 Z2.0000 I-1.7677 J-1.7677 -G1 X0.0001 Y12.4999 Z2.0000 -G3 X-2.4999 Y9.9999 Z2.0000 I-0.0000 J-2.5000 -G1 X-2.4999 Y0.0001 Z2.0000 -G3 X0.0001 Y-2.4999 Z2.0000 I2.5000 J-0.0000 -G1 X9.9999 Y-2.4999 Z2.0000 -G1 X10.4340 Y-2.4619 Z2.0000 -G3 X12.4999 Y0.0001 Z2.0000 I-0.4340 J2.4620 -G1 X12.4999 Y9.9999 Z2.0000 -G3 X11.7677 Y11.7676 Z2.0000 I-2.5000 J0.0000 -G1 X11.7677 Y11.7676 Z1.0000 -G3 X9.9999 Y12.4999 Z1.0000 I-1.7677 J-1.7677 -G1 X0.0001 Y12.4999 Z1.0000 -G3 X-2.4999 Y9.9999 Z1.0000 I-0.0000 J-2.5000 -G1 X-2.4999 Y0.0001 Z1.0000 -G3 X0.0001 Y-2.4999 Z1.0000 I2.5000 J-0.0000 -G1 X9.9999 Y-2.4999 Z1.0000 -G1 X10.4340 Y-2.4619 Z1.0000 -G3 X12.4999 Y0.0001 Z1.0000 I-0.4340 J2.4620 -G1 X12.4999 Y9.9999 Z1.0000 -G3 X11.7677 Y11.7676 Z1.0000 I-2.5000 J0.0000 -G1 X11.7677 Y11.7676 Z0.0000 -G3 X9.9999 Y12.4999 Z0.0000 I-1.7677 J-1.7677 -G1 X0.0001 Y12.4999 Z0.0000 -G3 X-2.4999 Y9.9999 Z0.0000 I-0.0000 J-2.5000 -G1 X-2.4999 Y0.0001 Z0.0000 -G3 X0.0001 Y-2.4999 Z0.0000 I2.5000 J-0.0000 -G1 X9.9999 Y-2.4999 Z0.0000 -G1 X10.4340 Y-2.4619 Z0.0000 -G3 X12.4999 Y0.0001 Z0.0000 I-0.4340 J2.4620 -G1 X12.4999 Y9.9999 Z0.0000 -G3 X11.7677 Y11.7676 Z0.0000 I-2.5000 J0.0000 +G0 X10.0000 Y10.0000 Z15.0000 +G0 X10.0000 Y10.0000 Z10.0000 +G1 X10.0000 Y10.0000 Z9.0000 +G1 X10.0000 Y0.0000 Z9.0000 +G1 X0.0000 Y0.0000 Z9.0000 +G1 X0.0000 Y10.0000 Z9.0000 +G1 X10.0000 Y10.0000 Z9.0000 +G1 X10.0000 Y10.0000 Z8.0000 +G1 X10.0000 Y0.0000 Z8.0000 +G1 X0.0000 Y0.0000 Z8.0000 +G1 X0.0000 Y10.0000 Z8.0000 +G1 X10.0000 Y10.0000 Z8.0000 +G1 X10.0000 Y10.0000 Z7.0000 +G1 X10.0000 Y0.0000 Z7.0000 +G1 X0.0000 Y0.0000 Z7.0000 +G1 X0.0000 Y10.0000 Z7.0000 +G1 X10.0000 Y10.0000 Z7.0000 +G1 X10.0000 Y10.0000 Z6.0000 +G1 X10.0000 Y0.0000 Z6.0000 +G1 X0.0000 Y0.0000 Z6.0000 +G1 X0.0000 Y10.0000 Z6.0000 +G1 X10.0000 Y10.0000 Z6.0000 +G1 X10.0000 Y10.0000 Z5.0000 +G1 X10.0000 Y0.0000 Z5.0000 +G1 X0.0000 Y0.0000 Z5.0000 +G1 X0.0000 Y10.0000 Z5.0000 +G1 X10.0000 Y10.0000 Z5.0000 +G1 X10.0000 Y10.0000 Z4.0000 +G1 X10.0000 Y0.0000 Z4.0000 +G1 X0.0000 Y0.0000 Z4.0000 +G1 X0.0000 Y10.0000 Z4.0000 +G1 X10.0000 Y10.0000 Z4.0000 +G1 X10.0000 Y10.0000 Z3.0000 +G1 X10.0000 Y0.0000 Z3.0000 +G1 X0.0000 Y0.0000 Z3.0000 +G1 X0.0000 Y10.0000 Z3.0000 +G1 X10.0000 Y10.0000 Z3.0000 +G1 X10.0000 Y10.0000 Z2.0000 +G1 X10.0000 Y0.0000 Z2.0000 +G1 X0.0000 Y0.0000 Z2.0000 +G1 X0.0000 Y10.0000 Z2.0000 +G1 X10.0000 Y10.0000 Z2.0000 +G1 X10.0000 Y10.0000 Z1.0000 +G1 X10.0000 Y0.0000 Z1.0000 +G1 X0.0000 Y0.0000 Z1.0000 +G1 X0.0000 Y10.0000 Z1.0000 +G1 X10.0000 Y10.0000 Z1.0000 +G1 X10.0000 Y10.0000 Z0.0000 +G1 X10.0000 Y0.0000 Z0.0000 +G1 X0.0000 Y0.0000 Z0.0000 +G1 X0.0000 Y10.0000 Z0.0000 +G1 X10.0000 Y10.0000 Z0.0000 M05 G00 X-1.0 Y1.0 G17 G90