Fixed linuxcnc unit test

FreeCAD · Nov 19, 2016 · f448076 · f448076
1 parent 2aa2560
commit f448076
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 32 deletions.
diff --git a/src/Mod/Path/PathScripts/PathLoadTool.py b/src/Mod/Path/PathScripts/PathLoadTool.py
@@ -82,7 +82,8 @@ def execute(self, obj):
 
         path = Path.Path(commands)
         obj.Path = path
-        obj.ViewObject.Visibility = True
+        if obj.ViewObject:
+            obj.ViewObject.Visibility = True
 
     def onChanged(self, obj, prop):
         mode = 2

diff --git a/src/Mod/Path/PathTests/TestPathPost.py b/src/Mod/Path/PathTests/TestPathPost.py
@@ -90,8 +90,13 @@ def testLinuxCNC(self):
         with open(referenceFile, 'r') as fp:
             refGCode = fp.read()
 
+        # Use if this test fails in order to have a real good look at the changes
+        if False:
+            with open('tab.tmp', 'w') as fp:
+                fp.write(gcode)
+
+
         if gcode != refGCode:
             msg = ''.join(difflib.ndiff(gcode.splitlines(True), refGCode.splitlines(True)))
             self.fail("linuxcnc output doesn't match: " + msg)
 
-
diff --git a/src/Mod/Path/PathTests/test_linuxcnc_00.ngc b/src/Mod/Path/PathTests/test_linuxcnc_00.ngc
@@ -1,60 +1,103 @@
 G17 G90
 G21
+(TC: UNDEFINED TOOL)
+M6 T2.0
+M3 S0.0000
 (Contour :TC)
 (Uncompensated Tool Path)
 G0 Z15.0000
 G00 X-0.2500 Y0.0000
 G00 Z23.0000
 G01 X-0.2500 Y0.0000 Z9.0000 F0.00
 G01 X-0.2500 Y10.0000 Z9.0000 F0.00
-G02 X0.2500 Y10.0000 Z9.0000 I0.2500 J0.0000 F0.00
-G01 X0.2500 Y0.0000 Z9.0000 F0.00
-G02 X-0.2500 Y0.0000 Z9.0000 I-0.2500 J0.0000 F0.00
+G02 X0.0000 Y10.2500 Z9.0000 I0.2500 J0.0000 F0.00
+G01 X10.0000 Y10.2500 Z9.0000 F0.00
+G02 X10.2500 Y10.0000 Z9.0000 I0.0000 J-0.2500 F0.00
+G01 X10.2500 Y0.0000 Z9.0000 F0.00
+G02 X10.0000 Y-0.2500 Z9.0000 I-0.2500 J0.0000 F0.00
+G01 X0.0000 Y-0.2500 Z9.0000 F0.00
+G02 X-0.2500 Y0.0000 Z9.0000 I0.0000 J0.2500 F0.00
 G01 X-0.2500 Y0.0000 Z8.0000 F0.00
 G01 X-0.2500 Y10.0000 Z8.0000 F0.00
-G02 X0.2500 Y10.0000 Z8.0000 I0.2500 J0.0000 F0.00
-G01 X0.2500 Y0.0000 Z8.0000 F0.00
-G02 X-0.2500 Y0.0000 Z8.0000 I-0.2500 J0.0000 F0.00
+G02 X0.0000 Y10.2500 Z8.0000 I0.2500 J0.0000 F0.00
+G01 X10.0000 Y10.2500 Z8.0000 F0.00
+G02 X10.2500 Y10.0000 Z8.0000 I0.0000 J-0.2500 F0.00
+G01 X10.2500 Y0.0000 Z8.0000 F0.00
+G02 X10.0000 Y-0.2500 Z8.0000 I-0.2500 J0.0000 F0.00
+G01 X0.0000 Y-0.2500 Z8.0000 F0.00
+G02 X-0.2500 Y0.0000 Z8.0000 I0.0000 J0.2500 F0.00
 G01 X-0.2500 Y0.0000 Z7.0000 F0.00
 G01 X-0.2500 Y10.0000 Z7.0000 F0.00
