Terminology Shift. Valid JSON. Joins.

Author: tatarize

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name="vpype-gcode",
-    version="0.4.0",
+    version="0.5.0",
     description="vpype gcode plugin",
     long_description=readme,
     long_description_content_type="text/markdown",

vpype_gcode/bundled_configs.toml

@@ -1,48 +1,52 @@
 [gwrite.ninja]
 header = "G20\nG17\nG90\n"
-move =  "M380\nG00 X{x:.4f} Y{y:.4f}\nM381\n"
-line = "G01 X{x:.4f} Y{y:.4f}\n"
+firstsegment =  "M380\nG00 X{x:.4f} Y{y:.4f}\nM381\n"
+segment = "G01 X{x:.4f} Y{y:.4f}\n"
 footer = "M2\n"
 unit = "mm"
 
 [gwrite.gcode]
 header = "G20\nG17\nG90\n"
-move = "G00 X{x:.4f} Y{y:.4f}\n"
-line = "G01 X{x:.4f} Y{y:.4f}\n"
+firstsegment = "G00 X{x:.4f} Y{y:.4f}\n"
+segment = "G01 X{x:.4f} Y{y:.4f}\n"
 footer = "M2\n"
 unit = "mm"
 
 [gwrite.gcode_relative]
 header = "G20\nG17\nG91\n"
-move = "G00 X{dx:.4f} Y{dy:.4f}\n"
-line = "G01 X{dx:.4f} Y{dy:.4f}\n"
+firstsegment = "G00 X{dx:.4f} Y{dy:.4f}\n"
+segment = "G01 X{dx:.4f} Y{dy:.4f}\n"
 footer = "M2\n"
 unit = "mm"
 
 [gwrite.csv]
 header = "#Operation, X-value, Y-value\n"
-move = "Move, {x:f}, {x:f}\n"
-line = "Line-to, {x:f}, {x:f}\n"
-
+firstsegment = "Move, {x:f}, {x:f}\n"
+segment = "Line-to, {x:f}, {x:f}\n"
+lastsegment = "Stop, {x:f}, {x:f}\n"
 
 [gwrite.json]
-header = "{{\n"
+header = "{{"
 footer = "}}\n"
-prelayer = "\t\"Layer\": {{\n"
-preblock = "\t\t\"Block\": [\n"
-move = "\t\t{{\n\t\t\t\"X\": {ix:d},\n\t\t\t\"Y\": {iy:d}\n\t\t}}"
-line = ",\n\t\t{{\n\t\t\t\"X\": {ix:d},\n\t\t\t\"Y\": {iy:d}\n\t\t}}"
-postblock = "\n\t\t],\n"
-postlayer = "\t}},\n"
+linejoin = ","
+layerjoin = ","
+prelayer = "\n\t\"Layer\": {{"
+postlayer = "\t}}\n"
+preline = "\n\t\t\"LineCollection{index:d}\": [\n"
+postline = "\n\t\t]"
+segment = "\t\t{{\n\t\t\t\"X\": {ix:d},\n\t\t\t\"Y\": {iy:d}\n\t\t}},\n"
+lastsegment = "\t\t{{\n\t\t\t\"X\": {ix:d},\n\t\t\t\"Y\": {iy:d}\n\t\t}}"
+
+
 
 [gwrite.isvg]
 header = """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xlink="http://www.w3.org/1999/xlink">
 """
 footer = "</svg>"
 prelayer = '<g fill="none" stroke="black">'
-preblock = '<path d="M '
-move = "{ix:d} {iy:d} l"
-line = "{idx:d} {idy:d} "
-postblock = '""/>'
-postlayer = "</g"
+preline = '<path d="M '
+firstsegment = "{ix:d} {iy:d} l"
+segment = "{idx:d} {idy:d} "
+postline = '"/>'
+postlayer = "</g>"

vpype_gcode/gwrite.py

@@ -74,14 +74,16 @@ def gwrite(document: vp.Document, filename: str, profile: str):
 
     # Read the config for the profile from the main vpype
     config = gwrite_config[profile]
