Outlines rewrite actually done

2022-01-16 20:36:19 +01:00 · 2022-01-16 20:36:19 +01:00 · d6f83232a8
commit d6f83232a8
parent 4844a044df
23 changed files with 288 additions and 1034 deletions
--- a/test/outlines/affect_mirror.yaml
+++ b/test/outlines/affect_mirror.yaml
@ -10,46 +10,45 @@ points:
    ref: matrix_only_top
    distance: 30
 outlines:
-  exports:
-    test:
-      keys:
-        type: keys
-        side: both
-        size: 14
-        bound: false
-      rb:
-        type: rectangle
-        anchor:
-          - ref: mirror_matrix_only_bottom
-            # we do NOT specify `affect: xyr` here
-          - shift: [-3,-3]
-            orient: 30
-        size: [6,6]
-        operation: stack
-      rt:
-        type: rectangle
-        anchor:
-          - ref: mirror_matrix_only_top
-            affect: xyr
-          - shift: [-3,-3]
-            orient: 30
-        size: [6,6]
-        operation: stack
-      lb:
-        type: rectangle
-        anchor:
-          - ref: matrix_only_bottom
-            # again, no `affect: xyr`
-          - shift: [-3,-3]
-            orient: 30
-        size: [6,6]
-        operation: stack
-      lt:
-        type: rectangle
-        anchor:
-          - ref: matrix_only_top
-            affect: xyr
-          - shift: [-3,-3]
-            orient: 30
-        size: [6,6]
-        operation: stack
+  test:
+    keys:
+      what: rectangle
+      where: true
+      size: 14
+      bound: false
+    rb:
+      what: rectangle
+      where:
+        - ref: mirror_matrix_only_bottom
+          # we do NOT specify `affect: xyr` here
+        - shift: [-3,-3]
+          orient: 30
+      size: [6,6]
+      operation: stack
+    rt:
+      what: rectangle
+      where:
+        - ref: mirror_matrix_only_top
+          affect: xyr
+        - shift: [-3,-3]
+          orient: 30
+      size: [6,6]
+      operation: stack
+    lb:
+      what: rectangle
+      where:
+        - ref: matrix_only_bottom
+          # again, no `affect: xyr`
+        - shift: [-3,-3]
+          orient: 30
+      size: [6,6]
+      operation: stack
+    lt:
+      what: rectangle
+      where:
+        - ref: matrix_only_top
+          affect: xyr
+        - shift: [-3,-3]
+          orient: 30
+      size: [6,6]
+      operation: stack
--- a/test/outlines/basic.yaml
+++ b/test/outlines/basic.yaml
@ -10,15 +10,14 @@ points:
      key:
        bind: [0, 0, 0, 0]
 outlines:
-  exports:
-    outline:
-      main:
-        type: keys
-        side: left
-        size: 20
-      min:
-        type: keys
-        side: left
-        bound: false
-        size: 14
-        operation: subtract
+  outline:
+    main:
+      what: rectangle
+      where: true
+      size: 20
+    min:
+      what: rectangle
+      where: true
+      bound: false
+      size: 14
+      operation: subtract
--- a/test/outlines/circles.yaml
+++ b/test/outlines/circles.yaml
@ -3,24 +3,23 @@ points:
    matrix: {}
  mirror: 20
 outlines:
-  exports:
-    outline:
-      main:
-        type: keys
-        side: both
-        size: 20
-        bound: false
-      middle_circle:
-        type: circle
-        anchor:
-          ref:
-            - matrix
-            - mirror_matrix
-        radius: 15
-      outside_circles:
-        type: circle
-        anchor:
-          ref: matrix
-          shift: [-10, 10]
-        radius: 5
-        mirror: true
+  outline:
+    main:
+      what: rectangle
+      where: true
+      size: 20
+      bound: false
+    middle_circle:
+      what: circle
+      where:
+        ref:
+          - matrix
+          - mirror_matrix
+      radius: 15
+    outside_circles:
+      what: circle
+      where:
+        ref: matrix
+        shift: [-10, 10]
+      radius: 5
+      mirror: true
--- a/test/outlines/fillet.yaml
+++ b/test/outlines/fillet.yaml
@ -11,12 +11,11 @@ points:
        bottom:
        top:
 outlines:
