split paths on M6 and change placement to use offset

src/Mod/Path/PathScripts/post/example_pre.py

@@ -73,13 +73,11 @@ def insert(filename, docname):
 def parse(inputstring):
     "parse(inputstring): returns a parsed output string"
     print("preprocessing...")
-    print(inputstring)
     PathLog.track(inputstring)
     # split the input by line
     lines = inputstring.split("\n")
-    output = ""
-    lastcommand = None
-    print(lines)
+    output = [] #""
+    lastcommand = None 
 
     for lin in lines:
         # remove any leftover trailing and preceding spaces
@@ -91,7 +89,7 @@ def parse(inputstring):
             # remove line numbers
             lin = lin.split(" ", 1)
             if len(lin) >= 1:
-                lin = lin[1]
+                lin = lin[1].strip()
             else:
                 continue
 
@@ -100,7 +98,8 @@ def parse(inputstring):
             continue
         if lin[0].upper() in ["G", "M"]:
             # found a G or M command: we store it
-            output += lin + "\n"
+            #output += lin + "\n"
+            output.append(lin) # + "\n"
             last = lin[0].upper()
             for c in lin[1:]:
                 if not c.isdigit():
@@ -110,7 +109,7 @@ def parse(inputstring):
             lastcommand = last
         elif lastcommand:
             # no G or M command: we repeat the last one
-            output += lastcommand + " " + lin + "\n"
+            output.append(lastcommand + " " + lin) # + "\n"
 
     print("done preprocessing.")
     return output

src/Mod/Path/PathScripts/post/gcode_pre.py

@@ -36,6 +36,7 @@ import Path
 import FreeCAD
 import PathScripts.PathUtils
 import PathScripts.PathLog as PathLog
+import re
 
 # LEVEL = PathLog.Level.DEBUG
 LEVEL = PathLog.Level.INFO
@@ -64,14 +65,20 @@ def insert(filename, docname):
     gfile = pythonopen(filename)
     gcode = gfile.read()
     gfile.close()
-    gcode = parse(gcode)
-    doc = FreeCAD.getDocument(docname)
-    obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", "Custom")
-    PathScripts.PathCustom.ObjectCustom(obj)
-    obj.ViewObject.Proxy = 0
-    obj.Gcode = gcode
-    PathScripts.PathUtils.addToJob(obj)
-    obj.ToolController = PathScripts.PathUtils.findToolController(obj)
+    # split on tool changes
+    paths = re.split('(?=[mM]+\s?0?6)', gcode)
+    # if there are any tool changes combine the preamble with the default tool 
+    if len(paths) > 1:
+        paths = ["\n".join(paths[0:2])] +  paths[2:]
+    for path in paths:
+        gcode = parse(path)
+        doc = FreeCAD.getDocument(docname)
+        obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", "Custom")
+        PathScripts.PathCustom.ObjectCustom(obj)
+        obj.ViewObject.Proxy = 0
+        obj.Gcode = gcode
+        PathScripts.PathUtils.addToJob(obj)
+        obj.ToolController = PathScripts.PathUtils.findToolController(obj)
     FreeCAD.ActiveDocument.recompute()
 
 
@@ -82,7 +89,7 @@ def parse(inputstring):
     # split the input by line
     lines = inputstring.split("\n")
     output = [] #""
-    lastcommand = None
+    lastcommand = None 
 
     for lin in lines:
         # remove any leftover trailing and preceding spaces