[rrix] fetch layer names from node id as well as inkscape layer name

cli/pyaxidraw/axidraw.py

@@ -761,6 +761,8 @@ class AxiDraw(inkex.Effect):
                             layer_name = node.get(inkex.addNS('label', 'inkscape'))
                             if layer_name == '% Preview':
                                 self.svg.remove(node)
+                        if node.get('id') is not None:
+                            layer_name = node.get('id')
 
             if self.options.rendering > 0:  # Render preview. Only possible when in preview mode.
                 preview_transform = simpletransform.parseTransform(
@@ -952,8 +954,8 @@ class AxiDraw(inkex.Effect):
                 oldplot_current_layer = self.plot_current_layer
                 old_layer_name = self.s_current_layer_name
 
-                if node.get(inkex.addNS('groupmode', 'inkscape')) == 'layer':
-                    self.s_current_layer_name = node.get(inkex.addNS('label', 'inkscape'))
+                if node.get('id') or node.get(inkex.addNS('groupmode', 'inkscape')) == 'layer':
+                    self.s_current_layer_name = node.get('id') or node.get(inkex.addNS('label', 'inkscape'))
                     self.DoWePlotLayer(self.s_current_layer_name)
                     self.pen_raise()
                 self.traverse_svg(node, mat_new, parent_visibility=visibility)

cli/pyaxidraw/axidraw_conf.py

@@ -59,7 +59,7 @@ rendering = 3           # Preview mode rendering option (0-3):
                             # 2: Render only pen-up movement
                             # 3: Render all movement (Default)
 
-model = 1               # AxiDraw Model (1-3). 
+model = 2               # AxiDraw Model (1-3). 
                             # 1: AxiDraw V2 or V3 (Default).
                             # 2: AxiDraw V3/A3 or SE/A3.
                             # 3: AxiDraw V3 XLX.
@@ -75,7 +75,7 @@ port_config = 0         # Serial port behavior option (0-2)
 auto_rotate = True      # Auto-select portrait vs landscape orientation
                             # Default: True
 
-reordering = 0          # Plot optimization option for how groups are handled
+reordering = 2          # Plot optimization option for how groups are handled
                             # 0: Preserve order of objects given in SVG file (Default).
                             # 1: Reorder objects, preserving groups
                             # 2: Reorder objects, reordering within each group