-  exports:
-    base:
-      - type: keys
-        side: left
-        size: cy
-    fillet:
-      - type: outline
-        name: base
-        fillet: 2
+  base:
+    - what: rectangle
+      where: true
+      size: cy
+  fillet:
+    - what: outline
+      name: base
+      fillet: 2
--- a/test/outlines/gluing.yaml
+++ b/test/outlines/gluing.yaml
@ -1,50 +0,0 @@
-points:
-  zones:
-    matrix:
-      columns:
-        left.key.bind: [,10,,]
-        right.key.bind: [,,,10]
-      rows:
-        bottom.key.bind: [10,,,]
-        top.key.bind: [,,10,]
-      key:
-        bind: [0, 0, 0, 0]
-  rotate: -20
-  mirror:
-    ref: matrix_right_top
-    distance: 30
-outlines:
-  glue:
-    default:
-      top:
-        left:
-          ref: matrix_right_top
-          shift: [,sy / 2]
-        right:
-          ref: mirror_matrix_right_top
-          shift: [,sy / 2]
-      bottom:
-        left:
-          ref: matrix_right_bottom
-          shift: [,sy / -2]
-        right:
-          ref: mirror_matrix_right_bottom
-          shift: [,sy / -2]
-  exports:
-    outline:
-      main:
-        type: keys
-        side: both
-        size: 20
-      min:
-        type: keys
-        side: both
-        bound: false
-        size: 14
-        operation: subtract
-    optout:
-      main:
-        type: keys
-        side: both
-        size: 20
-        glue: false
--- a/test/outlines/gluing___outlines_optout_dxf.dxf
+++ b/test/outlines/gluing___outlines_optout_dxf.dxf
@ -1,146 +0,0 @@
-0
-SECTION
-2
-HEADER
-9
-$INSUNITS
-70
-4
-0
-ENDSEC
-0
-SECTION
-2
-TABLES
-0
-TABLE
-2
-LTYPE
-0
-LTYPE
-72
-65
-70
-64
-2
-CONTINUOUS
-3
-______
-73
-0
-40
-0
-0
-ENDTAB
-0
-TABLE
-2
-LAYER
-0
-ENDTAB
-0
-ENDSEC
-0
-SECTION
-2
-ENTITIES
-0
-LINE
-8
-0
-10
-12.8171276
-20
-5.9767248
-11
-23.8308846
-21
-19.3155103
-0
-LINE
-8
-0
-10
-12.8171276
-20
-5.9767248
-11
-0.5216579
-21
-30.6712874
-0
-LINE
-8
-0
-10
-0.5216579
-20
-30.6712874
-11
-37.1696701
-21
-17.3325019
-0
-LINE
-8
-0
-10
-23.8308846
-20
-19.3155103
-11
-37.1696701
-21
-17.3325019
-0
-LINE
-8
-0
-10
-54.8742004
-20
-19.3155103
-11
-91.5222126
-21
-5.9767248
-0
-LINE
-8
-0
-10
-78.1834271
-20
-30.6712874
-11
-91.5222126
-21
-5.9767248
-0
-LINE
-8
-0
-10
-41.5354149
-20
-17.3325019
-11
-78.1834271
-21
-30.6712874
-0
-LINE
-8
-0
-10
-41.5354149
-20
-17.3325019
-11
-54.8742004
-21
-19.3155103
-0
-ENDSEC
-0
-EOF
--- a/test/outlines/gluing___outlines_outline_dxf.dxf
+++ b/test/outlines/gluing___outlines_outline_dxf.dxf
@ -1,518 +0,0 @@
-0
-SECTION
-2
-HEADER
-9
-$INSUNITS
-70
-4
-0
-ENDSEC
-0
-SECTION
-2
-TABLES
-0
-TABLE
-2
-LTYPE
-0
-LTYPE
-72
-65
-70
-64
-2
-CONTINUOUS
-3
-______
-73
-0
-40
-0
-0
-ENDTAB
-0
-TABLE
-2
-LAYER
-0
-ENDTAB
-0
-ENDSEC
-0
-SECTION
-2
-ENTITIES
-0
-LINE
-8
-0
-10
-12.8171276
-20
-5.9767248
-11
-39.3525425
-21
-24.9649308
-0
-LINE
-8
-0
-10
-12.8171276
-20
-5.9767248
-11
-0.5216579
-21
-30.6712874
-0
-LINE
-8
-0
-10
-0.5216579
-20
-30.6712874
-11
-39.3525425
-21
-16.5380017
-0
-LINE
-8
-0
-10
-41.5354149
-20
-17.3325019
-11
-78.1834271
-21
-30.6712874
-0
-LINE
-8
-0
-10
-41.5354149
-20
-17.3325019
-11
-39.3525425
-21
-16.5380017
-0
-LINE
-8
-0
-10
-39.3525425
-20
-24.9649308
-11
-91.5222126
-21
-5.9767248
-0
-LINE
-8
-0
-10
-78.1834271
-20
-30.6712874
-11
-91.5222126
-21
-5.9767248
-0
-LINE
-8
-0
-10
-8.9719893
-20
-4.1837073
-11
-4.1837073
-21
-8.9719893
-0
-LINE
-8
-0
-10
-4.1837073
-20
-8.9719893
-11
-8.9719893
-21
-4.1837073
-0
-LINE
-8
-0
-10
-8.9719893
-20
-4.1837073
-11
-4.1837073
-21
-8.9719893
-0
-LINE
-8
-0
-10
-4.1837073
-20
-8.9719893
-11
-8.9719893
-21
-4.1837073
-0
-LINE
-8
-0
-10
-2.4736066
-20
-13.6704525
-11
-10.68209
-21
-8.8821705
-0
-LINE
-8
-0
-10
-10.68209
-20
-8.8821705
-11
-15.470372
-21
-22.0378671
-0
-LINE
-8
-0
-10
-15.470372
-20
-22.0378671
-11
-2.3146754
-21
-26.8261491
-0
-LINE
-8
-0
-10
-2.3146754
-20
-26.8261491
-11
-2.4736066
-21
-13.6704525
-0
-LINE
-8
-0
-10
-8.8821705
-20
-10.68209
-11
-22.0378671
-21
-15.470372
-0
-LINE
-8
-0
-10
-22.0378671
-20
-15.470372
-11
-26.8261491
-21
-2.3146754
-0
-LINE
-8
-0
-10
-26.8261491
-20
-2.3146754
-11
-13.6704525
-21
-2.4736066
-0
-LINE
-8
-0
-10
-13.6704525
-20
-2.4736066
-11
-8.8821705
-21
-10.68209
-0
-LINE
-8
-0
-10
-15.3805532
-20
-7.1720698
-11
-28.5362498
-21
-2.3837878
-0
-LINE
-8
-0
-10
-28.5362498
-20
-2.3837878
-11
-33.3245318
-21
-15.5394844
-0
-LINE
-8
-0
-10
-33.3245318
-20
-15.5394844
-11
-20.1688352
-21
-20.3277664
-0
-LINE
-8
-0
-10
-20.1688352
-20
-20.3277664
-11
-15.3805532
-21
-7.1720698
-0
-LINE
-8
-0
-10
-74.5213777
-20
-8.9719893
-11
-87.6770743
-21
-4.1837073
-0
-LINE
-8
-0
-10
-87.6770743
-20
-4.1837073
-11
-82.8887923
-21
-8.9719893
-0
-LINE
-8
-0
-10
-82.8887923
-20
-8.9719893
-11
-69.7330957
-21
-4.1837073
-0
-LINE
-8
-0
-10
-69.7330957
-20
-4.1837073
-11
-74.5213777
-21
-8.9719893
-0
-LINE
-8
-0
-10
-68.022995
-20
-8.8821705
-11
-81.1786916
-21
-13.6704525
-0
-LINE
-8
-0
-10
-81.1786916
-20
-13.6704525
-11
-76.3904096
-21
-26.8261491
-0
-LINE
-8
-0
-10
-76.3904096
-20
-26.8261491
-11
-63.234713
-21
-22.0378671
-0
-LINE
-8
-0
-10
-63.234713
-20
-22.0378671
-11
-68.022995
-21
-8.8821705
-0
-LINE
-8
-0
-10
-56.6672179
-20
-15.470372
-11
-69.8229145
-21
-10.68209
-0
-LINE
-8
-0
-10
-69.8229145
-20
-10.68209
-11
-65.0346325
-21
-2.4736066
-0
-LINE
-8
-0
-10
-65.0346325
-20
-2.4736066
-11
-51.8789359
-21
-2.3146754
-0
-LINE
-8
-0
-10
-51.8789359
-20
-2.3146754
-11
-56.6672179
-21
-15.470372
-0
-LINE
-8
-0
-10
-50.1688352
-20
-2.3837878
-11
-63.3245318
-21
-7.1720698
-0
-LINE
-8
-0
-10
-63.3245318
-20
-7.1720698
-11
-58.5362498
-21
-20.3277664
-0
-LINE
-8
-0
-10
-58.5362498
-20
-20.3277664
-11
-45.3805532
-21
-15.5394844
-0
-LINE
-8
-0
-10
-45.3805532
-20
-15.5394844
-11
-50.1688352
-21
-2.3837878
-0
-ENDSEC
-0
-EOF
--- a/test/outlines/polygons.yaml
+++ b/test/outlines/polygons.yaml
@ -3,27 +3,26 @@ points:
    matrix: {}
  mirror: 20
 outlines:
-  exports:
-    outline:
-      main:
-        type: keys
-        side: both
-        size: 20
-        bound: false
-      middle_poly:
-        type: polygon
-        points:
-          - ref:
-              - matrix
-              - mirror_matrix
-            shift: [0, 20]
-          - shift: [20, -40]
-          - shift: [-40, 0]
-      outside_polys:
-        type: polygon
-        points:
-          - ref: matrix
-            shift: [-10, 15]
-          - shift: [5, -10]
-          - shift: [-10, 0]
-        mirror: true
+  outline:
+    main:
+      what: rectangle
+      where: true
+      size: 20
+      bound: false
+    middle_poly:
+      what: polygon
+      where.ref:
+        - matrix
+        - mirror_matrix
+      points:
+        - shift: [0, 20]
+        - shift: [20, -40]
+        - shift: [-40, 0]
+    outside_polys:
+      what: polygon
+      where.ref: matrix
+      points:
+        - shift: [-10, 15]
+        - shift: [5, -10]
+        - shift: [-10, 0]
+      mirror: true
--- a/test/outlines/rectangles.yaml
+++ b/test/outlines/rectangles.yaml
@ -3,25 +3,24 @@ points:
    matrix: {}
  mirror: 20
 outlines:
-  exports:
-    outline:
-      main:
-        type: keys
-        side: both
-        size: 20
-        bound: false
-      middle_rect:
-        type: rectangle
-        anchor:
-          ref:
-            - matrix
-            - mirror_matrix
-          shift: [0, sy/2]
-        size: [20, 40]
-      outside_rects:
-        type: rectangle
-        anchor:
-          ref: matrix
-          shift: [-10, 10]
-        size: 10
-        mirror: true
+  outline:
+    main:
+      what: rectangle
+      where: true
+      size: 20
+      bound: false
+    middle_rect:
+      what: rectangle
+      where:
+        ref:
+          - matrix
+          - mirror_matrix
+        shift: [0, sy/2]
+      size: [20, 40]
+    outside_rects:
+      what: rectangle
+      where:
+        ref: matrix
+        shift: [-10, 10]
+      size: 10
+      mirror: true