-
     header = config.get("header", None)
-    move = config.get("move", None)
-    line = config.get("line", None)
-    preblock = config.get("preblock", None)
-    postblock = config.get("postblock", None)
+    firstsegment = config.get("firstsegment", None)
+    segment = config.get("segment", None)
+    lastsegment = config.get("lastsegment", None)
     prelayer = config.get("prelayer", None)
     postlayer = config.get("postlayer", None)
+    layerjoin = config.get("layerjoin", None)
+    preline = config.get("preline", None)
+    postline = config.get("postline", None)
+    linejoin = config.get("linejoin", None)
     footer = config.get("footer", None)
     unit = config.get("unit", "mm")
 
@@ -100,68 +102,58 @@ def gwrite(document: vp.Document, filename: str, profile: str):
         last_y = 0
         xx = 0
         yy = 0
+        lastlayer_index = len(document.layers.values()) - 1
         for layer_index, layer in enumerate(document.layers.values()):
             if prelayer is not None:
                 f.write(prelayer.format(index=layer_index))
-            for p_index, p in enumerate(layer):
-                m = p * scale
-                first = True
-                if preblock is not None:
-                    f.write(preblock.format(index=p_index))
-                for v_index, v in enumerate(m):
-                    x = v.real
-                    y = v.imag
+            lastlines_index = len(layer) - 1
+            for lines_index, lines in enumerate(layer):
+                lines_scaled = lines * scale
+                if preline is not None:
+                    f.write(preline.format(index=lines_index))
+                lastsegment_index = len(lines_scaled) - 1
+                for segment_index, seg in enumerate(lines_scaled):
+                    x = seg.real
+                    y = seg.imag
                     dx = x - last_x
                     dy = y - last_y
                     idx = int(round(x - xx))
                     idy = int(round(y - yy))
                     xx += idx
                     yy += idy
-                    if first:
-                        if move is not None:
-                            f.write(
-                                move.format(
-                                    x=x,
-                                    y=y,
-                                    dx=dx,
-                                    dy=dy,
-                                    _x=-x,
-                                    _y=-y,
-                                    _dx=dx,
-                                    _dy=dy,
-                                    ix=xx,
-                                    iy=yy,
-                                    idx=idx,
-                                    idy=idy,
-                                    index=v_index,
-                                )
-                            )
-                        first = False
+                    if firstsegment is not None and segment_index == 0:
+                        seg_write = firstsegment
+                    elif lastsegment is not None and segment_index == lastsegment_index:
+                        seg_write = lastsegment
                     else:
-                        if line is not None:
-                            f.write(
-                                line.format(
-                                    x=x,
-                                    y=y,
-                                    dx=dx,
-                                    dy=dy,
-                                    _x=-x,
-                                    _y=-y,
-                                    _dx=dx,
-                                    _dy=dy,
-                                    ix=xx,
-                                    iy=yy,
-                                    idx=idx,
-                                    idy=idy,
-                                    index=v_index,
-                                )
-                            )
+                        seg_write = segment
+                    f.write(
+                        seg_write.format(
+                            x=x,
+                            y=y,
+                            dx=dx,
+                            dy=dy,
+                            _x=-x,
+                            _y=-y,
+                            _dx=dx,
+                            _dy=dy,
+                            ix=xx,
+                            iy=yy,
+                            idx=idx,
+                            idy=idy,
+                            index=segment_index,
+                        )
+                    )
                     last_x = x
                     last_y = y
-                if postblock is not None:
-                    f.write(postblock.format(index=p_index))
+                if postline is not None:
+                    f.write(postline.format(index=lines_index))
+                if linejoin is not None and lines_index != lastlines_index:
+                    f.write(linejoin)
             if postlayer is not None:
                 f.write(postlayer.format(index=layer_index))
+            if layerjoin is not None and layer_index != lastlayer_index:
+                f.write(layerjoin)
         if footer is not None:
             f.write(footer.format(filename=filename))