-G02 X0.2500 Y10.0000 Z7.0000 I0.2500 J0.0000 F0.00
-G01 X0.2500 Y0.0000 Z7.0000 F0.00
-G02 X-0.2500 Y0.0000 Z7.0000 I-0.2500 J0.0000 F0.00
+G02 X0.0000 Y10.2500 Z7.0000 I0.2500 J0.0000 F0.00
+G01 X10.0000 Y10.2500 Z7.0000 F0.00
+G02 X10.2500 Y10.0000 Z7.0000 I0.0000 J-0.2500 F0.00
+G01 X10.2500 Y0.0000 Z7.0000 F0.00
+G02 X10.0000 Y-0.2500 Z7.0000 I-0.2500 J0.0000 F0.00
+G01 X0.0000 Y-0.2500 Z7.0000 F0.00
+G02 X-0.2500 Y0.0000 Z7.0000 I0.0000 J0.2500 F0.00
 G01 X-0.2500 Y0.0000 Z6.0000 F0.00
 G01 X-0.2500 Y10.0000 Z6.0000 F0.00
-G02 X0.2500 Y10.0000 Z6.0000 I0.2500 J0.0000 F0.00
-G01 X0.2500 Y0.0000 Z6.0000 F0.00
-G02 X-0.2500 Y0.0000 Z6.0000 I-0.2500 J0.0000 F0.00
+G02 X0.0000 Y10.2500 Z6.0000 I0.2500 J0.0000 F0.00
+G01 X10.0000 Y10.2500 Z6.0000 F0.00
+G02 X10.2500 Y10.0000 Z6.0000 I0.0000 J-0.2500 F0.00
+G01 X10.2500 Y0.0000 Z6.0000 F0.00
+G02 X10.0000 Y-0.2500 Z6.0000 I-0.2500 J0.0000 F0.00
+G01 X0.0000 Y-0.2500 Z6.0000 F0.00
+G02 X-0.2500 Y0.0000 Z6.0000 I0.0000 J0.2500 F0.00
 G01 X-0.2500 Y0.0000 Z5.0000 F0.00
 G01 X-0.2500 Y10.0000 Z5.0000 F0.00
-G02 X0.2500 Y10.0000 Z5.0000 I0.2500 J0.0000 F0.00
-G01 X0.2500 Y0.0000 Z5.0000 F0.00
-G02 X-0.2500 Y0.0000 Z5.0000 I-0.2500 J0.0000 F0.00
+G02 X0.0000 Y10.2500 Z5.0000 I0.2500 J0.0000 F0.00
+G01 X10.0000 Y10.2500 Z5.0000 F0.00
+G02 X10.2500 Y10.0000 Z5.0000 I0.0000 J-0.2500 F0.00
+G01 X10.2500 Y0.0000 Z5.0000 F0.00
+G02 X10.0000 Y-0.2500 Z5.0000 I-0.2500 J0.0000 F0.00
+G01 X0.0000 Y-0.2500 Z5.0000 F0.00
+G02 X-0.2500 Y0.0000 Z5.0000 I0.0000 J0.2500 F0.00
 G01 X-0.2500 Y0.0000 Z4.0000 F0.00
 G01 X-0.2500 Y10.0000 Z4.0000 F0.00
-G02 X0.2500 Y10.0000 Z4.0000 I0.2500 J0.0000 F0.00
-G01 X0.2500 Y0.0000 Z4.0000 F0.00
-G02 X-0.2500 Y0.0000 Z4.0000 I-0.2500 J0.0000 F0.00
+G02 X0.0000 Y10.2500 Z4.0000 I0.2500 J0.0000 F0.00
+G01 X10.0000 Y10.2500 Z4.0000 F0.00
+G02 X10.2500 Y10.0000 Z4.0000 I0.0000 J-0.2500 F0.00
+G01 X10.2500 Y0.0000 Z4.0000 F0.00
+G02 X10.0000 Y-0.2500 Z4.0000 I-0.2500 J0.0000 F0.00
+G01 X0.0000 Y-0.2500 Z4.0000 F0.00
+G02 X-0.2500 Y0.0000 Z4.0000 I0.0000 J0.2500 F0.00
 G01 X-0.2500 Y0.0000 Z3.0000 F0.00
 G01 X-0.2500 Y10.0000 Z3.0000 F0.00
