diff --git a/src/Mod/Path/PathScripts/PathUtils.py b/src/Mod/Path/PathScripts/PathUtils.py index f2e2457072..420af641b7 100644 --- a/src/Mod/Path/PathScripts/PathUtils.py +++ b/src/Mod/Path/PathScripts/PathUtils.py @@ -43,6 +43,8 @@ FreeCAD.setLogLevel('Path.Area',0) def waiting_effects(function): def new_function(*args, **kwargs): + if not FreeCAD.GuiUp: + return function(*args, **kwargs) QtGui.QApplication.setOverrideCursor(QtCore.Qt.WaitCursor) res = None try: diff --git a/src/Mod/Path/PathTests/test_linuxcnc_00.ngc b/src/Mod/Path/PathTests/test_linuxcnc_00.ngc index 79a55e10e0..5df4c3231f 100644 --- a/src/Mod/Path/PathTests/test_linuxcnc_00.ngc +++ b/src/Mod/Path/PathTests/test_linuxcnc_00.ngc @@ -7,101 +7,123 @@ M3 S0.0000 M6 T2.0 M3 S0.0000 (Contour) -(Uncompensated Tool Path) +(Compensated Tool Path. Diameter: 5.0) G0 Z15.0000 -G00 X-2.5000 Y0.0000 -G00 Z23.0000 -G01 X-2.5000 Y0.0000 Z9.0000 F0.00 -G01 X-2.5000 Y10.0000 Z9.0000 F0.00 -G02 X0.0000 Y12.5000 Z9.0000 I2.5000 J0.0000 F0.00 -G01 X10.0000 Y12.5000 Z9.0000 F0.00 -G02 X12.5000 Y10.0000 Z9.0000 I0.0000 J-2.5000 F0.00 -G01 X12.5000 Y0.0000 Z9.0000 F0.00 -G02 X10.0000 Y-2.5000 Z9.0000 I-2.5000 J0.0000 F0.00 -G01 X0.0000 Y-2.5000 Z9.0000 F0.00 -G02 X-2.5000 Y0.0000 Z9.0000 I0.0000 J2.5000 F0.00 -G01 X-2.5000 Y0.0000 Z8.0000 F0.00 -G01 X-2.5000 Y10.0000 Z8.0000 F0.00 -G02 X0.0000 Y12.5000 Z8.0000 I2.5000 J0.0000 F0.00 -G01 X10.0000 Y12.5000 Z8.0000 F0.00 -G02 X12.5000 Y10.0000 Z8.0000 I0.0000 J-2.5000 F0.00 -G01 X12.5000 Y0.0000 Z8.0000 F0.00 -G02 X10.0000 Y-2.5000 Z8.0000 I-2.5000 J0.0000 F0.00 -G01 X0.0000 Y-2.5000 Z8.0000 F0.00 -G02 X-2.5000 Y0.0000 Z8.0000 I0.0000 J2.5000 F0.00 -G01 X-2.5000 Y0.0000 Z7.0000 F0.00 -G01 X-2.5000 Y10.0000 Z7.0000 F0.00 -G02 X0.0000 Y12.5000 Z7.0000 I2.5000 J0.0000 F0.00 -G01 X10.0000 Y12.5000 Z7.0000 F0.00 -G02 X12.5000 Y10.0000 Z7.0000 I0.0000 J-2.5000 F0.00 -G01 X12.5000 Y0.0000 Z7.0000 F0.00 -G02 X10.0000 Y-2.5000 Z7.0000 I-2.5000 J0.0000 F0.00 -G01 X0.0000 Y-2.5000 Z7.0000 F0.00 -G02 X-2.5000 Y0.0000 Z7.0000 I0.0000 J2.5000 F0.00 -G01 X-2.5000 Y0.0000 Z6.0000 F0.00 -G01 X-2.5000 Y10.0000 Z6.0000 F0.00 -G02 X0.0000 Y12.5000 Z6.0000 I2.5000 J0.0000 F0.00 -G01 X10.0000 Y12.5000 Z6.0000 F0.00 -G02 X12.5000 Y10.0000 Z6.0000 I0.0000 J-2.5000 F0.00 -G01 X12.5000 Y0.0000 Z6.0000 F0.00 -G02 X10.0000 Y-2.5000 Z6.0000 I-2.5000 J0.0000 F0.00 -G01 X0.0000 Y-2.5000 Z6.0000 F0.00 -G02 X-2.5000 Y0.0000 Z6.0000 I0.0000 J2.5000 F0.00 -G01 X-2.5000 Y0.0000 Z5.0000 F0.00 -G01 X-2.5000 Y10.0000 Z5.0000 F0.00 -G02 X0.0000 Y12.5000 Z5.0000 I2.5000 J0.0000 F0.00 -G01 X10.0000 Y12.5000 Z5.0000 F0.00 -G02 X12.5000 Y10.0000 Z5.0000 I0.0000 J-2.5000 F0.00 -G01 X12.5000 Y0.0000 Z5.0000 F0.00 -G02 X10.0000 Y-2.5000 Z5.0000 I-2.5000 J0.0000 F0.00 -G01 X0.0000 Y-2.5000 Z5.0000 F0.00 -G02 X-2.5000 Y0.0000 Z5.0000 I0.0000 J2.5000 F0.00 -G01 X-2.5000 Y0.0000 Z4.0000 F0.00 -G01 X-2.5000 Y10.0000 Z4.0000 F0.00 -G02 X0.0000 Y12.5000 Z4.0000 I2.5000 J0.0000 F0.00 -G01 X10.0000 Y12.5000 Z4.0000 F0.00 -G02 X12.5000 Y10.0000 Z4.0000 I0.0000 J-2.5000 F0.00 -G01 X12.5000 Y0.0000 Z4.0000 F0.00 -G02 X10.0000 Y-2.5000 Z4.0000 I-2.5000 J0.0000 F0.00 -G01 X0.0000 Y-2.5000 Z4.0000 F0.00 -G02 X-2.5000 Y0.0000 Z4.0000 I0.0000 J2.5000 F0.00 -G01 X-2.5000 Y0.0000 Z3.0000 F0.00 -G01 X-2.5000 Y10.0000 Z3.0000 F0.00 -G02 X0.0000 Y12.5000 Z3.0000 I2.5000 J0.0000 F0.00 -G01 X10.0000 Y12.5000 Z3.0000 F0.00 -G02 X12.5000 Y10.0000 Z3.0000 I0.0000 J-2.5000 F0.00 -G01 X12.5000 Y0.0000 Z3.0000 F0.00 -G02 X10.0000 Y-2.5000 Z3.0000 I-2.5000 J0.0000 F0.00 -G01 X0.0000 Y-2.5000 Z3.0000 F0.00 -G02 X-2.5000 Y0.0000 Z3.0000 I0.0000 J2.5000 F0.00 -G01 X-2.5000 Y0.0000 Z2.0000 F0.00 -G01 X-2.5000 Y10.0000 Z2.0000 F0.00 -G02 X0.0000 Y12.5000 Z2.0000 I2.5000 J0.0000 F0.00 -G01 X10.0000 Y12.5000 Z2.0000 F0.00 -G02 X12.5000 Y10.0000 Z2.0000 I0.0000 J-2.5000 F0.00 -G01 X12.5000 Y0.0000 Z2.0000 F0.00 -G02 X10.0000 Y-2.5000 Z2.0000 I-2.5000 J0.0000 F0.00 -G01 X0.0000 Y-2.5000 Z2.0000 F0.00 -G02 X-2.5000 Y0.0000 Z2.0000 I0.0000 J2.5000 F0.00 -G01 X-2.5000 Y0.0000 Z1.0000 F0.00 -G01 X-2.5000 Y10.0000 Z1.0000 F0.00 -G02 X0.0000 Y12.5000 Z1.0000 I2.5000 J0.0000 F0.00 -G01 X10.0000 Y12.5000 Z1.0000 F0.00 -G02 X12.5000 Y10.0000 Z1.0000 I0.0000 J-2.5000 F0.00 -G01 X12.5000 Y0.0000 Z1.0000 F0.00 -G02 X10.0000 Y-2.5000 Z1.0000 I-2.5000 J0.0000 F0.00 -G01 X0.0000 Y-2.5000 Z1.0000 F0.00 -G02 X-2.5000 Y0.0000 Z1.0000 I0.0000 J2.5000 F0.00 -G01 X-2.5000 Y0.0000 Z0.0000 F0.00 -G01 X-2.5000 Y10.0000 Z0.0000 F0.00 -G02 X0.0000 Y12.5000 Z0.0000 I2.5000 J0.0000 F0.00 -G01 X10.0000 Y12.5000 Z0.0000 F0.00 -G02 X12.5000 Y10.0000 Z0.0000 I0.0000 J-2.5000 F0.00 -G01 X12.5000 Y0.0000 Z0.0000 F0.00 -G02 X10.0000 Y-2.5000 Z0.0000 I-2.5000 J0.0000 F0.00 -G01 X0.0000 Y-2.5000 Z0.0000 F0.00 -G02 X-2.5000 Y0.0000 Z0.0000 I0.0000 J2.5000 F0.00 -G00 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 M05 G00 X-1.0 Y1.0 G17 G90