-G02 X0.2500 Y10.0000 Z3.0000 I0.2500 J0.0000 F0.00
-G01 X0.2500 Y0.0000 Z3.0000 F0.00
-G02 X-0.2500 Y0.0000 Z3.0000 I-0.2500 J0.0000 F0.00
+G02 X0.0000 Y10.2500 Z3.0000 I0.2500 J0.0000 F0.00
+G01 X10.0000 Y10.2500 Z3.0000 F0.00
+G02 X10.2500 Y10.0000 Z3.0000 I0.0000 J-0.2500 F0.00
+G01 X10.2500 Y0.0000 Z3.0000 F0.00
+G02 X10.0000 Y-0.2500 Z3.0000 I-0.2500 J0.0000 F0.00
+G01 X0.0000 Y-0.2500 Z3.0000 F0.00
+G02 X-0.2500 Y0.0000 Z3.0000 I0.0000 J0.2500 F0.00
 G01 X-0.2500 Y0.0000 Z2.0000 F0.00
 G01 X-0.2500 Y10.0000 Z2.0000 F0.00
-G02 X0.2500 Y10.0000 Z2.0000 I0.2500 J0.0000 F0.00
-G01 X0.2500 Y0.0000 Z2.0000 F0.00
-G02 X-0.2500 Y0.0000 Z2.0000 I-0.2500 J0.0000 F0.00
+G02 X0.0000 Y10.2500 Z2.0000 I0.2500 J0.0000 F0.00
+G01 X10.0000 Y10.2500 Z2.0000 F0.00
+G02 X10.2500 Y10.0000 Z2.0000 I0.0000 J-0.2500 F0.00
+G01 X10.2500 Y0.0000 Z2.0000 F0.00
+G02 X10.0000 Y-0.2500 Z2.0000 I-0.2500 J0.0000 F0.00
+G01 X0.0000 Y-0.2500 Z2.0000 F0.00
+G02 X-0.2500 Y0.0000 Z2.0000 I0.0000 J0.2500 F0.00
 G01 X-0.2500 Y0.0000 Z1.0000 F0.00
 G01 X-0.2500 Y10.0000 Z1.0000 F0.00
-G02 X0.2500 Y10.0000 Z1.0000 I0.2500 J0.0000 F0.00
-G01 X0.2500 Y0.0000 Z1.0000 F0.00
-G02 X-0.2500 Y0.0000 Z1.0000 I-0.2500 J0.0000 F0.00
+G02 X0.0000 Y10.2500 Z1.0000 I0.2500 J0.0000 F0.00
+G01 X10.0000 Y10.2500 Z1.0000 F0.00
+G02 X10.2500 Y10.0000 Z1.0000 I0.0000 J-0.2500 F0.00
+G01 X10.2500 Y0.0000 Z1.0000 F0.00
+G02 X10.0000 Y-0.2500 Z1.0000 I-0.2500 J0.0000 F0.00
+G01 X0.0000 Y-0.2500 Z1.0000 F0.00
+G02 X-0.2500 Y0.0000 Z1.0000 I0.0000 J0.2500 F0.00
 G01 X-0.2500 Y0.0000 Z0.0000 F0.00
 G01 X-0.2500 Y10.0000 Z0.0000 F0.00
-G02 X0.2500 Y10.0000 Z0.0000 I0.2500 J0.0000 F0.00
-G01 X0.2500 Y0.0000 Z0.0000 F0.00
-G02 X-0.2500 Y0.0000 Z0.0000 I-0.2500 J0.0000 F0.00
+G02 X0.0000 Y10.2500 Z0.0000 I0.2500 J0.0000 F0.00
+G01 X10.0000 Y10.2500 Z0.0000 F0.00
+G02 X10.2500 Y10.0000 Z0.0000 I0.0000 J-0.2500 F0.00
+G01 X10.2500 Y0.0000 Z0.0000 F0.00
+G02 X10.0000 Y-0.2500 Z0.0000 I-0.2500 J0.0000 F0.00
+G01 X0.0000 Y-0.2500 Z0.0000 F0.00
+G02 X-0.2500 Y0.0000 Z0.0000 I0.0000 J0.2500 F0.00
 G00 Z15.0000
 M05
 G00 X-1.0 Y1.0