diff --git a/docs/kcl/atan2.md b/docs/kcl/atan2.md index b8b9dabcc..1a31c08c4 100644 --- a/docs/kcl/atan2.md +++ b/docs/kcl/atan2.md @@ -24,8 +24,8 @@ atan2( | Name | Type | Description | Required | |----------|------|-------------|----------| -| `y` | [`number`](/docs/kcl/types/number) | | Yes | -| `x` | [`number`](/docs/kcl/types/number) | | Yes | +| `y` | [`number`](/docs/kcl/types/number) | Y | Yes | +| `x` | [`number`](/docs/kcl/types/number) | X | Yes | ### Returns @@ -37,7 +37,7 @@ atan2( ```js sketch001 = startSketchOn(XZ) |> startProfileAt([0, 0], %) - |> angledLine(angle = toDegrees(atan2(1.25, 2)), length = 20) + |> angledLine(angle = toDegrees(atan2(y = 1.25, x = 2)), length = 20) |> yLine(endAbsolute = 0) |> close() diff --git a/docs/kcl/chamfer.md b/docs/kcl/chamfer.md index c3fb0359f..e7552be83 100644 --- a/docs/kcl/chamfer.md +++ b/docs/kcl/chamfer.md @@ -80,7 +80,7 @@ part001 = cube([0, 0], 20) // We tag the chamfer to reference it later. |> chamfer(length = 10, tags = [getOppositeEdge(line1)], tag = $chamfer1) -sketch001 = startSketchOn(part001, chamfer1) +sketch001 = startSketchOn(part001, face = chamfer1) |> startProfileAt([10, 10], %) |> line(end = [2, 0]) |> line(end = [0, 2]) diff --git a/docs/kcl/hollow.md b/docs/kcl/hollow.md index 69b960e10..9978b36ec 100644 --- a/docs/kcl/hollow.md +++ b/docs/kcl/hollow.md @@ -69,11 +69,11 @@ case = startSketchOn(-XZ) |> close() |> extrude(length = 65) -thing1 = startSketchOn(case, 'end') +thing1 = startSketchOn(case, face = 'end') |> circle(center = [-size / 2, -size / 2], radius = 25) |> extrude(length = 50) -thing2 = startSketchOn(case, 'end') +thing2 = startSketchOn(case, face = 'end') |> circle(center = [size / 2, -size / 2], radius = 25) |> extrude(length = 50) diff --git a/docs/kcl/offsetPlane.md b/docs/kcl/offsetPlane.md index 1ddf56f52..28e974582 100644 --- a/docs/kcl/offsetPlane.md +++ b/docs/kcl/offsetPlane.md @@ -20,7 +20,7 @@ offsetPlane( | Name | Type | Description | Required | |----------|------|-------------|----------| -| `plane` | [`PlaneData`](/docs/kcl/types/PlaneData) | The plane (e.g. 'XY') which this new plane is created from. | Yes | +| `plane` | [`PlaneData`](/docs/kcl/types/PlaneData) | The plane (e.g. XY) which this new plane is created from. | Yes | | `offset` | [`number`](/docs/kcl/types/number) | Distance from the standard plane this new plane will be created at. | Yes | ### Returns diff --git a/docs/kcl/patternLinear3d.md b/docs/kcl/patternLinear3d.md index 20616cd9a..bced64372 100644 --- a/docs/kcl/patternLinear3d.md +++ b/docs/kcl/patternLinear3d.md @@ -61,11 +61,11 @@ case = startSketchOn(XY) |> close(%) |> extrude(length = 65) -thing1 = startSketchOn(case, 'end') +thing1 = startSketchOn(case, face = 'end') |> circle(center = [-size / 2, -size / 2], radius = 25) |> extrude(length = 50) -thing2 = startSketchOn(case, 'end') +thing2 = startSketchOn(case, face = 'end') |> circle(center = [size / 2, -size / 2], radius = 25) |> extrude(length = 50) @@ -92,7 +92,7 @@ case = startSketchOn(XY) |> close(%) |> extrude(length = 65) -thing1 = startSketchOn(case, 'end') +thing1 = startSketchOn(case, face = 'end') |> circle(center = [-size / 2, -size / 2], radius = 25) |> extrude(length = 50) diff --git a/docs/kcl/shell.md b/docs/kcl/shell.md index bac00e26b..908151aff 100644 --- a/docs/kcl/shell.md +++ b/docs/kcl/shell.md @@ -107,11 +107,11 @@ case = startSketchOn(-XZ) |> close() |> extrude(length = 65) -thing1 = startSketchOn(case, 'end') +thing1 = startSketchOn(case, face = 'end') |> circle(center = [-size / 2, -size / 2], radius = 25) |> extrude(length = 50) -thing2 = startSketchOn(case, 'end') +thing2 = startSketchOn(case, face = 'end') |> circle(center = [size / 2, -size / 2], radius = 25) |> extrude(length = 50) @@ -132,11 +132,11 @@ case = startSketchOn(XY) |> close() |> extrude(length = 65) -thing1 = startSketchOn(case, 'end') +thing1 = startSketchOn(case, face = 'end') |> circle(center = [-size / 2, -size / 2], radius = 25) |> extrude(length = 50) -thing2 = startSketchOn(case, 'end') +thing2 = startSketchOn(case, face = 'end') |> circle(center = [size / 2, -size / 2], radius = 25) |> extrude(length = 50) @@ -160,11 +160,11 @@ case = startSketchOn(XY) |> close() |> extrude(length = 65) -thing1 = startSketchOn(case, 'end') +thing1 = startSketchOn(case, face = 'end') |> circle(center = [-size / 2, -size / 2], radius = 25) |> extrude(length = 50) -thing2 = startSketchOn(case, 'end') +thing2 = startSketchOn(case, face = 'end') |> circle(center = [size / 2, -size / 2], radius = 25) |> extrude(length = 50) diff --git a/docs/kcl/startSketchOn.md b/docs/kcl/startSketchOn.md index f82b655e4..39b5859ff 100644 --- a/docs/kcl/startSketchOn.md +++ b/docs/kcl/startSketchOn.md @@ -18,8 +18,8 @@ The point is if you want to export the result of a sketch on a face, you only ne ```js startSketchOn( - data: SketchData, - tag?: FaceTag, + planeOrSolid: SketchData, + face?: FaceTag, ): SketchSurface ``` @@ -28,8 +28,8 @@ startSketchOn( | Name | Type | Description | Required | |----------|------|-------------|----------| -| `data` | [`SketchData`](/docs/kcl/types/SketchData) | Data for start sketch on. You can start a sketch on a plane or an solid. | Yes | -| [`tag`](/docs/kcl/types/tag) | [`FaceTag`](/docs/kcl/types/FaceTag) | A tag for a face. | No | +| `planeOrSolid` | [`SketchData`](/docs/kcl/types/SketchData) | The plane or solid to sketch on | Yes | +| `face` | [`FaceTag`](/docs/kcl/types/FaceTag) | Identify a face of a solid if a solid is specified as the input argument (`plane_or_solid`) | No | ### Returns @@ -48,7 +48,7 @@ exampleSketch = startSketchOn(XY) example = extrude(exampleSketch, length = 5) -exampleSketch002 = startSketchOn(example, 'end') +exampleSketch002 = startSketchOn(example, face = 'end') |> startProfileAt([1, 1], %) |> line(end = [8, 0]) |> line(end = [0, 8]) @@ -57,7 +57,7 @@ exampleSketch002 = startSketchOn(example, 'end') example002 = extrude(exampleSketch002, length = 5) -exampleSketch003 = startSketchOn(example002, 'end') +exampleSketch003 = startSketchOn(example002, face = 'end') |> startProfileAt([2, 2], %) |> line(end = [6, 0]) |> line(end = [0, 6]) @@ -82,7 +82,7 @@ exampleSketch = startSketchOn(XY) example = extrude(exampleSketch, length = 5, tagEnd = $end01) -exampleSketch002 = startSketchOn(example, end01) +exampleSketch002 = startSketchOn(example, face = end01) |> startProfileAt([1, 1], %) |> line(end = [8, 0]) |> line(end = [0, 8]) @@ -91,7 +91,7 @@ exampleSketch002 = startSketchOn(example, end01) example002 = extrude(exampleSketch002, length = 5, tagEnd = $end02) -exampleSketch003 = startSketchOn(example002, end02) +exampleSketch003 = startSketchOn(example002, face = end02) |> startProfileAt([2, 2], %) |> line(end = [6, 0]) |> line(end = [0, 6]) @@ -113,7 +113,7 @@ exampleSketch = startSketchOn(XY) example = extrude(exampleSketch, length = 10) -exampleSketch002 = startSketchOn(example, sketchingFace) +exampleSketch002 = startSketchOn(example, face = sketchingFace) |> startProfileAt([1, 1], %) |> line(end = [8, 0]) |> line(end = [0, 8]) @@ -122,7 +122,7 @@ exampleSketch002 = startSketchOn(example, sketchingFace) example002 = extrude(exampleSketch002, length = 10) -exampleSketch003 = startSketchOn(example002, sketchingFace002) +exampleSketch003 = startSketchOn(example002, face = sketchingFace002) |> startProfileAt([-8, 12], %) |> line(end = [0, 6]) |> line(end = [6, 0]) @@ -148,7 +148,7 @@ exampleSketch = startSketchOn(XY) example = revolve(exampleSketch, axis = Y, angle = 180) -exampleSketch002 = startSketchOn(example, 'end') +exampleSketch002 = startSketchOn(example, face = 'end') |> startProfileAt([4.5, -5], %) |> line(end = [0, 5]) |> line(end = [5, 0]) @@ -182,7 +182,7 @@ example = revolve( tagEnd = $end01, ) -exampleSketch002 = startSketchOn(example, end01) +exampleSketch002 = startSketchOn(example, face = end01) |> startProfileAt([4.5, -5], %) |> line(end = [0, 5]) |> line(end = [5, 0]) @@ -196,12 +196,10 @@ example002 = extrude(exampleSketch002, length = 5) ```js a1 = startSketchOn({ - plane = { - origin = { x = 0, y = 0, z = 0 }, - xAxis = { x = 1, y = 0, z = 0 }, - yAxis = { x = 0, y = 1, z = 0 }, - zAxis = { x = 0, y = 0, z = 1 } - } + origin = { x = 0, y = 0, z = 0 }, + xAxis = { x = 1, y = 0, z = 0 }, + yAxis = { x = 0, y = 1, z = 0 }, + zAxis = { x = 0, y = 0, z = 1 } }) |> startProfileAt([0, 0], %) |> line(end = [100.0, 0]) diff --git a/docs/kcl/std-helix.md b/docs/kcl/std-helix.md index 8861ee450..8873d3cdc 100644 --- a/docs/kcl/std-helix.md +++ b/docs/kcl/std-helix.md @@ -11,11 +11,11 @@ Create a helix. ```js helix( revolutions: number(_), - angleStart: number(deg), + angleStart: number(Angle), ccw?: bool, - radius?: number(mm), + radius?: number(Length), axis?: Axis3d | Edge, - length?: number(mm), + length?: number(Length), cylinder?: Solid, ): Helix ``` @@ -26,11 +26,11 @@ helix( | Name | Type | Description | Required | |----------|------|-------------|----------| | `revolutions` | `number(_)` | Number of revolutions. | Yes | -| `angleStart` | `number(deg)` | Start angle (in degrees). | Yes | +| `angleStart` | `number(Angle)` | Start angle (in degrees). | Yes | | `ccw` | [`bool`](/docs/kcl/types/bool) | Is the helix rotation counter clockwise? The default is `false`. | No | -| `radius` | `number(mm)` | Radius of the helix. | No | +| `radius` | `number(Length)` | Radius of the helix. | No | | `axis` | `Axis3d | Edge` | Axis to use for the helix. | No | -| `length` | `number(mm)` | Length of the helix. This is not necessary if the helix is created around an edge. If not given the length of the edge is used. | No | +| `length` | `number(Length)` | Length of the helix. This is not necessary if the helix is created around an edge. If not given the length of the edge is used. | No | | `cylinder` | [`Solid`](/docs/kcl/types/Solid) | Cylinder to create the helix on. | No | ### Returns diff --git a/docs/kcl/std-math-cos.md b/docs/kcl/std-math-cos.md index c8a448af5..d017f91c2 100644 --- a/docs/kcl/std-math-cos.md +++ b/docs/kcl/std-math-cos.md @@ -9,7 +9,7 @@ Compute the cosine of a number (in radians). ```js -cos(@num: number(rad)): number(_) +cos(@num: number(Angle)): number(_) ``` @@ -17,7 +17,7 @@ cos(@num: number(rad)): number(_) | Name | Type | Description | Required | |----------|------|-------------|----------| -| `num` | `number(rad)` | | Yes | +| `num` | `number(Angle)` | | Yes | ### Returns diff --git a/docs/kcl/std-math-polar.md b/docs/kcl/std-math-polar.md index bac891600..d5754ae7c 100644 --- a/docs/kcl/std-math-polar.md +++ b/docs/kcl/std-math-polar.md @@ -11,9 +11,9 @@ cartesian (x/y/z grid) coordinates. ```js polar( - angle: number(deg), - length: number(mm), -): [number(mm); 2] + angle: number(Angle), + length: number(Length), +): Point2d ``` @@ -21,12 +21,12 @@ polar( | Name | Type | Description | Required | |----------|------|-------------|----------| -| `angle` | `number(deg)` | | Yes | -| `length` | `number(mm)` | | Yes | +| `angle` | `number(Angle)` | | Yes | +| `length` | `number(Length)` | | Yes | ### Returns -`[number(mm); 2]` +[`Point2d`](/docs/kcl/types/Point2d) ### Examples diff --git a/docs/kcl/std-math-sin.md b/docs/kcl/std-math-sin.md index 68b359296..d0249c703 100644 --- a/docs/kcl/std-math-sin.md +++ b/docs/kcl/std-math-sin.md @@ -9,7 +9,7 @@ Compute the sine of a number (in radians). ```js -sin(@num: number(rad)): number(_) +sin(@num: number(Angle)): number(_) ``` @@ -17,7 +17,7 @@ sin(@num: number(rad)): number(_) | Name | Type | Description | Required | |----------|------|-------------|----------| -| `num` | `number(rad)` | | Yes | +| `num` | `number(Angle)` | | Yes | ### Returns diff --git a/docs/kcl/std-math-tan.md b/docs/kcl/std-math-tan.md index 08c5e8a41..be9867c5c 100644 --- a/docs/kcl/std-math-tan.md +++ b/docs/kcl/std-math-tan.md @@ -9,7 +9,7 @@ Compute the tangent of a number (in radians). ```js -tan(@num: number(rad)): number(_) +tan(@num: number(Angle)): number(_) ``` @@ -17,7 +17,7 @@ tan(@num: number(rad)): number(_) | Name | Type | Description | Required | |----------|------|-------------|----------| -| `num` | `number(rad)` | | Yes | +| `num` | `number(Angle)` | | Yes | ### Returns diff --git a/docs/kcl/std-revolve.md b/docs/kcl/std-revolve.md index 47b846607..58c7ad3e2 100644 --- a/docs/kcl/std-revolve.md +++ b/docs/kcl/std-revolve.md @@ -21,10 +21,10 @@ revolved around the same axis. revolve( @sketches: [Sketch; 1+], axis: Axis2d | Edge, - angle?: number(deg), - tolerance?: number(mm), + angle?: number(Angle), + tolerance?: number(Length), symmetric?: bool, - bidirectionalAngle?: number(deg), + bidirectionalAngle?: number(Angle), tagStart?: tag, tagEnd?: tag, ): Solid @@ -37,10 +37,10 @@ revolve( |----------|------|-------------|----------| | `sketches` | `[Sketch; 1+]` | The sketch or set of sketches that should be revolved | Yes | | `axis` | `Axis2d | Edge` | Axis of revolution. | Yes | -| `angle` | `number(deg)` | Angle to revolve (in degrees). Default is 360. | No | -| `tolerance` | `number(mm)` | Tolerance for the revolve operation. | No | +| `angle` | `number(Angle)` | Angle to revolve (in degrees). Default is 360. | No | +| `tolerance` | `number(Length)` | Tolerance for the revolve operation. | No | | `symmetric` | [`bool`](/docs/kcl/types/bool) | If true, the extrusion will happen symmetrically around the sketch. Otherwise, the extrusion will happen on only one side of the sketch. | No | -| `bidirectionalAngle` | `number(deg)` | If specified, will also revolve in the opposite direction to 'angle' to the specified angle. If 'symmetric' is true, this value is ignored. | No | +| `bidirectionalAngle` | `number(Angle)` | If specified, will also revolve in the opposite direction to 'angle' to the specified angle. If 'symmetric' is true, this value is ignored. | No | | `tagStart` | [`tag`](/docs/kcl/types/tag) | A named tag for the face at the start of the revolve, i.e. the original sketch. | No | | `tagEnd` | [`tag`](/docs/kcl/types/tag) | A named tag for the face at the end of the revolve. | No | @@ -108,7 +108,7 @@ part001 = startSketchOn(XY) |> close() |> revolve(axis = Y, angle = 180) -part002 = startSketchOn(part001, 'end') +part002 = startSketchOn(part001, face = 'end') |> startProfileAt([4.5, -5], %) |> line(end = [0, 5]) |> line(end = [5, 0]) @@ -128,7 +128,7 @@ box = startSketchOn(XY) |> close() |> extrude(length = 20) -sketch001 = startSketchOn(box, "END") +sketch001 = startSketchOn(box, face = "END") |> circle( center = [10,10], radius = 4 ) |> revolve( angle = -90, @@ -147,7 +147,7 @@ box = startSketchOn(XY) |> close() |> extrude(length = 20) -sketch001 = startSketchOn(box, "END") +sketch001 = startSketchOn(box, face = "END") |> circle( center = [10,10], radius = 4 ) |> revolve( angle = 90, @@ -166,7 +166,7 @@ box = startSketchOn(XY) |> close() |> extrude(length = 20) -sketch001 = startSketchOn(box, "END") +sketch001 = startSketchOn(box, face = "END") |> circle( center = [10,10], radius = 4 ) |> revolve( angle = 90, diff --git a/docs/kcl/std-sketch-circle.md b/docs/kcl/std-sketch-circle.md index 71287b3bc..6999cbaf9 100644 --- a/docs/kcl/std-sketch-circle.md +++ b/docs/kcl/std-sketch-circle.md @@ -13,7 +13,7 @@ the provided (x, y) origin point. circle( @sketch_or_surface: Sketch | Plane | Face, center: Point2d, - radius: number, + radius: number(Length), tag?: tag, ): Sketch ``` @@ -25,7 +25,7 @@ circle( |----------|------|-------------|----------| | `sketch_or_surface` | [`Sketch`](/docs/kcl/types/Sketch) OR [`Plane`](/docs/kcl/types/Plane) OR [`Face`](/docs/kcl/types/Face) | Sketch to extend, or plane or surface to sketch on. | Yes | | `center` | [`Point2d`](/docs/kcl/types/Point2d) | The center of the circle. | Yes | -| `radius` | [`number`](/docs/kcl/types/number) | The radius of the circle. | Yes | +| `radius` | `number(Length)` | The radius of the circle. | Yes | | [`tag`](/docs/kcl/types/tag) | [`tag`](/docs/kcl/types/tag) | Create a new tag which refers to this circle. | No | ### Returns diff --git a/docs/kcl/std-sketch-mirror2d.md b/docs/kcl/std-sketch-mirror2d.md index 435ecf868..d473e5122 100644 --- a/docs/kcl/std-sketch-mirror2d.md +++ b/docs/kcl/std-sketch-mirror2d.md @@ -110,7 +110,7 @@ sketch0011 = startSketchOn(XY) |> mirror2d( axis = X ) |> extrude(length = 10) -sketch002 = startSketchOn(sketch0011, 'END') +sketch002 = startSketchOn(sketch0011, face = 'END') |> circle( center = [-0.01, 1.58], radius = 1.2 ) |> extrude(length = 1.2) diff --git a/docs/kcl/std.json b/docs/kcl/std.json index b2d3dfb03..f21ea930c 100644 --- a/docs/kcl/std.json +++ b/docs/kcl/std.json @@ -1033,6 +1033,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -1289,6 +1303,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -1305,6 +1320,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -1713,8 +1731,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -1753,8 +1770,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -1772,6 +1788,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -2749,6 +2769,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -3005,6 +3039,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -3021,6 +3056,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -3429,8 +3467,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -3469,8 +3506,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -3488,6 +3524,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -4432,6 +4472,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -4688,6 +4742,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -4704,6 +4759,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -5112,8 +5170,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -5152,8 +5209,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -5171,6 +5227,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -6029,6 +6089,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -6285,6 +6359,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -6301,6 +6376,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -6709,8 +6787,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -6749,8 +6826,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -6768,6 +6844,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -7627,6 +7707,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -7883,6 +7977,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -7899,6 +7994,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -8307,8 +8405,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -8347,8 +8444,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -8366,6 +8462,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -9224,6 +9324,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -9480,6 +9594,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -9496,6 +9611,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -9904,8 +10022,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -9944,8 +10061,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -9963,6 +10079,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -10821,6 +10941,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -11077,6 +11211,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -11093,6 +11228,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -11501,8 +11639,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -11541,8 +11678,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -11560,6 +11696,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -12418,6 +12558,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -12674,6 +12828,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -12690,6 +12845,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -13098,8 +13256,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -13138,8 +13295,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -13157,6 +13313,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -14015,6 +14175,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -14271,6 +14445,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -14287,6 +14462,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -14695,8 +14873,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -14735,8 +14912,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -14754,6 +14930,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -15615,6 +15795,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -15871,6 +16065,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -15887,6 +16082,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -16295,8 +16493,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -16335,8 +16532,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -16354,6 +16550,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -17272,6 +17472,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -17528,6 +17742,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -17544,6 +17759,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -17952,8 +18170,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -17992,8 +18209,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -18011,6 +18227,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -18046,8 +18266,11 @@ "properties": { "angle": { "description": "The angle of the line.", - "type": "number", - "format": "double" + "allOf": [ + { + "$ref": "#/components/schemas/TyF64" + } + ] }, "intersectTag": { "description": "The tag of the line to intersect with.", @@ -18059,12 +18282,19 @@ }, "offset": { "description": "The offset from the intersecting line.", - "type": "number", - "format": "double", + "allOf": [ + { + "$ref": "#/components/schemas/TyF64" + } + ], "nullable": true } }, "definitions": { + "TyF64": { + "type": "number", + "format": "double" + }, "TagIdentifier": { "type": "object", "required": [ @@ -18151,6 +18381,10 @@ } }, "definitions": { + "TyF64": { + "type": "number", + "format": "double" + }, "TagIdentifier": { "type": "object", "required": [ @@ -19003,6 +19237,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -19259,6 +19507,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -19275,6 +19524,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -19672,8 +19924,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -19712,8 +19963,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -19751,6 +20001,10 @@ ], "nullable": true, "definitions": { + "TyF64": { + "type": "number", + "format": "double" + }, "TagIdentifier": { "type": "object", "required": [ @@ -20603,6 +20857,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -20859,6 +21127,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -20875,6 +21144,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -21272,8 +21544,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -21312,8 +21583,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -22248,6 +22518,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -22504,6 +22788,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -22520,6 +22805,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -22928,8 +23216,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -22968,8 +23255,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -22987,6 +23273,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -24223,6 +24513,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -24432,6 +24736,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -24448,6 +24753,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -24539,8 +24847,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -24579,8 +24886,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -24598,6 +24904,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -25819,6 +26129,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -26028,6 +26352,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -26044,6 +26369,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -26135,8 +26463,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -26175,8 +26502,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -26194,6 +26520,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -27417,6 +27747,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -27626,6 +27970,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -27642,6 +27987,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -27733,8 +28081,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -27773,8 +28120,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -27792,6 +28138,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -29014,6 +29364,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -29223,6 +29587,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -29239,6 +29604,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -29330,8 +29698,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -29370,8 +29737,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -29389,6 +29755,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -30613,6 +30983,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -30822,6 +31206,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -30838,6 +31223,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -30929,8 +31317,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -30969,8 +31356,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -30988,6 +31374,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -31035,22 +31425,31 @@ "properties": { "angleStart": { "description": "The start angle.", - "type": "number", - "format": "double", + "allOf": [ + { + "$ref": "#/components/schemas/TyF64" + } + ], "maximum": 360.0, "minimum": -360.0 }, "angleEnd": { "description": "The end angle.", - "type": "number", - "format": "double", + "allOf": [ + { + "$ref": "#/components/schemas/TyF64" + } + ], "maximum": 360.0, "minimum": -360.0 }, "radius": { "description": "The radius.", - "type": "number", - "format": "double" + "allOf": [ + { + "$ref": "#/components/schemas/TyF64" + } + ] } } }, @@ -31067,8 +31466,7 @@ "description": "The center.", "type": "array", "items": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "maxItems": 2, "minItems": 2 @@ -31077,20 +31475,28 @@ "description": "The to point.", "type": "array", "items": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "maxItems": 2, "minItems": 2 }, "radius": { "description": "The radius.", - "type": "number", - "format": "double" + "allOf": [ + { + "$ref": "#/components/schemas/TyF64" + } + ] } } } - ] + ], + "definitions": { + "TyF64": { + "type": "number", + "format": "double" + } + } }, "required": true, "includeInSnippet": true, @@ -31165,6 +31571,10 @@ } }, "definitions": { + "TyF64": { + "type": "number", + "format": "double" + }, "Path": { "description": "A path.", "oneOf": [ @@ -32006,6 +32416,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -32262,6 +32686,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -32278,6 +32703,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -32686,8 +33114,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -32726,8 +33153,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -32765,6 +33191,10 @@ ], "nullable": true, "definitions": { + "TyF64": { + "type": "number", + "format": "double" + }, "Path": { "description": "A path.", "oneOf": [ @@ -33606,6 +34036,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -33862,6 +34306,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -33878,6 +34323,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -34286,8 +34734,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -34326,8 +34773,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -35262,6 +35708,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -35518,6 +35978,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -35534,6 +35995,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -35942,8 +36406,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -35982,8 +36445,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -36001,6 +36463,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -36038,8 +36504,7 @@ "description": "End point of the arc. A point in 3D space", "type": "array", "items": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "maxItems": 2, "minItems": 2 @@ -36048,12 +36513,17 @@ "description": "Interior point of the arc. A point in 3D space", "type": "array", "items": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "maxItems": 2, "minItems": 2 } + }, + "definitions": { + "TyF64": { + "type": "number", + "format": "double" + } } }, "required": true, @@ -36129,6 +36599,10 @@ } }, "definitions": { + "TyF64": { + "type": "number", + "format": "double" + }, "Path": { "description": "A path.", "oneOf": [ @@ -36970,6 +37444,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -37226,6 +37714,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -37242,6 +37731,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -37650,8 +38142,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -37690,8 +38181,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -37729,6 +38219,10 @@ ], "nullable": true, "definitions": { + "TyF64": { + "type": "number", + "format": "double" + }, "Path": { "description": "A path.", "oneOf": [ @@ -38570,6 +39064,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -38826,6 +39334,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -38842,6 +39351,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -39250,8 +39762,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -39290,8 +39801,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -40226,6 +40736,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -40482,6 +41006,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -40498,6 +41023,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -40906,8 +41434,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -40946,8 +41473,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -40965,6 +41491,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -41452,7 +41982,7 @@ "tags": [ "math" ], - "keywordArguments": false, + "keywordArguments": true, "args": [ { "name": "y", @@ -41465,6 +41995,7 @@ }, "required": true, "includeInSnippet": true, + "description": "Y", "labelRequired": true }, { @@ -41478,6 +42009,7 @@ }, "required": true, "includeInSnippet": true, + "description": "X", "labelRequired": true } ], @@ -41497,7 +42029,7 @@ "unpublished": false, "deprecated": false, "examples": [ - "sketch001 = startSketchOn(XZ)\n |> startProfileAt([0, 0], %)\n |> angledLine(angle = toDegrees(atan2(1.25, 2)), length = 20)\n |> yLine(endAbsolute = 0)\n |> close()\n\nextrude001 = extrude(sketch001, length = 5)" + "sketch001 = startSketchOn(XZ)\n |> startProfileAt([0, 0], %)\n |> angledLine(angle = toDegrees(atan2(y = 1.25, x = 2)), length = 20)\n |> yLine(endAbsolute = 0)\n |> close()\n\nextrude001 = extrude(sketch001, length = 5)" ] }, { @@ -41525,8 +42057,7 @@ "description": "The to point.", "type": "array", "items": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "maxItems": 2, "minItems": 2 @@ -41535,8 +42066,7 @@ "description": "The first control point.", "type": "array", "items": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "maxItems": 2, "minItems": 2 @@ -41545,12 +42075,17 @@ "description": "The second control point.", "type": "array", "items": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "maxItems": 2, "minItems": 2 } + }, + "definitions": { + "TyF64": { + "type": "number", + "format": "double" + } } }, "required": true, @@ -41626,6 +42161,10 @@ } }, "definitions": { + "TyF64": { + "type": "number", + "format": "double" + }, "Path": { "description": "A path.", "oneOf": [ @@ -42467,6 +43006,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -42723,6 +43276,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -42739,6 +43293,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -43147,8 +43704,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -43187,8 +43743,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -43226,6 +43781,10 @@ ], "nullable": true, "definitions": { + "TyF64": { + "type": "number", + "format": "double" + }, "Path": { "description": "A path.", "oneOf": [ @@ -44067,6 +44626,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -44323,6 +44896,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -44339,6 +44913,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -44747,8 +45324,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -44787,8 +45363,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -45723,6 +46298,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -45979,6 +46568,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -45995,6 +46585,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -46403,8 +46996,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -46443,8 +47035,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -46462,6 +47053,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -47734,6 +48329,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -47943,6 +48552,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -47959,6 +48569,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -48055,8 +48668,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -48095,8 +48707,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -48115,6 +48726,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -48190,7 +48805,7 @@ "type": "number", "schema": { "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema", - "title": "double", + "title": "TyF64", "type": "number", "format": "double", "definitions": { @@ -49331,6 +49946,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -49540,6 +50169,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -49556,6 +50186,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -49652,8 +50285,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -49692,8 +50324,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -49712,6 +50343,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -50930,6 +51565,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -51139,6 +51788,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -51155,6 +51805,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -51251,8 +51904,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -51291,8 +51943,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -51311,6 +51962,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -52549,6 +53204,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -52758,6 +53427,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -52774,6 +53444,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -52870,8 +53543,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -52910,8 +53582,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -52930,6 +53601,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -54228,6 +54903,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -54437,6 +55126,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -54453,6 +55143,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -54549,8 +55242,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -54589,8 +55281,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -54609,6 +55300,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -54682,7 +55377,7 @@ "deprecated": false, "examples": [ "// Chamfer a mounting plate.\nwidth = 20\nlength = 10\nthickness = 1\nchamferLength = 2\n\nmountingPlateSketch = startSketchOn(XY)\n |> startProfileAt([-width / 2, -length / 2], %)\n |> line(endAbsolute = [width / 2, -length / 2], tag = $edge1)\n |> line(endAbsolute = [width / 2, length / 2], tag = $edge2)\n |> line(endAbsolute = [-width / 2, length / 2], tag = $edge3)\n |> close(tag = $edge4)\n\nmountingPlate = extrude(mountingPlateSketch, length = thickness)\n |> chamfer(\n length = chamferLength,\n tags = [\n getNextAdjacentEdge(edge1),\n getNextAdjacentEdge(edge2),\n getNextAdjacentEdge(edge3),\n getNextAdjacentEdge(edge4)\n ],\n )", - "// Sketch on the face of a chamfer.\nfn cube(pos, scale) {\n sg = startSketchOn(XY)\n |> startProfileAt(pos, %)\n |> line(end = [0, scale])\n |> line(end = [scale, 0])\n |> line(end = [0, -scale])\n\n return sg\n}\n\npart001 = cube([0, 0], 20)\n |> close(tag = $line1)\n |> extrude(length = 20)\n // We tag the chamfer to reference it later.\n |> chamfer(length = 10, tags = [getOppositeEdge(line1)], tag = $chamfer1)\n\nsketch001 = startSketchOn(part001, chamfer1)\n |> startProfileAt([10, 10], %)\n |> line(end = [2, 0])\n |> line(end = [0, 2])\n |> line(end = [-2, 0])\n |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n |> close()\n |> extrude(length = 10)" + "// Sketch on the face of a chamfer.\nfn cube(pos, scale) {\n sg = startSketchOn(XY)\n |> startProfileAt(pos, %)\n |> line(end = [0, scale])\n |> line(end = [scale, 0])\n |> line(end = [0, -scale])\n\n return sg\n}\n\npart001 = cube([0, 0], 20)\n |> close(tag = $line1)\n |> extrude(length = 20)\n // We tag the chamfer to reference it later.\n |> chamfer(length = 10, tags = [getOppositeEdge(line1)], tag = $chamfer1)\n\nsketch001 = startSketchOn(part001, face = chamfer1)\n |> startProfileAt([10, 10], %)\n |> line(end = [2, 0])\n |> line(end = [0, 2])\n |> line(end = [-2, 0])\n |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n |> close()\n |> extrude(length = 10)" ] }, { @@ -54895,6 +55590,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -54911,6 +55607,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -55000,6 +55699,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -56229,8 +56942,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -56269,8 +56981,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -56288,6 +56999,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -56497,6 +57212,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -56513,6 +57229,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -56602,6 +57321,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -57831,8 +58564,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -57871,8 +58603,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -57890,6 +58621,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -58099,6 +58834,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -58115,6 +58851,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -58204,6 +58943,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -59433,8 +60186,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -59473,8 +60225,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -59492,6 +60243,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -59701,6 +60456,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -59717,6 +60473,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -59806,6 +60565,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -61035,8 +61808,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -61075,8 +61847,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -61094,6 +61865,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -61302,6 +62077,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -61318,6 +62094,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -61407,6 +62186,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -62636,8 +63429,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -62676,8 +63468,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -62695,6 +63486,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -63613,6 +64408,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -63869,6 +64678,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -63885,6 +64695,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -64293,8 +65106,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -64333,8 +65145,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -64352,6 +65163,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -65282,6 +66097,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -65538,6 +66367,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -65554,6 +66384,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -65962,8 +66795,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -66002,8 +66834,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -66021,6 +66852,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -66883,6 +67718,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -67139,6 +67988,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -67155,6 +68005,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -67563,8 +68416,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -67603,8 +68455,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -67622,6 +68473,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -68540,6 +69395,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -68796,6 +69665,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -68812,6 +69682,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -69220,8 +70093,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -69260,8 +70132,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -69279,6 +70150,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -70244,6 +71119,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -70500,6 +71389,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -70516,6 +71406,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -70797,8 +71690,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -70837,8 +71729,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -70857,6 +71748,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -71841,6 +72736,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -72097,6 +73006,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -72113,6 +73023,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -72394,8 +73307,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -72434,8 +73346,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -72454,6 +73365,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -73438,6 +74353,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -73694,6 +74623,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -73710,6 +74640,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -73991,8 +74924,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -74031,8 +74963,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -74051,6 +74982,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -75035,6 +75970,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -75291,6 +76240,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -75307,6 +76257,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -75588,8 +76541,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -75628,8 +76580,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -75648,6 +76599,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -76635,6 +77590,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -76891,6 +77860,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -76907,6 +77877,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -77188,8 +78161,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -77228,8 +78200,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -77248,6 +78219,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -78235,6 +79210,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -78491,6 +79480,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -78507,6 +79497,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -78788,8 +79781,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -78828,8 +79820,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -78848,6 +79839,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -80134,6 +81129,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -80343,6 +81352,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -80359,6 +81369,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -80450,8 +81463,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -80490,8 +81502,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -80509,6 +81520,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -81742,6 +82757,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -81951,6 +82980,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -81967,6 +82997,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -82063,8 +83096,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -82103,8 +83135,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -82123,6 +83154,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -82198,7 +83233,7 @@ "type": "number", "schema": { "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema", - "title": "double", + "title": "TyF64", "type": "number", "format": "double", "definitions": { @@ -83339,6 +84374,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -83548,6 +84597,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -83564,6 +84614,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -83660,8 +84713,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -83700,8 +84752,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -83720,6 +84771,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -84938,6 +85993,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -85147,6 +86216,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -85163,6 +86233,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -85259,8 +86332,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -85299,8 +86371,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -85319,6 +86390,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -86554,6 +87629,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -86763,6 +87852,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -86779,6 +87869,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -86875,8 +87968,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -86915,8 +88007,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -86935,6 +88026,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -88172,6 +89267,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -88381,6 +89490,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -88397,6 +89507,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -88493,8 +89606,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -88533,8 +89645,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -88553,6 +89664,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -89851,6 +90966,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -90060,6 +91189,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -90076,6 +91206,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -90172,8 +91305,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -90212,8 +91344,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -90232,6 +91363,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -91722,6 +92857,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -91978,6 +93127,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -91994,6 +93144,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -92275,8 +93428,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -92315,8 +93467,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -92335,6 +93486,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -93378,6 +94533,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -93634,6 +94803,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -93650,6 +94820,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -93931,8 +95104,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -93971,8 +95143,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -93991,6 +95162,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -94971,6 +96146,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -95227,6 +96416,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -95243,6 +96433,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -95651,8 +96844,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -95691,8 +96883,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -95710,6 +96901,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -96954,6 +98149,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -97163,6 +98372,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -97179,6 +98389,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -97275,8 +98488,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -97315,8 +98527,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -97335,6 +98546,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -98615,6 +99830,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -98824,6 +100053,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -98840,6 +100070,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -98936,8 +100169,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -98976,8 +100208,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -98996,6 +100227,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -99070,7 +100305,7 @@ "examples": [ "// Hollow a basic sketch.\nfirstSketch = startSketchOn(XY)\n |> startProfileAt([-12, 12], %)\n |> line(end = [24, 0])\n |> line(end = [0, -24])\n |> line(end = [-24, 0])\n |> close()\n |> extrude(length = 6)\n |> hollow(0.25, %)", "// Hollow a basic sketch.\nfirstSketch = startSketchOn(-XZ)\n |> startProfileAt([-12, 12], %)\n |> line(end = [24, 0])\n |> line(end = [0, -24])\n |> line(end = [-24, 0])\n |> close()\n |> extrude(length = 6)\n |> hollow(0.5, %)", - "// Hollow a sketch on face object.\nsize = 100\ncase = startSketchOn(-XZ)\n |> startProfileAt([-size, -size], %)\n |> line(end = [2 * size, 0])\n |> line(end = [0, 2 * size])\n |> tangentialArcTo([-size, size], %)\n |> close()\n |> extrude(length = 65)\n\nthing1 = startSketchOn(case, 'end')\n |> circle(center = [-size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\nthing2 = startSketchOn(case, 'end')\n |> circle(center = [size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\nhollow(0.5, case)" + "// Hollow a sketch on face object.\nsize = 100\ncase = startSketchOn(-XZ)\n |> startProfileAt([-size, -size], %)\n |> line(end = [2 * size, 0])\n |> line(end = [0, 2 * size])\n |> tangentialArcTo([-size, size], %)\n |> close()\n |> extrude(length = 65)\n\nthing1 = startSketchOn(case, face = 'end')\n |> circle(center = [-size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\nthing2 = startSketchOn(case, face = 'end')\n |> circle(center = [size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\nhollow(0.5, case)" ] }, { @@ -100338,6 +101573,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -100547,6 +101796,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -100563,6 +101813,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -100654,8 +101907,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -100694,8 +101946,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -100713,6 +101964,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -100726,9 +101981,12 @@ "type": "number", "schema": { "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema", - "title": "Nullable_double", - "type": "number", - "format": "double", + "title": "Nullable_TyF64", + "allOf": [ + { + "$ref": "#/components/schemas/TyF64" + } + ], "nullable": true, "definitions": { "Solid": { @@ -101936,6 +103194,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -102145,6 +103417,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -102161,6 +103434,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -102252,8 +103528,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -102292,8 +103567,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -102311,6 +103585,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -103535,6 +104813,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -103744,6 +105036,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -103760,6 +105053,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -103851,8 +105147,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -103891,8 +105186,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -103910,6 +105204,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -104841,6 +106139,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -105097,6 +106409,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -105113,6 +106426,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -105521,8 +106837,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -105561,8 +106876,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -105580,6 +106894,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -106525,6 +107843,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -106781,6 +108113,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -106797,6 +108130,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -107205,8 +108541,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -107245,8 +108580,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -107264,6 +108598,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -108374,6 +109712,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -108630,6 +109982,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -108646,6 +109999,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -109054,8 +110410,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -109094,8 +110449,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -109113,6 +110467,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -109977,6 +111335,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -110233,6 +111605,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -110249,6 +111622,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -110657,8 +112033,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -110697,8 +112072,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -110716,6 +112090,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -111579,6 +112957,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -111835,6 +113227,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -111851,6 +113244,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -112259,8 +113655,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -112299,8 +113694,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -112318,6 +113712,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -113180,6 +114578,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -113436,6 +114848,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -113452,6 +114865,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -113860,8 +115276,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -113900,8 +115315,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -113919,6 +115333,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -114837,6 +116255,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -115093,6 +116525,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -115109,6 +116542,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -115517,8 +116953,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -115557,8 +116992,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -115576,6 +117010,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -116554,6 +117992,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -116810,6 +118262,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -116826,6 +118279,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -117107,8 +118563,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -117147,8 +118602,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -117167,6 +118621,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -118152,6 +119610,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -118408,6 +119880,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -118424,6 +119897,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -118705,8 +120181,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -118745,8 +120220,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -118765,6 +120239,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -119748,6 +121226,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -120004,6 +121496,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -120020,6 +121513,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -120301,8 +121797,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -120341,8 +121836,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -120361,6 +121855,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -121347,6 +122845,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -121603,6 +123115,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -121619,6 +123132,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -121900,8 +123416,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -121940,8 +123455,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -121960,6 +123474,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -122944,6 +124462,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -123200,6 +124732,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -123216,6 +124749,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -123497,8 +125033,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -123537,8 +125072,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -123557,6 +125091,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -124544,6 +126082,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -124800,6 +126352,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -124816,6 +126369,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -125097,8 +126653,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -125137,8 +126692,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -125157,6 +126711,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -126144,6 +127702,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -126400,6 +127972,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -126416,6 +127989,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -126697,8 +128273,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -126737,8 +128312,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -126757,6 +128331,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -128037,6 +129615,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -128246,6 +129838,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -128262,6 +129855,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -128358,8 +129954,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -128398,8 +129993,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -128418,6 +130012,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -129144,6 +130742,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -129189,6 +130801,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -129354,6 +130980,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -129387,6 +131027,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -129490,6 +131144,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -129506,6 +131161,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -130956,8 +132614,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -130996,8 +132653,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -131016,6 +132672,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "Helix": { "description": "A helix.", "type": "object", @@ -131595,6 +133255,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -131640,6 +133314,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -131805,6 +133493,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -131838,6 +133540,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -131941,6 +133657,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -131957,6 +133674,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -133407,8 +135127,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -133447,8 +135166,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -133467,6 +135185,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "Helix": { "description": "A helix.", "type": "object", @@ -134050,6 +135772,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -134095,6 +135831,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -134260,6 +136010,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -134293,6 +136057,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -134396,6 +136174,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -134412,6 +136191,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -135862,8 +137644,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -135902,8 +137683,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -135922,6 +137702,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "Helix": { "description": "A helix.", "type": "object", @@ -136213,6 +137997,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -136229,14 +138014,120 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } + }, + "UnitLen": { + "description": "A unit of length.", + "oneOf": [ + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Mm" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Cm" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "M" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Inches" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Feet" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Yards" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } + } + ] } } }, "required": true, "includeInSnippet": true, - "description": "The plane (e.g. 'XY') which this new plane is created from.", + "description": "The plane (e.g. XY) which this new plane is created from.", "labelRequired": false }, { @@ -136251,6 +138142,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -136267,8 +138159,114 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } + }, + "UnitLen": { + "description": "A unit of length.", + "oneOf": [ + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Mm" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Cm" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "M" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Inches" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Feet" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Yards" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } + } + ] } } }, @@ -136383,6 +138381,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -136399,6 +138398,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -136488,6 +138490,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] } @@ -137430,6 +139446,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -137686,6 +139716,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -137702,6 +139733,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -137983,8 +140017,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -138023,8 +140056,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -138043,6 +140075,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -139028,6 +141064,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -139284,6 +141334,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -139300,6 +141351,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -139581,8 +141635,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -139621,8 +141674,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -139641,6 +141693,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -140630,6 +142686,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -140886,6 +142956,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -140902,6 +142973,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -141183,8 +143257,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -141223,8 +143296,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -141243,6 +143315,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -142227,6 +144303,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -142483,6 +144573,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -142499,6 +144590,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -142780,8 +144874,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -142820,8 +144913,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -142840,6 +144932,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -143823,6 +145919,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -144079,6 +146189,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -144095,6 +146206,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -144376,8 +146490,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -144416,8 +146529,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -144436,6 +146548,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -145420,6 +147536,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -145676,6 +147806,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -145692,6 +147823,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -145973,8 +148107,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -146013,8 +148146,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -146033,6 +148165,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -147019,6 +149155,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -147275,6 +149425,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -147291,6 +149442,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -147572,8 +149726,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -147612,8 +149765,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -147632,6 +149784,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -148930,6 +151086,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -149139,6 +151309,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -149155,6 +151326,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -149246,8 +151420,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -149286,8 +151459,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -149305,6 +151477,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -150528,6 +152704,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -150737,6 +152927,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -150753,6 +152944,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -150844,8 +153038,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -150884,8 +153077,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -150903,6 +153095,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -152130,6 +154326,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -152339,6 +154549,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -152355,6 +154566,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -152446,8 +154660,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -152486,8 +154699,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -152505,6 +154717,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -153732,6 +155948,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -153941,6 +156171,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -153957,6 +156188,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -154048,8 +156282,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -154088,8 +156321,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -154107,6 +156339,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -155329,6 +157565,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -155538,6 +157788,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -155554,6 +157805,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -155645,8 +157899,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -155685,8 +157938,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -155704,6 +157956,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -156925,6 +159181,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -157134,6 +159404,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -157150,6 +159421,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -157241,8 +159515,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -157281,8 +159554,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -157300,6 +159572,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -158522,6 +160798,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -158731,6 +161021,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -158747,6 +161038,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -158838,8 +161132,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -158878,8 +161171,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -158897,6 +161189,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -160121,6 +162417,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -160330,6 +162640,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -160346,6 +162657,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -160437,8 +162751,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -160477,8 +162790,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -160496,6 +162808,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -161432,6 +163748,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -161688,6 +164018,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -161704,6 +164035,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -161985,8 +164319,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -162025,8 +164358,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -162045,6 +164377,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -163030,6 +165366,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -163286,6 +165636,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -163302,6 +165653,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -163583,8 +165937,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -163623,8 +165976,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -163643,6 +165995,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -164627,6 +166983,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -164883,6 +167253,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -164899,6 +167270,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -165180,8 +167554,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -165220,8 +167593,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -165240,6 +167612,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -166229,6 +168605,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -166485,6 +168875,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -166501,6 +168892,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -166782,8 +169176,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -166822,8 +169215,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -166842,6 +169234,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -167826,6 +170222,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -168082,6 +170492,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -168098,6 +170509,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -168379,8 +170793,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -168419,8 +170832,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -168439,6 +170851,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -169425,6 +171841,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -169681,6 +172111,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -169697,6 +172128,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -169978,8 +172412,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -170018,8 +172451,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -170038,6 +172470,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -171336,6 +173772,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -171545,6 +173995,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -171561,6 +174012,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -171652,8 +174106,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -171692,8 +174145,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -171711,6 +174163,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -172934,6 +175390,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -173143,6 +175613,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -173159,6 +175630,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -173250,8 +175724,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -173290,8 +175763,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -173309,6 +175781,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -174531,6 +177007,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -174740,6 +177230,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -174756,6 +177247,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -174847,8 +177341,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -174887,8 +177380,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -174906,6 +177398,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -176133,6 +178629,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -176342,6 +178852,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -176358,6 +178869,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -176449,8 +178963,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -176489,8 +179002,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -176508,6 +179020,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -177730,6 +180246,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -177939,6 +180469,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -177955,6 +180486,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -178046,8 +180580,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -178086,8 +180619,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -178105,6 +180637,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -179329,6 +181865,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -179538,6 +182088,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -179554,6 +182105,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -179645,8 +182199,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -179685,8 +182238,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -179704,6 +182256,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -179715,8 +182271,8 @@ "deprecated": false, "examples": [ "exampleSketch = startSketchOn(XZ)\n |> startProfileAt([0, 0], %)\n |> line(end = [0, 2])\n |> line(end = [3, 1])\n |> line(end = [0, -4])\n |> close()\n\nexample = extrude(exampleSketch, length = 1)\n |> patternLinear3d(axis = [1, 0, 1], instances = 7, distance = 6)", - "// Pattern a whole sketch on face.\nsize = 100\ncase = startSketchOn(XY)\n |> startProfileAt([-size, -size], %)\n |> line(end = [2 * size, 0])\n |> line(end = [0, 2 * size])\n |> tangentialArcTo([-size, size], %)\n |> close(%)\n |> extrude(length = 65)\n\nthing1 = startSketchOn(case, 'end')\n |> circle(center = [-size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\nthing2 = startSketchOn(case, 'end')\n |> circle(center = [size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\n // We pass in the \"case\" here since we want to pattern the whole sketch.\n// And the case was the base of the sketch.\npatternLinear3d(\n case,\n axis = [1, 0, 0],\n distance = 250,\n instances = 2,\n)", - "// Pattern an object on a face.\nsize = 100\ncase = startSketchOn(XY)\n |> startProfileAt([-size, -size], %)\n |> line(end = [2 * size, 0])\n |> line(end = [0, 2 * size])\n |> tangentialArcTo([-size, size], %)\n |> close(%)\n |> extrude(length = 65)\n\nthing1 = startSketchOn(case, 'end')\n |> circle(center = [-size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\n// We pass in `thing1` here with `useOriginal` since we want to pattern just this object on the face.\npatternLinear3d(\n thing1,\n axis = [1, 0, 0],\n distance = size,\n instances = 2,\n useOriginal = true,\n)" + "// Pattern a whole sketch on face.\nsize = 100\ncase = startSketchOn(XY)\n |> startProfileAt([-size, -size], %)\n |> line(end = [2 * size, 0])\n |> line(end = [0, 2 * size])\n |> tangentialArcTo([-size, size], %)\n |> close(%)\n |> extrude(length = 65)\n\nthing1 = startSketchOn(case, face = 'end')\n |> circle(center = [-size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\nthing2 = startSketchOn(case, face = 'end')\n |> circle(center = [size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\n // We pass in the \"case\" here since we want to pattern the whole sketch.\n// And the case was the base of the sketch.\npatternLinear3d(\n case,\n axis = [1, 0, 0],\n distance = 250,\n instances = 2,\n)", + "// Pattern an object on a face.\nsize = 100\ncase = startSketchOn(XY)\n |> startProfileAt([-size, -size], %)\n |> line(end = [2 * size, 0])\n |> line(end = [0, 2 * size])\n |> tangentialArcTo([-size, size], %)\n |> close(%)\n |> extrude(length = 65)\n\nthing1 = startSketchOn(case, face = 'end')\n |> circle(center = [-size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\n// We pass in `thing1` here with `useOriginal` since we want to pattern just this object on the face.\npatternLinear3d(\n thing1,\n axis = [1, 0, 0],\n distance = size,\n instances = 2,\n useOriginal = true,\n)" ] }, { @@ -180942,6 +183498,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -181151,6 +183721,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -181167,6 +183738,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -181258,8 +183832,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -181298,8 +183871,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -181317,6 +183889,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -182540,6 +185116,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -182749,6 +185339,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -182765,6 +185356,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -182856,8 +185450,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -182896,8 +185489,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -182915,6 +185507,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -184136,6 +186732,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -184345,6 +186955,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -184361,6 +186972,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -184452,8 +187066,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -184492,8 +187105,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -184511,6 +187123,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -185733,6 +188349,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -185942,6 +188572,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -185958,6 +188589,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -186049,8 +188683,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -186089,8 +188722,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -186108,6 +188740,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -187332,6 +189968,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -187541,6 +190191,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -187557,6 +190208,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -187648,8 +190302,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -187688,8 +190341,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -187707,6 +190359,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -188648,6 +191304,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -188904,6 +191574,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -188920,6 +191591,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -189201,8 +191875,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -189241,8 +191914,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -189261,6 +191933,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -190246,6 +192922,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -190502,6 +193192,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -190518,6 +193209,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -190799,8 +193493,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -190839,8 +193532,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -190859,6 +193551,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -191842,6 +194538,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -192098,6 +194808,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -192114,6 +194825,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -192395,8 +195109,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -192435,8 +195148,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -192455,6 +195167,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -193439,6 +196155,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -193695,6 +196425,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -193711,6 +196442,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -193992,8 +196726,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -194032,8 +196765,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -194052,6 +196784,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -195038,6 +197774,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -195294,6 +198044,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -195310,6 +198061,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -195591,8 +198345,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -195631,8 +198384,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -195651,6 +198403,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -195777,8 +198533,11 @@ "properties": { "radius": { "description": "The radius of the polygon", - "type": "number", - "format": "double" + "allOf": [ + { + "$ref": "#/components/schemas/TyF64" + } + ] }, "numSides": { "description": "The number of sides in the polygon", @@ -195790,8 +198549,7 @@ "description": "The center point of the polygon", "type": "array", "items": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "maxItems": 2, "minItems": 2 @@ -195801,6 +198559,12 @@ "default": true, "type": "boolean" } + }, + "definitions": { + "TyF64": { + "type": "number", + "format": "double" + } } }, "required": true, @@ -195823,6 +198587,10 @@ } ], "definitions": { + "TyF64": { + "type": "number", + "format": "double" + }, "SketchSurface": { "description": "A sketch type.", "oneOf": [ @@ -196010,6 +198778,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -196026,6 +198795,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -196115,6 +198887,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -197344,8 +200130,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -197384,8 +200169,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -197423,6 +200207,10 @@ ], "nullable": true, "definitions": { + "TyF64": { + "type": "number", + "format": "double" + }, "SketchSurface": { "description": "A sketch type.", "oneOf": [ @@ -197610,6 +200398,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -197626,6 +200415,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -197715,6 +200507,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -198944,8 +201750,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -198984,8 +201789,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -199920,6 +202724,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -200176,6 +202994,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -200192,6 +203011,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -200600,8 +203422,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -200640,8 +203461,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -200659,6 +203479,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -201183,6 +204007,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -201228,6 +204066,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -201393,6 +204245,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -201426,6 +204292,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -201529,6 +204409,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -201545,6 +204426,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -202995,8 +205879,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -203035,8 +205918,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -203055,6 +205937,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "Helix": { "description": "A helix.", "type": "object", @@ -203633,6 +206519,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -203678,6 +206578,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -203843,6 +206757,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -203876,6 +206804,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -204365,6 +207307,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -204381,6 +207324,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -205831,8 +208777,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -205871,8 +208816,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -205891,6 +208835,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "Helix": { "description": "A helix.", "type": "object", @@ -206948,6 +209896,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -207204,6 +210166,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -207220,6 +210183,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -207628,8 +210594,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -207668,8 +210633,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -207687,6 +210651,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -208636,6 +211604,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -208892,6 +211874,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -208908,6 +211891,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -209316,8 +212302,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -209356,8 +212341,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -209375,6 +212359,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -210319,6 +213307,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -210575,6 +213577,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -210591,6 +213594,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -210999,8 +214005,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -211039,8 +214044,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -211058,6 +214062,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -211595,6 +214603,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -211640,6 +214662,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -211805,6 +214841,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -211838,6 +214888,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -211941,6 +215005,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -211957,6 +215022,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -213407,8 +216475,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -213447,8 +216514,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -213467,6 +216533,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "Helix": { "description": "A helix.", "type": "object", @@ -214429,6 +217499,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -214474,6 +217558,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -214639,6 +217737,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -214672,6 +217784,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -214775,6 +217901,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -214791,6 +217918,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -216241,8 +219371,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -216281,8 +219410,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -216301,6 +219429,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "Helix": { "description": "A helix.", "type": "object", @@ -216878,6 +220010,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -216923,6 +220069,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -217088,6 +220248,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -217121,6 +220295,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -217610,6 +220798,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -217626,6 +220815,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -219076,8 +222268,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -219116,8 +222307,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -219136,6 +222326,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "Helix": { "description": "A helix.", "type": "object", @@ -219731,6 +222925,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -219776,6 +222984,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -219941,6 +223163,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -219974,6 +223210,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -220077,6 +223327,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -220093,6 +223344,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -221543,8 +224797,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -221583,8 +224836,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -221603,6 +224855,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "Helix": { "description": "A helix.", "type": "object", @@ -222565,6 +225821,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -222610,6 +225880,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -222775,6 +226059,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -222808,6 +226106,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -222911,6 +226223,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -222927,6 +226240,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -224377,8 +227693,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -224417,8 +227732,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -224437,6 +227751,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "Helix": { "description": "A helix.", "type": "object", @@ -225016,6 +228334,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -225061,6 +228393,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -225226,6 +228572,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -225259,6 +228619,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -225362,6 +228736,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -225378,6 +228753,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -226828,8 +230206,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -226868,8 +230245,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -226888,6 +230264,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "Helix": { "description": "A helix.", "type": "object", @@ -227465,6 +230845,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -227510,6 +230904,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ], "required": [ @@ -227675,6 +231083,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -227708,6 +231130,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -228197,6 +231633,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -228213,6 +231650,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -229663,8 +233103,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -229703,8 +233142,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -229723,6 +233161,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "Helix": { "description": "A helix.", "type": "object", @@ -231158,6 +234600,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -231367,6 +234823,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -231383,6 +234840,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -231474,8 +234934,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -231514,8 +234973,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -231533,6 +234991,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -232756,6 +236218,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -232965,6 +236441,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -232981,6 +236458,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -233072,8 +236552,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -233112,8 +236591,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -233131,6 +236609,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -234354,6 +237836,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -234563,6 +238059,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -234579,6 +238076,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -234670,8 +238170,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -234710,8 +238209,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -234729,6 +238227,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -235952,6 +239454,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -236161,6 +239677,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -236177,6 +239694,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -236268,8 +239788,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -236308,8 +239827,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -236327,6 +239845,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -237555,6 +241077,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -237764,6 +241300,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -237780,6 +241317,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -237871,8 +241411,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -237911,8 +241450,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -237930,6 +241468,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -239152,6 +242694,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -239361,6 +242917,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -239377,6 +242934,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -239468,8 +243028,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -239508,8 +243067,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -239527,6 +243085,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -240748,6 +244310,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -240957,6 +244533,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -240973,6 +244550,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -241064,8 +244644,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -241104,8 +244683,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -241123,6 +244701,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -242415,6 +245997,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -242624,6 +246220,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -242640,6 +246237,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -242731,8 +246331,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -242771,8 +246370,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -242790,6 +246388,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -244141,6 +247743,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -244350,6 +247966,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -244366,6 +247983,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -244457,8 +248077,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -244497,8 +248116,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -244516,6 +248134,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -245739,6 +249361,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -245948,6 +249584,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -245964,6 +249601,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -246055,8 +249695,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -246095,8 +249734,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -246114,6 +249752,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -247337,6 +250979,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -247546,6 +251202,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -247562,6 +251219,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -247653,8 +251313,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -247693,8 +251352,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -247712,6 +251370,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -248935,6 +252597,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -249144,6 +252820,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -249160,6 +252837,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -249251,8 +252931,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -249291,8 +252970,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -249310,6 +252988,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -250532,6 +254214,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -250741,6 +254437,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -250757,6 +254454,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -250848,8 +254548,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -250888,8 +254587,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -250907,6 +254605,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -252199,6 +255901,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -252408,6 +256124,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -252424,6 +256141,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -252515,8 +256235,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -252555,8 +256274,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -252574,6 +256292,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -254216,6 +257938,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -254425,6 +258161,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -254441,6 +258178,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -254532,8 +258272,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -254572,8 +258311,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -254591,6 +258329,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -255813,6 +259555,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -256022,6 +259778,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -256038,6 +259795,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -256129,8 +259889,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -256169,8 +259928,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -256188,6 +259946,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -257412,6 +261174,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -257621,6 +261397,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -257637,6 +261414,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -257728,8 +261508,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -257768,8 +261547,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -257788,6 +261566,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "FaceTag": { "description": "A tag for a face.", "anyOf": [ @@ -259046,6 +262828,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -259255,6 +263051,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -259271,6 +263068,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -259362,8 +263162,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -259402,8 +263201,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -259421,6 +263219,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -259435,9 +263237,9 @@ "// Remove the start face for the extrusion.\nfirstSketch = startSketchOn(-XZ)\n |> startProfileAt([-12, 12], %)\n |> line(end = [24, 0])\n |> line(end = [0, -24])\n |> line(end = [-24, 0])\n |> close()\n |> extrude(length = 6)\n\n// Remove the start face for the extrusion.\nshell(firstSketch, faces = ['start'], thickness = 0.25)", "// Remove a tagged face and the end face for the extrusion.\nfirstSketch = startSketchOn(XY)\n |> startProfileAt([-12, 12], %)\n |> line(end = [24, 0])\n |> line(end = [0, -24])\n |> line(end = [-24, 0], tag = $myTag)\n |> close()\n |> extrude(length = 6)\n\n// Remove a tagged face for the extrusion.\nshell(firstSketch, faces = [myTag], thickness = 0.25)", "// Remove multiple faces at once.\nfirstSketch = startSketchOn(XY)\n |> startProfileAt([-12, 12], %)\n |> line(end = [24, 0])\n |> line(end = [0, -24])\n |> line(end = [-24, 0], tag = $myTag)\n |> close()\n |> extrude(length = 6)\n\n// Remove a tagged face and the end face for the extrusion.\nshell(firstSketch, faces = [myTag, 'end'], thickness = 0.25)", - "// Shell a sketch on face.\nsize = 100\ncase = startSketchOn(-XZ)\n |> startProfileAt([-size, -size], %)\n |> line(end = [2 * size, 0])\n |> line(end = [0, 2 * size])\n |> tangentialArcTo([-size, size], %)\n |> close()\n |> extrude(length = 65)\n\nthing1 = startSketchOn(case, 'end')\n |> circle(center = [-size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\nthing2 = startSketchOn(case, 'end')\n |> circle(center = [size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\n// We put \"case\" in the shell function to shell the entire object.\nshell(case, faces = ['start'], thickness = 5)", - "// Shell a sketch on face object on the end face.\nsize = 100\ncase = startSketchOn(XY)\n |> startProfileAt([-size, -size], %)\n |> line(end = [2 * size, 0])\n |> line(end = [0, 2 * size])\n |> tangentialArcTo([-size, size], %)\n |> close()\n |> extrude(length = 65)\n\nthing1 = startSketchOn(case, 'end')\n |> circle(center = [-size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\nthing2 = startSketchOn(case, 'end')\n |> circle(center = [size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\n// We put \"thing1\" in the shell function to shell the end face of the object.\nshell(thing1, faces = ['end'], thickness = 5)", - "// Shell sketched on face objects on the end face, include all sketches to shell\n// the entire object.\n\n\nsize = 100\ncase = startSketchOn(XY)\n |> startProfileAt([-size, -size], %)\n |> line(end = [2 * size, 0])\n |> line(end = [0, 2 * size])\n |> tangentialArcTo([-size, size], %)\n |> close()\n |> extrude(length = 65)\n\nthing1 = startSketchOn(case, 'end')\n |> circle(center = [-size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\nthing2 = startSketchOn(case, 'end')\n |> circle(center = [size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\n// We put \"thing1\" and \"thing2\" in the shell function to shell the end face of the object.\nshell([thing1, thing2], faces = ['end'], thickness = 5)" + "// Shell a sketch on face.\nsize = 100\ncase = startSketchOn(-XZ)\n |> startProfileAt([-size, -size], %)\n |> line(end = [2 * size, 0])\n |> line(end = [0, 2 * size])\n |> tangentialArcTo([-size, size], %)\n |> close()\n |> extrude(length = 65)\n\nthing1 = startSketchOn(case, face = 'end')\n |> circle(center = [-size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\nthing2 = startSketchOn(case, face = 'end')\n |> circle(center = [size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\n// We put \"case\" in the shell function to shell the entire object.\nshell(case, faces = ['start'], thickness = 5)", + "// Shell a sketch on face object on the end face.\nsize = 100\ncase = startSketchOn(XY)\n |> startProfileAt([-size, -size], %)\n |> line(end = [2 * size, 0])\n |> line(end = [0, 2 * size])\n |> tangentialArcTo([-size, size], %)\n |> close()\n |> extrude(length = 65)\n\nthing1 = startSketchOn(case, face = 'end')\n |> circle(center = [-size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\nthing2 = startSketchOn(case, face = 'end')\n |> circle(center = [size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\n// We put \"thing1\" in the shell function to shell the end face of the object.\nshell(thing1, faces = ['end'], thickness = 5)", + "// Shell sketched on face objects on the end face, include all sketches to shell\n// the entire object.\n\n\nsize = 100\ncase = startSketchOn(XY)\n |> startProfileAt([-size, -size], %)\n |> line(end = [2 * size, 0])\n |> line(end = [0, 2 * size])\n |> tangentialArcTo([-size, size], %)\n |> close()\n |> extrude(length = 65)\n\nthing1 = startSketchOn(case, face = 'end')\n |> circle(center = [-size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\nthing2 = startSketchOn(case, face = 'end')\n |> circle(center = [size / 2, -size / 2], radius = 25)\n |> extrude(length = 50)\n\n// We put \"thing1\" and \"thing2\" in the shell function to shell the end face of the object.\nshell([thing1, thing2], faces = ['end'], thickness = 5)" ] }, { @@ -259699,6 +263501,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -259715,6 +263518,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -259804,6 +263610,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -261186,8 +265006,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -261226,8 +265045,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -261245,6 +265063,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -261299,6 +265121,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -261315,6 +265138,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -261404,6 +265230,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -262786,8 +266626,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -262826,8 +266665,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -262845,6 +266683,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -263762,6 +267604,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -264018,6 +267874,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -264034,6 +267891,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -264442,8 +268302,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -264482,8 +268341,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -264501,6 +268359,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -264521,10 +268383,10 @@ "summary": "Start a new 2-dimensional sketch on a specific plane or face.", "description": "### Sketch on Face Behavior\n\nThere are some important behaviors to understand when sketching on a face:\n\nThe resulting sketch will _include_ the face and thus Solid that was sketched on. So say you were to export the resulting Sketch / Solid from a sketch on a face, you would get both the artifact of the sketch on the face and the parent face / Solid itself.\n\nThis is important to understand because if you were to then sketch on the resulting Solid, it would again include the face and parent Solid that was sketched on. This could go on indefinitely.\n\nThe point is if you want to export the result of a sketch on a face, you only need to export the final Solid that was created from the sketch on the face, since it will include all the parent faces and Solids.", "tags": [], - "keywordArguments": false, + "keywordArguments": true, "args": [ { - "name": "data", + "name": "planeOrSolid", "type": "SketchData", "schema": { "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema", @@ -264645,6 +268507,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -264661,9 +268524,115 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, + "UnitLen": { + "description": "A unit of length.", + "oneOf": [ + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Mm" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Cm" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "M" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Inches" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Feet" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Yards" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } + } + ] + }, "Plane": { "type": "object", "required": [ @@ -264761,95 +268730,6 @@ } ] }, - "UnitLen": { - "description": "A unit of length.", - "oneOf": [ - { - "type": "object", - "required": [ - "type" - ], - "properties": { - "type": { - "type": "string", - "enum": [ - "Mm" - ] - } - } - }, - { - "type": "object", - "required": [ - "type" - ], - "properties": { - "type": { - "type": "string", - "enum": [ - "Cm" - ] - } - } - }, - { - "type": "object", - "required": [ - "type" - ], - "properties": { - "type": { - "type": "string", - "enum": [ - "M" - ] - } - } - }, - { - "type": "object", - "required": [ - "type" - ], - "properties": { - "type": { - "type": "string", - "enum": [ - "Inches" - ] - } - } - }, - { - "type": "object", - "required": [ - "type" - ], - "properties": { - "type": { - "type": "string", - "enum": [ - "Feet" - ] - } - } - }, - { - "type": "object", - "required": [ - "type" - ], - "properties": { - "type": { - "type": "string", - "enum": [ - "Yards" - ] - } - } - } - ] - }, "Solid": { "type": "object", "required": [ @@ -266229,8 +270109,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -266269,8 +270148,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -266288,15 +270166,20 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, "required": true, "includeInSnippet": true, - "labelRequired": true + "description": "The plane or solid to sketch on", + "labelRequired": false }, { - "name": "tag", + "name": "face", "type": "FaceTag", "schema": { "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema", @@ -266411,6 +270294,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -266427,9 +270311,115 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, + "UnitLen": { + "description": "A unit of length.", + "oneOf": [ + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Mm" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Cm" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "M" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Inches" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Feet" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Yards" + ] + } + } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } + } + ] + }, "Plane": { "type": "object", "required": [ @@ -266527,95 +270517,6 @@ } ] }, - "UnitLen": { - "description": "A unit of length.", - "oneOf": [ - { - "type": "object", - "required": [ - "type" - ], - "properties": { - "type": { - "type": "string", - "enum": [ - "Mm" - ] - } - } - }, - { - "type": "object", - "required": [ - "type" - ], - "properties": { - "type": { - "type": "string", - "enum": [ - "Cm" - ] - } - } - }, - { - "type": "object", - "required": [ - "type" - ], - "properties": { - "type": { - "type": "string", - "enum": [ - "M" - ] - } - } - }, - { - "type": "object", - "required": [ - "type" - ], - "properties": { - "type": { - "type": "string", - "enum": [ - "Inches" - ] - } - } - }, - { - "type": "object", - "required": [ - "type" - ], - "properties": { - "type": { - "type": "string", - "enum": [ - "Feet" - ] - } - } - }, - { - "type": "object", - "required": [ - "type" - ], - "properties": { - "type": { - "type": "string", - "enum": [ - "Yards" - ] - } - } - } - ] - }, "Solid": { "type": "object", "required": [ @@ -267995,8 +271896,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -268035,8 +271935,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -268055,6 +271954,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "FaceTag": { "description": "A tag for a face.", "anyOf": [ @@ -268092,6 +271995,7 @@ } }, "required": false, + "description": "Identify a face of a solid if a solid is specified as the input argument (`plane_or_solid`)", "labelRequired": true } ], @@ -268287,6 +272191,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -268303,6 +272208,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -268392,6 +272300,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -269774,8 +273696,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -269814,8 +273735,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -269833,6 +273753,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -269843,12 +273767,12 @@ "unpublished": false, "deprecated": false, "examples": [ - "exampleSketch = startSketchOn(XY)\n |> startProfileAt([0, 0], %)\n |> line(end = [10, 0])\n |> line(end = [0, 10])\n |> line(end = [-10, 0])\n |> close()\n\nexample = extrude(exampleSketch, length = 5)\n\nexampleSketch002 = startSketchOn(example, 'end')\n |> startProfileAt([1, 1], %)\n |> line(end = [8, 0])\n |> line(end = [0, 8])\n |> line(end = [-8, 0])\n |> close()\n\nexample002 = extrude(exampleSketch002, length = 5)\n\nexampleSketch003 = startSketchOn(example002, 'end')\n |> startProfileAt([2, 2], %)\n |> line(end = [6, 0])\n |> line(end = [0, 6])\n |> line(end = [-6, 0])\n |> close()\n\nexample003 = extrude(exampleSketch003, length = 5)", - "// Sketch on the end of an extruded face by tagging the end face.\n\n\nexampleSketch = startSketchOn(XY)\n |> startProfileAt([0, 0], %)\n |> line(end = [10, 0])\n |> line(end = [0, 10])\n |> line(end = [-10, 0])\n |> close()\n\nexample = extrude(exampleSketch, length = 5, tagEnd = $end01)\n\nexampleSketch002 = startSketchOn(example, end01)\n |> startProfileAt([1, 1], %)\n |> line(end = [8, 0])\n |> line(end = [0, 8])\n |> line(end = [-8, 0])\n |> close()\n\nexample002 = extrude(exampleSketch002, length = 5, tagEnd = $end02)\n\nexampleSketch003 = startSketchOn(example002, end02)\n |> startProfileAt([2, 2], %)\n |> line(end = [6, 0])\n |> line(end = [0, 6])\n |> line(end = [-6, 0])\n |> close()\n\nexample003 = extrude(exampleSketch003, length = 5)", - "exampleSketch = startSketchOn(XY)\n |> startProfileAt([0, 0], %)\n |> line(end = [10, 0])\n |> line(end = [0, 10], tag = $sketchingFace)\n |> line(end = [-10, 0])\n |> close()\n\nexample = extrude(exampleSketch, length = 10)\n\nexampleSketch002 = startSketchOn(example, sketchingFace)\n |> startProfileAt([1, 1], %)\n |> line(end = [8, 0])\n |> line(end = [0, 8])\n |> line(end = [-8, 0])\n |> close(tag = $sketchingFace002)\n\nexample002 = extrude(exampleSketch002, length = 10)\n\nexampleSketch003 = startSketchOn(example002, sketchingFace002)\n |> startProfileAt([-8, 12], %)\n |> line(end = [0, 6])\n |> line(end = [6, 0])\n |> line(end = [0, -6])\n |> close()\n\nexample003 = extrude(exampleSketch003, length = 5)", - "exampleSketch = startSketchOn(XY)\n |> startProfileAt([4, 12], %)\n |> line(end = [2, 0])\n |> line(end = [0, -6])\n |> line(end = [4, -6])\n |> line(end = [0, -6])\n |> line(end = [-3.75, -4.5])\n |> line(end = [0, -5.5])\n |> line(end = [-2, 0])\n |> close()\n\nexample = revolve(exampleSketch, axis = Y, angle = 180)\n\nexampleSketch002 = startSketchOn(example, 'end')\n |> startProfileAt([4.5, -5], %)\n |> line(end = [0, 5])\n |> line(end = [5, 0])\n |> line(end = [0, -5])\n |> close()\n\nexample002 = extrude(exampleSketch002, length = 5)", - "// Sketch on the end of a revolved face by tagging the end face.\n\n\nexampleSketch = startSketchOn(XY)\n |> startProfileAt([4, 12], %)\n |> line(end = [2, 0])\n |> line(end = [0, -6])\n |> line(end = [4, -6])\n |> line(end = [0, -6])\n |> line(end = [-3.75, -4.5])\n |> line(end = [0, -5.5])\n |> line(end = [-2, 0])\n |> close()\n\nexample = revolve(\n exampleSketch,\n axis = Y,\n angle = 180,\n tagEnd = $end01,\n)\n\nexampleSketch002 = startSketchOn(example, end01)\n |> startProfileAt([4.5, -5], %)\n |> line(end = [0, 5])\n |> line(end = [5, 0])\n |> line(end = [0, -5])\n |> close()\n\nexample002 = extrude(exampleSketch002, length = 5)", - "a1 = startSketchOn({\n plane = {\n origin = { x = 0, y = 0, z = 0 },\n xAxis = { x = 1, y = 0, z = 0 },\n yAxis = { x = 0, y = 1, z = 0 },\n zAxis = { x = 0, y = 0, z = 1 }\n }\n })\n |> startProfileAt([0, 0], %)\n |> line(end = [100.0, 0])\n |> yLine(length = -100.0)\n |> xLine(length = -100.0)\n |> yLine(length = 100.0)\n |> close()\n |> extrude(length = 3.14)" + "exampleSketch = startSketchOn(XY)\n |> startProfileAt([0, 0], %)\n |> line(end = [10, 0])\n |> line(end = [0, 10])\n |> line(end = [-10, 0])\n |> close()\n\nexample = extrude(exampleSketch, length = 5)\n\nexampleSketch002 = startSketchOn(example, face = 'end')\n |> startProfileAt([1, 1], %)\n |> line(end = [8, 0])\n |> line(end = [0, 8])\n |> line(end = [-8, 0])\n |> close()\n\nexample002 = extrude(exampleSketch002, length = 5)\n\nexampleSketch003 = startSketchOn(example002, face = 'end')\n |> startProfileAt([2, 2], %)\n |> line(end = [6, 0])\n |> line(end = [0, 6])\n |> line(end = [-6, 0])\n |> close()\n\nexample003 = extrude(exampleSketch003, length = 5)", + "// Sketch on the end of an extruded face by tagging the end face.\n\n\nexampleSketch = startSketchOn(XY)\n |> startProfileAt([0, 0], %)\n |> line(end = [10, 0])\n |> line(end = [0, 10])\n |> line(end = [-10, 0])\n |> close()\n\nexample = extrude(exampleSketch, length = 5, tagEnd = $end01)\n\nexampleSketch002 = startSketchOn(example, face = end01)\n |> startProfileAt([1, 1], %)\n |> line(end = [8, 0])\n |> line(end = [0, 8])\n |> line(end = [-8, 0])\n |> close()\n\nexample002 = extrude(exampleSketch002, length = 5, tagEnd = $end02)\n\nexampleSketch003 = startSketchOn(example002, face = end02)\n |> startProfileAt([2, 2], %)\n |> line(end = [6, 0])\n |> line(end = [0, 6])\n |> line(end = [-6, 0])\n |> close()\n\nexample003 = extrude(exampleSketch003, length = 5)", + "exampleSketch = startSketchOn(XY)\n |> startProfileAt([0, 0], %)\n |> line(end = [10, 0])\n |> line(end = [0, 10], tag = $sketchingFace)\n |> line(end = [-10, 0])\n |> close()\n\nexample = extrude(exampleSketch, length = 10)\n\nexampleSketch002 = startSketchOn(example, face = sketchingFace)\n |> startProfileAt([1, 1], %)\n |> line(end = [8, 0])\n |> line(end = [0, 8])\n |> line(end = [-8, 0])\n |> close(tag = $sketchingFace002)\n\nexample002 = extrude(exampleSketch002, length = 10)\n\nexampleSketch003 = startSketchOn(example002, face = sketchingFace002)\n |> startProfileAt([-8, 12], %)\n |> line(end = [0, 6])\n |> line(end = [6, 0])\n |> line(end = [0, -6])\n |> close()\n\nexample003 = extrude(exampleSketch003, length = 5)", + "exampleSketch = startSketchOn(XY)\n |> startProfileAt([4, 12], %)\n |> line(end = [2, 0])\n |> line(end = [0, -6])\n |> line(end = [4, -6])\n |> line(end = [0, -6])\n |> line(end = [-3.75, -4.5])\n |> line(end = [0, -5.5])\n |> line(end = [-2, 0])\n |> close()\n\nexample = revolve(exampleSketch, axis = Y, angle = 180)\n\nexampleSketch002 = startSketchOn(example, face = 'end')\n |> startProfileAt([4.5, -5], %)\n |> line(end = [0, 5])\n |> line(end = [5, 0])\n |> line(end = [0, -5])\n |> close()\n\nexample002 = extrude(exampleSketch002, length = 5)", + "// Sketch on the end of a revolved face by tagging the end face.\n\n\nexampleSketch = startSketchOn(XY)\n |> startProfileAt([4, 12], %)\n |> line(end = [2, 0])\n |> line(end = [0, -6])\n |> line(end = [4, -6])\n |> line(end = [0, -6])\n |> line(end = [-3.75, -4.5])\n |> line(end = [0, -5.5])\n |> line(end = [-2, 0])\n |> close()\n\nexample = revolve(\n exampleSketch,\n axis = Y,\n angle = 180,\n tagEnd = $end01,\n)\n\nexampleSketch002 = startSketchOn(example, face = end01)\n |> startProfileAt([4.5, -5], %)\n |> line(end = [0, 5])\n |> line(end = [5, 0])\n |> line(end = [0, -5])\n |> close()\n\nexample002 = extrude(exampleSketch002, length = 5)", + "a1 = startSketchOn({\n origin = { x = 0, y = 0, z = 0 },\n xAxis = { x = 1, y = 0, z = 0 },\n yAxis = { x = 0, y = 1, z = 0 },\n zAxis = { x = 0, y = 0, z = 1 }\n })\n |> startProfileAt([0, 0], %)\n |> line(end = [100.0, 0])\n |> yLine(length = -100.0)\n |> xLine(length = -100.0)\n |> yLine(length = 100.0)\n |> close()\n |> extrude(length = 3.14)" ] }, { @@ -271074,6 +274998,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -271283,6 +275221,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -271299,6 +275238,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -271390,8 +275332,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -271430,8 +275371,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -271449,6 +275389,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -272673,6 +276617,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -272882,6 +276840,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -272898,6 +276857,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -272989,8 +276951,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -273029,8 +276990,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -273048,6 +277008,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -273061,9 +277025,12 @@ "type": "number", "schema": { "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema", - "title": "Nullable_double", - "type": "number", - "format": "double", + "title": "Nullable_TyF64", + "allOf": [ + { + "$ref": "#/components/schemas/TyF64" + } + ], "nullable": true, "definitions": { "Solid": { @@ -274271,6 +278238,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -274480,6 +278461,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -274496,6 +278478,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -274587,8 +278572,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -274627,8 +278611,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -274646,6 +278629,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -275870,6 +279857,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -276079,6 +280080,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -276095,6 +280097,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -276186,8 +280191,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -276226,8 +280230,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -276245,6 +280248,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -277182,6 +281189,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -277438,6 +281459,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -277454,6 +281476,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -277735,8 +281760,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -277775,8 +281799,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -277795,6 +281818,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -278786,6 +282813,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -279042,6 +283083,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -279058,6 +283100,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -279339,8 +283384,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -279379,8 +283423,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -279399,6 +283442,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -280433,6 +284480,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -280689,6 +284750,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -280705,6 +284767,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -280986,8 +285051,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -281026,8 +285090,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -281046,6 +285109,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -282080,6 +286147,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -282336,6 +286417,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -282352,6 +286434,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -282633,8 +286718,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -282673,8 +286757,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -282693,6 +286776,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -283730,6 +287817,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -283986,6 +288087,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -284002,6 +288104,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -284283,8 +288388,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -284323,8 +288427,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -284343,6 +288446,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -285380,6 +289487,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -285636,6 +289757,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -285652,6 +289774,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -285933,8 +290058,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -285973,8 +290097,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -285993,6 +290116,10 @@ } ] }, + "TyF64": { + "type": "number", + "format": "double" + }, "BasePath": { "description": "A base path.", "type": "object", @@ -287329,6 +291456,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -287538,6 +291679,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -287554,6 +291696,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -287645,8 +291790,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -287685,8 +291829,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -287704,6 +291847,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -287796,17 +291943,29 @@ "properties": { "radius": { "description": "Radius of the arc. Not to be confused with Raiders of the Lost Ark.", - "type": "number", - "format": "double" + "allOf": [ + { + "$ref": "#/components/schemas/TyF64" + } + ] }, "offset": { "description": "Offset of the arc, in degrees.", - "type": "number", - "format": "double" + "allOf": [ + { + "$ref": "#/components/schemas/TyF64" + } + ] } } } - ] + ], + "definitions": { + "TyF64": { + "type": "number", + "format": "double" + } + } }, "required": true, "includeInSnippet": true, @@ -287881,6 +292040,10 @@ } }, "definitions": { + "TyF64": { + "type": "number", + "format": "double" + }, "Path": { "description": "A path.", "oneOf": [ @@ -288722,6 +292885,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -288978,6 +293155,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -288994,6 +293172,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -289402,8 +293583,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -289442,8 +293622,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -289481,6 +293660,10 @@ ], "nullable": true, "definitions": { + "TyF64": { + "type": "number", + "format": "double" + }, "Path": { "description": "A path.", "oneOf": [ @@ -290322,6 +294505,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -290578,6 +294775,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -290594,6 +294792,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -291002,8 +295203,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -291042,8 +295242,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -291978,6 +296177,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -292234,6 +296447,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -292250,6 +296464,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -292658,8 +296875,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -292698,8 +296914,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -292717,6 +296932,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -293665,6 +297884,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -293921,6 +298154,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -293937,6 +298171,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -294345,8 +298582,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -294385,8 +298621,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -294404,6 +298639,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -295265,6 +299504,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -295521,6 +299774,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -295537,6 +299791,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -295945,8 +300202,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -295985,8 +300241,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -296004,6 +300259,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -296921,6 +301180,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -297177,6 +301450,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -297193,6 +301467,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -297601,8 +301878,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -297641,8 +301917,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -297660,6 +301935,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -298608,6 +302887,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -298864,6 +303157,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -298880,6 +303174,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -299288,8 +303585,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -299328,8 +303624,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -299347,6 +303642,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -300208,6 +304507,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -300464,6 +304777,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -300480,6 +304794,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -300888,8 +305205,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -300928,8 +305244,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -300947,6 +305262,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -301864,6 +306183,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -302120,6 +306453,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -302136,6 +306470,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -302544,8 +306881,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -302584,8 +306920,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -302603,6 +306938,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -304019,6 +308358,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -304228,6 +308581,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -304244,6 +308598,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -304335,8 +308692,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -304375,8 +308731,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -304394,6 +308749,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -305617,6 +309976,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -305826,6 +310199,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -305842,6 +310216,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -305933,8 +310310,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -305973,8 +310349,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -305992,6 +310367,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -307215,6 +311594,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -307424,6 +311817,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -307440,6 +311834,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -307531,8 +311928,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -307571,8 +311967,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -307590,6 +311985,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -308813,6 +313212,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -309022,6 +313435,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -309038,6 +313452,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -309129,8 +313546,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -309169,8 +313585,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -309188,6 +313603,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -310410,6 +314829,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -310619,6 +315052,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -310635,6 +315069,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -310726,8 +315163,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -310766,8 +315202,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -310785,6 +315220,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -312077,6 +316516,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -312286,6 +316739,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -312302,6 +316756,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -312393,8 +316850,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -312433,8 +316889,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -312452,6 +316907,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -313692,6 +318151,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -313901,6 +318374,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -313917,6 +318391,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -314008,8 +318485,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -314048,8 +318524,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -314067,6 +318542,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -314080,9 +318559,12 @@ "type": "number", "schema": { "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema", - "title": "Nullable_double", - "type": "number", - "format": "double", + "title": "Nullable_TyF64", + "allOf": [ + { + "$ref": "#/components/schemas/TyF64" + } + ], "nullable": true, "definitions": { "Solid": { @@ -315290,6 +319772,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -315499,6 +319995,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -315515,6 +320012,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -315606,8 +320106,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -315646,8 +320145,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -315665,6 +320163,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -316889,6 +321391,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -317098,6 +321614,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -317114,6 +321631,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -317205,8 +321725,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -317245,8 +321764,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -317264,6 +321782,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -318196,6 +322718,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -318452,6 +322988,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -318468,6 +323005,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -318876,8 +323416,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -318916,8 +323455,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -318935,6 +323473,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -319794,6 +324336,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -320050,6 +324606,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -320066,6 +324623,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -320474,8 +325034,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -320514,8 +325073,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -320533,6 +325091,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -321392,6 +325954,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -321648,6 +326224,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -321664,6 +326241,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -322072,8 +326652,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -322112,8 +326691,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -322131,6 +326709,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -322992,6 +327574,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -323248,6 +327844,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -323264,6 +327861,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -323672,8 +328272,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -323712,8 +328311,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -323731,6 +328329,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -324649,6 +329251,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -324905,6 +329521,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -324921,6 +329538,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -325329,8 +329949,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -325369,8 +329988,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -325388,6 +330006,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -326318,6 +330940,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -326574,6 +331210,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -326590,6 +331227,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -326998,8 +331638,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -327038,8 +331677,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -327057,6 +331695,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -327916,6 +332558,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -328172,6 +332828,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -328188,6 +332845,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -328596,8 +333256,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -328636,8 +333295,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -328655,6 +333313,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -329514,6 +334176,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -329770,6 +334446,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -329786,6 +334463,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -330194,8 +334874,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -330234,8 +334913,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -330253,6 +334931,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -331114,6 +335796,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -331370,6 +336066,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -331386,6 +336083,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -331794,8 +336494,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -331834,8 +336533,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -331853,6 +336551,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, @@ -332771,6 +337473,20 @@ ] } } + }, + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "Unknown" + ] + } + } } ] }, @@ -333027,6 +337743,7 @@ "Point3d": { "type": "object", "required": [ + "units", "x", "y", "z" @@ -333043,6 +337760,9 @@ "z": { "type": "number", "format": "double" + }, + "units": { + "$ref": "#/components/schemas/UnitLen" } } }, @@ -333451,8 +338171,7 @@ "format": "uuid" }, "radius": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to fillet.", @@ -333491,8 +338210,7 @@ "format": "uuid" }, "length": { - "type": "number", - "format": "double" + "$ref": "#/components/schemas/TyF64" }, "edgeId": { "description": "The engine id of the edge to chamfer.", @@ -333510,6 +338228,10 @@ } } ] + }, + "TyF64": { + "type": "number", + "format": "double" } } }, diff --git a/docs/kcl/types/AngledLineData.md b/docs/kcl/types/AngledLineData.md deleted file mode 100644 index 903dea11d..000000000 --- a/docs/kcl/types/AngledLineData.md +++ /dev/null @@ -1,46 +0,0 @@ ---- -title: "AngledLineData" -excerpt: "Data to draw an angled line." -layout: manual ---- - -Data to draw an angled line. - - - - -**This schema accepts any of the following:** - -An angle and length with explicitly named parameters - -**Type:** `object` - - - - - -## Properties - -| Property | Type | Description | Required | -|----------|------|-------------|----------| -| `angle` |[`number`](/docs/kcl/types/number)| The angle of the line (in degrees). | No | -| `length` |[`number`](/docs/kcl/types/number)| The length of the line. | No | - - ----- -An angle and length given as a pair - -**Type:** `array` - -`[number, number]` - - - - - ----- - - - - - diff --git a/docs/kcl/types/AngledLineThatIntersectsData.md b/docs/kcl/types/AngledLineThatIntersectsData.md index 111a7054a..c0e9a1309 100644 --- a/docs/kcl/types/AngledLineThatIntersectsData.md +++ b/docs/kcl/types/AngledLineThatIntersectsData.md @@ -16,8 +16,8 @@ Data for drawing an angled line that intersects with a given line. | Property | Type | Description | Required | |----------|------|-------------|----------| -| `angle` |[`number`](/docs/kcl/types/number)| The angle of the line. | No | +| `angle` |`TyF64`| The angle of the line. | No | | `intersectTag` |[`TagIdentifier`](/docs/kcl/types#tag-identifier)| The tag of the line to intersect with. | No | -| `offset` |[`number`](/docs/kcl/types/number)| The offset from the intersecting line. | No | +| `offset` |`TyF64`| The offset from the intersecting line. | No | diff --git a/docs/kcl/types/AngledLineToData.md b/docs/kcl/types/AngledLineToData.md deleted file mode 100644 index c95f12a4d..000000000 --- a/docs/kcl/types/AngledLineToData.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -title: "AngledLineToData" -excerpt: "Data to draw an angled line to a point." -layout: manual ---- - -Data to draw an angled line to a point. - -**Type:** `object` - - - - - -## Properties - -| Property | Type | Description | Required | -|----------|------|-------------|----------| -| `angle` |[`number`](/docs/kcl/types/number)| The angle of the line. | No | -| `to` |[`number`](/docs/kcl/types/number)| The point to draw to. | No | - - diff --git a/docs/kcl/types/ArcData.md b/docs/kcl/types/ArcData.md index 46a9220a7..daf7278f9 100644 --- a/docs/kcl/types/ArcData.md +++ b/docs/kcl/types/ArcData.md @@ -23,9 +23,9 @@ Angles and radius with an optional tag. | Property | Type | Description | Required | |----------|------|-------------|----------| -| `angleStart` |[`number`](/docs/kcl/types/number) (**maximum:** 360.0) (**minimum:** -360.0)| The start angle. | No | -| `angleEnd` |[`number`](/docs/kcl/types/number) (**maximum:** 360.0) (**minimum:** -360.0)| The end angle. | No | -| `radius` |[`number`](/docs/kcl/types/number)| The radius. | No | +| `angleStart` |`TyF64`| The start angle. | No | +| `angleEnd` |`TyF64`| The end angle. | No | +| `radius` |`TyF64`| The radius. | No | ---- @@ -41,9 +41,9 @@ Center, to and radius with an optional tag. | Property | Type | Description | Required | |----------|------|-------------|----------| -| `center` |`[number, number]`| The center. | No | -| `to` |`[number, number]`| The to point. | No | -| `radius` |[`number`](/docs/kcl/types/number)| The radius. | No | +| `center` |`[, `TyF64`, `TyF64`]`| The center. | No | +| `to` |`[, `TyF64`, `TyF64`]`| The to point. | No | +| `radius` |`TyF64`| The radius. | No | ---- diff --git a/docs/kcl/types/ArcToData.md b/docs/kcl/types/ArcToData.md index 31727dcea..00889f6d6 100644 --- a/docs/kcl/types/ArcToData.md +++ b/docs/kcl/types/ArcToData.md @@ -16,7 +16,7 @@ Data to draw a three point arc (arcTo). | Property | Type | Description | Required | |----------|------|-------------|----------| -| `end` |`[number, number]`| End point of the arc. A point in 3D space | No | -| `interior` |`[number, number]`| Interior point of the arc. A point in 3D space | No | +| `end` |`[, `TyF64`, `TyF64`]`| End point of the arc. A point in 3D space | No | +| `interior` |`[, `TyF64`, `TyF64`]`| Interior point of the arc. A point in 3D space | No | diff --git a/docs/kcl/types/BezierData.md b/docs/kcl/types/BezierData.md index 1363fc723..309e41910 100644 --- a/docs/kcl/types/BezierData.md +++ b/docs/kcl/types/BezierData.md @@ -16,8 +16,8 @@ Data to draw a bezier curve. | Property | Type | Description | Required | |----------|------|-------------|----------| -| `to` |`[number, number]`| The to point. | No | -| `control1` |`[number, number]`| The first control point. | No | -| `control2` |`[number, number]`| The second control point. | No | +| `to` |`[, `TyF64`, `TyF64`]`| The to point. | No | +| `control1` |`[, `TyF64`, `TyF64`]`| The first control point. | No | +| `control2` |`[, `TyF64`, `TyF64`]`| The second control point. | No | diff --git a/docs/kcl/types/EdgeCut.md b/docs/kcl/types/EdgeCut.md index b7980c9d7..eb351be1a 100644 --- a/docs/kcl/types/EdgeCut.md +++ b/docs/kcl/types/EdgeCut.md @@ -26,7 +26,7 @@ A fillet. |----------|------|-------------|----------| | `type` |enum: `fillet`| | No | | `id` |[`string`](/docs/kcl/types/string)| The id of the engine command that called this fillet. | No | -| `radius` |[`number`](/docs/kcl/types/number)| | No | +| `radius` |`TyF64`| | No | | `edgeId` |[`string`](/docs/kcl/types/string)| The engine id of the edge to fillet. | No | | [`tag`](/docs/kcl/types/tag) |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| | No | @@ -46,7 +46,7 @@ A chamfer. |----------|------|-------------|----------| | `type` |enum: `chamfer`| | No | | `id` |[`string`](/docs/kcl/types/string)| The id of the engine command that called this chamfer. | No | -| `length` |[`number`](/docs/kcl/types/number)| | No | +| `length` |`TyF64`| | No | | `edgeId` |[`string`](/docs/kcl/types/string)| The engine id of the edge to chamfer. | No | | [`tag`](/docs/kcl/types/tag) |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| | No | diff --git a/docs/kcl/types/NumericType.md b/docs/kcl/types/NumericType.md index 8e0050fd1..ad7be7a57 100644 --- a/docs/kcl/types/NumericType.md +++ b/docs/kcl/types/NumericType.md @@ -130,6 +130,21 @@ A unit of length. | `type` |enum: `Yards`| | No | +---- + +**Type:** `object` + + + + + +## Properties + +| Property | Type | Description | Required | +|----------|------|-------------|----------| +| `type` |enum: `Unknown`| | No | + + ---- @@ -178,6 +193,21 @@ A unit of angle. | `type` |enum: `Radians`| | No | +---- + +**Type:** `object` + + + + + +## Properties + +| Property | Type | Description | Required | +|----------|------|-------------|----------| +| `type` |enum: `Unknown`| | No | + + ---- diff --git a/docs/kcl/types/Point2d.md b/docs/kcl/types/Point2d.md index 3055d5a68..ca90a146f 100644 --- a/docs/kcl/types/Point2d.md +++ b/docs/kcl/types/Point2d.md @@ -7,7 +7,7 @@ layout: manual A point in two dimensional space. ```kcl -type Point2d = [number; 2] +type Point2d = [number(Length); 2] ``` [`Point2d`](/docs/kcl/types/Point2d) is an alias for a two-element array of [number](/docs/kcl/types/number)s. To write a value diff --git a/docs/kcl/types/Point3d.md b/docs/kcl/types/Point3d.md index 220daa9cc..e12abd583 100644 --- a/docs/kcl/types/Point3d.md +++ b/docs/kcl/types/Point3d.md @@ -7,7 +7,7 @@ layout: manual A point in three dimensional space. ```kcl -type Point3d = [number; 3] +type Point3d = [number(Length); 3] ``` [`Point3d`](/docs/kcl/types/Point3d) is an alias for a three-element array of [number](/docs/kcl/types/number)s. To write a value diff --git a/docs/kcl/types/PolygonData.md b/docs/kcl/types/PolygonData.md index 501c0928a..8cd12387c 100644 --- a/docs/kcl/types/PolygonData.md +++ b/docs/kcl/types/PolygonData.md @@ -16,9 +16,9 @@ Data for drawing a polygon | Property | Type | Description | Required | |----------|------|-------------|----------| -| `radius` |[`number`](/docs/kcl/types/number)| The radius of the polygon | No | +| `radius` |`TyF64`| The radius of the polygon | No | | `numSides` |`integer`| The number of sides in the polygon | No | -| `center` |`[number, number]`| The center point of the polygon | No | +| `center` |`[, `TyF64`, `TyF64`]`| The center point of the polygon | No | | `inscribed` |`boolean`| Whether the polygon is inscribed (true) or circumscribed (false) about a circle with the specified radius | No | diff --git a/docs/kcl/types/TangentialArcData.md b/docs/kcl/types/TangentialArcData.md index c5b2c854c..7b624e75a 100644 --- a/docs/kcl/types/TangentialArcData.md +++ b/docs/kcl/types/TangentialArcData.md @@ -16,7 +16,7 @@ Data to draw a tangential arc. | Property | Type | Description | Required | |----------|------|-------------|----------| -| `radius` |[`number`](/docs/kcl/types/number)| Radius of the arc. Not to be confused with Raiders of the Lost Ark. | No | -| `offset` |[`number`](/docs/kcl/types/number)| Offset of the arc, in degrees. | No | +| `radius` |`TyF64`| Radius of the arc. Not to be confused with Raiders of the Lost Ark. | No | +| `offset` |`TyF64`| Offset of the arc, in degrees. | No | diff --git a/docs/kcl/types/UnitAngle.md b/docs/kcl/types/UnitAngle.md index a9660e2cf..09a6aa892 100644 --- a/docs/kcl/types/UnitAngle.md +++ b/docs/kcl/types/UnitAngle.md @@ -43,6 +43,21 @@ A unit of angle. ---- +**Type:** `object` + + + + + +## Properties + +| Property | Type | Description | Required | +|----------|------|-------------|----------| +| `type` |enum: `Unknown`| | No | + + +---- + diff --git a/docs/kcl/types/UnitLen.md b/docs/kcl/types/UnitLen.md index 747440241..5e00e5c39 100644 --- a/docs/kcl/types/UnitLen.md +++ b/docs/kcl/types/UnitLen.md @@ -103,6 +103,21 @@ A unit of length. ---- +**Type:** `object` + + + + + +## Properties + +| Property | Type | Description | Required | +|----------|------|-------------|----------| +| `type` |enum: `Unknown`| | No | + + +---- + diff --git a/e2e/playwright/editor-tests.spec.ts b/e2e/playwright/editor-tests.spec.ts index 916a39c1a..38e5049cc 100644 --- a/e2e/playwright/editor-tests.spec.ts +++ b/e2e/playwright/editor-tests.spec.ts @@ -731,7 +731,7 @@ sketch_001 = startSketchOn(XY) |> close() |> extrude(length = 10) - sketch001 = startSketchOn(box, revolveAxis) + sketch001 = startSketchOn(box, face = revolveAxis) |> startProfileAt([5, 10], %) |> line(end = [0, -10]) |> line(end = [2, 0]) diff --git a/e2e/playwright/feature-tree-pane.spec.ts b/e2e/playwright/feature-tree-pane.spec.ts index fa1725d25..b91dfb4fa 100644 --- a/e2e/playwright/feature-tree-pane.spec.ts +++ b/e2e/playwright/feature-tree-pane.spec.ts @@ -44,7 +44,7 @@ const FEATURE_TREE_SKETCH_CODE = `sketch001 = startSketchOn(XZ) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close(%) extrude001 = extrude(sketch001, length = 10) -sketch002 = startSketchOn(extrude001, rectangleSegmentB001) +sketch002 = startSketchOn(extrude001, face = rectangleSegmentB001) |> circle( center = [-1, 2], radius = .5 @@ -194,7 +194,7 @@ test.describe('Feature Tree pane', () => { highlightedCode: '', diagnostics: [], activeLines: [ - 'sketch002=startSketchOn(extrude001,rectangleSegmentB001)', + 'sketch002=startSketchOn(extrude001,face=rectangleSegmentB001)', ], }) await toolbar.exitSketchBtn.click() diff --git a/e2e/playwright/import-ui.spec.ts b/e2e/playwright/import-ui.spec.ts index 7c050f902..56e7bea81 100644 --- a/e2e/playwright/import-ui.spec.ts +++ b/e2e/playwright/import-ui.spec.ts @@ -44,8 +44,8 @@ profile001 = startProfileAt([-134.53, -56.17], sketch001) |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02) |> close() extrude001 = extrude(profile001, length = 100) -sketch003 = startSketchOn(extrude001, seg02) -sketch002 = startSketchOn(extrude001, seg01)` +sketch003 = startSketchOn(extrude001, face = seg02) +sketch002 = startSketchOn(extrude001, face = seg01)` ) }) diff --git a/e2e/playwright/point-click.spec.ts b/e2e/playwright/point-click.spec.ts index aad952cd7..b67591ed3 100644 --- a/e2e/playwright/point-click.spec.ts +++ b/e2e/playwright/point-click.spec.ts @@ -220,7 +220,7 @@ test.describe('Point-and-click tests', () => { )`, afterChamferSelectSnippet: - 'sketch002 = startSketchOn(extrude001, seg03)', + 'sketch002 = startSketchOn(extrude001, face = seg03)', afterRectangle1stClickSnippet: 'startProfileAt([205.96, 254.59], sketch002)', afterRectangle2ndClickSnippet: `angledLine(angle=0,length=11.39,tag=$rectangleSegmentA002) @@ -244,7 +244,7 @@ test.describe('Point-and-click tests', () => { )`, afterChamferSelectSnippet: - 'sketch003 = startSketchOn(extrude001, seg04)', + 'sketch003 = startSketchOn(extrude001, face = seg04)', afterRectangle1stClickSnippet: 'startProfileAt([-209.64, 255.28], sketch003)', afterRectangle2ndClickSnippet: `angledLine(angle=0,length=11.56,tag=$rectangleSegmentA003) @@ -266,7 +266,7 @@ test.describe('Point-and-click tests', () => { ] )`, afterChamferSelectSnippet: - 'sketch004 = startSketchOn(extrude001, seg05)', + 'sketch004 = startSketchOn(extrude001, face = seg05)', afterRectangle1stClickSnippet: 'startProfileAt([82.57, 322.96], sketch004)', afterRectangle2ndClickSnippet: `angledLine(angle=0,length=11.16,tag=$rectangleSegmentA004) @@ -284,7 +284,7 @@ test.describe('Point-and-click tests', () => { beforeChamferSnippetEnd: '|> chamfer(length = 30, tags = [getNextAdjacentEdge(yo)])', afterChamferSelectSnippet: - 'sketch005 = startSketchOn(extrude001, seg06)', + 'sketch005 = startSketchOn(extrude001, face = seg06)', afterRectangle1stClickSnippet: 'startProfileAt([-23.43, 19.69], sketch005)', afterRectangle2ndClickSnippet: `angledLine(angle=0,length=9.1,tag=$rectangleSegmentA005) @@ -309,28 +309,28 @@ extrude001 = extrude(sketch001, length = 100) |> chamfer(length = 30, tags = [seg01], tag = $seg04) |> chamfer(length = 30, tags = [getNextAdjacentEdge(seg02)], tag = $seg05) |> chamfer(length = 30, tags = [getNextAdjacentEdge(yo)], tag = $seg06) -sketch005 = startSketchOn(extrude001, seg06) +sketch005 = startSketchOn(extrude001, face = seg06) profile004=startProfileAt([-23.43,19.69], sketch005) |> angledLine(angle = 0, length = 9.1, tag = $rectangleSegmentA005) |> angledLine(angle = segAng(rectangleSegmentA005) - 90, length = 84.07) |> angledLine(angle = segAng(rectangleSegmentA005), length = -segLen(rectangleSegmentA005)) |> line(endAbsolute=[profileStartX(%), profileStartY(%)]) |> close() -sketch004 = startSketchOn(extrude001, seg05) +sketch004 = startSketchOn(extrude001, face = seg05) profile003 = startProfileAt([82.57, 322.96], sketch004) |> angledLine(angle = 0, length = 11.16, tag = $rectangleSegmentA004) |> angledLine(angle = segAng(rectangleSegmentA004) - 90, length = 103.07) |> angledLine(angle = segAng(rectangleSegmentA004), length = -segLen(rectangleSegmentA004)) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() -sketch003 = startSketchOn(extrude001, seg04) +sketch003 = startSketchOn(extrude001, face = seg04) profile002 = startProfileAt([-209.64, 255.28], sketch003) |> angledLine(angle = 0, length = 11.56, tag = $rectangleSegmentA003) |> angledLine(angle = segAng(rectangleSegmentA003) - 90, length = 106.84) |> angledLine(angle = segAng(rectangleSegmentA003), length = -segLen(rectangleSegmentA003)) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() -sketch002 = startSketchOn(extrude001, seg03) +sketch002 = startSketchOn(extrude001, face = seg03) profile001 = startProfileAt([205.96, 254.59], sketch002) |> angledLine(angle = 0, length = 11.39, tag = $rectangleSegmentA002) |> angledLine(angle = segAng(rectangleSegmentA002) - 90, length = 105.26) @@ -383,7 +383,7 @@ profile001 = startProfileAt([205.96, 254.59], sketch002) ])`, beforeChamferSnippetEnd: ')', afterChamferSelectSnippet: - 'sketch002 = startSketchOn(extrude001, seg03)', + 'sketch002 = startSketchOn(extrude001, face = seg03)', afterRectangle1stClickSnippet: 'startProfileAt([205.96, 254.59], sketch002)', afterRectangle2ndClickSnippet: `angledLine(angle=0,length=11.39,tag=$rectangleSegmentA002) @@ -416,7 +416,7 @@ chamf = chamfer( getNextAdjacentEdge(seg02) ], ) -sketch002 = startSketchOn(extrude001, seg03) +sketch002 = startSketchOn(extrude001, face = seg03) profile001 = startProfileAt([205.96, 254.59], sketch002) |> angledLine(angle = 0, length = 11.39, tag = $rectangleSegmentA002) |> angledLine(angle = segAng(rectangleSegmentA002) - 90, length = 105.26) @@ -3188,7 +3188,7 @@ sketch001 = startSketchOn(XZ) |> circle(center = [0, 0], radius = 100) |> extrude(length = 100) -sketch002 = startSketchOn(sketch001, 'END') +sketch002 = startSketchOn(sketch001, face = 'END') |> circle(center = [0, 0], radius = 50) |> extrude(length = 50) `, @@ -3197,7 +3197,7 @@ sketch001 = startSketchOn(XZ) |> circle(center = [0, 0], radius = 100) extrude001 = extrude(sketch001, length = 100) -sketch002 = startSketchOn(extrude001, 'END') +sketch002 = startSketchOn(extrude001, face = 'END') |> circle(center = [0, 0], radius = 50) extrude002 = extrude(sketch002, length = 50) `, @@ -3447,7 +3447,7 @@ tag=$rectangleSegmentC001, |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude001 = extrude(sketch001, length = 200) -sketch002 = startSketchOn(extrude001, rectangleSegmentA001) +sketch002 = startSketchOn(extrude001, face = rectangleSegmentA001) |> startProfileAt([-66.77, 84.81], %) |> angledLine(angle = 180, length = 27.08, tag = $rectangleSegmentA002) |> angledLine( @@ -3535,7 +3535,7 @@ tag=$rectangleSegmentC002, |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude001 = extrude(sketch001, length = 50) -sketch002 = startSketchOn(extrude001, rectangleSegmentA001) +sketch002 = startSketchOn(extrude001, face = rectangleSegmentA001) |> circle(center = [-11.34, 10.0], radius = 8.69) ` @@ -3623,7 +3623,7 @@ sketch002 = startSketchOn(extrude001, rectangleSegmentA001) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude001 = extrude(sketch001, length = 5) - sketch003 = startSketchOn(extrude001, 'START') + sketch003 = startSketchOn(extrude001, face = 'START') |> circle( center = [-0.69, 0.56], radius = 0.28 diff --git a/e2e/playwright/sketch-tests.spec.ts b/e2e/playwright/sketch-tests.spec.ts index 0229484bb..710ccbdad 100644 --- a/e2e/playwright/sketch-tests.spec.ts +++ b/e2e/playwright/sketch-tests.spec.ts @@ -1099,7 +1099,7 @@ profile001 = startProfileAt([${roundOff(scale * 69.6)}, ${roundOff( |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude001 = extrude(sketch001, length = 5) - sketch002 = startSketchOn(extrude001, 'END') + sketch002 = startSketchOn(extrude001, face = 'END') |> `.replace(/\s/g, '') ) @@ -2634,7 +2634,7 @@ profile001 = startProfileAt([6.71, -3.66], sketch001) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude001 = extrude(profile001, length = 20) -sketch002 = startSketchOn(extrude001, seg01) +sketch002 = startSketchOn(extrude001, face = seg01) profile002 = startProfileAt([0.75, 13.46], sketch002) |> line(end = [4.52, 3.79]) |> line(end = [5.98, -2.81]) diff --git a/e2e/playwright/snapshot-tests.spec.ts b/e2e/playwright/snapshot-tests.spec.ts index 529524743..0ed08ea20 100644 --- a/e2e/playwright/snapshot-tests.spec.ts +++ b/e2e/playwright/snapshot-tests.spec.ts @@ -824,7 +824,7 @@ test( |> line(end = [11.91, -10.42]) |> close() |> extrude(length = ${KCL_DEFAULT_LENGTH}) -part002 = startSketchOn(part001, seg01) +part002 = startSketchOn(part001, face = seg01) |> startProfileAt([8, 8], %) |> line(end = [4.68, 3.05]) |> line(end = [0, -7.79]) diff --git a/e2e/playwright/storageStates.ts b/e2e/playwright/storageStates.ts index dffcedc18..9a2ff8e5e 100644 --- a/e2e/playwright/storageStates.ts +++ b/e2e/playwright/storageStates.ts @@ -140,7 +140,7 @@ box = startSketchOn(XY) |> close() |> extrude(length = 10) -sketch001 = startSketchOn(box, revolveAxis) +sketch001 = startSketchOn(box, face = revolveAxis) |> startProfileAt([5, 10], %) |> line(end = [0, -10]) |> line(end = [2, 0]) diff --git a/e2e/playwright/testing-selections.spec.ts b/e2e/playwright/testing-selections.spec.ts index 9e9e3d9ad..39c7ddb4a 100644 --- a/e2e/playwright/testing-selections.spec.ts +++ b/e2e/playwright/testing-selections.spec.ts @@ -272,27 +272,27 @@ sketch001 = startSketchOn(XZ) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude001 = extrude(sketch001, length = 50) -sketch005 = startSketchOn(extrude001, 'END') +sketch005 = startSketchOn(extrude001, face = 'END') |> startProfileAt([23.24, 136.52], %) |> line(end = [-8.44, 36.61]) |> line(end = [49.4, 2.05]) |> line(end = [29.69, -46.95]) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() -sketch003 = startSketchOn(extrude001, seg01) +sketch003 = startSketchOn(extrude001, face = seg01) |> startProfileAt([21.23, 17.81], %) |> line(end = [51.97, 21.32]) |> line(end = [4.07, -22.75]) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() -sketch002 = startSketchOn(extrude001, seg02) +sketch002 = startSketchOn(extrude001, face = seg02) |> startProfileAt([-100.54, 16.99], %) |> line(end = [0, 20.03]) |> line(end = [62.61, 0], tag = $seg03) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude002 = extrude(sketch002, length = 50) -sketch004 = startSketchOn(extrude002, seg03) +sketch004 = startSketchOn(extrude002, face = seg03) |> startProfileAt([57.07, 134.77], %) |> line(end = [-4.72, 22.84]) |> line(end = [28.8, 6.71]) @@ -391,28 +391,22 @@ profile003 = startProfileAt([40.16, -120.48], sketch006) // `extrude001 = extrude(sketch001, length = 50)` // ) // await expect(u.codeLocator).toContainText(`sketch005 = startSketchOn({ - // plane = { // origin = { x = 0, y = -50, z = 0 }, // xAxis = { x = 1, y = 0, z = 0 }, // yAxis = { x = 0, y = 0, z = 1 }, // zAxis = { x = 0, y = -1, z = 0 } - // } // })`) // await expect(u.codeLocator).toContainText(`sketch003 = startSketchOn({ - // plane = { // origin = { x = 116.53, y = 0, z = 163.25 }, // xAxis = { x = -0.81, y = 0, z = 0.58 }, // yAxis = { x = 0, y = -1, z = 0 }, // zAxis = { x = 0.58, y = 0, z = 0.81 } - // } // })`) // await expect(u.codeLocator).toContainText(`sketch002 = startSketchOn({ - // plane = { // origin = { x = -91.74, y = 0, z = 80.89 }, // xAxis = { x = -0.66, y = 0, z = -0.75 }, // yAxis = { x = 0, y = -1, z = 0 }, // zAxis = { x = -0.75, y = 0, z = 0.66 } - // } // })`) // DELETE SOLID 2D @@ -463,8 +457,8 @@ yo = startProfileAt([4.83, 12.56], part001) |> line(end = [-13.02, 10.03]) |> close() yoo = extrude(yo, length = 4) -sketch002 = startSketchOn(yoo, seg02) -sketch001 = startSketchOn(yoo, 'END') +sketch002 = startSketchOn(yoo, face = seg02) +sketch001 = startSketchOn(yoo, face = 'END') profile002 = startProfileAt([-11.08, 2.39], sketch002) |> line(end = [4.89, 0.9]) |> line(end = [-0.61, -2.41]) @@ -893,7 +887,7 @@ part001 = startSketchOn(XZ) await expect(page.locator('.cm-activeLine')).toHaveText('') const codeToAdd = `${await u.codeLocator.allInnerTexts()} - sketch002 = startSketchOn(extrude001, $seg01) + sketch002 = startSketchOn(extrude001, face = $seg01) |> startProfileAt([-12.94, 6.6], %) |> line(end = [2.45, -0.2]) |> line(end = [-2, -1.25]) diff --git a/e2e/playwright/various.spec.ts b/e2e/playwright/various.spec.ts index 869929742..5703830f2 100644 --- a/e2e/playwright/various.spec.ts +++ b/e2e/playwright/various.spec.ts @@ -546,7 +546,7 @@ extrude001 = extrude(sketch001, length = 5 + 7)` previousCodeContent = await page.locator('.cm-content').innerText() await expect.poll(u.normalisedEditorCode).toContain( - u.normalisedCode(`sketch002 = startSketchOn(extrude001, seg01) + u.normalisedCode(`sketch002 = startSketchOn(extrude001, face = seg01) profile001 = startProfileAt([-12.34, 12.34], sketch002) |> line(end = [12.34, -12.34]) |> line(end = [-12.34, -12.34]) @@ -583,7 +583,7 @@ profile001 = startProfileAt([-12.34, 12.34], sketch002) await expect(page.locator('.cm-content')).not.toHaveText(previousCodeContent) previousCodeContent = await page.locator('.cm-content').innerText() - const result = makeTemplate`sketch002 = startSketchOn(extrude001, seg01) + const result = makeTemplate`sketch002 = startSketchOn(extrude001, face = seg01) |> startProfileAt([-12.83, 6.7], %) |> line(end = [${[2.28, 2.35]}, -${0.07}]) |> line(end = [-3.05, -1.47]) diff --git a/public/kcl-samples/bracket/main.kcl b/public/kcl-samples/bracket/main.kcl index 60cf0a172..cdfc4ab53 100644 --- a/public/kcl-samples/bracket/main.kcl +++ b/public/kcl-samples/bracket/main.kcl @@ -35,13 +35,13 @@ sketch001 = startSketchOn(XZ) |> fillet(radius = filletRadius, tags = [seg02, getOppositeEdge(seg02)]) |> fillet(radius = filletRadius, tags = [seg05, getOppositeEdge(seg05)]) -sketch002 = startSketchOn(sketch001, seg03) +sketch002 = startSketchOn(sketch001, face = seg03) |> circle(center = [-1.25, 1], radius = mountingHoleDiameter / 2) |> patternLinear2d(instances = 2, distance = 2.5, axis = [-1, 0]) |> patternLinear2d(instances = 2, distance = 4, axis = [0, 1]) |> extrude(%, length = -thickness - .01) -sketch003 = startSketchOn(sketch001, seg04) +sketch003 = startSketchOn(sketch001, face = seg04) |> circle(center = [1, -1], radius = mountingHoleDiameter / 2) |> patternLinear2d(instances = 2, distance = 4, axis = [1, 0]) |> extrude(%, length = -thickness - 0.1) diff --git a/public/kcl-samples/car-wheel-assembly/car-rotor.kcl b/public/kcl-samples/car-wheel-assembly/car-rotor.kcl index 3a376691f..d2171cc64 100644 --- a/public/kcl-samples/car-wheel-assembly/car-rotor.kcl +++ b/public/kcl-samples/car-wheel-assembly/car-rotor.kcl @@ -12,11 +12,11 @@ rotorSketch = startSketchOn(XZ) rotor = extrude(rotorSketch, length = rotorSinglePlateThickness) |> appearance(color = "#dbcd70", roughness = 90, metalness = 90) -rotorBumpSketch = startSketchOn(rotor, 'end') +rotorBumpSketch = startSketchOn(rotor, face = 'end') |> circle(center = [0, 0], radius = rotorInnerDiameter / 2) rotorBump = extrude(rotorBumpSketch, length = rotorInnerDiameterThickness) -lugHoles = startSketchOn(rotorBump, 'end') +lugHoles = startSketchOn(rotorBump, face = 'end') |> circle(center = [-lugSpacing / 2, 0], radius = 0.315) |> patternCircular2d( arcDegrees = 360, @@ -28,15 +28,15 @@ lugHoles = startSketchOn(rotorBump, 'end') |> appearance(color = "#dbcd70", roughness = 90, metalness = 90) // (update when boolean is available) -centerSpacer = startSketchOn(rotor, 'start') +centerSpacer = startSketchOn(rotor, face = 'start') |> circle(%, center = [0, 0], radius = .25) |> extrude(%, length = spacerLength) -secondaryRotorSketch = startSketchOn(centerSpacer, 'end') +secondaryRotorSketch = startSketchOn(centerSpacer, face = 'end') |> circle(center = [0, 0], radius = rotorDiameter / 2) secondRotor = extrude(secondaryRotorSketch, length = rotorSinglePlateThickness) -lugHoles2 = startSketchOn(secondRotor, 'end') +lugHoles2 = startSketchOn(secondRotor, face = 'end') |> circle(center = [-lugSpacing / 2, 0], radius = 0.315) |> patternCircular2d( arcDegrees = 360, @@ -46,7 +46,7 @@ lugHoles2 = startSketchOn(secondRotor, 'end') ) |> extrude(length = -rotorSinglePlateThickness) -spacerSketch = startSketchOn(rotor, 'start') +spacerSketch = startSketchOn(rotor, face = 'start') |> circle(center = [spacerPatternDiameter / 2, 0], radius = spacerDiameter) |> patternCircular2d( arcDegrees = 360, @@ -56,7 +56,7 @@ spacerSketch = startSketchOn(rotor, 'start') ) spacers = extrude(spacerSketch, length = spacerLength) -rotorSlottedSketch = startSketchOn(rotor, 'START') +rotorSlottedSketch = startSketchOn(rotor, face = 'START') |> startProfileAt([2.17, 2.56], %) |> xLine(length = 0.12) |> yLine(length = 2.56) @@ -71,7 +71,7 @@ rotorSlottedSketch = startSketchOn(rotor, 'START') ) rotorSlotted = extrude(rotorSlottedSketch, length = -rotorSinglePlateThickness / 2) -secondRotorSlottedSketch = startSketchOn(secondRotor, 'END') +secondRotorSlottedSketch = startSketchOn(secondRotor, face = 'END') |> startProfileAt([-2.17, 2.56], %) |> xLine(length = -0.12) |> yLine(length = 2.56) diff --git a/public/kcl-samples/car-wheel-assembly/car-wheel.kcl b/public/kcl-samples/car-wheel-assembly/car-wheel.kcl index 99cb77738..8a21c67d1 100644 --- a/public/kcl-samples/car-wheel-assembly/car-wheel.kcl +++ b/public/kcl-samples/car-wheel-assembly/car-wheel.kcl @@ -14,13 +14,13 @@ lugBase = startSketchOn(XZ) |> extrude(length = wheelWidth / 20) // Extend the wheel center and bore holes to accomidate the lug heads -lugExtrusion = startSketchOn(lugBase, 'END') +lugExtrusion = startSketchOn(lugBase, face = 'END') |> circle(center = [0, 0], radius = (lugSpacing + 1.5) / 2) |> hole(circle(center = [0, 0], radius = (lugSpacing - 1.5) / 2), %) |> extrude(length = wheelWidth / 10) // Create the circular pattern for the lugs -lugClearance = startSketchOn(lugExtrusion, 'END') +lugClearance = startSketchOn(lugExtrusion, face = 'END') |> circle(center = [lugSpacing / 2, 0], radius = 1.2 / 2) |> patternCircular2d( arcDegrees = 360, @@ -31,7 +31,7 @@ lugClearance = startSketchOn(lugExtrusion, 'END') |> extrude(length = -wheelWidth / 10) // Create the circular pattern for the lug holes -lugHoles = startSketchOn(lugBase, 'END') +lugHoles = startSketchOn(lugBase, face = 'END') |> circle(center = [lugSpacing / 2, 0], radius = fromMm(16) / 2) |> patternCircular2d( arcDegrees = 360, @@ -75,12 +75,10 @@ wheelCenterOuter = startSketchOn(XY) fn spoke(spokeGap, spokeAngle, spokeThickness) { // Seperating the spoke base planes plane001 = { - plane = { - origin = [0.0, 0.0, spokeGap / 2], - xAxis = [1.0, 0.0, spokeAngle], - yAxis = [0.0, 1.0, 0.0], - zAxis = [0.0, 0.0, 1.0] - } + origin = [0.0, 0.0, spokeGap / 2], + xAxis = [1.0, 0.0, spokeAngle], + yAxis = [0.0, 1.0, 0.0], + zAxis = [0.0, 0.0, 1.0] } // Spoke cross sections diff --git a/public/kcl-samples/car-wheel-assembly/lug-nut.kcl b/public/kcl-samples/car-wheel-assembly/lug-nut.kcl index 1538eb7ff..278c44124 100644 --- a/public/kcl-samples/car-wheel-assembly/lug-nut.kcl +++ b/public/kcl-samples/car-wheel-assembly/lug-nut.kcl @@ -8,16 +8,14 @@ import lugDiameter, lugHeadLength, lugThreadDiameter, lugLength, lugThreadDepth, lugSpacing from "parameters.kcl" customPlane = { - plane = { - origin = { - x = lugSpacing / 2, - y = fromMm(-30), - z = 0 - }, - xAxis = { x = 1, y = 0, z = 0 }, - yAxis = { x = 0, y = -1, z = 0 }, - zAxis = { x = 0, y = 0, z = 1 } - } + origin = { + x = lugSpacing / 2, + y = fromMm(-30), + z = 0 + }, + xAxis = { x = 1, y = 0, z = 0 }, + yAxis = { x = 0, y = -1, z = 0 }, + zAxis = { x = 0, y = 0, z = 1 } } fn lug(plane, length, diameter) { diff --git a/public/kcl-samples/dodecahedron/main.kcl b/public/kcl-samples/dodecahedron/main.kcl index 8986e70a3..44522172e 100644 --- a/public/kcl-samples/dodecahedron/main.kcl +++ b/public/kcl-samples/dodecahedron/main.kcl @@ -26,16 +26,14 @@ pentR = edgeL / 2 / sin(toRadians(36)) // Define a plane for the bottom angled face plane = { - plane = { - origin = [ - -inscR * cos(toRadians(toDegrees(dihedral) - 90)), - 0, - inscR - (inscR * sin(toRadians(toDegrees(dihedral) - 90))) - ], - xAxis = [cos(dihedral), 0.0, sin(dihedral)], - yAxis = [0, 1, 0], - zAxis = [sin(dihedral), 0, -cos(dihedral)] - } + origin = [ + -inscR * cos(toRadians(toDegrees(dihedral) - 90)), + 0, + inscR - (inscR * sin(toRadians(toDegrees(dihedral) - 90))) + ], + xAxis = [cos(dihedral), 0.0, sin(dihedral)], + yAxis = [0, 1, 0], + zAxis = [sin(dihedral), 0, -cos(dihedral)] } // Create a regular pentagon inscribed in a circle of radius pentR diff --git a/public/kcl-samples/dual-basin-utility-sink/main.kcl b/public/kcl-samples/dual-basin-utility-sink/main.kcl index ab8f15daf..3807b2bbe 100644 --- a/public/kcl-samples/dual-basin-utility-sink/main.kcl +++ b/public/kcl-samples/dual-basin-utility-sink/main.kcl @@ -117,7 +117,7 @@ sinkOffsetFront = 40 sinkOffsetLeft = 350 sinkSpacing = tableWidth - sinkWidth - (sinkOffsetLeft * 2) -sinkPlaneOutside = startSketchOn(tableTopBody, 'START') +sinkPlaneOutside = startSketchOn(tableTopBody, face = 'START') sinkBodyOutside = startProfileAt([-sinkOffsetLeft, sinkOffsetFront], sinkPlaneOutside) |> yLine(length = sinkLength) |> xLine(length = -sinkWidth) @@ -127,7 +127,7 @@ sinkBodyOutside = startProfileAt([-sinkOffsetLeft, sinkOffsetFront], sinkPlaneOu |> patternLinear2d(axis = [-1, 0], instances = sinkCount, distance = sinkSpacing) |> extrude(length = sinkDepth) -sinkPlaneInside = startSketchOn(tableTopBody, 'END') +sinkPlaneInside = startSketchOn(tableTopBody, face = 'END') sinkBodyInside = startProfileAt([ sinkOffsetLeft + metalThickness, sinkOffsetFront + metalThickness diff --git a/public/kcl-samples/enclosure/main.kcl b/public/kcl-samples/enclosure/main.kcl index 72d7bb7ed..d94f5c999 100644 --- a/public/kcl-samples/enclosure/main.kcl +++ b/public/kcl-samples/enclosure/main.kcl @@ -37,12 +37,10 @@ extrude001 = extrude(sketch001, length = height) fn function001(originStart) { // Create a plane to sketch on shell interior plane001 = { - plane = { - origin = [0.0, 0.0, wallThickness], - xAxis = [1.0, 0.0, 0.0], - yAxis = [0.0, 1.0, 0.0], - zAxis = [0.0, 0.0, 1.0] - } + origin = [0.0, 0.0, wallThickness], + xAxis = [1.0, 0.0, 0.0], + yAxis = [0.0, 1.0, 0.0], + zAxis = [0.0, 0.0, 1.0] } // Create a pillar with a fasterner hole at the center @@ -120,7 +118,7 @@ extrude003 = extrude(sketch003, length = wallThickness) ) // Define lid inner and sealing surfaces -sketch004 = startSketchOn(extrude003, 'END') +sketch004 = startSketchOn(extrude003, face = 'END') |> startProfileAt([ width * 1.2 + wallThickness, wallThickness diff --git a/public/kcl-samples/exhaust-manifold/main.kcl b/public/kcl-samples/exhaust-manifold/main.kcl index f7414c23f..d5abfcfae 100644 --- a/public/kcl-samples/exhaust-manifold/main.kcl +++ b/public/kcl-samples/exhaust-manifold/main.kcl @@ -17,16 +17,14 @@ fn primaryTube(n, angle001, length001, length002, length003) { // Define a plane for each sweep path defined by an angle sweepPlane = { - plane = { - origin = [pos001, 0.0, 0], - xAxis = [ - sin(toRadians(-angle001)), - cos(toRadians(-angle001)), - 0.0 - ], - yAxis = [0.0, 0.0, 1.0], - zAxis = [1.0, 0.0, 0.0] - } + origin = [pos001, 0.0, 0], + xAxis = [ + sin(toRadians(-angle001)), + cos(toRadians(-angle001)), + 0.0 + ], + yAxis = [0.0, 0.0, 1.0], + zAxis = [1.0, 0.0, 0.0] } // Draw a path for each sweep diff --git a/public/kcl-samples/flange/main.kcl b/public/kcl-samples/flange/main.kcl index ea52daf78..26b0d21ec 100644 --- a/public/kcl-samples/flange/main.kcl +++ b/public/kcl-samples/flange/main.kcl @@ -37,16 +37,16 @@ flangeBase = startSketchOn(XY) |> extrude(length = baseThickness) // Create the extrusion on the top of the flange base -topExtrusion = startSketchOn(flangeBase, 'end') +topExtrusion = startSketchOn(flangeBase, face = 'end') |> circle(center = [0, 0], radius = topTotalDiameter / 2) |> extrude(length = topTotalThickness) // Create the extrusion on the bottom of the flange base -bottomExtrusion = startSketchOn(flangeBase, 'start') +bottomExtrusion = startSketchOn(flangeBase, face = 'start') |> circle(center = [0, 0], radius = bottomTotalDiameter / 2) |> extrude(length = bottomThickness) // Cut a hole through the entire body -pipeHole = startSketchOn(topExtrusion, 'end') +pipeHole = startSketchOn(topExtrusion, face = 'end') |> circle(center = [0, 0], radius = pipeDia / 2) |> extrude(%, length = -(topTotalThickness + baseThickness + bottomThickness)) diff --git a/public/kcl-samples/focusrite-scarlett-mounting-bracket/main.kcl b/public/kcl-samples/focusrite-scarlett-mounting-bracket/main.kcl index 7f4336907..580317a6a 100644 --- a/public/kcl-samples/focusrite-scarlett-mounting-bracket/main.kcl +++ b/public/kcl-samples/focusrite-scarlett-mounting-bracket/main.kcl @@ -28,12 +28,10 @@ fn rectShape(pos, w, l) { // Define the bracket plane bracketPlane = { - plane = { - origin = { x = 0, y = length / 2 + thk, z = 0 }, - xAxis = { x = 1, y = 0, z = 0 }, - yAxis = { x = 0, y = 0, z = 1 }, - zAxis = { x = 0, y = -1, z = 0 } - } + origin = { x = 0, y = length / 2 + thk, z = 0 }, + xAxis = { x = 1, y = 0, z = 0 }, + yAxis = { x = 0, y = 0, z = 1 }, + zAxis = { x = 0, y = -1, z = 0 } } // Build the bracket sketch around the body @@ -67,12 +65,10 @@ bracketBody = bs // Define the tab plane tabPlane = { - plane = { - origin = { x = 0, y = 0, z = depth + thk }, - xAxis = { x = 1, y = 0, z = 0 }, - yAxis = { x = 0, y = 1, z = 0 }, - zAxis = { x = 0, y = 0, z = 1 } - } + origin = { x = 0, y = 0, z = depth + thk }, + xAxis = { x = 1, y = 0, z = 0 }, + yAxis = { x = 0, y = 1, z = 0 }, + zAxis = { x = 0, y = 0, z = 1 } } // Build the tabs of the mounting bracket (right side) @@ -125,12 +121,10 @@ tabsL = startSketchOn(tabPlane) // Define a plane for retention bumps retPlane = { - plane = { - origin = { x = -width / 2 + 20, y = 0, z = 0 }, - xAxis = { x = 0, y = 1, z = 0 }, - yAxis = { x = 0, y = 0, z = 1 }, - zAxis = { x = 1, y = 0, z = 0 } - } + origin = { x = -width / 2 + 20, y = 0, z = 0 }, + xAxis = { x = 0, y = 1, z = 0 }, + yAxis = { x = 0, y = 0, z = 1 }, + zAxis = { x = 1, y = 0, z = 0 } } // Build the retention bump in the front diff --git a/public/kcl-samples/food-service-spatula/main.kcl b/public/kcl-samples/food-service-spatula/main.kcl index 64b7183a2..8146f2140 100644 --- a/public/kcl-samples/food-service-spatula/main.kcl +++ b/public/kcl-samples/food-service-spatula/main.kcl @@ -114,12 +114,10 @@ fillet( // Define a plane which is at the end of the handle handlePlane = { - plane = { - origin = [208.593833, 0.0, 75.921946], - xAxis = [0.342020, -0.0, -0.939693], - yAxis = [0.0, 1.0, 0.0], - zAxis = [0.939693, -0.0, 0.342020] - } + origin = [208.593833, 0.0, 75.921946], + xAxis = [0.342020, -0.0, -0.939693], + yAxis = [0.0, 1.0, 0.0], + zAxis = [0.939693, -0.0, 0.342020] } // Create a sketch on the handle plane @@ -157,7 +155,7 @@ gripProfile = startProfileAt([-26.806746, -10.0], gripSketch) grip = extrude(gripProfile, length = -gripLength) // Create a sketch on the grip for the hole -holeSketch = startSketchOn(grip, gripEdgeTop) +holeSketch = startSketchOn(grip, face = gripEdgeTop) // Create a profile for the grip hole gripHoleProfile = slot(holeSketch, [0, 200], [0, 210], gripSlotWidth) diff --git a/public/kcl-samples/french-press/main.kcl b/public/kcl-samples/french-press/main.kcl index 4f31d95e5..68a820d22 100644 --- a/public/kcl-samples/french-press/main.kcl +++ b/public/kcl-samples/french-press/main.kcl @@ -21,12 +21,10 @@ sketch001 = startSketchOn(XZ) // Create an angled plane to sketch the supports plane001 = { - plane = { - origin = [-0.26, 0.26, 0.0], - xAxis = [1, 1, 0.0], - yAxis = [0.0, 0.0, 1.0], - zAxis = [1.0, 0.0, 0.0] - } + origin = [-0.26, 0.26, 0.0], + xAxis = [1, 1, 0.0], + yAxis = [0.0, 0.0, 1.0], + zAxis = [1.0, 0.0, 0.0] } // Cross section of the metal supports @@ -88,7 +86,7 @@ sketch003 = startSketchOn(offsetPlane(XY, offset = 1)) extrude001 = extrude(sketch003, length = 0.050) -sketch004 = startSketchOn(extrude001, 'END') +sketch004 = startSketchOn(extrude001, face = 'END') |> startProfileAt([0.3, 0.17], %) |> yLine(length = 1.2) |> arc({ @@ -140,7 +138,7 @@ sketch007 = startSketchOn(offsetPlane(XY, offset = 1.12)) extrude003 = extrude(sketch007, length = 0.050) // Pattern holes in the spiral plate -sketch008 = startSketchOn(extrude003, 'END') +sketch008 = startSketchOn(extrude003, face = 'END') |> circle(center = [1.4, 0], radius = .3) |> patternCircular2d( center = [0, 0], @@ -152,7 +150,7 @@ sketch008 = startSketchOn(extrude003, 'END') extrude004 = extrude(sketch008, length = -0.050) // Pattern holes in the spiral plate -sketch009 = startSketchOn(extrude003, 'END') +sketch009 = startSketchOn(extrude003, face = 'END') |> circle(center = [0.6, 0], radius = .2) |> patternCircular2d( center = [0, 0], diff --git a/public/kcl-samples/gear/main.kcl b/public/kcl-samples/gear/main.kcl index 209445205..b5aef98c7 100644 --- a/public/kcl-samples/gear/main.kcl +++ b/public/kcl-samples/gear/main.kcl @@ -87,7 +87,7 @@ holeRadius = 1 startAngle = asin(keywayWidth / 2 / holeRadius) // Sketch the keyway and center hole and extrude -keyWay = startSketchOn(body, 'END') +keyWay = startSketchOn(body, face = 'END') |> startProfileAt([ holeRadius * cos(startAngle), holeRadius * sin(startAngle) diff --git a/public/kcl-samples/gridfinity-bins-stacking-lip/main.kcl b/public/kcl-samples/gridfinity-bins-stacking-lip/main.kcl index 4f514c875..49b2be988 100644 --- a/public/kcl-samples/gridfinity-bins-stacking-lip/main.kcl +++ b/public/kcl-samples/gridfinity-bins-stacking-lip/main.kcl @@ -109,7 +109,7 @@ singleBinFill = startSketchOn(XY) ], ) -magCutout000 = startSketchOn(singleBinFill, "start") +magCutout000 = startSketchOn(singleBinFill, face = "start") |> circle( center = [ -magOffset - binBaseLength - binTol, @@ -195,42 +195,36 @@ fn lipFace(plane) { } plane000 = { - plane = { - origin = [ - cornerRadius, - 0.0, - height + binHeight * countBinHeight - ], - xAxis = [0.0, 1.0, 0.0], - yAxis = [0.0, 0.0, 1.0], - zAxis = [1.0, 0.0, 0.0] - } + origin = [ + cornerRadius, + 0.0, + height + binHeight * countBinHeight + ], + xAxis = [0.0, 1.0, 0.0], + yAxis = [0.0, 0.0, 1.0], + zAxis = [1.0, 0.0, 0.0] } plane001 = { - plane = { - origin = [ - 0.0, - cornerRadius, - height + binHeight * countBinHeight - ], - xAxis = [1.0, 0.0, 0.0], - yAxis = [0.0, 0.0, 1.0], - zAxis = [0.0, 1.0, 0.0] - } + origin = [ + 0.0, + cornerRadius, + height + binHeight * countBinHeight + ], + xAxis = [1.0, 0.0, 0.0], + yAxis = [0.0, 0.0, 1.0], + zAxis = [0.0, 1.0, 0.0] } plane002 = { - plane = { - origin = [ - countBinWidth * (binLength + 2 * binTol) - cornerRadius, - 0.0, - height + binHeight * countBinHeight - ], - xAxis = [0.0, 1.0, 0.0], - yAxis = [0.0, 0.0, 1.0], - zAxis = [1.0, 0.0, 0.0] - } + origin = [ + countBinWidth * (binLength + 2 * binTol) - cornerRadius, + 0.0, + height + binHeight * countBinHeight + ], + xAxis = [0.0, 1.0, 0.0], + yAxis = [0.0, 0.0, 1.0], + zAxis = [1.0, 0.0, 0.0] } // Extrude a single side of the lip of the bin diff --git a/public/kcl-samples/gridfinity-bins/main.kcl b/public/kcl-samples/gridfinity-bins/main.kcl index f423ceabe..10d440c0b 100644 --- a/public/kcl-samples/gridfinity-bins/main.kcl +++ b/public/kcl-samples/gridfinity-bins/main.kcl @@ -102,7 +102,7 @@ singleBinFill = startSketchOn(XY) ], ) -magCutout000 = startSketchOn(singleBinFill, "start") +magCutout000 = startSketchOn(singleBinFill, face = "start") |> circle( center = [ -magOffset - binBaseLength - binTol, diff --git a/public/kcl-samples/keyboard/main.kcl b/public/kcl-samples/keyboard/main.kcl index 10754d990..a23e5fc39 100644 --- a/public/kcl-samples/keyboard/main.kcl +++ b/public/kcl-samples/keyboard/main.kcl @@ -39,7 +39,7 @@ sketch001 = startSketchOn(YZ) ) // Create a short cylindrical foot at each corner of the keyboard -sketch003 = startSketchOn(sketch001, seg04) +sketch003 = startSketchOn(sketch001, face = seg04) profile001 = circle(sketch003, center = [0.75, 0.75], radius = 0.4) profile003 = circle(sketch003, center = [4.4, 0.75], radius = 0.4) profile004 = circle(sketch003, center = [0.73, 13.6 - .75], radius = 0.4) @@ -56,12 +56,10 @@ extrude( // Define the plane to sketch keyboard keys on plane001 = { - plane = { - origin = [0.0, 0.0, 0.7], - xAxis = [1.0, 0.0, 0.0], - yAxis = [0.0, 1.0, sin(toRadians(7))], - zAxis = [0.0, 0.0, 1.0] - } + origin = [0.0, 0.0, 0.7], + xAxis = [1.0, 0.0, 0.0], + yAxis = [0.0, 1.0, sin(toRadians(7))], + zAxis = [0.0, 0.0, 1.0] } // Create a function to build a key. Parameterize for position, width, height, number of instances, and appearance color. @@ -128,12 +126,10 @@ keyFn([spacing * 3 + 12, row6], 1, keyHeight * .6, 0, highlightColor2) // Create a plane to sketch ZOO brand letters on plane002 = { - plane = { - origin = [0.0, 0.0, .81], - xAxis = [1.0, 0.0, 0.0], - yAxis = [0.0, 1.0, sin(toRadians(7))], - zAxis = [0.0, 0.0, 1.0] - } + origin = [0.0, 0.0, .81], + xAxis = [1.0, 0.0, 0.0], + yAxis = [0.0, 1.0, sin(toRadians(7))], + zAxis = [0.0, 0.0, 1.0] } // Define a function to draw the ZOO 'Z' diff --git a/public/kcl-samples/kitt/main.kcl b/public/kcl-samples/kitt/main.kcl index 06f64de7b..b05e61819 100644 --- a/public/kcl-samples/kitt/main.kcl +++ b/public/kcl-samples/kitt/main.kcl @@ -3,7 +3,7 @@ // Pixel box function fn pixelBox(kitExtrude, extrudeTag, positionY, positionZ, width, height, depth) { - pixelBoxBody = startSketchOn(kitExtrude, extrudeTag) + pixelBoxBody = startSketchOn(kitExtrude, face = extrudeTag) |> startProfileAt([positionY, positionZ], %) |> line(end = [0, height]) |> line(end = [width, 0]) @@ -45,7 +45,7 @@ kitFaceWidth = kitHeadWidth - 4 kitFaceHeight = kitHeadElevation + kitHeadHeight - kitFaceElevation - 3 kitFaceDepth = 2 -kitFace = startSketchOn(kitHead, 'END') +kitFace = startSketchOn(kitHead, face = 'END') |> startProfileAt([-kitFaceWidth / 2, kitFaceElevation], %) |> line(end = [0, 1]) // left lower corner up |> line(end = [-1, 0]) // left lower corner left @@ -78,7 +78,7 @@ kitLeftEye2 = pixelBox(kitFace, 'START', -kitEyeOffset + 1, kitEyeHeihgt + 1, 3, kitLeftEye3 = pixelBox(kitFace, 'START', -kitEyeOffset + 4, kitEyeHeihgt, 1, 1, kitEyeDepth) kitRightEye = pixelBox(kitFace, 'START', kitEyeOffset - 3, kitEyeHeihgt - 1, 2, 4, kitEyeDepth) kitNoseElevation = kitEyeHeihgt - 5 -kitNose = startSketchOn(kitFace, 'START') +kitNose = startSketchOn(kitFace, face = 'START') |> startProfileAt([-2, kitNoseElevation], %) // H V |> line(end = [0, 1]) // lower-left up |> line(end = [2, 0]) // lower-left right diff --git a/public/kcl-samples/lego/main.kcl b/public/kcl-samples/lego/main.kcl index c2fba5936..2b45616b1 100644 --- a/public/kcl-samples/lego/main.kcl +++ b/public/kcl-samples/lego/main.kcl @@ -35,7 +35,7 @@ base = startSketchOn(XY) |> extrude(length = height) // Sketch and extrude a rectangular shape to create the shell underneath the lego. Will replace with shell function when able to call a face created from shell. -shellExtrude = startSketchOn(base, "start") +shellExtrude = startSketchOn(base, face = "start") |> startProfileAt([ -(totalWidth / 2 - t), -(totalLength / 2 - t) @@ -47,7 +47,7 @@ shellExtrude = startSketchOn(base, "start") |> extrude(length = -(height - t)) // Create the pegs on the top of the base -peg = startSketchOn(base, 'end') +peg = startSketchOn(base, face = 'end') |> circle( center = [ -(pitch * (wbumps - 1) / 2), @@ -60,7 +60,7 @@ peg = startSketchOn(base, 'end') |> extrude(length = bumpHeight) // Create the pegs on the bottom of the base -tubePattern = startSketchOn(shellExtrude, 'start') +tubePattern = startSketchOn(shellExtrude, face = 'start') |> circle( center = [ -(pitch * (wbumps - 1) / 2 - (pitch / 2)), diff --git a/public/kcl-samples/multi-axis-robot/globals.kcl b/public/kcl-samples/multi-axis-robot/globals.kcl index 9ec44a0a6..47169ba2d 100644 --- a/public/kcl-samples/multi-axis-robot/globals.kcl +++ b/public/kcl-samples/multi-axis-robot/globals.kcl @@ -28,37 +28,31 @@ export axisJ3CArmThickness = 2.5 // Planes export plane001 = { - plane = { - origin = [0.0, 0.0, baseHeight - 1.5 + 0.1], - xAxis = [1.0, 0.0, 0.0], - yAxis = [0.0, 1.0, 0.0], - zAxis = [0.0, 0.0, 1.0] - } + origin = [0.0, 0.0, baseHeight - 1.5 + 0.1], + xAxis = [1.0, 0.0, 0.0], + yAxis = [0.0, 1.0, 0.0], + zAxis = [0.0, 0.0, 1.0] } export plane002 = { - plane = { - origin = [0.0, 0.0, 0.0], - xAxis = [ - sin(toRadians(axisJ1)), - cos(toRadians(axisJ1)), - 0.0 - ], - yAxis = [0.0, 0.0, 1.0], - zAxis = [1.0, 0.0, 0.0] - } + origin = [0.0, 0.0, 0.0], + xAxis = [ + sin(toRadians(axisJ1)), + cos(toRadians(axisJ1)), + 0.0 + ], + yAxis = [0.0, 0.0, 1.0], + zAxis = [1.0, 0.0, 0.0] } // Define Plane to Move J2 Axis Robot Arm export plane003 = { - plane = { - origin = [-0.1, 0.0, 0.0], - xAxis = [ - sin(toRadians(axisJ1)), - cos(toRadians(axisJ1)), - 0.0 - ], - yAxis = [0.0, 0.0, 1.0], - zAxis = [1.0, 0.0, 0.0] - } + origin = [-0.1, 0.0, 0.0], + xAxis = [ + sin(toRadians(axisJ1)), + cos(toRadians(axisJ1)), + 0.0 + ], + yAxis = [0.0, 0.0, 1.0], + zAxis = [1.0, 0.0, 0.0] } diff --git a/public/kcl-samples/multi-axis-robot/robot-arm-base.kcl b/public/kcl-samples/multi-axis-robot/robot-arm-base.kcl index c7d56ae7a..bef83574b 100644 --- a/public/kcl-samples/multi-axis-robot/robot-arm-base.kcl +++ b/public/kcl-samples/multi-axis-robot/robot-arm-base.kcl @@ -26,16 +26,16 @@ extrude001 = extrude(sketch001, length = basePlateThickness) ) // Base Motor for actuating first joint -sketch002 = startSketchOn(extrude001, 'END') +sketch002 = startSketchOn(extrude001, face = 'END') |> circle(center = [0, 0], radius = 4, tag = $referenceEdge) extrude002 = extrude(sketch002, length = baseHeight - basePlateThickness - 1.5) |> fillet(radius = 0.1, tags = [getOppositeEdge(referenceEdge)]) -sketch003 = startSketchOn(extrude002, 'END') +sketch003 = startSketchOn(extrude002, face = 'END') |> circle(center = [0, 0], radius = 0.5) extrude003 = extrude(sketch003, length = 1) // Pattern M8 mounting bolts in base -sketch4A = startSketchOn(extrude001, 'END') +sketch4A = startSketchOn(extrude001, face = 'END') |> circle( center = [ -basePlateRadius + 1, @@ -52,7 +52,7 @@ sketch4A = startSketchOn(extrude001, 'END') extrude4A = extrude(sketch4A, length = -basePlateThickness) -sketch4B = startSketchOn(extrude001, 'END') +sketch4B = startSketchOn(extrude001, face = 'END') |> circle( center = [ -basePlateRadius + 0.5 + baseChamfer, diff --git a/public/kcl-samples/multi-axis-robot/robot-arm-j2.kcl b/public/kcl-samples/multi-axis-robot/robot-arm-j2.kcl index debfba34f..951e3b3aa 100644 --- a/public/kcl-samples/multi-axis-robot/robot-arm-j2.kcl +++ b/public/kcl-samples/multi-axis-robot/robot-arm-j2.kcl @@ -26,12 +26,12 @@ sketch011 = startSketchOn(plane003) |> close() extrude011 = extrude(sketch011, length = -axisJ2ArmThickness) -sketch012 = startSketchOn(extrude011, 'START') +sketch012 = startSketchOn(extrude011, face = 'START') |> circle(center = [-1.75, 8], radius = 1.9, tag = $referenceEdge4) extrude012 = extrude(sketch012, length = 0.15) |> fillet(radius = 0.1, tags = [getOppositeEdge(referenceEdge4)]) -sketch013 = startSketchOn(extrude011, 'START') +sketch013 = startSketchOn(extrude011, face = 'START') |> circle( center = [ -1.75 - (axisJ2ArmLength * cos(toRadians(axisJ2))), @@ -45,7 +45,7 @@ extrude013 = extrude(sketch013, length = 1) |> fillet(radius = 0.1, tags = [getOppositeEdge(referenceEdge5)]) // Draw Bolt Patterns on J2 Robot Arm -sketch014 = startSketchOn(extrude012, 'END') +sketch014 = startSketchOn(extrude012, face = 'END') |> circle(center = [-1.75, 6.75], radius = 0.2) |> patternCircular2d( center = [-1.75, 8], @@ -56,7 +56,7 @@ sketch014 = startSketchOn(extrude012, 'END') extrude014 = extrude(sketch014, length = 0.15) -sketch015 = startSketchOn(extrude013, 'END') +sketch015 = startSketchOn(extrude013, face = 'END') |> circle( center = [ -1.75 - ((axisJ2ArmLength - 1) * cos(toRadians(axisJ2))), @@ -76,7 +76,7 @@ sketch015 = startSketchOn(extrude013, 'END') extrude015 = extrude(sketch015, length = 0.15) -sketch016 = startSketchOn(extrude011, 'END') +sketch016 = startSketchOn(extrude011, face = 'END') |> circle( center = [ 1.75 + axisJ2ArmLength * cos(toRadians(axisJ2)), diff --git a/public/kcl-samples/multi-axis-robot/robot-arm-j3.kcl b/public/kcl-samples/multi-axis-robot/robot-arm-j3.kcl index c883652b8..d020f6bba 100644 --- a/public/kcl-samples/multi-axis-robot/robot-arm-j3.kcl +++ b/public/kcl-samples/multi-axis-robot/robot-arm-j3.kcl @@ -26,7 +26,7 @@ sketch017 = startSketchOn(plane002) |> close() extrude017 = extrude(sketch017, length = axisJ3CArmThickness) -sketch018 = startSketchOn(extrude017, 'END') +sketch018 = startSketchOn(extrude017, face = 'END') |> circle( center = [ 1.75 + axisJ2ArmLength * cos(toRadians(axisJ2)), @@ -40,7 +40,7 @@ extrude018 = extrude(sketch018, length = 0.15) |> fillet(radius = 0.1, tags = [getOppositeEdge(referenceEdge6)]) // Draw Bolt Pattern on J3 Robot Arm -sketch019 = startSketchOn(extrude018, 'END') +sketch019 = startSketchOn(extrude018, face = 'END') |> circle( center = [ 1.75 + (axisJ2ArmLength - 1) * cos(toRadians(axisJ2)), @@ -61,7 +61,7 @@ sketch019 = startSketchOn(extrude018, 'END') extrude019 = extrude(sketch019, length = 0.15) // On the J3 Robot Arm Body, Create Mounting Clevis for Grabber Claw -sketch020 = startSketchOn(extrude017, 'START') +sketch020 = startSketchOn(extrude017, face = 'START') |> circle( center = [ -1.75 - (axisJ2ArmLength * cos(toRadians(axisJ2))) - (axisJ3CArmLength * cos(toRadians(axisJ3C))), @@ -71,7 +71,7 @@ sketch020 = startSketchOn(extrude017, 'START') ) extrude020 = extrude(sketch020, length = -0.5) -sketch021 = startSketchOn(extrude017, 'END') +sketch021 = startSketchOn(extrude017, face = 'END') |> circle( center = [ 1.75 + axisJ2ArmLength * cos(toRadians(axisJ2)) + axisJ3CArmLength * cos(toRadians(axisJ3C)), @@ -85,13 +85,13 @@ extrude021 = extrude(sketch021, length = -0.5) // Define Grabber Claw Constants grabberLength = 7 -sketch022 = startSketchOn(extrude021, 'START') +sketch022 = startSketchOn(extrude021, face = 'START') |> circle(center = [0, 0], radius = 0.10) extrude022 = extrude(sketch022, length = -0.01) // Build Upper Claw Finger -sketch023 = startSketchOn(extrude022, 'START') +sketch023 = startSketchOn(extrude022, face = 'START') |> startProfileAt([ 1.75 + axisJ2ArmLength * cos(toRadians(axisJ2)) + axisJ3CArmLength * cos(toRadians(axisJ3C)), 8 + axisJ2ArmLength * sin(toRadians(axisJ2)) + axisJ3CArmLength * sin(toRadians(axisJ3C)) @@ -112,7 +112,7 @@ sketch023 = startSketchOn(extrude022, 'START') extrude023 = extrude(sketch023, length = -1.5) // Build Lower Claw Finger -sketch024 = startSketchOn(extrude022, 'START') +sketch024 = startSketchOn(extrude022, face = 'START') |> startProfileAt([ 1.75 + axisJ2ArmLength * cos(toRadians(axisJ2)) + axisJ3CArmLength * cos(toRadians(axisJ3C)), 8 + axisJ2ArmLength * sin(toRadians(axisJ2)) + axisJ3CArmLength * sin(toRadians(axisJ3C)) diff --git a/public/kcl-samples/multi-axis-robot/robot-rotating-base.kcl b/public/kcl-samples/multi-axis-robot/robot-rotating-base.kcl index 9318b9b6f..50ebddc36 100644 --- a/public/kcl-samples/multi-axis-robot/robot-rotating-base.kcl +++ b/public/kcl-samples/multi-axis-robot/robot-rotating-base.kcl @@ -26,7 +26,7 @@ sketch006 = startSketchOn(plane002) extrude006 = extrude(sketch006, length = 1) -sketch007 = startSketchOn(extrude006, 'END') +sketch007 = startSketchOn(extrude006, face = 'END') |> circle( center = [ 1.75 * cos(toRadians(axisJ1)) / abs(cos(toRadians(axisJ1))), @@ -39,7 +39,7 @@ extrude007 = extrude(sketch007, length = 1.5) |> fillet(radius = 0.1, tags = [getOppositeEdge(referenceEdge2)]) // Draw Bolt Pattern on Rotating Base -sketch008 = startSketchOn(extrude007, 'END') +sketch008 = startSketchOn(extrude007, face = 'END') |> circle( center = [ 1.75 * cos(toRadians(axisJ1)) / abs(cos(toRadians(axisJ1))), @@ -58,7 +58,7 @@ sketch008 = startSketchOn(extrude007, 'END') ) extrude008 = extrude(sketch008, length = 0.2) -sketch009 = startSketchOn(extrude007, 'END') +sketch009 = startSketchOn(extrude007, face = 'END') |> circle( center = [ 1.75 * cos(toRadians(axisJ1)) / abs(cos(toRadians(axisJ1))), diff --git a/public/kcl-samples/parametric-bearing-pillow-block/main.kcl b/public/kcl-samples/parametric-bearing-pillow-block/main.kcl index 6e53c6e47..ce5af11bb 100644 --- a/public/kcl-samples/parametric-bearing-pillow-block/main.kcl +++ b/public/kcl-samples/parametric-bearing-pillow-block/main.kcl @@ -22,7 +22,7 @@ body = startSketchOn(XY) |> line(endAbsolute = [-width / 2, length / 2]) |> close() |> extrude(length = height) -counterBoreHoles = startSketchOn(body, 'end') +counterBoreHoles = startSketchOn(body, face = 'end') |> circle( center = [ -(width / 2 - (padding / 2)), @@ -34,7 +34,7 @@ counterBoreHoles = startSketchOn(body, 'end') |> patternLinear2d(instances = 2, distance = width - padding, axis = [1, 0]) |> extrude(%, length = -cbDepth) -boltHoles = startSketchOn(body, 'start') +boltHoles = startSketchOn(body, face = 'start') |> circle( center = [ -(width / 2 - (padding / 2)), @@ -46,6 +46,6 @@ boltHoles = startSketchOn(body, 'start') |> patternLinear2d(instances = 2, distance = width - padding, axis = [1, 0]) |> extrude(length = -height + cbDepth) -centerHole = startSketchOn(body, 'end') +centerHole = startSketchOn(body, face = 'end') |> circle(center = [0, 0], radius = bearingDia / 2) |> extrude(length = -height) diff --git a/public/kcl-samples/pipe-flange-assembly/1120t74-pipe.kcl b/public/kcl-samples/pipe-flange-assembly/1120t74-pipe.kcl index 8871155d6..c52f7089f 100644 --- a/public/kcl-samples/pipe-flange-assembly/1120t74-pipe.kcl +++ b/public/kcl-samples/pipe-flange-assembly/1120t74-pipe.kcl @@ -15,7 +15,7 @@ export fn pipe() { |> extrude(%, length = pipeLength) // Extrude a hole through the length of the pipe - pipe = startSketchOn(pipeBase, 'end') + pipe = startSketchOn(pipeBase, face = 'end') |> circle(center = [0, 0], radius = pipeInnerDiameter / 2) |> extrude(%, length = -pipeLength) |> appearance(color = "#a24ed0") diff --git a/public/kcl-samples/pipe-flange-assembly/68095k348-flange.kcl b/public/kcl-samples/pipe-flange-assembly/68095k348-flange.kcl index fc99d12f8..199ba9b4a 100644 --- a/public/kcl-samples/pipe-flange-assembly/68095k348-flange.kcl +++ b/public/kcl-samples/pipe-flange-assembly/68095k348-flange.kcl @@ -27,15 +27,15 @@ export fn flange() { |> extrude(%, length = flangeBaseThickness) // Create both the raised portions on the front and back of the flange base - flangeBack = startSketchOn(flangeBase, 'start') + flangeBack = startSketchOn(flangeBase, face = 'start') |> circle(%, center = [0, 0], radius = flangeBackDiameter / 2) |> extrude(%, length = flangeBackHeight) - flangeFront = startSketchOn(flangeBase, 'end') + flangeFront = startSketchOn(flangeBase, face = 'end') |> circle(%, center = [0, 0], radius = flangeFrontDiameter / 2) |> extrude(%, length = flangeFrontHeight) // Create the circular cut in the center for the pipe - pipeCut = startSketchOn(flangeFront, 'end') + pipeCut = startSketchOn(flangeFront, face = 'end') |> circle(%, center = [0, 0], radius = pipeDiameter / 2) |> extrude(%, length = -flangeTotalThickness) |> appearance(%, color = "#bab0b0") diff --git a/public/kcl-samples/pipe-flange-assembly/91251a404-bolt.kcl b/public/kcl-samples/pipe-flange-assembly/91251a404-bolt.kcl index 14ad16ced..caee97053 100644 --- a/public/kcl-samples/pipe-flange-assembly/91251a404-bolt.kcl +++ b/public/kcl-samples/pipe-flange-assembly/91251a404-bolt.kcl @@ -16,7 +16,7 @@ export fn bolt() { |> fillet(radius = 0.020, tags = [topEdge, getOppositeEdge(topEdge)]) // Define the sketch of the hex pattern on the screw head and extrude into the head - hexPatternSketch = startSketchOn(boltHead, 'start') + hexPatternSketch = startSketchOn(boltHead, face = 'start') |> startProfileAt([ boltHexDrive / 2, boltHexFlatLength / 2 @@ -30,7 +30,7 @@ export fn bolt() { |> extrude(length = -boltHeadLength * 0.75) // create the body of the bolt - boltBody = startSketchOn(boltHead, 'end') + boltBody = startSketchOn(boltHead, face = 'end') |> circle(center = [0, 0], radius = boltDiameter / 2, tag = $filletEdge) |> extrude(length = boltLength) |> appearance(color = "#4dd043", metalness = 90, roughness = 90) diff --git a/public/kcl-samples/pipe-flange-assembly/9472k188-gasket.kcl b/public/kcl-samples/pipe-flange-assembly/9472k188-gasket.kcl index db777f76f..196abb098 100644 --- a/public/kcl-samples/pipe-flange-assembly/9472k188-gasket.kcl +++ b/public/kcl-samples/pipe-flange-assembly/9472k188-gasket.kcl @@ -13,7 +13,7 @@ gasketBase = startSketchOn(XY) |> extrude(%, length = gasketThickness) // Extrude a circular hole through the gasket base -startSketchOn(gasketBase, 'end') +startSketchOn(gasketBase, face = 'end') |> circle(%, center = [0, 0], radius = gasketInnerDiameter / 2) |> extrude(%, length = -gasketThickness) |> appearance(%, color = "#d0cb3e") diff --git a/public/kcl-samples/pipe-flange-assembly/95479a127-hex-nut.kcl b/public/kcl-samples/pipe-flange-assembly/95479a127-hex-nut.kcl index f4ba495bc..799d3b4a3 100644 --- a/public/kcl-samples/pipe-flange-assembly/95479a127-hex-nut.kcl +++ b/public/kcl-samples/pipe-flange-assembly/95479a127-hex-nut.kcl @@ -24,7 +24,7 @@ export fn hexNut() { |> extrude(length = hexNutThickness) // Create the hole in the center of the hex nut - hexNut = startSketchOn(hexNutBase, 'end') + hexNut = startSketchOn(hexNutBase, face = 'end') |> circle(center = [0, 0], radius = hexNutDiameter / 2) |> extrude(%, length = -hexNutThickness) |> appearance(%, color = "#4edfd5") diff --git a/public/kcl-samples/pipe-flange-assembly/98017a257-washer.kcl b/public/kcl-samples/pipe-flange-assembly/98017a257-washer.kcl index b00541af6..13858cbd7 100644 --- a/public/kcl-samples/pipe-flange-assembly/98017a257-washer.kcl +++ b/public/kcl-samples/pipe-flange-assembly/98017a257-washer.kcl @@ -15,7 +15,7 @@ export fn washer() { |> extrude(length = washerThickness) // Extrude a hole through the washer - washer = startSketchOn(washerBase, 'end') + washer = startSketchOn(washerBase, face = 'end') |> circle(center = [0, 0], radius = washerInnerDia / 2) |> extrude(%, length = -washerThickness) |> appearance(%, color = "#ee4f4f") diff --git a/public/kcl-samples/pipe/main.kcl b/public/kcl-samples/pipe/main.kcl index f948826f1..951bc48e4 100644 --- a/public/kcl-samples/pipe/main.kcl +++ b/public/kcl-samples/pipe/main.kcl @@ -15,7 +15,7 @@ pipeBase = startSketchOn(XZ) |> extrude(%, length = pipeLength) // Extrude a hole through the length of the pipe -pipe = startSketchOn(pipeBase, 'end') +pipe = startSketchOn(pipeBase, face = 'end') |> circle(center = [0, 0], radius = pipeInnerDiameter / 2) |> extrude(%, length = -pipeLength) |> appearance(color = "#a24ed0") diff --git a/public/kcl-samples/poopy-shoe/main.kcl b/public/kcl-samples/poopy-shoe/main.kcl index 224b4afd5..bb82c605e 100644 --- a/public/kcl-samples/poopy-shoe/main.kcl +++ b/public/kcl-samples/poopy-shoe/main.kcl @@ -56,16 +56,14 @@ sketch002 = startSketchOn(-YZ) |> extrude(length = backLength - height) customPlane = { - plane = { - origin = { - x = 0, - y = -(wallsWidth / 2 - (wallThickness / 2)), - z = 0 - }, - xAxis = { x = 1, y = 0, z = 0 }, - yAxis = { x = 0, y = 0, z = 1 }, - zAxis = { x = 0, y = -1, z = 0 } - } + origin = { + x = 0, + y = -(wallsWidth / 2 - (wallThickness / 2)), + z = 0 + }, + xAxis = { x = 1, y = 0, z = 0 }, + yAxis = { x = 0, y = 0, z = 1 }, + zAxis = { x = 0, y = -1, z = 0 } } sketch003 = startSketchOn(customPlane) |> startProfileAt([0, 0], %) @@ -75,7 +73,7 @@ sketch003 = startSketchOn(customPlane) |> extrude(length = wallThickness) // Create the right side wall of the tub -sketch004 = startSketchOn(sketch002, 'END') +sketch004 = startSketchOn(sketch002, face = 'END') |> startProfileAt([0, 0], %) |> yLine(endAbsolute = height) |> xLine(endAbsolute = wallThickness) @@ -95,16 +93,14 @@ sketch004 = startSketchOn(sketch002, 'END') |> extrude(length = wallThickness) customPlane2 = { - plane = { - origin = { - x = -1 * (backLength - height + wallsWidth), - y = 0, - z = 0 - }, - xAxis = { x = 0, y = -1, z = 0 }, - yAxis = { x = 0, y = 0, z = 1 }, - zAxis = { x = 1, y = 0, z = 0 } - } + origin = { + x = -1 * (backLength - height + wallsWidth), + y = 0, + z = 0 + }, + xAxis = { x = 0, y = -1, z = 0 }, + yAxis = { x = 0, y = 0, z = 1 }, + zAxis = { x = 1, y = 0, z = 0 } } sketch005 = startSketchOn(customPlane2) |> startProfileAt([0, 0], %) @@ -119,7 +115,7 @@ sketch005 = startSketchOn(customPlane2) |> close() |> extrude(length = wallThickness) -sketch006 = startSketchOn(sketch005, seg03) +sketch006 = startSketchOn(sketch005, face = seg03) |> startProfileAt([0, -1 * (backLength - height)], %) |> xLine(endAbsolute = -exitHeight) |> yLine(length = -wallsWidth) @@ -127,7 +123,7 @@ sketch006 = startSketchOn(sketch005, seg03) |> close() |> extrude(length = wallThickness) -sketch007 = startSketchOn(sketch004, 'END') +sketch007 = startSketchOn(sketch004, face = 'END') |> startProfileAt([0, 0], %) |> xLine(endAbsolute = wallThickness) |> yLine(endAbsolute = height) @@ -136,16 +132,14 @@ sketch007 = startSketchOn(sketch004, 'END') |> extrude(length = wallsWidth - (2 * wallThickness)) customPlane3 = { - plane = { - origin = { - x = -1 * (backLength - height + wallsWidth), - y = 0, - z = wallThickness - }, - xAxis = { x = 0, y = -1, z = 0 }, - yAxis = { x = 1, y = 0, z = 0 }, - zAxis = { x = 0, y = 0, z = 1 } - } + origin = { + x = -1 * (backLength - height + wallsWidth), + y = 0, + z = wallThickness + }, + xAxis = { x = 0, y = -1, z = 0 }, + yAxis = { x = 1, y = 0, z = 0 }, + zAxis = { x = 0, y = 0, z = 1 } } sketch008 = startSketchOn(customPlane3) diff --git a/public/kcl-samples/router-template-cross-bar/main.kcl b/public/kcl-samples/router-template-cross-bar/main.kcl index f8895ce7d..bf5f4fe94 100644 --- a/public/kcl-samples/router-template-cross-bar/main.kcl +++ b/public/kcl-samples/router-template-cross-bar/main.kcl @@ -54,7 +54,7 @@ sketch001 = startSketchOn(XZ) extrude001 = extrude(sketch001, length = 5) // Create the second sketch -sketch002 = startSketchOn(extrude001, 'START') +sketch002 = startSketchOn(extrude001, face = 'START') |> startProfileAt([distanceToInsideEdge, 0], %) |> angledLine(angle = 180, length = templateThickness, tag = $rectangleSegmentA002) |> angledLine(angle = segAng(rectangleSegmentA002) + 90, length = templateThickness, tag = $rectangleSegmentB002) @@ -66,7 +66,7 @@ sketch002 = startSketchOn(extrude001, 'START') extrude002 = extrude(sketch002, length = 13) // Create the third sketch -sketch003 = startSketchOn(extrude001, 'START') +sketch003 = startSketchOn(extrude001, face = 'START') |> startProfileAt([-distanceToInsideEdge, 0], %) |> angledLine(angle = 0, length = templateThickness, tag = $rectangleSegmentA001) |> angledLine(angle = segAng(rectangleSegmentA001) - 90, length = templateThickness, tag = $rectangleSegmentB001) @@ -78,7 +78,7 @@ sketch003 = startSketchOn(extrude001, 'START') extrude003 = extrude(sketch003, length = 13) // Create the fourth sketch -sketch004 = startSketchOn(extrude002, 'END') +sketch004 = startSketchOn(extrude002, face = 'END') |> startProfileAt([-distanceToInsideEdge, 0], %) |> angledLine(angle = 0, length = distanceToInsideEdge * 2, tag = $rectangleSegmentA003) |> angledLine(angle = segAng(rectangleSegmentA003) - 90, length = templateThickness, tag = $rectangleSegmentB003) diff --git a/public/kcl-samples/router-template-slate/main.kcl b/public/kcl-samples/router-template-slate/main.kcl index 3273f68db..20864cf77 100644 --- a/public/kcl-samples/router-template-slate/main.kcl +++ b/public/kcl-samples/router-template-slate/main.kcl @@ -48,7 +48,7 @@ sketch001 = startSketchOn(XZ) extrude001 = extrude(sketch001, length = 5) // Create the second sketch -sketch002 = startSketchOn(extrude001, 'START') +sketch002 = startSketchOn(extrude001, face = 'START') |> startProfileAt([ -slateWidthHalf, -templateGap * 2 - (templateDiameter / 2) @@ -63,7 +63,7 @@ sketch002 = startSketchOn(extrude001, 'START') extrude002 = extrude(sketch002, length = 7.5) // Create the third sketch -sketch003 = startSketchOn(extrude001, 'START') +sketch003 = startSketchOn(extrude001, face = 'START') |> startProfileAt([ slateWidthHalf, -templateGap * 2 - (templateDiameter / 2) diff --git a/public/kcl-samples/sheet-metal-bracket/main.kcl b/public/kcl-samples/sheet-metal-bracket/main.kcl index b70056488..30a6ccd53 100644 --- a/public/kcl-samples/sheet-metal-bracket/main.kcl +++ b/public/kcl-samples/sheet-metal-bracket/main.kcl @@ -95,7 +95,7 @@ bracketProfile = startSketchOn(XZ) ) // Cut the bolt pattern in the left base flange -leftFlangeBoltPattern = startSketchOn(bracketProfile, seg04) +leftFlangeBoltPattern = startSketchOn(bracketProfile, face = seg04) |> circle(center = [-mountingBoltPatternX / 2, overhang], radius = mountingBoltDiameter / 2) |> patternLinear2d( %, @@ -106,7 +106,7 @@ leftFlangeBoltPattern = startSketchOn(bracketProfile, seg04) |> extrude(length = -thickness) // Cut the bolt pattern in the right base flange -rightFlangeBoltPattern = startSketchOn(bracketProfile, seg06) +rightFlangeBoltPattern = startSketchOn(bracketProfile, face = seg06) |> circle(center = [mountingBoltPatternX / 2, overhang], radius = mountingBoltDiameter / 2) |> patternLinear2d( %, @@ -117,7 +117,7 @@ rightFlangeBoltPattern = startSketchOn(bracketProfile, seg06) |> extrude(length = -thickness) // Provision the top flange with holes to mount an object -topFlangeBoltPattern = startSketchOn(bracketProfile, seg05) +topFlangeBoltPattern = startSketchOn(bracketProfile, face = seg05) |> circle( center = [ -componentBoltPatternX / 2, @@ -140,6 +140,6 @@ topFlangeBoltPattern = startSketchOn(bracketProfile, seg05) |> extrude(length = -thickness) // Place a hole at the center of the component bolt pattern to reduce mass -centeredHole = startSketchOn(bracketProfile, seg05) +centeredHole = startSketchOn(bracketProfile, face = seg05) |> circle(center = [0, flangeExtrusion / 2], radius = 0.75) |> extrude(length = -thickness) diff --git a/public/kcl-samples/socket-head-cap-screw/main.kcl b/public/kcl-samples/socket-head-cap-screw/main.kcl index 84624f08e..adbe5ce3d 100644 --- a/public/kcl-samples/socket-head-cap-screw/main.kcl +++ b/public/kcl-samples/socket-head-cap-screw/main.kcl @@ -19,7 +19,7 @@ boltHead = startSketchOn(XZ) |> fillet(radius = 0.020, tags = [topEdge, getOppositeEdge(topEdge)]) // Define the sketch of the hex pattern on the screw head -hexPatternSketch = startSketchOn(boltHead, 'start') +hexPatternSketch = startSketchOn(boltHead, face = 'start') |> startProfileAt([ boltHexDrive / 2, boltHexFlatLength / 2 @@ -31,7 +31,7 @@ hexPatternSketch = startSketchOn(boltHead, 'start') |> angledLine(angle = 30, length = boltHexFlatLength) |> close() |> extrude(length = -boltHeadLength * 0.75) -boltBody = startSketchOn(boltHead, 'end') +boltBody = startSketchOn(boltHead, face = 'end') |> circle(center = [0, 0], radius = boltDiameter / 2, tag = $filletEdge) |> extrude(length = boltLength) |> fillet(radius = .020, tags = [getOppositeEdge(filletEdge)]) diff --git a/public/kcl-samples/walkie-talkie/body.kcl b/public/kcl-samples/walkie-talkie/body.kcl index 7f0dd0ee1..f0c212b45 100644 --- a/public/kcl-samples/walkie-talkie/body.kcl +++ b/public/kcl-samples/walkie-talkie/body.kcl @@ -26,7 +26,7 @@ body = startSketchOn(XZ) ) // Cut out the indentation for the case -caseIndentSketch = startSketchOn(body, 'END') +caseIndentSketch = startSketchOn(body, face = 'END') |> startProfileAt([ -width / 2 + offset, height / 2 - (chamferLength + offset / 2 * cos(toRadians(45))) @@ -51,7 +51,7 @@ caseIndentSketch = startSketchOn(body, 'END') extrude002 = extrude(caseIndentSketch, length = -0.0625) // Create the pocket for the screen -screenCutout = startSketchOn(extrude002, 'start') +screenCutout = startSketchOn(extrude002, face = 'start') |> startProfileAt([-screenWidth / 2, screenYPosition], %) |> xLine(length = screenWidth, tag = $seg01) |> yLine(length = -screenHeight) @@ -61,7 +61,7 @@ screenCutout = startSketchOn(extrude002, 'start') extrude003 = extrude(screenCutout, length = screenDepth) // Create the speaker box -speakerBox = startSketchOn(extrude002, 'start') +speakerBox = startSketchOn(extrude002, face = 'start') |> startProfileAt([-1.25 / 2, -.125], %) |> xLine(length = speakerBoxWidth) |> yLine(length = -speakerBoxHeight) diff --git a/rust/kcl-lib/e2e/executor/inputs/boolean-setup-with-sketch-on-faces.kcl b/rust/kcl-lib/e2e/executor/inputs/boolean-setup-with-sketch-on-faces.kcl index fc54ba3ae..95dd01cb3 100644 --- a/rust/kcl-lib/e2e/executor/inputs/boolean-setup-with-sketch-on-faces.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/boolean-setup-with-sketch-on-faces.kcl @@ -18,7 +18,7 @@ extrude002 = extrude(profile002, length = 150) tag = $seg02, ) -sketch003 = startSketchOn(extrude002, mySeg) +sketch003 = startSketchOn(extrude002, face = mySeg) profile003 = startProfileAt([207.36, 126.19], sketch003) |> angledLine(angle = 0, length = 33.57, tag = $rectangleSegmentA002) |> angledLine(angle = segAng(rectangleSegmentA002) - 90, length = 99.11) @@ -26,7 +26,7 @@ profile003 = startProfileAt([207.36, 126.19], sketch003) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude003 = extrude(profile003, length = -20) -sketch004 = startSketchOn(extrude003, seg01) +sketch004 = startSketchOn(extrude003, face = seg01) profile004 = startProfileAt([-235.38, 66.16], sketch004) |> angledLine(angle = 0, length = 24.21, tag = $rectangleSegmentA003) |> angledLine(angle = segAng(rectangleSegmentA003) - 90, length = 3.72) @@ -35,7 +35,7 @@ profile004 = startProfileAt([-235.38, 66.16], sketch004) |> close() extrude004 = extrude(profile004, length = 30) -sketch005 = startSketchOn(extrude002, seg02) +sketch005 = startSketchOn(extrude002, face = seg02) profile005 = startProfileAt([-129.93, -59.19], sketch005) |> xLine(length = 48.79) |> line(end = [1.33, 11.03]) @@ -43,7 +43,7 @@ profile005 = startProfileAt([-129.93, -59.19], sketch005) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude005 = extrude(profile005, length = -10) -sketch006 = startSketchOn(extrude005, seg03) +sketch006 = startSketchOn(extrude005, face = seg03) profile006 = startProfileAt([-95.86, 38.73], sketch006) |> angledLine(angle = 0, length = 3.48, tag = $rectangleSegmentA004) |> angledLine(angle = segAng(rectangleSegmentA004) - 90, length = 3.36) diff --git a/rust/kcl-lib/e2e/executor/inputs/extrude-custom-plane.kcl b/rust/kcl-lib/e2e/executor/inputs/extrude-custom-plane.kcl index 76adba417..c676cf80e 100644 --- a/rust/kcl-lib/e2e/executor/inputs/extrude-custom-plane.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/extrude-custom-plane.kcl @@ -10,12 +10,10 @@ const extrude000 = extrude(sketch000, length = 1.0) // define a plane with name plane005 const plane005 = { - plane: { - origin: [0.0, 0.0, 1.0], - xAxis: [0.707107, 0.707107, 0.0], - yAxis: [-0.0, 0.0, 1.0], - zAxis: [0.707107, -0.707107, 0.0] - } + origin: [0.0, 0.0, 1.0], + xAxis: [0.707107, 0.707107, 0.0], + yAxis: [-0.0, 0.0, 1.0], + zAxis: [0.707107, -0.707107, 0.0] } // create a sketch with name sketch001 diff --git a/rust/kcl-lib/e2e/executor/inputs/extrude-inside-fn-with-tags.kcl b/rust/kcl-lib/e2e/executor/inputs/extrude-inside-fn-with-tags.kcl index 802cb2ada..754c3076f 100644 --- a/rust/kcl-lib/e2e/executor/inputs/extrude-inside-fn-with-tags.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/extrude-inside-fn-with-tags.kcl @@ -15,7 +15,7 @@ const tabThk = 4 // define a rectangular shape func fn rectShape = (pos, w, l) => { - const rr = startSketchOn('xy') + const rr = startSketchOn(XY) |> startProfileAt([pos[0] - (w / 2), pos[1] - (l / 2)], %) |> line(endAbsolute = [pos[0] + w / 2, pos[1] - (l / 2)], tag = $edge01) |> line(endAbsolute = [pos[0] + w / 2, pos[1] + l / 2], tag = $edge02) @@ -26,12 +26,10 @@ fn rectShape = (pos, w, l) => { // define the bracket plane const bracketPlane = { - plane: { - origin: { x: 0, y: length / 2 + thk, z: 0 }, - xAxis: { x: 1, y: 0, z: 0 }, - yAxis: { x: 0, y: 0, z: 1 }, - zAxis: { x: 0, y: -1, z: 0 } - } + origin: { x: 0, y: length / 2 + thk, z: 0 }, + xAxis: { x: 1, y: 0, z: 0 }, + yAxis: { x: 0, y: 0, z: 1 }, + zAxis: { x: 0, y: -1, z: 0 } } // build the bracket sketch around the body @@ -65,7 +63,7 @@ const bracketBody = bs // sketch on the face -const retBack = startSketchOn(bs, bs.sketch.tags.edge4) +const retBack = startSketchOn(bs, face = bs.sketch.tags.edge4) |> startProfileAt([length / 2 + thk, 0], %) |> line(end = [0, thk]) |> line(end = [-thk, 0]) diff --git a/rust/kcl-lib/e2e/executor/inputs/focusrite_scarlett_mounting_braket.kcl b/rust/kcl-lib/e2e/executor/inputs/focusrite_scarlett_mounting_braket.kcl index feffe9884..4ec89b27e 100644 --- a/rust/kcl-lib/e2e/executor/inputs/focusrite_scarlett_mounting_braket.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/focusrite_scarlett_mounting_braket.kcl @@ -26,12 +26,10 @@ fn rectShape = (pos, w, l) => { // define the bracket plane const bracketPlane = { - plane: { - origin: { x: 0, y: length / 2 + thk, z: 0 }, - xAxis: { x: 1, y: 0, z: 0 }, - yAxis: { x: 0, y: 0, z: 1 }, - zAxis: { x: 0, y: -1, z: 0 } - } + origin: { x: 0, y: length / 2 + thk, z: 0 }, + xAxis: { x: 1, y: 0, z: 0 }, + yAxis: { x: 0, y: 0, z: 1 }, + zAxis: { x: 0, y: -1, z: 0 } } // build the bracket sketch around the body @@ -65,12 +63,10 @@ const bracketBody = bs // define the tab plane const tabPlane = { - plane: { - origin: { x: 0, y: 0, z: depth + thk }, - xAxis: { x: 1, y: 0, z: 0 }, - yAxis: { x: 0, y: 1, z: 0 }, - zAxis: { x: 0, y: 0, z: 1 } - } + origin: { x: 0, y: 0, z: depth + thk }, + xAxis: { x: 1, y: 0, z: 0 }, + yAxis: { x: 0, y: 1, z: 0 }, + zAxis: { x: 0, y: 0, z: 1 } } // build the tabs of the mounting bracket (right side) @@ -131,12 +127,10 @@ const tabsL = startSketchOn(tabPlane) // define a plane for retention bumps const retPlane = { - plane: { - origin: { x: -width / 2 + 20, y: 0, z: 0 }, - xAxis: { x: 0, y: 1, z: 0 }, - yAxis: { x: 0, y: 0, z: 1 }, - zAxis: { x: 1, y: 0, z: 0 } - } + origin: { x: -width / 2 + 20, y: 0, z: 0 }, + xAxis: { x: 0, y: 1, z: 0 }, + yAxis: { x: 0, y: 0, z: 1 }, + zAxis: { x: 1, y: 0, z: 0 } } // build the retention bump in the front diff --git a/rust/kcl-lib/e2e/executor/inputs/global-tags.kcl b/rust/kcl-lib/e2e/executor/inputs/global-tags.kcl index 01930cb1c..25fa5dd51 100644 --- a/rust/kcl-lib/e2e/executor/inputs/global-tags.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/global-tags.kcl @@ -26,12 +26,10 @@ fn rectShape = (pos, w, l) => { // define the bracket plane const bracketPlane = { - plane: { - origin: { x: 0, y: length / 2 + thk, z: 0 }, - xAxis: { x: 1, y: 0, z: 0 }, - yAxis: { x: 0, y: 0, z: 1 }, - zAxis: { x: 0, y: -1, z: 0 } - } + origin: { x: 0, y: length / 2 + thk, z: 0 }, + xAxis: { x: 1, y: 0, z: 0 }, + yAxis: { x: 0, y: 0, z: 1 }, + zAxis: { x: 0, y: -1, z: 0 } } // build the bracket sketch around the body @@ -65,12 +63,10 @@ const bracketBody = bs // define the tab plane const tabPlane = { - plane: { - origin: { x: 0, y: 0, z: depth + thk }, - xAxis: { x: 1, y: 0, z: 0 }, - yAxis: { x: 0, y: 1, z: 0 }, - zAxis: { x: 0, y: 0, z: 1 } - } + origin: { x: 0, y: 0, z: depth + thk }, + xAxis: { x: 1, y: 0, z: 0 }, + yAxis: { x: 0, y: 1, z: 0 }, + zAxis: { x: 0, y: 0, z: 1 } } // build the tabs of the mounting bracket (right side) @@ -131,12 +127,10 @@ const tabsL = startSketchOn(tabPlane) // define a plane for retention bumps const retPlane = { - plane: { - origin: { x: -width / 2 + 20, y: 0, z: 0 }, - xAxis: { x: 0, y: 1, z: 0 }, - yAxis: { x: 0, y: 0, z: 1 }, - zAxis: { x: 1, y: 0, z: 0 } - } + origin: { x: -width / 2 + 20, y: 0, z: 0 }, + xAxis: { x: 0, y: 1, z: 0 }, + yAxis: { x: 0, y: 0, z: 1 }, + zAxis: { x: 1, y: 0, z: 0 } } // build the retention bump in the front diff --git a/rust/kcl-lib/e2e/executor/inputs/lego.kcl b/rust/kcl-lib/e2e/executor/inputs/lego.kcl index 66426668d..ed2f021b7 100644 --- a/rust/kcl-lib/e2e/executor/inputs/lego.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/lego.kcl @@ -27,7 +27,7 @@ const s = startSketchOn(XY) |> close() |> extrude(length = height) -const shellExtrude = startSketchOn(s, "start") +const shellExtrude = startSketchOn(s, face = "start") |> startProfileAt([ -(total_width / 2 - t), -(total_length / 2 - t) @@ -38,7 +38,7 @@ const shellExtrude = startSketchOn(s, "start") |> close() |> extrude(length = -(height - t)) -const peg = startSketchOn(s, "end") +const peg = startSketchOn(s, face = "end") |> circle( center= [ -(total_width / 2 - wSegments), -(total_length / 2 - lSegments) diff --git a/rust/kcl-lib/e2e/executor/inputs/order-sketch-extrude-in-order.kcl b/rust/kcl-lib/e2e/executor/inputs/order-sketch-extrude-in-order.kcl index 7b98930b1..595db503e 100644 --- a/rust/kcl-lib/e2e/executor/inputs/order-sketch-extrude-in-order.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/order-sketch-extrude-in-order.kcl @@ -1,19 +1,17 @@ // define a plane with UID 94894440791888 const plane94894440791888 = { - plane: { - origin: [0.005000000000000001, 0.01, -0.005], - xAxis: [ - 0.9285064634886234, - 0.37131623619207604, - 0.0 - ], - yAxis: [-0.0, 0.0, 1.0], - zAxis: [ - 0.37131623619207604, - -0.9285064634886234, - 0.0 - ] - } + origin: [0.005000000000000001, 0.01, -0.005], + xAxis: [ + 0.9285064634886234, + 0.37131623619207604, + 0.0 + ], + yAxis: [-0.0, 0.0, 1.0], + zAxis: [ + 0.37131623619207604, + -0.9285064634886234, + 0.0 + ] } // create a sketch with UID 94894440902176 diff --git a/rust/kcl-lib/e2e/executor/inputs/order-sketch-extrude-out-of-order.kcl b/rust/kcl-lib/e2e/executor/inputs/order-sketch-extrude-out-of-order.kcl index c4395b2df..f9d7286f6 100644 --- a/rust/kcl-lib/e2e/executor/inputs/order-sketch-extrude-out-of-order.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/order-sketch-extrude-out-of-order.kcl @@ -1,19 +1,17 @@ // define a plane with UID 94894440791888 const plane94894440791888 = { - plane: { - origin: [0.005000000000000001, 0.01, -0.005], - xAxis: [ - 0.9285064634886234, - 0.37131623619207604, - 0.0 - ], - yAxis: [-0.0, 0.0, 1.0], - zAxis: [ - 0.37131623619207604, - -0.9285064634886234, - 0.0 - ] - } + origin: [0.005000000000000001, 0.01, -0.005], + xAxis: [ + 0.9285064634886234, + 0.37131623619207604, + 0.0 + ], + yAxis: [-0.0, 0.0, 1.0], + zAxis: [ + 0.37131623619207604, + -0.9285064634886234, + 0.0 + ] } // create a sketch with UID 94894440902176 diff --git a/rust/kcl-lib/e2e/executor/inputs/pentagon_fillet_sugar.kcl b/rust/kcl-lib/e2e/executor/inputs/pentagon_fillet_sugar.kcl index ff97b2390..0d2d1a758 100644 --- a/rust/kcl-lib/e2e/executor/inputs/pentagon_fillet_sugar.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/pentagon_fillet_sugar.kcl @@ -12,7 +12,7 @@ const p = startSketchOn(XY) |> extrude(length = triangleHeight) fn circl = (x, face) => { -return startSketchOn(p, face) +return startSketchOn(p, face = face) |> startProfileAt([x + radius, triangleHeight/2], %) |> arc(circ, %, $arc_tag) |> close() diff --git a/rust/kcl-lib/e2e/executor/inputs/router-template-slate.kcl b/rust/kcl-lib/e2e/executor/inputs/router-template-slate.kcl index f67102465..8575cba12 100644 --- a/rust/kcl-lib/e2e/executor/inputs/router-template-slate.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/router-template-slate.kcl @@ -33,7 +33,7 @@ const sketch001 = startSketchOn(XZ) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() const extrude001 = extrude(sketch001, length = 5) -const sketch002 = startSketchOn(extrude001, 'START') +const sketch002 = startSketchOn(extrude001, face = 'START') |> startProfileAt([ -slateWidthHalf, -templateGap * 2 - (templateDiameter / 2) @@ -44,7 +44,7 @@ const sketch002 = startSketchOn(extrude001, 'START') |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() const extrude002 = extrude(sketch002, length = 7.5) -const sketch003 = startSketchOn(extrude001, 'START') +const sketch003 = startSketchOn(extrude001, face = 'START') |> startProfileAt([ slateWidthHalf, -templateGap * 2 - (templateDiameter / 2) diff --git a/rust/kcl-lib/e2e/executor/inputs/server-rack-heavy.kcl b/rust/kcl-lib/e2e/executor/inputs/server-rack-heavy.kcl index 69a44da58..769bebc32 100644 --- a/rust/kcl-lib/e2e/executor/inputs/server-rack-heavy.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/server-rack-heavy.kcl @@ -11,7 +11,6 @@ const width = 21.53 // simple caster model at each corner fn caster = (originStart) => { const plane001c = { - plane: { origin: [ -(3.543 - 2.756) / 2 + originStart[0], -(3.543 - 2.756) / 2 + originStart[1], @@ -20,7 +19,6 @@ fn caster = (originStart) => { x_axis: [1.0, 0.0, 0.0], y_axis: [0.0, 1.0, 0.0], z_axis: [0.0, 0.0, 1.0] - } } const sketch001c = startSketchOn(plane001c) @@ -48,7 +46,7 @@ fn caster = (originStart) => { ], radius = 8.8 / 2 / 25.4 ), %) |> extrude(length = -.25) - const sketch002c = startSketchOn(sketch001c, 'START') + const sketch002c = startSketchOn(sketch001c, face = 'START') |> startProfileAt([-originStart[0], 2.2 + originStart[1]], %) |> arc({ angle_start: 30, @@ -59,7 +57,6 @@ fn caster = (originStart) => { |> extrude(length = 3.1) const plane002c = { - plane: { origin: [ 0 + originStart[0], 0.8 + originStart[1], @@ -68,7 +65,6 @@ fn caster = (originStart) => { x_axis: [1, 0, 0], y_axis: [0, 0, 1], z_axis: [1, 0, 0] - } } const sketch003c = startSketchOn(plane002c) |> circle(center = [0, 1.2], radius = 2.48 / 2) @@ -96,7 +92,6 @@ caster([ // left wall const plane001 = { - plane: { origin: [ originStart[0] - 4, originStart[1] + 2, @@ -105,7 +100,6 @@ const plane001 = { x_axis: [0, 1, 0], y_axis: [0, 0, 1], z_axis: [1, 0, 0] - } } const sketch001l = startSketchOn(plane001) @@ -187,7 +181,6 @@ const extrude007l = extrude(sketch007l, length = 1) // right wall const plane002 = { - plane: { origin: [ originStart[0] - 4 + width - 1, originStart[1] - 1, @@ -196,7 +189,6 @@ const plane002 = { x_axis: [0, 1, 0], y_axis: [0, 0, 1], z_axis: [1, 0, 0] - } } const sketch001w = startSketchOn(plane002) @@ -488,12 +480,10 @@ const extrude025w = extrude(sketch025w, length = 1) // Base plane of rack const plane003 = { - plane: { origin: [0, 0, 4.114], x_axis: [1, 0, 0], y_axis: [0, 1, 0], z_axis: [0, 0, 1] - } } const sketch005 = startSketchOn(plane003) @@ -541,12 +531,10 @@ const extrude008 = extrude(sketch008, length = 1) // Top Plane const plane004 = { - plane: { origin: [0, 0, 4.114 + railHeight * 1.75 + 2], x_axis: [1, 0, 0], y_axis: [0, 1, 0], z_axis: [0, 0, 1] - } } const sketch005t = startSketchOn(plane004) @@ -594,30 +582,24 @@ const extrude009t = extrude(sketch009t, length = -1) // front left vertical rail // Define planes so the rail can be moved const planeXYfl = { - plane: { origin: [0, 0, originStart[2]], xAxis: [1.0, 0.0, 0.0], yAxis: [0.0, 1.0, 0.0], zAxis: [0.0, 0.0, 1.0] - } } const planeXZfl = { - plane: { origin: [originStart[1], originStart[0], originStart[2]], xAxis: [0, 1, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } const planeYZfl = { - plane: { origin: [originStart[1], originStart[0], originStart[2]], xAxis: [-1, 0, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } // Base flange @@ -661,7 +643,7 @@ const sketch003fl = startSketchOn(planeXYfl) const extrude003fl = extrude(sketch003fl, length = railHeight * 1.75) // EIA-310-D standard hole pattern -const sketch004fl = startSketchOn(extrude002fl, 'START') +const sketch004fl = startSketchOn(extrude002fl, face = 'START') |> startProfileAt([0.72 + originStart[1], originStart[2] + 0.15], %) |> angledLine(angle = 0, length = -0.375, tag = $rectangleSegmentA003fl) |> angledLine(angle = segAng(rectangleSegmentA003fl) - 90, length = 0.375, tag = $rectangleSegmentB003fl) @@ -676,7 +658,7 @@ const sketch004fl = startSketchOn(extrude002fl, 'START') const extrude004fl = extrude(sketch004fl, length = -thickness) // EIA-310-D standard hole pattern -const sketch005fl = startSketchOn(extrude002fl, 'START') +const sketch005fl = startSketchOn(extrude002fl, face = 'START') |> startProfileAt([0.72 + originStart[1],originStart[2] + 0.15 + .62], %) |> angledLine(angle = 0, length = -0.375, tag = $rectangleSegmentA004fl) |> angledLine(angle = segAng(rectangleSegmentA004fl) - 90, length = 0.375, tag = $rectangleSegmentB004fl) @@ -691,7 +673,7 @@ const sketch005fl = startSketchOn(extrude002fl, 'START') const extrude005fl = extrude(sketch005fl, length = -thickness) // EIA-310-D standard hole pattern -const sketch006fl = startSketchOn(extrude002fl, 'START') +const sketch006fl = startSketchOn(extrude002fl, face = 'START') |> startProfileAt([ 0.72 + originStart[1], originStart[2] + 0.15 + 0.62 + 0.50 @@ -709,7 +691,7 @@ const sketch006fl = startSketchOn(extrude002fl, 'START') const extrude006fl = extrude(sketch006fl, length = -thickness) // EIA-310-D standard hole pattern -const sketch007fl = startSketchOn(extrude001fl, 'START') +const sketch007fl = startSketchOn(extrude001fl, face = 'START') |> startProfileAt([-1.45 - originStart[0], originStart[2] + 0.15], %) |> angledLine(angle = 0, length = -0.375, tag = $rectangleSegmentA006fl) |> angledLine(angle = segAng(rectangleSegmentA006fl) - 90, length = 0.375, tag = $rectangleSegmentB006fl) @@ -724,7 +706,7 @@ const sketch007fl = startSketchOn(extrude001fl, 'START') const extrude007fl = extrude(sketch007fl, length = -thickness) // EIA-310-D standard hole pattern -const sketch008fl = startSketchOn(extrude001fl, 'START') +const sketch008fl = startSketchOn(extrude001fl, face = 'START') |> startProfileAt([-1.45 - originStart[0],originStart[2] + 0.15 + 0.62], %) |> angledLine(angle = 0, length = -0.375, tag = $rectangleSegmentA007fl) |> angledLine(angle = segAng(rectangleSegmentA007fl) - 90, length = 0.375, tag = $rectangleSegmentB007fl) @@ -739,7 +721,7 @@ const sketch008fl = startSketchOn(extrude001fl, 'START') const extrude008fl = extrude(sketch008fl, length = -thickness) // EIA-310-D standard hole pattern -const sketch009fl = startSketchOn(extrude001fl, 'START') +const sketch009fl = startSketchOn(extrude001fl, face = 'START') |> startProfileAt([ -1.45 - originStart[0], originStart[2] + 0.15 + 0.62 + 0.5 @@ -757,7 +739,7 @@ const sketch009fl = startSketchOn(extrude001fl, 'START') const extrude009fl = extrude(sketch009fl, length = -thickness) // define slots -const sketch010fl = startSketchOn(extrude001fl, 'START') +const sketch010fl = startSketchOn(extrude001fl, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0], originStart[2] + .81 - (.438 / 2) @@ -775,7 +757,7 @@ const sketch010fl = startSketchOn(extrude001fl, 'START') const extrude010fl = extrude(sketch010fl, length = -thickness) // define slots -const sketch011fl = startSketchOn(extrude001fl, 'START') +const sketch011fl = startSketchOn(extrude001fl, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0], originStart[2] + railHeight * 1.75 / 2 + .438 / 2 @@ -792,7 +774,7 @@ const sketch011fl = startSketchOn(extrude001fl, 'START') const extrude011fl = extrude(sketch011fl, length = -thickness) // define slots -const sketch012fl = startSketchOn(extrude001fl, 'START') +const sketch012fl = startSketchOn(extrude001fl, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0], originStart[2] + railHeight * 1.75 - .81 + .438 / 2 @@ -815,16 +797,13 @@ const extrude012fl = extrude(sketch012fl, length = -thickness) // FRONT RIGHT VERTICAL RAIL // Define planes so the rail can be moved const planeXYfr = { - plane: { origin: [0, 0, originStart[2]], xAxis: [1.0, 0.0, 0.0], yAxis: [0.0, 1.0, 0.0], zAxis: [0.0, 0.0, 1.0] - } } const planeXZfr = { - plane: { origin: [ originStart[1] + width - thickness - 2, originStart[0], @@ -833,11 +812,9 @@ const planeXZfr = { xAxis: [0, 1, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } const planeYZfr = { - plane: { origin: [ originStart[1] + width - 2, originStart[0], @@ -846,7 +823,6 @@ const planeYZfr = { xAxis: [-1, 0, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } // Base flange @@ -892,7 +868,7 @@ const sketch003fr = startSketchOn(planeXYfr) const extrude003fr = extrude(sketch003fr, length = railHeight * 1.75) // EIA-310-D standard hole pattern -const sketch004fr = startSketchOn(extrude002fr, 'START') +const sketch004fr = startSketchOn(extrude002fr, face = 'START') |> startProfileAt([ -0.35 + originStart[1] + width - 2, originStart[2] + 0.15 @@ -910,7 +886,7 @@ const sketch004fr = startSketchOn(extrude002fr, 'START') const extrude004fr = extrude(sketch004fr, length = -thickness) // EIA-310-D standard hole pattern -const sketch005fr = startSketchOn(extrude002fr, 'START') +const sketch005fr = startSketchOn(extrude002fr, face = 'START') |> startProfileAt([ -0.35 + originStart[1] + width - 2, originStart[2] + 0.15 + .62 @@ -928,7 +904,7 @@ const sketch005fr = startSketchOn(extrude002fr, 'START') const extrude005fr = extrude(sketch005fr, length = -thickness) // EIA-310-D standard hole pattern -const sketch006fr = startSketchOn(extrude002fr, 'START') +const sketch006fr = startSketchOn(extrude002fr, face = 'START') |> startProfileAt([ -0.35 + originStart[1] + width - 2, originStart[2] + 0.15 + 0.62 + 0.50 @@ -946,7 +922,7 @@ const sketch006fr = startSketchOn(extrude002fr, 'START') const extrude006fr = extrude(sketch006fr, length = -thickness) // EIA-310-D standard hole pattern -const sketch007fr = startSketchOn(extrude001fr, 'START') +const sketch007fr = startSketchOn(extrude001fr, face = 'START') |> startProfileAt([ -1.45 - originStart[0], originStart[2] + 0.15 @@ -964,7 +940,7 @@ const sketch007fr = startSketchOn(extrude001fr, 'START') const extrude007fr = extrude(sketch007fr, length = -thickness) // EIA-310-D standard hole pattern -const sketch008fr = startSketchOn(extrude001fr, 'START') +const sketch008fr = startSketchOn(extrude001fr, face = 'START') |> startProfileAt([ -1.45 - originStart[0], originStart[2] + 0.15 + 0.62 @@ -982,7 +958,7 @@ const sketch008fr = startSketchOn(extrude001fr, 'START') const extrude008fr = extrude(sketch008fr, length = -thickness) // EIA-310-D standard hole pattern -const sketch009fr = startSketchOn(extrude001fr, 'START') +const sketch009fr = startSketchOn(extrude001fr, face = 'START') |> startProfileAt([ -1.45 - originStart[0], originStart[2] + 0.15 + 0.62 + 0.5 @@ -1000,7 +976,7 @@ const sketch009fr = startSketchOn(extrude001fr, 'START') const extrude009fr = extrude(sketch009fr, length = -thickness) // define slots -const sketch010fr = startSketchOn(extrude001fr, 'START') +const sketch010fr = startSketchOn(extrude001fr, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0], originStart[2] + .81 - (.438 / 2) @@ -1021,7 +997,7 @@ const sketch010fr = startSketchOn(extrude001fr, 'START') const extrude010fr = extrude(sketch010fr, length = -thickness) // define slots -const sketch011fr = startSketchOn(extrude001fr, 'START') +const sketch011fr = startSketchOn(extrude001fr, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0], originStart[2] + railHeight * 1.75 / 2 + .438 / 2 @@ -1038,7 +1014,7 @@ const sketch011fr = startSketchOn(extrude001fr, 'START') const extrude011fr = extrude(sketch011fr, length = -thickness) // define slots -const sketch012fr = startSketchOn(extrude001fr, 'START') +const sketch012fr = startSketchOn(extrude001fr, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0], originStart[2] + railHeight * 1.75 - .81 + .438 / 2 @@ -1061,16 +1037,13 @@ const extrude012fr = extrude(sketch012fr, length = -thickness) // RIGHT REAR VERTICAL RAIL // Define planes so the rail can be moved const planeXYrr = { - plane: { origin: [0, serverDepth, originStart[2]], xAxis: [1.0, 0.0, 0.0], yAxis: [0.0, 1.0, 0.0], zAxis: [0.0, 0.0, 1.0] - } } const planeXZrr = { - plane: { origin: [ originStart[1] + width - thickness - 2, originStart[0]+serverDepth-2-bendRad, @@ -1079,11 +1052,9 @@ const planeXZrr = { xAxis: [0, 1, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } const planeYZrr = { - plane: { origin: [ originStart[1] + width - 2, originStart[0]+serverDepth, @@ -1092,7 +1063,6 @@ const planeYZrr = { xAxis: [-1, 0, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } // Base flange @@ -1138,7 +1108,7 @@ const sketch003rr = startSketchOn(planeXYrr) const extrude003rr = extrude(sketch003rr, length = railHeight * 1.75) // EIA-310-D standard hole pattern -const sketch004rr = startSketchOn(extrude002rr, 'START') +const sketch004rr = startSketchOn(extrude002rr, face = 'START') |> startProfileAt([ -0.35 + originStart[1] + width - 2, originStart[2] + 0.15 @@ -1156,7 +1126,7 @@ const sketch004rr = startSketchOn(extrude002rr, 'START') const extrude004rr = extrude(sketch004rr, length = -thickness) // EIA-310-D standard hole pattern -const sketch005rr = startSketchOn(extrude002rr, 'START') +const sketch005rr = startSketchOn(extrude002rr, face = 'START') |> startProfileAt([ -0.35 + originStart[1] + width - 2, originStart[2] + 0.15 + .62 @@ -1174,7 +1144,7 @@ const sketch005rr = startSketchOn(extrude002rr, 'START') const extrude005rr = extrude(sketch005rr, length = -thickness) // EIA-310-D standard hole pattern -const sketch006rr = startSketchOn(extrude002rr, 'START') +const sketch006rr = startSketchOn(extrude002rr, face = 'START') |> startProfileAt([ -0.35 + originStart[1] + width - 2, originStart[2] + 0.15 + 0.62 + 0.50 @@ -1192,7 +1162,7 @@ const sketch006rr = startSketchOn(extrude002rr, 'START') const extrude006rr = extrude(sketch006rr, length = -thickness) // EIA-310-D standard hole pattern -const sketch007rr = startSketchOn(extrude001rr, 'START') +const sketch007rr = startSketchOn(extrude001rr, face = 'START') |> startProfileAt([ -originStart[0]-serverDepth+1.7, originStart[2] + 0.15 @@ -1210,7 +1180,7 @@ const sketch007rr = startSketchOn(extrude001rr, 'START') const extrude007rr = extrude(sketch007rr, length = -thickness) // EIA-310-D standard hole pattern -const sketch008rr = startSketchOn(extrude001rr, 'START') +const sketch008rr = startSketchOn(extrude001rr, face = 'START') |> startProfileAt([ -originStart[0]-serverDepth+1.7, originStart[2] + 0.15 + 0.62 @@ -1228,7 +1198,7 @@ const sketch008rr = startSketchOn(extrude001rr, 'START') const extrude008rr = extrude(sketch008rr, length = -thickness) // EIA-310-D standard hole pattern -const sketch009rr = startSketchOn(extrude001rr, 'START') +const sketch009rr = startSketchOn(extrude001rr, face = 'START') |> startProfileAt([ -originStart[0]-serverDepth+1.7, originStart[2] + 0.15 + 0.62 + 0.5 @@ -1246,7 +1216,7 @@ const sketch009rr = startSketchOn(extrude001rr, 'START') const extrude009rr = extrude(sketch009rr, length = -thickness) // define slots -const sketch010rr = startSketchOn(extrude001rr, 'START') +const sketch010rr = startSketchOn(extrude001rr, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0]+1.5-serverDepth, originStart[2] + .81 - (.438 / 2) @@ -1267,7 +1237,7 @@ const sketch010rr = startSketchOn(extrude001rr, 'START') const extrude010rr = extrude(sketch010rr, length = -thickness) // define slots -const sketch011rr = startSketchOn(extrude001rr, 'START') +const sketch011rr = startSketchOn(extrude001rr, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0]+1.5-serverDepth, originStart[2] + railHeight * 1.75 / 2 + .438 / 2 @@ -1284,7 +1254,7 @@ const sketch011rr = startSketchOn(extrude001rr, 'START') const extrude011rr = extrude(sketch011rr, length = -thickness) // define slots -const sketch012rr = startSketchOn(extrude001rr, 'START') +const sketch012rr = startSketchOn(extrude001rr, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0]+1.5-serverDepth, originStart[2] + railHeight * 1.75 - .81 + .438 / 2 @@ -1307,16 +1277,13 @@ const extrude012rr = extrude(sketch012rr, length = -thickness) // REAR LEFT VETCIAL RAIL // Define planes so the rail can be moved const planeXYrl = { - plane: { origin: [0, serverDepth, originStart[2]], xAxis: [1.0, 0.0, 0.0], yAxis: [0.0, 1.0, 0.0], zAxis: [0.0, 0.0, 1.0] - } } const planeXZrl = { - plane: { origin: [ originStart[1], originStart[0] + serverDepth - 2 - bendRad, @@ -1325,11 +1292,9 @@ const planeXZrl = { xAxis: [0, 1, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } const planeYZrl = { - plane: { origin: [ originStart[1], originStart[0] + serverDepth, @@ -1338,7 +1303,6 @@ const planeYZrl = { xAxis: [-1, 0, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } // Base flange const sketch001rl = startSketchOn(planeXZrl) @@ -1383,7 +1347,7 @@ const sketch003rl = startSketchOn(planeXYrl) const extrude003rl = extrude(sketch003rl, length = railHeight * 1.75) // EIA-310-D standard hole pattern -const sketch004rl = startSketchOn(extrude002rl, 'START') +const sketch004rl = startSketchOn(extrude002rl, face = 'START') |> startProfileAt([ -1.38 + 2 + thickness + originStart[1], originStart[2] + 0.15 @@ -1401,7 +1365,7 @@ const sketch004rl = startSketchOn(extrude002rl, 'START') const extrude004rl = extrude(sketch004rl, length = -thickness) // EIA-310-D standard hole pattern -const sketch005rl = startSketchOn(extrude002rl, 'START') +const sketch005rl = startSketchOn(extrude002rl, face = 'START') |> startProfileAt([ -1.38 + 2 + thickness + originStart[1], originStart[2] + 0.15 + .62 @@ -1419,7 +1383,7 @@ const sketch005rl = startSketchOn(extrude002rl, 'START') const extrude005rl = extrude(sketch005rl, length = -thickness) // EIA-310-D standard hole pattern -const sketch006rl = startSketchOn(extrude002rl, 'START') +const sketch006rl = startSketchOn(extrude002rl, face = 'START') |> startProfileAt([ -1.38 + 2 + thickness + originStart[1], originStart[2] + 0.15 + 0.62 + 0.50 @@ -1437,7 +1401,7 @@ const sketch006rl = startSketchOn(extrude002rl, 'START') const extrude006rl = extrude(sketch006rl, length = -thickness) // EIA-310-D standard hole pattern -const sketch007rl = startSketchOn(extrude001rl, 'START') +const sketch007rl = startSketchOn(extrude001rl, face = 'START') |> startProfileAt([ 1.75 - originStart[0] - serverDepth, originStart[2] + 0.15 @@ -1455,7 +1419,7 @@ const sketch007rl = startSketchOn(extrude001rl, 'START') const extrude007rl = extrude(sketch007rl, length = -thickness) // EIA-310-D standard hole pattern -const sketch008rl = startSketchOn(extrude001rl, 'START') +const sketch008rl = startSketchOn(extrude001rl, face = 'START') |> startProfileAt([ 1.75 - originStart[0] - serverDepth, originStart[2] + 0.15 + 0.62 @@ -1473,7 +1437,7 @@ const sketch008rl = startSketchOn(extrude001rl, 'START') const extrude008rl = extrude(sketch008rl, length = -thickness) // EIA-310-D standard hole pattern -const sketch009rl = startSketchOn(extrude001rl, 'START') +const sketch009rl = startSketchOn(extrude001rl, face = 'START') |> startProfileAt([ 1.75 - originStart[0] - serverDepth, originStart[2] + 0.15 + 0.62 + 0.5 @@ -1491,7 +1455,7 @@ const sketch009rl = startSketchOn(extrude001rl, 'START') const extrude009rl = extrude(sketch009rl, length = -thickness) // define slots -const sketch010rl = startSketchOn(extrude001rl, 'START') +const sketch010rl = startSketchOn(extrude001rl, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0] - serverDepth + 1.5, originStart[2] + .81 - (.438 / 2) @@ -1512,7 +1476,7 @@ const sketch010rl = startSketchOn(extrude001rl, 'START') const extrude010rl = extrude(sketch010rl, length = -thickness) // define slots -const sketch011rl = startSketchOn(extrude001rl, 'START') +const sketch011rl = startSketchOn(extrude001rl, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0] - serverDepth + 1.5, originStart[2] + railHeight * 1.75 / 2 + .438 / 2 @@ -1529,7 +1493,7 @@ const sketch011rl = startSketchOn(extrude001rl, 'START') const extrude011rl = extrude(sketch011rl, length = -thickness) // define slots -const sketch012rl = startSketchOn(extrude001rl, 'START') +const sketch012rl = startSketchOn(extrude001rl, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0] - serverDepth + 1.5, originStart[2] + railHeight * 1.75 - .81 + .438 / 2 @@ -1553,29 +1517,23 @@ const extrude012rl = extrude(sketch012rl, length = -thickness) // Define planes so the server can be moved fn streamServer = (serverPos) => { const planeXYs = { - plane: { origin: [0, 0 + 2, 4.114 + 1 + serverPos * 1.75], xAxis: [1.0, 0.0, 0.0], yAxis: [0.0, 1.0, 0.0], zAxis: [0.0, 0.0, 1.0] - } } const planeXZs = { - plane: { origin: [0 + 1.2 + .1, 0 + 2, 0], xAxis: [0, -1, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } const planeXZs2 = { - plane: { origin: [18 + 1.4, 0 + 2, 0], xAxis: [0, -1, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } const sketch001s = startSketchOn(planeXYs) diff --git a/rust/kcl-lib/e2e/executor/inputs/server-rack-lite.kcl b/rust/kcl-lib/e2e/executor/inputs/server-rack-lite.kcl index 52c9cd8fa..7513e5f30 100644 --- a/rust/kcl-lib/e2e/executor/inputs/server-rack-lite.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/server-rack-lite.kcl @@ -9,7 +9,6 @@ const width = 21.53 // simple caster model at each corner fn caster = (originStart) => { const plane001c = { - plane: { origin: [ -(3.543 - 2.756) / 2 + originStart[0], -(3.543 - 2.756) / 2 + originStart[1], @@ -18,7 +17,6 @@ fn caster = (originStart) => { x_axis: [1.0, 0.0, 0.0], y_axis: [0.0, 1.0, 0.0], z_axis: [0.0, 0.0, 1.0] - } } const sketch001c = startSketchOn(plane001c) @@ -46,7 +44,7 @@ fn caster = (originStart) => { ], radius= 8.8 / 2 / 25.4), %) |> extrude(length = -.25) - const sketch002c = startSketchOn(sketch001c, 'START') + const sketch002c = startSketchOn(sketch001c, face = 'START') |> startProfileAt([-originStart[0], 2.2 + originStart[1]], %) |> arc({ angle_start: 30, @@ -57,7 +55,6 @@ fn caster = (originStart) => { |> extrude(length = 3.1) const plane002c = { - plane: { origin: [ 0 + originStart[0], 0.8 + originStart[1], @@ -66,7 +63,6 @@ fn caster = (originStart) => { x_axis: [1, 0, 0], y_axis: [0, 0, 1], z_axis: [1, 0, 0] - } } const sketch003c = startSketchOn(plane002c) |> circle(center = [0, 1.2], radius = 2.48 / 2) @@ -94,7 +90,6 @@ caster([ // left wall const plane001 = { - plane: { origin: [ originStart[0] - 4, originStart[1] + 2, @@ -103,7 +98,6 @@ const plane001 = { x_axis: [0, 1, 0], y_axis: [0, 0, 1], z_axis: [1, 0, 0] - } } const sketch001l = startSketchOn(plane001) @@ -185,7 +179,6 @@ const extrude007l = extrude(sketch007l, length = 1) // right wall const plane002 = { - plane: { origin: [ originStart[0] - 4 + width - 1, originStart[1] - 1, @@ -194,7 +187,6 @@ const plane002 = { x_axis: [0, 1, 0], y_axis: [0, 0, 1], z_axis: [1, 0, 0] - } } const sketch001w = startSketchOn(plane002) @@ -486,12 +478,10 @@ const extrude025w = extrude(sketch025w, length = 1) // Base plane of rack const plane003 = { - plane: { origin: [0, 0, 4.114], x_axis: [1, 0, 0], y_axis: [0, 1, 0], z_axis: [0, 0, 1] - } } const sketch005 = startSketchOn(plane003) @@ -539,12 +529,10 @@ const extrude008 = extrude(sketch008, length = 1) // Top Plane const plane004 = { - plane: { origin: [0, 0, 4.114 + railHeight * 1.75 + 2], x_axis: [1, 0, 0], y_axis: [0, 1, 0], z_axis: [0, 0, 1] - } } const sketch005t = startSketchOn(plane004) @@ -592,16 +580,13 @@ const extrude009t = extrude(sketch009t, length = -1) // front left vertical rail // Define planes so the rail can be moved const planeXYfl = { - plane: { origin: [0, 0, originStart[2]], xAxis: [1.0, 0.0, 0.0], yAxis: [0.0, 1.0, 0.0], zAxis: [0.0, 0.0, 1.0] - } } const planeXZfl = { - plane: { origin: [ originStart[1], originStart[0], @@ -610,11 +595,9 @@ const planeXZfl = { xAxis: [0, 1, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } const planeYZfl = { - plane: { origin: [ originStart[1], originStart[0], @@ -623,7 +606,6 @@ const planeYZfl = { xAxis: [-1, 0, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } // Base flange @@ -670,7 +652,7 @@ const sketch003fl = startSketchOn(planeXYfl) const extrude003fl = extrude(sketch003fl, length = railHeight * 1.75) // define slots -const sketch010fl = startSketchOn(extrude001fl, 'START') +const sketch010fl = startSketchOn(extrude001fl, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0], originStart[2] + .81 - (.438 / 2) @@ -691,7 +673,7 @@ const sketch010fl = startSketchOn(extrude001fl, 'START') const extrude010fl = extrude(sketch010fl, length = -thickness) // define slots -const sketch011fl = startSketchOn(extrude001fl, 'START') +const sketch011fl = startSketchOn(extrude001fl, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0], originStart[2] + railHeight * 1.75 / 2 + .438 / 2 @@ -708,7 +690,7 @@ const sketch011fl = startSketchOn(extrude001fl, 'START') const extrude011fl = extrude(sketch011fl, length = -thickness) // define slots -const sketch012fl = startSketchOn(extrude001fl, 'START') +const sketch012fl = startSketchOn(extrude001fl, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0], originStart[2] + railHeight * 1.75 - .81 + .438 / 2 @@ -731,16 +713,13 @@ const extrude012fl = extrude(sketch012fl, length = -thickness) // FRONT RIGHT VERTICAL RAIL // Define planes so the rail can be moved const planeXYfr = { - plane: { origin: [0, 0, originStart[2]], xAxis: [1.0, 0.0, 0.0], yAxis: [0.0, 1.0, 0.0], zAxis: [0.0, 0.0, 1.0] - } } const planeXZfr = { - plane: { origin: [ originStart[1] + width - thickness - 2, originStart[0], @@ -749,11 +728,9 @@ const planeXZfr = { xAxis: [0, 1, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } const planeYZfr = { - plane: { origin: [ originStart[1] + width - 2, originStart[0], @@ -762,7 +739,6 @@ const planeYZfr = { xAxis: [-1, 0, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } // Base flange @@ -808,7 +784,7 @@ const sketch003fr = startSketchOn(planeXYfr) const extrude003fr = extrude(sketch003fr, length = railHeight * 1.75) // define slots -const sketch010fr = startSketchOn(extrude001fr, 'START') +const sketch010fr = startSketchOn(extrude001fr, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0], originStart[2] + .81 - (.438 / 2) @@ -829,7 +805,7 @@ const sketch010fr = startSketchOn(extrude001fr, 'START') const extrude010fr = extrude(sketch010fr, length = -thickness) // define slots -const sketch011fr = startSketchOn(extrude001fr, 'START') +const sketch011fr = startSketchOn(extrude001fr, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0], originStart[2] + railHeight * 1.75 / 2 + .438 / 2 @@ -846,7 +822,7 @@ const sketch011fr = startSketchOn(extrude001fr, 'START') const extrude011fr = extrude(sketch011fr, length = -thickness) // define slots -const sketch012fr = startSketchOn(extrude001fr, 'START') +const sketch012fr = startSketchOn(extrude001fr, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0], originStart[2] + railHeight * 1.75 - .81 + .438 / 2 @@ -869,16 +845,13 @@ const extrude012fr = extrude(sketch012fr, length = -thickness) // RIGHT REAR VERTICAL RAIL // Define planes so the rail can be moved const planeXYrr = { - plane: { origin: [0, serverDepth, originStart[2]], xAxis: [1.0, 0.0, 0.0], yAxis: [0.0, 1.0, 0.0], zAxis: [0.0, 0.0, 1.0] - } } const planeXZrr = { - plane: { origin: [ originStart[1] + width - thickness - 2, originStart[0] + serverDepth - 2 - bendRad, @@ -887,11 +860,9 @@ const planeXZrr = { xAxis: [0, 1, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } const planeYZrr = { - plane: { origin: [ originStart[1] + width - 2, originStart[0] + serverDepth, @@ -900,7 +871,6 @@ const planeYZrr = { xAxis: [-1, 0, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } // Base flange @@ -946,7 +916,7 @@ const sketch003rr = startSketchOn(planeXYrr) const extrude003rr = extrude(sketch003rr, length = railHeight * 1.75) // define slots -const sketch010rr = startSketchOn(extrude001rr, 'START') +const sketch010rr = startSketchOn(extrude001rr, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0] + 1.5 - serverDepth, originStart[2] + .81 - (.438 / 2) @@ -967,7 +937,7 @@ const sketch010rr = startSketchOn(extrude001rr, 'START') const extrude010rr = extrude(sketch010rr, length = -thickness) // define slots -const sketch011rr = startSketchOn(extrude001rr, 'START') +const sketch011rr = startSketchOn(extrude001rr, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0] + 1.5 - serverDepth, originStart[2] + railHeight * 1.75 / 2 + .438 / 2 @@ -984,7 +954,7 @@ const sketch011rr = startSketchOn(extrude001rr, 'START') const extrude011rr = extrude(sketch011rr, length = -thickness) // define slots -const sketch012rr = startSketchOn(extrude001rr, 'START') +const sketch012rr = startSketchOn(extrude001rr, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0] + 1.5 - serverDepth, originStart[2] + railHeight * 1.75 - .81 + .438 / 2 @@ -1007,16 +977,13 @@ const extrude012rr = extrude(sketch012rr, length = -thickness) // REAR LEFT VETCIAL RAIL // Define planes so the rail can be moved const planeXYrl = { - plane: { origin: [0, serverDepth, originStart[2]], xAxis: [1.0, 0.0, 0.0], yAxis: [0.0, 1.0, 0.0], zAxis: [0.0, 0.0, 1.0] - } } const planeXZrl = { - plane: { origin: [ originStart[1], originStart[0] + serverDepth - 2 - bendRad, @@ -1025,11 +992,9 @@ const planeXZrl = { xAxis: [0, 1, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } const planeYZrl = { - plane: { origin: [ originStart[1], originStart[0] + serverDepth, @@ -1038,7 +1003,6 @@ const planeYZrl = { xAxis: [-1, 0, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } // Base flange const sketch001rl = startSketchOn(planeXZrl) @@ -1083,7 +1047,7 @@ const sketch003rl = startSketchOn(planeXYrl) const extrude003rl = extrude(sketch003rl, length = railHeight * 1.75) // define slots -const sketch010rl = startSketchOn(extrude001rl, 'START') +const sketch010rl = startSketchOn(extrude001rl, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0] - serverDepth + 1.5, originStart[2] + .81 - (.438 / 2) @@ -1104,7 +1068,7 @@ const sketch010rl = startSketchOn(extrude001rl, 'START') const extrude010rl = extrude(sketch010rl, length = -thickness) // define slots -const sketch011rl = startSketchOn(extrude001rl, 'START') +const sketch011rl = startSketchOn(extrude001rl, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0] - serverDepth + 1.5, originStart[2] + railHeight * 1.75 / 2 + .438 / 2 @@ -1121,7 +1085,7 @@ const sketch011rl = startSketchOn(extrude001rl, 'START') const extrude011rl = extrude(sketch011rl, length = -thickness) // define slots -const sketch012rl = startSketchOn(extrude001rl, 'START') +const sketch012rl = startSketchOn(extrude001rl, face = 'START') |> startProfileAt([ -1.12 + (.75 - .438) / 2 - originStart[0] - serverDepth + 1.5, originStart[2] + railHeight * 1.75 - .81 + .438 / 2 @@ -1144,29 +1108,23 @@ const extrude012rl = extrude(sketch012rl, length = -thickness) // Define planes so the server can be moved fn streamServer = (serverPos) => { const planeXYs = { - plane: { origin: [0, 0 + 2, 4.114 + 1 + serverPos * 1.75], xAxis: [1.0, 0.0, 0.0], yAxis: [0.0, 1.0, 0.0], zAxis: [0.0, 0.0, 1.0] - } } const planeXZs = { - plane: { origin: [0 + 1.2 + .1, 0 + 2, 0], xAxis: [0, -1, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } const planeXZs2 = { - plane: { origin: [18 + 1.4, 0 + 2, 0], xAxis: [0, -1, 0], yAxis: [0, 0, 1], zAxis: [1, 0, 0] - } } const sketch001s = startSketchOn(planeXYs) diff --git a/rust/kcl-lib/e2e/executor/inputs/sketch-on-chamfer-two-times-different-order.kcl b/rust/kcl-lib/e2e/executor/inputs/sketch-on-chamfer-two-times-different-order.kcl index b8b26cb17..bf353a9fc 100644 --- a/rust/kcl-lib/e2e/executor/inputs/sketch-on-chamfer-two-times-different-order.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/sketch-on-chamfer-two-times-different-order.kcl @@ -14,14 +14,14 @@ const extrude001 = extrude(sketch001, length = 100) ) |> chamfer(length = 50, tags = [seg02], tag = $seg04) -const sketch003 = startSketchOn(extrude001, seg04) +const sketch003 = startSketchOn(extrude001, face = seg04) |> startProfileAt([-69.1, 277.34], %) |> angledLine(angle = 0, length = 41.48, tag = $rectangleSegmentA003) |> angledLine(angle = segAng(rectangleSegmentA003) - 90, length = 104.8, tag = $rectangleSegmentB002) |> angledLine(angle = segAng(rectangleSegmentA003), length = -segLen(rectangleSegmentA003), tag = $rectangleSegmentC002) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() -const sketch002 = startSketchOn(extrude001, seg03) +const sketch002 = startSketchOn(extrude001, face = seg03) |> startProfileAt([159.25, 278.35], %) |> angledLine(angle = 0, length = 40.82, tag = $rectangleSegmentA002) |> angledLine(angle = segAng(rectangleSegmentA002) - 90, length = 132.27, tag = $rectangleSegmentB001) diff --git a/rust/kcl-lib/e2e/executor/inputs/sketch-on-chamfer-two-times.kcl b/rust/kcl-lib/e2e/executor/inputs/sketch-on-chamfer-two-times.kcl index b4c75870a..d9f031e1e 100644 --- a/rust/kcl-lib/e2e/executor/inputs/sketch-on-chamfer-two-times.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/sketch-on-chamfer-two-times.kcl @@ -14,14 +14,14 @@ const extrude001 = extrude(sketch001, length = 100) tag = $seg03 ) -const sketch003 = startSketchOn(extrude001, seg04) +const sketch003 = startSketchOn(extrude001, face = seg04) |> startProfileAt([-69.1, 277.34], %) |> angledLine(angle = 0, length = 41.48, tag = $rectangleSegmentA003) |> angledLine(angle = segAng(rectangleSegmentA003) - 90, length = 104.8, tag = $rectangleSegmentB002) |> angledLine(angle = segAng(rectangleSegmentA003), length = -segLen(rectangleSegmentA003), tag = $rectangleSegmentC002) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() -const sketch002 = startSketchOn(extrude001, seg03) +const sketch002 = startSketchOn(extrude001, face = seg03) |> startProfileAt([159.25, 278.35], %) |> angledLine(angle = 0, length = 40.82, tag = $rectangleSegmentA002) |> angledLine(angle = segAng(rectangleSegmentA002) - 90, length = 132.27, tag = $rectangleSegmentB001) diff --git a/rust/kcl-lib/e2e/executor/inputs/sketch_on_face.kcl b/rust/kcl-lib/e2e/executor/inputs/sketch_on_face.kcl index 4e0d6f78d..7035d701d 100644 --- a/rust/kcl-lib/e2e/executor/inputs/sketch_on_face.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/sketch_on_face.kcl @@ -6,7 +6,7 @@ part001 = startSketchOn(XY) |> close() |> extrude(length = 5) -part002 = startSketchOn(part001, here) +part002 = startSketchOn(part001, face = here) |> startProfileAt([0, 0], %) |> line(end = [0, 10]) |> line(end = [10, 0]) diff --git a/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_after_fillets_referencing_face.kcl b/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_after_fillets_referencing_face.kcl index 1c3562268..cf6ced88d 100644 --- a/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_after_fillets_referencing_face.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_after_fillets_referencing_face.kcl @@ -45,7 +45,7 @@ bracket = startSketchOn(XY) ] ) -sketch001 = startSketchOn(bracket, seg01) +sketch001 = startSketchOn(bracket, face = seg01) |> startProfileAt([4.28, 3.83], %) |> line(end = [2.17, -0.03]) |> line(end = [-0.07, -1.8]) diff --git a/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_circle_tagged.kcl b/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_circle_tagged.kcl index 0d1e62d40..bb84507cf 100644 --- a/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_circle_tagged.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_circle_tagged.kcl @@ -11,6 +11,6 @@ const part001 = cube([0,0], 20) |> close() |> extrude(length = 20) -const part002 = startSketchOn(part001, "end") +const part002 = startSketchOn(part001, face = "end") |> circle(center: [0, 0], radius: 5, tag =$myCircle) |> extrude(length = 5) diff --git a/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_end.kcl b/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_end.kcl index 6f97f426b..f5735b996 100644 --- a/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_end.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_end.kcl @@ -11,7 +11,7 @@ const part001 = cube([0,0], 20) |> close() |> extrude(length = 20) -const part002 = startSketchOn(part001, "END") +const part002 = startSketchOn(part001, face = "END") |> startProfileAt([0, 0], %) |> line(end = [0, 10]) |> line(end = [10, 0]) diff --git a/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_end_negative_extrude.kcl b/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_end_negative_extrude.kcl index b479b80d1..9c2a210da 100644 --- a/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_end_negative_extrude.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_end_negative_extrude.kcl @@ -11,7 +11,7 @@ const part001 = cube([0,0], 20) |> close() |> extrude(length = 20) -const part002 = startSketchOn(part001, "END") +const part002 = startSketchOn(part001, face = "END") |> startProfileAt([0, 0], %) |> line(end = [0, 10]) |> line(end = [10, 0]) diff --git a/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_start.kcl b/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_start.kcl index f71df502e..915ab44fa 100644 --- a/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_start.kcl +++ b/rust/kcl-lib/e2e/executor/inputs/sketch_on_face_start.kcl @@ -11,7 +11,7 @@ const part001 = cube([0,0], 20) |> close() |> extrude(length = 20) -const part002 = startSketchOn(part001, "start") +const part002 = startSketchOn(part001, face = "start") |> startProfileAt([0, 0], %) |> line(end = [0, 10]) |> line(end = [10, 0]) diff --git a/rust/kcl-lib/e2e/executor/inputs/slow_lego.kcl.tmpl b/rust/kcl-lib/e2e/executor/inputs/slow_lego.kcl.tmpl index 41f5f22ee..b9ffb2e31 100644 --- a/rust/kcl-lib/e2e/executor/inputs/slow_lego.kcl.tmpl +++ b/rust/kcl-lib/e2e/executor/inputs/slow_lego.kcl.tmpl @@ -13,21 +13,17 @@ const totalLength = lbumps * pitch - (2.0 * clearance) const totalWidth = wbumps * pitch - (2.0 * clearance) // Create the plane for the pegs. This is a hack so that the pegs can be patterned along the face of the lego base. const pegFace = { - plane: { - origin: { x: 0, y: 0, z: height }, - xAxis: { x: 1, y: 0, z: 0 }, - yAxis: { x: 0, y: 1, z: 0 }, - zAxis: { x: 0, y: 0, z: 1 } - } + origin: { x: 0, y: 0, z: height }, + xAxis: { x: 1, y: 0, z: 0 }, + yAxis: { x: 0, y: 1, z: 0 }, + zAxis: { x: 0, y: 0, z: 1 } } // Create the plane for the tubes underneath the lego. This is a hack so that the tubes can be patterned underneath the lego. const tubeFace = { - plane: { - origin: { x: 0, y: 0, z: height - t }, - xAxis: { x: 1, y: 0, z: 0 }, - yAxis: { x: 0, y: 1, z: 0 }, - zAxis: { x: 0, y: 0, z: 1 } - } + origin: { x: 0, y: 0, z: height - t }, + xAxis: { x: 1, y: 0, z: 0 }, + yAxis: { x: 0, y: 1, z: 0 }, + zAxis: { x: 0, y: 0, z: 1 } } // Make the base const s = startSketchOn('XY') diff --git a/rust/kcl-lib/e2e/executor/main.rs b/rust/kcl-lib/e2e/executor/main.rs index e809c277b..feb6136b3 100644 --- a/rust/kcl-lib/e2e/executor/main.rs +++ b/rust/kcl-lib/e2e/executor/main.rs @@ -715,7 +715,7 @@ part001 = cube([0, 0], 20) |> close() |> extrude(length = 20) -part002 = startSketchOn(part001, part001.sketch.tags.here) +part002 = startSketchOn(part001, face = part001.sketch.tags.here) |> startProfileAt([0, 0], %) |> line(end = [5, 0]) |> line(end = [5, 5]) @@ -751,7 +751,7 @@ part001 = cube([0,0], 20) |> close() |> extrude(length = 20) -part002 = startSketchOn(part001, "end") +part002 = startSketchOn(part001, face = "end") |> startProfileAt([0, 0], %) |> line(end = [0, 10]) |> line(end = [10, 0]) @@ -759,7 +759,7 @@ part002 = startSketchOn(part001, "end") |> close() |> extrude(length = 5) -part003 = startSketchOn(part002, "end") +part003 = startSketchOn(part002, face = "end") |> startProfileAt([0, 0], %) |> line(end = [0, 5]) |> line(end = [5, 0]) @@ -811,7 +811,7 @@ part001 = cube([0,0], 20) |> close() |> extrude(length = 20) -part002 = startSketchOn(part001, "end") +part002 = startSketchOn(part001, face = "end") |> circle(center = [0, 0], radius= 5) |> extrude(length = 5) "#; @@ -865,7 +865,7 @@ part = rectShape([0, 0], 20, 20) }; assert_eq!( err.error.message(), - "The input argument of `std::sketch::circle` requires a value with type `Sketch | Plane | Face`, but found string (text)" + "This function expected the input argument to be of type SketchOrSurface but it's actually of type string (text)" ); } @@ -1031,7 +1031,7 @@ async fn kcl_test_revolve_on_edge() { |> close() |> extrude(length = 10) -sketch001 = startSketchOn(box, "end") +sketch001 = startSketchOn(box, face = "end") |> startProfileAt([5, 10], %) |> line(end = [0, -10]) |> line(end = [2, 0]) @@ -1055,7 +1055,7 @@ async fn kcl_test_revolve_on_edge_get_edge() { |> close() |> extrude(length = 10) -sketch001 = startSketchOn(box, revolveAxis) +sketch001 = startSketchOn(box, face = revolveAxis) |> startProfileAt([5, 10], %) |> line(end = [0, -10]) |> line(end = [2, 0]) @@ -1085,7 +1085,7 @@ async fn kcl_test_revolve_on_face_circle_edge() { |> close() |> extrude(length = 20) -sketch001 = startSketchOn(box, "END") +sketch001 = startSketchOn(box, face = "END") |> circle(center = [10,10], radius= 4) |> revolve( angle = 90, @@ -1107,7 +1107,7 @@ async fn kcl_test_revolve_on_face_circle() { |> close() |> extrude(length = 20) -sketch001 = startSketchOn(box, "END") +sketch001 = startSketchOn(box, face = "END") |> circle(center = [10,10], radius= 4 ) |> revolve( angle = -90, @@ -1129,7 +1129,7 @@ async fn kcl_test_revolve_on_face() { |> close(tag = $revolveAxis) |> extrude(length = 10) -sketch001 = startSketchOn(box, "end") +sketch001 = startSketchOn(box, face = "end") |> startProfileAt([5, 10], %) |> line(end = [0, -10]) |> line(end = [2, 0]) @@ -1173,7 +1173,7 @@ async fn kcl_test_simple_revolve_sketch_on_edge() { |> close() |> revolve(axis = Y, angle = 180) -part002 = startSketchOn(part001, 'end') +part002 = startSketchOn(part001, face = 'end') |> startProfileAt([4.5, -5], %) |> line(end = [0, 5]) |> line(end = [5, 0]) @@ -1189,7 +1189,7 @@ part002 = startSketchOn(part001, 'end') #[tokio::test(flavor = "multi_thread")] async fn kcl_test_plumbus_fillets() { let code = r#"fn make_circle = (ext, face, pos, radius) => { - sg = startSketchOn(ext, face) + sg = startSketchOn(ext, face = face) |> startProfileAt([pos[0] + radius, pos[1]], %) |> arc({ angleEnd = 360, @@ -1264,20 +1264,18 @@ async fn kcl_test_empty_file_is_ok() { async fn kcl_test_member_expression_in_params() { let code = r#"fn capScrew = (originStart, length, dia, capDia, capHeadLength) => { screwHead = startSketchOn({ - plane: { - origin: { - x: originStart[0], - y: originStart[1], - z: originStart[2], - }, - xAxis: { x: 0, y: 0, z: -1 }, - yAxis: { x: 1, y: 0, z: 0 }, - zAxis: { x: 0, y: 1, z: 0 } - } + origin: { + x: originStart[0], + y: originStart[1], + z: originStart[2], + }, + xAxis: { x: 0, y: 0, z: -1 }, + yAxis: { x: 1, y: 0, z: 0 }, + zAxis: { x: 0, y: 1, z: 0 } }) |> circle(center = [0, 0], radius= capDia / 2) |> extrude(length = capHeadLength) - screw = startSketchOn(screwHead, "start") + screw = startSketchOn(screwHead, face = "start") |> circle(center = [0, 0], radius= dia / 2) |> extrude(length = length) return screw @@ -1346,7 +1344,7 @@ async fn kcl_test_error_empty_start_sketch_on_string() { |> close() |> extrude(length = 100) -secondSketch = startSketchOn(part001, '') +secondSketch = startSketchOn(part001, face = '') |> circle(center = [-20, 50], radius= 40) |> extrude(length = 20) "#; @@ -1355,7 +1353,7 @@ secondSketch = startSketchOn(part001, '') assert!(result.is_err()); assert_eq!( result.err().unwrap().to_string(), - r#"semantic: KclErrorDetails { source_ranges: [SourceRange([297, 299, 0])], message: "Argument at index 1 was supposed to be type Option but found string (text)" }"# + r#"type: KclErrorDetails { source_ranges: [SourceRange([274, 307, 0])], message: "The arg face was given, but it was the wrong type. It should be type FaceTag but it was string (text)" }"# ); } @@ -1991,7 +1989,7 @@ someFunction('INVALID') assert!(result.is_err()); assert_eq!( result.err().unwrap().to_string(), - r#"semantic: KclErrorDetails { source_ranges: [SourceRange([51, 60, 0]), SourceRange([65, 88, 0])], message: "Argument at index 0 was supposed to be type SketchData but found string (text)" }"# + r#"semantic: KclErrorDetails { source_ranges: [SourceRange([51, 60, 0]), SourceRange([65, 88, 0])], message: "This function expected the input argument to be Solid or Plane but it's actually of type string (text)" }"# ); } @@ -2012,7 +2010,7 @@ someFunction('INVALID') assert!(result.is_err()); assert_eq!( result.err().unwrap().to_string(), - r#"semantic: KclErrorDetails { source_ranges: [SourceRange([103, 113, 0]), SourceRange([126, 155, 0]), SourceRange([159, 182, 0])], message: "Argument at index 0 was supposed to be type SketchData but found string (text)" }"# + r#"semantic: KclErrorDetails { source_ranges: [SourceRange([103, 113, 0]), SourceRange([126, 155, 0]), SourceRange([159, 182, 0])], message: "This function expected the input argument to be Solid or Plane but it's actually of type string (text)" }"# ); } diff --git a/rust/kcl-lib/src/engine/mod.rs b/rust/kcl-lib/src/engine/mod.rs index d78d3c20c..189634b7e 100644 --- a/rust/kcl-lib/src/engine/mod.rs +++ b/rust/kcl-lib/src/engine/mod.rs @@ -37,7 +37,7 @@ use uuid::Uuid; use crate::{ errors::{KclError, KclErrorDetails}, - execution::{ArtifactCommand, DefaultPlanes, IdGenerator, Point3d}, + execution::{types::UnitLen, ArtifactCommand, DefaultPlanes, IdGenerator, Point3d}, SourceRange, }; @@ -517,7 +517,13 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static { ) -> Result { // Create new default planes. let default_size = 100.0; - let default_origin = Point3d { x: 0.0, y: 0.0, z: 0.0 }.into(); + let default_origin = Point3d { + x: 0.0, + y: 0.0, + z: 0.0, + units: UnitLen::Mm, + } + .into(); self.batch_modeling_cmd( plane_id, @@ -555,8 +561,18 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static { ( PlaneName::Xy, id_generator.next_uuid(), - Point3d { x: 1.0, y: 0.0, z: 0.0 }, - Point3d { x: 0.0, y: 1.0, z: 0.0 }, + Point3d { + x: 1.0, + y: 0.0, + z: 0.0, + units: UnitLen::Mm, + }, + Point3d { + x: 0.0, + y: 1.0, + z: 0.0, + units: UnitLen::Mm, + }, Some(Color { r: 0.7, g: 0.28, @@ -567,8 +583,18 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static { ( PlaneName::Yz, id_generator.next_uuid(), - Point3d { x: 0.0, y: 1.0, z: 0.0 }, - Point3d { x: 0.0, y: 0.0, z: 1.0 }, + Point3d { + x: 0.0, + y: 1.0, + z: 0., + units: UnitLen::Mm, + }, + Point3d { + x: 0.0, + y: 0.0, + z: 1.0, + units: UnitLen::Mm, + }, Some(Color { r: 0.28, g: 0.7, @@ -579,8 +605,18 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static { ( PlaneName::Xz, id_generator.next_uuid(), - Point3d { x: 1.0, y: 0.0, z: 0.0 }, - Point3d { x: 0.0, y: 0.0, z: 1.0 }, + Point3d { + x: 1.0, + y: 0.0, + z: 0.0, + units: UnitLen::Mm, + }, + Point3d { + x: 0.0, + y: 0.0, + z: 1.0, + units: UnitLen::Mm, + }, Some(Color { r: 0.28, g: 0.28, @@ -595,8 +631,14 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static { x: -1.0, y: 0.0, z: 0.0, + units: UnitLen::Mm, + }, + Point3d { + x: 0.0, + y: 1.0, + z: 0.0, + units: UnitLen::Mm, }, - Point3d { x: 0.0, y: 1.0, z: 0.0 }, None, ), ( @@ -606,8 +648,14 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static { x: 0.0, y: -1.0, z: 0.0, + units: UnitLen::Mm, + }, + Point3d { + x: 0.0, + y: 0.0, + z: 1.0, + units: UnitLen::Mm, }, - Point3d { x: 0.0, y: 0.0, z: 1.0 }, None, ), ( @@ -617,8 +665,14 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static { x: -1.0, y: 0.0, z: 0.0, + units: UnitLen::Mm, + }, + Point3d { + x: 0.0, + y: 0.0, + z: 1.0, + units: UnitLen::Mm, }, - Point3d { x: 0.0, y: 0.0, z: 1.0 }, None, ), ]; diff --git a/rust/kcl-lib/src/execution/exec_ast.rs b/rust/kcl-lib/src/execution/exec_ast.rs index d11cc6210..1a1e43ef5 100644 --- a/rust/kcl-lib/src/execution/exec_ast.rs +++ b/rust/kcl-lib/src/execution/exec_ast.rs @@ -725,12 +725,7 @@ fn apply_ascription( let ty = RuntimeType::from_parsed(ty.inner.clone(), exec_state, value.into()) .map_err(|e| KclError::Semantic(e.into()))?; - if let KclValue::Number { - ty: NumericType::Unknown, - value, - meta, - } = value - { + if let KclValue::Number { value, meta, .. } = value { // If the number has unknown units but the user is explicitly specifying them, treat the value as having had it's units erased, // rather than forcing the user to explicitly erase them. KclValue::Number { diff --git a/rust/kcl-lib/src/execution/geometry.rs b/rust/kcl-lib/src/execution/geometry.rs index d90b771d7..c586dfd88 100644 --- a/rust/kcl-lib/src/execution/geometry.rs +++ b/rust/kcl-lib/src/execution/geometry.rs @@ -184,62 +184,191 @@ pub struct Plane { impl Plane { pub(crate) fn into_plane_data(self) -> PlaneData { - if self.origin == Point3d::new(0.0, 0.0, 0.0) { + if self.origin.is_zero() { match self { Self { - origin: Point3d { x: 0.0, y: 0.0, z: 0.0 }, - x_axis: Point3d { x: 1.0, y: 0.0, z: 0.0 }, - y_axis: Point3d { x: 0.0, y: 1.0, z: 0.0 }, - z_axis: Point3d { x: 0.0, y: 0.0, z: 1.0 }, + origin: + Point3d { + x: 0.0, + y: 0.0, + z: 0.0, + units: UnitLen::Mm, + }, + x_axis: + Point3d { + x: 1.0, + y: 0.0, + z: 0.0, + units: UnitLen::Mm, + }, + y_axis: + Point3d { + x: 0.0, + y: 1.0, + z: 0.0, + units: UnitLen::Mm, + }, + z_axis: + Point3d { + x: 0.0, + y: 0.0, + z: 1.0, + units: UnitLen::Mm, + }, .. } => return PlaneData::XY, Self { - origin: Point3d { x: 0.0, y: 0.0, z: 0.0 }, - x_axis: Point3d { x: 1.0, y: 0.0, z: 0.0 }, - y_axis: Point3d { x: 0.0, y: 1.0, z: 0.0 }, + origin: + Point3d { + x: 0.0, + y: 0.0, + z: 0.0, + units: UnitLen::Mm, + }, + x_axis: + Point3d { + x: 1.0, + y: 0.0, + z: 0.0, + units: UnitLen::Mm, + }, + y_axis: + Point3d { + x: 0.0, + y: 1.0, + z: 0.0, + units: UnitLen::Mm, + }, z_axis: Point3d { x: 0.0, y: 0.0, z: -1.0, + units: UnitLen::Mm, }, .. } => return PlaneData::NegXY, Self { - origin: Point3d { x: 0.0, y: 0.0, z: 0.0 }, - x_axis: Point3d { x: 1.0, y: 0.0, z: 0.0 }, - y_axis: Point3d { x: 0.0, y: 0.0, z: 1.0 }, + origin: + Point3d { + x: 0.0, + y: 0.0, + z: 0.0, + units: UnitLen::Mm, + }, + x_axis: + Point3d { + x: 1.0, + y: 0.0, + z: 0.0, + units: UnitLen::Mm, + }, + y_axis: + Point3d { + x: 0.0, + y: 0.0, + z: 1.0, + units: UnitLen::Mm, + }, z_axis: Point3d { x: 0.0, y: -1.0, z: 0.0, + units: UnitLen::Mm, }, .. } => return PlaneData::XZ, Self { - origin: Point3d { x: 0.0, y: 0.0, z: 0.0 }, - x_axis: Point3d { x: 1.0, y: 0.0, z: 0.0 }, - y_axis: Point3d { x: 0.0, y: 0.0, z: 1.0 }, - z_axis: Point3d { x: 0.0, y: 1.0, z: 0.0 }, + origin: + Point3d { + x: 0.0, + y: 0.0, + z: 0.0, + units: UnitLen::Mm, + }, + x_axis: + Point3d { + x: 1.0, + y: 0.0, + z: 0.0, + units: UnitLen::Mm, + }, + y_axis: + Point3d { + x: 0.0, + y: 0.0, + z: 1.0, + units: UnitLen::Mm, + }, + z_axis: + Point3d { + x: 0.0, + y: 1.0, + z: 0.0, + units: UnitLen::Mm, + }, .. } => return PlaneData::NegXZ, Self { - origin: Point3d { x: 0.0, y: 0.0, z: 0.0 }, - x_axis: Point3d { x: 0.0, y: 1.0, z: 0.0 }, - y_axis: Point3d { x: 0.0, y: 0.0, z: 1.0 }, - z_axis: Point3d { x: 1.0, y: 0.0, z: 0.0 }, + origin: + Point3d { + x: 0.0, + y: 0.0, + z: 0.0, + units: UnitLen::Mm, + }, + x_axis: + Point3d { + x: 0.0, + y: 1.0, + z: 0.0, + units: UnitLen::Mm, + }, + y_axis: + Point3d { + x: 0.0, + y: 0.0, + z: 1.0, + units: UnitLen::Mm, + }, + z_axis: + Point3d { + x: 1.0, + y: 0.0, + z: 0.0, + units: UnitLen::Mm, + }, .. } => return PlaneData::YZ, Self { - origin: Point3d { x: 0.0, y: 0.0, z: 0.0 }, - x_axis: Point3d { x: 0.0, y: 1.0, z: 0.0 }, - y_axis: Point3d { x: 0.0, y: 0.0, z: 1.0 }, + origin: + Point3d { + x: 0.0, + y: 0.0, + z: 0.0, + units: UnitLen::Mm, + }, + x_axis: + Point3d { + x: 0.0, + y: 1.0, + z: 0.0, + units: UnitLen::Mm, + }, + y_axis: + Point3d { + x: 0.0, + y: 0.0, + z: 1.0, + units: UnitLen::Mm, + }, z_axis: Point3d { x: -1.0, y: 0.0, z: 0.0, + units: UnitLen::Mm, }, .. } => return PlaneData::NegYZ, @@ -261,10 +390,10 @@ impl Plane { PlaneData::XY => Plane { id, artifact_id: id.into(), - origin: Point3d::new(0.0, 0.0, 0.0), - x_axis: Point3d::new(1.0, 0.0, 0.0), - y_axis: Point3d::new(0.0, 1.0, 0.0), - z_axis: Point3d::new(0.0, 0.0, 1.0), + origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm), + x_axis: Point3d::new(1.0, 0.0, 0.0, UnitLen::Mm), + y_axis: Point3d::new(0.0, 1.0, 0.0, UnitLen::Mm), + z_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Mm), value: PlaneType::XY, units: exec_state.length_unit(), meta: vec![], @@ -272,10 +401,10 @@ impl Plane { PlaneData::NegXY => Plane { id, artifact_id: id.into(), - origin: Point3d::new(0.0, 0.0, 0.0), - x_axis: Point3d::new(1.0, 0.0, 0.0), - y_axis: Point3d::new(0.0, 1.0, 0.0), - z_axis: Point3d::new(0.0, 0.0, -1.0), + origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm), + x_axis: Point3d::new(1.0, 0.0, 0.0, UnitLen::Mm), + y_axis: Point3d::new(0.0, 1.0, 0.0, UnitLen::Mm), + z_axis: Point3d::new(0.0, 0.0, -1.0, UnitLen::Mm), value: PlaneType::XY, units: exec_state.length_unit(), meta: vec![], @@ -283,10 +412,10 @@ impl Plane { PlaneData::XZ => Plane { id, artifact_id: id.into(), - origin: Point3d::new(0.0, 0.0, 0.0), - x_axis: Point3d::new(1.0, 0.0, 0.0), - y_axis: Point3d::new(0.0, 0.0, 1.0), - z_axis: Point3d::new(0.0, -1.0, 0.0), + origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm), + x_axis: Point3d::new(1.0, 0.0, 0.0, UnitLen::Mm), + y_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Mm), + z_axis: Point3d::new(0.0, -1.0, 0.0, UnitLen::Mm), value: PlaneType::XZ, units: exec_state.length_unit(), meta: vec![], @@ -294,10 +423,10 @@ impl Plane { PlaneData::NegXZ => Plane { id, artifact_id: id.into(), - origin: Point3d::new(0.0, 0.0, 0.0), - x_axis: Point3d::new(-1.0, 0.0, 0.0), - y_axis: Point3d::new(0.0, 0.0, 1.0), - z_axis: Point3d::new(0.0, 1.0, 0.0), + origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm), + x_axis: Point3d::new(-1.0, 0.0, 0.0, UnitLen::Mm), + y_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Mm), + z_axis: Point3d::new(0.0, 1.0, 0.0, UnitLen::Mm), value: PlaneType::XZ, units: exec_state.length_unit(), meta: vec![], @@ -305,10 +434,10 @@ impl Plane { PlaneData::YZ => Plane { id, artifact_id: id.into(), - origin: Point3d::new(0.0, 0.0, 0.0), - x_axis: Point3d::new(0.0, 1.0, 0.0), - y_axis: Point3d::new(0.0, 0.0, 1.0), - z_axis: Point3d::new(1.0, 0.0, 0.0), + origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm), + x_axis: Point3d::new(0.0, 1.0, 0.0, UnitLen::Mm), + y_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Mm), + z_axis: Point3d::new(1.0, 0.0, 0.0, UnitLen::Mm), value: PlaneType::YZ, units: exec_state.length_unit(), meta: vec![], @@ -316,10 +445,10 @@ impl Plane { PlaneData::NegYZ => Plane { id, artifact_id: id.into(), - origin: Point3d::new(0.0, 0.0, 0.0), - x_axis: Point3d::new(0.0, 1.0, 0.0), - y_axis: Point3d::new(0.0, 0.0, 1.0), - z_axis: Point3d::new(-1.0, 0.0, 0.0), + origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm), + x_axis: Point3d::new(0.0, 1.0, 0.0, UnitLen::Mm), + y_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Mm), + z_axis: Point3d::new(-1.0, 0.0, 0.0, UnitLen::Mm), value: PlaneType::YZ, units: exec_state.length_unit(), meta: vec![], @@ -512,7 +641,7 @@ pub(crate) enum GetTangentialInfoFromPathsResult { } impl GetTangentialInfoFromPathsResult { - pub(crate) fn tan_previous_point(&self, last_arc_end: crate::std::utils::Coords2d) -> [f64; 2] { + pub(crate) fn tan_previous_point(&self, last_arc_end: [f64; 2]) -> [f64; 2] { match self { GetTangentialInfoFromPathsResult::PreviousPoint(p) => *p, GetTangentialInfoFromPathsResult::Arc { center, ccw, .. } => { @@ -567,11 +696,10 @@ impl Sketch { /// where the last path segment ends, and the next path segment will begin. pub(crate) fn current_pen_position(&self) -> Result { let Some(path) = self.latest_path() else { - return Ok(self.start.to.into()); + return Ok(Point2d::new(self.start.to[0], self.start.to[1], self.start.units)); }; - let base = path.get_base(); - Ok(base.to.into()) + Ok(path.get_to().into()) } pub(crate) fn get_tangential_info_from_paths(&self) -> GetTangentialInfoFromPathsResult { @@ -624,7 +752,7 @@ pub enum EdgeCut { Fillet { /// The id of the engine command that called this fillet. id: uuid::Uuid, - radius: f64, + radius: TyF64, /// The engine id of the edge to fillet. #[serde(rename = "edgeId")] edge_id: uuid::Uuid, @@ -634,7 +762,7 @@ pub enum EdgeCut { Chamfer { /// The id of the engine command that called this chamfer. id: uuid::Uuid, - length: f64, + length: TyF64, /// The engine id of the edge to chamfer. #[serde(rename = "edgeId")] edge_id: uuid::Uuid, @@ -670,23 +798,16 @@ impl EdgeCut { pub struct Point2d { pub x: f64, pub y: f64, -} - -impl From<[f64; 2]> for Point2d { - fn from(p: [f64; 2]) -> Self { - Self { x: p[0], y: p[1] } - } + pub units: UnitLen, } impl From<[TyF64; 2]> for Point2d { fn from(p: [TyF64; 2]) -> Self { - Self { x: p[0].n, y: p[1].n } - } -} - -impl From<&[f64; 2]> for Point2d { - fn from(p: &[f64; 2]) -> Self { - Self { x: p[0], y: p[1] } + Self { + x: p[0].n, + y: p[1].n, + units: p[0].ty.expect_length(), + } } } @@ -703,12 +824,14 @@ impl From for Point2D { } impl Point2d { - pub const ZERO: Self = Self { x: 0.0, y: 0.0 }; - pub fn scale(self, scalar: f64) -> Self { - Self { - x: self.x * scalar, - y: self.y * scalar, - } + pub const ZERO: Self = Self { + x: 0.0, + y: 0.0, + units: UnitLen::Mm, + }; + + pub fn new(x: f64, y: f64, units: UnitLen) -> Self { + Self { x, y, units } } } @@ -718,12 +841,34 @@ pub struct Point3d { pub x: f64, pub y: f64, pub z: f64, + pub units: UnitLen, } impl Point3d { - pub const ZERO: Self = Self { x: 0.0, y: 0.0, z: 0.0 }; - pub fn new(x: f64, y: f64, z: f64) -> Self { - Self { x, y, z } + pub const ZERO: Self = Self { + x: 0.0, + y: 0.0, + z: 0.0, + units: UnitLen::Mm, + }; + + pub fn new(x: f64, y: f64, z: f64, units: UnitLen) -> Self { + Self { x, y, z, units } + } + + pub const fn is_zero(&self) -> bool { + self.x == 0.0 && self.y == 0.0 && self.z == 0.0 + } +} + +impl From<[TyF64; 3]> for Point3d { + fn from(p: [TyF64; 3]) -> Self { + Self { + x: p[0].n, + y: p[1].n, + z: p[2].n, + units: p[0].ty.expect_length(), + } } } @@ -746,10 +891,12 @@ impl Add for Point3d { type Output = Point3d; fn add(self, rhs: Self) -> Self::Output { + // TODO should assert that self and rhs the same units or coerce them Point3d { x: self.x + rhs.x, y: self.y + rhs.y, z: self.z + rhs.z, + units: self.units, } } } @@ -768,6 +915,7 @@ impl Mul for Point3d { x: self.x * rhs, y: self.y * rhs, z: self.z * rhs, + units: self.units, } } } @@ -791,6 +939,18 @@ pub struct BasePath { pub geo_meta: GeoMeta, } +impl BasePath { + pub fn get_to(&self) -> [TyF64; 2] { + let ty: NumericType = self.units.into(); + [TyF64::new(self.to[0], ty.clone()), TyF64::new(self.to[1], ty)] + } + + pub fn get_from(&self) -> [TyF64; 2] { + let ty: NumericType = self.units.into(); + [TyF64::new(self.from[0], ty.clone()), TyF64::new(self.from[1], ty)] + } +} + /// Geometry metadata. #[derive(Debug, Clone, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[ts(export)] @@ -990,6 +1150,7 @@ impl Path { let ty: NumericType = self.get_base().units.into(); [TyF64::new(p[0], ty.clone()), TyF64::new(p[1], ty)] } + /// Where does this path segment end? pub fn get_to(&self) -> [TyF64; 2] { let p = &self.get_base().to; @@ -1023,11 +1184,14 @@ impl Path { Self::Circle { radius, .. } => 2.0 * std::f64::consts::PI * radius, Self::CircleThreePoint { .. } => { let circle_center = crate::std::utils::calculate_circle_from_3_points([ - self.get_base().from.into(), - self.get_base().to.into(), - self.get_base().to.into(), + self.get_base().from, + self.get_base().to, + self.get_base().to, ]); - let radius = linear_distance(&[circle_center.center.x, circle_center.center.y], &self.get_base().from); + let radius = linear_distance( + &[circle_center.center[0], circle_center.center[1]], + &self.get_base().from, + ); 2.0 * std::f64::consts::PI * radius } Self::Arc { .. } => { @@ -1066,10 +1230,9 @@ impl Path { ccw: *ccw, }, Path::ArcThreePoint { p1, p2, p3, .. } => { - let circle_center = - crate::std::utils::calculate_circle_from_3_points([(*p1).into(), (*p2).into(), (*p3).into()]); - let radius = linear_distance(&[circle_center.center.x, circle_center.center.y], p1); - let center_point = [circle_center.center.x, circle_center.center.y]; + let circle_center = crate::std::utils::calculate_circle_from_3_points([*p1, *p2, *p3]); + let radius = linear_distance(&[circle_center.center[0], circle_center.center[1]], p1); + let center_point = [circle_center.center[0], circle_center.center[1]]; GetTangentialInfoFromPathsResult::Circle { center: center_point, ccw: true, @@ -1084,10 +1247,9 @@ impl Path { radius: *radius, }, Path::CircleThreePoint { p1, p2, p3, .. } => { - let circle_center = - crate::std::utils::calculate_circle_from_3_points([(*p1).into(), (*p2).into(), (*p3).into()]); - let radius = linear_distance(&[circle_center.center.x, circle_center.center.y], p1); - let center_point = [circle_center.center.x, circle_center.center.y]; + let circle_center = crate::std::utils::calculate_circle_from_3_points([*p1, *p2, *p3]); + let radius = linear_distance(&[circle_center.center[0], circle_center.center[1]], p1); + let center_point = [circle_center.center[0], circle_center.center[1]]; GetTangentialInfoFromPathsResult::Circle { center: center_point, ccw: true, diff --git a/rust/kcl-lib/src/execution/kcl_value.rs b/rust/kcl-lib/src/execution/kcl_value.rs index fe792bcfe..77876616c 100644 --- a/rust/kcl-lib/src/execution/kcl_value.rs +++ b/rust/kcl-lib/src/execution/kcl_value.rs @@ -422,23 +422,33 @@ impl KclValue { } pub fn as_array(&self) -> Option<&[KclValue]> { - if let KclValue::MixedArray { value, meta: _ } = &self { - Some(value) - } else { - None + match self { + KclValue::MixedArray { value, .. } | KclValue::HomArray { value, .. } => Some(value), + _ => None, } } - pub fn as_point2d(&self) -> Option<[f64; 2]> { + pub fn as_point2d(&self) -> Option<[TyF64; 2]> { let arr = self.as_array()?; if arr.len() != 2 { return None; } - let x = arr[0].as_f64()?; - let y = arr[1].as_f64()?; + let x = arr[0].as_ty_f64()?; + let y = arr[1].as_ty_f64()?; Some([x, y]) } + pub fn as_point3d(&self) -> Option<[TyF64; 3]> { + let arr = self.as_array()?; + if arr.len() != 3 { + return None; + } + let x = arr[0].as_ty_f64()?; + let y = arr[1].as_ty_f64()?; + let z = arr[2].as_ty_f64()?; + Some([x, y, z]) + } + pub fn as_uuid(&self) -> Option { if let KclValue::Uuid { value, meta: _ } = &self { Some(*value) @@ -487,6 +497,7 @@ impl KclValue { } } + #[cfg(test)] pub fn as_f64(&self) -> Option { if let KclValue::Number { value, .. } = &self { Some(*value) diff --git a/rust/kcl-lib/src/execution/mod.rs b/rust/kcl-lib/src/execution/mod.rs index c9da1d0b8..02c6f3651 100644 --- a/rust/kcl-lib/src/execution/mod.rs +++ b/rust/kcl-lib/src/execution/mod.rs @@ -2050,7 +2050,7 @@ fn foo() { solid = sketch |> extrude(length = 10) // tag0 tags a face -sketch2 = startSketchOn(solid, tag0) +sketch2 = startSketchOn(solid, face = tag0) |> startProfileAt([0,0], %) |> line(end = [0, 1]) |> line(end = [1, 0]) diff --git a/rust/kcl-lib/src/execution/types.rs b/rust/kcl-lib/src/execution/types.rs index d3bb69250..6a6c463c7 100644 --- a/rust/kcl-lib/src/execution/types.rs +++ b/rust/kcl-lib/src/execution/types.rs @@ -62,21 +62,57 @@ impl RuntimeType { RuntimeType::Primitive(PrimitiveType::Solid) } + pub fn plane() -> Self { + RuntimeType::Primitive(PrimitiveType::Plane) + } + + pub fn string() -> Self { + RuntimeType::Primitive(PrimitiveType::String) + } + pub fn imported() -> Self { RuntimeType::Primitive(PrimitiveType::ImportedGeometry) } /// `[number; 2]` pub fn point2d() -> Self { - RuntimeType::Array(Box::new(RuntimeType::number_any()), ArrayLen::Known(2)) + RuntimeType::Array(Box::new(RuntimeType::length()), ArrayLen::Known(2)) } /// `[number; 3]` pub fn point3d() -> Self { - RuntimeType::Array(Box::new(RuntimeType::number_any()), ArrayLen::Known(3)) + RuntimeType::Array(Box::new(RuntimeType::length()), ArrayLen::Known(3)) } - pub fn number_any() -> Self { + pub fn length() -> Self { + RuntimeType::Primitive(PrimitiveType::Number(NumericType::Known(UnitType::Length( + UnitLen::Unknown, + )))) + } + + pub fn angle() -> Self { + RuntimeType::Primitive(PrimitiveType::Number(NumericType::Known(UnitType::Angle( + UnitAngle::Unknown, + )))) + } + + pub fn radians() -> Self { + RuntimeType::Primitive(PrimitiveType::Number(NumericType::Known(UnitType::Angle( + UnitAngle::Radians, + )))) + } + + pub fn degrees() -> Self { + RuntimeType::Primitive(PrimitiveType::Number(NumericType::Known(UnitType::Angle( + UnitAngle::Degrees, + )))) + } + + pub fn count() -> Self { + RuntimeType::Primitive(PrimitiveType::Number(NumericType::Known(UnitType::Count))) + } + + pub fn num_any() -> Self { RuntimeType::Primitive(PrimitiveType::Number(NumericType::Any)) } @@ -397,8 +433,8 @@ impl NumericType { (Default { .. }, Default { .. }) | (_, Unknown) | (Unknown, _) => (a.n, b.n, Unknown), // Known types and compatible, but needs adjustment. - (t @ Known(UnitType::Length(l1)), Known(UnitType::Length(l2))) => (a.n, l2.adjust_to(b.n, l1), t), - (t @ Known(UnitType::Angle(a1)), Known(UnitType::Angle(a2))) => (a.n, a2.adjust_to(b.n, a1), t), + (t @ Known(UnitType::Length(l1)), Known(UnitType::Length(l2))) => (a.n, l2.adjust_to(b.n, l1).0, t), + (t @ Known(UnitType::Angle(a1)), Known(UnitType::Angle(a2))) => (a.n, a2.adjust_to(b.n, a1).0, t), // Known but incompatible. (Known(_), Known(_)) => (a.n, b.n, Unknown), @@ -408,11 +444,11 @@ impl NumericType { (a.n, b.n, Known(UnitType::Count)) } - (t @ Known(UnitType::Length(l1)), Default { len: l2, .. }) => (a.n, l2.adjust_to(b.n, l1), t), - (Default { len: l1, .. }, t @ Known(UnitType::Length(l2))) => (l1.adjust_to(a.n, l2), b.n, t), + (t @ Known(UnitType::Length(l1)), Default { len: l2, .. }) => (a.n, l2.adjust_to(b.n, l1).0, t), + (Default { len: l1, .. }, t @ Known(UnitType::Length(l2))) => (l1.adjust_to(a.n, l2).0, b.n, t), - (t @ Known(UnitType::Angle(a1)), Default { angle: a2, .. }) => (a.n, a2.adjust_to(b.n, a1), t), - (Default { angle: a1, .. }, t @ Known(UnitType::Angle(a2))) => (a1.adjust_to(a.n, a2), b.n, t), + (t @ Known(UnitType::Angle(a1)), Default { angle: a2, .. }) => (a.n, a2.adjust_to(b.n, a1).0, t), + (Default { angle: a1, .. }, t @ Known(UnitType::Angle(a2))) => (a1.adjust_to(a.n, a2).0, b.n, t), } } @@ -422,7 +458,7 @@ impl NumericType { let mut result = input.iter().map(|t| t.n).collect(); let mut ty = Any; - // Invariant mismatch is true => ty is Known + // Invariant mismatch is true => ty is fully known let mut mismatch = false; for i in input { if i.ty == Any || ty == i.ty { @@ -478,10 +514,10 @@ impl NumericType { .zip(input) .map(|(n, i)| match (&ty, &i.ty) { (Known(UnitType::Length(l1)), Known(UnitType::Length(l2)) | Default { len: l2, .. }) => { - l2.adjust_to(n, *l1) + l2.adjust_to(n, *l1).0 } (Known(UnitType::Angle(a1)), Known(UnitType::Angle(a2)) | Default { angle: a2, .. }) => { - a2.adjust_to(n, *a1) + a2.adjust_to(n, *a1).0 } _ => unreachable!(), }) @@ -495,8 +531,10 @@ impl NumericType { use NumericType::*; match (a.ty, b.ty) { (at @ Default { .. }, bt @ Default { .. }) if at != bt => (a.n, b.n, Unknown), - (Known(UnitType::Count) | Default { .. }, bt) => (a.n, b.n, bt), - (at, Known(UnitType::Count) | Default { .. }) => (a.n, b.n, at), + (Known(UnitType::Count), bt) => (a.n, b.n, bt), + (at, Known(UnitType::Count)) => (a.n, b.n, at), + (Default { .. }, bt) => (a.n, b.n, bt), + (at, Default { .. }) => (a.n, b.n, at), (Any, Any) => (a.n, b.n, Any), _ => (a.n, b.n, Unknown), } @@ -506,21 +544,23 @@ impl NumericType { pub fn combine_div(a: TyF64, b: TyF64) -> (f64, f64, NumericType) { use NumericType::*; match (a.ty, b.ty) { + (at @ Default { .. }, bt @ Default { .. }) if at == bt => (a.n, b.n, at), (at, bt) if at == bt => (a.n, b.n, Known(UnitType::Count)), (Default { .. }, Default { .. }) => (a.n, b.n, Unknown), - (at, Known(UnitType::Count) | Default { .. } | Any) => (a.n, b.n, at), + (at, Known(UnitType::Count) | Any) => (a.n, b.n, at), (Known(UnitType::Length(l1)), Known(UnitType::Length(l2))) => { - (a.n, l2.adjust_to(b.n, l1), Known(UnitType::Count)) + (a.n, l2.adjust_to(b.n, l1).0, Known(UnitType::Count)) } (Known(UnitType::Angle(a1)), Known(UnitType::Angle(a2))) => { - (a.n, a2.adjust_to(b.n, a1), Known(UnitType::Count)) + (a.n, a2.adjust_to(b.n, a1).0, Known(UnitType::Count)) } (Default { len: l1, .. }, Known(UnitType::Length(l2))) => { - (l1.adjust_to(a.n, l2), b.n, Known(UnitType::Count)) + (l1.adjust_to(a.n, l2).0, b.n, Known(UnitType::Count)) } (Default { angle: a1, .. }, Known(UnitType::Angle(a2))) => { - (a1.adjust_to(a.n, a2), b.n, Known(UnitType::Count)) + (a1.adjust_to(a.n, a2).0, b.n, Known(UnitType::Count)) } + (Known(UnitType::Count), _) => (a.n, b.n, Known(UnitType::Count)), _ => (a.n, b.n, Unknown), } } @@ -532,6 +572,8 @@ impl NumericType { angle: settings.default_angle_units, }, NumericSuffix::Count => NumericType::Known(UnitType::Count), + NumericSuffix::Length => NumericType::Known(UnitType::Length(UnitLen::Unknown)), + NumericSuffix::Angle => NumericType::Known(UnitType::Angle(UnitAngle::Unknown)), NumericSuffix::Mm => NumericType::Known(UnitType::Length(UnitLen::Mm)), NumericSuffix::Cm => NumericType::Known(UnitType::Length(UnitLen::Cm)), NumericSuffix::M => NumericType::Known(UnitType::Length(UnitLen::M)), @@ -549,6 +591,14 @@ impl NumericType { match (self, other) { (_, Any) => true, (a, b) if a == b => true, + ( + NumericType::Known(UnitType::Length(_)) | NumericType::Default { .. }, + NumericType::Known(UnitType::Length(UnitLen::Unknown)), + ) + | ( + NumericType::Known(UnitType::Angle(_)) | NumericType::Default { .. }, + NumericType::Known(UnitType::Angle(UnitAngle::Unknown)), + ) => true, (Unknown, _) | (_, Unknown) => false, (_, _) => false, } @@ -599,16 +649,22 @@ impl NumericType { }), // Known types and compatible, but needs adjustment. - (Known(UnitType::Length(l1)), Known(UnitType::Length(l2))) => Ok(KclValue::Number { - value: l1.adjust_to(*value, *l2), - ty: self.clone(), - meta: meta.clone(), - }), - (Known(UnitType::Angle(a1)), Known(UnitType::Angle(a2))) => Ok(KclValue::Number { - value: a1.adjust_to(*value, *a2), - ty: self.clone(), - meta: meta.clone(), - }), + (Known(UnitType::Length(l1)), Known(UnitType::Length(l2))) => { + let (value, ty) = l1.adjust_to(*value, *l2); + Ok(KclValue::Number { + value, + ty: Known(UnitType::Length(ty)), + meta: meta.clone(), + }) + } + (Known(UnitType::Angle(a1)), Known(UnitType::Angle(a2))) => { + let (value, ty) = a1.adjust_to(*value, *a2); + Ok(KclValue::Number { + value, + ty: Known(UnitType::Angle(ty)), + meta: meta.clone(), + }) + } // Known but incompatible. (Known(_), Known(_)) => Err(val.into()), @@ -623,22 +679,42 @@ impl NumericType { } (Known(UnitType::Length(l1)), Default { len: l2, .. }) - | (Default { len: l1, .. }, Known(UnitType::Length(l2))) => Ok(KclValue::Number { - value: l1.adjust_to(*value, *l2), - ty: Known(UnitType::Length(*l2)), - meta: meta.clone(), - }), + | (Default { len: l1, .. }, Known(UnitType::Length(l2))) => { + let (value, ty) = l1.adjust_to(*value, *l2); + Ok(KclValue::Number { + value, + ty: Known(UnitType::Length(ty)), + meta: meta.clone(), + }) + } (Known(UnitType::Angle(a1)), Default { angle: a2, .. }) - | (Default { angle: a1, .. }, Known(UnitType::Angle(a2))) => Ok(KclValue::Number { - value: a1.adjust_to(*value, *a2), - ty: Known(UnitType::Angle(*a2)), - meta: meta.clone(), - }), + | (Default { angle: a1, .. }, Known(UnitType::Angle(a2))) => { + let (value, ty) = a1.adjust_to(*value, *a2); + Ok(KclValue::Number { + value, + ty: Known(UnitType::Angle(ty)), + meta: meta.clone(), + }) + } (_, _) => unreachable!(), } } + + pub fn expect_length(&self) -> UnitLen { + match self { + Self::Known(UnitType::Length(len)) | Self::Default { len, .. } => *len, + _ => unreachable!("Found {self:?}"), + } + } + + pub fn as_length(&self) -> Option { + match self { + Self::Known(UnitType::Length(len)) | Self::Default { len, .. } => Some(*len), + _ => None, + } + } } impl From for RuntimeType { @@ -691,15 +767,21 @@ pub enum UnitLen { Inches, Feet, Yards, + Unknown, } impl UnitLen { - fn adjust_to(self, value: f64, to: UnitLen) -> f64 { + fn adjust_to(self, value: f64, to: UnitLen) -> (f64, UnitLen) { + use UnitLen::*; + if !*CHECK_NUMERIC_TYPES || self == to { - return value; + return (value, to); + } + + if to == Unknown { + return (value, self); } - use UnitLen::*; let (base, base_unit) = match self { Mm => (value, Mm), Cm => (value * 10.0, Mm), @@ -707,6 +789,7 @@ impl UnitLen { Inches => (value, Inches), Feet => (value * 12.0, Inches), Yards => (value * 36.0, Inches), + Unknown => unreachable!(), }; let (base, base_unit) = match (base_unit, to) { (Mm, Inches) | (Mm, Feet) | (Mm, Yards) => (base / 25.4, Inches), @@ -714,7 +797,7 @@ impl UnitLen { _ => (base, base_unit), }; - match (base_unit, to) { + let value = match (base_unit, to) { (Mm, Mm) => base, (Mm, Cm) => base / 10.0, (Mm, M) => base / 1000.0, @@ -722,7 +805,9 @@ impl UnitLen { (Inches, Feet) => base / 12.0, (Inches, Yards) => base / 36.0, _ => unreachable!(), - } + }; + + (value, to) } } @@ -735,6 +820,7 @@ impl std::fmt::Display for UnitLen { UnitLen::Inches => write!(f, "in"), UnitLen::Feet => write!(f, "ft"), UnitLen::Yards => write!(f, "yd"), + UnitLen::Unknown => write!(f, "Length"), } } } @@ -777,6 +863,7 @@ impl From for crate::UnitLength { UnitLen::M => crate::UnitLength::M, UnitLen::Mm => crate::UnitLength::Mm, UnitLen::Yards => crate::UnitLength::Yd, + UnitLen::Unknown => unreachable!(), } } } @@ -790,6 +877,7 @@ impl From for kittycad_modeling_cmds::units::UnitLength { UnitLen::M => kittycad_modeling_cmds::units::UnitLength::Meters, UnitLen::Mm => kittycad_modeling_cmds::units::UnitLength::Millimeters, UnitLen::Yards => kittycad_modeling_cmds::units::UnitLength::Yards, + UnitLen::Unknown => unreachable!(), } } } @@ -802,23 +890,31 @@ pub enum UnitAngle { #[default] Degrees, Radians, + Unknown, } impl UnitAngle { - fn adjust_to(self, value: f64, to: UnitAngle) -> f64 { + fn adjust_to(self, value: f64, to: UnitAngle) -> (f64, UnitAngle) { use std::f64::consts::PI; use UnitAngle::*; if !*CHECK_NUMERIC_TYPES { - return value; + return (value, to); } - match (self, to) { + if to == Unknown { + return (value, self); + } + + let value = match (self, to) { (Degrees, Degrees) => value, (Degrees, Radians) => (value / 180.0) * PI, (Radians, Degrees) => 180.0 * value / PI, (Radians, Radians) => value, - } + (Unknown, _) | (_, Unknown) => unreachable!(), + }; + + (value, to) } } @@ -827,6 +923,7 @@ impl std::fmt::Display for UnitAngle { match self { UnitAngle::Degrees => write!(f, "deg"), UnitAngle::Radians => write!(f, "rad"), + UnitAngle::Unknown => write!(f, "Angle"), } } } @@ -919,6 +1016,14 @@ impl KclValue { _ => Err(self.into()), }, PrimitiveType::Plane => match value { + KclValue::String { value: s, .. } + if [ + "xy", "xz", "yz", "-xy", "-xz", "-yz", "XY", "XZ", "YZ", "-XY", "-XZ", "-YZ", + ] + .contains(&&**s) => + { + Ok(value.clone()) + } KclValue::Plane { .. } => Ok(value.clone()), KclValue::Object { value, meta } => { let origin = value @@ -984,10 +1089,10 @@ impl KclValue { } let origin = values.get("origin").ok_or(self.into()).and_then(|p| { - p.coerce_to_array_type(&RuntimeType::number_any(), ArrayLen::Known(2), exec_state, true) + p.coerce_to_array_type(&RuntimeType::length(), ArrayLen::Known(2), exec_state, true) })?; let direction = values.get("direction").ok_or(self.into()).and_then(|p| { - p.coerce_to_array_type(&RuntimeType::number_any(), ArrayLen::Known(2), exec_state, true) + p.coerce_to_array_type(&RuntimeType::length(), ArrayLen::Known(2), exec_state, true) })?; Ok(KclValue::Object { @@ -1012,10 +1117,10 @@ impl KclValue { } let origin = values.get("origin").ok_or(self.into()).and_then(|p| { - p.coerce_to_array_type(&RuntimeType::number_any(), ArrayLen::Known(3), exec_state, true) + p.coerce_to_array_type(&RuntimeType::length(), ArrayLen::Known(3), exec_state, true) })?; let direction = values.get("direction").ok_or(self.into()).and_then(|p| { - p.coerce_to_array_type(&RuntimeType::number_any(), ArrayLen::Known(3), exec_state, true) + p.coerce_to_array_type(&RuntimeType::length(), ArrayLen::Known(3), exec_state, true) })?; Ok(KclValue::Object { @@ -1955,12 +2060,12 @@ u = min(3rad, 4in) assert_value_and_type("j", &result, 20.0, NumericType::default()); assert_value_and_type("k", &result, 18.0, NumericType::Unknown); - assert_value_and_type("l", &result, 0.0, NumericType::count()); + assert_value_and_type("l", &result, 0.0, NumericType::default()); assert_value_and_type("m", &result, 2.0, NumericType::count()); if *CHECK_NUMERIC_TYPES { assert_value_and_type("n", &result, 127.0, NumericType::count()); } - assert_value_and_type("o", &result, 1.0, NumericType::mm()); + assert_value_and_type("o", &result, 1.0, NumericType::Unknown); assert_value_and_type("p", &result, 1.0, NumericType::count()); assert_value_and_type("q", &result, 2.0, NumericType::Known(UnitType::Length(UnitLen::Inches))); diff --git a/rust/kcl-lib/src/parsing/parser.rs b/rust/kcl-lib/src/parsing/parser.rs index 5de35cfe2..0865b80ab 100644 --- a/rust/kcl-lib/src/parsing/parser.rs +++ b/rust/kcl-lib/src/parsing/parser.rs @@ -3881,6 +3881,23 @@ mySk1 = startSketchOn(XY) } } + #[test] + fn parse_numeric() { + let test_program = "fn foo(x: number(Length)) {}"; + let tokens = crate::parsing::token::lex(test_program, ModuleId::default()).unwrap(); + run_parser(tokens.as_slice()).unwrap(); + + let test_program = "42_mm"; + let tokens = crate::parsing::token::lex(test_program, ModuleId::default()).unwrap(); + assert_eq!(tokens.iter().count(), 1); + run_parser(tokens.as_slice()).unwrap(); + + let test_program = "42_Length"; + let tokens = crate::parsing::token::lex(test_program, ModuleId::default()).unwrap(); + assert_eq!(tokens.iter().count(), 2); + assert_eq!(run_parser(tokens.as_slice()).unwrap_errs().count(), 1); + } + #[test] fn test_parameter_list() { let tests = [ diff --git a/rust/kcl-lib/src/parsing/token/mod.rs b/rust/kcl-lib/src/parsing/token/mod.rs index a28c40efc..2cf8ca2dd 100644 --- a/rust/kcl-lib/src/parsing/token/mod.rs +++ b/rust/kcl-lib/src/parsing/token/mod.rs @@ -34,6 +34,8 @@ pub const NUM_SUFFIXES: [&str; 9] = ["mm", "cm", "m", "inch", "in", "ft", "yd", pub enum NumericSuffix { None, Count, + Length, + Angle, Mm, Cm, M, @@ -58,6 +60,8 @@ impl NumericSuffix { match self { NumericSuffix::None => &[], NumericSuffix::Count => b"_", + NumericSuffix::Length => b"Length", + NumericSuffix::Angle => b"Angle", NumericSuffix::Mm => b"mm", NumericSuffix::Cm => b"cm", NumericSuffix::M => b"m", @@ -75,7 +79,9 @@ impl FromStr for NumericSuffix { fn from_str(s: &str) -> Result { match s { - "_" => Ok(NumericSuffix::Count), + "_" | "Count" => Ok(NumericSuffix::Count), + "Length" => Ok(NumericSuffix::Length), + "Angle" => Ok(NumericSuffix::Angle), "mm" | "millimeters" => Ok(NumericSuffix::Mm), "cm" | "centimeters" => Ok(NumericSuffix::Cm), "m" | "meters" => Ok(NumericSuffix::M), @@ -94,6 +100,8 @@ impl fmt::Display for NumericSuffix { match self { NumericSuffix::None => Ok(()), NumericSuffix::Count => write!(f, "_"), + NumericSuffix::Length => write!(f, "Length"), + NumericSuffix::Angle => write!(f, "Angle"), NumericSuffix::Mm => write!(f, "mm"), NumericSuffix::Cm => write!(f, "cm"), NumericSuffix::M => write!(f, "m"), diff --git a/rust/kcl-lib/src/std/appearance.rs b/rust/kcl-lib/src/std/appearance.rs index 706e6c9fa..9766e272a 100644 --- a/rust/kcl-lib/src/std/appearance.rs +++ b/rust/kcl-lib/src/std/appearance.rs @@ -7,21 +7,25 @@ use kittycad_modeling_cmds::{self as kcmc, shared::Color}; use regex::Regex; use rgba_simple::Hex; use schemars::JsonSchema; -use serde::{Deserialize, Serialize}; -use validator::Validate; +use serde::Serialize; use crate::{ errors::{KclError, KclErrorDetails}, - execution::{types::RuntimeType, ExecState, KclValue, Solid}, + execution::{ + types::{NumericType, PrimitiveType, RuntimeType}, + ExecState, KclValue, Solid, + }, std::Args, }; +use super::args::TyF64; + lazy_static::lazy_static! { static ref HEX_REGEX: Regex = Regex::new(r"^#[0-9a-fA-F]{6}$").unwrap(); } /// Data for appearance. -#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Validate)] +#[derive(Debug, Clone, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[ts(export)] #[serde(rename_all = "camelCase")] struct AppearanceData { @@ -30,10 +34,10 @@ struct AppearanceData { pub color: String, /// Metalness of the new material, a percentage like 95.7. #[validate(range(min = 0.0, max = 100.0))] - pub metalness: Option, + pub metalness: Option, /// Roughness of the new material, a percentage like 95.7. #[validate(range(min = 0.0, max = 100.0))] - pub roughness: Option, + pub roughness: Option, // TODO(jess): we can also ambient occlusion here I just don't know what it is. } @@ -42,22 +46,15 @@ pub async fn appearance(exec_state: &mut ExecState, args: Args) -> Result = args.get_kw_arg_opt("metalness")?; - let roughness: Option = args.get_kw_arg_opt("roughness")?; + let count_ty = RuntimeType::Primitive(PrimitiveType::Number(NumericType::count())); + let metalness: Option = args.get_kw_arg_opt_typed("metalness", &count_ty, exec_state)?; + let roughness: Option = args.get_kw_arg_opt_typed("roughness", &count_ty, exec_state)?; let data = AppearanceData { color, metalness, roughness, }; - // Validate the data. - data.validate().map_err(|err| { - KclError::Semantic(KclErrorDetails { - message: format!("Invalid appearance data: {}", err), - source_ranges: vec![args.source_range], - }) - })?; - // Make sure the color if set is valid. if !HEX_REGEX.is_match(&data.color) { return Err(KclError::Semantic(KclErrorDetails { @@ -66,7 +63,15 @@ pub async fn appearance(exec_state: &mut ExecState, args: Args) -> Result Result { - FromArgs::from_args(self, 0) - } - pub(crate) fn get_number_with_type(&self) -> Result { FromArgs::from_args(self, 0) } - pub(crate) fn get_number_array(&self) -> Result, KclError> { - let numbers = self - .args - .iter() - .map(|arg| { - let Some(num) = f64::from_kcl_val(&arg.value) else { - return Err(KclError::Semantic(KclErrorDetails { - source_ranges: arg.source_ranges(), - message: format!("Expected a number but found {}", arg.value.human_friendly_type()), - })); - }; - Ok(num) - }) - .collect::>()?; - Ok(numbers) - } - pub(crate) fn get_number_array_with_types(&self) -> Result, KclError> { let numbers = self .args @@ -659,23 +638,17 @@ impl Args { pub(crate) fn get_data<'a, T>(&'a self) -> Result where - T: FromArgs<'a> + serde::de::DeserializeOwned, + T: FromArgs<'a>, { FromArgs::from_args(self, 0) } - pub(crate) fn get_sketch_data_and_optional_tag( - &self, - ) -> Result<(super::sketch::SketchData, Option), KclError> { - FromArgs::from_args(self, 0) - } - pub(crate) fn get_data_and_sketch_and_tag<'a, T>( &'a self, exec_state: &mut ExecState, ) -> Result<(T, Sketch, Option), KclError> where - T: serde::de::DeserializeOwned + FromKclValue<'a> + Sized, + T: FromKclValue<'a> + Sized, { let data: T = FromArgs::from_args(self, 0)?; let Some(arg1) = self.args.get(1) else { @@ -704,18 +677,12 @@ impl Args { Ok((data, sketch, tag)) } - pub(crate) fn get_data_and_sketch_surface<'a, T>(&'a self) -> Result<(T, SketchSurface, Option), KclError> - where - T: serde::de::DeserializeOwned + FromKclValue<'a> + Sized, - { + pub(crate) fn get_data_and_sketch_surface(&self) -> Result<([TyF64; 2], SketchSurface, Option), KclError> { FromArgs::from_args(self, 0) } - pub(crate) fn get_data_and_solid<'a, T>(&'a self, exec_state: &mut ExecState) -> Result<(T, Box), KclError> - where - T: serde::de::DeserializeOwned + FromKclValue<'a> + Sized, - { - let data: T = FromArgs::from_args(self, 0)?; + pub(crate) fn get_data_and_solid(&self, exec_state: &mut ExecState) -> Result<(TyF64, Box), KclError> { + let data = FromArgs::from_args(self, 0)?; let Some(arg1) = self.args.get(1) else { return Err(KclError::Semantic(KclErrorDetails { message: "Expected a solid for second argument".to_owned(), @@ -741,7 +708,7 @@ impl Args { Ok((data, solid)) } - pub(crate) fn get_tag_to_number_sketch(&self) -> Result<(TagIdentifier, f64, Sketch), KclError> { + pub(crate) fn get_tag_to_number_sketch(&self) -> Result<(TagIdentifier, TyF64, Sketch), KclError> { FromArgs::from_args(self, 0) } @@ -967,59 +934,6 @@ where } } -impl<'a> FromKclValue<'a> for [f64; 2] { - fn from_kcl_val(arg: &'a KclValue) -> Option { - match arg { - KclValue::MixedArray { value, meta: _ } | KclValue::HomArray { value, .. } => { - if value.len() != 2 { - return None; - } - let v0 = value.first()?; - let v1 = value.get(1)?; - let array = [v0.as_f64()?, v1.as_f64()?]; - Some(array) - } - _ => None, - } - } -} - -impl<'a> FromKclValue<'a> for [usize; 3] { - fn from_kcl_val(arg: &'a KclValue) -> Option { - match arg { - KclValue::MixedArray { value, meta: _ } | KclValue::HomArray { value, .. } => { - if value.len() != 3 { - return None; - } - let v0 = value.first()?; - let v1 = value.get(1)?; - let v2 = value.get(2)?; - let array = [v0.as_usize()?, v1.as_usize()?, v2.as_usize()?]; - Some(array) - } - _ => None, - } - } -} - -impl<'a> FromKclValue<'a> for [f64; 3] { - fn from_kcl_val(arg: &'a KclValue) -> Option { - match arg { - KclValue::MixedArray { value, meta: _ } | KclValue::HomArray { value, .. } => { - if value.len() != 3 { - return None; - } - let v0 = value.first()?; - let v1 = value.get(1)?; - let v2 = value.get(2)?; - let array = [v0.as_f64()?, v1.as_f64()?, v2.as_f64()?]; - Some(array) - } - _ => None, - } - } -} - impl<'a> FromKclValue<'a> for TagNode { fn from_kcl_val(arg: &'a KclValue) -> Option { arg.get_tag_declarator().ok() @@ -1213,10 +1127,10 @@ impl<'a> FromKclValue<'a> for FaceTag { impl<'a> FromKclValue<'a> for super::sketch::ArcData { fn from_kcl_val(arg: &'a KclValue) -> Option { let obj = arg.as_object()?; - let_field_of!(obj, radius); let case1 = || { - let angle_start = obj.get("angleStart")?.as_f64()?; - let angle_end = obj.get("angleEnd")?.as_f64()?; + let angle_start = obj.get("angleStart")?.as_ty_f64()?; + let angle_end = obj.get("angleEnd")?.as_ty_f64()?; + let_field_of!(obj, radius, TyF64); Some(Self::AnglesAndRadius { angle_start, angle_end, @@ -1227,6 +1141,7 @@ impl<'a> FromKclValue<'a> for super::sketch::ArcData { let obj = arg.as_object()?; let_field_of!(obj, to); let_field_of!(obj, center); + let_field_of!(obj, radius, TyF64); Some(Self::CenterToRadius { center, to, radius }) }; case1().or_else(case2) @@ -1255,14 +1170,26 @@ impl<'a> FromKclValue<'a> for crate::execution::Point3d { fn from_kcl_val(arg: &'a KclValue) -> Option { // Case 1: object with x/y/z fields if let Some(obj) = arg.as_object() { - let_field_of!(obj, x); - let_field_of!(obj, y); - let_field_of!(obj, z); - return Some(Self { x, y, z }); + let_field_of!(obj, x, TyF64); + let_field_of!(obj, y, TyF64); + let_field_of!(obj, z, TyF64); + let (a, ty) = NumericType::combine_eq_array(&[x, y, z]); + return Some(Self { + x: a[0], + y: a[1], + z: a[2], + units: ty.as_length().unwrap_or(UnitLen::Unknown), + }); } // Case 2: Array of 3 numbers. - let [x, y, z]: [f64; 3] = FromKclValue::from_kcl_val(arg)?; - Some(Self { x, y, z }) + let [x, y, z]: [TyF64; 3] = FromKclValue::from_kcl_val(arg)?; + let (a, ty) = NumericType::combine_eq_array(&[x, y, z]); + Some(Self { + x: a[0], + y: a[1], + z: a[2], + units: ty.as_length().unwrap_or(UnitLen::Unknown), + }) } } @@ -1588,14 +1515,7 @@ impl<'a> FromKclValue<'a> for u64 { } } } -impl<'a> FromKclValue<'a> for f64 { - fn from_kcl_val(arg: &'a KclValue) -> Option { - match arg { - KclValue::Number { value, .. } => Some(*value), - _ => None, - } - } -} + impl<'a> FromKclValue<'a> for TyF64 { fn from_kcl_val(arg: &'a KclValue) -> Option { match arg { @@ -1605,6 +1525,41 @@ impl<'a> FromKclValue<'a> for TyF64 { } } +impl<'a> FromKclValue<'a> for [TyF64; 2] { + fn from_kcl_val(arg: &'a KclValue) -> Option { + match arg { + KclValue::MixedArray { value, meta: _ } | KclValue::HomArray { value, .. } => { + if value.len() != 2 { + return None; + } + let v0 = value.first()?; + let v1 = value.get(1)?; + let array = [v0.as_ty_f64()?, v1.as_ty_f64()?]; + Some(array) + } + _ => None, + } + } +} + +impl<'a> FromKclValue<'a> for [TyF64; 3] { + fn from_kcl_val(arg: &'a KclValue) -> Option { + match arg { + KclValue::MixedArray { value, meta: _ } | KclValue::HomArray { value, .. } => { + if value.len() != 3 { + return None; + } + let v0 = value.first()?; + let v1 = value.get(1)?; + let v2 = value.get(2)?; + let array = [v0.as_ty_f64()?, v1.as_ty_f64()?, v2.as_ty_f64()?]; + Some(array) + } + _ => None, + } + } +} + impl<'a> FromKclValue<'a> for Sketch { fn from_kcl_val(arg: &'a KclValue) -> Option { let KclValue::Sketch { value } = arg else { diff --git a/rust/kcl-lib/src/std/assert.rs b/rust/kcl-lib/src/std/assert.rs index c463a9ec9..976a0a29f 100644 --- a/rust/kcl-lib/src/std/assert.rs +++ b/rust/kcl-lib/src/std/assert.rs @@ -9,6 +9,8 @@ use crate::{ std::Args, }; +use super::args::TyF64; + async fn _assert(value: bool, message: &str, args: &Args) -> Result<(), KclError> { if !value { return Err(KclError::Type(KclErrorDetails { @@ -42,8 +44,8 @@ async fn inner_assert(data: bool, message: &str, args: &Args) -> Result<(), KclE } pub async fn assert_lt(_exec_state: &mut ExecState, args: Args) -> Result { - let (left, right, description): (f64, f64, String) = args.get_data()?; - inner_assert_lt(left, right, &description, &args).await?; + let (left, right, description): (TyF64, TyF64, String) = args.get_data()?; + inner_assert_lt(left.n, right.n, &description, &args).await?; Ok(KclValue::none()) } @@ -61,8 +63,8 @@ async fn inner_assert_lt(left: f64, right: f64, message: &str, args: &Args) -> R } pub async fn assert_gt(_exec_state: &mut ExecState, args: Args) -> Result { - let (left, right, description): (f64, f64, String) = args.get_data()?; - inner_assert_gt(left, right, &description, &args).await?; + let (left, right, description): (TyF64, TyF64, String) = args.get_data()?; + inner_assert_gt(left.n, right.n, &description, &args).await?; Ok(KclValue::none()) } @@ -94,8 +96,8 @@ async fn inner_assert_equal(left: f64, right: f64, epsilon: f64, message: &str, } pub async fn assert_equal(_exec_state: &mut ExecState, args: Args) -> Result { - let (left, right, epsilon, description): (f64, f64, f64, String) = args.get_data()?; - inner_assert_equal(left, right, epsilon, &description, &args).await?; + let (left, right, epsilon, description): (TyF64, TyF64, TyF64, String) = args.get_data()?; + inner_assert_equal(left.n, right.n, epsilon.n, &description, &args).await?; Ok(KclValue::none()) } @@ -113,8 +115,8 @@ async fn inner_assert_gt(left: f64, right: f64, message: &str, args: &Args) -> R } pub async fn assert_lte(_exec_state: &mut ExecState, args: Args) -> Result { - let (left, right, description): (f64, f64, String) = args.get_data()?; - inner_assert_lte(left, right, &description, &args).await?; + let (left, right, description): (TyF64, TyF64, String) = args.get_data()?; + inner_assert_lte(left.n, right.n, &description, &args).await?; Ok(KclValue::none()) } @@ -133,8 +135,8 @@ async fn inner_assert_lte(left: f64, right: f64, message: &str, args: &Args) -> } pub async fn assert_gte(_exec_state: &mut ExecState, args: Args) -> Result { - let (left, right, description): (f64, f64, String) = args.get_data()?; - inner_assert_gte(left, right, &description, &args).await?; + let (left, right, description): (TyF64, TyF64, String) = args.get_data()?; + inner_assert_gte(left.n, right.n, &description, &args).await?; Ok(KclValue::none()) } diff --git a/rust/kcl-lib/src/std/axis_or_reference.rs b/rust/kcl-lib/src/std/axis_or_reference.rs index e84489b6b..c7b7b26ea 100644 --- a/rust/kcl-lib/src/std/axis_or_reference.rs +++ b/rust/kcl-lib/src/std/axis_or_reference.rs @@ -2,20 +2,23 @@ use crate::std::fillet::EdgeReference; +use super::args::TyF64; + /// A 2D axis or tagged edge. #[derive(Debug, Clone, PartialEq)] pub enum Axis2dOrEdgeReference { /// 2D axis and origin. - Axis { direction: [f64; 2], origin: [f64; 2] }, + Axis { direction: [TyF64; 2], origin: [TyF64; 2] }, /// Tagged edge. Edge(EdgeReference), } /// A 3D axis or tagged edge. +#[allow(clippy::large_enum_variant)] #[derive(Debug, Clone, PartialEq)] pub enum Axis3dOrEdgeReference { /// 3D axis and origin. - Axis { direction: [f64; 3], origin: [f64; 3] }, + Axis { direction: [TyF64; 3], origin: [TyF64; 3] }, /// Tagged edge. Edge(EdgeReference), } diff --git a/rust/kcl-lib/src/std/chamfer.rs b/rust/kcl-lib/src/std/chamfer.rs index 43e945556..68982397d 100644 --- a/rust/kcl-lib/src/std/chamfer.rs +++ b/rust/kcl-lib/src/std/chamfer.rs @@ -15,12 +15,14 @@ use crate::{ std::{fillet::EdgeReference, Args}, }; +use super::args::TyF64; + pub(crate) const DEFAULT_TOLERANCE: f64 = 0.0000001; /// Create chamfers on tagged paths. pub async fn chamfer(exec_state: &mut ExecState, args: Args) -> Result { let solid = args.get_unlabeled_kw_arg_typed("solid", &RuntimeType::Primitive(PrimitiveType::Solid), exec_state)?; - let length = args.get_kw_arg("length")?; + let length: TyF64 = args.get_kw_arg_typed("length", &RuntimeType::length(), exec_state)?; let tags = args.kw_arg_array_and_source::("tags")?; let tag = args.get_kw_arg_opt("tag")?; @@ -43,7 +45,7 @@ pub async fn chamfer(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([-width/2, -length/2], %) /// |> line(endAbsolute = [width/2, -length/2], tag = $edge1) /// |> line(endAbsolute = [width/2, length/2], tag = $edge2) @@ -65,7 +67,7 @@ pub async fn chamfer(exec_state: &mut ExecState, args: Args) -> Result startProfileAt(pos, %) /// |> line(end = [0, scale]) /// |> line(end = [scale, 0]) @@ -84,7 +86,7 @@ pub async fn chamfer(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([10, 10], %) /// |> line(end = [2, 0]) /// |> line(end = [0, 2]) @@ -107,7 +109,7 @@ pub async fn chamfer(exec_state: &mut ExecState, args: Args) -> Result, - length: f64, + length: TyF64, tags: Vec, tag: Option, exec_state: &mut ExecState, @@ -135,7 +137,7 @@ async fn inner_chamfer( ModelingCmd::from(mcmd::Solid3dFilletEdge { edge_id, object_id: solid.id, - radius: LengthUnit(length), + radius: LengthUnit(length.n), tolerance: LengthUnit(DEFAULT_TOLERANCE), // We can let the user set this in the future. cut_type: CutType::Chamfer, }), @@ -145,7 +147,7 @@ async fn inner_chamfer( solid.edge_cuts.push(EdgeCut::Chamfer { id, edge_id, - length, + length: length.clone(), tag: Box::new(tag.clone()), }); diff --git a/rust/kcl-lib/src/std/csg.rs b/rust/kcl-lib/src/std/csg.rs index c6067c44a..5a9445f79 100644 --- a/rust/kcl-lib/src/std/csg.rs +++ b/rust/kcl-lib/src/std/csg.rs @@ -16,13 +16,13 @@ use crate::{ std::Args, }; -use super::DEFAULT_TOLERANCE; +use super::{args::TyF64, DEFAULT_TOLERANCE}; /// Union two or more solids into a single solid. pub async fn union(exec_state: &mut ExecState, args: Args) -> Result { let solids: Vec = args.get_unlabeled_kw_arg_typed("solids", &RuntimeType::Union(vec![RuntimeType::solids()]), exec_state)?; - let tolerance = args.get_kw_arg_opt("tolerance")?; + let tolerance: Option = args.get_kw_arg_opt_typed("tolerance", &RuntimeType::length(), exec_state)?; if solids.len() < 2 { return Err(KclError::UndefinedValue(KclErrorDetails { @@ -116,7 +116,7 @@ pub async fn union(exec_state: &mut ExecState, args: Args) -> Result, - tolerance: Option, + tolerance: Option, exec_state: &mut ExecState, args: Args, ) -> Result, KclError> { @@ -138,7 +138,7 @@ pub(crate) async fn inner_union( solid_out_id, ModelingCmd::from(mcmd::BooleanUnion { solid_ids: solids.iter().map(|s| s.id).collect(), - tolerance: LengthUnit(tolerance.unwrap_or(DEFAULT_TOLERANCE)), + tolerance: LengthUnit(tolerance.map(|t| t.n).unwrap_or(DEFAULT_TOLERANCE)), }), ) .await?; @@ -166,7 +166,7 @@ pub(crate) async fn inner_union( /// overlapping regions. pub async fn intersect(exec_state: &mut ExecState, args: Args) -> Result { let solids: Vec = args.get_unlabeled_kw_arg_typed("solids", &RuntimeType::solids(), exec_state)?; - let tolerance = args.get_kw_arg_opt("tolerance")?; + let tolerance: Option = args.get_kw_arg_opt_typed("tolerance", &RuntimeType::length(), exec_state)?; if solids.len() < 2 { return Err(KclError::UndefinedValue(KclErrorDetails { @@ -241,7 +241,7 @@ pub async fn intersect(exec_state: &mut ExecState, args: Args) -> Result, - tolerance: Option, + tolerance: Option, exec_state: &mut ExecState, args: Args, ) -> Result, KclError> { @@ -263,7 +263,7 @@ pub(crate) async fn inner_intersect( solid_out_id, ModelingCmd::from(mcmd::BooleanIntersection { solid_ids: solids.iter().map(|s| s.id).collect(), - tolerance: LengthUnit(tolerance.unwrap_or(DEFAULT_TOLERANCE)), + tolerance: LengthUnit(tolerance.map(|t| t.n).unwrap_or(DEFAULT_TOLERANCE)), }), ) .await?; @@ -306,7 +306,7 @@ pub async fn subtract(exec_state: &mut ExecState, args: Args) -> Result = args.get_kw_arg_opt_typed("tolerance", &RuntimeType::length(), exec_state)?; let solids = inner_subtract(solids, tools, tolerance, exec_state, args).await?; Ok(solids.into()) @@ -376,7 +376,7 @@ pub async fn subtract(exec_state: &mut ExecState, args: Args) -> Result, tools: Vec, - tolerance: Option, + tolerance: Option, exec_state: &mut ExecState, args: Args, ) -> Result, KclError> { @@ -400,7 +400,7 @@ pub(crate) async fn inner_subtract( ModelingCmd::from(mcmd::BooleanSubtract { target_ids: solids.iter().map(|s| s.id).collect(), tool_ids: tools.iter().map(|s| s.id).collect(), - tolerance: LengthUnit(tolerance.unwrap_or(DEFAULT_TOLERANCE)), + tolerance: LengthUnit(tolerance.map(|t| t.n).unwrap_or(DEFAULT_TOLERANCE)), }), ) .await?; diff --git a/rust/kcl-lib/src/std/extrude.rs b/rust/kcl-lib/src/std/extrude.rs index 39007ef57..27c027848 100644 --- a/rust/kcl-lib/src/std/extrude.rs +++ b/rust/kcl-lib/src/std/extrude.rs @@ -27,20 +27,23 @@ use crate::{ std::Args, }; +use super::args::TyF64; + /// Extrudes by a given amount. pub async fn extrude(exec_state: &mut ExecState, args: Args) -> Result { let sketches = args.get_unlabeled_kw_arg_typed("sketches", &RuntimeType::sketches(), exec_state)?; - let length = args.get_kw_arg("length")?; + let length: TyF64 = args.get_kw_arg_typed("length", &RuntimeType::length(), exec_state)?; let symmetric = args.get_kw_arg_opt("symmetric")?; - let bidirectional_length = args.get_kw_arg_opt("bidirectionalLength")?; + let bidirectional_length: Option = + args.get_kw_arg_opt_typed("bidirectionalLength", &RuntimeType::length(), exec_state)?; let tag_start = args.get_kw_arg_opt("tagStart")?; let tag_end = args.get_kw_arg_opt("tagEnd")?; let result = inner_extrude( sketches, - length, + length.n, symmetric, - bidirectional_length, + bidirectional_length.map(|t| t.n), tag_start, tag_end, exec_state, diff --git a/rust/kcl-lib/src/std/fillet.rs b/rust/kcl-lib/src/std/fillet.rs index c77dbbf1f..aee67a89a 100644 --- a/rust/kcl-lib/src/std/fillet.rs +++ b/rust/kcl-lib/src/std/fillet.rs @@ -8,12 +8,11 @@ use kittycad_modeling_cmds as kcmc; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; -use super::DEFAULT_TOLERANCE; +use super::{args::TyF64, DEFAULT_TOLERANCE}; use crate::{ errors::{KclError, KclErrorDetails}, execution::{ - types::{PrimitiveType, RuntimeType}, - EdgeCut, ExecState, ExtrudeSurface, FilletSurface, GeoMeta, KclValue, Solid, TagIdentifier, + types::RuntimeType, EdgeCut, ExecState, ExtrudeSurface, FilletSurface, GeoMeta, KclValue, Solid, TagIdentifier, }, parsing::ast::types::TagNode, std::Args, @@ -63,16 +62,16 @@ pub(super) fn validate_unique(tags: &[(T, SourceRange)] /// Create fillets on tagged paths. pub async fn fillet(exec_state: &mut ExecState, args: Args) -> Result { - let solid = args.get_unlabeled_kw_arg_typed("solid", &RuntimeType::Primitive(PrimitiveType::Solid), exec_state)?; - let radius = args.get_kw_arg("radius")?; - let tolerance = args.get_kw_arg_opt("tolerance")?; + let solid = args.get_unlabeled_kw_arg_typed("solid", &RuntimeType::solid(), exec_state)?; + let radius: TyF64 = args.get_kw_arg_typed("radius", &RuntimeType::length(), exec_state)?; + let tolerance: Option = args.get_kw_arg_opt_typed("tolerance", &RuntimeType::count(), exec_state)?; let tags = args.kw_arg_array_and_source::("tags")?; let tag = args.get_kw_arg_opt("tag")?; // Run the function. validate_unique(&tags)?; let tags: Vec = tags.into_iter().map(|item| item.0).collect(); - let value = inner_fillet(solid, radius, tags, tolerance, tag, exec_state, args).await?; + let value = inner_fillet(solid, radius, tags, tolerance.map(|t| t.n), tag, exec_state, args).await?; Ok(KclValue::Solid { value }) } @@ -147,7 +146,7 @@ pub async fn fillet(exec_state: &mut ExecState, args: Args) -> Result, - radius: f64, + radius: TyF64, tags: Vec, tolerance: Option, tag: Option, @@ -164,7 +163,7 @@ async fn inner_fillet( ModelingCmd::from(mcmd::Solid3dFilletEdge { edge_id, object_id: solid.id, - radius: LengthUnit(radius), + radius: LengthUnit(radius.n), tolerance: LengthUnit(tolerance.unwrap_or(DEFAULT_TOLERANCE)), cut_type: CutType::Fillet, }), @@ -174,7 +173,7 @@ async fn inner_fillet( solid.edge_cuts.push(EdgeCut::Fillet { id, edge_id, - radius, + radius: radius.clone(), tag: Box::new(tag.clone()), }); diff --git a/rust/kcl-lib/src/std/helix.rs b/rust/kcl-lib/src/std/helix.rs index 6090b7a1b..ba86be6ed 100644 --- a/rust/kcl-lib/src/std/helix.rs +++ b/rust/kcl-lib/src/std/helix.rs @@ -13,12 +13,14 @@ use crate::{ std::{axis_or_reference::Axis3dOrEdgeReference, Args}, }; +use super::args::TyF64; + /// Create a helix. pub async fn helix(exec_state: &mut ExecState, args: Args) -> Result { - let angle_start = args.get_kw_arg("angleStart")?; - let revolutions = args.get_kw_arg("revolutions")?; + let angle_start: TyF64 = args.get_kw_arg_typed("angleStart", &RuntimeType::angle(), exec_state)?; + let revolutions: TyF64 = args.get_kw_arg_typed("revolutions", &RuntimeType::count(), exec_state)?; let ccw = args.get_kw_arg_opt("ccw")?; - let radius = args.get_kw_arg_opt("radius")?; + let radius: Option = args.get_kw_arg_opt_typed("radius", &RuntimeType::length(), exec_state)?; let axis: Option = args.get_kw_arg_opt_typed( "axis", &RuntimeType::Union(vec![ @@ -27,8 +29,8 @@ pub async fn helix(exec_state: &mut ExecState, args: Args) -> Result = args.get_kw_arg_opt_typed("length", &RuntimeType::length(), exec_state)?; + let cylinder = args.get_kw_arg_opt_typed("cylinder", &RuntimeType::solid(), exec_state)?; // Make sure we have a radius if we don't have a cylinder. if radius.is_none() && cylinder.is_none() { @@ -79,12 +81,12 @@ pub async fn helix(exec_state: &mut ExecState, args: Args) -> Result Result = args.get_kw_arg_opt("baseCurveIndex")?; // Tolerance for the loft operation. - let tolerance: Option = args.get_kw_arg_opt("tolerance")?; + let tolerance: Option = args.get_kw_arg_opt_typed("tolerance", &RuntimeType::count(), exec_state)?; let tag_start = args.get_kw_arg_opt("tagStart")?; let tag_end = args.get_kw_arg_opt("tagEnd")?; @@ -39,7 +39,7 @@ pub async fn loft(exec_state: &mut ExecState, args: Args) -> Result Result { - let n: TyF64 = args.get_unlabeled_kw_arg("number to divide")?; - let d: TyF64 = args.get_kw_arg("divisor")?; + let n: TyF64 = args.get_unlabeled_kw_arg_typed("number to divide", &RuntimeType::num_any(), exec_state)?; + let d: TyF64 = args.get_kw_arg_typed("divisor", &RuntimeType::num_any(), exec_state)?; let (n, d, ty) = NumericType::combine_div(n, d); if *types::CHECK_NUMERIC_TYPES && ty == NumericType::Unknown { @@ -59,21 +58,21 @@ fn inner_rem(num: f64, divisor: f64) -> f64 { } /// Compute the cosine of a number (in radians). -pub async fn cos(_exec_state: &mut ExecState, args: Args) -> Result { - let num: f64 = args.get_unlabeled_kw_arg("input")?; - Ok(args.make_user_val_from_f64_with_type(TyF64::count(num.cos()))) +pub async fn cos(exec_state: &mut ExecState, args: Args) -> Result { + let num: TyF64 = args.get_unlabeled_kw_arg_typed("input", &RuntimeType::radians(), exec_state)?; + Ok(args.make_user_val_from_f64_with_type(TyF64::count(num.n.cos()))) } /// Compute the sine of a number (in radians). -pub async fn sin(_exec_state: &mut ExecState, args: Args) -> Result { - let num: f64 = args.get_unlabeled_kw_arg("input")?; - Ok(args.make_user_val_from_f64_with_type(TyF64::count(num.sin()))) +pub async fn sin(exec_state: &mut ExecState, args: Args) -> Result { + let num: TyF64 = args.get_unlabeled_kw_arg_typed("input", &RuntimeType::radians(), exec_state)?; + Ok(args.make_user_val_from_f64_with_type(TyF64::count(num.n.sin()))) } /// Compute the tangent of a number (in radians). -pub async fn tan(_exec_state: &mut ExecState, args: Args) -> Result { - let num: f64 = args.get_unlabeled_kw_arg("input")?; - Ok(args.make_user_val_from_f64_with_type(TyF64::count(num.tan()))) +pub async fn tan(exec_state: &mut ExecState, args: Args) -> Result { + let num: TyF64 = args.get_unlabeled_kw_arg_typed("input", &RuntimeType::radians(), exec_state)?; + Ok(args.make_user_val_from_f64_with_type(TyF64::count(num.n.tan()))) } /// Return the value of `pi`. Archimedes’ constant (π). @@ -105,11 +104,11 @@ fn inner_pi() -> Result { } /// Compute the square root of a number. -pub async fn sqrt(_exec_state: &mut ExecState, args: Args) -> Result { - let num = args.get_number()?; - let result = inner_sqrt(num)?; +pub async fn sqrt(exec_state: &mut ExecState, args: Args) -> Result { + let num = args.get_number_with_type()?; + let result = inner_sqrt(num.n)?; - Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, NumericType::Unknown))) + Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, exec_state.current_default_units()))) } /// Compute the square root of a number. @@ -346,8 +345,8 @@ fn inner_max(args: Vec) -> f64 { } /// Compute the number to a power. -pub async fn pow(_exec_state: &mut ExecState, args: Args) -> Result { - let nums = args.get_number_array()?; +pub async fn pow(exec_state: &mut ExecState, args: Args) -> Result { + let nums = args.get_number_array_with_types()?; if nums.len() > 2 { return Err(KclError::Type(KclErrorDetails { message: format!("expected 2 arguments, got {}", nums.len()), @@ -362,9 +361,9 @@ pub async fn pow(_exec_state: &mut ExecState, args: Args) -> Result Result { /// Compute the arccosine of a number (in radians). pub async fn acos(_exec_state: &mut ExecState, args: Args) -> Result { - let num = args.get_number()?; - let result = inner_acos(num)?; + let num = args.get_number_with_type()?; + let result = inner_acos(num.n)?; Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, NumericType::radians()))) } @@ -422,8 +421,8 @@ fn inner_acos(num: f64) -> Result { /// Compute the arcsine of a number (in radians). pub async fn asin(_exec_state: &mut ExecState, args: Args) -> Result { - let num = args.get_number()?; - let result = inner_asin(num)?; + let num = args.get_number_with_type()?; + let result = inner_asin(num.n)?; Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, NumericType::radians()))) } @@ -452,8 +451,8 @@ fn inner_asin(num: f64) -> Result { /// Compute the arctangent of a number (in radians). pub async fn atan(_exec_state: &mut ExecState, args: Args) -> Result { - let num = args.get_number()?; - let result = inner_atan(num)?; + let num = args.get_number_with_type()?; + let result = inner_atan(num.n)?; Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, NumericType::radians()))) } @@ -481,8 +480,10 @@ fn inner_atan(num: f64) -> Result { } /// Compute the four quadrant arctangent of Y and X (in radians). -pub async fn atan2(_exec_state: &mut ExecState, args: Args) -> Result { - let (y, x) = FromArgs::from_args(&args, 0)?; +pub async fn atan2(exec_state: &mut ExecState, args: Args) -> Result { + let y = args.get_kw_arg_typed("y", &RuntimeType::length(), exec_state)?; + let x = args.get_kw_arg_typed("x", &RuntimeType::length(), exec_state)?; + let (y, x, _) = NumericType::combine_eq(y, x); let result = inner_atan2(y, x)?; Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, NumericType::radians()))) @@ -491,10 +492,10 @@ pub async fn atan2(_exec_state: &mut ExecState, args: Args) -> Result startProfileAt([0, 0], %) /// |> angledLine( -/// angle = toDegrees(atan2(1.25, 2)), +/// angle = toDegrees(atan2(y = 1.25, x = 2)), /// length = 20, /// ) /// |> yLine(endAbsolute = 0) @@ -505,6 +506,12 @@ pub async fn atan2(_exec_state: &mut ExecState, args: Args) -> Result Result { Ok(y.atan2(x)) @@ -515,8 +522,8 @@ fn inner_atan2(y: f64, x: f64) -> Result { /// The result might not be correctly rounded owing to implementation /// details; `log2()` can produce more accurate results for base 2, /// and `log10()` can produce more accurate results for base 10. -pub async fn log(_exec_state: &mut ExecState, args: Args) -> Result { - let nums = args.get_number_array()?; +pub async fn log(exec_state: &mut ExecState, args: Args) -> Result { + let nums = args.get_number_array_with_types()?; if nums.len() > 2 { return Err(KclError::Type(KclErrorDetails { message: format!("expected 2 arguments, got {}", nums.len()), @@ -530,9 +537,9 @@ pub async fn log(_exec_state: &mut ExecState, args: Args) -> Result Result { } /// Compute the base 2 logarithm of the number. -pub async fn log2(_exec_state: &mut ExecState, args: Args) -> Result { - let num = args.get_number()?; - let result = inner_log2(num)?; +pub async fn log2(exec_state: &mut ExecState, args: Args) -> Result { + let num = args.get_number_with_type()?; + let result = inner_log2(num.n)?; - Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, NumericType::Unknown))) + Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, exec_state.current_default_units()))) } /// Compute the base 2 logarithm of the number. @@ -588,11 +595,11 @@ fn inner_log2(num: f64) -> Result { } /// Compute the base 10 logarithm of the number. -pub async fn log10(_exec_state: &mut ExecState, args: Args) -> Result { - let num = args.get_number()?; - let result = inner_log10(num)?; +pub async fn log10(exec_state: &mut ExecState, args: Args) -> Result { + let num = args.get_number_with_type()?; + let result = inner_log10(num.n)?; - Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, NumericType::Unknown))) + Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, exec_state.current_default_units()))) } /// Compute the base 10 logarithm of the number. @@ -616,11 +623,11 @@ fn inner_log10(num: f64) -> Result { } /// Compute the natural logarithm of the number. -pub async fn ln(_exec_state: &mut ExecState, args: Args) -> Result { - let num = args.get_number()?; - let result = inner_ln(num)?; +pub async fn ln(exec_state: &mut ExecState, args: Args) -> Result { + let num = args.get_number_with_type()?; + let result = inner_ln(num.n)?; - Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, NumericType::Unknown))) + Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, exec_state.current_default_units()))) } /// Compute the natural logarithm of the number. @@ -709,8 +716,8 @@ fn inner_tau() -> Result { /// Converts a number from degrees to radians. pub async fn to_radians(_exec_state: &mut ExecState, args: Args) -> Result { - let num = args.get_number()?; - let result = inner_to_radians(num)?; + let num = args.get_number_with_type()?; + let result = inner_to_radians(num.n)?; Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, NumericType::radians()))) } @@ -739,8 +746,8 @@ fn inner_to_radians(num: f64) -> Result { /// Converts a number from radians to degrees. pub async fn to_degrees(_exec_state: &mut ExecState, args: Args) -> Result { - let num = args.get_number()?; - let result = inner_to_degrees(num)?; + let num = args.get_number_with_type()?; + let result = inner_to_degrees(num.n)?; Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, NumericType::degrees()))) } diff --git a/rust/kcl-lib/src/std/mirror.rs b/rust/kcl-lib/src/std/mirror.rs index 123e50e22..e4feff170 100644 --- a/rust/kcl-lib/src/std/mirror.rs +++ b/rust/kcl-lib/src/std/mirror.rs @@ -61,13 +61,13 @@ async fn inner_mirror_2d( ModelingCmd::from(mcmd::EntityMirror { ids: starting_sketches.iter().map(|sketch| sketch.id).collect(), axis: Point3d { - x: direction[0], - y: direction[1], + x: direction[0].n, + y: direction[1].n, z: 0.0, }, point: Point3d { - x: LengthUnit(origin[0]), - y: LengthUnit(origin[1]), + x: LengthUnit(origin[0].n), + y: LengthUnit(origin[1].n), z: LengthUnit(0.0), }, }), diff --git a/rust/kcl-lib/src/std/patterns.rs b/rust/kcl-lib/src/std/patterns.rs index 6afb4e3fa..d62c68749 100644 --- a/rust/kcl-lib/src/std/patterns.rs +++ b/rust/kcl-lib/src/std/patterns.rs @@ -16,15 +16,18 @@ use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use uuid::Uuid; -use super::args::Arg; +use super::{ + args::Arg, + utils::{untype_point, untype_point_3d}, +}; use crate::{ errors::{KclError, KclErrorDetails}, execution::{ kcl_value::FunctionSource, types::{NumericType, RuntimeType}, - ExecState, Geometries, Geometry, KclObjectFields, KclValue, Point2d, Point3d, Sketch, Solid, + ExecState, Geometries, Geometry, KclObjectFields, KclValue, Sketch, Solid, }, - std::Args, + std::{args::TyF64, Args}, ExecutorContext, SourceRange, }; @@ -472,13 +475,14 @@ async fn make_transform( transforms .into_iter() - .map(|obj| transform_from_obj_fields::(obj, source_ranges.clone())) + .map(|obj| transform_from_obj_fields::(obj, source_ranges.clone(), exec_state)) .collect() } fn transform_from_obj_fields( transform: KclObjectFields, source_ranges: Vec, + exec_state: &mut ExecState, ) -> Result { // Apply defaults to the transform. let replicate = match transform.get("replicate") { @@ -494,13 +498,26 @@ fn transform_from_obj_fields( }; let scale = match transform.get("scale") { - Some(x) => T::array_to_point3d(x, source_ranges.clone())?, - None => Point3d { x: 1.0, y: 1.0, z: 1.0 }, + Some(x) => untype_point_3d(T::array_to_point3d(x, source_ranges.clone(), exec_state)?) + .0 + .into(), + None => kcmc::shared::Point3d { x: 1.0, y: 1.0, z: 1.0 }, }; let translate = match transform.get("translate") { - Some(x) => T::array_to_point3d(x, source_ranges.clone())?, - None => Point3d { x: 0.0, y: 0.0, z: 0.0 }, + Some(x) => { + let (arr, _) = untype_point_3d(T::array_to_point3d(x, source_ranges.clone(), exec_state)?); + kcmc::shared::Point3d:: { + x: LengthUnit(arr[0]), + y: LengthUnit(arr[1]), + z: LengthUnit(arr[2]), + } + } + None => kcmc::shared::Point3d:: { + x: LengthUnit(0.0), + y: LengthUnit(0.0), + z: LengthUnit(0.0), + }, }; let mut rotation = Rotation::default(); @@ -513,7 +530,9 @@ fn transform_from_obj_fields( })); }; if let Some(axis) = rot.get("axis") { - rotation.axis = T::array_to_point3d(axis, source_ranges.clone())?.into(); + rotation.axis = untype_point_3d(T::array_to_point3d(axis, source_ranges.clone(), exec_state)?) + .0 + .into(); } if let Some(angle) = rot.get("angle") { match angle { @@ -533,7 +552,9 @@ fn transform_from_obj_fields( KclValue::String { value: s, meta: _ } if s == "local" => OriginType::Local, KclValue::String { value: s, meta: _ } if s == "global" => OriginType::Global, other => { - let origin = T::array_to_point3d(other, source_ranges.clone())?.into(); + let origin = untype_point_3d(T::array_to_point3d(other, source_ranges.clone(), exec_state)?) + .0 + .into(); OriginType::Custom { origin } } }; @@ -542,73 +563,50 @@ fn transform_from_obj_fields( Ok(Transform { replicate, - scale: scale.into(), - translate: translate.into(), + scale, + translate, rotation, }) } -fn array_to_point3d(val: &KclValue, source_ranges: Vec) -> Result { - let KclValue::MixedArray { value: arr, meta } = val else { - return Err(KclError::Semantic(KclErrorDetails { - message: "Expected an array of 3 numbers (i.e. a 3D point)".to_string(), - source_ranges, - })); - }; - let len = arr.len(); - if len != 3 { - return Err(KclError::Semantic(KclErrorDetails { - message: format!("Expected an array of 3 numbers (i.e. a 3D point) but found {len} items"), - source_ranges, - })); - }; - // Gets an f64 from a KCL value. - let f = |k: &KclValue, component: char| { - use super::args::FromKclValue; - if let Some(value) = f64::from_kcl_val(k) { - Ok(value) - } else { - Err(KclError::Semantic(KclErrorDetails { - message: format!("{component} component of this point was not a number"), - source_ranges: meta.iter().map(|m| m.source_range).collect(), - })) - } - }; - let x = f(&arr[0], 'x')?; - let y = f(&arr[1], 'y')?; - let z = f(&arr[2], 'z')?; - Ok(Point3d { x, y, z }) +fn array_to_point3d( + val: &KclValue, + source_ranges: Vec, + exec_state: &mut ExecState, +) -> Result<[TyF64; 3], KclError> { + val.coerce(&RuntimeType::point3d(), exec_state) + .map_err(|e| { + KclError::Semantic(KclErrorDetails { + message: format!( + "Expected an array of 3 numbers (i.e., a 3D point), found {}", + e.found + .map(|t| t.human_friendly_type()) + .unwrap_or_else(|| val.human_friendly_type().to_owned()) + ), + source_ranges, + }) + }) + .map(|val| val.as_point3d().unwrap()) } -fn array_to_point2d(val: &KclValue, source_ranges: Vec) -> Result { - let KclValue::MixedArray { value: arr, meta } = val else { - return Err(KclError::Semantic(KclErrorDetails { - message: "Expected an array of 2 numbers (i.e. a 2D point)".to_string(), - source_ranges, - })); - }; - let len = arr.len(); - if len != 2 { - return Err(KclError::Semantic(KclErrorDetails { - message: format!("Expected an array of 2 numbers (i.e. a 2D point) but found {len} items"), - source_ranges, - })); - }; - // Gets an f64 from a KCL value. - let f = |k: &KclValue, component: char| { - use super::args::FromKclValue; - if let Some(value) = f64::from_kcl_val(k) { - Ok(value) - } else { - Err(KclError::Semantic(KclErrorDetails { - message: format!("{component} component of this point was not a number"), - source_ranges: meta.iter().map(|m| m.source_range).collect(), - })) - } - }; - let x = f(&arr[0], 'x')?; - let y = f(&arr[1], 'y')?; - Ok(Point2d { x, y }) +fn array_to_point2d( + val: &KclValue, + source_ranges: Vec, + exec_state: &mut ExecState, +) -> Result<[TyF64; 2], KclError> { + val.coerce(&RuntimeType::point2d(), exec_state) + .map_err(|e| { + KclError::Semantic(KclErrorDetails { + message: format!( + "Expected an array of 2 numbers (i.e., a 2D point), found {}", + e.found + .map(|t| t.human_friendly_type()) + .unwrap_or_else(|| val.human_friendly_type().to_owned()) + ), + source_ranges, + }) + }) + .map(|val| val.as_point2d().unwrap()) } trait GeometryTrait: Clone { @@ -616,7 +614,11 @@ trait GeometryTrait: Clone { fn id(&self) -> Uuid; fn original_id(&self) -> Uuid; fn set_id(&mut self, id: Uuid); - fn array_to_point3d(val: &KclValue, source_ranges: Vec) -> Result; + fn array_to_point3d( + val: &KclValue, + source_ranges: Vec, + exec_state: &mut ExecState, + ) -> Result<[TyF64; 3], KclError>; async fn flush_batch(args: &Args, exec_state: &mut ExecState, set: &Self::Set) -> Result<(), KclError>; } @@ -631,9 +633,14 @@ impl GeometryTrait for Sketch { fn original_id(&self) -> Uuid { self.original_id } - fn array_to_point3d(val: &KclValue, source_ranges: Vec) -> Result { - let Point2d { x, y } = array_to_point2d(val, source_ranges)?; - Ok(Point3d { x, y, z: 0.0 }) + fn array_to_point3d( + val: &KclValue, + source_ranges: Vec, + exec_state: &mut ExecState, + ) -> Result<[TyF64; 3], KclError> { + let [x, y] = array_to_point2d(val, source_ranges, exec_state)?; + let ty = x.ty.clone(); + Ok([x, y, TyF64::new(0.0, ty)]) } async fn flush_batch(_: &Args, _: &mut ExecState, _: &Self::Set) -> Result<(), KclError> { @@ -655,8 +662,12 @@ impl GeometryTrait for Solid { self.sketch.original_id } - fn array_to_point3d(val: &KclValue, source_ranges: Vec) -> Result { - array_to_point3d(val, source_ranges) + fn array_to_point3d( + val: &KclValue, + source_ranges: Vec, + exec_state: &mut ExecState, + ) -> Result<[TyF64; 3], KclError> { + array_to_point3d(val, source_ranges, exec_state) } async fn flush_batch(args: &Args, exec_state: &mut ExecState, solid_set: &Self::Set) -> Result<(), KclError> { @@ -669,30 +680,35 @@ mod tests { use super::*; use crate::execution::types::NumericType; - #[test] - fn test_array_to_point3d() { + #[tokio::test(flavor = "multi_thread")] + async fn test_array_to_point3d() { + let mut exec_state = ExecState::new(&ExecutorContext::new_mock().await); let input = KclValue::MixedArray { value: vec![ KclValue::Number { value: 1.1, meta: Default::default(), - ty: NumericType::Unknown, + ty: NumericType::mm(), }, KclValue::Number { value: 2.2, meta: Default::default(), - ty: NumericType::Unknown, + ty: NumericType::mm(), }, KclValue::Number { value: 3.3, meta: Default::default(), - ty: NumericType::Unknown, + ty: NumericType::mm(), }, ], meta: Default::default(), }; - let expected = Point3d { x: 1.1, y: 2.2, z: 3.3 }; - let actual = array_to_point3d(&input, Vec::new()); + let expected = [ + TyF64::new(1.1, NumericType::mm()), + TyF64::new(2.2, NumericType::mm()), + TyF64::new(3.3, NumericType::mm()), + ]; + let actual = array_to_point3d(&input, Vec::new(), &mut exec_state); assert_eq!(actual.unwrap(), expected); } } @@ -701,10 +717,11 @@ mod tests { pub async fn pattern_linear_2d(exec_state: &mut ExecState, args: Args) -> Result { let sketches = args.get_unlabeled_kw_arg_typed("sketches", &RuntimeType::sketches(), exec_state)?; let instances: u32 = args.get_kw_arg("instances")?; - let distance: f64 = args.get_kw_arg("distance")?; - let axis: [f64; 2] = args.get_kw_arg("axis")?; + let distance: TyF64 = args.get_kw_arg_typed("distance", &RuntimeType::length(), exec_state)?; + let axis: [TyF64; 2] = args.get_kw_arg_typed("axis", &RuntimeType::point2d(), exec_state)?; let use_original: Option = args.get_kw_arg_opt("useOriginal")?; + let axis = untype_point(axis).0; if axis == [0.0, 0.0] { return Err(KclError::Semantic(KclErrorDetails { message: @@ -714,7 +731,8 @@ pub async fn pattern_linear_2d(exec_state: &mut ExecState, args: Args) -> Result })); } - let sketches = inner_pattern_linear_2d(sketches, instances, distance, axis, use_original, exec_state, args).await?; + let sketches = + inner_pattern_linear_2d(sketches, instances, distance.n, axis, use_original, exec_state, args).await?; Ok(sketches.into()) } @@ -780,10 +798,11 @@ async fn inner_pattern_linear_2d( pub async fn pattern_linear_3d(exec_state: &mut ExecState, args: Args) -> Result { let solids = args.get_unlabeled_kw_arg_typed("solids", &RuntimeType::solids(), exec_state)?; let instances: u32 = args.get_kw_arg("instances")?; - let distance: f64 = args.get_kw_arg("distance")?; - let axis: [f64; 3] = args.get_kw_arg("axis")?; + let distance: TyF64 = args.get_kw_arg_typed("distance", &RuntimeType::length(), exec_state)?; + let axis: [TyF64; 3] = args.get_kw_arg_typed("axis", &RuntimeType::point3d(), exec_state)?; let use_original: Option = args.get_kw_arg_opt("useOriginal")?; + let (axis, _) = untype_point_3d(axis); if axis == [0.0, 0.0, 0.0] { return Err(KclError::Semantic(KclErrorDetails { message: @@ -793,7 +812,7 @@ pub async fn pattern_linear_3d(exec_state: &mut ExecState, args: Args) -> Result })); } - let solids = inner_pattern_linear_3d(solids, instances, distance, axis, use_original, exec_state, args).await?; + let solids = inner_pattern_linear_3d(solids, instances, distance.n, axis, use_original, exec_state, args).await?; Ok(solids.into()) } @@ -828,11 +847,11 @@ pub async fn pattern_linear_3d(exec_state: &mut ExecState, args: Args) -> Result /// |> close(%) /// |> extrude(length = 65) /// -/// const thing1 = startSketchOn(case, 'end') +/// const thing1 = startSketchOn(case, face = 'end') /// |> circle(center = [-size / 2, -size / 2], radius = 25) /// |> extrude(length = 50) /// -/// const thing2 = startSketchOn(case, 'end') +/// const thing2 = startSketchOn(case, face = 'end') /// |> circle(center = [size / 2, -size / 2], radius = 25) /// |> extrude(length = 50) /// @@ -856,7 +875,7 @@ pub async fn pattern_linear_3d(exec_state: &mut ExecState, args: Args) -> Result /// |> close(%) /// |> extrude(length = 65) /// -/// const thing1 = startSketchOn(case, 'end') +/// const thing1 = startSketchOn(case, face = 'end') /// |> circle(center =[-size / 2, -size / 2], radius = 25) /// |> extrude(length = 50) /// @@ -1025,16 +1044,16 @@ impl CircularPattern { pub async fn pattern_circular_2d(exec_state: &mut ExecState, args: Args) -> Result { let sketches = args.get_unlabeled_kw_arg_typed("sketches", &RuntimeType::sketches(), exec_state)?; let instances: u32 = args.get_kw_arg("instances")?; - let center: [f64; 2] = args.get_kw_arg("center")?; - let arc_degrees: f64 = args.get_kw_arg("arcDegrees")?; + let center: [TyF64; 2] = args.get_kw_arg_typed("center", &RuntimeType::point2d(), exec_state)?; + let arc_degrees: TyF64 = args.get_kw_arg_typed("arcDegrees", &RuntimeType::angle(), exec_state)?; let rotate_duplicates: bool = args.get_kw_arg("rotateDuplicates")?; let use_original: Option = args.get_kw_arg_opt("useOriginal")?; let sketches = inner_pattern_circular_2d( sketches, instances, - center, - arc_degrees, + untype_point(center).0, + arc_degrees.n, rotate_duplicates, use_original, exec_state, @@ -1134,11 +1153,11 @@ pub async fn pattern_circular_3d(exec_state: &mut ExecState, args: Args) -> Resu // If instances is 1, this has no effect. let instances: u32 = args.get_kw_arg("instances")?; // The axis around which to make the pattern. This is a 3D vector. - let axis: [f64; 3] = args.get_kw_arg("axis")?; + let axis: [TyF64; 3] = args.get_kw_arg_typed("axis", &RuntimeType::point3d(), exec_state)?; // The center about which to make the pattern. This is a 3D vector. - let center: [f64; 3] = args.get_kw_arg("center")?; + let center: [TyF64; 3] = args.get_kw_arg_typed("center", &RuntimeType::point3d(), exec_state)?; // The arc angle (in degrees) to place the repetitions. Must be greater than 0. - let arc_degrees: f64 = args.get_kw_arg("arcDegrees")?; + let arc_degrees: TyF64 = args.get_kw_arg_typed("arcDegrees", &RuntimeType::angle(), exec_state)?; // Whether or not to rotate the duplicates as they are copied. let rotate_duplicates: bool = args.get_kw_arg("rotateDuplicates")?; // If the target being patterned is itself a pattern, then, should you use the original solid, @@ -1148,9 +1167,9 @@ pub async fn pattern_circular_3d(exec_state: &mut ExecState, args: Args) -> Resu let solids = inner_pattern_circular_3d( solids, instances, - axis, - center, - arc_degrees, + untype_point_3d(axis).0, + untype_point_3d(center).0, + arc_degrees.n, rotate_duplicates, use_original, exec_state, diff --git a/rust/kcl-lib/src/std/planes.rs b/rust/kcl-lib/src/std/planes.rs index e742f8c9b..8f53f45bd 100644 --- a/rust/kcl-lib/src/std/planes.rs +++ b/rust/kcl-lib/src/std/planes.rs @@ -4,18 +4,18 @@ use kcl_derive_docs::stdlib; use kcmc::{each_cmd as mcmd, length_unit::LengthUnit, shared::Color, ModelingCmd}; use kittycad_modeling_cmds as kcmc; -use super::sketch::PlaneData; +use super::{args::TyF64, sketch::PlaneData}; use crate::{ errors::KclError, - execution::{ExecState, KclValue, Plane, PlaneType}, + execution::{types::RuntimeType, ExecState, KclValue, Plane, PlaneType}, std::Args, }; /// Offset a plane by a distance along its normal. pub async fn offset_plane(exec_state: &mut ExecState, args: Args) -> Result { let std_plane = args.get_unlabeled_kw_arg("plane")?; - let offset = args.get_kw_arg("offset")?; - let plane = inner_offset_plane(std_plane, offset, exec_state).await?; + let offset: TyF64 = args.get_kw_arg_typed("offset", &RuntimeType::length(), exec_state)?; + let plane = inner_offset_plane(std_plane, offset.n, exec_state).await?; make_offset_plane_in_engine(&plane, exec_state, &args).await?; Ok(KclValue::Plane { value: Box::new(plane) }) } @@ -108,7 +108,7 @@ pub async fn offset_plane(exec_state: &mut ExecState, args: Args) -> Result Result = args.get_kw_arg_opt_typed("angle", &RuntimeType::angle(), exec_state)?; + let tolerance: Option = args.get_kw_arg_opt_typed("tolerance", &RuntimeType::count(), exec_state)?; let tag_start = args.get_kw_arg_opt("tagStart")?; let tag_end = args.get_kw_arg_opt("tagEnd")?; let symmetric = args.get_kw_arg_opt("symmetric")?; - let bidirectional_angle = args.get_kw_arg_opt("bidirectionalAngle")?; + let bidirectional_angle: Option = + args.get_kw_arg_opt_typed("bidirectionalAngle", &RuntimeType::angle(), exec_state)?; let value = inner_revolve( sketches, axis, - angle, - tolerance, + angle.map(|t| t.n), + tolerance.map(|t| t.n), tag_start, tag_end, symmetric, - bidirectional_angle, + bidirectional_angle.map(|t| t.n), exec_state, args, ) @@ -134,13 +135,13 @@ async fn inner_revolve( angle, target: sketch.id.into(), axis: Point3d { - x: direction[0], - y: direction[1], + x: direction[0].n, + y: direction[1].n, z: 0.0, }, origin: Point3d { - x: LengthUnit(origin[0]), - y: LengthUnit(origin[1]), + x: LengthUnit(origin[0].n), + y: LengthUnit(origin[1].n), z: LengthUnit(0.0), }, tolerance: LengthUnit(tolerance.unwrap_or(DEFAULT_TOLERANCE)), diff --git a/rust/kcl-lib/src/std/segment.rs b/rust/kcl-lib/src/std/segment.rs index 7616de4ce..55da9539a 100644 --- a/rust/kcl-lib/src/std/segment.rs +++ b/rust/kcl-lib/src/std/segment.rs @@ -8,11 +8,13 @@ use crate::{ errors::{KclError, KclErrorDetails}, execution::{ types::{NumericType, PrimitiveType, RuntimeType}, - ExecState, KclValue, Point2d, Sketch, TagIdentifier, + ExecState, KclValue, Sketch, TagIdentifier, }, std::{args::TyF64, utils::between, Args}, }; +use super::utils::untype_point; + /// Returns the point at the end of the given segment. pub async fn segment_end(exec_state: &mut ExecState, args: Args) -> Result { let tag: TagIdentifier = args.get_unlabeled_kw_arg("tag")?; @@ -565,17 +567,17 @@ async fn inner_tangent_to_end(tag: &TagIdentifier, exec_state: &mut ExecState, a }) })?; - let from = Point2d::from(path.get_to()); + let from = untype_point(path.get_to()).0; // Undocumented voodoo from get_tangential_arc_to_info let tangent_info = path.get_tangential_info(); - let tan_previous_point = tangent_info.tan_previous_point(from.into()); + let tan_previous_point = tangent_info.tan_previous_point(from); // Calculate the end point from the angle and radius. // atan2 outputs radians. let previous_end_tangent = Angle::from_radians(f64::atan2( - from.y - tan_previous_point[1], - from.x - tan_previous_point[0], + from[1] - tan_previous_point[1], + from[0] - tan_previous_point[0], )); Ok(previous_end_tangent.to_degrees()) @@ -584,7 +586,7 @@ async fn inner_tangent_to_end(tag: &TagIdentifier, exec_state: &mut ExecState, a /// Returns the angle to match the given length for x. pub async fn angle_to_match_length_x(exec_state: &mut ExecState, args: Args) -> Result { let (tag, to, sketch) = args.get_tag_to_number_sketch()?; - let result = inner_angle_to_match_length_x(&tag, to, sketch, exec_state, args.clone())?; + let result = inner_angle_to_match_length_x(&tag, to.n, sketch, exec_state, args.clone())?; Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, NumericType::degrees()))) } @@ -648,7 +650,7 @@ fn inner_angle_to_match_length_x( /// Returns the angle to match the given length for y. pub async fn angle_to_match_length_y(exec_state: &mut ExecState, args: Args) -> Result { let (tag, to, sketch) = args.get_tag_to_number_sketch()?; - let result = inner_angle_to_match_length_y(&tag, to, sketch, exec_state, args.clone())?; + let result = inner_angle_to_match_length_y(&tag, to.n, sketch, exec_state, args.clone())?; Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, NumericType::degrees()))) } diff --git a/rust/kcl-lib/src/std/shapes.rs b/rust/kcl-lib/src/std/shapes.rs index 0ce4e311f..0f74cf03b 100644 --- a/rust/kcl-lib/src/std/shapes.rs +++ b/rust/kcl-lib/src/std/shapes.rs @@ -11,11 +11,11 @@ use kcmc::{ use kittycad_modeling_cmds as kcmc; use kittycad_modeling_cmds::shared::PathSegment; use schemars::JsonSchema; -use serde::{Deserialize, Serialize}; +use serde::Serialize; use crate::{ errors::{KclError, KclErrorDetails}, - execution::{BasePath, ExecState, GeoMeta, KclValue, Path, Sketch, SketchSurface}, + execution::{types::RuntimeType, BasePath, ExecState, GeoMeta, KclValue, Path, Sketch, SketchSurface}, parsing::ast::types::TagNode, std::{ sketch::NEW_TAG_KW, @@ -24,6 +24,8 @@ use crate::{ }, }; +use super::{args::TyF64, utils::untype_point}; + /// A sketch surface or a sketch. #[derive(Debug, Clone, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[ts(export)] @@ -36,11 +38,19 @@ pub enum SketchOrSurface { /// Sketch a circle. pub async fn circle(exec_state: &mut ExecState, args: Args) -> Result { let sketch_or_surface = args.get_unlabeled_kw_arg("sketchOrSurface")?; - let center = args.get_kw_arg("center")?; - let radius = args.get_kw_arg("radius")?; + let center = args.get_kw_arg_typed("center", &RuntimeType::point2d(), exec_state)?; + let radius: TyF64 = args.get_kw_arg_typed("radius", &RuntimeType::length(), exec_state)?; let tag = args.get_kw_arg_opt(NEW_TAG_KW)?; - let sketch = inner_circle(sketch_or_surface, center, radius, tag, exec_state, args).await?; + let sketch = inner_circle( + sketch_or_surface, + untype_point(center).0, + radius.n, + tag, + exec_state, + args, + ) + .await?; Ok(KclValue::Sketch { value: Box::new(sketch), }) @@ -121,12 +131,21 @@ async fn inner_circle( /// Sketch a 3-point circle. pub async fn circle_three_point(exec_state: &mut ExecState, args: Args) -> Result { let sketch_surface_or_group = args.get_unlabeled_kw_arg("sketch_surface_or_group")?; - let p1 = args.get_kw_arg("p1")?; - let p2 = args.get_kw_arg("p2")?; - let p3 = args.get_kw_arg("p3")?; + let p1 = args.get_kw_arg_typed("p1", &RuntimeType::point2d(), exec_state)?; + let p2 = args.get_kw_arg_typed("p2", &RuntimeType::point2d(), exec_state)?; + let p3 = args.get_kw_arg_typed("p3", &RuntimeType::point2d(), exec_state)?; let tag = args.get_kw_arg_opt("tag")?; - let sketch = inner_circle_three_point(sketch_surface_or_group, p1, p2, p3, tag, exec_state, args).await?; + let sketch = inner_circle_three_point( + sketch_surface_or_group, + untype_point(p1).0, + untype_point(p2).0, + untype_point(p3).0, + tag, + exec_state, + args, + ) + .await?; Ok(KclValue::Sketch { value: Box::new(sketch), }) @@ -165,7 +184,7 @@ async fn inner_circle_three_point( ) -> Result { let center = calculate_circle_center(p1, p2, p3); // It can be the distance to any of the 3 points - they all lay on the circumference. - let radius = distance(center.into(), p2.into()); + let radius = distance(center, p2); let sketch_surface = match sketch_surface_or_group { SketchOrSurface::SketchSurface(surface) => surface, @@ -231,7 +250,7 @@ async fn inner_circle_three_point( } /// Type of the polygon -#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Default)] +#[derive(Debug, Clone, Serialize, PartialEq, ts_rs::TS, JsonSchema, Default)] #[ts(export)] #[serde(rename_all = "lowercase")] pub enum PolygonType { @@ -241,16 +260,16 @@ pub enum PolygonType { } /// Data for drawing a polygon -#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] +#[derive(Debug, Clone, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[ts(export)] #[serde(rename_all = "camelCase")] pub struct PolygonData { /// The radius of the polygon - pub radius: f64, + pub radius: TyF64, /// The number of sides in the polygon pub num_sides: u64, /// The center point of the polygon - pub center: [f64; 2], + pub center: [TyF64; 2], /// The type of the polygon (inscribed or circumscribed) #[serde(skip)] pub polygon_type: PolygonType, @@ -317,7 +336,7 @@ async fn inner_polygon( })); } - if data.radius <= 0.0 { + if data.radius.n <= 0.0 { return Err(KclError::Type(KclErrorDetails { message: "Radius must be greater than 0".to_string(), source_ranges: vec![args.source_range], @@ -332,8 +351,8 @@ async fn inner_polygon( let half_angle = std::f64::consts::PI / data.num_sides as f64; let radius_to_vertices = match data.polygon_type { - PolygonType::Inscribed => data.radius, - PolygonType::Circumscribed => data.radius / half_angle.cos(), + PolygonType::Inscribed => data.radius.n, + PolygonType::Circumscribed => data.radius.n / half_angle.cos(), }; let angle_step = 2.0 * std::f64::consts::PI / data.num_sides as f64; @@ -342,8 +361,8 @@ async fn inner_polygon( .map(|i| { let angle = angle_step * i as f64; [ - data.center[0] + radius_to_vertices * angle.cos(), - data.center[1] + radius_to_vertices * angle.sin(), + data.center[0].n + radius_to_vertices * angle.cos(), + data.center[1].n + radius_to_vertices * angle.sin(), ] }) .collect(); diff --git a/rust/kcl-lib/src/std/shell.rs b/rust/kcl-lib/src/std/shell.rs index 618696f7c..13e029de2 100644 --- a/rust/kcl-lib/src/std/shell.rs +++ b/rust/kcl-lib/src/std/shell.rs @@ -11,13 +11,15 @@ use crate::{ std::{sketch::FaceTag, Args}, }; +use super::args::TyF64; + /// Create a shell. pub async fn shell(exec_state: &mut ExecState, args: Args) -> Result { let solids = args.get_unlabeled_kw_arg_typed("solids", &RuntimeType::solids(), exec_state)?; - let thickness = args.get_kw_arg("thickness")?; + let thickness: TyF64 = args.get_kw_arg_typed("thickness", &RuntimeType::count(), exec_state)?; let faces = args.get_kw_arg("faces")?; - let result = inner_shell(solids, thickness, faces, exec_state, args).await?; + let result = inner_shell(solids, thickness.n, faces, exec_state, args).await?; Ok(result.into()) } @@ -27,7 +29,7 @@ pub async fn shell(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([-12, 12], %) /// |> line(end = [24, 0]) /// |> line(end = [0, -24]) @@ -45,7 +47,7 @@ pub async fn shell(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([-12, 12], %) /// |> line(end = [24, 0]) /// |> line(end = [0, -24]) @@ -63,7 +65,7 @@ pub async fn shell(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([-12, 12], %) /// |> line(end = [24, 0]) /// |> line(end = [0, -24]) @@ -81,7 +83,7 @@ pub async fn shell(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([-12, 12], %) /// |> line(end = [24, 0]) /// |> line(end = [0, -24]) @@ -100,7 +102,7 @@ pub async fn shell(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([-size, -size], %) /// |> line(end = [2 * size, 0]) /// |> line(end = [0, 2 * size]) @@ -108,11 +110,11 @@ pub async fn shell(exec_state: &mut ExecState, args: Args) -> Result close() /// |> extrude(length = 65) /// -/// thing1 = startSketchOn(case, 'end') +/// thing1 = startSketchOn(case, face = 'end') /// |> circle( center = [-size / 2, -size / 2], radius = 25 ) /// |> extrude(length = 50) /// -/// thing2 = startSketchOn(case, 'end') +/// thing2 = startSketchOn(case, face = 'end') /// |> circle( center = [size / 2, -size / 2], radius = 25 ) /// |> extrude(length = 50) /// @@ -123,7 +125,7 @@ pub async fn shell(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([-size, -size], %) /// |> line(end = [2 * size, 0]) /// |> line(end = [0, 2 * size]) @@ -131,11 +133,11 @@ pub async fn shell(exec_state: &mut ExecState, args: Args) -> Result close() /// |> extrude(length = 65) /// -/// thing1 = startSketchOn(case, 'end') +/// thing1 = startSketchOn(case, face = 'end') /// |> circle( center = [-size / 2, -size / 2], radius = 25 ) /// |> extrude(length = 50) /// -/// thing2 = startSketchOn(case, 'end') +/// thing2 = startSketchOn(case, face = 'end') /// |> circle( center = [size / 2, -size / 2], radius = 25 ) /// |> extrude(length = 50) /// @@ -148,7 +150,7 @@ pub async fn shell(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([-size, -size], %) /// |> line(end = [2 * size, 0]) /// |> line(end = [0, 2 * size]) @@ -156,11 +158,11 @@ pub async fn shell(exec_state: &mut ExecState, args: Args) -> Result close() /// |> extrude(length = 65) /// -/// thing1 = startSketchOn(case, 'end') +/// thing1 = startSketchOn(case, face = 'end') /// |> circle( center = [-size / 2, -size / 2], radius = 25 ) /// |> extrude(length = 50) /// -/// thing2 = startSketchOn(case, 'end') +/// thing2 = startSketchOn(case, face = 'end') /// |> circle( center = [size / 2, -size / 2], radius = 25) /// |> extrude(length = 50) /// @@ -245,9 +247,9 @@ async fn inner_shell( /// Make the inside of a 3D object hollow. pub async fn hollow(exec_state: &mut ExecState, args: Args) -> Result { - let (thickness, solid): (f64, Box) = args.get_data_and_solid(exec_state)?; + let (thickness, solid) = args.get_data_and_solid(exec_state)?; - let value = inner_hollow(thickness, solid, exec_state, args).await?; + let value = inner_hollow(thickness.n, solid, exec_state, args).await?; Ok(KclValue::Solid { value }) } @@ -258,7 +260,7 @@ pub async fn hollow(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([-12, 12], %) /// |> line(end = [24, 0]) /// |> line(end = [0, -24]) @@ -270,7 +272,7 @@ pub async fn hollow(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([-12, 12], %) /// |> line(end = [24, 0]) /// |> line(end = [0, -24]) @@ -283,7 +285,7 @@ pub async fn hollow(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([-size, -size], %) /// |> line(end = [2 * size, 0]) /// |> line(end = [0, 2 * size]) @@ -291,11 +293,11 @@ pub async fn hollow(exec_state: &mut ExecState, args: Args) -> Result close() /// |> extrude(length = 65) /// -/// thing1 = startSketchOn(case, 'end') +/// thing1 = startSketchOn(case, face = 'end') /// |> circle( center = [-size / 2, -size / 2], radius = 25 ) /// |> extrude(length = 50) /// -/// thing2 = startSketchOn(case, 'end') +/// thing2 = startSketchOn(case, face = 'end') /// |> circle( center = [size / 2, -size / 2], radius = 25 ) /// |> extrude(length = 50) /// diff --git a/rust/kcl-lib/src/std/sketch.rs b/rust/kcl-lib/src/std/sketch.rs index 3132a40fa..53a9e9944 100644 --- a/rust/kcl-lib/src/std/sketch.rs +++ b/rust/kcl-lib/src/std/sketch.rs @@ -11,6 +11,7 @@ use parse_display::{Display, FromStr}; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; +use crate::execution::types::UnitLen; use crate::{ errors::{KclError, KclErrorDetails}, execution::{ @@ -28,6 +29,8 @@ use crate::{ }, }; +use super::utils::untype_point; + /// A tag for a face. #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[ts(export)] @@ -96,13 +99,20 @@ pub const NEW_TAG_KW: &str = "tag"; /// Draw a line to a point. pub async fn line(exec_state: &mut ExecState, args: Args) -> Result { - let sketch = - args.get_unlabeled_kw_arg_typed("sketch", &RuntimeType::Primitive(PrimitiveType::Sketch), exec_state)?; - let end = args.get_kw_arg_opt("end")?; - let end_absolute = args.get_kw_arg_opt("endAbsolute")?; + let sketch = args.get_unlabeled_kw_arg_typed("sketch", &RuntimeType::sketch(), exec_state)?; + let end = args.get_kw_arg_opt_typed("end", &RuntimeType::point2d(), exec_state)?; + let end_absolute = args.get_kw_arg_opt_typed("endAbsolute", &RuntimeType::point2d(), exec_state)?; let tag = args.get_kw_arg_opt(NEW_TAG_KW)?; - let new_sketch = inner_line(sketch, end_absolute, end, tag, exec_state, args).await?; + let new_sketch = inner_line( + sketch, + end_absolute.map(|p| untype_point(p).0), + end.map(|p| untype_point(p).0), + tag, + exec_state, + args, + ) + .await?; Ok(KclValue::Sketch { value: Box::new(new_sketch), }) @@ -266,11 +276,19 @@ async fn straight_line( pub async fn x_line(exec_state: &mut ExecState, args: Args) -> Result { let sketch = args.get_unlabeled_kw_arg_typed("sketch", &RuntimeType::Primitive(PrimitiveType::Sketch), exec_state)?; - let length = args.get_kw_arg_opt("length")?; - let end_absolute = args.get_kw_arg_opt("endAbsolute")?; + let length: Option = args.get_kw_arg_opt_typed("length", &RuntimeType::length(), exec_state)?; + let end_absolute: Option = args.get_kw_arg_opt_typed("endAbsolute", &RuntimeType::length(), exec_state)?; let tag = args.get_kw_arg_opt(NEW_TAG_KW)?; - let new_sketch = inner_x_line(sketch, length, end_absolute, tag, exec_state, args).await?; + let new_sketch = inner_x_line( + sketch, + length.map(|t| t.n), + end_absolute.map(|t| t.n), + tag, + exec_state, + args, + ) + .await?; Ok(KclValue::Sketch { value: Box::new(new_sketch), }) @@ -335,11 +353,19 @@ async fn inner_x_line( pub async fn y_line(exec_state: &mut ExecState, args: Args) -> Result { let sketch = args.get_unlabeled_kw_arg_typed("sketch", &RuntimeType::Primitive(PrimitiveType::Sketch), exec_state)?; - let length = args.get_kw_arg_opt("length")?; - let end_absolute = args.get_kw_arg_opt("endAbsolute")?; + let length: Option = args.get_kw_arg_opt_typed("length", &RuntimeType::length(), exec_state)?; + let end_absolute: Option = args.get_kw_arg_opt_typed("endAbsolute", &RuntimeType::length(), exec_state)?; let tag = args.get_kw_arg_opt(NEW_TAG_KW)?; - let new_sketch = inner_y_line(sketch, length, end_absolute, tag, exec_state, args).await?; + let new_sketch = inner_y_line( + sketch, + length.map(|t| t.n), + end_absolute.map(|t| t.n), + tag, + exec_state, + args, + ) + .await?; Ok(KclValue::Sketch { value: Box::new(new_sketch), }) @@ -397,24 +423,25 @@ async fn inner_y_line( /// Draw an angled line. pub async fn angled_line(exec_state: &mut ExecState, args: Args) -> Result { - let sketch = - args.get_unlabeled_kw_arg_typed("sketch", &RuntimeType::Primitive(PrimitiveType::Sketch), exec_state)?; - let angle = args.get_kw_arg("angle")?; - let length = args.get_kw_arg_opt("length")?; - let length_x = args.get_kw_arg_opt("lengthX")?; - let length_y = args.get_kw_arg_opt("lengthY")?; - let end_absolute_x = args.get_kw_arg_opt("endAbsoluteX")?; - let end_absolute_y = args.get_kw_arg_opt("endAbsoluteY")?; + let sketch = args.get_unlabeled_kw_arg_typed("sketch", &RuntimeType::sketch(), exec_state)?; + let angle: TyF64 = args.get_kw_arg_typed("angle", &RuntimeType::degrees(), exec_state)?; + let length: Option = args.get_kw_arg_opt_typed("length", &RuntimeType::length(), exec_state)?; + let length_x: Option = args.get_kw_arg_opt_typed("lengthX", &RuntimeType::length(), exec_state)?; + let length_y: Option = args.get_kw_arg_opt_typed("lengthY", &RuntimeType::length(), exec_state)?; + let end_absolute_x: Option = + args.get_kw_arg_opt_typed("endAbsoluteX", &RuntimeType::length(), exec_state)?; + let end_absolute_y: Option = + args.get_kw_arg_opt_typed("endAbsoluteY", &RuntimeType::length(), exec_state)?; let tag = args.get_kw_arg_opt(NEW_TAG_KW)?; let new_sketch = inner_angled_line( sketch, - angle, - length, - length_x, - length_y, - end_absolute_x, - end_absolute_y, + angle.n, + length.map(|t| t.n), + length_x.map(|t| t.n), + length_y.map(|t| t.n), + end_absolute_x.map(|t| t.n), + end_absolute_y.map(|t| t.n), tag, exec_state, args, @@ -597,7 +624,7 @@ async fn inner_angled_line_of_x_length( let to = get_y_component(Angle::from_degrees(angle_degrees), length); - let new_sketch = straight_line(StraightLineParams::relative(to.into(), sketch, tag), exec_state, args).await?; + let new_sketch = straight_line(StraightLineParams::relative(to, sketch, tag), exec_state, args).await?; Ok(new_sketch) } @@ -663,7 +690,7 @@ async fn inner_angled_line_of_y_length( let to = get_x_component(Angle::from_degrees(angle_degrees), length); - let new_sketch = straight_line(StraightLineParams::relative(to.into(), sketch, tag), exec_state, args).await?; + let new_sketch = straight_line(StraightLineParams::relative(to, sketch, tag), exec_state, args).await?; Ok(new_sketch) } @@ -706,17 +733,17 @@ async fn inner_angled_line_to_y( } /// Data for drawing an angled line that intersects with a given line. -#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] +#[derive(Debug, Clone, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[ts(export)] #[serde(rename_all = "camelCase")] // TODO: make sure the docs on the args below are correct. pub struct AngledLineThatIntersectsData { /// The angle of the line. - pub angle: f64, + pub angle: TyF64, /// The tag of the line to intersect with. pub intersect_tag: TagIdentifier, /// The offset from the intersecting line. - pub offset: Option, + pub offset: Option, } /// Draw an angled line that intersects with a given line. @@ -768,13 +795,13 @@ pub async fn inner_angled_line_that_intersects( let from = sketch.current_pen_position()?; let to = intersection_with_parallel_line( - &[path.get_from().into(), path.get_to().into()], - data.offset.unwrap_or_default(), - data.angle, - from, + &[untype_point(path.get_from()).0, untype_point(path.get_to()).0], + data.offset.map(|t| t.n).unwrap_or_default(), + data.angle.n, + from.into(), ); - let new_sketch = straight_line(StraightLineParams::absolute(to.into(), sketch, tag), exec_state, args).await?; + let new_sketch = straight_line(StraightLineParams::absolute(to, sketch, tag), exec_state, args).await?; Ok(new_sketch) } @@ -832,9 +859,14 @@ pub enum PlaneData { /// Start a sketch on a specific plane or face. pub async fn start_sketch_on(exec_state: &mut ExecState, args: Args) -> Result { - let (data, tag) = args.get_sketch_data_and_optional_tag()?; + let data = args.get_unlabeled_kw_arg_typed( + "planeOrSolid", + &RuntimeType::Union(vec![RuntimeType::solid(), RuntimeType::plane()]), + exec_state, + )?; + let face = args.get_kw_arg_opt("face")?; - match inner_start_sketch_on(data, tag, exec_state, &args).await? { + match inner_start_sketch_on(data, face, exec_state, &args).await? { SketchSurface::Plane(value) => Ok(KclValue::Plane { value }), SketchSurface::Face(value) => Ok(KclValue::Face { value }), } @@ -870,7 +902,7 @@ pub async fn start_sketch_on(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([1, 1], %) /// |> line(end = [8, 0]) /// |> line(end = [0, 8]) @@ -879,7 +911,7 @@ pub async fn start_sketch_on(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([2, 2], %) /// |> line(end = [6, 0]) /// |> line(end = [0, 6]) @@ -901,7 +933,7 @@ pub async fn start_sketch_on(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([1, 1], %) /// |> line(end = [8, 0]) /// |> line(end = [0, 8]) @@ -910,7 +942,7 @@ pub async fn start_sketch_on(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([2, 2], %) /// |> line(end = [6, 0]) /// |> line(end = [0, 6]) @@ -930,7 +962,7 @@ pub async fn start_sketch_on(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([1, 1], %) /// |> line(end = [8, 0]) /// |> line(end = [0, 8]) @@ -939,7 +971,7 @@ pub async fn start_sketch_on(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([-8, 12], %) /// |> line(end = [0, 6]) /// |> line(end = [6, 0]) @@ -963,7 +995,7 @@ pub async fn start_sketch_on(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([4.5, -5], %) /// |> line(end = [0, 5]) /// |> line(end = [5, 0]) @@ -989,7 +1021,7 @@ pub async fn start_sketch_on(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([4.5, -5], %) /// |> line(end = [0, 5]) /// |> line(end = [5, 0]) @@ -1001,13 +1033,11 @@ pub async fn start_sketch_on(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([0, 0], %) /// |> line(end = [100.0, 0]) /// |> yLine(length = -100.0) @@ -1019,14 +1049,20 @@ pub async fn start_sketch_on(exec_state: &mut ExecState, args: Args) -> Result, + plane_or_solid: SketchData, + face: Option, exec_state: &mut ExecState, args: &Args, ) -> Result { - match data { + match plane_or_solid { SketchData::PlaneOrientation(plane_data) => { let plane = make_sketch_plane_from_orientation(plane_data, exec_state, args).await?; Ok(SketchSurface::Plane(plane)) @@ -1048,7 +1084,7 @@ async fn inner_start_sketch_on( } } SketchData::Solid(solid) => { - let Some(tag) = tag else { + let Some(tag) = face else { return Err(KclError::Type(KclErrorDetails { message: "Expected a tag for the face to sketch on".to_string(), source_ranges: vec![args.source_range], @@ -1107,9 +1143,9 @@ async fn make_sketch_plane_from_orientation( // TODO: ignoring the default planes here since we already created them, breaks the // front end for the feature tree which is stupid and we should fix it. let x_axis = match data { - PlaneData::NegXY => Point3d::new(-1.0, 0.0, 0.0), - PlaneData::NegXZ => Point3d::new(-1.0, 0.0, 0.0), - PlaneData::NegYZ => Point3d::new(0.0, -1.0, 0.0), + PlaneData::NegXY => Point3d::new(-1.0, 0.0, 0.0, UnitLen::Mm), + PlaneData::NegXZ => Point3d::new(-1.0, 0.0, 0.0, UnitLen::Mm), + PlaneData::NegYZ => Point3d::new(0.0, -1.0, 0.0, UnitLen::Mm), _ => plane.x_axis, }; args.batch_modeling_cmd( @@ -1151,10 +1187,9 @@ async fn make_sketch_plane_from_orientation( /// Start a new profile at a given point. pub async fn start_profile_at(exec_state: &mut ExecState, args: Args) -> Result { - let (start, sketch_surface, tag): ([f64; 2], SketchSurface, Option) = - args.get_data_and_sketch_surface()?; + let (start, sketch_surface, tag) = args.get_data_and_sketch_surface()?; - let sketch = inner_start_profile_at(start, sketch_surface, tag, exec_state, args).await?; + let sketch = inner_start_profile_at([start[0].n, start[1].n], sketch_surface, tag, exec_state, args).await?; Ok(KclValue::Sketch { value: Box::new(sketch), }) @@ -1431,7 +1466,7 @@ pub(crate) async fn inner_close( args: Args, ) -> Result { let from = sketch.current_pen_position()?; - let to: Point2d = sketch.start.from.into(); + let to: Point2d = sketch.start.get_from().into(); let id = exec_state.next_uuid(); @@ -1462,7 +1497,7 @@ pub(crate) async fn inner_close( } /// Data to draw an arc. -#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] +#[derive(Debug, Clone, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[ts(export)] #[serde(rename_all = "camelCase", untagged)] pub enum ArcData { @@ -1471,34 +1506,34 @@ pub enum ArcData { /// The start angle. #[serde(rename = "angleStart")] #[schemars(range(min = -360.0, max = 360.0))] - angle_start: f64, + angle_start: TyF64, /// The end angle. #[serde(rename = "angleEnd")] #[schemars(range(min = -360.0, max = 360.0))] - angle_end: f64, + angle_end: TyF64, /// The radius. - radius: f64, + radius: TyF64, }, /// Center, to and radius with an optional tag. CenterToRadius { /// The center. - center: [f64; 2], + center: [TyF64; 2], /// The to point. - to: [f64; 2], + to: [TyF64; 2], /// The radius. - radius: f64, + radius: TyF64, }, } /// Data to draw a three point arc (arcTo). -#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] +#[derive(Debug, Clone, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[ts(export)] #[serde(rename_all = "camelCase")] pub struct ArcToData { /// End point of the arc. A point in 3D space - pub end: [f64; 2], + pub end: [TyF64; 2], /// Interior point of the arc. A point in 3D space - pub interior: [f64; 2], + pub interior: [TyF64; 2], } /// Draw an arc. @@ -1552,14 +1587,26 @@ pub(crate) async fn inner_arc( angle_end, radius, } => { - let a_start = Angle::from_degrees(*angle_start); - let a_end = Angle::from_degrees(*angle_end); - let (center, end) = arc_center_and_end(from, a_start, a_end, *radius); - (center, a_start, a_end, *radius, end) + let a_start = Angle::from_degrees(angle_start.n); + let a_end = Angle::from_degrees(angle_end.n); + let (center, end) = arc_center_and_end(from.into(), a_start, a_end, radius.n); + (center, a_start, a_end, radius.n, end) } ArcData::CenterToRadius { center, to, radius } => { - let (angle_start, angle_end) = arc_angles(from, to.into(), center.into(), *radius, args.source_range)?; - (center.into(), angle_start, angle_end, *radius, to.into()) + let (angle_start, angle_end) = arc_angles( + from.into(), + untype_point(to.clone()).0, + untype_point(center.clone()).0, + radius.n, + args.source_range, + )?; + ( + untype_point(center.clone()).0, + angle_start, + angle_end, + radius.n, + untype_point(to.clone()).0, + ) } }; @@ -1591,7 +1638,7 @@ pub(crate) async fn inner_arc( let current_path = Path::Arc { base: BasePath { from: from.into(), - to: end.into(), + to: end, tag: tag.clone(), units: sketch.units, geo_meta: GeoMeta { @@ -1599,7 +1646,7 @@ pub(crate) async fn inner_arc( metadata: args.source_range.into(), }, }, - center: center.into(), + center, radius, ccw, }; @@ -1660,13 +1707,13 @@ pub(crate) async fn inner_arc_to( path: sketch.id.into(), segment: PathSegment::ArcTo { end: kcmc::shared::Point3d { - x: LengthUnit(data.end[0]), - y: LengthUnit(data.end[1]), + x: LengthUnit(data.end[0].n), + y: LengthUnit(data.end[1].n), z: LengthUnit(0.0), }, interior: kcmc::shared::Point3d { - x: LengthUnit(data.interior[0]), - y: LengthUnit(data.interior[1]), + x: LengthUnit(data.interior[0].n), + y: LengthUnit(data.interior[1].n), z: LengthUnit(0.0), }, relative: false, @@ -1677,12 +1724,12 @@ pub(crate) async fn inner_arc_to( let start = [from.x, from.y]; let interior = data.interior; - let end = data.end; + let end = data.end.clone(); let current_path = Path::ArcThreePoint { base: BasePath { from: from.into(), - to: data.end, + to: untype_point(data.end).0, tag: tag.clone(), units: sketch.units, geo_meta: GeoMeta { @@ -1691,8 +1738,8 @@ pub(crate) async fn inner_arc_to( }, }, p1: start, - p2: interior, - p3: end, + p2: untype_point(interior).0, + p3: untype_point(end).0, }; let mut new_sketch = sketch.clone(); @@ -1706,16 +1753,16 @@ pub(crate) async fn inner_arc_to( } /// Data to draw a tangential arc. -#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, JsonSchema, ts_rs::TS)] +#[derive(Debug, Clone, Serialize, PartialEq, JsonSchema, ts_rs::TS)] #[ts(export)] #[serde(rename_all = "camelCase", untagged)] pub enum TangentialArcData { RadiusAndOffset { /// Radius of the arc. /// Not to be confused with Raiders of the Lost Ark. - radius: f64, + radius: TyF64, /// Offset of the arc, in degrees. - offset: f64, + offset: TyF64, }, } @@ -1773,7 +1820,7 @@ async fn inner_tangential_arc( let (center, to, ccw) = match data { TangentialArcData::RadiusAndOffset { radius, offset } => { // KCL stdlib types use degrees. - let offset = Angle::from_degrees(offset); + let offset = Angle::from_degrees(offset.n); // Calculate the end point from the angle and radius. // atan2 outputs radians. @@ -1795,26 +1842,26 @@ async fn inner_tangential_arc( // but the above logic *should* capture that behavior let start_angle = previous_end_tangent + tangent_to_arc_start_angle; let end_angle = start_angle + offset; - let (center, to) = arc_center_and_end(from, start_angle, end_angle, radius); + let (center, to) = arc_center_and_end(from.into(), start_angle, end_angle, radius.n); args.batch_modeling_cmd( id, ModelingCmd::from(mcmd::ExtendPath { path: sketch.id.into(), segment: PathSegment::TangentialArc { - radius: LengthUnit(radius), + radius: LengthUnit(radius.n), offset, }, }), ) .await?; - (center, to.into(), ccw) + (center, to, ccw) } }; let current_path = Path::TangentialArc { ccw, - center: center.into(), + center, base: BasePath { from: from.into(), to, @@ -1849,9 +1896,9 @@ fn tan_arc_to(sketch: &Sketch, to: &[f64; 2]) -> ModelingCmd { /// Draw a tangential arc to a specific point. pub async fn tangential_arc_to(exec_state: &mut ExecState, args: Args) -> Result { - let (to, sketch, tag): ([f64; 2], Sketch, Option) = args.get_data_and_sketch_and_tag(exec_state)?; + let (to, sketch, tag): ([TyF64; 2], Sketch, Option) = args.get_data_and_sketch_and_tag(exec_state)?; - let new_sketch = inner_tangential_arc_to(to, sketch, tag, exec_state, args).await?; + let new_sketch = inner_tangential_arc_to(untype_point(to).0, sketch, tag, exec_state, args).await?; Ok(KclValue::Sketch { value: Box::new(new_sketch), }) @@ -1859,9 +1906,9 @@ pub async fn tangential_arc_to(exec_state: &mut ExecState, args: Args) -> Result /// Draw a tangential arc to point some distance away.. pub async fn tangential_arc_to_relative(exec_state: &mut ExecState, args: Args) -> Result { - let (delta, sketch, tag): ([f64; 2], Sketch, Option) = args.get_data_and_sketch_and_tag(exec_state)?; + let (delta, sketch, tag): ([TyF64; 2], Sketch, Option) = args.get_data_and_sketch_and_tag(exec_state)?; - let new_sketch = inner_tangential_arc_to_relative(delta, sketch, tag, exec_state, args).await?; + let new_sketch = inner_tangential_arc_to_relative(untype_point(delta).0, sketch, tag, exec_state, args).await?; Ok(KclValue::Sketch { value: Box::new(new_sketch), }) @@ -2019,16 +2066,16 @@ async fn inner_tangential_arc_to_relative( } /// Data to draw a bezier curve. -#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] +#[derive(Debug, Clone, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[ts(export)] #[serde(rename_all = "camelCase")] pub struct BezierData { /// The to point. - pub to: [f64; 2], + pub to: [TyF64; 2], /// The first control point. - pub control1: [f64; 2], + pub control1: [TyF64; 2], /// The second control point. - pub control2: [f64; 2], + pub control2: [TyF64; 2], } /// Draw a bezier curve. @@ -2072,8 +2119,8 @@ async fn inner_bezier_curve( let from = sketch.current_pen_position()?; let relative = true; - let delta = data.to; - let to = [from.x + data.to[0], from.y + data.to[1]]; + let delta = data.to.clone(); + let to = [from.x + data.to[0].n, from.y + data.to[1].n]; let id = exec_state.next_uuid(); @@ -2082,9 +2129,13 @@ async fn inner_bezier_curve( ModelingCmd::from(mcmd::ExtendPath { path: sketch.id.into(), segment: PathSegment::Bezier { - control1: KPoint2d::from(data.control1).with_z(0.0).map(LengthUnit), - control2: KPoint2d::from(data.control2).with_z(0.0).map(LengthUnit), - end: KPoint2d::from(delta).with_z(0.0).map(LengthUnit), + control1: KPoint2d::from(untype_point(data.control1).0) + .with_z(0.0) + .map(LengthUnit), + control2: KPoint2d::from(untype_point(data.control2).0) + .with_z(0.0) + .map(LengthUnit), + end: KPoint2d::from(untype_point(delta).0).with_z(0.0).map(LengthUnit), relative, }, }), diff --git a/rust/kcl-lib/src/std/sweep.rs b/rust/kcl-lib/src/std/sweep.rs index becbb3aed..9c3107033 100644 --- a/rust/kcl-lib/src/std/sweep.rs +++ b/rust/kcl-lib/src/std/sweep.rs @@ -7,7 +7,7 @@ use kittycad_modeling_cmds::{self as kcmc}; use schemars::JsonSchema; use serde::Serialize; -use super::DEFAULT_TOLERANCE; +use super::{args::TyF64, DEFAULT_TOLERANCE}; use crate::{ errors::KclError, execution::{types::RuntimeType, ExecState, Helix, KclValue, Sketch, Solid}, @@ -29,12 +29,19 @@ pub async fn sweep(exec_state: &mut ExecState, args: Args) -> Result = args.get_kw_arg_opt_typed("tolerance", &RuntimeType::count(), exec_state)?; let tag_start = args.get_kw_arg_opt("tagStart")?; let tag_end = args.get_kw_arg_opt("tagEnd")?; let value = inner_sweep( - sketches, path, sectional, tolerance, tag_start, tag_end, exec_state, args, + sketches, + path, + sectional, + tolerance.map(|t| t.n), + tag_start, + tag_end, + exec_state, + args, ) .await?; Ok(value.into()) diff --git a/rust/kcl-lib/src/std/transform.rs b/rust/kcl-lib/src/std/transform.rs index d34029920..1a851e2fc 100644 --- a/rust/kcl-lib/src/std/transform.rs +++ b/rust/kcl-lib/src/std/transform.rs @@ -17,6 +17,8 @@ use crate::{ std::Args, }; +use super::args::TyF64; + /// Scale a solid or a sketch. pub async fn scale(exec_state: &mut ExecState, args: Args) -> Result { let objects = args.get_unlabeled_kw_arg_typed( @@ -28,9 +30,9 @@ pub async fn scale(exec_state: &mut ExecState, args: Args) -> Result = args.get_kw_arg_opt_typed("x", &RuntimeType::count(), exec_state)?; + let scale_y: Option = args.get_kw_arg_opt_typed("y", &RuntimeType::count(), exec_state)?; + let scale_z: Option = args.get_kw_arg_opt_typed("z", &RuntimeType::count(), exec_state)?; let global = args.get_kw_arg_opt("global")?; // Ensure at least one scale value is provided. @@ -41,7 +43,16 @@ pub async fn scale(exec_state: &mut ExecState, args: Args) -> Result Result = args.get_kw_arg_opt_typed("x", &RuntimeType::length(), exec_state)?; + let translate_y: Option = args.get_kw_arg_opt_typed("y", &RuntimeType::length(), exec_state)?; + let translate_z: Option = args.get_kw_arg_opt_typed("z", &RuntimeType::length(), exec_state)?; let global = args.get_kw_arg_opt("global")?; // Ensure at least one translation value is provided. @@ -222,7 +233,16 @@ pub async fn translate(exec_state: &mut ExecState, args: Args) -> Result Result = args.get_kw_arg_opt_typed("roll", &RuntimeType::angle(), exec_state)?; + let pitch: Option = args.get_kw_arg_opt_typed("pitch", &RuntimeType::angle(), exec_state)?; + let yaw: Option = args.get_kw_arg_opt_typed("yaw", &RuntimeType::angle(), exec_state)?; + let axis: Option<[TyF64; 3]> = args.get_kw_arg_opt_typed("axis", &RuntimeType::point3d(), exec_state)?; + let angle: Option = args.get_kw_arg_opt_typed("angle", &RuntimeType::angle(), exec_state)?; let global = args.get_kw_arg_opt("global")?; // Check if no rotation values are provided. @@ -500,42 +520,53 @@ pub async fn rotate(exec_state: &mut ExecState, args: Args) -> Result Result { - let input = args.get_number()?; - let result = inner_from_mm(input, exec_state)?; + let input = args.get_number_with_type()?; + let result = inner_from_mm(input.n, exec_state)?; Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, exec_state.current_default_units()))) } @@ -48,13 +48,14 @@ fn inner_from_mm(input: f64, exec_state: &ExecState) -> Result { UnitLen::M => measurements::Length::from_millimeters(input).as_meters(), UnitLen::Cm => measurements::Length::from_millimeters(input).as_centimeters(), UnitLen::Yards => measurements::Length::from_millimeters(input).as_yards(), + UnitLen::Unknown => unreachable!(), }) } /// Inches conversion factor for current files units. pub async fn from_inches(exec_state: &mut ExecState, args: Args) -> Result { - let input = args.get_number()?; - let result = inner_from_inches(input, exec_state)?; + let input = args.get_number_with_type()?; + let result = inner_from_inches(input.n, exec_state)?; Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, exec_state.current_default_units()))) } @@ -90,13 +91,14 @@ fn inner_from_inches(input: f64, exec_state: &ExecState) -> Result Ok(measurements::Length::from_inches(input).as_meters()), UnitLen::Cm => Ok(measurements::Length::from_inches(input).as_centimeters()), UnitLen::Yards => Ok(measurements::Length::from_inches(input).as_yards()), + UnitLen::Unknown => unreachable!(), } } /// Feet conversion factor for current files units. pub async fn from_ft(exec_state: &mut ExecState, args: Args) -> Result { - let input = args.get_number()?; - let result = inner_from_ft(input, exec_state)?; + let input = args.get_number_with_type()?; + let result = inner_from_ft(input.n, exec_state)?; Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, exec_state.current_default_units()))) } @@ -133,13 +135,14 @@ fn inner_from_ft(input: f64, exec_state: &ExecState) -> Result { UnitLen::M => Ok(measurements::Length::from_feet(input).as_meters()), UnitLen::Cm => Ok(measurements::Length::from_feet(input).as_centimeters()), UnitLen::Yards => Ok(measurements::Length::from_feet(input).as_yards()), + UnitLen::Unknown => unreachable!(), } } /// Meters conversion factor for current files units. pub async fn from_m(exec_state: &mut ExecState, args: Args) -> Result { - let input = args.get_number()?; - let result = inner_from_m(input, exec_state)?; + let input = args.get_number_with_type()?; + let result = inner_from_m(input.n, exec_state)?; Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, exec_state.current_default_units()))) } @@ -176,13 +179,14 @@ fn inner_from_m(input: f64, exec_state: &ExecState) -> Result { UnitLen::M => Ok(input), UnitLen::Cm => Ok(measurements::Length::from_meters(input).as_centimeters()), UnitLen::Yards => Ok(measurements::Length::from_meters(input).as_yards()), + UnitLen::Unknown => unreachable!(), } } /// Centimeters conversion factor for current files units. pub async fn from_cm(exec_state: &mut ExecState, args: Args) -> Result { - let input = args.get_number()?; - let result = inner_from_cm(input, exec_state)?; + let input = args.get_number_with_type()?; + let result = inner_from_cm(input.n, exec_state)?; Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, exec_state.current_default_units()))) } @@ -219,13 +223,14 @@ fn inner_from_cm(input: f64, exec_state: &ExecState) -> Result { UnitLen::M => Ok(measurements::Length::from_centimeters(input).as_meters()), UnitLen::Cm => Ok(input), UnitLen::Yards => Ok(measurements::Length::from_centimeters(input).as_yards()), + UnitLen::Unknown => unreachable!(), } } /// Yards conversion factor for current files units. pub async fn from_yd(exec_state: &mut ExecState, args: Args) -> Result { - let input = args.get_number()?; - let result = inner_from_yd(input, exec_state)?; + let input = args.get_number_with_type()?; + let result = inner_from_yd(input.n, exec_state)?; Ok(args.make_user_val_from_f64_with_type(TyF64::new(result, exec_state.current_default_units()))) } @@ -262,5 +267,6 @@ fn inner_from_yd(input: f64, exec_state: &ExecState) -> Result { UnitLen::M => Ok(measurements::Length::from_yards(input).as_meters()), UnitLen::Cm => Ok(measurements::Length::from_yards(input).as_centimeters()), UnitLen::Yards => Ok(input), + UnitLen::Unknown => unreachable!(), } } diff --git a/rust/kcl-lib/src/std/utils.rs b/rust/kcl-lib/src/std/utils.rs index 4d7aefd79..36fb18d77 100644 --- a/rust/kcl-lib/src/std/utils.rs +++ b/rust/kcl-lib/src/std/utils.rs @@ -4,13 +4,26 @@ use kittycad_modeling_cmds::shared::Angle; use crate::{ errors::{KclError, KclErrorDetails}, - execution::Point2d, + execution::{types::NumericType, Point2d}, source_range::SourceRange, }; +use super::args::TyF64; + +pub fn untype_point(p: [TyF64; 2]) -> ([f64; 2], NumericType) { + let (x, y, ty) = NumericType::combine_eq(p[0].clone(), p[1].clone()); + ([x, y], ty) +} + +pub fn untype_point_3d(p: [TyF64; 3]) -> ([f64; 3], NumericType) { + let (arr, ty) = NumericType::combine_eq_array(&[p[0].clone(), p[1].clone(), p[2].clone()]); + let mut iter = arr.into_iter(); + ([iter.next().unwrap(), iter.next().unwrap(), iter.next().unwrap()], ty) +} + /// Get the distance between two points. -pub fn distance(a: Point2d, b: Point2d) -> f64 { - ((b.x - a.x).powi(2) + (b.y - a.y).powi(2)).sqrt() +pub fn distance(a: Coords2d, b: Coords2d) -> f64 { + ((b[0] - a[0]).powi(2) + (b[1] - a[1]).powi(2)).sqrt() } /// Get the angle between these points @@ -68,87 +81,54 @@ pub fn normalize_rad(angle: f64) -> f64 { } } -pub fn calculate_intersection_of_two_lines(line1: &[Point2d; 2], line2_angle: f64, line2_point: Point2d) -> Point2d { - let line2_point_b = Point2d { - x: line2_point.x + f64::cos(line2_angle.to_radians()) * 10.0, - y: line2_point.y + f64::sin(line2_angle.to_radians()) * 10.0, - }; +fn calculate_intersection_of_two_lines(line1: &[Coords2d; 2], line2_angle: f64, line2_point: Coords2d) -> Coords2d { + let line2_point_b = [ + line2_point[0] + f64::cos(line2_angle.to_radians()) * 10.0, + line2_point[1] + f64::sin(line2_angle.to_radians()) * 10.0, + ]; intersect(line1[0], line1[1], line2_point, line2_point_b) } -pub fn intersect(p1: Point2d, p2: Point2d, p3: Point2d, p4: Point2d) -> Point2d { - let slope = |p1: Point2d, p2: Point2d| (p1.y - p2.y) / (p1.x - p2.x); - let constant = |p1: Point2d, p2: Point2d| p1.y - slope(p1, p2) * p1.x; - let get_y = |for_x: f64, p1: Point2d, p2: Point2d| slope(p1, p2) * for_x + constant(p1, p2); +fn intersect(p1: Coords2d, p2: Coords2d, p3: Coords2d, p4: Coords2d) -> Coords2d { + let slope = |p1: Coords2d, p2: Coords2d| (p1[1] - p2[1]) / (p1[0] - p2[0]); + let constant = |p1: Coords2d, p2: Coords2d| p1[1] - slope(p1, p2) * p1[0]; + let get_y = |for_x: f64, p1: Coords2d, p2: Coords2d| slope(p1, p2) * for_x + constant(p1, p2); - if p1.x == p2.x { - return Point2d { - x: p1.x, - y: get_y(p1.x, p3, p4), - }; + if p1[0] == p2[0] { + return [p1[0], get_y(p1[0], p3, p4)]; } - if p3.x == p4.x { - return Point2d { - x: p3.x, - y: get_y(p3.x, p1, p2), - }; + if p3[0] == p4[0] { + return [p3[0], get_y(p3[0], p1, p2)]; } let x = (constant(p3, p4) - constant(p1, p2)) / (slope(p1, p2) - slope(p3, p4)); let y = get_y(x, p1, p2); - Point2d { x, y } + [x, y] } pub fn intersection_with_parallel_line( - line1: &[Point2d; 2], + line1: &[Coords2d; 2], line1_offset: f64, line2_angle: f64, - line2_point: Point2d, -) -> Point2d { + line2_point: Coords2d, +) -> Coords2d { calculate_intersection_of_two_lines(&offset_line(line1_offset, line1[0], line1[1]), line2_angle, line2_point) } -fn offset_line(offset: f64, p1: Point2d, p2: Point2d) -> [Point2d; 2] { - if p1.x == p2.x { - let direction = (p1.y - p2.y).signum(); - return [ - Point2d { - x: p1.x + offset * direction, - y: p1.y, - }, - Point2d { - x: p2.x + offset * direction, - y: p2.y, - }, - ]; +fn offset_line(offset: f64, p1: Coords2d, p2: Coords2d) -> [Coords2d; 2] { + if p1[0] == p2[0] { + let direction = (p1[1] - p2[1]).signum(); + return [[p1[0] + offset * direction, p1[1]], [p2[0] + offset * direction, p2[1]]]; } - if p1.y == p2.y { - let direction = (p2.x - p1.x).signum(); - return [ - Point2d { - x: p1.x, - y: p1.y + offset * direction, - }, - Point2d { - x: p2.x, - y: p2.y + offset * direction, - }, - ]; + if p1[1] == p2[1] { + let direction = (p2[0] - p1[0]).signum(); + return [[p1[0], p1[1] + offset * direction], [p2[0], p2[1] + offset * direction]]; } - let x_offset = offset / f64::sin(f64::atan2(p1.y - p2.y, p1.x - p2.x)); - [ - Point2d { - x: p1.x + x_offset, - y: p1.y, - }, - Point2d { - x: p2.x + x_offset, - y: p2.y, - }, - ] + let x_offset = offset / f64::sin(f64::atan2(p1[1] - p2[1], p1[0] - p2[0])); + [[p1[0] + x_offset, p1[1]], [p2[0] + x_offset, p2[1]]] } -pub fn get_y_component(angle: Angle, x: f64) -> Point2d { +pub fn get_y_component(angle: Angle, x: f64) -> Coords2d { let normalised_angle = ((angle.to_degrees() % 360.0) + 360.0) % 360.0; // between 0 and 360 let y = x * f64::tan(normalised_angle.to_radians()); let sign = if normalised_angle > 90.0 && normalised_angle <= 270.0 { @@ -156,10 +136,10 @@ pub fn get_y_component(angle: Angle, x: f64) -> Point2d { } else { 1.0 }; - Point2d { x, y }.scale(sign) + [x * sign, y * sign] } -pub fn get_x_component(angle: Angle, y: f64) -> Point2d { +pub fn get_x_component(angle: Angle, y: f64) -> Coords2d { let normalised_angle = ((angle.to_degrees() % 360.0) + 360.0) % 360.0; // between 0 and 360 let x = y / f64::tan(normalised_angle.to_radians()); let sign = if normalised_angle > 180.0 && normalised_angle <= 360.0 { @@ -167,30 +147,30 @@ pub fn get_x_component(angle: Angle, y: f64) -> Point2d { } else { 1.0 }; - Point2d { x, y }.scale(sign) + [x * sign, y * sign] } -pub fn arc_center_and_end(from: Point2d, start_angle: Angle, end_angle: Angle, radius: f64) -> (Point2d, Point2d) { +pub fn arc_center_and_end(from: Coords2d, start_angle: Angle, end_angle: Angle, radius: f64) -> (Coords2d, Coords2d) { let start_angle = start_angle.to_radians(); let end_angle = end_angle.to_radians(); - let center = Point2d { - x: -1.0 * (radius * start_angle.cos() - from.x), - y: -1.0 * (radius * start_angle.sin() - from.y), - }; + let center = [ + -1.0 * (radius * start_angle.cos() - from[0]), + -1.0 * (radius * start_angle.sin() - from[1]), + ]; - let end = Point2d { - x: center.x + radius * end_angle.cos(), - y: center.y + radius * end_angle.sin(), - }; + let end = [ + center[0] + radius * end_angle.cos(), + center[1] + radius * end_angle.sin(), + ]; (center, end) } pub fn arc_angles( - from: Point2d, - to: Point2d, - center: Point2d, + from: Coords2d, + to: Coords2d, + center: Coords2d, radius: f64, source_range: SourceRange, ) -> Result<(Angle, Angle), KclError> { @@ -216,15 +196,15 @@ pub fn arc_angles( })); } - let start_angle = (from.y - center.y).atan2(from.x - center.x); - let end_angle = (to.y - center.y).atan2(to.x - center.x); + let start_angle = (from[1] - center[1]).atan2(from[0] - center[0]); + let end_angle = (to[1] - center[1]).atan2(to[0] - center[0]); Ok((Angle::from_radians(start_angle), Angle::from_radians(end_angle))) } -pub fn is_on_circumference(center: Point2d, point: Point2d, radius: f64) -> bool { - let dx = point.x - center.x; - let dy = point.y - center.y; +fn is_on_circumference(center: Coords2d, point: Coords2d, radius: f64) -> bool { + let dx = point[0] - center[0]; + let dy = point[1] - center[1]; let distance_squared = dx.powi(2) + dy.powi(2); @@ -271,12 +251,12 @@ pub fn calculate_circle_center(p1: [f64; 2], p2: [f64; 2], p3: [f64; 2]) -> [f64 } pub struct CircleParams { - pub center: Point2d, + pub center: Coords2d, pub radius: f64, } -pub fn calculate_circle_from_3_points(points: [Point2d; 3]) -> CircleParams { - let center: Point2d = calculate_circle_center(points[0].into(), points[1].into(), points[2].into()).into(); +pub fn calculate_circle_from_3_points(points: [Coords2d; 3]) -> CircleParams { + let center = calculate_circle_center(points[0], points[1], points[2]); CircleParams { center, radius: distance(center, points[1]), @@ -313,27 +293,27 @@ mod tests { for &(angle, expected_result) in EACH_QUAD.iter() { let res = get_y_component(Angle::from_degrees(angle as f64), 1.0); - results.push([res.x.round() as i32, res.y.round() as i32]); + results.push([res[0].round() as i32, res[1].round() as i32]); expected.push(expected_result); } assert_eq!(results, expected); let result = get_y_component(Angle::zero(), 1.0); - assert_eq!(result.x as i32, 1); - assert_eq!(result.y as i32, 0); + assert_eq!(result[0] as i32, 1); + assert_eq!(result[1] as i32, 0); let result = get_y_component(Angle::from_degrees(90.0), 1.0); - assert_eq!(result.x as i32, 1); - assert!(result.y > 100000.0); + assert_eq!(result[0] as i32, 1); + assert!(result[1] > 100000.0); let result = get_y_component(Angle::from_degrees(180.0), 1.0); - assert_eq!(result.x as i32, -1); - assert!((result.y - 0.0).abs() < f64::EPSILON); + assert_eq!(result[0] as i32, -1); + assert!((result[1] - 0.0).abs() < f64::EPSILON); let result = get_y_component(Angle::from_degrees(270.0), 1.0); - assert_eq!(result.x as i32, -1); - assert!(result.y < -100000.0); + assert_eq!(result[0] as i32, -1); + assert!(result[1] < -100000.0); } #[test] @@ -343,110 +323,71 @@ mod tests { for &(angle, expected_result) in EACH_QUAD.iter() { let res = get_x_component(Angle::from_degrees(angle as f64), 1.0); - results.push([res.x.round() as i32, res.y.round() as i32]); + results.push([res[0].round() as i32, res[1].round() as i32]); expected.push(expected_result); } assert_eq!(results, expected); let result = get_x_component(Angle::zero(), 1.0); - assert!(result.x > 100000.0); - assert_eq!(result.y as i32, 1); + assert!(result[0] > 100000.0); + assert_eq!(result[1] as i32, 1); let result = get_x_component(Angle::from_degrees(90.0), 1.0); - assert!((result.x - 0.0).abs() < f64::EPSILON); - assert_eq!(result.y as i32, 1); + assert!((result[0] - 0.0).abs() < f64::EPSILON); + assert_eq!(result[1] as i32, 1); let result = get_x_component(Angle::from_degrees(180.0), 1.0); - assert!(result.x < -100000.0); - assert_eq!(result.y as i32, 1); + assert!(result[0] < -100000.0); + assert_eq!(result[1] as i32, 1); let result = get_x_component(Angle::from_degrees(270.0), 1.0); - assert!((result.x - 0.0).abs() < f64::EPSILON); - assert_eq!(result.y as i32, -1); + assert!((result[0] - 0.0).abs() < f64::EPSILON); + assert_eq!(result[1] as i32, -1); } #[test] fn test_arc_center_and_end() { - let (center, end) = super::arc_center_and_end( - super::Point2d { x: 0.0, y: 0.0 }, - Angle::zero(), - Angle::from_degrees(90.0), - 1.0, - ); - assert_eq!(center.x.round(), -1.0); - assert_eq!(center.y, 0.0); - assert_eq!(end.x.round(), -1.0); - assert_eq!(end.y, 1.0); + let (center, end) = super::arc_center_and_end([0.0, 0.0], Angle::zero(), Angle::from_degrees(90.0), 1.0); + assert_eq!(center[0].round(), -1.0); + assert_eq!(center[1], 0.0); + assert_eq!(end[0].round(), -1.0); + assert_eq!(end[1], 1.0); - let (center, end) = super::arc_center_and_end( - super::Point2d { x: 0.0, y: 0.0 }, - Angle::zero(), - Angle::from_degrees(180.0), - 1.0, - ); - assert_eq!(center.x.round(), -1.0); - assert_eq!(center.y, 0.0); - assert_eq!(end.x.round(), -2.0); - assert_eq!(end.y.round(), 0.0); + let (center, end) = super::arc_center_and_end([0.0, 0.0], Angle::zero(), Angle::from_degrees(180.0), 1.0); + assert_eq!(center[0].round(), -1.0); + assert_eq!(center[1], 0.0); + assert_eq!(end[0].round(), -2.0); + assert_eq!(end[1].round(), 0.0); - let (center, end) = super::arc_center_and_end( - super::Point2d { x: 0.0, y: 0.0 }, - Angle::zero(), - Angle::from_degrees(180.0), - 10.0, - ); - assert_eq!(center.x.round(), -10.0); - assert_eq!(center.y, 0.0); - assert_eq!(end.x.round(), -20.0); - assert_eq!(end.y.round(), 0.0); + let (center, end) = super::arc_center_and_end([0.0, 0.0], Angle::zero(), Angle::from_degrees(180.0), 10.0); + assert_eq!(center[0].round(), -10.0); + assert_eq!(center[1], 0.0); + assert_eq!(end[0].round(), -20.0); + assert_eq!(end[1].round(), 0.0); } #[test] fn test_arc_angles() { - let (angle_start, angle_end) = super::arc_angles( - super::Point2d { x: 0.0, y: 0.0 }, - super::Point2d { x: -1.0, y: 1.0 }, - super::Point2d { x: -1.0, y: 0.0 }, - 1.0, - SourceRange::default(), - ) - .unwrap(); + let (angle_start, angle_end) = + super::arc_angles([0.0, 0.0], [-1.0, 1.0], [-1.0, 0.0], 1.0, SourceRange::default()).unwrap(); assert_eq!(angle_start.to_degrees().round(), 0.0); assert_eq!(angle_end.to_degrees().round(), 90.0); - let (angle_start, angle_end) = super::arc_angles( - super::Point2d { x: 0.0, y: 0.0 }, - super::Point2d { x: -2.0, y: 0.0 }, - super::Point2d { x: -1.0, y: 0.0 }, - 1.0, - SourceRange::default(), - ) - .unwrap(); + let (angle_start, angle_end) = + super::arc_angles([0.0, 0.0], [-2.0, 0.0], [-1.0, 0.0], 1.0, SourceRange::default()).unwrap(); assert_eq!(angle_start.to_degrees().round(), 0.0); assert_eq!(angle_end.to_degrees().round(), 180.0); - let (angle_start, angle_end) = super::arc_angles( - super::Point2d { x: 0.0, y: 0.0 }, - super::Point2d { x: -20.0, y: 0.0 }, - super::Point2d { x: -10.0, y: 0.0 }, - 10.0, - SourceRange::default(), - ) - .unwrap(); + let (angle_start, angle_end) = + super::arc_angles([0.0, 0.0], [-20.0, 0.0], [-10.0, 0.0], 10.0, SourceRange::default()).unwrap(); assert_eq!(angle_start.to_degrees().round(), 0.0); assert_eq!(angle_end.to_degrees().round(), 180.0); - let result = super::arc_angles( - super::Point2d { x: 0.0, y: 5.0 }, - super::Point2d { x: 5.0, y: 5.0 }, - super::Point2d { x: 10.0, y: -10.0 }, - 10.0, - SourceRange::default(), - ); + let result = super::arc_angles([0.0, 5.0], [5.0, 5.0], [10.0, -10.0], 10.0, SourceRange::default()); if let Err(err) = result { - assert!(err.to_string().contains("Point Point2d { x: 0.0, y: 5.0 } is not on the circumference of the circle with center Point2d { x: 10.0, y: -10.0 } and radius 10.")); + assert!(err.to_string().contains("Point [0.0, 5.0] is not on the circumference of the circle with center [10.0, -10.0] and radius 10."), "found: `{}`", err); } else { panic!("Expected error"); } diff --git a/rust/kcl-lib/std/math.kcl b/rust/kcl-lib/std/math.kcl index 255f718b2..0dbc49412 100644 --- a/rust/kcl-lib/std/math.kcl +++ b/rust/kcl-lib/std/math.kcl @@ -60,7 +60,7 @@ export TAU = 6.28318530717958647692528676655900577_ /// example = extrude(exampleSketch, length = 5) /// ``` @(impl = std_rust) -export fn cos(@num: number(rad)): number(_) {} +export fn cos(@num: number(Angle)): number(_) {} /// Compute the sine of a number (in radians). /// @@ -77,7 +77,7 @@ export fn cos(@num: number(rad)): number(_) {} /// example = extrude(exampleSketch, length = 5) /// ``` @(impl = std_rust) -export fn sin(@num: number(rad)): number(_) {} +export fn sin(@num: number(Angle)): number(_) {} /// Compute the tangent of a number (in radians). /// @@ -94,7 +94,7 @@ export fn sin(@num: number(rad)): number(_) {} /// example = extrude(exampleSketch, length = 5) /// ``` @(impl = std_rust) -export fn tan(@num: number(rad)): number(_) {} +export fn tan(@num: number(Angle)): number(_) {} /// Convert polar/sphere (azimuth, elevation, distance) coordinates to /// cartesian (x/y/z grid) coordinates. @@ -110,7 +110,7 @@ export fn tan(@num: number(rad)): number(_) {} /// /// example = extrude(exampleSketch, length = 5) /// ``` -export fn polar(angle: number(deg), length: number(mm)): [number(mm); 2] { +export fn polar(angle: number(Angle), length: number(Length)): Point2d { // TODO could be done by implicit conversion when UoM coercions are activated. rads = toRadians(angle) x = length * cos(rads) diff --git a/rust/kcl-lib/std/prelude.kcl b/rust/kcl-lib/std/prelude.kcl index 7d41ed0a7..560eb4469 100644 --- a/rust/kcl-lib/std/prelude.kcl +++ b/rust/kcl-lib/std/prelude.kcl @@ -245,13 +245,13 @@ export type Edge /// /// `Point2d` is an alias for a two-element array of [number](/docs/kcl/types/number)s. To write a value /// with type `Point2d`, use an array, e.g., `[0, 0]` or `[5.0, 3.14]`. -export type Point2d = [number; 2] +export type Point2d = [number(Length); 2] /// A point in three dimensional space. /// /// `Point3d` is an alias for a three-element array of [number](/docs/kcl/types/number)s. To write a value /// with type `Point3d`, use an array, e.g., `[0, 0, 0]` or `[5.0, 3.14, 6.8]`. -export type Point3d = [number; 3] +export type Point3d = [number(Length); 3] export XY = { origin = { x = 0, y = 0, z = 0 }, @@ -376,18 +376,18 @@ export fn helix( /// Number of revolutions. revolutions: number(_), /// Start angle (in degrees). - angleStart: number(deg), + angleStart: number(Angle), /// Is the helix rotation counter clockwise? The default is `false`. ccw?: bool, /// Radius of the helix. @(include_in_snippet = true) - radius?: number(mm), + radius?: number(Length), /// Axis to use for the helix. @(include_in_snippet = true) axis?: Axis3d | Edge, /// Length of the helix. This is not necessary if the helix is created around an edge. If not given the length of the edge is used. @(include_in_snippet = true) - length?: number(mm), + length?: number(Length), /// Cylinder to create the helix on. cylinder?: Solid, ): Helix {} @@ -456,7 +456,7 @@ export fn helix( /// |> close() /// |> revolve(axis = Y, angle = 180) /// -/// part002 = startSketchOn(part001, 'end') +/// part002 = startSketchOn(part001, face = 'end') /// |> startProfileAt([4.5, -5], %) /// |> line(end = [0, 5]) /// |> line(end = [5, 0]) @@ -474,7 +474,7 @@ export fn helix( /// |> close() /// |> extrude(length = 20) /// -/// sketch001 = startSketchOn(box, "END") +/// sketch001 = startSketchOn(box, face = "END") /// |> circle( center = [10,10], radius = 4 ) /// |> revolve( /// angle = -90, @@ -491,7 +491,7 @@ export fn helix( /// |> close() /// |> extrude(length = 20) /// -/// sketch001 = startSketchOn(box, "END") +/// sketch001 = startSketchOn(box, face = "END") /// |> circle( center = [10,10], radius = 4 ) /// |> revolve( /// angle = 90, @@ -508,7 +508,7 @@ export fn helix( /// |> close() /// |> extrude(length = 20) /// -/// sketch001 = startSketchOn(box, "END") +/// sketch001 = startSketchOn(box, face = "END") /// |> circle( center = [10,10], radius = 4 ) /// |> revolve( /// angle = 90, @@ -618,13 +618,13 @@ export fn revolve( /// Axis of revolution. axis: Axis2d | Edge, /// Angle to revolve (in degrees). Default is 360. - angle?: number(deg), + angle?: number(Angle), /// Tolerance for the revolve operation. - tolerance?: number(mm), + tolerance?: number(Length), /// If true, the extrusion will happen symmetrically around the sketch. Otherwise, the extrusion will happen on only one side of the sketch. symmetric?: bool, /// If specified, will also revolve in the opposite direction to 'angle' to the specified angle. If 'symmetric' is true, this value is ignored. - bidirectionalAngle?: number(deg), + bidirectionalAngle?: number(Angle), /// A named tag for the face at the start of the revolve, i.e. the original sketch. tagStart?: tag, /// A named tag for the face at the end of the revolve. diff --git a/rust/kcl-lib/std/sketch.kcl b/rust/kcl-lib/std/sketch.kcl index 4d9458fad..f24e1ca44 100644 --- a/rust/kcl-lib/std/sketch.kcl +++ b/rust/kcl-lib/std/sketch.kcl @@ -29,7 +29,7 @@ export fn circle( /// The center of the circle. center: Point2d, /// The radius of the circle. - radius: number, + radius: number(Length), /// Create a new tag which refers to this circle. tag?: tag, ): Sketch {} @@ -110,7 +110,7 @@ export fn circle( /// |> mirror2d( axis = X ) /// |> extrude(length = 10) /// -/// sketch002 = startSketchOn(sketch0011, 'END') +/// sketch002 = startSketchOn(sketch0011, face = 'END') /// |> circle( center = [-0.01, 1.58], radius = 1.2 ) /// |> extrude(length = 1.2) /// diff --git a/rust/kcl-lib/tests/add_lots/ast.snap b/rust/kcl-lib/tests/add_lots/ast.snap index 914566d3f..1bbabce99 100644 --- a/rust/kcl-lib/tests/add_lots/ast.snap +++ b/rust/kcl-lib/tests/add_lots/ast.snap @@ -288,480 +288,40 @@ description: Result of parsing add_lots.kcl "commentStart": 0, "end": 0, "left": { + "arguments": [ + { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + ], + "callee": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "f", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name" + }, "commentStart": 0, "end": 0, - "left": { - "commentStart": 0, - "end": 0, - "left": { - "commentStart": 0, - "end": 0, - "left": { - "commentStart": 0, - "end": 0, - "left": { - "commentStart": 0, - "end": 0, - "left": { - "commentStart": 0, - "end": 0, - "left": { - "commentStart": 0, - "end": 0, - "left": { - "commentStart": 0, - "end": 0, - "left": { - "commentStart": 0, - "end": 0, - "left": { - "commentStart": 0, - "end": 0, - "left": { - "arguments": [ - { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "f", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - "operator": "+", - "right": { - "arguments": [ - { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "f", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "operator": "+", - "right": { - "arguments": [ - { - "commentStart": 0, - "end": 0, - "raw": "2", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 2.0, - "suffix": "None" - } - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "f", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "operator": "+", - "right": { - "arguments": [ - { - "commentStart": 0, - "end": 0, - "raw": "3", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 3.0, - "suffix": "None" - } - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "f", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "operator": "+", - "right": { - "arguments": [ - { - "commentStart": 0, - "end": 0, - "raw": "4", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 4.0, - "suffix": "None" - } - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "f", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "operator": "+", - "right": { - "arguments": [ - { - "commentStart": 0, - "end": 0, - "raw": "5", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 5.0, - "suffix": "None" - } - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "f", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "operator": "+", - "right": { - "arguments": [ - { - "commentStart": 0, - "end": 0, - "raw": "6", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 6.0, - "suffix": "None" - } - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "f", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "operator": "+", - "right": { - "arguments": [ - { - "commentStart": 0, - "end": 0, - "raw": "7", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 7.0, - "suffix": "None" - } - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "f", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "operator": "+", - "right": { - "arguments": [ - { - "commentStart": 0, - "end": 0, - "raw": "8", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 8.0, - "suffix": "None" - } - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "f", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "operator": "+", - "right": { - "arguments": [ - { - "commentStart": 0, - "end": 0, - "raw": "9", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 9.0, - "suffix": "None" - } - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "f", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "operator": "+", - "right": { - "arguments": [ - { - "commentStart": 0, - "end": 0, - "raw": "10", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 10.0, - "suffix": "None" - } - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "f", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" + "type": "CallExpression", + "type": "CallExpression" }, "operator": "+", "right": { @@ -769,12 +329,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "11", + "raw": "1", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 11.0, + "value": 1.0, "suffix": "None" } } @@ -810,12 +370,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "12", + "raw": "2", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 12.0, + "value": 2.0, "suffix": "None" } } @@ -851,12 +411,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "13", + "raw": "3", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 13.0, + "value": 3.0, "suffix": "None" } } @@ -892,12 +452,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "14", + "raw": "4", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 14.0, + "value": 4.0, "suffix": "None" } } @@ -933,12 +493,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "15", + "raw": "5", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 15.0, + "value": 5.0, "suffix": "None" } } @@ -974,12 +534,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "16", + "raw": "6", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 16.0, + "value": 6.0, "suffix": "None" } } @@ -1015,12 +575,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "17", + "raw": "7", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 17.0, + "value": 7.0, "suffix": "None" } } @@ -1056,12 +616,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "18", + "raw": "8", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 18.0, + "value": 8.0, "suffix": "None" } } @@ -1097,12 +657,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "19", + "raw": "9", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 19.0, + "value": 9.0, "suffix": "None" } } @@ -1138,12 +698,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "20", + "raw": "10", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 20.0, + "value": 10.0, "suffix": "None" } } @@ -1179,12 +739,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "21", + "raw": "11", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 21.0, + "value": 11.0, "suffix": "None" } } @@ -1220,12 +780,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "22", + "raw": "12", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 22.0, + "value": 12.0, "suffix": "None" } } @@ -1261,12 +821,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "23", + "raw": "13", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 23.0, + "value": 13.0, "suffix": "None" } } @@ -1302,12 +862,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "24", + "raw": "14", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 24.0, + "value": 14.0, "suffix": "None" } } @@ -1343,12 +903,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "25", + "raw": "15", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 25.0, + "value": 15.0, "suffix": "None" } } @@ -1384,12 +944,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "26", + "raw": "16", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 26.0, + "value": 16.0, "suffix": "None" } } @@ -1425,12 +985,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "27", + "raw": "17", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 27.0, + "value": 17.0, "suffix": "None" } } @@ -1466,12 +1026,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "28", + "raw": "18", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 28.0, + "value": 18.0, "suffix": "None" } } @@ -1507,12 +1067,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "29", + "raw": "19", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 29.0, + "value": 19.0, "suffix": "None" } } @@ -1548,12 +1108,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "30", + "raw": "20", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 30.0, + "value": 20.0, "suffix": "None" } } @@ -1589,12 +1149,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "31", + "raw": "21", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 31.0, + "value": 21.0, "suffix": "None" } } @@ -1630,12 +1190,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "32", + "raw": "22", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 32.0, + "value": 22.0, "suffix": "None" } } @@ -1671,12 +1231,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "33", + "raw": "23", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 33.0, + "value": 23.0, "suffix": "None" } } @@ -1712,12 +1272,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "34", + "raw": "24", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 34.0, + "value": 24.0, "suffix": "None" } } @@ -1753,12 +1313,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "35", + "raw": "25", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 35.0, + "value": 25.0, "suffix": "None" } } @@ -1794,12 +1354,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "36", + "raw": "26", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 36.0, + "value": 26.0, "suffix": "None" } } @@ -1835,12 +1395,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "37", + "raw": "27", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 37.0, + "value": 27.0, "suffix": "None" } } @@ -1876,12 +1436,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "38", + "raw": "28", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 38.0, + "value": 28.0, "suffix": "None" } } @@ -1917,12 +1477,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "39", + "raw": "29", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 39.0, + "value": 29.0, "suffix": "None" } } @@ -1958,12 +1518,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "40", + "raw": "30", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 40.0, + "value": 30.0, "suffix": "None" } } @@ -1999,12 +1559,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "41", + "raw": "31", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 41.0, + "value": 31.0, "suffix": "None" } } @@ -2040,12 +1600,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "42", + "raw": "32", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 42.0, + "value": 32.0, "suffix": "None" } } @@ -2081,12 +1641,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "43", + "raw": "33", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 43.0, + "value": 33.0, "suffix": "None" } } @@ -2122,12 +1682,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "44", + "raw": "34", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 44.0, + "value": 34.0, "suffix": "None" } } @@ -2163,12 +1723,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "45", + "raw": "35", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 45.0, + "value": 35.0, "suffix": "None" } } @@ -2204,12 +1764,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "46", + "raw": "36", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 46.0, + "value": 36.0, "suffix": "None" } } @@ -2245,12 +1805,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "47", + "raw": "37", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 47.0, + "value": 37.0, "suffix": "None" } } @@ -2286,12 +1846,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "48", + "raw": "38", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 48.0, + "value": 38.0, "suffix": "None" } } @@ -2327,12 +1887,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "49", + "raw": "39", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 49.0, + "value": 39.0, "suffix": "None" } } @@ -2368,12 +1928,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "50", + "raw": "40", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 50.0, + "value": 40.0, "suffix": "None" } } @@ -2409,12 +1969,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "51", + "raw": "41", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 51.0, + "value": 41.0, "suffix": "None" } } @@ -2450,12 +2010,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "52", + "raw": "42", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 52.0, + "value": 42.0, "suffix": "None" } } @@ -2491,12 +2051,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "53", + "raw": "43", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 53.0, + "value": 43.0, "suffix": "None" } } @@ -2532,12 +2092,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "54", + "raw": "44", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 54.0, + "value": 44.0, "suffix": "None" } } @@ -2573,12 +2133,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "55", + "raw": "45", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 55.0, + "value": 45.0, "suffix": "None" } } @@ -2614,12 +2174,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "56", + "raw": "46", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 56.0, + "value": 46.0, "suffix": "None" } } @@ -2655,12 +2215,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "57", + "raw": "47", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 57.0, + "value": 47.0, "suffix": "None" } } @@ -2696,12 +2256,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "58", + "raw": "48", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 58.0, + "value": 48.0, "suffix": "None" } } @@ -2737,12 +2297,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "59", + "raw": "49", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 59.0, + "value": 49.0, "suffix": "None" } } @@ -2778,12 +2338,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "60", + "raw": "50", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 60.0, + "value": 50.0, "suffix": "None" } } @@ -2819,12 +2379,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "61", + "raw": "51", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 61.0, + "value": 51.0, "suffix": "None" } } @@ -2860,12 +2420,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "62", + "raw": "52", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 62.0, + "value": 52.0, "suffix": "None" } } @@ -2901,12 +2461,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "63", + "raw": "53", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 63.0, + "value": 53.0, "suffix": "None" } } @@ -2942,12 +2502,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "64", + "raw": "54", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 64.0, + "value": 54.0, "suffix": "None" } } @@ -2983,12 +2543,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "65", + "raw": "55", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 65.0, + "value": 55.0, "suffix": "None" } } @@ -3024,12 +2584,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "66", + "raw": "56", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 66.0, + "value": 56.0, "suffix": "None" } } @@ -3065,12 +2625,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "67", + "raw": "57", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 67.0, + "value": 57.0, "suffix": "None" } } @@ -3106,12 +2666,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "68", + "raw": "58", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 68.0, + "value": 58.0, "suffix": "None" } } @@ -3147,12 +2707,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "69", + "raw": "59", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 69.0, + "value": 59.0, "suffix": "None" } } @@ -3188,12 +2748,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "70", + "raw": "60", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 70.0, + "value": 60.0, "suffix": "None" } } @@ -3256,12 +2816,12 @@ description: Result of parsing add_lots.kcl { "commentStart": 0, "end": 0, - "raw": "4970", + "raw": "3660", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 4970.0, + "value": 3660.0, "suffix": "None" } }, diff --git a/rust/kcl-lib/tests/add_lots/input.kcl b/rust/kcl-lib/tests/add_lots/input.kcl index bc31baaf0..d36f3c4c0 100644 --- a/rust/kcl-lib/tests/add_lots/input.kcl +++ b/rust/kcl-lib/tests/add_lots/input.kcl @@ -2,6 +2,6 @@ fn f(i) { return i * 2 } -x = f(0) + f(1) + f(2) + f(3) + f(4) + f(5) + f(6) + f(7) + f(8) + f(9) + f(10) + f(11) + f(12) + f(13) + f(14) + f(15) + f(16) + f(17) + f(18) + f(19) + f(20) + f(21) + f(22) + f(23) + f(24) + f(25) + f(26) + f(27) + f(28) + f(29) + f(30) + f(31) + f(32) + f(33) + f(34) + f(35) + f(36) + f(37) + f(38) + f(39) + f(40) + f(41) + f(42) + f(43) + f(44) + f(45) + f(46) + f(47) + f(48) + f(49) + f(50) + f(51) + f(52) + f(53) + f(54) + f(55) + f(56) + f(57) + f(58) + f(59) + f(60) + f(61) + f(62) + f(63) + f(64) + f(65) + f(66) + f(67) + f(68) + f(69) + f(70) +x = f(0) + f(1) + f(2) + f(3) + f(4) + f(5) + f(6) + f(7) + f(8) + f(9) + f(10) + f(11) + f(12) + f(13) + f(14) + f(15) + f(16) + f(17) + f(18) + f(19) + f(20) + f(21) + f(22) + f(23) + f(24) + f(25) + f(26) + f(27) + f(28) + f(29) + f(30) + f(31) + f(32) + f(33) + f(34) + f(35) + f(36) + f(37) + f(38) + f(39) + f(40) + f(41) + f(42) + f(43) + f(44) + f(45) + f(46) + f(47) + f(48) + f(49) + f(50) + f(51) + f(52) + f(53) + f(54) + f(55) + f(56) + f(57) + f(58) + f(59) + f(60) -assertEqual(x, 4970, 0.1, "Big sum") +assertEqual(x, 3660, 0.1, "Big sum") diff --git a/rust/kcl-lib/tests/add_lots/ops.snap b/rust/kcl-lib/tests/add_lots/ops.snap index 1c2700a9e..b9b1b270d 100644 --- a/rust/kcl-lib/tests/add_lots/ops.snap +++ b/rust/kcl-lib/tests/add_lots/ops.snap @@ -1098,186 +1098,6 @@ description: Operations executed add_lots.kcl }, "sourceRange": [] }, - { - "type": "GroupEnd" - }, - { - "type": "GroupBegin", - "group": { - "type": "FunctionCall", - "name": "f", - "functionSourceRange": [ - 4, - 26, - 0 - ], - "unlabeledArg": null, - "labeledArgs": {} - }, - "sourceRange": [] - }, - { - "type": "GroupEnd" - }, - { - "type": "GroupBegin", - "group": { - "type": "FunctionCall", - "name": "f", - "functionSourceRange": [ - 4, - 26, - 0 - ], - "unlabeledArg": null, - "labeledArgs": {} - }, - "sourceRange": [] - }, - { - "type": "GroupEnd" - }, - { - "type": "GroupBegin", - "group": { - "type": "FunctionCall", - "name": "f", - "functionSourceRange": [ - 4, - 26, - 0 - ], - "unlabeledArg": null, - "labeledArgs": {} - }, - "sourceRange": [] - }, - { - "type": "GroupEnd" - }, - { - "type": "GroupBegin", - "group": { - "type": "FunctionCall", - "name": "f", - "functionSourceRange": [ - 4, - 26, - 0 - ], - "unlabeledArg": null, - "labeledArgs": {} - }, - "sourceRange": [] - }, - { - "type": "GroupEnd" - }, - { - "type": "GroupBegin", - "group": { - "type": "FunctionCall", - "name": "f", - "functionSourceRange": [ - 4, - 26, - 0 - ], - "unlabeledArg": null, - "labeledArgs": {} - }, - "sourceRange": [] - }, - { - "type": "GroupEnd" - }, - { - "type": "GroupBegin", - "group": { - "type": "FunctionCall", - "name": "f", - "functionSourceRange": [ - 4, - 26, - 0 - ], - "unlabeledArg": null, - "labeledArgs": {} - }, - "sourceRange": [] - }, - { - "type": "GroupEnd" - }, - { - "type": "GroupBegin", - "group": { - "type": "FunctionCall", - "name": "f", - "functionSourceRange": [ - 4, - 26, - 0 - ], - "unlabeledArg": null, - "labeledArgs": {} - }, - "sourceRange": [] - }, - { - "type": "GroupEnd" - }, - { - "type": "GroupBegin", - "group": { - "type": "FunctionCall", - "name": "f", - "functionSourceRange": [ - 4, - 26, - 0 - ], - "unlabeledArg": null, - "labeledArgs": {} - }, - "sourceRange": [] - }, - { - "type": "GroupEnd" - }, - { - "type": "GroupBegin", - "group": { - "type": "FunctionCall", - "name": "f", - "functionSourceRange": [ - 4, - 26, - 0 - ], - "unlabeledArg": null, - "labeledArgs": {} - }, - "sourceRange": [] - }, - { - "type": "GroupEnd" - }, - { - "type": "GroupBegin", - "group": { - "type": "FunctionCall", - "name": "f", - "functionSourceRange": [ - 4, - 26, - 0 - ], - "unlabeledArg": null, - "labeledArgs": {} - }, - "sourceRange": [] - }, { "type": "GroupEnd" } diff --git a/rust/kcl-lib/tests/add_lots/program_memory.snap b/rust/kcl-lib/tests/add_lots/program_memory.snap index 385a17446..5de5bb1ed 100644 --- a/rust/kcl-lib/tests/add_lots/program_memory.snap +++ b/rust/kcl-lib/tests/add_lots/program_memory.snap @@ -8,7 +8,7 @@ description: Variables in memory after executing add_lots.kcl }, "x": { "type": "Number", - "value": 4970.0, + "value": 3660.0, "ty": { "type": "Default", "len": { diff --git a/rust/kcl-lib/tests/add_lots/unparsed.snap b/rust/kcl-lib/tests/add_lots/unparsed.snap index edfbd75b4..5713fbcd7 100644 --- a/rust/kcl-lib/tests/add_lots/unparsed.snap +++ b/rust/kcl-lib/tests/add_lots/unparsed.snap @@ -6,6 +6,6 @@ fn f(i) { return i * 2 } -x = f(0) + f(1) + f(2) + f(3) + f(4) + f(5) + f(6) + f(7) + f(8) + f(9) + f(10) + f(11) + f(12) + f(13) + f(14) + f(15) + f(16) + f(17) + f(18) + f(19) + f(20) + f(21) + f(22) + f(23) + f(24) + f(25) + f(26) + f(27) + f(28) + f(29) + f(30) + f(31) + f(32) + f(33) + f(34) + f(35) + f(36) + f(37) + f(38) + f(39) + f(40) + f(41) + f(42) + f(43) + f(44) + f(45) + f(46) + f(47) + f(48) + f(49) + f(50) + f(51) + f(52) + f(53) + f(54) + f(55) + f(56) + f(57) + f(58) + f(59) + f(60) + f(61) + f(62) + f(63) + f(64) + f(65) + f(66) + f(67) + f(68) + f(69) + f(70) +x = f(0) + f(1) + f(2) + f(3) + f(4) + f(5) + f(6) + f(7) + f(8) + f(9) + f(10) + f(11) + f(12) + f(13) + f(14) + f(15) + f(16) + f(17) + f(18) + f(19) + f(20) + f(21) + f(22) + f(23) + f(24) + f(25) + f(26) + f(27) + f(28) + f(29) + f(30) + f(31) + f(32) + f(33) + f(34) + f(35) + f(36) + f(37) + f(38) + f(39) + f(40) + f(41) + f(42) + f(43) + f(44) + f(45) + f(46) + f(47) + f(48) + f(49) + f(50) + f(51) + f(52) + f(53) + f(54) + f(55) + f(56) + f(57) + f(58) + f(59) + f(60) -assertEqual(x, 4970, 0.1, "Big sum") +assertEqual(x, 3660, 0.1, "Big sum") diff --git a/rust/kcl-lib/tests/angled_line/ops.snap b/rust/kcl-lib/tests/angled_line/ops.snap index d55ccd814..43c58d7ae 100644 --- a/rust/kcl-lib/tests/angled_line/ops.snap +++ b/rust/kcl-lib/tests/angled_line/ops.snap @@ -5,7 +5,7 @@ description: Operations executed angled_line.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/angled_line/program_memory.snap b/rust/kcl-lib/tests/angled_line/program_memory.snap index 5a4ebee04..961375c48 100644 --- a/rust/kcl-lib/tests/angled_line/program_memory.snap +++ b/rust/kcl-lib/tests/angled_line/program_memory.snap @@ -192,22 +192,34 @@ description: Variables in memory after executing angled_line.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/artifact_graph_example_code1/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/artifact_graph_example_code1/artifact_graph_flowchart.snap.md index 94519194f..b86904dd8 100644 --- a/rust/kcl-lib/tests/artifact_graph_example_code1/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/artifact_graph_example_code1/artifact_graph_flowchart.snap.md @@ -10,11 +10,11 @@ flowchart LR 8[Solid2d] end subgraph path25 [Path] - 25["Path
[383, 410, 0]"] - 26["Segment
[416, 434, 0]"] - 27["Segment
[440, 459, 0]"] - 28["Segment
[465, 521, 0]"] - 29["Segment
[527, 534, 0]"] + 25["Path
[390, 417, 0]"] + 26["Segment
[423, 441, 0]"] + 27["Segment
[447, 466, 0]"] + 28["Segment
[472, 528, 0]"] + 29["Segment
[534, 541, 0]"] 30[Solid2d] end 1["Plane
[12, 31, 0]"] @@ -34,7 +34,7 @@ flowchart LR 22["SweepEdge Opposite"] 23["SweepEdge Adjacent"] 24["EdgeCut Fillet
[298, 332, 0]"] - 31["Sweep Extrusion
[548, 578, 0]"] + 31["Sweep Extrusion
[555, 585, 0]"] 32[Wall] 33[Wall] 34[Wall] @@ -45,7 +45,7 @@ flowchart LR 39["SweepEdge Adjacent"] 40["SweepEdge Opposite"] 41["SweepEdge Adjacent"] - 42["StartSketchOnFace
[345, 377, 0]"] + 42["StartSketchOnFace
[345, 384, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/artifact_graph_example_code1/ast.snap b/rust/kcl-lib/tests/artifact_graph_example_code1/ast.snap index 85bf9ceb2..1b038356c 100644 --- a/rust/kcl-lib/tests/artifact_graph_example_code1/ast.snap +++ b/rust/kcl-lib/tests/artifact_graph_example_code1/ast.snap @@ -724,36 +724,30 @@ description: Result of parsing artifact_graph_example_code1.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg02", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg02", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -774,8 +768,24 @@ description: Result of parsing artifact_graph_example_code1.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/artifact_graph_example_code1/input.kcl b/rust/kcl-lib/tests/artifact_graph_example_code1/input.kcl index a7e26e11c..b50d3b4d9 100644 --- a/rust/kcl-lib/tests/artifact_graph_example_code1/input.kcl +++ b/rust/kcl-lib/tests/artifact_graph_example_code1/input.kcl @@ -7,7 +7,7 @@ sketch001 = startSketchOn('XY') |> close() extrude001 = extrude(sketch001, length = -10) |> fillet(radius = 5, tags = [seg01]) -sketch002 = startSketchOn(extrude001, seg02) +sketch002 = startSketchOn(extrude001, face = seg02) |> startProfileAt([-2, -6], %) |> line(end = [2, 3]) |> line(end = [2, -3]) diff --git a/rust/kcl-lib/tests/artifact_graph_example_code1/ops.snap b/rust/kcl-lib/tests/artifact_graph_example_code1/ops.snap index a2ef40a53..d07131c12 100644 --- a/rust/kcl-lib/tests/artifact_graph_example_code1/ops.snap +++ b/rust/kcl-lib/tests/artifact_graph_example_code1/ops.snap @@ -5,7 +5,7 @@ description: Operations executed artifact_graph_example_code1.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" @@ -97,16 +97,7 @@ description: Operations executed artifact_graph_example_code1.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg02", @@ -118,7 +109,15 @@ description: Operations executed artifact_graph_example_code1.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/artifact_graph_example_code1/program_memory.snap b/rust/kcl-lib/tests/artifact_graph_example_code1/program_memory.snap index 1efb62c8f..721aadcbf 100644 --- a/rust/kcl-lib/tests/artifact_graph_example_code1/program_memory.snap +++ b/rust/kcl-lib/tests/artifact_graph_example_code1/program_memory.snap @@ -171,22 +171,34 @@ description: Variables in memory after executing artifact_graph_example_code1.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -233,7 +245,18 @@ description: Variables in memory after executing artifact_graph_example_code1.kc { "type": "fillet", "id": "[uuid]", - "radius": 5.0, + "radius": { + "n": 5.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -361,17 +384,26 @@ description: Variables in memory after executing artifact_graph_example_code1.kc "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -539,22 +571,34 @@ description: Variables in memory after executing artifact_graph_example_code1.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -601,7 +645,18 @@ description: Variables in memory after executing artifact_graph_example_code1.kc { "type": "fillet", "id": "[uuid]", - "radius": 5.0, + "radius": { + "n": 5.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -778,22 +833,34 @@ description: Variables in memory after executing artifact_graph_example_code1.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -925,17 +992,26 @@ description: Variables in memory after executing artifact_graph_example_code1.kc "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1103,22 +1179,34 @@ description: Variables in memory after executing artifact_graph_example_code1.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1165,7 +1253,18 @@ description: Variables in memory after executing artifact_graph_example_code1.kc { "type": "fillet", "id": "[uuid]", - "radius": 5.0, + "radius": { + "n": 5.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } diff --git a/rust/kcl-lib/tests/artifact_graph_example_code1/unparsed.snap b/rust/kcl-lib/tests/artifact_graph_example_code1/unparsed.snap index 6a100aae8..b1066870c 100644 --- a/rust/kcl-lib/tests/artifact_graph_example_code1/unparsed.snap +++ b/rust/kcl-lib/tests/artifact_graph_example_code1/unparsed.snap @@ -11,7 +11,7 @@ sketch001 = startSketchOn(XY) |> close() extrude001 = extrude(sketch001, length = -10) |> fillet(radius = 5, tags = [seg01]) -sketch002 = startSketchOn(extrude001, seg02) +sketch002 = startSketchOn(extrude001, face = seg02) |> startProfileAt([-2, -6], %) |> line(end = [2, 3]) |> line(end = [2, -3]) diff --git a/rust/kcl-lib/tests/artifact_graph_example_code_no_3d/ops.snap b/rust/kcl-lib/tests/artifact_graph_example_code_no_3d/ops.snap index c8e23e42f..3f61a2e6f 100644 --- a/rust/kcl-lib/tests/artifact_graph_example_code_no_3d/ops.snap +++ b/rust/kcl-lib/tests/artifact_graph_example_code_no_3d/ops.snap @@ -5,7 +5,7 @@ description: Operations executed artifact_graph_example_code_no_3d.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "YZ" @@ -20,7 +20,7 @@ description: Operations executed artifact_graph_example_code_no_3d.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "-XZ" diff --git a/rust/kcl-lib/tests/artifact_graph_example_code_no_3d/program_memory.snap b/rust/kcl-lib/tests/artifact_graph_example_code_no_3d/program_memory.snap index 976a81a53..b7e3a106b 100644 --- a/rust/kcl-lib/tests/artifact_graph_example_code_no_3d/program_memory.snap +++ b/rust/kcl-lib/tests/artifact_graph_example_code_no_3d/program_memory.snap @@ -146,22 +146,34 @@ description: Variables in memory after executing artifact_graph_example_code_no_ "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -288,22 +300,34 @@ description: Variables in memory after executing artifact_graph_example_code_no_ "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/artifact_graph_example_code_offset_planes/ops.snap b/rust/kcl-lib/tests/artifact_graph_example_code_offset_planes/ops.snap index 9d94cf7bc..acae2869e 100644 --- a/rust/kcl-lib/tests/artifact_graph_example_code_offset_planes/ops.snap +++ b/rust/kcl-lib/tests/artifact_graph_example_code_offset_planes/ops.snap @@ -95,7 +95,7 @@ description: Operations executed artifact_graph_example_code_offset_planes.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/artifact_graph_example_code_offset_planes/program_memory.snap b/rust/kcl-lib/tests/artifact_graph_example_code_offset_planes/program_memory.snap index 59fd81bc8..7b7c1a3ea 100644 --- a/rust/kcl-lib/tests/artifact_graph_example_code_offset_planes/program_memory.snap +++ b/rust/kcl-lib/tests/artifact_graph_example_code_offset_planes/program_memory.snap @@ -12,22 +12,34 @@ description: Variables in memory after executing artifact_graph_example_code_off "origin": { "x": 0.0, "y": 0.0, - "z": 20.0 + "z": 20.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -43,22 +55,34 @@ description: Variables in memory after executing artifact_graph_example_code_off "origin": { "x": 0.0, "y": 50.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -74,22 +98,34 @@ description: Variables in memory after executing artifact_graph_example_code_off "origin": { "x": 10.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -130,22 +166,34 @@ description: Variables in memory after executing artifact_graph_example_code_off "origin": { "x": 0.0, "y": 0.0, - "z": 20.0 + "z": 20.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/artifact_graph_flowchart.snap.md index 1ebb3e12b..1499f9700 100644 --- a/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/artifact_graph_flowchart.snap.md @@ -1,39 +1,39 @@ ```mermaid flowchart LR subgraph path2 [Path] - 2["Path
[37, 62, 0]"] - 3["Segment
[68, 86, 0]"] - 4["Segment
[92, 125, 0]"] - 5["Segment
[131, 187, 0]"] - 6["Segment
[193, 200, 0]"] + 2["Path
[35, 60, 0]"] + 3["Segment
[66, 84, 0]"] + 4["Segment
[90, 123, 0]"] + 5["Segment
[129, 185, 0]"] + 6["Segment
[191, 198, 0]"] 7[Solid2d] end subgraph path20 [Path] - 20["Path
[295, 325, 0]"] - 21["Segment
[331, 349, 0]"] - 22["Segment
[355, 374, 0]"] - 23["Segment
[380, 436, 0]"] - 24["Segment
[442, 449, 0]"] + 20["Path
[300, 330, 0]"] + 21["Segment
[336, 354, 0]"] + 22["Segment
[360, 379, 0]"] + 23["Segment
[385, 441, 0]"] + 24["Segment
[447, 454, 0]"] 25[Solid2d] end subgraph path37 [Path] - 37["Path
[544, 571, 0]"] - 38["Segment
[577, 611, 0]"] - 39["Segment
[617, 636, 0]"] - 40["Segment
[642, 698, 0]"] - 41["Segment
[704, 711, 0]"] + 37["Path
[556, 583, 0]"] + 38["Segment
[589, 623, 0]"] + 39["Segment
[629, 648, 0]"] + 40["Segment
[654, 710, 0]"] + 41["Segment
[716, 723, 0]"] 42[Solid2d] end subgraph path54 [Path] - 54["Path
[806, 833, 0]"] - 55["Segment
[839, 859, 0]"] - 56["Segment
[865, 886, 0]"] - 57["Segment
[892, 948, 0]"] - 58["Segment
[954, 961, 0]"] + 54["Path
[825, 852, 0]"] + 55["Segment
[858, 878, 0]"] + 56["Segment
[884, 905, 0]"] + 57["Segment
[911, 967, 0]"] + 58["Segment
[973, 980, 0]"] 59[Solid2d] end - 1["Plane
[12, 31, 0]"] - 8["Sweep Extrusion
[214, 244, 0]"] + 1["Plane
[12, 29, 0]"] + 8["Sweep Extrusion
[212, 242, 0]"] 9[Wall] 10[Wall] 11[Wall] @@ -45,7 +45,7 @@ flowchart LR 17["SweepEdge Adjacent"] 18["SweepEdge Opposite"] 19["SweepEdge Adjacent"] - 26["Sweep Extrusion
[463, 493, 0]"] + 26["Sweep Extrusion
[468, 498, 0]"] 27[Wall] 28[Wall] 29[Wall] @@ -56,7 +56,7 @@ flowchart LR 34["SweepEdge Adjacent"] 35["SweepEdge Opposite"] 36["SweepEdge Adjacent"] - 43["Sweep Extrusion
[725, 755, 0]"] + 43["Sweep Extrusion
[737, 767, 0]"] 44[Wall] 45[Wall] 46[Wall] @@ -67,7 +67,7 @@ flowchart LR 51["SweepEdge Adjacent"] 52["SweepEdge Opposite"] 53["SweepEdge Adjacent"] - 60["Sweep Extrusion
[975, 1005, 0]"] + 60["Sweep Extrusion
[994, 1024, 0]"] 61[Wall] 62[Wall] 63[Wall] @@ -78,9 +78,9 @@ flowchart LR 68["SweepEdge Adjacent"] 69["SweepEdge Opposite"] 70["SweepEdge Adjacent"] - 71["StartSketchOnFace
[257, 289, 0]"] - 72["StartSketchOnFace
[506, 538, 0]"] - 73["StartSketchOnFace
[768, 800, 0]"] + 71["StartSketchOnFace
[255, 294, 0]"] + 72["StartSketchOnFace
[511, 550, 0]"] + 73["StartSketchOnFace
[780, 819, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/ast.snap b/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/ast.snap index 83bbf5d12..0e38b7f1a 100644 --- a/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/ast.snap +++ b/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/ast.snap @@ -22,13 +22,20 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl { "arguments": [ { + "abs_path": false, "commentStart": 0, "end": 0, - "raw": "'XZ'", + "name": { + "commentStart": 0, + "end": 0, + "name": "XZ", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Literal", - "type": "Literal", - "value": "XZ" + "type": "Name", + "type": "Name" } ], "callee": { @@ -523,36 +530,30 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg01", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg01", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -573,8 +574,24 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -1037,29 +1054,23 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude002", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'END'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "END" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'END'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "END" + } } ], "callee": { @@ -1080,8 +1091,24 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude002", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -1554,36 +1581,30 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude003", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg02", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg02", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -1604,8 +1625,24 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude003", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/input.kcl b/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/input.kcl index 6253d95e4..e77dd7be0 100644 --- a/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/input.kcl +++ b/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/input.kcl @@ -1,25 +1,25 @@ -sketch001 = startSketchOn('XZ') +sketch001 = startSketchOn(XZ) |> startProfileAt([0, 0], %) |> line(end = [4, 8]) |> line(end = [5, -8], tag = $seg01) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude001 = extrude(sketch001, length = 6) -sketch002 = startSketchOn(extrude001, seg01) +sketch002 = startSketchOn(extrude001, face = seg01) |> startProfileAt([-0.5, 0.5], %) |> line(end = [2, 5]) |> line(end = [2, -5]) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude002 = extrude(sketch002, length = 5) -sketch003 = startSketchOn(extrude002, 'END') +sketch003 = startSketchOn(extrude002, face = 'END') |> startProfileAt([1, 1.5], %) |> line(end = [0.5, 2], tag = $seg02) |> line(end = [1, -2]) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude003 = extrude(sketch003, length = 4) -sketch004 = startSketchOn(extrude003, seg02) +sketch004 = startSketchOn(extrude003, face = seg02) |> startProfileAt([-3, 14], %) |> line(end = [0.5, 1]) |> line(end = [0.5, -2]) diff --git a/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/ops.snap b/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/ops.snap index 02198c7f9..63c97057b 100644 --- a/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/ops.snap +++ b/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/ops.snap @@ -5,10 +5,10 @@ description: Operations executed artifact_graph_sketch_on_face_etc.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { - "type": "String", - "value": "XZ" + "type": "Plane", + "artifact_id": "[uuid]" }, "sourceRange": [] } @@ -52,16 +52,7 @@ description: Operations executed artifact_graph_sketch_on_face_etc.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg01", @@ -73,7 +64,15 @@ description: Operations executed artifact_graph_sketch_on_face_etc.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -109,16 +108,7 @@ description: Operations executed artifact_graph_sketch_on_face_etc.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -129,7 +119,15 @@ description: Operations executed artifact_graph_sketch_on_face_etc.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -165,16 +163,7 @@ description: Operations executed artifact_graph_sketch_on_face_etc.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg02", @@ -186,7 +175,15 @@ description: Operations executed artifact_graph_sketch_on_face_etc.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/program_memory.snap b/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/program_memory.snap index be2478180..1aa1e6218 100644 --- a/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/program_memory.snap +++ b/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/program_memory.snap @@ -22,9 +22,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 118, - "end": 124, - "start": 118, + "commentStart": 116, + "end": 122, + "start": 116, "type": "TagDeclarator", "value": "seg01" }, @@ -71,9 +71,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e 8.0 ], "tag": { - "commentStart": 118, - "end": 124, - "start": 118, + "commentStart": 116, + "end": 122, + "start": 116, "type": "TagDeclarator", "value": "seg01" }, @@ -133,22 +133,34 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -310,17 +322,26 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -339,9 +360,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 118, - "end": 124, - "start": 118, + "commentStart": 116, + "end": 122, + "start": 116, "type": "TagDeclarator", "value": "seg01" }, @@ -388,9 +409,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e 8.0 ], "tag": { - "commentStart": 118, - "end": 124, - "start": 118, + "commentStart": 116, + "end": 122, + "start": 116, "type": "TagDeclarator", "value": "seg01" }, @@ -450,22 +471,34 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -556,9 +589,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 604, - "end": 610, - "start": 604, + "commentStart": 616, + "end": 622, + "start": 616, "type": "TagDeclarator", "value": "seg02" }, @@ -593,9 +626,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e 1.5 ], "tag": { - "commentStart": 604, - "end": 610, - "start": 604, + "commentStart": 616, + "end": 622, + "start": 616, "type": "TagDeclarator", "value": "seg02" }, @@ -674,17 +707,26 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -802,17 +844,26 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -831,9 +882,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 118, - "end": 124, - "start": 118, + "commentStart": 116, + "end": 122, + "start": 116, "type": "TagDeclarator", "value": "seg01" }, @@ -880,9 +931,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e 8.0 ], "tag": { - "commentStart": 118, - "end": 124, - "start": 118, + "commentStart": 116, + "end": 122, + "start": 116, "type": "TagDeclarator", "value": "seg01" }, @@ -942,22 +993,34 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1195,17 +1258,26 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1217,9 +1289,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 604, - "end": 610, - "start": 604, + "commentStart": 616, + "end": 622, + "start": 616, "type": "TagDeclarator", "value": "seg02" }, @@ -1254,9 +1326,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e 1.5 ], "tag": { - "commentStart": 604, - "end": 610, - "start": 604, + "commentStart": 616, + "end": 622, + "start": 616, "type": "TagDeclarator", "value": "seg02" }, @@ -1335,17 +1407,26 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1463,17 +1544,26 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1492,9 +1582,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 118, - "end": 124, - "start": 118, + "commentStart": 116, + "end": 122, + "start": 116, "type": "TagDeclarator", "value": "seg01" }, @@ -1541,9 +1631,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e 8.0 ], "tag": { - "commentStart": 118, - "end": 124, - "start": 118, + "commentStart": 116, + "end": 122, + "start": 116, "type": "TagDeclarator", "value": "seg01" }, @@ -1603,22 +1693,34 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1818,9 +1920,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e 8.0 ], "tag": { - "commentStart": 118, - "end": 124, - "start": 118, + "commentStart": 116, + "end": 122, + "start": 116, "type": "TagDeclarator", "value": "seg01" }, @@ -1880,22 +1982,34 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2023,17 +2137,26 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2052,9 +2175,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 118, - "end": 124, - "start": 118, + "commentStart": 116, + "end": 122, + "start": 116, "type": "TagDeclarator", "value": "seg01" }, @@ -2101,9 +2224,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e 8.0 ], "tag": { - "commentStart": 118, - "end": 124, - "start": 118, + "commentStart": 116, + "end": 122, + "start": 116, "type": "TagDeclarator", "value": "seg01" }, @@ -2163,22 +2286,34 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2266,9 +2401,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e 1.5 ], "tag": { - "commentStart": 604, - "end": 610, - "start": 604, + "commentStart": 616, + "end": 622, + "start": 616, "type": "TagDeclarator", "value": "seg02" }, @@ -2347,17 +2482,26 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2475,17 +2619,26 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2504,9 +2657,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 118, - "end": 124, - "start": 118, + "commentStart": 116, + "end": 122, + "start": 116, "type": "TagDeclarator", "value": "seg01" }, @@ -2553,9 +2706,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e 8.0 ], "tag": { - "commentStart": 118, - "end": 124, - "start": 118, + "commentStart": 116, + "end": 122, + "start": 116, "type": "TagDeclarator", "value": "seg01" }, @@ -2615,22 +2768,34 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2834,17 +2999,26 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2856,9 +3030,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 604, - "end": 610, - "start": 604, + "commentStart": 616, + "end": 622, + "start": 616, "type": "TagDeclarator", "value": "seg02" }, @@ -2893,9 +3067,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e 1.5 ], "tag": { - "commentStart": 604, - "end": 610, - "start": 604, + "commentStart": 616, + "end": 622, + "start": 616, "type": "TagDeclarator", "value": "seg02" }, @@ -2974,17 +3148,26 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3102,17 +3285,26 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3131,9 +3323,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 118, - "end": 124, - "start": 118, + "commentStart": 116, + "end": 122, + "start": 116, "type": "TagDeclarator", "value": "seg01" }, @@ -3180,9 +3372,9 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e 8.0 ], "tag": { - "commentStart": 118, - "end": 124, - "start": 118, + "commentStart": 116, + "end": 122, + "start": 116, "type": "TagDeclarator", "value": "seg01" }, @@ -3242,22 +3434,34 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/unparsed.snap b/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/unparsed.snap index 96225d5dc..33137b507 100644 --- a/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/unparsed.snap +++ b/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/unparsed.snap @@ -9,21 +9,21 @@ sketch001 = startSketchOn(XZ) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude001 = extrude(sketch001, length = 6) -sketch002 = startSketchOn(extrude001, seg01) +sketch002 = startSketchOn(extrude001, face = seg01) |> startProfileAt([-0.5, 0.5], %) |> line(end = [2, 5]) |> line(end = [2, -5]) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude002 = extrude(sketch002, length = 5) -sketch003 = startSketchOn(extrude002, 'END') +sketch003 = startSketchOn(extrude002, face = 'END') |> startProfileAt([1, 1.5], %) |> line(end = [0.5, 2], tag = $seg02) |> line(end = [1, -2]) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude003 = extrude(sketch003, length = 4) -sketch004 = startSketchOn(extrude003, seg02) +sketch004 = startSketchOn(extrude003, face = seg02) |> startProfileAt([-3, 14], %) |> line(end = [0.5, 1]) |> line(end = [0.5, -2]) diff --git a/rust/kcl-lib/tests/assembly_mixed_units_cubes/ops.snap b/rust/kcl-lib/tests/assembly_mixed_units_cubes/ops.snap index 3ff4313e5..3715b60d0 100644 --- a/rust/kcl-lib/tests/assembly_mixed_units_cubes/ops.snap +++ b/rust/kcl-lib/tests/assembly_mixed_units_cubes/ops.snap @@ -14,7 +14,7 @@ description: Operations executed assembly_mixed_units_cubes.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" @@ -73,7 +73,7 @@ description: Operations executed assembly_mixed_units_cubes.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/assembly_non_default_units/ops.snap b/rust/kcl-lib/tests/assembly_non_default_units/ops.snap index ee50a9d80..e032dbdf2 100644 --- a/rust/kcl-lib/tests/assembly_non_default_units/ops.snap +++ b/rust/kcl-lib/tests/assembly_non_default_units/ops.snap @@ -14,7 +14,7 @@ description: Operations executed assembly_non_default_units.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XZ" @@ -41,7 +41,7 @@ description: Operations executed assembly_non_default_units.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XZ" diff --git a/rust/kcl-lib/tests/basic_fillet_cube_close_opposite/ops.snap b/rust/kcl-lib/tests/basic_fillet_cube_close_opposite/ops.snap index cc337f525..b5062f52f 100644 --- a/rust/kcl-lib/tests/basic_fillet_cube_close_opposite/ops.snap +++ b/rust/kcl-lib/tests/basic_fillet_cube_close_opposite/ops.snap @@ -5,7 +5,7 @@ description: Operations executed basic_fillet_cube_close_opposite.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/basic_fillet_cube_close_opposite/program_memory.snap b/rust/kcl-lib/tests/basic_fillet_cube_close_opposite/program_memory.snap index 9b96ad94b..e2e28c8a9 100644 --- a/rust/kcl-lib/tests/basic_fillet_cube_close_opposite/program_memory.snap +++ b/rust/kcl-lib/tests/basic_fillet_cube_close_opposite/program_memory.snap @@ -164,22 +164,34 @@ description: Variables in memory after executing basic_fillet_cube_close_opposit "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -230,14 +242,36 @@ description: Variables in memory after executing basic_fillet_cube_close_opposit { "type": "fillet", "id": "[uuid]", - "radius": 2.0, + "radius": { + "n": 2.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 2.0, + "radius": { + "n": 2.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } diff --git a/rust/kcl-lib/tests/basic_fillet_cube_end/ops.snap b/rust/kcl-lib/tests/basic_fillet_cube_end/ops.snap index 5c0166e8c..460bfae44 100644 --- a/rust/kcl-lib/tests/basic_fillet_cube_end/ops.snap +++ b/rust/kcl-lib/tests/basic_fillet_cube_end/ops.snap @@ -5,7 +5,7 @@ description: Operations executed basic_fillet_cube_end.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/basic_fillet_cube_end/program_memory.snap b/rust/kcl-lib/tests/basic_fillet_cube_end/program_memory.snap index c943835f9..2894abd45 100644 --- a/rust/kcl-lib/tests/basic_fillet_cube_end/program_memory.snap +++ b/rust/kcl-lib/tests/basic_fillet_cube_end/program_memory.snap @@ -152,22 +152,34 @@ description: Variables in memory after executing basic_fillet_cube_end.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -214,14 +226,36 @@ description: Variables in memory after executing basic_fillet_cube_end.kcl { "type": "fillet", "id": "[uuid]", - "radius": 2.0, + "radius": { + "n": 2.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 2.0, + "radius": { + "n": 2.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } diff --git a/rust/kcl-lib/tests/basic_fillet_cube_next_adjacent/ops.snap b/rust/kcl-lib/tests/basic_fillet_cube_next_adjacent/ops.snap index 12bdf8476..937c7d07b 100644 --- a/rust/kcl-lib/tests/basic_fillet_cube_next_adjacent/ops.snap +++ b/rust/kcl-lib/tests/basic_fillet_cube_next_adjacent/ops.snap @@ -5,7 +5,7 @@ description: Operations executed basic_fillet_cube_next_adjacent.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/basic_fillet_cube_next_adjacent/program_memory.snap b/rust/kcl-lib/tests/basic_fillet_cube_next_adjacent/program_memory.snap index 54bb2eeb6..cb5f74be4 100644 --- a/rust/kcl-lib/tests/basic_fillet_cube_next_adjacent/program_memory.snap +++ b/rust/kcl-lib/tests/basic_fillet_cube_next_adjacent/program_memory.snap @@ -176,22 +176,34 @@ description: Variables in memory after executing basic_fillet_cube_next_adjacent "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -246,7 +258,18 @@ description: Variables in memory after executing basic_fillet_cube_next_adjacent { "type": "fillet", "id": "[uuid]", - "radius": 2.0, + "radius": { + "n": 2.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } diff --git a/rust/kcl-lib/tests/basic_fillet_cube_previous_adjacent/ops.snap b/rust/kcl-lib/tests/basic_fillet_cube_previous_adjacent/ops.snap index 364bbb6f9..01167f5fe 100644 --- a/rust/kcl-lib/tests/basic_fillet_cube_previous_adjacent/ops.snap +++ b/rust/kcl-lib/tests/basic_fillet_cube_previous_adjacent/ops.snap @@ -5,7 +5,7 @@ description: Operations executed basic_fillet_cube_previous_adjacent.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/basic_fillet_cube_previous_adjacent/program_memory.snap b/rust/kcl-lib/tests/basic_fillet_cube_previous_adjacent/program_memory.snap index 25e08a5a9..8fc08a03c 100644 --- a/rust/kcl-lib/tests/basic_fillet_cube_previous_adjacent/program_memory.snap +++ b/rust/kcl-lib/tests/basic_fillet_cube_previous_adjacent/program_memory.snap @@ -176,22 +176,34 @@ description: Variables in memory after executing basic_fillet_cube_previous_adja "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -246,7 +258,18 @@ description: Variables in memory after executing basic_fillet_cube_previous_adja { "type": "fillet", "id": "[uuid]", - "radius": 2.0, + "radius": { + "n": 2.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } diff --git a/rust/kcl-lib/tests/basic_fillet_cube_start/ops.snap b/rust/kcl-lib/tests/basic_fillet_cube_start/ops.snap index c73ca04d6..879134dc7 100644 --- a/rust/kcl-lib/tests/basic_fillet_cube_start/ops.snap +++ b/rust/kcl-lib/tests/basic_fillet_cube_start/ops.snap @@ -5,7 +5,7 @@ description: Operations executed basic_fillet_cube_start.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/basic_fillet_cube_start/program_memory.snap b/rust/kcl-lib/tests/basic_fillet_cube_start/program_memory.snap index 680ba705c..d796ceaf2 100644 --- a/rust/kcl-lib/tests/basic_fillet_cube_start/program_memory.snap +++ b/rust/kcl-lib/tests/basic_fillet_cube_start/program_memory.snap @@ -152,22 +152,34 @@ description: Variables in memory after executing basic_fillet_cube_start.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -214,14 +226,36 @@ description: Variables in memory after executing basic_fillet_cube_start.kcl { "type": "fillet", "id": "[uuid]", - "radius": 2.0, + "radius": { + "n": 2.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 2.0, + "radius": { + "n": 2.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } diff --git a/rust/kcl-lib/tests/big_number_angle_to_match_length_x/ops.snap b/rust/kcl-lib/tests/big_number_angle_to_match_length_x/ops.snap index 6618d96dd..0ab91459e 100644 --- a/rust/kcl-lib/tests/big_number_angle_to_match_length_x/ops.snap +++ b/rust/kcl-lib/tests/big_number_angle_to_match_length_x/ops.snap @@ -5,7 +5,7 @@ description: Operations executed big_number_angle_to_match_length_x.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/big_number_angle_to_match_length_x/program_memory.snap b/rust/kcl-lib/tests/big_number_angle_to_match_length_x/program_memory.snap index d3d48809b..5bb9a6716 100644 --- a/rust/kcl-lib/tests/big_number_angle_to_match_length_x/program_memory.snap +++ b/rust/kcl-lib/tests/big_number_angle_to_match_length_x/program_memory.snap @@ -114,22 +114,34 @@ description: Variables in memory after executing big_number_angle_to_match_lengt "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/big_number_angle_to_match_length_y/ops.snap b/rust/kcl-lib/tests/big_number_angle_to_match_length_y/ops.snap index 5de0ab29e..1f0a45253 100644 --- a/rust/kcl-lib/tests/big_number_angle_to_match_length_y/ops.snap +++ b/rust/kcl-lib/tests/big_number_angle_to_match_length_y/ops.snap @@ -5,7 +5,7 @@ description: Operations executed big_number_angle_to_match_length_y.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/big_number_angle_to_match_length_y/program_memory.snap b/rust/kcl-lib/tests/big_number_angle_to_match_length_y/program_memory.snap index 311aa01fa..486e937cc 100644 --- a/rust/kcl-lib/tests/big_number_angle_to_match_length_y/program_memory.snap +++ b/rust/kcl-lib/tests/big_number_angle_to_match_length_y/program_memory.snap @@ -114,22 +114,34 @@ description: Variables in memory after executing big_number_angle_to_match_lengt "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/circle_three_point/ops.snap b/rust/kcl-lib/tests/circle_three_point/ops.snap index a6fa29e1a..da25520e9 100644 --- a/rust/kcl-lib/tests/circle_three_point/ops.snap +++ b/rust/kcl-lib/tests/circle_three_point/ops.snap @@ -5,7 +5,7 @@ description: Operations executed circle_three_point.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/circle_three_point/program_memory.snap b/rust/kcl-lib/tests/circle_three_point/program_memory.snap index d29d0a2c6..17a2b9074 100644 --- a/rust/kcl-lib/tests/circle_three_point/program_memory.snap +++ b/rust/kcl-lib/tests/circle_three_point/program_memory.snap @@ -62,22 +62,34 @@ description: Variables in memory after executing circle_three_point.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/circular_pattern3d_a_pattern/ops.snap b/rust/kcl-lib/tests/circular_pattern3d_a_pattern/ops.snap index 958d70d9a..004551ae1 100644 --- a/rust/kcl-lib/tests/circular_pattern3d_a_pattern/ops.snap +++ b/rust/kcl-lib/tests/circular_pattern3d_a_pattern/ops.snap @@ -5,7 +5,7 @@ description: Operations executed circular_pattern3d_a_pattern.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XZ" diff --git a/rust/kcl-lib/tests/circular_pattern3d_a_pattern/program_memory.snap b/rust/kcl-lib/tests/circular_pattern3d_a_pattern/program_memory.snap index cc8ae5fc6..248df6d8e 100644 --- a/rust/kcl-lib/tests/circular_pattern3d_a_pattern/program_memory.snap +++ b/rust/kcl-lib/tests/circular_pattern3d_a_pattern/program_memory.snap @@ -128,22 +128,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -309,22 +321,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -487,22 +511,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -665,22 +701,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -843,22 +891,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1021,22 +1081,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1199,22 +1271,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1377,22 +1461,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1560,22 +1656,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1738,22 +1846,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1916,22 +2036,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2094,22 +2226,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2272,22 +2416,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2450,22 +2606,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2628,22 +2796,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2806,22 +2986,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2984,22 +3176,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3162,22 +3366,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3340,22 +3556,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3518,22 +3746,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3696,22 +3936,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3874,22 +4126,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4052,22 +4316,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4230,22 +4506,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4408,22 +4696,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4586,22 +4886,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4764,22 +5076,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4942,22 +5266,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5120,22 +5456,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5298,22 +5646,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5476,22 +5836,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5654,22 +6026,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5832,22 +6216,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6010,22 +6406,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6188,22 +6596,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6366,22 +6786,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6544,22 +6976,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6722,22 +7166,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6900,22 +7356,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7078,22 +7546,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7256,22 +7736,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7434,22 +7926,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7612,22 +8116,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7790,22 +8306,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7968,22 +8496,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8146,22 +8686,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8324,22 +8876,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8502,22 +9066,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8680,22 +9256,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8858,22 +9446,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9036,22 +9636,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9214,22 +9826,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9392,22 +10016,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9570,22 +10206,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9748,22 +10396,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9926,22 +10586,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10104,22 +10776,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10282,22 +10966,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10460,22 +11156,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10638,22 +11346,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10816,22 +11536,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10994,22 +11726,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11172,22 +11916,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11350,22 +12106,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11528,22 +12296,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11706,22 +12486,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11884,22 +12676,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12062,22 +12866,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12240,22 +13056,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12418,22 +13246,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12596,22 +13436,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12774,22 +13626,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12952,22 +13816,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13130,22 +14006,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13308,22 +14196,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13486,22 +14386,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13664,22 +14576,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13842,22 +14766,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -14020,22 +14956,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -14198,22 +15146,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -14376,22 +15336,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -14554,22 +15526,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -14732,22 +15716,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -14910,22 +15906,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -15088,22 +16096,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -15266,22 +16286,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -15444,22 +16476,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -15622,22 +16666,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -15800,22 +16856,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -15978,22 +17046,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -16156,22 +17236,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -16334,22 +17426,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -16512,22 +17616,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -16690,22 +17806,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -16868,22 +17996,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -17046,22 +18186,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -17224,22 +18376,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -17402,22 +18566,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -17580,22 +18756,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -17758,22 +18946,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -17936,22 +19136,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -18114,22 +19326,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -18292,22 +19516,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -18470,22 +19706,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -18648,22 +19896,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -18826,22 +20086,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -19004,22 +20276,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -19182,22 +20466,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -19360,22 +20656,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -19538,22 +20846,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -19716,22 +21036,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -19894,22 +21226,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -20072,22 +21416,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -20250,22 +21606,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -20428,22 +21796,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -20606,22 +21986,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -20784,22 +22176,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -20962,22 +22366,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -21140,22 +22556,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -21318,22 +22746,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -21496,22 +22936,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -21674,22 +23126,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -21852,22 +23316,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -22030,22 +23506,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -22208,22 +23696,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -22386,22 +23886,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -22564,22 +24076,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -22742,22 +24266,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -22920,22 +24456,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -23098,22 +24646,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -23276,22 +24836,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -23454,22 +25026,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -23632,22 +25216,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -23810,22 +25406,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -23988,22 +25596,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -24166,22 +25786,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -24344,22 +25976,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -24522,22 +26166,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -24700,22 +26356,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -24878,22 +26546,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -25056,22 +26736,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -25234,22 +26926,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -25412,22 +27116,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -25590,22 +27306,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -25768,22 +27496,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -25946,22 +27686,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -26124,22 +27876,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -26302,22 +28066,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -26480,22 +28256,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -26658,22 +28446,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -26836,22 +28636,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -27014,22 +28826,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -27192,22 +29016,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -27370,22 +29206,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -27548,22 +29396,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -27726,22 +29586,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -27904,22 +29776,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -28082,22 +29966,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -28260,22 +30156,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -28438,22 +30346,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -28616,22 +30536,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -28794,22 +30726,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -28972,22 +30916,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -29150,22 +31106,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -29328,22 +31296,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -29506,22 +31486,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -29684,22 +31676,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -29862,22 +31866,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -30040,22 +32056,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -30218,22 +32246,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -30396,22 +32436,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -30574,22 +32626,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -30752,22 +32816,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -30930,22 +33006,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -31108,22 +33196,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -31286,22 +33386,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -31464,22 +33576,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -31642,22 +33766,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -31820,22 +33956,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -31998,22 +34146,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -32176,22 +34336,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -32354,22 +34526,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -32532,22 +34716,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -32710,22 +34906,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -32888,22 +35096,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -33066,22 +35286,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -33244,22 +35476,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -33422,22 +35666,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -33600,22 +35856,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -33778,22 +36046,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -33956,22 +36236,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -34134,22 +36426,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -34312,22 +36616,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -34490,22 +36806,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -34668,22 +36996,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -34846,22 +37186,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -35024,22 +37376,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -35202,22 +37566,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -35380,22 +37756,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -35558,22 +37946,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -35736,22 +38136,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -35914,22 +38326,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -36092,22 +38516,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -36270,22 +38706,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -36448,22 +38896,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -36626,22 +39086,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -36804,22 +39276,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -36982,22 +39466,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -37160,22 +39656,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -37338,22 +39846,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -37516,22 +40036,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -37694,22 +40226,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -37872,22 +40416,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -38050,22 +40606,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -38228,22 +40796,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -38406,22 +40986,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -38584,22 +41176,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -38762,22 +41366,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -38940,22 +41556,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -39118,22 +41746,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -39296,22 +41936,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -39474,22 +42126,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -39652,22 +42316,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -39830,22 +42506,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -40008,22 +42696,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -40186,22 +42886,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -40364,22 +43076,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -40542,22 +43266,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -40720,22 +43456,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -40898,22 +43646,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -41076,22 +43836,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -41254,22 +44026,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -41432,22 +44216,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -41610,22 +44406,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -41788,22 +44596,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -41966,22 +44786,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -42144,22 +44976,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -42322,22 +45166,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -42500,22 +45356,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -42678,22 +45546,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -42856,22 +45736,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -43034,22 +45926,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -43212,22 +46116,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -43390,22 +46306,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -43568,22 +46496,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -43746,22 +46686,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -43924,22 +46876,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -44102,22 +47066,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -44280,22 +47256,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -44458,22 +47446,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -44636,22 +47636,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -44814,22 +47826,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -44992,22 +48016,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -45170,22 +48206,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -45348,22 +48396,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -45526,22 +48586,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -45704,22 +48776,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -45882,22 +48966,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -46060,22 +49156,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -46238,22 +49346,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -46416,22 +49536,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -46594,22 +49726,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -46772,22 +49916,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -46950,22 +50106,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -47128,22 +50296,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -47306,22 +50486,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -47484,22 +50676,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -47662,22 +50866,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -47840,22 +51056,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -48018,22 +51246,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -48196,22 +51436,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -48374,22 +51626,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -48552,22 +51816,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -48730,22 +52006,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -48908,22 +52196,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -49086,22 +52386,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -49264,22 +52576,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -49442,22 +52766,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -49620,22 +52956,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -49798,22 +53146,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -49976,22 +53336,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -50154,22 +53526,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -50332,22 +53716,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -50510,22 +53906,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -50688,22 +54096,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -50866,22 +54286,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -51044,22 +54476,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -51222,22 +54666,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -51400,22 +54856,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -51578,22 +55046,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -51756,22 +55236,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -51934,22 +55426,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -52112,22 +55616,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -52290,22 +55806,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -52468,22 +55996,34 @@ description: Variables in memory after executing circular_pattern3d_a_pattern.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/crazy_multi_profile/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/crazy_multi_profile/artifact_graph_flowchart.snap.md index 381e571ad..b8d7f6014 100644 --- a/rust/kcl-lib/tests/crazy_multi_profile/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/crazy_multi_profile/artifact_graph_flowchart.snap.md @@ -9,73 +9,73 @@ flowchart LR 7[Solid2d] end subgraph path20 [Path] - 20["Path
[354, 394, 0]"] - 21["Segment
[400, 424, 0]"] - 22["Segment
[430, 455, 0]"] + 20["Path
[361, 401, 0]"] + 21["Segment
[407, 431, 0]"] + 22["Segment
[437, 462, 0]"] end subgraph path23 [Path] - 23["Path
[469, 508, 0]"] - 24["Segment
[514, 579, 0]"] - 25["Segment
[585, 653, 0]"] - 26["Segment
[659, 747, 0]"] - 27["Segment
[753, 809, 0]"] - 28["Segment
[815, 822, 0]"] + 23["Path
[476, 515, 0]"] + 24["Segment
[521, 586, 0]"] + 25["Segment
[592, 660, 0]"] + 26["Segment
[666, 754, 0]"] + 27["Segment
[760, 816, 0]"] + 28["Segment
[822, 829, 0]"] 29[Solid2d] end subgraph path30 [Path] - 30["Path
[836, 875, 0]"] - 31["Segment
[881, 901, 0]"] - 32["Segment
[907, 933, 0]"] - 33["Segment
[939, 995, 0]"] - 34["Segment
[1001, 1008, 0]"] + 30["Path
[843, 882, 0]"] + 31["Segment
[888, 908, 0]"] + 32["Segment
[914, 940, 0]"] + 33["Segment
[946, 1002, 0]"] + 34["Segment
[1008, 1015, 0]"] 35[Solid2d] end subgraph path36 [Path] - 36["Path
[1022, 1077, 0]"] - 37["Segment
[1022, 1077, 0]"] + 36["Path
[1029, 1084, 0]"] + 37["Segment
[1029, 1084, 0]"] 38[Solid2d] end subgraph path39 [Path] - 39["Path
[1091, 1130, 0]"] - 40["Segment
[1136, 1160, 0]"] - 41["Segment
[1166, 1191, 0]"] - 42["Segment
[1197, 1253, 0]"] - 43["Segment
[1259, 1266, 0]"] + 39["Path
[1098, 1137, 0]"] + 40["Segment
[1143, 1167, 0]"] + 41["Segment
[1173, 1198, 0]"] + 42["Segment
[1204, 1260, 0]"] + 43["Segment
[1266, 1273, 0]"] 44[Solid2d] end subgraph path59 [Path] - 59["Path
[1438, 1476, 0]"] - 60["Segment
[1482, 1506, 0]"] - 61["Segment
[1512, 1537, 0]"] + 59["Path
[1445, 1483, 0]"] + 60["Segment
[1489, 1513, 0]"] + 61["Segment
[1519, 1544, 0]"] end subgraph path62 [Path] - 62["Path
[1551, 1590, 0]"] - 63["Segment
[1596, 1620, 0]"] - 64["Segment
[1626, 1651, 0]"] - 65["Segment
[1657, 1713, 0]"] - 66["Segment
[1719, 1726, 0]"] + 62["Path
[1558, 1597, 0]"] + 63["Segment
[1603, 1627, 0]"] + 64["Segment
[1633, 1658, 0]"] + 65["Segment
[1664, 1720, 0]"] + 66["Segment
[1726, 1733, 0]"] 67[Solid2d] end subgraph path68 [Path] - 68["Path
[1740, 1779, 0]"] - 69["Segment
[1785, 1808, 0]"] - 70["Segment
[1814, 1839, 0]"] - 71["Segment
[1845, 1901, 0]"] - 72["Segment
[1907, 1914, 0]"] + 68["Path
[1747, 1786, 0]"] + 69["Segment
[1792, 1815, 0]"] + 70["Segment
[1821, 1846, 0]"] + 71["Segment
[1852, 1908, 0]"] + 72["Segment
[1914, 1921, 0]"] 73[Solid2d] end subgraph path74 [Path] - 74["Path
[1928, 1984, 0]"] - 75["Segment
[1928, 1984, 0]"] + 74["Path
[1935, 1991, 0]"] + 75["Segment
[1935, 1991, 0]"] 76[Solid2d] end subgraph path77 [Path] - 77["Path
[1998, 2038, 0]"] - 78["Segment
[2044, 2109, 0]"] - 79["Segment
[2115, 2183, 0]"] - 80["Segment
[2189, 2277, 0]"] - 81["Segment
[2283, 2339, 0]"] - 82["Segment
[2345, 2352, 0]"] + 77["Path
[2005, 2045, 0]"] + 78["Segment
[2051, 2116, 0]"] + 79["Segment
[2122, 2190, 0]"] + 80["Segment
[2196, 2284, 0]"] + 81["Segment
[2290, 2346, 0]"] + 82["Segment
[2352, 2359, 0]"] 83[Solid2d] end 1["Plane
[12, 31, 0]"] @@ -91,8 +91,8 @@ flowchart LR 17["SweepEdge Adjacent"] 18["SweepEdge Opposite"] 19["SweepEdge Adjacent"] - 45["Sweep RevolveAboutEdge
[1280, 1346, 0]"] - 46["Sweep Extrusion
[1360, 1391, 0]"] + 45["Sweep RevolveAboutEdge
[1287, 1353, 0]"] + 46["Sweep Extrusion
[1367, 1398, 0]"] 47[Wall] 48[Wall] 49[Wall] @@ -104,8 +104,8 @@ flowchart LR 55["SweepEdge Adjacent"] 56["SweepEdge Opposite"] 57["SweepEdge Adjacent"] - 58["Plane
[1404, 1424, 0]"] - 84["Sweep Extrusion
[2366, 2399, 0]"] + 58["Plane
[1411, 1431, 0]"] + 84["Sweep Extrusion
[2373, 2406, 0]"] 85[Wall] 86[Wall] 87[Wall] @@ -120,7 +120,7 @@ flowchart LR 96["SweepEdge Adjacent"] 97["SweepEdge Opposite"] 98["SweepEdge Adjacent"] - 99["Sweep RevolveAboutEdge
[2413, 2458, 0]"] + 99["Sweep RevolveAboutEdge
[2420, 2465, 0]"] 100[Wall] 101[Wall] 102[Wall] @@ -132,7 +132,7 @@ flowchart LR 108["SweepEdge Adjacent"] 109["SweepEdge Opposite"] 110["SweepEdge Adjacent"] - 111["StartSketchOnFace
[308, 340, 0]"] + 111["StartSketchOnFace
[308, 347, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/crazy_multi_profile/ast.snap b/rust/kcl-lib/tests/crazy_multi_profile/ast.snap index fa78eb5fb..aa48268f6 100644 --- a/rust/kcl-lib/tests/crazy_multi_profile/ast.snap +++ b/rust/kcl-lib/tests/crazy_multi_profile/ast.snap @@ -577,36 +577,30 @@ description: Result of parsing crazy_multi_profile.kcl "init": { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg01", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg01", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -627,8 +621,24 @@ description: Result of parsing crazy_multi_profile.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, "start": 0, "type": "VariableDeclarator" diff --git a/rust/kcl-lib/tests/crazy_multi_profile/input.kcl b/rust/kcl-lib/tests/crazy_multi_profile/input.kcl index 72cacb4f8..c39f40d09 100644 --- a/rust/kcl-lib/tests/crazy_multi_profile/input.kcl +++ b/rust/kcl-lib/tests/crazy_multi_profile/input.kcl @@ -5,7 +5,7 @@ profile001 = startProfileAt([6.71, -3.66], sketch001) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude001 = extrude(profile001, length = 20) -sketch002 = startSketchOn(extrude001, seg01) +sketch002 = startSketchOn(extrude001, face = seg01) profile002 = startProfileAt([0.75, 13.46], sketch002) |> line(end = [4.52, 3.79]) |> line(end = [5.98, -2.81]) diff --git a/rust/kcl-lib/tests/crazy_multi_profile/ops.snap b/rust/kcl-lib/tests/crazy_multi_profile/ops.snap index 0ebf2b70a..496240a98 100644 --- a/rust/kcl-lib/tests/crazy_multi_profile/ops.snap +++ b/rust/kcl-lib/tests/crazy_multi_profile/ops.snap @@ -5,7 +5,7 @@ description: Operations executed crazy_multi_profile.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XZ" @@ -52,16 +52,7 @@ description: Operations executed crazy_multi_profile.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg01", @@ -73,7 +64,15 @@ description: Operations executed crazy_multi_profile.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "KclStdLibCall", @@ -153,7 +152,7 @@ description: Operations executed crazy_multi_profile.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "-XZ" diff --git a/rust/kcl-lib/tests/crazy_multi_profile/program_memory.snap b/rust/kcl-lib/tests/crazy_multi_profile/program_memory.snap index 2f6d2339e..320dae8a7 100644 --- a/rust/kcl-lib/tests/crazy_multi_profile/program_memory.snap +++ b/rust/kcl-lib/tests/crazy_multi_profile/program_memory.snap @@ -145,22 +145,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -326,17 +338,26 @@ description: Variables in memory after executing crazy_multi_profile.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -478,22 +499,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -588,9 +621,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2087, - "end": 2108, - "start": 2087, + "commentStart": 2094, + "end": 2115, + "start": 2094, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -632,9 +665,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl -6.39 ], "tag": { - "commentStart": 2087, - "end": 2108, - "start": 2087, + "commentStart": 2094, + "end": 2115, + "start": 2094, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -732,22 +765,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -894,22 +939,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1003,17 +1060,26 @@ description: Variables in memory after executing crazy_multi_profile.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1155,22 +1221,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1262,9 +1340,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl 13.3 ], "tag": { - "commentStart": 557, - "end": 578, - "start": 557, + "commentStart": 564, + "end": 585, + "start": 564, "type": "TagDeclarator", "value": "rectangleSegmentA001" }, @@ -1362,17 +1440,26 @@ description: Variables in memory after executing crazy_multi_profile.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1514,22 +1601,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1702,17 +1801,26 @@ description: Variables in memory after executing crazy_multi_profile.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1854,22 +1962,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1985,17 +2105,26 @@ description: Variables in memory after executing crazy_multi_profile.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2137,22 +2266,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2319,17 +2460,26 @@ description: Variables in memory after executing crazy_multi_profile.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2471,22 +2621,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2615,22 +2777,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2752,22 +2926,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2889,22 +3075,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2975,22 +3173,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3037,9 +3247,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl -6.39 ], "tag": { - "commentStart": 2087, - "end": 2108, - "start": 2087, + "commentStart": 2094, + "end": 2115, + "start": 2094, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -3137,22 +3347,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3295,17 +3517,26 @@ description: Variables in memory after executing crazy_multi_profile.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3447,22 +3678,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3663,22 +3906,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3735,22 +3990,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3766,17 +4033,26 @@ description: Variables in memory after executing crazy_multi_profile.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3918,22 +4194,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3994,22 +4282,34 @@ description: Variables in memory after executing crazy_multi_profile.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/crazy_multi_profile/unparsed.snap b/rust/kcl-lib/tests/crazy_multi_profile/unparsed.snap index 028ca5756..6a6f69307 100644 --- a/rust/kcl-lib/tests/crazy_multi_profile/unparsed.snap +++ b/rust/kcl-lib/tests/crazy_multi_profile/unparsed.snap @@ -9,7 +9,7 @@ profile001 = startProfileAt([6.71, -3.66], sketch001) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude001 = extrude(profile001, length = 20) -sketch002 = startSketchOn(extrude001, seg01) +sketch002 = startSketchOn(extrude001, face = seg01) profile002 = startProfileAt([0.75, 13.46], sketch002) |> line(end = [4.52, 3.79]) |> line(end = [5.98, -2.81]) diff --git a/rust/kcl-lib/tests/cube/ops.snap b/rust/kcl-lib/tests/cube/ops.snap index 7fc94aa70..494032c70 100644 --- a/rust/kcl-lib/tests/cube/ops.snap +++ b/rust/kcl-lib/tests/cube/ops.snap @@ -71,7 +71,7 @@ description: Operations executed cube.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/cube/program_memory.snap b/rust/kcl-lib/tests/cube/program_memory.snap index 693183f27..f30828d20 100644 --- a/rust/kcl-lib/tests/cube/program_memory.snap +++ b/rust/kcl-lib/tests/cube/program_memory.snap @@ -150,22 +150,34 @@ description: Variables in memory after executing cube.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/cube_with_error/ops.snap b/rust/kcl-lib/tests/cube_with_error/ops.snap index b7b76b32f..5233b0ec3 100644 --- a/rust/kcl-lib/tests/cube_with_error/ops.snap +++ b/rust/kcl-lib/tests/cube_with_error/ops.snap @@ -20,7 +20,7 @@ description: Operations executed cube_with_error.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/fillet-and-shell/ops.snap b/rust/kcl-lib/tests/fillet-and-shell/ops.snap index 7f68276a8..98ed83ff8 100644 --- a/rust/kcl-lib/tests/fillet-and-shell/ops.snap +++ b/rust/kcl-lib/tests/fillet-and-shell/ops.snap @@ -5,7 +5,7 @@ description: Operations executed fillet-and-shell.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -20,7 +20,7 @@ description: Operations executed fillet-and-shell.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" @@ -138,7 +138,7 @@ description: Operations executed fillet-and-shell.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" @@ -229,7 +229,7 @@ description: Operations executed fillet-and-shell.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" @@ -320,7 +320,7 @@ description: Operations executed fillet-and-shell.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" @@ -411,7 +411,7 @@ description: Operations executed fillet-and-shell.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/fillet-and-shell/program_memory.snap b/rust/kcl-lib/tests/fillet-and-shell/program_memory.snap index 544983743..acebaa395 100644 --- a/rust/kcl-lib/tests/fillet-and-shell/program_memory.snap +++ b/rust/kcl-lib/tests/fillet-and-shell/program_memory.snap @@ -189,22 +189,34 @@ description: Variables in memory after executing fillet-and-shell.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -259,28 +271,72 @@ description: Variables in memory after executing fillet-and-shell.kcl { "type": "fillet", "id": "[uuid]", - "radius": 1.0, + "radius": { + "n": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 1.0, + "radius": { + "n": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 1.0, + "radius": { + "n": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 1.0, + "radius": { + "n": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -534,22 +590,34 @@ description: Variables in memory after executing fillet-and-shell.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/flush_batch_on_end/ops.snap b/rust/kcl-lib/tests/flush_batch_on_end/ops.snap index 5d99805a9..286995c4b 100644 --- a/rust/kcl-lib/tests/flush_batch_on_end/ops.snap +++ b/rust/kcl-lib/tests/flush_batch_on_end/ops.snap @@ -5,7 +5,7 @@ description: Operations executed flush_batch_on_end.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" @@ -51,8 +51,13 @@ description: Operations executed flush_batch_on_end.kcl "type": "Number", "value": 1.5, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] diff --git a/rust/kcl-lib/tests/flush_batch_on_end/program_memory.snap b/rust/kcl-lib/tests/flush_batch_on_end/program_memory.snap index 9a18e3fe7..cf0894648 100644 --- a/rust/kcl-lib/tests/flush_batch_on_end/program_memory.snap +++ b/rust/kcl-lib/tests/flush_batch_on_end/program_memory.snap @@ -72,22 +72,34 @@ description: Variables in memory after executing flush_batch_on_end.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -128,16 +140,26 @@ description: Variables in memory after executing flush_batch_on_end.kcl "type": "Number", "value": 1.5, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "outerDiameter": { "type": "Number", "value": 0.5469, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "outerProfile": { @@ -186,22 +208,34 @@ description: Variables in memory after executing flush_batch_on_end.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -303,22 +337,34 @@ description: Variables in memory after executing flush_batch_on_end.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -408,22 +454,34 @@ description: Variables in memory after executing flush_batch_on_end.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -469,22 +527,34 @@ description: Variables in memory after executing flush_batch_on_end.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" diff --git a/rust/kcl-lib/tests/function_sketch/ops.snap b/rust/kcl-lib/tests/function_sketch/ops.snap index 59cc38886..8c10ddd24 100644 --- a/rust/kcl-lib/tests/function_sketch/ops.snap +++ b/rust/kcl-lib/tests/function_sketch/ops.snap @@ -20,7 +20,7 @@ description: Operations executed function_sketch.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/function_sketch/program_memory.snap b/rust/kcl-lib/tests/function_sketch/program_memory.snap index e0c4fd07b..76cefaeb0 100644 --- a/rust/kcl-lib/tests/function_sketch/program_memory.snap +++ b/rust/kcl-lib/tests/function_sketch/program_memory.snap @@ -131,22 +131,34 @@ description: Variables in memory after executing function_sketch.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/function_sketch_with_position/ops.snap b/rust/kcl-lib/tests/function_sketch_with_position/ops.snap index 4e263844b..6eb820382 100644 --- a/rust/kcl-lib/tests/function_sketch_with_position/ops.snap +++ b/rust/kcl-lib/tests/function_sketch_with_position/ops.snap @@ -20,7 +20,7 @@ description: Operations executed function_sketch_with_position.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/function_sketch_with_position/program_memory.snap b/rust/kcl-lib/tests/function_sketch_with_position/program_memory.snap index bd7dbec85..145e19587 100644 --- a/rust/kcl-lib/tests/function_sketch_with_position/program_memory.snap +++ b/rust/kcl-lib/tests/function_sketch_with_position/program_memory.snap @@ -131,22 +131,34 @@ description: Variables in memory after executing function_sketch_with_position.k "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/helix_ccw/ops.snap b/rust/kcl-lib/tests/helix_ccw/ops.snap index 856b5be03..d66464644 100644 --- a/rust/kcl-lib/tests/helix_ccw/ops.snap +++ b/rust/kcl-lib/tests/helix_ccw/ops.snap @@ -5,7 +5,7 @@ description: Operations executed helix_ccw.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/helix_simple/ops.snap b/rust/kcl-lib/tests/helix_simple/ops.snap index f9702e74e..c184a38c0 100644 --- a/rust/kcl-lib/tests/helix_simple/ops.snap +++ b/rust/kcl-lib/tests/helix_simple/ops.snap @@ -5,7 +5,7 @@ description: Operations executed helix_simple.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XZ" diff --git a/rust/kcl-lib/tests/helix_simple/program_memory.snap b/rust/kcl-lib/tests/helix_simple/program_memory.snap index 6b60152bd..92562c142 100644 --- a/rust/kcl-lib/tests/helix_simple/program_memory.snap +++ b/rust/kcl-lib/tests/helix_simple/program_memory.snap @@ -62,22 +62,34 @@ description: Variables in memory after executing helix_simple.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/i_shape/ops.snap b/rust/kcl-lib/tests/i_shape/ops.snap index 4a11c6e95..82cf8925e 100644 --- a/rust/kcl-lib/tests/i_shape/ops.snap +++ b/rust/kcl-lib/tests/i_shape/ops.snap @@ -5,7 +5,7 @@ description: Operations executed i_shape.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -20,7 +20,7 @@ description: Operations executed i_shape.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/i_shape/program_memory.snap b/rust/kcl-lib/tests/i_shape/program_memory.snap index 71335076c..cf388ab17 100644 --- a/rust/kcl-lib/tests/i_shape/program_memory.snap +++ b/rust/kcl-lib/tests/i_shape/program_memory.snap @@ -553,22 +553,34 @@ description: Variables in memory after executing i_shape.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1393,22 +1405,34 @@ description: Variables in memory after executing i_shape.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1665,22 +1689,34 @@ description: Variables in memory after executing i_shape.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/import_whole/ops.snap b/rust/kcl-lib/tests/import_whole/ops.snap index cfb851b71..ec5961460 100644 --- a/rust/kcl-lib/tests/import_whole/ops.snap +++ b/rust/kcl-lib/tests/import_whole/ops.snap @@ -14,7 +14,7 @@ description: Operations executed import_whole.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/import_whole/program_memory.snap b/rust/kcl-lib/tests/import_whole/program_memory.snap index be03eed1d..8822ce0f9 100644 --- a/rust/kcl-lib/tests/import_whole/program_memory.snap +++ b/rust/kcl-lib/tests/import_whole/program_memory.snap @@ -56,22 +56,34 @@ description: Variables in memory after executing import_whole.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" diff --git a/rust/kcl-lib/tests/intersect_cubes/ops.snap b/rust/kcl-lib/tests/intersect_cubes/ops.snap index abeb5587a..8b2685972 100644 --- a/rust/kcl-lib/tests/intersect_cubes/ops.snap +++ b/rust/kcl-lib/tests/intersect_cubes/ops.snap @@ -20,7 +20,7 @@ description: Operations executed intersect_cubes.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -85,7 +85,7 @@ description: Operations executed intersect_cubes.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/intersect_cubes/program_memory.snap b/rust/kcl-lib/tests/intersect_cubes/program_memory.snap index c6953ab8f..2e0aca0e4 100644 --- a/rust/kcl-lib/tests/intersect_cubes/program_memory.snap +++ b/rust/kcl-lib/tests/intersect_cubes/program_memory.snap @@ -134,22 +134,34 @@ description: Variables in memory after executing intersect_cubes.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -312,22 +324,34 @@ description: Variables in memory after executing intersect_cubes.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -492,22 +516,34 @@ description: Variables in memory after executing intersect_cubes.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -670,22 +706,34 @@ description: Variables in memory after executing intersect_cubes.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/kcl_samples/80-20-rail/ops.snap b/rust/kcl-lib/tests/kcl_samples/80-20-rail/ops.snap index 32907d5d1..611686853 100644 --- a/rust/kcl-lib/tests/kcl_samples/80-20-rail/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/80-20-rail/ops.snap @@ -20,7 +20,7 @@ description: Operations executed 80-20-rail.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/kcl_samples/ball-bearing/ops.snap b/rust/kcl-lib/tests/kcl_samples/ball-bearing/ops.snap index 450028d83..40b7850a0 100644 --- a/rust/kcl-lib/tests/kcl_samples/ball-bearing/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/ball-bearing/ops.snap @@ -10,8 +10,13 @@ description: Operations executed ball-bearing.kcl "type": "Number", "value": -0.1565, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -30,7 +35,7 @@ description: Operations executed ball-bearing.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -103,7 +108,7 @@ description: Operations executed ball-bearing.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -358,7 +363,7 @@ description: Operations executed ball-bearing.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -631,7 +636,7 @@ description: Operations executed ball-bearing.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -667,8 +672,13 @@ description: Operations executed ball-bearing.kcl "type": "Number", "value": 36.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -902,8 +912,13 @@ description: Operations executed ball-bearing.kcl "type": "Number", "value": -0.1565, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -922,7 +937,7 @@ description: Operations executed ball-bearing.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/kcl_samples/ball-bearing/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/ball-bearing/program_memory.snap index 78e96a94f..591736a1d 100644 --- a/rust/kcl-lib/tests/kcl_samples/ball-bearing/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/ball-bearing/program_memory.snap @@ -85,22 +85,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -217,22 +229,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -349,22 +373,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -481,22 +517,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -613,22 +661,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -745,22 +805,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -877,22 +949,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1009,22 +1093,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1141,22 +1237,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1273,22 +1381,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1387,22 +1507,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1567,22 +1699,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1751,22 +1895,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1935,22 +2091,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2119,22 +2287,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2303,22 +2483,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2487,22 +2679,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2671,22 +2875,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2855,22 +3071,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -3039,22 +3267,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -3223,22 +3463,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -3375,22 +3627,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -3425,16 +3689,26 @@ description: Variables in memory after executing ball-bearing.kcl "type": "Number", "value": 0.0313, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "chainWidth": { "type": "Number", "value": 0.125, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "insideWall": { @@ -3490,22 +3764,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": -0.1565 + "z": -0.1565, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -3583,22 +3869,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": -0.1565 + "z": -0.1565, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -3633,8 +3931,13 @@ description: Variables in memory after executing ball-bearing.kcl "type": "Number", "value": 0.0625, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "linkRevolve": { @@ -3693,22 +3996,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -3799,22 +4114,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -3905,22 +4232,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -4011,22 +4350,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -4117,22 +4468,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -4223,22 +4586,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -4329,22 +4704,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -4435,22 +4822,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -4541,22 +4940,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -4647,22 +5058,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -4742,22 +5165,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -4867,22 +5302,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": -0.1565 + "z": -0.1565, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -4960,22 +5407,34 @@ description: Variables in memory after executing ball-bearing.kcl "origin": { "x": 0.0, "y": 0.0, - "z": -0.1565 + "z": -0.1565, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" diff --git a/rust/kcl-lib/tests/kcl_samples/bench/ops.snap b/rust/kcl-lib/tests/kcl_samples/bench/ops.snap index d11f7459c..88e50adf8 100644 --- a/rust/kcl-lib/tests/kcl_samples/bench/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/bench/ops.snap @@ -35,7 +35,7 @@ description: Operations executed bench.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -58,8 +58,13 @@ description: Operations executed bench.kcl "type": "Number", "value": 2.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -95,7 +100,7 @@ description: Operations executed bench.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -118,8 +123,13 @@ description: Operations executed bench.kcl "type": "Number", "value": -2.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -236,8 +246,13 @@ description: Operations executed bench.kcl "type": "Number", "value": 28.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -286,7 +301,7 @@ description: Operations executed bench.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -309,8 +324,13 @@ description: Operations executed bench.kcl "type": "Number", "value": 2.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -346,7 +366,7 @@ description: Operations executed bench.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -369,8 +389,13 @@ description: Operations executed bench.kcl "type": "Number", "value": -2.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -487,8 +512,13 @@ description: Operations executed bench.kcl "type": "Number", "value": 28.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -537,7 +567,7 @@ description: Operations executed bench.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -560,8 +590,13 @@ description: Operations executed bench.kcl "type": "Number", "value": 2.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -597,7 +632,7 @@ description: Operations executed bench.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -620,8 +655,13 @@ description: Operations executed bench.kcl "type": "Number", "value": -2.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -738,8 +778,13 @@ description: Operations executed bench.kcl "type": "Number", "value": -28.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -788,7 +833,7 @@ description: Operations executed bench.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -853,7 +898,7 @@ description: Operations executed bench.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -911,8 +956,13 @@ description: Operations executed bench.kcl "type": "Number", "value": -30.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -961,7 +1011,7 @@ description: Operations executed bench.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1036,8 +1086,13 @@ description: Operations executed bench.kcl "type": "Number", "value": -30.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -1086,7 +1141,7 @@ description: Operations executed bench.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1170,8 +1225,13 @@ description: Operations executed bench.kcl "type": "Number", "value": 28.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -1205,7 +1265,7 @@ description: Operations executed bench.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1268,7 +1328,7 @@ description: Operations executed bench.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1334,8 +1394,13 @@ description: Operations executed bench.kcl "type": "Number", "value": -28.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -1369,7 +1434,7 @@ description: Operations executed bench.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1432,7 +1497,7 @@ description: Operations executed bench.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/kcl_samples/bracket/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/bracket/artifact_graph_flowchart.snap.md index 9e5dd2358..c0c98b48a 100644 --- a/rust/kcl-lib/tests/kcl_samples/bracket/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/bracket/artifact_graph_flowchart.snap.md @@ -12,13 +12,13 @@ flowchart LR 10[Solid2d] end subgraph path38 [Path] - 38["Path
[1823, 1885, 0]"] - 39["Segment
[1823, 1885, 0]"] + 38["Path
[1830, 1892, 0]"] + 39["Segment
[1830, 1892, 0]"] 40[Solid2d] end subgraph path48 [Path] - 48["Path
[2112, 2171, 0]"] - 49["Segment
[2112, 2171, 0]"] + 48["Path
[2126, 2185, 0]"] + 49["Segment
[2126, 2185, 0]"] 50[Solid2d] end 1["Plane
[1062, 1079, 0]"] @@ -49,20 +49,20 @@ flowchart LR 35["EdgeCut Fillet
[1628, 1697, 0]"] 36["EdgeCut Fillet
[1703, 1772, 0]"] 37["EdgeCut Fillet
[1703, 1772, 0]"] - 41["Sweep Extrusion
[2024, 2061, 0]"] + 41["Sweep Extrusion
[2031, 2068, 0]"] 42[Wall] 43["SweepEdge Opposite"] 44["SweepEdge Adjacent"] - 45["Sweep Extrusion
[2024, 2061, 0]"] - 46["Sweep Extrusion
[2024, 2061, 0]"] - 47["Sweep Extrusion
[2024, 2061, 0]"] - 51["Sweep Extrusion
[2242, 2279, 0]"] + 45["Sweep Extrusion
[2031, 2068, 0]"] + 46["Sweep Extrusion
[2031, 2068, 0]"] + 47["Sweep Extrusion
[2031, 2068, 0]"] + 51["Sweep Extrusion
[2256, 2293, 0]"] 52[Wall] 53["SweepEdge Opposite"] 54["SweepEdge Adjacent"] - 55["Sweep Extrusion
[2242, 2279, 0]"] - 56["StartSketchOnFace
[1786, 1817, 0]"] - 57["StartSketchOnFace
[2075, 2106, 0]"] + 55["Sweep Extrusion
[2256, 2293, 0]"] + 56["StartSketchOnFace
[1786, 1824, 0]"] + 57["StartSketchOnFace
[2082, 2120, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/bracket/ast.snap b/rust/kcl-lib/tests/kcl_samples/bracket/ast.snap index 623e8ddcc..df2c14ed6 100644 --- a/rust/kcl-lib/tests/kcl_samples/bracket/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/bracket/ast.snap @@ -1799,36 +1799,30 @@ description: Result of parsing bracket.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "sketch001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg03", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg03", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -1849,8 +1843,24 @@ description: Result of parsing bracket.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "sketch001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -2324,36 +2334,30 @@ description: Result of parsing bracket.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "sketch001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg04", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg04", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -2374,8 +2378,24 @@ description: Result of parsing bracket.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "sketch001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/kcl_samples/bracket/ops.snap b/rust/kcl-lib/tests/kcl_samples/bracket/ops.snap index 36d9da380..dd48d74fd 100644 --- a/rust/kcl-lib/tests/kcl_samples/bracket/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/bracket/ops.snap @@ -5,7 +5,7 @@ description: Operations executed bracket.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -57,7 +57,13 @@ description: Operations executed bracket.kcl "type": "Number", "value": 0.601324026261472, "ty": { - "type": "Unknown" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -232,16 +238,7 @@ description: Operations executed bracket.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg03", @@ -253,7 +250,15 @@ description: Operations executed bracket.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -262,7 +267,13 @@ description: Operations executed bracket.kcl "type": "Number", "value": -0.361324026261472, "ty": { - "type": "Unknown" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -306,16 +317,7 @@ description: Operations executed bracket.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg04", @@ -327,7 +329,15 @@ description: Operations executed bracket.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -336,7 +346,13 @@ description: Operations executed bracket.kcl "type": "Number", "value": -0.45132402626147194, "ty": { - "type": "Unknown" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] diff --git a/rust/kcl-lib/tests/kcl_samples/bracket/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/bracket/program_memory.snap index c1852f33d..f36906815 100644 --- a/rust/kcl-lib/tests/kcl_samples/bracket/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/bracket/program_memory.snap @@ -7,7 +7,13 @@ description: Variables in memory after executing bracket.kcl "type": "Number", "value": 0.6013, "ty": { - "type": "Unknown" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "factorOfSafety": { @@ -412,22 +418,34 @@ description: Variables in memory after executing bracket.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -490,42 +508,108 @@ description: Variables in memory after executing bracket.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.601324026261472, + "radius": { + "n": 0.601324026261472, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -591,17 +675,26 @@ description: Variables in memory after executing bracket.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -869,22 +962,34 @@ description: Variables in memory after executing bracket.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -947,42 +1052,108 @@ description: Variables in memory after executing bracket.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.601324026261472, + "radius": { + "n": 0.601324026261472, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -1080,17 +1251,26 @@ description: Variables in memory after executing bracket.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1358,22 +1538,34 @@ description: Variables in memory after executing bracket.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1436,42 +1628,108 @@ description: Variables in memory after executing bracket.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.601324026261472, + "radius": { + "n": 0.601324026261472, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -1569,17 +1827,26 @@ description: Variables in memory after executing bracket.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1847,22 +2114,34 @@ description: Variables in memory after executing bracket.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1925,42 +2204,108 @@ description: Variables in memory after executing bracket.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.601324026261472, + "radius": { + "n": 0.601324026261472, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -2058,17 +2403,26 @@ description: Variables in memory after executing bracket.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2336,22 +2690,34 @@ description: Variables in memory after executing bracket.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2414,42 +2780,108 @@ description: Variables in memory after executing bracket.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.601324026261472, + "radius": { + "n": 0.601324026261472, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -2552,17 +2984,26 @@ description: Variables in memory after executing bracket.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2830,22 +3271,34 @@ description: Variables in memory after executing bracket.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2908,42 +3361,108 @@ description: Variables in memory after executing bracket.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.601324026261472, + "radius": { + "n": 0.601324026261472, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -3041,17 +3560,26 @@ description: Variables in memory after executing bracket.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3319,22 +3847,34 @@ description: Variables in memory after executing bracket.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3397,42 +3937,108 @@ description: Variables in memory after executing bracket.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.601324026261472, + "radius": { + "n": 0.601324026261472, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -3483,7 +4089,13 @@ description: Variables in memory after executing bracket.kcl "type": "Number", "value": 0.3513, "ty": { - "type": "Unknown" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "wallMountL": { diff --git a/rust/kcl-lib/tests/kcl_samples/car-wheel-assembly/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/car-wheel-assembly/artifact_graph_flowchart.snap.md index 942213f66..ab60581a6 100644 --- a/rust/kcl-lib/tests/kcl_samples/car-wheel-assembly/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/car-wheel-assembly/artifact_graph_flowchart.snap.md @@ -6,51 +6,51 @@ flowchart LR 4[Solid2d] end subgraph path11 [Path] - 11["Path
[807, 863, 6]"] - 12["Segment
[807, 863, 6]"] + 11["Path
[814, 870, 6]"] + 12["Segment
[814, 870, 6]"] 13[Solid2d] end subgraph path19 [Path] - 19["Path
[988, 1041, 6]"] - 20["Segment
[988, 1041, 6]"] + 19["Path
[1002, 1055, 6]"] + 20["Segment
[1002, 1055, 6]"] 21[Solid2d] end subgraph path30 [Path] - 30["Path
[1424, 1464, 6]"] - 31["Segment
[1424, 1464, 6]"] + 30["Path
[1445, 1485, 6]"] + 31["Segment
[1445, 1485, 6]"] 32[Solid2d] end subgraph path38 [Path] - 38["Path
[1568, 1619, 6]"] - 39["Segment
[1568, 1619, 6]"] + 38["Path
[1596, 1647, 6]"] + 39["Segment
[1596, 1647, 6]"] 40[Solid2d] end subgraph path47 [Path] - 47["Path
[1752, 1805, 6]"] - 48["Segment
[1752, 1805, 6]"] + 47["Path
[1787, 1840, 6]"] + 48["Segment
[1787, 1840, 6]"] 49[Solid2d] end subgraph path58 [Path] - 58["Path
[2048, 2120, 6]"] - 59["Segment
[2048, 2120, 6]"] + 58["Path
[2090, 2162, 6]"] + 59["Segment
[2090, 2162, 6]"] 60[Solid2d] end subgraph path81 [Path] - 81["Path
[2377, 2408, 6]"] - 82["Segment
[2414, 2434, 6]"] - 83["Segment
[2440, 2460, 6]"] - 84["Segment
[2466, 2487, 6]"] - 85["Segment
[2493, 2549, 6]"] - 86["Segment
[2555, 2562, 6]"] + 81["Path
[2426, 2457, 6]"] + 82["Segment
[2463, 2483, 6]"] + 83["Segment
[2489, 2509, 6]"] + 84["Segment
[2515, 2536, 6]"] + 85["Segment
[2542, 2598, 6]"] + 86["Segment
[2604, 2611, 6]"] 87[Solid2d] end subgraph path106 [Path] - 106["Path
[2864, 2896, 6]"] - 107["Segment
[2902, 2923, 6]"] - 108["Segment
[2929, 2949, 6]"] - 109["Segment
[2955, 2975, 6]"] - 110["Segment
[2981, 3037, 6]"] - 111["Segment
[3043, 3050, 6]"] + 106["Path
[2920, 2952, 6]"] + 107["Segment
[2958, 2979, 6]"] + 108["Segment
[2985, 3005, 6]"] + 109["Segment
[3011, 3031, 6]"] + 110["Segment
[3037, 3093, 6]"] + 111["Segment
[3099, 3106, 6]"] 112[Solid2d] end subgraph path132 [Path] @@ -64,100 +64,100 @@ flowchart LR 137[Solid2d] end subgraph path144 [Path] - 144["Path
[642, 698, 5]"] - 145["Segment
[642, 698, 5]"] + 144["Path
[649, 705, 5]"] + 145["Segment
[649, 705, 5]"] 146[Solid2d] end subgraph path147 [Path] - 147["Path
[709, 765, 5]"] - 148["Segment
[709, 765, 5]"] + 147["Path
[716, 772, 5]"] + 148["Segment
[716, 772, 5]"] 149[Solid2d] end subgraph path156 [Path] - 156["Path
[909, 963, 5]"] - 157["Segment
[909, 963, 5]"] + 156["Path
[923, 977, 5]"] + 157["Segment
[923, 977, 5]"] 158[Solid2d] end subgraph path167 [Path] - 167["Path
[1241, 1302, 5]"] - 168["Segment
[1241, 1302, 5]"] + 167["Path
[1262, 1323, 5]"] + 168["Segment
[1262, 1323, 5]"] 169[Solid2d] end subgraph path179 [Path] - 179["Path
[1660, 1706, 5]"] - 180["Segment
[1712, 1764, 5]"] - 181["Segment
[1770, 1875, 5]"] - 182["Segment
[1881, 1903, 5]"] - 183["Segment
[1909, 1965, 5]"] - 184["Segment
[1971, 1978, 5]"] + 179["Path
[1681, 1727, 5]"] + 180["Segment
[1733, 1785, 5]"] + 181["Segment
[1791, 1896, 5]"] + 182["Segment
[1902, 1924, 5]"] + 183["Segment
[1930, 1986, 5]"] + 184["Segment
[1992, 1999, 5]"] 185[Solid2d] end subgraph path195 [Path] - 195["Path
[2110, 2156, 5]"] - 196["Segment
[2162, 2214, 5]"] - 197["Segment
[2220, 2327, 5]"] - 198["Segment
[2333, 2370, 5]"] - 199["Segment
[2376, 2432, 5]"] - 200["Segment
[2438, 2445, 5]"] + 195["Path
[2131, 2177, 5]"] + 196["Segment
[2183, 2235, 5]"] + 197["Segment
[2241, 2348, 5]"] + 198["Segment
[2354, 2391, 5]"] + 199["Segment
[2397, 2453, 5]"] + 200["Segment
[2459, 2466, 5]"] 201[Solid2d] end subgraph path212 [Path] - 212["Path
[2954, 3001, 5]"] - 213["Segment
[3009, 3349, 5]"] - 214["Segment
[3357, 3389, 5]"] - 215["Segment
[3397, 3741, 5]"] - 216["Segment
[3749, 3805, 5]"] - 217["Segment
[3813, 3820, 5]"] + 212["Path
[2947, 2994, 5]"] + 213["Segment
[3002, 3342, 5]"] + 214["Segment
[3350, 3382, 5]"] + 215["Segment
[3390, 3734, 5]"] + 216["Segment
[3742, 3798, 5]"] + 217["Segment
[3806, 3813, 5]"] 218[Solid2d] end subgraph path235 [Path] - 235["Path
[2954, 3001, 5]"] - 236["Segment
[3009, 3349, 5]"] - 237["Segment
[3357, 3389, 5]"] - 238["Segment
[3397, 3741, 5]"] - 239["Segment
[3749, 3805, 5]"] - 240["Segment
[3813, 3820, 5]"] + 235["Path
[2947, 2994, 5]"] + 236["Segment
[3002, 3342, 5]"] + 237["Segment
[3350, 3382, 5]"] + 238["Segment
[3390, 3734, 5]"] + 239["Segment
[3742, 3798, 5]"] + 240["Segment
[3806, 3813, 5]"] 241[Solid2d] end subgraph path258 [Path] - 258["Path
[4348, 4443, 5]"] - 259["Segment
[4449, 4482, 5]"] - 260["Segment
[4488, 4539, 5]"] - 261["Segment
[4545, 4578, 5]"] - 262["Segment
[4584, 4634, 5]"] - 263["Segment
[4640, 4681, 5]"] - 264["Segment
[4687, 4736, 5]"] - 265["Segment
[4742, 4775, 5]"] - 266["Segment
[4781, 4815, 5]"] - 267["Segment
[4821, 4855, 5]"] - 268["Segment
[4861, 4913, 5]"] - 269["Segment
[4919, 4953, 5]"] - 270["Segment
[4959, 5035, 5]"] - 271["Segment
[5041, 5074, 5]"] - 272["Segment
[5080, 5156, 5]"] - 273["Segment
[5162, 5196, 5]"] - 274["Segment
[5202, 5276, 5]"] - 275["Segment
[5282, 5316, 5]"] - 276["Segment
[5322, 5373, 5]"] - 277["Segment
[5379, 5441, 5]"] - 278["Segment
[5447, 5498, 5]"] - 279["Segment
[5504, 5538, 5]"] - 280["Segment
[5544, 5577, 5]"] - 281["Segment
[5583, 5616, 5]"] - 282["Segment
[5622, 5629, 5]"] + 258["Path
[4341, 4436, 5]"] + 259["Segment
[4442, 4475, 5]"] + 260["Segment
[4481, 4532, 5]"] + 261["Segment
[4538, 4571, 5]"] + 262["Segment
[4577, 4627, 5]"] + 263["Segment
[4633, 4674, 5]"] + 264["Segment
[4680, 4729, 5]"] + 265["Segment
[4735, 4768, 5]"] + 266["Segment
[4774, 4808, 5]"] + 267["Segment
[4814, 4848, 5]"] + 268["Segment
[4854, 4906, 5]"] + 269["Segment
[4912, 4946, 5]"] + 270["Segment
[4952, 5028, 5]"] + 271["Segment
[5034, 5067, 5]"] + 272["Segment
[5073, 5149, 5]"] + 273["Segment
[5155, 5189, 5]"] + 274["Segment
[5195, 5269, 5]"] + 275["Segment
[5275, 5309, 5]"] + 276["Segment
[5315, 5366, 5]"] + 277["Segment
[5372, 5434, 5]"] + 278["Segment
[5440, 5491, 5]"] + 279["Segment
[5497, 5531, 5]"] + 280["Segment
[5537, 5570, 5]"] + 281["Segment
[5576, 5609, 5]"] + 282["Segment
[5615, 5622, 5]"] 283[Solid2d] end subgraph path334 [Path] - 334["Path
[745, 785, 8]"] - 335["Segment
[793, 840, 8]"] - 336["Segment
[848, 884, 8]"] - 337["Segment
[892, 922, 8]"] - 338["Segment
[930, 983, 8]"] - 339["Segment
[991, 1031, 8]"] - 340["Segment
[1039, 1074, 8]"] - 341["Segment
[1082, 1120, 8]"] - 342["Segment
[1128, 1150, 8]"] - 343["Segment
[1158, 1165, 8]"] + 334["Path
[713, 753, 8]"] + 335["Segment
[761, 808, 8]"] + 336["Segment
[816, 852, 8]"] + 337["Segment
[860, 890, 8]"] + 338["Segment
[898, 951, 8]"] + 339["Segment
[959, 999, 8]"] + 340["Segment
[1007, 1042, 8]"] + 341["Segment
[1050, 1088, 8]"] + 342["Segment
[1096, 1118, 8]"] + 343["Segment
[1126, 1133, 8]"] 344[Solid2d] end subgraph path365 [Path] @@ -206,59 +206,59 @@ flowchart LR 8["Cap End"] 9["SweepEdge Opposite"] 10["SweepEdge Adjacent"] - 14["Sweep Extrusion
[876, 938, 6]"] + 14["Sweep Extrusion
[883, 945, 6]"] 15[Wall] 16["Cap End"] 17["SweepEdge Opposite"] 18["SweepEdge Adjacent"] - 22["Sweep Extrusion
[1188, 1267, 6]"] + 22["Sweep Extrusion
[1202, 1281, 6]"] 23[Wall] 24["SweepEdge Opposite"] 25["SweepEdge Adjacent"] - 26["Sweep Extrusion
[1188, 1267, 6]"] - 27["Sweep Extrusion
[1188, 1267, 6]"] - 28["Sweep Extrusion
[1188, 1267, 6]"] - 29["Sweep Extrusion
[1188, 1267, 6]"] - 33["Sweep Extrusion
[1470, 1503, 6]"] + 26["Sweep Extrusion
[1202, 1281, 6]"] + 27["Sweep Extrusion
[1202, 1281, 6]"] + 28["Sweep Extrusion
[1202, 1281, 6]"] + 29["Sweep Extrusion
[1202, 1281, 6]"] + 33["Sweep Extrusion
[1491, 1524, 6]"] 34[Wall] 35["Cap End"] 36["SweepEdge Opposite"] 37["SweepEdge Adjacent"] - 41["Sweep Extrusion
[1634, 1699, 6]"] + 41["Sweep Extrusion
[1662, 1727, 6]"] 42[Wall] 43["Cap Start"] 44["Cap End"] 45["SweepEdge Opposite"] 46["SweepEdge Adjacent"] - 50["Sweep Extrusion
[1952, 1996, 6]"] + 50["Sweep Extrusion
[1987, 2031, 6]"] 51[Wall] 52["SweepEdge Opposite"] 53["SweepEdge Adjacent"] - 54["Sweep Extrusion
[1952, 1996, 6]"] - 55["Sweep Extrusion
[1952, 1996, 6]"] - 56["Sweep Extrusion
[1952, 1996, 6]"] - 57["Sweep Extrusion
[1952, 1996, 6]"] - 61["Sweep Extrusion
[2275, 2319, 6]"] + 54["Sweep Extrusion
[1987, 2031, 6]"] + 55["Sweep Extrusion
[1987, 2031, 6]"] + 56["Sweep Extrusion
[1987, 2031, 6]"] + 57["Sweep Extrusion
[1987, 2031, 6]"] + 61["Sweep Extrusion
[2317, 2361, 6]"] 62[Wall] 63["Cap End"] 64["SweepEdge Opposite"] 65["SweepEdge Adjacent"] - 66["Sweep Extrusion
[2275, 2319, 6]"] - 67["Sweep Extrusion
[2275, 2319, 6]"] - 68["Sweep Extrusion
[2275, 2319, 6]"] - 69["Sweep Extrusion
[2275, 2319, 6]"] - 70["Sweep Extrusion
[2275, 2319, 6]"] - 71["Sweep Extrusion
[2275, 2319, 6]"] - 72["Sweep Extrusion
[2275, 2319, 6]"] - 73["Sweep Extrusion
[2275, 2319, 6]"] - 74["Sweep Extrusion
[2275, 2319, 6]"] - 75["Sweep Extrusion
[2275, 2319, 6]"] - 76["Sweep Extrusion
[2275, 2319, 6]"] - 77["Sweep Extrusion
[2275, 2319, 6]"] - 78["Sweep Extrusion
[2275, 2319, 6]"] - 79["Sweep Extrusion
[2275, 2319, 6]"] - 80["Sweep Extrusion
[2275, 2319, 6]"] - 88["Sweep Extrusion
[2728, 2796, 6]"] + 66["Sweep Extrusion
[2317, 2361, 6]"] + 67["Sweep Extrusion
[2317, 2361, 6]"] + 68["Sweep Extrusion
[2317, 2361, 6]"] + 69["Sweep Extrusion
[2317, 2361, 6]"] + 70["Sweep Extrusion
[2317, 2361, 6]"] + 71["Sweep Extrusion
[2317, 2361, 6]"] + 72["Sweep Extrusion
[2317, 2361, 6]"] + 73["Sweep Extrusion
[2317, 2361, 6]"] + 74["Sweep Extrusion
[2317, 2361, 6]"] + 75["Sweep Extrusion
[2317, 2361, 6]"] + 76["Sweep Extrusion
[2317, 2361, 6]"] + 77["Sweep Extrusion
[2317, 2361, 6]"] + 78["Sweep Extrusion
[2317, 2361, 6]"] + 79["Sweep Extrusion
[2317, 2361, 6]"] + 80["Sweep Extrusion
[2317, 2361, 6]"] + 88["Sweep Extrusion
[2777, 2845, 6]"] 89[Wall] 90[Wall] 91[Wall] @@ -272,11 +272,11 @@ flowchart LR 99["SweepEdge Adjacent"] 100["SweepEdge Opposite"] 101["SweepEdge Adjacent"] - 102["Sweep Extrusion
[2728, 2796, 6]"] - 103["Sweep Extrusion
[2728, 2796, 6]"] - 104["Sweep Extrusion
[2728, 2796, 6]"] - 105["Sweep Extrusion
[2728, 2796, 6]"] - 113["Sweep Extrusion
[3202, 3276, 6]"] + 102["Sweep Extrusion
[2777, 2845, 6]"] + 103["Sweep Extrusion
[2777, 2845, 6]"] + 104["Sweep Extrusion
[2777, 2845, 6]"] + 105["Sweep Extrusion
[2777, 2845, 6]"] + 113["Sweep Extrusion
[3258, 3332, 6]"] 114[Wall] 115[Wall] 116[Wall] @@ -290,10 +290,10 @@ flowchart LR 124["SweepEdge Adjacent"] 125["SweepEdge Opposite"] 126["SweepEdge Adjacent"] - 127["Sweep Extrusion
[3202, 3276, 6]"] - 128["Sweep Extrusion
[3202, 3276, 6]"] - 129["Sweep Extrusion
[3202, 3276, 6]"] - 130["Sweep Extrusion
[3202, 3276, 6]"] + 127["Sweep Extrusion
[3258, 3332, 6]"] + 128["Sweep Extrusion
[3258, 3332, 6]"] + 129["Sweep Extrusion
[3258, 3332, 6]"] + 130["Sweep Extrusion
[3258, 3332, 6]"] 131["Plane
[331, 348, 5]"] 138["Sweep Extrusion
[487, 520, 5]"] 139[Wall] @@ -301,30 +301,30 @@ flowchart LR 141["Cap End"] 142["SweepEdge Opposite"] 143["SweepEdge Adjacent"] - 150["Sweep Extrusion
[775, 808, 5]"] + 150["Sweep Extrusion
[782, 815, 5]"] 151[Wall] 152["Cap Start"] 153["Cap End"] 154["SweepEdge Opposite"] 155["SweepEdge Adjacent"] - 159["Sweep Extrusion
[1110, 1144, 5]"] + 159["Sweep Extrusion
[1124, 1158, 5]"] 160[Wall] 161["SweepEdge Opposite"] 162["SweepEdge Adjacent"] - 163["Sweep Extrusion
[1110, 1144, 5]"] - 164["Sweep Extrusion
[1110, 1144, 5]"] - 165["Sweep Extrusion
[1110, 1144, 5]"] - 166["Sweep Extrusion
[1110, 1144, 5]"] - 170["Sweep Extrusion
[1449, 1483, 5]"] + 163["Sweep Extrusion
[1124, 1158, 5]"] + 164["Sweep Extrusion
[1124, 1158, 5]"] + 165["Sweep Extrusion
[1124, 1158, 5]"] + 166["Sweep Extrusion
[1124, 1158, 5]"] + 170["Sweep Extrusion
[1470, 1504, 5]"] 171[Wall] 172["SweepEdge Opposite"] 173["SweepEdge Adjacent"] - 174["Sweep Extrusion
[1449, 1483, 5]"] - 175["Sweep Extrusion
[1449, 1483, 5]"] - 176["Sweep Extrusion
[1449, 1483, 5]"] - 177["Sweep Extrusion
[1449, 1483, 5]"] - 178["Plane
[1637, 1654, 5]"] - 186["Sweep Revolve
[1984, 2001, 5]"] + 174["Sweep Extrusion
[1470, 1504, 5]"] + 175["Sweep Extrusion
[1470, 1504, 5]"] + 176["Sweep Extrusion
[1470, 1504, 5]"] + 177["Sweep Extrusion
[1470, 1504, 5]"] + 178["Plane
[1658, 1675, 5]"] + 186["Sweep Revolve
[2005, 2022, 5]"] 187[Wall] 188[Wall] 189[Wall] @@ -332,8 +332,8 @@ flowchart LR 191["SweepEdge Adjacent"] 192["SweepEdge Adjacent"] 193["SweepEdge Adjacent"] - 194["Plane
[2087, 2104, 5]"] - 202["Sweep Revolve
[2451, 2468, 5]"] + 194["Plane
[2108, 2125, 5]"] + 202["Sweep Revolve
[2472, 2489, 5]"] 203[Wall] 204[Wall] 205[Wall] @@ -342,8 +342,8 @@ flowchart LR 208["SweepEdge Adjacent"] 209["SweepEdge Adjacent"] 210["SweepEdge Adjacent"] - 211["Plane
[2923, 2946, 5]"] - 219["Sweep Extrusion
[3868, 3914, 5]"] + 211["Plane
[2916, 2939, 5]"] + 219["Sweep Extrusion
[3861, 3907, 5]"] 220[Wall] 221[Wall] 222[Wall] @@ -358,8 +358,8 @@ flowchart LR 231["SweepEdge Adjacent"] 232["SweepEdge Opposite"] 233["SweepEdge Adjacent"] - 234["Plane
[2923, 2946, 5]"] - 242["Sweep Extrusion
[3868, 3914, 5]"] + 234["Plane
[2916, 2939, 5]"] + 242["Sweep Extrusion
[3861, 3907, 5]"] 243[Wall] 244[Wall] 245[Wall] @@ -374,8 +374,8 @@ flowchart LR 254["SweepEdge Adjacent"] 255["SweepEdge Opposite"] 256["SweepEdge Adjacent"] - 257["Plane
[4325, 4342, 5]"] - 284["Sweep Revolve
[5635, 5652, 5]"] + 257["Plane
[4318, 4335, 5]"] + 284["Sweep Revolve
[5628, 5645, 5]"] 285[Wall] 286[Wall] 287[Wall] @@ -424,8 +424,8 @@ flowchart LR 330["SweepEdge Adjacent"] 331["SweepEdge Adjacent"] 332["SweepEdge Adjacent"] - 333["Plane
[711, 737, 8]"] - 345["Sweep Revolve
[1173, 1190, 8]"] + 333["Plane
[679, 705, 8]"] + 345["Sweep Revolve
[1141, 1158, 8]"] 346[Wall] 347[Wall] 348[Wall] @@ -529,17 +529,17 @@ flowchart LR 481["SweepEdge Adjacent"] 482["SweepEdge Adjacent"] 483["SweepEdge Adjacent"] - 484["StartSketchOnFace
[774, 801, 6]"] - 485["StartSketchOnFace
[951, 982, 6]"] - 486["StartSketchOnFace
[1389, 1418, 6]"] - 487["StartSketchOnFace
[1528, 1562, 6]"] - 488["StartSketchOnFace
[1713, 1746, 6]"] - 489["StartSketchOnFace
[2013, 2042, 6]"] - 490["StartSketchOnFace
[2342, 2371, 6]"] - 491["StartSketchOnFace
[2825, 2858, 6]"] - 492["StartSketchOnFace
[607, 636, 5]"] - 493["StartSketchOnFace
[869, 903, 5]"] - 494["StartSketchOnFace
[1206, 1235, 5]"] + 484["StartSketchOnFace
[774, 808, 6]"] + 485["StartSketchOnFace
[958, 996, 6]"] + 486["StartSketchOnFace
[1403, 1439, 6]"] + 487["StartSketchOnFace
[1549, 1590, 6]"] + 488["StartSketchOnFace
[1741, 1781, 6]"] + 489["StartSketchOnFace
[2048, 2084, 6]"] + 490["StartSketchOnFace
[2384, 2420, 6]"] + 491["StartSketchOnFace
[2874, 2914, 6]"] + 492["StartSketchOnFace
[607, 643, 5]"] + 493["StartSketchOnFace
[876, 917, 5]"] + 494["StartSketchOnFace
[1220, 1256, 5]"] 1 --- 2 2 --- 3 2 ---- 5 diff --git a/rust/kcl-lib/tests/kcl_samples/car-wheel-assembly/ops.snap b/rust/kcl-lib/tests/kcl_samples/car-wheel-assembly/ops.snap index ec6030cd1..a3f732b0d 100644 --- a/rust/kcl-lib/tests/kcl_samples/car-wheel-assembly/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/car-wheel-assembly/ops.snap @@ -14,7 +14,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -61,16 +61,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -81,7 +72,15 @@ description: Operations executed car-wheel-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -117,16 +116,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -137,7 +127,15 @@ description: Operations executed car-wheel-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -202,16 +200,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -222,7 +211,15 @@ description: Operations executed car-wheel-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -258,16 +255,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -278,7 +266,15 @@ description: Operations executed car-wheel-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -314,16 +310,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -334,7 +321,15 @@ description: Operations executed car-wheel-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -399,16 +394,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -419,7 +405,15 @@ description: Operations executed car-wheel-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -550,16 +544,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -570,7 +555,15 @@ description: Operations executed car-wheel-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -579,8 +572,13 @@ description: Operations executed car-wheel-assembly.kcl "type": "Number", "value": -0.125, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -630,16 +628,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -650,7 +639,15 @@ description: Operations executed car-wheel-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -659,8 +656,13 @@ description: Operations executed car-wheel-assembly.kcl "type": "Number", "value": -0.125, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -722,7 +724,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -768,8 +770,13 @@ description: Operations executed car-wheel-assembly.kcl "type": "Number", "value": 0.475, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -790,16 +797,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -810,7 +808,15 @@ description: Operations executed car-wheel-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -845,8 +851,13 @@ description: Operations executed car-wheel-assembly.kcl "type": "Number", "value": 0.95, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -867,16 +878,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -887,7 +889,15 @@ description: Operations executed car-wheel-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -896,8 +906,13 @@ description: Operations executed car-wheel-assembly.kcl "type": "Number", "value": -0.95, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -947,16 +962,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -967,7 +973,15 @@ description: Operations executed car-wheel-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -976,8 +990,13 @@ description: Operations executed car-wheel-assembly.kcl "type": "Number", "value": -0.475, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -1027,7 +1046,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1128,7 +1147,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1233,8 +1252,8 @@ description: Operations executed car-wheel-assembly.kcl "type": "FunctionCall", "name": "spoke", "functionSourceRange": [ - 2621, - 4194, + 2642, + 4187, 5 ], "unlabeledArg": null, @@ -1244,185 +1263,185 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.1, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.02, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.1, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.02, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -1624,8 +1643,8 @@ description: Operations executed car-wheel-assembly.kcl "type": "FunctionCall", "name": "spoke", "functionSourceRange": [ - 2621, - 4194, + 2642, + 4187, 5 ], "unlabeledArg": null, @@ -1635,185 +1654,185 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": -0.1, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": -0.02, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": -0.1, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": -0.02, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -2011,7 +2030,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -2128,8 +2147,8 @@ description: Operations executed car-wheel-assembly.kcl "type": "FunctionCall", "name": "lug", "functionSourceRange": [ - 669, - 1280, + 637, + 1248, 8 ], "unlabeledArg": null, @@ -2139,181 +2158,181 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { + "origin": { "type": "Object", "value": { - "origin": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 2.25, - "ty": { - "type": "Known", - "type": "Count" - } + "x": { + "type": "Number", + "value": 2.25, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": -1.1811023622047243, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "xAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": -1.1811023622047243, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "yAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": -1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "xAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "zAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "z": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "yAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": -1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + } + }, + "zAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" } } } @@ -2581,7 +2600,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -2715,7 +2734,7 @@ description: Operations executed car-wheel-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/kcl_samples/color-cube/ops.snap b/rust/kcl-lib/tests/kcl_samples/color-cube/ops.snap index f58bb233a..8b1b4ccaa 100644 --- a/rust/kcl-lib/tests/kcl_samples/color-cube/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/color-cube/ops.snap @@ -10,8 +10,13 @@ description: Operations executed color-cube.kcl "type": "Number", "value": 50.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -35,8 +40,13 @@ description: Operations executed color-cube.kcl "type": "Number", "value": -50.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -60,8 +70,13 @@ description: Operations executed color-cube.kcl "type": "Number", "value": -50.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -85,8 +100,13 @@ description: Operations executed color-cube.kcl "type": "Number", "value": -50.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -110,8 +130,13 @@ description: Operations executed color-cube.kcl "type": "Number", "value": 49.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -135,8 +160,13 @@ description: Operations executed color-cube.kcl "type": "Number", "value": -50.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] diff --git a/rust/kcl-lib/tests/kcl_samples/color-cube/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/color-cube/program_memory.snap index 0d0164de0..3045566b5 100644 --- a/rust/kcl-lib/tests/kcl_samples/color-cube/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/color-cube/program_memory.snap @@ -12,22 +12,34 @@ description: Variables in memory after executing color-cube.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 50.0 + "z": 50.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -56,22 +68,34 @@ description: Variables in memory after executing color-cube.kcl "origin": { "x": 0.0, "y": 50.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -82,8 +106,13 @@ description: Variables in memory after executing color-cube.kcl "type": "Number", "value": 50.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "metalConstant": { @@ -108,22 +137,34 @@ description: Variables in memory after executing color-cube.kcl "origin": { "x": 0.0, "y": -50.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": -0.0, "y": 1.0, - "z": -0.0 + "z": -0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -139,22 +180,34 @@ description: Variables in memory after executing color-cube.kcl "origin": { "x": 49.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -199,22 +252,34 @@ description: Variables in memory after executing color-cube.kcl "origin": { "x": -50.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -230,22 +295,34 @@ description: Variables in memory after executing color-cube.kcl "origin": { "x": 0.0, "y": 0.0, - "z": -50.0 + "z": -50.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/kcl_samples/cycloidal-gear/ops.snap b/rust/kcl-lib/tests/kcl_samples/cycloidal-gear/ops.snap index 9b6acc412..32fb4483f 100644 --- a/rust/kcl-lib/tests/kcl_samples/cycloidal-gear/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/cycloidal-gear/ops.snap @@ -65,7 +65,7 @@ description: Operations executed cycloidal-gear.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -201,8 +201,13 @@ description: Operations executed cycloidal-gear.kcl "type": "Number", "value": 0.75, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -221,7 +226,7 @@ description: Operations executed cycloidal-gear.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -382,7 +387,7 @@ description: Operations executed cycloidal-gear.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/kcl_samples/dodecahedron/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/dodecahedron/artifact_graph_flowchart.snap.md index b0fef67d6..1316f2d5a 100644 --- a/rust/kcl-lib/tests/kcl_samples/dodecahedron/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/dodecahedron/artifact_graph_flowchart.snap.md @@ -1,28 +1,28 @@ ```mermaid flowchart LR subgraph path2 [Path] - 2["Path
[1162, 1274, 0]"] - 3["Segment
[1162, 1274, 0]"] - 4["Segment
[1162, 1274, 0]"] - 5["Segment
[1162, 1274, 0]"] - 6["Segment
[1162, 1274, 0]"] - 7["Segment
[1162, 1274, 0]"] - 8["Segment
[1162, 1274, 0]"] + 2["Path
[1130, 1242, 0]"] + 3["Segment
[1130, 1242, 0]"] + 4["Segment
[1130, 1242, 0]"] + 5["Segment
[1130, 1242, 0]"] + 6["Segment
[1130, 1242, 0]"] + 7["Segment
[1130, 1242, 0]"] + 8["Segment
[1130, 1242, 0]"] 9[Solid2d] end subgraph path11 [Path] - 11["Path
[1319, 1431, 0]"] - 12["Segment
[1319, 1431, 0]"] - 13["Segment
[1319, 1431, 0]"] - 14["Segment
[1319, 1431, 0]"] - 15["Segment
[1319, 1431, 0]"] - 16["Segment
[1319, 1431, 0]"] - 17["Segment
[1319, 1431, 0]"] + 11["Path
[1287, 1399, 0]"] + 12["Segment
[1287, 1399, 0]"] + 13["Segment
[1287, 1399, 0]"] + 14["Segment
[1287, 1399, 0]"] + 15["Segment
[1287, 1399, 0]"] + 16["Segment
[1287, 1399, 0]"] + 17["Segment
[1287, 1399, 0]"] 18[Solid2d] end - 1["Plane
[1139, 1156, 0]"] - 10["Plane
[1293, 1313, 0]"] - 19["Sweep Extrusion
[1477, 1520, 0]"] + 1["Plane
[1107, 1124, 0]"] + 10["Plane
[1261, 1281, 0]"] + 19["Sweep Extrusion
[1445, 1488, 0]"] 20[Wall] 21[Wall] 22[Wall] @@ -40,7 +40,7 @@ flowchart LR 34["SweepEdge Adjacent"] 35["SweepEdge Opposite"] 36["SweepEdge Adjacent"] - 37["Sweep Extrusion
[1534, 1581, 0]"] + 37["Sweep Extrusion
[1502, 1549, 0]"] 38[Wall] 39[Wall] 40[Wall] diff --git a/rust/kcl-lib/tests/kcl_samples/dodecahedron/ast.snap b/rust/kcl-lib/tests/kcl_samples/dodecahedron/ast.snap index c5543e026..6cac78142 100644 --- a/rust/kcl-lib/tests/kcl_samples/dodecahedron/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/dodecahedron/ast.snap @@ -711,7 +711,7 @@ description: Result of parsing dodecahedron.kcl "key": { "commentStart": 0, "end": 0, - "name": "plane", + "name": "origin", "start": 0, "type": "Identifier" }, @@ -719,114 +719,59 @@ description: Result of parsing dodecahedron.kcl "type": "ObjectProperty", "value": { "commentStart": 0, - "end": 0, - "properties": [ + "elements": [ { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "origin", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "elements": [ - { + "left": { + "argument": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { "commentStart": 0, "end": 0, - "left": { - "argument": { - "abs_path": false, + "name": "inscR", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "commentStart": 0, + "end": 0, + "operator": "-", + "start": 0, + "type": "UnaryExpression", + "type": "UnaryExpression" + }, + "operator": "*", + "right": { + "arguments": [ + { + "arguments": [ + { "commentStart": 0, "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "inscR", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "operator": "-", - "start": 0, - "type": "UnaryExpression", - "type": "UnaryExpression" - }, - "operator": "*", - "right": { - "arguments": [ - { + "left": { "arguments": [ { + "abs_path": false, "commentStart": 0, "end": 0, - "left": { - "arguments": [ - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "dihedral", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "toDegrees", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, + "name": { "commentStart": 0, "end": 0, + "name": "dihedral", "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - "operator": "-", - "right": { - "commentStart": 0, - "end": 0, - "raw": "90", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 90.0, - "suffix": "None" - } + "type": "Identifier" }, + "path": [], "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" + "type": "Name", + "type": "Name" } ], "callee": { @@ -836,7 +781,7 @@ description: Result of parsing dodecahedron.kcl "name": { "commentStart": 0, "end": 0, - "name": "toRadians", + "name": "toDegrees", "start": 0, "type": "Identifier" }, @@ -849,148 +794,148 @@ description: Result of parsing dodecahedron.kcl "start": 0, "type": "CallExpression", "type": "CallExpression" - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + }, + "operator": "-", + "right": { "commentStart": 0, "end": 0, - "name": "cos", + "raw": "90", "start": 0, - "type": "Identifier" + "type": "Literal", + "type": "Literal", + "value": { + "value": 90.0, + "suffix": "None" + } }, - "path": [], "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "left": { + "type": "BinaryExpression", + "type": "BinaryExpression" + } + ], + "callee": { "abs_path": false, "commentStart": 0, "end": 0, "name": { "commentStart": 0, "end": 0, - "name": "inscR", + "name": "toRadians", "start": 0, "type": "Identifier" }, "path": [], "start": 0, - "type": "Name", "type": "Name" }, - "operator": "-", - "right": { - "commentStart": 0, - "end": 0, - "left": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "commentStart": 0, + "end": 0, + "start": 0, + "type": "CallExpression", + "type": "CallExpression" + } + ], + "callee": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "cos", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name" + }, + "commentStart": 0, + "end": 0, + "start": 0, + "type": "CallExpression", + "type": "CallExpression" + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + }, + { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "left": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "inscR", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "operator": "-", + "right": { + "commentStart": 0, + "end": 0, + "left": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "inscR", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "operator": "*", + "right": { + "arguments": [ + { + "arguments": [ + { "commentStart": 0, "end": 0, - "name": "inscR", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "operator": "*", - "right": { - "arguments": [ - { + "left": { "arguments": [ { + "abs_path": false, "commentStart": 0, "end": 0, - "left": { - "arguments": [ - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "dihedral", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "toDegrees", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, + "name": { "commentStart": 0, "end": 0, + "name": "dihedral", "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - "operator": "-", - "right": { - "commentStart": 0, - "end": 0, - "raw": "90", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 90.0, - "suffix": "None" - } + "type": "Identifier" }, + "path": [], "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" + "type": "Name", + "type": "Name" } ], "callee": { @@ -1000,7 +945,7 @@ description: Result of parsing dodecahedron.kcl "name": { "commentStart": 0, "end": 0, - "name": "toRadians", + "name": "toDegrees", "start": 0, "type": "Identifier" }, @@ -1013,301 +958,23 @@ description: Result of parsing dodecahedron.kcl "start": 0, "type": "CallExpression", "type": "CallExpression" - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + }, + "operator": "-", + "right": { "commentStart": 0, "end": 0, - "name": "sin", + "raw": "90", "start": 0, - "type": "Identifier" + "type": "Literal", + "type": "Literal", + "value": { + "value": 90.0, + "suffix": "None" + } }, - "path": [], "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "xAxis", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "elements": [ - { - "arguments": [ - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "dihedral", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "cos", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "arguments": [ - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "dihedral", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "sin", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "yAxis", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "zAxis", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "elements": [ - { - "arguments": [ - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "dihedral", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "sin", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "argument": { - "arguments": [ - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "dihedral", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "BinaryExpression", + "type": "BinaryExpression" } ], "callee": { @@ -1317,7 +984,7 @@ description: Result of parsing dodecahedron.kcl "name": { "commentStart": 0, "end": 0, - "name": "cos", + "name": "toRadians", "start": 0, "type": "Identifier" }, @@ -1330,25 +997,336 @@ description: Result of parsing dodecahedron.kcl "start": 0, "type": "CallExpression", "type": "CallExpression" - }, + } + ], + "callee": { + "abs_path": false, "commentStart": 0, "end": 0, - "operator": "-", + "name": { + "commentStart": 0, + "end": 0, + "name": "sin", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "UnaryExpression", - "type": "UnaryExpression" - } - ], - "end": 0, + "type": "Name" + }, + "commentStart": 0, + "end": 0, + "start": 0, + "type": "CallExpression", + "type": "CallExpression" + }, "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "type": "BinaryExpression", + "type": "BinaryExpression" + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "xAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "arguments": [ + { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "dihedral", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } + ], + "callee": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "cos", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name" + }, + "commentStart": 0, + "end": 0, + "start": 0, + "type": "CallExpression", + "type": "CallExpression" + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "arguments": [ + { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "dihedral", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } + ], + "callee": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "sin", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name" + }, + "commentStart": 0, + "end": 0, + "start": 0, + "type": "CallExpression", + "type": "CallExpression" + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "yAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" } } ], + "end": 0, "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "zAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "arguments": [ + { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "dihedral", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } + ], + "callee": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "sin", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name" + }, + "commentStart": 0, + "end": 0, + "start": 0, + "type": "CallExpression", + "type": "CallExpression" + }, + { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "argument": { + "arguments": [ + { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "dihedral", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } + ], + "callee": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "cos", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name" + }, + "commentStart": 0, + "end": 0, + "start": 0, + "type": "CallExpression", + "type": "CallExpression" + }, + "commentStart": 0, + "end": 0, + "operator": "-", + "start": 0, + "type": "UnaryExpression", + "type": "UnaryExpression" + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" } } ], diff --git a/rust/kcl-lib/tests/kcl_samples/dodecahedron/ops.snap b/rust/kcl-lib/tests/kcl_samples/dodecahedron/ops.snap index 7dc007dab..9c5f614b8 100644 --- a/rust/kcl-lib/tests/kcl_samples/dodecahedron/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/dodecahedron/ops.snap @@ -131,7 +131,7 @@ description: Operations executed dodecahedron.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -146,158 +146,165 @@ description: Operations executed dodecahedron.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": -17.76901418668612, - "ty": { - "type": "Unknown" - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": -17.76901418668612, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 10.981854713951094, - "ty": { - "type": "Unknown" - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": -0.4472135954999579, - "ty": { - "type": "Known", - "type": "Count" - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.8944271909999159, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 10.981854713951094, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.8944271909999159, - "ty": { - "type": "Known", - "type": "Count" - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.4472135954999579, - "ty": { - "type": "Known", - "type": "Count" - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": -0.4472135954999579, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.8944271909999159, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.8944271909999159, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.4472135954999579, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] } } }, @@ -621,7 +628,13 @@ description: Operations executed dodecahedron.kcl "type": "Number", "value": 19.866361807294155, "ty": { - "type": "Unknown" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } } ] @@ -764,7 +777,13 @@ description: Operations executed dodecahedron.kcl "type": "Number", "value": 19.866361807294155, "ty": { - "type": "Unknown" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } } ] diff --git a/rust/kcl-lib/tests/kcl_samples/dodecahedron/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/dodecahedron/program_memory.snap index ec4b726c4..e468cdd06 100644 --- a/rust/kcl-lib/tests/kcl_samples/dodecahedron/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/dodecahedron/program_memory.snap @@ -154,22 +154,34 @@ description: Variables in memory after executing dodecahedron.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -361,22 +373,34 @@ description: Variables in memory after executing dodecahedron.kcl "origin": { "x": -17.76901418668612, "y": 0.0, - "z": 10.981854713951094 + "z": 10.981854713951094, + "units": { + "type": "Inches" + } }, "xAxis": { "x": -0.4472135954999579, "y": 0.0, - "z": 0.8944271909999159 + "z": 0.8944271909999159, + "units": { + "type": "Unknown" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "zAxis": { "x": 0.8944271909999159, "y": 0.0, - "z": 0.4472135954999579 + "z": 0.4472135954999579, + "units": { + "type": "Unknown" + } }, "units": { "type": "Inches" @@ -565,22 +589,34 @@ description: Variables in memory after executing dodecahedron.kcl "origin": { "x": -17.76901418668612, "y": 0.0, - "z": 10.981854713951094 + "z": 10.981854713951094, + "units": { + "type": "Inches" + } }, "xAxis": { "x": -0.4472135954999579, "y": 0.0, - "z": 0.8944271909999159 + "z": 0.8944271909999159, + "units": { + "type": "Unknown" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "zAxis": { "x": 0.8944271909999159, "y": 0.0, - "z": 0.4472135954999579 + "z": 0.4472135954999579, + "units": { + "type": "Unknown" + } }, "units": { "type": "Inches" @@ -769,22 +805,34 @@ description: Variables in memory after executing dodecahedron.kcl "origin": { "x": -17.76901418668612, "y": 0.0, - "z": 10.981854713951094 + "z": 10.981854713951094, + "units": { + "type": "Inches" + } }, "xAxis": { "x": -0.4472135954999579, "y": 0.0, - "z": 0.8944271909999159 + "z": 0.8944271909999159, + "units": { + "type": "Unknown" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "zAxis": { "x": 0.8944271909999159, "y": 0.0, - "z": 0.4472135954999579 + "z": 0.4472135954999579, + "units": { + "type": "Unknown" + } }, "units": { "type": "Inches" @@ -973,22 +1021,34 @@ description: Variables in memory after executing dodecahedron.kcl "origin": { "x": -17.76901418668612, "y": 0.0, - "z": 10.981854713951094 + "z": 10.981854713951094, + "units": { + "type": "Inches" + } }, "xAxis": { "x": -0.4472135954999579, "y": 0.0, - "z": 0.8944271909999159 + "z": 0.8944271909999159, + "units": { + "type": "Unknown" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "zAxis": { "x": 0.8944271909999159, "y": 0.0, - "z": 0.4472135954999579 + "z": 0.4472135954999579, + "units": { + "type": "Unknown" + } }, "units": { "type": "Inches" @@ -1177,22 +1237,34 @@ description: Variables in memory after executing dodecahedron.kcl "origin": { "x": -17.76901418668612, "y": 0.0, - "z": 10.981854713951094 + "z": 10.981854713951094, + "units": { + "type": "Inches" + } }, "xAxis": { "x": -0.4472135954999579, "y": 0.0, - "z": 0.8944271909999159 + "z": 0.8944271909999159, + "units": { + "type": "Unknown" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "zAxis": { "x": 0.8944271909999159, "y": 0.0, - "z": 0.4472135954999579 + "z": 0.4472135954999579, + "units": { + "type": "Unknown" + } }, "units": { "type": "Inches" @@ -1342,22 +1414,34 @@ description: Variables in memory after executing dodecahedron.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1539,22 +1623,34 @@ description: Variables in memory after executing dodecahedron.kcl "origin": { "x": -17.76901418668612, "y": 0.0, - "z": 10.981854713951094 + "z": 10.981854713951094, + "units": { + "type": "Inches" + } }, "xAxis": { "x": -0.4472135954999579, "y": 0.0, - "z": 0.8944271909999159 + "z": 0.8944271909999159, + "units": { + "type": "Unknown" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "zAxis": { "x": 0.8944271909999159, "y": 0.0, - "z": 0.4472135954999579 + "z": 0.4472135954999579, + "units": { + "type": "Unknown" + } }, "units": { "type": "Inches" @@ -1702,22 +1798,34 @@ description: Variables in memory after executing dodecahedron.kcl "origin": { "x": -17.76901418668612, "y": 0.0, - "z": 10.981854713951094 + "z": 10.981854713951094, + "units": { + "type": "Inches" + } }, "xAxis": { "x": -0.4472135954999579, "y": 0.0, - "z": 0.8944271909999159 + "z": 0.8944271909999159, + "units": { + "type": "Unknown" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "zAxis": { "x": 0.8944271909999159, "y": 0.0, - "z": 0.4472135954999579 + "z": 0.4472135954999579, + "units": { + "type": "Unknown" + } }, "units": { "type": "Inches" @@ -1774,174 +1882,199 @@ description: Variables in memory after executing dodecahedron.kcl "type": "Number", "value": 17.8411, "ty": { - "type": "Unknown" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "inscR": { "type": "Number", "value": 19.8664, "ty": { - "type": "Unknown" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "pentR": { "type": "Number", "value": 15.1765, "ty": { - "type": "Unknown" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "plane": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": -17.769, - "ty": { - "type": "Unknown" - } + "origin": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": -17.769, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 10.9819, - "ty": { - "type": "Unknown" - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": -0.4472, - "ty": { - "type": "Known", - "type": "Count" - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.8944, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 10.9819, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.8944, - "ty": { - "type": "Known", - "type": "Count" - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.4472, - "ty": { - "type": "Known", - "type": "Count" - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": -0.4472, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.8944, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "yAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.8944, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.4472, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] } } }, diff --git a/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/artifact_graph_flowchart.snap.md index 2a97ac77b..8ca8b228b 100644 --- a/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/artifact_graph_flowchart.snap.md @@ -64,52 +64,52 @@ flowchart LR 164[Solid2d] end subgraph path180 [Path] - 180["Path
[4350, 4418, 0]"] - 181["Segment
[4424, 4450, 0]"] - 182["Segment
[4456, 4482, 0]"] - 183["Segment
[4488, 4515, 0]"] - 184["Segment
[4521, 4577, 0]"] - 185["Segment
[4583, 4590, 0]"] + 180["Path
[4357, 4425, 0]"] + 181["Segment
[4431, 4457, 0]"] + 182["Segment
[4463, 4489, 0]"] + 183["Segment
[4495, 4522, 0]"] + 184["Segment
[4528, 4584, 0]"] + 185["Segment
[4590, 4597, 0]"] 186[Solid2d] end subgraph path202 [Path] - 202["Path
[4779, 4900, 0]"] - 203["Segment
[4906, 4955, 0]"] - 204["Segment
[4961, 5009, 0]"] - 205["Segment
[5015, 5063, 0]"] - 206["Segment
[5069, 5125, 0]"] - 207["Segment
[5131, 5138, 0]"] + 202["Path
[4793, 4914, 0]"] + 203["Segment
[4920, 4969, 0]"] + 204["Segment
[4975, 5023, 0]"] + 205["Segment
[5029, 5077, 0]"] + 206["Segment
[5083, 5139, 0]"] + 207["Segment
[5145, 5152, 0]"] 208[Solid2d] end subgraph path225 [Path] - 225["Path
[5670, 5711, 0]"] - 226["Segment
[5717, 5749, 0]"] - 227["Segment
[5755, 5780, 0]"] - 228["Segment
[5786, 5819, 0]"] - 229["Segment
[5825, 5881, 0]"] - 230["Segment
[5887, 5894, 0]"] + 225["Path
[5684, 5725, 0]"] + 226["Segment
[5731, 5763, 0]"] + 227["Segment
[5769, 5794, 0]"] + 228["Segment
[5800, 5833, 0]"] + 229["Segment
[5839, 5895, 0]"] + 230["Segment
[5901, 5908, 0]"] 231[Solid2d] end subgraph path252 [Path] - 252["Path
[6181, 6222, 0]"] - 253["Segment
[6228, 6254, 0]"] - 254["Segment
[6260, 6292, 0]"] - 255["Segment
[6298, 6325, 0]"] - 256["Segment
[6331, 6387, 0]"] - 257["Segment
[6393, 6400, 0]"] + 252["Path
[6195, 6236, 0]"] + 253["Segment
[6242, 6268, 0]"] + 254["Segment
[6274, 6306, 0]"] + 255["Segment
[6312, 6339, 0]"] + 256["Segment
[6345, 6401, 0]"] + 257["Segment
[6407, 6414, 0]"] 258[Solid2d] end subgraph path276 [Path] - 276["Path
[6877, 6927, 0]"] - 277["Segment
[6933, 6970, 0]"] - 278["Segment
[6976, 7060, 0]"] - 279["Segment
[7066, 7102, 0]"] - 280["Segment
[7108, 7200, 0]"] - 281["Segment
[7206, 7242, 0]"] + 276["Path
[6891, 6941, 0]"] + 277["Segment
[6947, 6984, 0]"] + 278["Segment
[6990, 7074, 0]"] + 279["Segment
[7080, 7116, 0]"] + 280["Segment
[7122, 7214, 0]"] + 281["Segment
[7220, 7256, 0]"] end subgraph path283 [Path] - 283["Path
[7305, 7416, 0]"] - 284["Segment
[7305, 7416, 0]"] + 283["Path
[7319, 7430, 0]"] + 284["Segment
[7319, 7430, 0]"] 285[Solid2d] end 1["Plane
[565, 582, 0]"] @@ -242,7 +242,7 @@ flowchart LR 177["SweepEdge Adjacent"] 178["SweepEdge Opposite"] 179["SweepEdge Adjacent"] - 187["Sweep Extrusion
[4680, 4707, 0]"] + 187["Sweep Extrusion
[4687, 4714, 0]"] 188[Wall] 189[Wall] 190[Wall] @@ -256,8 +256,8 @@ flowchart LR 198["SweepEdge Adjacent"] 199["SweepEdge Opposite"] 200["SweepEdge Adjacent"] - 201["Sweep Extrusion
[4680, 4707, 0]"] - 209["Sweep Extrusion
[5227, 5255, 0]"] + 201["Sweep Extrusion
[4687, 4714, 0]"] + 209["Sweep Extrusion
[5241, 5269, 0]"] 210[Wall] 211[Wall] 212[Wall] @@ -271,9 +271,9 @@ flowchart LR 220["SweepEdge Adjacent"] 221["SweepEdge Opposite"] 222["SweepEdge Adjacent"] - 223["Sweep Extrusion
[5227, 5255, 0]"] - 224["Plane
[5608, 5657, 0]"] - 232["Sweep Extrusion
[5993, 6021, 0]"] + 223["Sweep Extrusion
[5241, 5269, 0]"] + 224["Plane
[5622, 5671, 0]"] + 232["Sweep Extrusion
[6007, 6035, 0]"] 233[Wall] 234[Wall] 235[Wall] @@ -288,12 +288,12 @@ flowchart LR 244["SweepEdge Adjacent"] 245["SweepEdge Opposite"] 246["SweepEdge Adjacent"] - 247["Sweep Extrusion
[5993, 6021, 0]"] - 248["Sweep Extrusion
[5993, 6021, 0]"] - 249["Sweep Extrusion
[5993, 6021, 0]"] - 250["Sweep Extrusion
[5993, 6021, 0]"] - 251["Sweep Extrusion
[5993, 6021, 0]"] - 259["Sweep Extrusion
[6482, 6510, 0]"] + 247["Sweep Extrusion
[6007, 6035, 0]"] + 248["Sweep Extrusion
[6007, 6035, 0]"] + 249["Sweep Extrusion
[6007, 6035, 0]"] + 250["Sweep Extrusion
[6007, 6035, 0]"] + 251["Sweep Extrusion
[6007, 6035, 0]"] + 259["Sweep Extrusion
[6496, 6524, 0]"] 260[Wall] 261[Wall] 262[Wall] @@ -308,10 +308,10 @@ flowchart LR 271["SweepEdge Adjacent"] 272["SweepEdge Opposite"] 273["SweepEdge Adjacent"] - 274["Sweep Extrusion
[6482, 6510, 0]"] - 275["Plane
[6803, 6854, 0]"] - 282["Plane
[7264, 7281, 0]"] - 286["Sweep Sweep
[7430, 7483, 0]"] + 274["Sweep Extrusion
[6496, 6524, 0]"] + 275["Plane
[6817, 6868, 0]"] + 282["Plane
[7278, 7295, 0]"] + 286["Sweep Sweep
[7444, 7497, 0]"] 287[Wall] 288["Cap Start"] 289["Cap Start"] @@ -321,10 +321,10 @@ flowchart LR 293["StartSketchOnPlane
[2276, 2342, 0]"] 294["StartSketchOnPlane
[2912, 2964, 0]"] 295["StartSketchOnPlane
[3791, 3843, 0]"] - 296["StartSketchOnFace
[4295, 4331, 0]"] - 297["StartSketchOnFace
[4727, 4761, 0]"] - 298["StartSketchOnPlane
[5594, 5658, 0]"] - 299["StartSketchOnPlane
[6789, 6855, 0]"] + 296["StartSketchOnFace
[4295, 4338, 0]"] + 297["StartSketchOnFace
[4734, 4775, 0]"] + 298["StartSketchOnPlane
[5608, 5672, 0]"] + 299["StartSketchOnPlane
[6803, 6869, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/ast.snap b/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/ast.snap index 2a1f8eea4..cbc64b299 100644 --- a/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/ast.snap @@ -6160,29 +6160,23 @@ description: Result of parsing dual-basin-utility-sink.kcl "init": { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "tableTopBody", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'START'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "START" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'START'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "START" + } } ], "callee": { @@ -6203,8 +6197,24 @@ description: Result of parsing dual-basin-utility-sink.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "tableTopBody", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, "start": 0, "type": "VariableDeclarator" @@ -6826,29 +6836,23 @@ description: Result of parsing dual-basin-utility-sink.kcl "init": { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "tableTopBody", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'END'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "END" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'END'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "END" + } } ], "callee": { @@ -6869,8 +6873,24 @@ description: Result of parsing dual-basin-utility-sink.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "tableTopBody", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, "start": 0, "type": "VariableDeclarator" diff --git a/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/ops.snap b/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/ops.snap index 3a4ae4fd0..77f4b3e4c 100644 --- a/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/ops.snap @@ -5,7 +5,7 @@ description: Operations executed dual-basin-utility-sink.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -129,7 +129,7 @@ description: Operations executed dual-basin-utility-sink.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -284,7 +284,7 @@ description: Operations executed dual-basin-utility-sink.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -396,7 +396,7 @@ description: Operations executed dual-basin-utility-sink.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -527,7 +527,7 @@ description: Operations executed dual-basin-utility-sink.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -574,16 +574,7 @@ description: Operations executed dual-basin-utility-sink.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -594,7 +585,15 @@ description: Operations executed dual-basin-utility-sink.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -641,16 +640,7 @@ description: Operations executed dual-basin-utility-sink.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -661,7 +651,15 @@ description: Operations executed dual-basin-utility-sink.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -738,7 +736,7 @@ description: Operations executed dual-basin-utility-sink.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -893,7 +891,7 @@ description: Operations executed dual-basin-utility-sink.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -908,7 +906,7 @@ description: Operations executed dual-basin-utility-sink.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1000,8 +998,13 @@ description: Operations executed dual-basin-utility-sink.kcl "type": "Number", "value": 564.5, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] diff --git a/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/program_memory.snap index f6727fd2f..cf88e75e1 100644 --- a/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/program_memory.snap @@ -59,16 +59,26 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "type": "Number", "value": 564.5, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "blockWidth": { "type": "Number", "value": 1129.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "doorBody": { @@ -218,22 +228,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 165.0 + "z": 165.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -386,22 +408,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 165.0 + "z": 165.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -554,22 +588,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 165.0 + "z": 165.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -722,22 +768,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 165.0 + "z": 165.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -890,22 +948,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 165.0 + "z": 165.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1058,22 +1128,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 165.0 + "z": 165.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1174,22 +1256,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 165.0 + "z": 165.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1213,8 +1307,13 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "type": "Number", "value": 547.5, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "floorPlane": { @@ -1226,22 +1325,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1304,22 +1415,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1410,22 +1533,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1516,22 +1651,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1622,22 +1769,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1728,22 +1887,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1834,22 +2005,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1958,8 +2141,13 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "type": "Number", "value": 228.75, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "handlePlane": { @@ -1971,22 +2159,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 780.0 + "z": 780.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2113,22 +2313,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 780.0 + "z": 780.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2199,22 +2411,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2254,22 +2478,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2436,22 +2672,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2604,22 +2852,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2772,22 +3032,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2940,22 +3212,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3108,22 +3392,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3276,22 +3572,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3444,22 +3752,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3612,22 +3932,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3840,22 +4172,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 150.0 + "z": 150.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4008,22 +4352,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 150.0 + "z": 150.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4176,22 +4532,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 150.0 + "z": 150.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4344,22 +4712,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 150.0 + "z": 150.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4512,22 +4892,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 150.0 + "z": 150.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4680,22 +5072,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 150.0 + "z": 150.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4882,22 +5286,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 150.0 + "z": 150.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5050,22 +5466,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 150.0 + "z": 150.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5122,8 +5550,13 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "type": "Number", "value": 1116.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "lowerBeltLengthY": { @@ -5148,22 +5581,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 150.0 + "z": 150.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5330,22 +5775,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 165.0 + "z": 165.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5498,22 +5955,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 165.0 + "z": 165.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5739,22 +6208,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 163.0 + "z": 163.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5907,22 +6388,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 163.0 + "z": 163.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6075,22 +6568,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 163.0 + "z": 163.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6243,22 +6748,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 163.0 + "z": 163.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6411,22 +6928,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 163.0 + "z": 163.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6579,22 +7108,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 163.0 + "z": 163.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6656,22 +7197,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 163.0 + "z": 163.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6851,17 +7404,26 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -7005,22 +7567,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 850.0 + "z": 850.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7237,17 +7811,26 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -7391,22 +7974,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 850.0 + "z": 850.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7628,17 +8223,26 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -7782,22 +8386,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 850.0 + "z": 850.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8014,17 +8630,26 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -8168,22 +8793,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 850.0 + "z": 850.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8332,17 +8969,26 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -8486,22 +9132,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 850.0 + "z": 850.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8552,17 +9210,26 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -8706,22 +9373,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 850.0 + "z": 850.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8959,22 +9638,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 850.0 + "z": 850.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9021,22 +9712,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 850.0 + "z": 850.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9203,22 +9906,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 847.5 + "z": 847.5, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9371,22 +10086,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 847.5 + "z": 847.5, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9573,22 +10300,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 847.5 + "z": 847.5, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9741,22 +10480,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 847.5 + "z": 847.5, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9818,22 +10569,34 @@ description: Variables in memory after executing dual-basin-utility-sink.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 847.5 + "z": 847.5, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/kcl_samples/enclosure/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/enclosure/artifact_graph_flowchart.snap.md index 8dbbb9d45..59bf36d00 100644 --- a/rust/kcl-lib/tests/kcl_samples/enclosure/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/enclosure/artifact_graph_flowchart.snap.md @@ -10,101 +10,101 @@ flowchart LR 8[Solid2d] end subgraph path29 [Path] - 29["Path
[1627, 1710, 0]"] - 30["Segment
[1627, 1710, 0]"] + 29["Path
[1599, 1682, 0]"] + 30["Segment
[1599, 1682, 0]"] 31[Solid2d] end subgraph path32 [Path] - 32["Path
[1723, 1790, 0]"] - 33["Segment
[1723, 1790, 0]"] + 32["Path
[1695, 1762, 0]"] + 33["Segment
[1695, 1762, 0]"] 34[Solid2d] end subgraph path42 [Path] - 42["Path
[1627, 1710, 0]"] - 43["Segment
[1627, 1710, 0]"] + 42["Path
[1599, 1682, 0]"] + 43["Segment
[1599, 1682, 0]"] 44[Solid2d] end subgraph path45 [Path] - 45["Path
[1723, 1790, 0]"] - 46["Segment
[1723, 1790, 0]"] + 45["Path
[1695, 1762, 0]"] + 46["Segment
[1695, 1762, 0]"] 47[Solid2d] end subgraph path55 [Path] - 55["Path
[1627, 1710, 0]"] - 56["Segment
[1627, 1710, 0]"] + 55["Path
[1599, 1682, 0]"] + 56["Segment
[1599, 1682, 0]"] 57[Solid2d] end subgraph path58 [Path] - 58["Path
[1723, 1790, 0]"] - 59["Segment
[1723, 1790, 0]"] + 58["Path
[1695, 1762, 0]"] + 59["Segment
[1695, 1762, 0]"] 60[Solid2d] end subgraph path68 [Path] - 68["Path
[1627, 1710, 0]"] - 69["Segment
[1627, 1710, 0]"] + 68["Path
[1599, 1682, 0]"] + 69["Segment
[1599, 1682, 0]"] 70[Solid2d] end subgraph path71 [Path] - 71["Path
[1723, 1790, 0]"] - 72["Segment
[1723, 1790, 0]"] + 71["Path
[1695, 1762, 0]"] + 72["Segment
[1695, 1762, 0]"] 73[Solid2d] end subgraph path81 [Path] - 81["Path
[2361, 2396, 0]"] - 82["Segment
[2402, 2468, 0]"] - 83["Segment
[2474, 2573, 0]"] - 84["Segment
[2579, 2696, 0]"] - 85["Segment
[2702, 2787, 0]"] - 86["Segment
[2793, 2800, 0]"] + 81["Path
[2333, 2368, 0]"] + 82["Segment
[2374, 2440, 0]"] + 83["Segment
[2446, 2545, 0]"] + 84["Segment
[2551, 2668, 0]"] + 85["Segment
[2674, 2759, 0]"] + 86["Segment
[2765, 2772, 0]"] 87[Solid2d] end subgraph path88 [Path] - 88["Path
[2811, 2967, 0]"] - 89["Segment
[2811, 2967, 0]"] + 88["Path
[2783, 2939, 0]"] + 89["Segment
[2783, 2939, 0]"] 90[Solid2d] end subgraph path91 [Path] - 91["Path
[2982, 3149, 0]"] - 92["Segment
[2982, 3149, 0]"] + 91["Path
[2954, 3121, 0]"] + 92["Segment
[2954, 3121, 0]"] 93[Solid2d] end subgraph path94 [Path] - 94["Path
[3164, 3322, 0]"] - 95["Segment
[3164, 3322, 0]"] + 94["Path
[3136, 3294, 0]"] + 95["Segment
[3136, 3294, 0]"] 96[Solid2d] end subgraph path97 [Path] - 97["Path
[3337, 3506, 0]"] - 98["Segment
[3337, 3506, 0]"] + 97["Path
[3309, 3478, 0]"] + 98["Segment
[3309, 3478, 0]"] 99[Solid2d] end subgraph path119 [Path] - 119["Path
[3947, 4031, 0]"] - 120["Segment
[4037, 4125, 0]"] - 121["Segment
[4131, 4252, 0]"] - 122["Segment
[4258, 4375, 0]"] - 123["Segment
[4381, 4466, 0]"] - 124["Segment
[4472, 4479, 0]"] + 119["Path
[3926, 4010, 0]"] + 120["Segment
[4016, 4104, 0]"] + 121["Segment
[4110, 4231, 0]"] + 122["Segment
[4237, 4354, 0]"] + 123["Segment
[4360, 4445, 0]"] + 124["Segment
[4451, 4458, 0]"] 125[Solid2d] end subgraph path126 [Path] - 126["Path
[4490, 4662, 0]"] - 127["Segment
[4490, 4662, 0]"] + 126["Path
[4469, 4641, 0]"] + 127["Segment
[4469, 4641, 0]"] 128[Solid2d] end subgraph path129 [Path] - 129["Path
[4677, 4860, 0]"] - 130["Segment
[4677, 4860, 0]"] + 129["Path
[4656, 4839, 0]"] + 130["Segment
[4656, 4839, 0]"] 131[Solid2d] end subgraph path132 [Path] - 132["Path
[4875, 5049, 0]"] - 133["Segment
[4875, 5049, 0]"] + 132["Path
[4854, 5028, 0]"] + 133["Segment
[4854, 5028, 0]"] 134[Solid2d] end subgraph path135 [Path] - 135["Path
[5064, 5249, 0]"] - 136["Segment
[5064, 5249, 0]"] + 135["Path
[5043, 5228, 0]"] + 136["Segment
[5043, 5228, 0]"] 137[Solid2d] end 1["Plane
[264, 281, 0]"] @@ -127,36 +127,36 @@ flowchart LR 25["EdgeCut Fillet
[771, 1053, 0]"] 26["EdgeCut Fillet
[771, 1053, 0]"] 27["EdgeCut Fillet
[771, 1053, 0]"] - 28["Plane
[1596, 1619, 0]"] - 35["Sweep Extrusion
[1810, 1861, 0]"] + 28["Plane
[1568, 1591, 0]"] + 35["Sweep Extrusion
[1782, 1833, 0]"] 36[Wall] 37["Cap Start"] 38["Cap End"] 39["SweepEdge Opposite"] 40["SweepEdge Adjacent"] - 41["Plane
[1596, 1619, 0]"] - 48["Sweep Extrusion
[1810, 1861, 0]"] + 41["Plane
[1568, 1591, 0]"] + 48["Sweep Extrusion
[1782, 1833, 0]"] 49[Wall] 50["Cap Start"] 51["Cap End"] 52["SweepEdge Opposite"] 53["SweepEdge Adjacent"] - 54["Plane
[1596, 1619, 0]"] - 61["Sweep Extrusion
[1810, 1861, 0]"] + 54["Plane
[1568, 1591, 0]"] + 61["Sweep Extrusion
[1782, 1833, 0]"] 62[Wall] 63["Cap Start"] 64["Cap End"] 65["SweepEdge Opposite"] 66["SweepEdge Adjacent"] - 67["Plane
[1596, 1619, 0]"] - 74["Sweep Extrusion
[1810, 1861, 0]"] + 67["Plane
[1568, 1591, 0]"] + 74["Sweep Extrusion
[1782, 1833, 0]"] 75[Wall] 76["Cap Start"] 77["Cap End"] 78["SweepEdge Opposite"] 79["SweepEdge Adjacent"] - 80["Plane
[2338, 2355, 0]"] - 100["Sweep Extrusion
[3524, 3566, 0]"] + 80["Plane
[2310, 2327, 0]"] + 100["Sweep Extrusion
[3496, 3538, 0]"] 101[Wall] 102[Wall] 103[Wall] @@ -171,11 +171,11 @@ flowchart LR 112["SweepEdge Adjacent"] 113["SweepEdge Opposite"] 114["SweepEdge Adjacent"] - 115["EdgeCut Fillet
[3572, 3854, 0]"] - 116["EdgeCut Fillet
[3572, 3854, 0]"] - 117["EdgeCut Fillet
[3572, 3854, 0]"] - 118["EdgeCut Fillet
[3572, 3854, 0]"] - 138["Sweep Extrusion
[5267, 5309, 0]"] + 115["EdgeCut Fillet
[3544, 3826, 0]"] + 116["EdgeCut Fillet
[3544, 3826, 0]"] + 117["EdgeCut Fillet
[3544, 3826, 0]"] + 118["EdgeCut Fillet
[3544, 3826, 0]"] + 138["Sweep Extrusion
[5246, 5288, 0]"] 139[Wall] 140[Wall] 141[Wall] @@ -190,11 +190,11 @@ flowchart LR 150["SweepEdge Adjacent"] 151["SweepEdge Opposite"] 152["SweepEdge Adjacent"] - 153["EdgeCut Fillet
[5315, 5597, 0]"] - 154["EdgeCut Fillet
[5315, 5597, 0]"] - 155["EdgeCut Fillet
[5315, 5597, 0]"] - 156["EdgeCut Fillet
[5315, 5597, 0]"] - 157["StartSketchOnFace
[3909, 3941, 0]"] + 153["EdgeCut Fillet
[5294, 5576, 0]"] + 154["EdgeCut Fillet
[5294, 5576, 0]"] + 155["EdgeCut Fillet
[5294, 5576, 0]"] + 156["EdgeCut Fillet
[5294, 5576, 0]"] + 157["StartSketchOnFace
[3881, 3920, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/enclosure/ast.snap b/rust/kcl-lib/tests/kcl_samples/enclosure/ast.snap index 9e4119d08..d4c38e197 100644 --- a/rust/kcl-lib/tests/kcl_samples/enclosure/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/enclosure/ast.snap @@ -1333,7 +1333,7 @@ description: Result of parsing enclosure.kcl "key": { "commentStart": 0, "end": 0, - "name": "plane", + "name": "origin", "start": 0, "type": "Identifier" }, @@ -1341,248 +1341,226 @@ description: Result of parsing enclosure.kcl "type": "ObjectProperty", "value": { "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "wallThickness", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } + ], "end": 0, - "properties": [ + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "xAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "origin", - "start": 0, - "type": "Identifier" - }, + "raw": "1.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "wallThickness", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 1.0, + "suffix": "None" } }, { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "xAxis", - "start": 0, - "type": "Identifier" - }, + "raw": "0.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.0, + "suffix": "None" } }, { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "yAxis", - "start": 0, - "type": "Identifier" - }, + "raw": "0.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "zAxis", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.0, + "suffix": "None" } } ], + "end": 0, "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "yAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "zAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" } } ], @@ -5087,29 +5065,23 @@ description: Result of parsing enclosure.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude003", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'END'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "END" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'END'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "END" + } } ], "callee": { @@ -5130,8 +5102,24 @@ description: Result of parsing enclosure.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude003", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/kcl_samples/enclosure/ops.snap b/rust/kcl-lib/tests/kcl_samples/enclosure/ops.snap index 49fa1154e..b8e983b2b 100644 --- a/rust/kcl-lib/tests/kcl_samples/enclosure/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/enclosure/ops.snap @@ -5,7 +5,7 @@ description: Operations executed enclosure.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -157,7 +157,7 @@ description: Operations executed enclosure.kcl "name": "function001", "functionSourceRange": [ 1287, - 1884, + 1856, 0 ], "unlabeledArg": null, @@ -167,190 +167,185 @@ description: Operations executed enclosure.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 3.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 3.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -430,7 +425,7 @@ description: Operations executed enclosure.kcl "name": "function001", "functionSourceRange": [ 1287, - 1884, + 1856, 0 ], "unlabeledArg": null, @@ -440,190 +435,185 @@ description: Operations executed enclosure.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 3.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 3.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -703,7 +693,7 @@ description: Operations executed enclosure.kcl "name": "function001", "functionSourceRange": [ 1287, - 1884, + 1856, 0 ], "unlabeledArg": null, @@ -713,190 +703,185 @@ description: Operations executed enclosure.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 3.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 3.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -976,7 +961,7 @@ description: Operations executed enclosure.kcl "name": "function001", "functionSourceRange": [ 1287, - 1884, + 1856, 0 ], "unlabeledArg": null, @@ -986,190 +971,185 @@ description: Operations executed enclosure.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 3.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 3.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -1244,7 +1224,7 @@ description: Operations executed enclosure.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1451,16 +1431,7 @@ description: Operations executed enclosure.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -1471,7 +1442,15 @@ description: Operations executed enclosure.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/kcl_samples/enclosure/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/enclosure/program_memory.snap index 7fcdfa867..08f422003 100644 --- a/rust/kcl-lib/tests/kcl_samples/enclosure/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/enclosure/program_memory.snap @@ -195,22 +195,34 @@ description: Variables in memory after executing enclosure.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -265,28 +277,72 @@ description: Variables in memory after executing enclosure.kcl { "type": "fillet", "id": "[uuid]", - "radius": 12.0, + "radius": { + "n": 12.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 12.0, + "radius": { + "n": 12.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 12.0, + "radius": { + "n": 12.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 12.0, + "radius": { + "n": 12.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -308,9 +364,9 @@ description: Variables in memory after executing enclosure.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2446, - "end": 2467, - "start": 2446, + "commentStart": 2418, + "end": 2439, + "start": 2418, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -321,9 +377,9 @@ description: Variables in memory after executing enclosure.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2551, - "end": 2572, - "start": 2551, + "commentStart": 2523, + "end": 2544, + "start": 2523, "type": "TagDeclarator", "value": "rectangleSegmentB002" }, @@ -334,9 +390,9 @@ description: Variables in memory after executing enclosure.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2674, - "end": 2695, - "start": 2674, + "commentStart": 2646, + "end": 2667, + "start": 2646, "type": "TagDeclarator", "value": "rectangleSegmentC002" }, @@ -347,9 +403,9 @@ description: Variables in memory after executing enclosure.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2765, - "end": 2786, - "start": 2765, + "commentStart": 2737, + "end": 2758, + "start": 2737, "type": "TagDeclarator", "value": "rectangleSegmentD002" }, @@ -370,9 +426,9 @@ description: Variables in memory after executing enclosure.kcl 0.0 ], "tag": { - "commentStart": 2446, - "end": 2467, - "start": 2446, + "commentStart": 2418, + "end": 2439, + "start": 2418, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -395,9 +451,9 @@ description: Variables in memory after executing enclosure.kcl 0.0 ], "tag": { - "commentStart": 2551, - "end": 2572, - "start": 2551, + "commentStart": 2523, + "end": 2544, + "start": 2523, "type": "TagDeclarator", "value": "rectangleSegmentB002" }, @@ -420,9 +476,9 @@ description: Variables in memory after executing enclosure.kcl 175.0 ], "tag": { - "commentStart": 2674, - "end": 2695, - "start": 2674, + "commentStart": 2646, + "end": 2667, + "start": 2646, "type": "TagDeclarator", "value": "rectangleSegmentC002" }, @@ -445,9 +501,9 @@ description: Variables in memory after executing enclosure.kcl 175.0 ], "tag": { - "commentStart": 2765, - "end": 2786, - "start": 2765, + "commentStart": 2737, + "end": 2758, + "start": 2737, "type": "TagDeclarator", "value": "rectangleSegmentD002" }, @@ -488,22 +544,34 @@ description: Variables in memory after executing enclosure.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -558,28 +626,72 @@ description: Variables in memory after executing enclosure.kcl { "type": "fillet", "id": "[uuid]", - "radius": 12.0, + "radius": { + "n": 12.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 12.0, + "radius": { + "n": 12.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 12.0, + "radius": { + "n": 12.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 12.0, + "radius": { + "n": 12.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -601,9 +713,9 @@ description: Variables in memory after executing enclosure.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 4103, - "end": 4124, - "start": 4103, + "commentStart": 4082, + "end": 4103, + "start": 4082, "type": "TagDeclarator", "value": "rectangleSegmentA003" }, @@ -614,9 +726,9 @@ description: Variables in memory after executing enclosure.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 4230, - "end": 4251, - "start": 4230, + "commentStart": 4209, + "end": 4230, + "start": 4209, "type": "TagDeclarator", "value": "rectangleSegmentB003" }, @@ -627,9 +739,9 @@ description: Variables in memory after executing enclosure.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 4353, - "end": 4374, - "start": 4353, + "commentStart": 4332, + "end": 4353, + "start": 4332, "type": "TagDeclarator", "value": "rectangleSegmentC003" }, @@ -640,9 +752,9 @@ description: Variables in memory after executing enclosure.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 4444, - "end": 4465, - "start": 4444, + "commentStart": 4423, + "end": 4444, + "start": 4423, "type": "TagDeclarator", "value": "rectangleSegmentD003" }, @@ -663,9 +775,9 @@ description: Variables in memory after executing enclosure.kcl 3.0 ], "tag": { - "commentStart": 4103, - "end": 4124, - "start": 4103, + "commentStart": 4082, + "end": 4103, + "start": 4082, "type": "TagDeclarator", "value": "rectangleSegmentA003" }, @@ -688,9 +800,9 @@ description: Variables in memory after executing enclosure.kcl 3.0 ], "tag": { - "commentStart": 4230, - "end": 4251, - "start": 4230, + "commentStart": 4209, + "end": 4230, + "start": 4209, "type": "TagDeclarator", "value": "rectangleSegmentB003" }, @@ -713,9 +825,9 @@ description: Variables in memory after executing enclosure.kcl 172.0 ], "tag": { - "commentStart": 4353, - "end": 4374, - "start": 4353, + "commentStart": 4332, + "end": 4353, + "start": 4332, "type": "TagDeclarator", "value": "rectangleSegmentC003" }, @@ -738,9 +850,9 @@ description: Variables in memory after executing enclosure.kcl 172.0 ], "tag": { - "commentStart": 4444, - "end": 4465, - "start": 4444, + "commentStart": 4423, + "end": 4444, + "start": 4423, "type": "TagDeclarator", "value": "rectangleSegmentD003" }, @@ -781,17 +893,26 @@ description: Variables in memory after executing enclosure.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -803,9 +924,9 @@ description: Variables in memory after executing enclosure.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2446, - "end": 2467, - "start": 2446, + "commentStart": 2418, + "end": 2439, + "start": 2418, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -816,9 +937,9 @@ description: Variables in memory after executing enclosure.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2551, - "end": 2572, - "start": 2551, + "commentStart": 2523, + "end": 2544, + "start": 2523, "type": "TagDeclarator", "value": "rectangleSegmentB002" }, @@ -829,9 +950,9 @@ description: Variables in memory after executing enclosure.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2674, - "end": 2695, - "start": 2674, + "commentStart": 2646, + "end": 2667, + "start": 2646, "type": "TagDeclarator", "value": "rectangleSegmentC002" }, @@ -842,9 +963,9 @@ description: Variables in memory after executing enclosure.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2765, - "end": 2786, - "start": 2765, + "commentStart": 2737, + "end": 2758, + "start": 2737, "type": "TagDeclarator", "value": "rectangleSegmentD002" }, @@ -865,9 +986,9 @@ description: Variables in memory after executing enclosure.kcl 0.0 ], "tag": { - "commentStart": 2446, - "end": 2467, - "start": 2446, + "commentStart": 2418, + "end": 2439, + "start": 2418, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -890,9 +1011,9 @@ description: Variables in memory after executing enclosure.kcl 0.0 ], "tag": { - "commentStart": 2551, - "end": 2572, - "start": 2551, + "commentStart": 2523, + "end": 2544, + "start": 2523, "type": "TagDeclarator", "value": "rectangleSegmentB002" }, @@ -915,9 +1036,9 @@ description: Variables in memory after executing enclosure.kcl 175.0 ], "tag": { - "commentStart": 2674, - "end": 2695, - "start": 2674, + "commentStart": 2646, + "end": 2667, + "start": 2646, "type": "TagDeclarator", "value": "rectangleSegmentC002" }, @@ -940,9 +1061,9 @@ description: Variables in memory after executing enclosure.kcl 175.0 ], "tag": { - "commentStart": 2765, - "end": 2786, - "start": 2765, + "commentStart": 2737, + "end": 2758, + "start": 2737, "type": "TagDeclarator", "value": "rectangleSegmentD002" }, @@ -983,22 +1104,34 @@ description: Variables in memory after executing enclosure.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1053,28 +1186,72 @@ description: Variables in memory after executing enclosure.kcl { "type": "fillet", "id": "[uuid]", - "radius": 12.0, + "radius": { + "n": 12.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 12.0, + "radius": { + "n": 12.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 12.0, + "radius": { + "n": 12.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 12.0, + "radius": { + "n": 12.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -1136,28 +1313,72 @@ description: Variables in memory after executing enclosure.kcl { "type": "fillet", "id": "[uuid]", - "radius": 9.0, + "radius": { + "n": 9.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 9.0, + "radius": { + "n": 9.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 9.0, + "radius": { + "n": 9.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 9.0, + "radius": { + "n": 9.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -1403,22 +1624,34 @@ description: Variables in memory after executing enclosure.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1483,9 +1716,9 @@ description: Variables in memory after executing enclosure.kcl 0.0 ], "tag": { - "commentStart": 2446, - "end": 2467, - "start": 2446, + "commentStart": 2418, + "end": 2439, + "start": 2418, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -1508,9 +1741,9 @@ description: Variables in memory after executing enclosure.kcl 0.0 ], "tag": { - "commentStart": 2551, - "end": 2572, - "start": 2551, + "commentStart": 2523, + "end": 2544, + "start": 2523, "type": "TagDeclarator", "value": "rectangleSegmentB002" }, @@ -1533,9 +1766,9 @@ description: Variables in memory after executing enclosure.kcl 175.0 ], "tag": { - "commentStart": 2674, - "end": 2695, - "start": 2674, + "commentStart": 2646, + "end": 2667, + "start": 2646, "type": "TagDeclarator", "value": "rectangleSegmentC002" }, @@ -1558,9 +1791,9 @@ description: Variables in memory after executing enclosure.kcl 175.0 ], "tag": { - "commentStart": 2765, - "end": 2786, - "start": 2765, + "commentStart": 2737, + "end": 2758, + "start": 2737, "type": "TagDeclarator", "value": "rectangleSegmentD002" }, @@ -1601,22 +1834,34 @@ description: Variables in memory after executing enclosure.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1681,9 +1926,9 @@ description: Variables in memory after executing enclosure.kcl 3.0 ], "tag": { - "commentStart": 4103, - "end": 4124, - "start": 4103, + "commentStart": 4082, + "end": 4103, + "start": 4082, "type": "TagDeclarator", "value": "rectangleSegmentA003" }, @@ -1706,9 +1951,9 @@ description: Variables in memory after executing enclosure.kcl 3.0 ], "tag": { - "commentStart": 4230, - "end": 4251, - "start": 4230, + "commentStart": 4209, + "end": 4230, + "start": 4209, "type": "TagDeclarator", "value": "rectangleSegmentB003" }, @@ -1731,9 +1976,9 @@ description: Variables in memory after executing enclosure.kcl 172.0 ], "tag": { - "commentStart": 4353, - "end": 4374, - "start": 4353, + "commentStart": 4332, + "end": 4353, + "start": 4332, "type": "TagDeclarator", "value": "rectangleSegmentC003" }, @@ -1756,9 +2001,9 @@ description: Variables in memory after executing enclosure.kcl 172.0 ], "tag": { - "commentStart": 4444, - "end": 4465, - "start": 4444, + "commentStart": 4423, + "end": 4444, + "start": 4423, "type": "TagDeclarator", "value": "rectangleSegmentD003" }, @@ -1799,17 +2044,26 @@ description: Variables in memory after executing enclosure.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1821,9 +2075,9 @@ description: Variables in memory after executing enclosure.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2446, - "end": 2467, - "start": 2446, + "commentStart": 2418, + "end": 2439, + "start": 2418, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -1834,9 +2088,9 @@ description: Variables in memory after executing enclosure.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2551, - "end": 2572, - "start": 2551, + "commentStart": 2523, + "end": 2544, + "start": 2523, "type": "TagDeclarator", "value": "rectangleSegmentB002" }, @@ -1847,9 +2101,9 @@ description: Variables in memory after executing enclosure.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2674, - "end": 2695, - "start": 2674, + "commentStart": 2646, + "end": 2667, + "start": 2646, "type": "TagDeclarator", "value": "rectangleSegmentC002" }, @@ -1860,9 +2114,9 @@ description: Variables in memory after executing enclosure.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2765, - "end": 2786, - "start": 2765, + "commentStart": 2737, + "end": 2758, + "start": 2737, "type": "TagDeclarator", "value": "rectangleSegmentD002" }, @@ -1883,9 +2137,9 @@ description: Variables in memory after executing enclosure.kcl 0.0 ], "tag": { - "commentStart": 2446, - "end": 2467, - "start": 2446, + "commentStart": 2418, + "end": 2439, + "start": 2418, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -1908,9 +2162,9 @@ description: Variables in memory after executing enclosure.kcl 0.0 ], "tag": { - "commentStart": 2551, - "end": 2572, - "start": 2551, + "commentStart": 2523, + "end": 2544, + "start": 2523, "type": "TagDeclarator", "value": "rectangleSegmentB002" }, @@ -1933,9 +2187,9 @@ description: Variables in memory after executing enclosure.kcl 175.0 ], "tag": { - "commentStart": 2674, - "end": 2695, - "start": 2674, + "commentStart": 2646, + "end": 2667, + "start": 2646, "type": "TagDeclarator", "value": "rectangleSegmentC002" }, @@ -1958,9 +2212,9 @@ description: Variables in memory after executing enclosure.kcl 175.0 ], "tag": { - "commentStart": 2765, - "end": 2786, - "start": 2765, + "commentStart": 2737, + "end": 2758, + "start": 2737, "type": "TagDeclarator", "value": "rectangleSegmentD002" }, @@ -2001,22 +2255,34 @@ description: Variables in memory after executing enclosure.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2071,28 +2337,72 @@ description: Variables in memory after executing enclosure.kcl { "type": "fillet", "id": "[uuid]", - "radius": 12.0, + "radius": { + "n": 12.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 12.0, + "radius": { + "n": 12.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 12.0, + "radius": { + "n": 12.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 12.0, + "radius": { + "n": 12.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } diff --git a/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/artifact_graph_flowchart.snap.md index ba70de1a9..3f5bb9b6b 100644 --- a/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/artifact_graph_flowchart.snap.md @@ -1,172 +1,172 @@ ```mermaid flowchart LR subgraph path2 [Path] - 2["Path
[817, 852, 0]"] - 3["Segment
[860, 886, 0]"] - 4["Segment
[894, 957, 0]"] - 5["Segment
[965, 1024, 0]"] - 6["Segment
[1032, 1094, 0]"] - 7["Segment
[1102, 1161, 0]"] + 2["Path
[781, 816, 0]"] + 3["Segment
[824, 850, 0]"] + 4["Segment
[858, 921, 0]"] + 5["Segment
[929, 988, 0]"] + 6["Segment
[996, 1058, 0]"] + 7["Segment
[1066, 1125, 0]"] end subgraph path9 [Path] - 9["Path
[1263, 1325, 0]"] - 10["Segment
[1263, 1325, 0]"] + 9["Path
[1227, 1289, 0]"] + 10["Segment
[1227, 1289, 0]"] 11[Solid2d] end subgraph path12 [Path] - 12["Path
[1338, 1416, 0]"] - 13["Segment
[1338, 1416, 0]"] + 12["Path
[1302, 1380, 0]"] + 13["Segment
[1302, 1380, 0]"] 14[Solid2d] end subgraph path22 [Path] - 22["Path
[817, 852, 0]"] - 23["Segment
[860, 886, 0]"] - 24["Segment
[894, 957, 0]"] - 25["Segment
[965, 1024, 0]"] - 26["Segment
[1032, 1094, 0]"] - 27["Segment
[1102, 1161, 0]"] + 22["Path
[781, 816, 0]"] + 23["Segment
[824, 850, 0]"] + 24["Segment
[858, 921, 0]"] + 25["Segment
[929, 988, 0]"] + 26["Segment
[996, 1058, 0]"] + 27["Segment
[1066, 1125, 0]"] end subgraph path29 [Path] - 29["Path
[1263, 1325, 0]"] - 30["Segment
[1263, 1325, 0]"] + 29["Path
[1227, 1289, 0]"] + 30["Segment
[1227, 1289, 0]"] 31[Solid2d] end subgraph path32 [Path] - 32["Path
[1338, 1416, 0]"] - 33["Segment
[1338, 1416, 0]"] + 32["Path
[1302, 1380, 0]"] + 33["Segment
[1302, 1380, 0]"] 34[Solid2d] end subgraph path42 [Path] - 42["Path
[817, 852, 0]"] - 43["Segment
[860, 886, 0]"] - 44["Segment
[894, 957, 0]"] - 45["Segment
[965, 1024, 0]"] - 46["Segment
[1032, 1094, 0]"] - 47["Segment
[1102, 1161, 0]"] + 42["Path
[781, 816, 0]"] + 43["Segment
[824, 850, 0]"] + 44["Segment
[858, 921, 0]"] + 45["Segment
[929, 988, 0]"] + 46["Segment
[996, 1058, 0]"] + 47["Segment
[1066, 1125, 0]"] end subgraph path49 [Path] - 49["Path
[1263, 1325, 0]"] - 50["Segment
[1263, 1325, 0]"] + 49["Path
[1227, 1289, 0]"] + 50["Segment
[1227, 1289, 0]"] 51[Solid2d] end subgraph path52 [Path] - 52["Path
[1338, 1416, 0]"] - 53["Segment
[1338, 1416, 0]"] + 52["Path
[1302, 1380, 0]"] + 53["Segment
[1302, 1380, 0]"] 54[Solid2d] end subgraph path62 [Path] - 62["Path
[817, 852, 0]"] - 63["Segment
[860, 886, 0]"] - 64["Segment
[894, 957, 0]"] - 65["Segment
[965, 1024, 0]"] - 66["Segment
[1032, 1094, 0]"] - 67["Segment
[1102, 1161, 0]"] + 62["Path
[781, 816, 0]"] + 63["Segment
[824, 850, 0]"] + 64["Segment
[858, 921, 0]"] + 65["Segment
[929, 988, 0]"] + 66["Segment
[996, 1058, 0]"] + 67["Segment
[1066, 1125, 0]"] end subgraph path69 [Path] - 69["Path
[1263, 1325, 0]"] - 70["Segment
[1263, 1325, 0]"] + 69["Path
[1227, 1289, 0]"] + 70["Segment
[1227, 1289, 0]"] 71[Solid2d] end subgraph path72 [Path] - 72["Path
[1338, 1416, 0]"] - 73["Segment
[1338, 1416, 0]"] + 72["Path
[1302, 1380, 0]"] + 73["Segment
[1302, 1380, 0]"] 74[Solid2d] end subgraph path82 [Path] - 82["Path
[1743, 1778, 0]"] - 83["Segment
[1784, 1818, 0]"] - 84["Segment
[1824, 1871, 0]"] - 85["Segment
[1877, 1923, 0]"] - 86["Segment
[1929, 1976, 0]"] - 87["Segment
[1982, 2016, 0]"] - 88["Segment
[2022, 2065, 0]"] - 89["Segment
[2071, 2104, 0]"] - 90["Segment
[2110, 2157, 0]"] - 91["Segment
[2163, 2210, 0]"] - 92["Segment
[2216, 2263, 0]"] - 93["Segment
[2269, 2312, 0]"] - 94["Segment
[2318, 2369, 0]"] - 95["Segment
[2375, 2419, 0]"] - 96["Segment
[2425, 2472, 0]"] - 97["Segment
[2478, 2524, 0]"] - 98["Segment
[2530, 2586, 0]"] - 99["Segment
[2592, 2599, 0]"] + 82["Path
[1707, 1742, 0]"] + 83["Segment
[1748, 1782, 0]"] + 84["Segment
[1788, 1835, 0]"] + 85["Segment
[1841, 1887, 0]"] + 86["Segment
[1893, 1940, 0]"] + 87["Segment
[1946, 1980, 0]"] + 88["Segment
[1986, 2029, 0]"] + 89["Segment
[2035, 2068, 0]"] + 90["Segment
[2074, 2121, 0]"] + 91["Segment
[2127, 2174, 0]"] + 92["Segment
[2180, 2227, 0]"] + 93["Segment
[2233, 2276, 0]"] + 94["Segment
[2282, 2333, 0]"] + 95["Segment
[2339, 2383, 0]"] + 96["Segment
[2389, 2436, 0]"] + 97["Segment
[2442, 2488, 0]"] + 98["Segment
[2494, 2550, 0]"] + 99["Segment
[2556, 2563, 0]"] 100[Solid2d] end subgraph path101 [Path] - 101["Path
[2671, 2744, 0]"] - 102["Segment
[2671, 2744, 0]"] + 101["Path
[2635, 2708, 0]"] + 102["Segment
[2635, 2708, 0]"] 103[Solid2d] end subgraph path104 [Path] - 104["Path
[2759, 2832, 0]"] - 105["Segment
[2759, 2832, 0]"] + 104["Path
[2723, 2796, 0]"] + 105["Segment
[2723, 2796, 0]"] 106[Solid2d] end subgraph path107 [Path] - 107["Path
[2847, 2920, 0]"] - 108["Segment
[2847, 2920, 0]"] + 107["Path
[2811, 2884, 0]"] + 108["Segment
[2811, 2884, 0]"] 109[Solid2d] end subgraph path110 [Path] - 110["Path
[2935, 3008, 0]"] - 111["Segment
[2935, 3008, 0]"] + 110["Path
[2899, 2972, 0]"] + 111["Segment
[2899, 2972, 0]"] 112[Solid2d] end subgraph path113 [Path] - 113["Path
[3062, 3201, 0]"] - 114["Segment
[3062, 3201, 0]"] + 113["Path
[3026, 3165, 0]"] + 114["Segment
[3026, 3165, 0]"] 115[Solid2d] end subgraph path116 [Path] - 116["Path
[3216, 3353, 0]"] - 117["Segment
[3216, 3353, 0]"] + 116["Path
[3180, 3317, 0]"] + 117["Segment
[3180, 3317, 0]"] 118[Solid2d] end subgraph path119 [Path] - 119["Path
[3368, 3515, 0]"] - 120["Segment
[3368, 3515, 0]"] + 119["Path
[3332, 3479, 0]"] + 120["Segment
[3332, 3479, 0]"] 121[Solid2d] end subgraph path122 [Path] - 122["Path
[3530, 3676, 0]"] - 123["Segment
[3530, 3676, 0]"] + 122["Path
[3494, 3640, 0]"] + 123["Segment
[3494, 3640, 0]"] 124[Solid2d] end - 1["Plane
[784, 809, 0]"] - 8["Plane
[1238, 1255, 0]"] - 15["Sweep Sweep
[1428, 1451, 0]"] + 1["Plane
[748, 773, 0]"] + 8["Plane
[1202, 1219, 0]"] + 15["Sweep Sweep
[1392, 1415, 0]"] 16[Wall] 17["Cap Start"] 18["Cap End"] 19["SweepEdge Opposite"] 20["SweepEdge Adjacent"] - 21["Plane
[784, 809, 0]"] - 28["Plane
[1238, 1255, 0]"] - 35["Sweep Sweep
[1428, 1451, 0]"] + 21["Plane
[748, 773, 0]"] + 28["Plane
[1202, 1219, 0]"] + 35["Sweep Sweep
[1392, 1415, 0]"] 36[Wall] 37["Cap Start"] 38["Cap End"] 39["SweepEdge Opposite"] 40["SweepEdge Adjacent"] - 41["Plane
[784, 809, 0]"] - 48["Plane
[1238, 1255, 0]"] - 55["Sweep Sweep
[1428, 1451, 0]"] + 41["Plane
[748, 773, 0]"] + 48["Plane
[1202, 1219, 0]"] + 55["Sweep Sweep
[1392, 1415, 0]"] 56[Wall] 57["Cap Start"] 58["Cap End"] 59["SweepEdge Opposite"] 60["SweepEdge Adjacent"] - 61["Plane
[784, 809, 0]"] - 68["Plane
[1238, 1255, 0]"] - 75["Sweep Sweep
[1428, 1451, 0]"] + 61["Plane
[748, 773, 0]"] + 68["Plane
[1202, 1219, 0]"] + 75["Sweep Sweep
[1392, 1415, 0]"] 76[Wall] 77["Cap Start"] 78["Cap End"] 79["SweepEdge Opposite"] 80["SweepEdge Adjacent"] - 81["Plane
[1720, 1737, 0]"] - 125["Sweep Extrusion
[3732, 3761, 0]"] + 81["Plane
[1684, 1701, 0]"] + 125["Sweep Extrusion
[3696, 3725, 0]"] 126[Wall] 127[Wall] 128[Wall] @@ -217,10 +217,10 @@ flowchart LR 173["SweepEdge Adjacent"] 174["SweepEdge Opposite"] 175["SweepEdge Adjacent"] - 176["EdgeCut Fillet
[3767, 3901, 0]"] - 177["EdgeCut Fillet
[3767, 3901, 0]"] - 178["EdgeCut Fillet
[3907, 4041, 0]"] - 179["EdgeCut Fillet
[3907, 4041, 0]"] + 176["EdgeCut Fillet
[3731, 3865, 0]"] + 177["EdgeCut Fillet
[3731, 3865, 0]"] + 178["EdgeCut Fillet
[3871, 4005, 0]"] + 179["EdgeCut Fillet
[3871, 4005, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/ast.snap b/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/ast.snap index 289edb885..2bb3553e5 100644 --- a/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/ast.snap @@ -237,7 +237,7 @@ description: Result of parsing exhaust-manifold.kcl "key": { "commentStart": 0, "end": 0, - "name": "plane", + "name": "origin", "start": 0, "type": "Identifier" }, @@ -245,368 +245,346 @@ description: Result of parsing exhaust-manifold.kcl "type": "ObjectProperty", "value": { "commentStart": 0, - "end": 0, - "properties": [ + "elements": [ { + "abs_path": false, "commentStart": 0, "end": 0, - "key": { + "name": { "commentStart": 0, "end": 0, - "name": "origin", + "name": "pos001", "start": 0, "type": "Identifier" }, + "path": [], "start": 0, - "type": "ObjectProperty", + "type": "Name", + "type": "Name" + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "xAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "arguments": [ + { + "arguments": [ + { + "argument": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "angle001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "commentStart": 0, + "end": 0, + "operator": "-", + "start": 0, + "type": "UnaryExpression", + "type": "UnaryExpression" + } + ], + "callee": { "abs_path": false, "commentStart": 0, "end": 0, "name": { "commentStart": 0, "end": 0, - "name": "pos001", + "name": "toRadians", "start": 0, "type": "Identifier" }, "path": [], "start": 0, - "type": "Name", "type": "Name" }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], + "commentStart": 0, + "end": 0, + "start": 0, + "type": "CallExpression", + "type": "CallExpression" + } + ], + "callee": { + "abs_path": false, + "commentStart": 0, "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "sin", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" - } - }, - { + "type": "Name" + }, "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "xAxis", - "start": 0, - "type": "Identifier" - }, "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "elements": [ - { - "arguments": [ - { - "arguments": [ - { - "argument": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "angle001", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "operator": "-", - "start": 0, - "type": "UnaryExpression", - "type": "UnaryExpression" - } - ], - "callee": { - "abs_path": false, + "type": "CallExpression", + "type": "CallExpression" + }, + { + "arguments": [ + { + "arguments": [ + { + "argument": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { "commentStart": 0, "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "toRadians", - "start": 0, - "type": "Identifier" - }, - "path": [], + "name": "angle001", "start": 0, - "type": "Name" + "type": "Identifier" }, - "commentStart": 0, - "end": 0, + "path": [], "start": 0, - "type": "CallExpression", - "type": "CallExpression" - } - ], - "callee": { - "abs_path": false, + "type": "Name", + "type": "Name" + }, "commentStart": 0, "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "sin", - "start": 0, - "type": "Identifier" - }, - "path": [], + "operator": "-", "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - { - "arguments": [ - { - "arguments": [ - { - "argument": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "angle001", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "operator": "-", - "start": 0, - "type": "UnaryExpression", - "type": "UnaryExpression" - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "toRadians", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "cos", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" + "type": "UnaryExpression", + "type": "UnaryExpression" } - } - ], + ], + "callee": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "toRadians", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name" + }, + "commentStart": 0, + "end": 0, + "start": 0, + "type": "CallExpression", + "type": "CallExpression" + } + ], + "callee": { + "abs_path": false, + "commentStart": 0, "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "cos", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" - } + "type": "Name" + }, + "commentStart": 0, + "end": 0, + "start": 0, + "type": "CallExpression", + "type": "CallExpression" }, { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "yAxis", - "start": 0, - "type": "Identifier" - }, + "raw": "0.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "zAxis", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.0, + "suffix": "None" } } ], + "end": 0, "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "yAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "zAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" } } ], diff --git a/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/ops.snap b/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/ops.snap index 00a6e262d..4be08324e 100644 --- a/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/ops.snap @@ -10,7 +10,7 @@ description: Operations executed exhaust-manifold.kcl "name": "primaryTube", "functionSourceRange": [ 330, - 1468, + 1432, 0 ], "unlabeledArg": null, @@ -56,180 +56,175 @@ description: Operations executed exhaust-manifold.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": -0.0, - "ty": { - "type": "Known", - "type": "Count" - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Known", - "type": "Count" - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": -0.0, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -243,7 +238,7 @@ description: Operations executed exhaust-manifold.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -317,7 +312,7 @@ description: Operations executed exhaust-manifold.kcl "name": "primaryTube", "functionSourceRange": [ 330, - 1468, + 1432, 0 ], "unlabeledArg": null, @@ -363,180 +358,175 @@ description: Operations executed exhaust-manifold.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 2.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 2.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": -0.01745240643728351, - "ty": { - "type": "Known", - "type": "Count" - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.9998476951563913, - "ty": { - "type": "Known", - "type": "Count" - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": -0.01745240643728351, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.9998476951563913, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -550,7 +540,7 @@ description: Operations executed exhaust-manifold.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -624,7 +614,7 @@ description: Operations executed exhaust-manifold.kcl "name": "primaryTube", "functionSourceRange": [ 330, - 1468, + 1432, 0 ], "unlabeledArg": null, @@ -670,180 +660,175 @@ description: Operations executed exhaust-manifold.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 4.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 4.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": -0.4115143586051088, - "ty": { - "type": "Known", - "type": "Count" - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.9114032766354453, - "ty": { - "type": "Known", - "type": "Count" - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": -0.4115143586051088, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.9114032766354453, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -857,7 +842,7 @@ description: Operations executed exhaust-manifold.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -931,7 +916,7 @@ description: Operations executed exhaust-manifold.kcl "name": "primaryTube", "functionSourceRange": [ 330, - 1468, + 1432, 0 ], "unlabeledArg": null, @@ -977,180 +962,175 @@ description: Operations executed exhaust-manifold.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 6.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 6.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": -0.42577929156507266, - "ty": { - "type": "Known", - "type": "Count" - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.9048270524660196, - "ty": { - "type": "Known", - "type": "Count" - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": -0.42577929156507266, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.9048270524660196, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -1164,7 +1144,7 @@ description: Operations executed exhaust-manifold.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1233,7 +1213,7 @@ description: Operations executed exhaust-manifold.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/program_memory.snap index 3226d5b04..14ea742d6 100644 --- a/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/program_memory.snap @@ -28,9 +28,9 @@ description: Variables in memory after executing exhaust-manifold.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1811, - "end": 1817, - "start": 1811, + "commentStart": 1775, + "end": 1781, + "start": 1775, "type": "TagDeclarator", "value": "seg01" }, @@ -62,9 +62,9 @@ description: Variables in memory after executing exhaust-manifold.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2009, - "end": 2015, - "start": 2009, + "commentStart": 1973, + "end": 1979, + "start": 1973, "type": "TagDeclarator", "value": "seg03" }, @@ -75,9 +75,9 @@ description: Variables in memory after executing exhaust-manifold.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2058, - "end": 2064, - "start": 2058, + "commentStart": 2022, + "end": 2028, + "start": 2022, "type": "TagDeclarator", "value": "seg04" }, @@ -88,9 +88,9 @@ description: Variables in memory after executing exhaust-manifold.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2097, - "end": 2103, - "start": 2097, + "commentStart": 2061, + "end": 2067, + "start": 2061, "type": "TagDeclarator", "value": "seg05" }, @@ -122,9 +122,9 @@ description: Variables in memory after executing exhaust-manifold.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2305, - "end": 2311, - "start": 2305, + "commentStart": 2269, + "end": 2275, + "start": 2269, "type": "TagDeclarator", "value": "seg07" }, @@ -135,9 +135,9 @@ description: Variables in memory after executing exhaust-manifold.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2362, - "end": 2368, - "start": 2362, + "commentStart": 2326, + "end": 2332, + "start": 2326, "type": "TagDeclarator", "value": "seg08" }, @@ -148,9 +148,9 @@ description: Variables in memory after executing exhaust-manifold.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2412, - "end": 2418, - "start": 2412, + "commentStart": 2376, + "end": 2382, + "start": 2376, "type": "TagDeclarator", "value": "seg09" }, @@ -192,9 +192,9 @@ description: Variables in memory after executing exhaust-manifold.kcl -1.25 ], "tag": { - "commentStart": 1811, - "end": 1817, - "start": 1811, + "commentStart": 1775, + "end": 1781, + "start": 1775, "type": "TagDeclarator", "value": "seg01" }, @@ -289,9 +289,9 @@ description: Variables in memory after executing exhaust-manifold.kcl -1.25 ], "tag": { - "commentStart": 2009, - "end": 2015, - "start": 2009, + "commentStart": 1973, + "end": 1979, + "start": 1973, "type": "TagDeclarator", "value": "seg03" }, @@ -314,9 +314,9 @@ description: Variables in memory after executing exhaust-manifold.kcl -1.25 ], "tag": { - "commentStart": 2058, - "end": 2064, - "start": 2058, + "commentStart": 2022, + "end": 2028, + "start": 2022, "type": "TagDeclarator", "value": "seg04" }, @@ -339,9 +339,9 @@ description: Variables in memory after executing exhaust-manifold.kcl 1.35 ], "tag": { - "commentStart": 2097, - "end": 2103, - "start": 2097, + "commentStart": 2061, + "end": 2067, + "start": 2061, "type": "TagDeclarator", "value": "seg05" }, @@ -436,9 +436,9 @@ description: Variables in memory after executing exhaust-manifold.kcl 1.35 ], "tag": { - "commentStart": 2305, - "end": 2311, - "start": 2305, + "commentStart": 2269, + "end": 2275, + "start": 2269, "type": "TagDeclarator", "value": "seg07" }, @@ -461,9 +461,9 @@ description: Variables in memory after executing exhaust-manifold.kcl 1.35 ], "tag": { - "commentStart": 2362, - "end": 2368, - "start": 2362, + "commentStart": 2326, + "end": 2332, + "start": 2326, "type": "TagDeclarator", "value": "seg08" }, @@ -486,9 +486,9 @@ description: Variables in memory after executing exhaust-manifold.kcl -1.25 ], "tag": { - "commentStart": 2412, - "end": 2418, - "start": 2412, + "commentStart": 2376, + "end": 2382, + "start": 2376, "type": "TagDeclarator", "value": "seg09" }, @@ -601,22 +601,34 @@ description: Variables in memory after executing exhaust-manifold.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -683,28 +695,72 @@ description: Variables in memory after executing exhaust-manifold.kcl { "type": "fillet", "id": "[uuid]", - "radius": 1.5, + "radius": { + "n": 1.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 1.5, + "radius": { + "n": 1.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } diff --git a/rust/kcl-lib/tests/kcl_samples/flange/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/flange/artifact_graph_flowchart.snap.md index 974bf2419..b0b85e824 100644 --- a/rust/kcl-lib/tests/kcl_samples/flange/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/flange/artifact_graph_flowchart.snap.md @@ -11,18 +11,18 @@ flowchart LR 8[Solid2d] end subgraph path15 [Path] - 15["Path
[1385, 1439, 0]"] - 16["Segment
[1385, 1439, 0]"] + 15["Path
[1392, 1446, 0]"] + 16["Segment
[1392, 1446, 0]"] 17[Solid2d] end subgraph path23 [Path] - 23["Path
[1597, 1654, 0]"] - 24["Segment
[1597, 1654, 0]"] + 23["Path
[1611, 1668, 0]"] + 24["Segment
[1611, 1668, 0]"] 25[Solid2d] end subgraph path31 [Path] - 31["Path
[1784, 1829, 0]"] - 32["Segment
[1784, 1829, 0]"] + 31["Path
[1805, 1850, 0]"] + 32["Segment
[1805, 1850, 0]"] 33[Solid2d] end 1["Plane
[827, 844, 0]"] @@ -33,23 +33,23 @@ flowchart LR 12["Cap End"] 13["SweepEdge Opposite"] 14["SweepEdge Adjacent"] - 18["Sweep Extrusion
[1445, 1480, 0]"] + 18["Sweep Extrusion
[1452, 1487, 0]"] 19[Wall] 20["Cap End"] 21["SweepEdge Opposite"] 22["SweepEdge Adjacent"] - 26["Sweep Extrusion
[1660, 1693, 0]"] + 26["Sweep Extrusion
[1674, 1707, 0]"] 27[Wall] 28["Cap End"] 29["SweepEdge Opposite"] 30["SweepEdge Adjacent"] - 34["Sweep Extrusion
[1835, 1910, 0]"] + 34["Sweep Extrusion
[1856, 1931, 0]"] 35[Wall] 36["SweepEdge Opposite"] 37["SweepEdge Adjacent"] - 38["StartSketchOnFace
[1347, 1379, 0]"] - 39["StartSketchOnFace
[1557, 1591, 0]"] - 40["StartSketchOnFace
[1744, 1778, 0]"] + 38["StartSketchOnFace
[1347, 1386, 0]"] + 39["StartSketchOnFace
[1564, 1605, 0]"] + 40["StartSketchOnFace
[1758, 1799, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/flange/ast.snap b/rust/kcl-lib/tests/kcl_samples/flange/ast.snap index a5d03d6da..b2ebaa703 100644 --- a/rust/kcl-lib/tests/kcl_samples/flange/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/flange/ast.snap @@ -1179,29 +1179,23 @@ description: Result of parsing flange.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "flangeBase", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'end'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "end" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'end'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "end" + } } ], "callee": { @@ -1222,8 +1216,24 @@ description: Result of parsing flange.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "flangeBase", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -1441,29 +1451,23 @@ description: Result of parsing flange.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "flangeBase", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'start'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "start" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'start'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "start" + } } ], "callee": { @@ -1484,8 +1488,24 @@ description: Result of parsing flange.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "flangeBase", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -1703,29 +1723,23 @@ description: Result of parsing flange.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "topExtrusion", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'end'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "end" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'end'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "end" + } } ], "callee": { @@ -1746,8 +1760,24 @@ description: Result of parsing flange.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "topExtrusion", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/kcl_samples/flange/ops.snap b/rust/kcl-lib/tests/kcl_samples/flange/ops.snap index 66c9454ec..37ee3f992 100644 --- a/rust/kcl-lib/tests/kcl_samples/flange/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/flange/ops.snap @@ -5,7 +5,7 @@ description: Operations executed flange.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -20,7 +20,7 @@ description: Operations executed flange.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -116,16 +116,7 @@ description: Operations executed flange.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -136,7 +127,15 @@ description: Operations executed flange.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -172,16 +171,7 @@ description: Operations executed flange.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -192,7 +182,15 @@ description: Operations executed flange.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -228,16 +226,7 @@ description: Operations executed flange.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -248,7 +237,15 @@ description: Operations executed flange.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/kcl_samples/flange/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/flange/program_memory.snap index 9b9228acd..039fcd8fa 100644 --- a/rust/kcl-lib/tests/kcl_samples/flange/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/flange/program_memory.snap @@ -82,17 +82,26 @@ description: Variables in memory after executing flange.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -145,22 +154,34 @@ description: Variables in memory after executing flange.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -302,22 +323,34 @@ description: Variables in memory after executing flange.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -388,22 +421,34 @@ description: Variables in memory after executing flange.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -474,22 +519,34 @@ description: Variables in memory after executing flange.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -560,22 +617,34 @@ description: Variables in memory after executing flange.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -661,22 +730,34 @@ description: Variables in memory after executing flange.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -819,17 +900,26 @@ description: Variables in memory after executing flange.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -882,17 +972,26 @@ description: Variables in memory after executing flange.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -945,22 +1044,34 @@ description: Variables in memory after executing flange.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1121,17 +1232,26 @@ description: Variables in memory after executing flange.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1184,22 +1304,34 @@ description: Variables in memory after executing flange.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" diff --git a/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/artifact_graph_flowchart.snap.md index 238cba6ea..591390708 100644 --- a/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/artifact_graph_flowchart.snap.md @@ -1,60 +1,60 @@ ```mermaid flowchart LR subgraph path2 [Path] - 2["Path
[1260, 1298, 0]"] - 3["Segment
[1306, 1356, 0]"] - 4["Segment
[1364, 1413, 0]"] - 5["Segment
[1421, 1473, 0]"] - 6["Segment
[1481, 1529, 0]"] - 7["Segment
[1537, 1581, 0]"] - 8["Segment
[1589, 1634, 0]"] - 9["Segment
[1642, 1691, 0]"] - 10["Segment
[1699, 1718, 0]"] + 2["Path
[1236, 1274, 0]"] + 3["Segment
[1282, 1332, 0]"] + 4["Segment
[1340, 1389, 0]"] + 5["Segment
[1397, 1449, 0]"] + 6["Segment
[1457, 1505, 0]"] + 7["Segment
[1513, 1557, 0]"] + 8["Segment
[1565, 1610, 0]"] + 9["Segment
[1618, 1667, 0]"] + 10["Segment
[1675, 1694, 0]"] 11[Solid2d] end subgraph path40 [Path] - 40["Path
[2433, 2487, 0]"] - 41["Segment
[2493, 2546, 0]"] - 42["Segment
[2552, 2602, 0]"] - 43["Segment
[2608, 2662, 0]"] - 44["Segment
[2668, 2688, 0]"] + 40["Path
[2385, 2439, 0]"] + 41["Segment
[2445, 2498, 0]"] + 42["Segment
[2504, 2554, 0]"] + 43["Segment
[2560, 2614, 0]"] + 44["Segment
[2620, 2640, 0]"] 45[Solid2d] end subgraph path46 [Path] - 46["Path
[2699, 2862, 0]"] - 47["Segment
[2699, 2862, 0]"] + 46["Path
[2651, 2814, 0]"] + 47["Segment
[2651, 2814, 0]"] 48[Solid2d] end subgraph path67 [Path] - 67["Path
[3247, 3302, 0]"] - 68["Segment
[3308, 3362, 0]"] - 69["Segment
[3368, 3418, 0]"] - 70["Segment
[3424, 3477, 0]"] - 71["Segment
[3483, 3503, 0]"] + 67["Path
[3199, 3254, 0]"] + 68["Segment
[3260, 3314, 0]"] + 69["Segment
[3320, 3370, 0]"] + 70["Segment
[3376, 3429, 0]"] + 71["Segment
[3435, 3455, 0]"] 72[Solid2d] end subgraph path73 [Path] - 73["Path
[3514, 3680, 0]"] - 74["Segment
[3514, 3680, 0]"] + 73["Path
[3466, 3632, 0]"] + 74["Segment
[3466, 3632, 0]"] 75[Solid2d] end subgraph path94 [Path] - 94["Path
[4287, 4328, 0]"] - 95["Segment
[4334, 4354, 0]"] - 96["Segment
[4360, 4383, 0]"] - 97["Segment
[4389, 4396, 0]"] + 94["Path
[4215, 4256, 0]"] + 95["Segment
[4262, 4282, 0]"] + 96["Segment
[4288, 4311, 0]"] + 97["Segment
[4317, 4324, 0]"] 98[Solid2d] end subgraph path112 [Path] - 112["Path
[4511, 4551, 0]"] - 113["Segment
[4557, 4577, 0]"] - 114["Segment
[4583, 4604, 0]"] - 115["Segment
[4610, 4631, 0]"] - 116["Segment
[4637, 4644, 0]"] + 112["Path
[4439, 4479, 0]"] + 113["Segment
[4485, 4505, 0]"] + 114["Segment
[4511, 4532, 0]"] + 115["Segment
[4538, 4559, 0]"] + 116["Segment
[4565, 4572, 0]"] 117[Solid2d] end - 1["Plane
[1225, 1252, 0]"] - 12["Sweep Extrusion
[1826, 1860, 0]"] + 1["Plane
[1201, 1228, 0]"] + 12["Sweep Extrusion
[1802, 1836, 0]"] 13[Wall] 14[Wall] 15[Wall] @@ -81,8 +81,8 @@ flowchart LR 36["SweepEdge Adjacent"] 37["SweepEdge Opposite"] 38["SweepEdge Adjacent"] - 39["Plane
[2404, 2427, 0]"] - 49["Sweep Extrusion
[2872, 2897, 0]"] + 39["Plane
[2356, 2379, 0]"] + 49["Sweep Extrusion
[2824, 2849, 0]"] 50[Wall] 51[Wall] 52[Wall] @@ -97,10 +97,10 @@ flowchart LR 61["SweepEdge Adjacent"] 62["SweepEdge Opposite"] 63["SweepEdge Adjacent"] - 64["EdgeCut Fillet
[2903, 3048, 0]"] - 65["EdgeCut Fillet
[2903, 3048, 0]"] - 66["Plane
[3218, 3241, 0]"] - 76["Sweep Extrusion
[3690, 3715, 0]"] + 64["EdgeCut Fillet
[2855, 3000, 0]"] + 65["EdgeCut Fillet
[2855, 3000, 0]"] + 66["Plane
[3170, 3193, 0]"] + 76["Sweep Extrusion
[3642, 3667, 0]"] 77[Wall] 78[Wall] 79[Wall] @@ -115,10 +115,10 @@ flowchart LR 88["SweepEdge Adjacent"] 89["SweepEdge Opposite"] 90["SweepEdge Adjacent"] - 91["EdgeCut Fillet
[3721, 3866, 0]"] - 92["EdgeCut Fillet
[3721, 3866, 0]"] - 93["Plane
[4258, 4281, 0]"] - 99["Sweep Extrusion
[4402, 4430, 0]"] + 91["EdgeCut Fillet
[3673, 3818, 0]"] + 92["EdgeCut Fillet
[3673, 3818, 0]"] + 93["Plane
[4186, 4209, 0]"] + 99["Sweep Extrusion
[4330, 4358, 0]"] 100[Wall] 101[Wall] 102[Wall] @@ -130,8 +130,8 @@ flowchart LR 108["SweepEdge Adjacent"] 109["SweepEdge Opposite"] 110["SweepEdge Adjacent"] - 111["Plane
[4482, 4505, 0]"] - 118["Sweep Extrusion
[4650, 4678, 0]"] + 111["Plane
[4410, 4433, 0]"] + 118["Sweep Extrusion
[4578, 4606, 0]"] 119[Wall] 120[Wall] 121[Wall] @@ -146,10 +146,10 @@ flowchart LR 130["SweepEdge Adjacent"] 131["SweepEdge Opposite"] 132["SweepEdge Adjacent"] - 133["EdgeCut Fillet
[1866, 2125, 0]"] - 134["EdgeCut Fillet
[1866, 2125, 0]"] - 135["EdgeCut Fillet
[1866, 2125, 0]"] - 136["EdgeCut Fillet
[1866, 2125, 0]"] + 133["EdgeCut Fillet
[1842, 2101, 0]"] + 134["EdgeCut Fillet
[1842, 2101, 0]"] + 135["EdgeCut Fillet
[1842, 2101, 0]"] + 136["EdgeCut Fillet
[1842, 2101, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/ast.snap b/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/ast.snap index d5325bcca..ac4e22435 100644 --- a/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/ast.snap @@ -1330,7 +1330,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "key": { "commentStart": 0, "end": 0, - "name": "plane", + "name": "origin", "start": 0, "type": "Identifier" }, @@ -1346,7 +1346,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "key": { "commentStart": 0, "end": 0, - "name": "origin", + "name": "x", "start": 0, "type": "Identifier" }, @@ -1355,134 +1355,14 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "left": { - "commentStart": 0, - "end": 0, - "left": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "length", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "operator": "/", - "right": { - "commentStart": 0, - "end": 0, - "raw": "2", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 2.0, - "suffix": "None" - } - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "operator": "+", - "right": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "thk", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - } - ], + "raw": "0", "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } } }, { @@ -1491,7 +1371,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "key": { "commentStart": 0, "end": 0, - "name": "xAxis", + "name": "y", "start": 0, "type": "Identifier" }, @@ -1500,86 +1380,62 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { + "left": { + "commentStart": 0, + "end": 0, + "left": { + "abs_path": false, "commentStart": 0, "end": 0, - "key": { + "name": { "commentStart": 0, "end": 0, - "name": "x", + "name": "length", "start": 0, "type": "Identifier" }, + "path": [], "start": 0, - "type": "ObjectProperty", + "type": "Name", + "type": "Name" + }, + "operator": "/", + "right": { + "commentStart": 0, + "end": 0, + "raw": "2", + "start": 0, + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } + "value": 2.0, + "suffix": "None" } }, - { + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + }, + "operator": "+", + "right": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, + "name": "thk", "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } + "type": "Identifier" }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - } - ], + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "BinaryExpression", + "type": "BinaryExpression" } }, { @@ -1588,7 +1444,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "key": { "commentStart": 0, "end": 0, - "name": "yAxis", + "name": "z", "start": 0, "type": "Identifier" }, @@ -1597,86 +1453,61 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - } - ], + "raw": "0", "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "xAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } } }, { @@ -1685,7 +1516,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "key": { "commentStart": 0, "end": 0, - "name": "zAxis", + "name": "y", "start": 0, "type": "Identifier" }, @@ -1694,94 +1525,241 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "argument": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - "commentStart": 0, - "end": 0, - "operator": "-", - "start": 0, - "type": "UnaryExpression", - "type": "UnaryExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - } - ], + "raw": "0", "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "yAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "y", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "zAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "y", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "argument": { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + "commentStart": 0, + "end": 0, + "operator": "-", + "start": 0, + "type": "UnaryExpression", + "type": "UnaryExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } } } ], @@ -3744,7 +3722,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "key": { "commentStart": 0, "end": 0, - "name": "plane", + "name": "origin", "start": 0, "type": "Identifier" }, @@ -3760,7 +3738,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "key": { "commentStart": 0, "end": 0, - "name": "origin", + "name": "x", "start": 0, "type": "Identifier" }, @@ -3769,114 +3747,14 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "left": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "depth", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "operator": "+", - "right": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "thk", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - } - } - ], + "raw": "0", "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } } }, { @@ -3885,7 +3763,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "key": { "commentStart": 0, "end": 0, - "name": "xAxis", + "name": "y", "start": 0, "type": "Identifier" }, @@ -3894,86 +3772,14 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - } - ], + "raw": "0", "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } } }, { @@ -3982,7 +3788,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "key": { "commentStart": 0, "end": 0, - "name": "yAxis", + "name": "z", "start": 0, "type": "Identifier" }, @@ -3991,86 +3797,89 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { + "left": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, + "name": "depth", "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } + "type": "Identifier" }, - { + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "operator": "+", + "right": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, + "name": "thk", "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } + "type": "Identifier" }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - } - ], + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "BinaryExpression", + "type": "BinaryExpression" + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "xAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } } }, { @@ -4079,7 +3888,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "key": { "commentStart": 0, "end": 0, - "name": "zAxis", + "name": "y", "start": 0, "type": "Identifier" }, @@ -4088,86 +3897,233 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - } - ], + "raw": "0", "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "yAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "y", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "zAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "y", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } } } ], @@ -7239,7 +7195,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "key": { "commentStart": 0, "end": 0, - "name": "plane", + "name": "origin", "start": 0, "type": "Identifier" }, @@ -7255,7 +7211,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "key": { "commentStart": 0, "end": 0, - "name": "origin", + "name": "x", "start": 0, "type": "Identifier" }, @@ -7264,138 +7220,66 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { + "left": { + "commentStart": 0, + "end": 0, + "left": { + "argument": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "left": { + "name": { "commentStart": 0, "end": 0, - "left": { - "argument": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "width", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "operator": "-", - "start": 0, - "type": "UnaryExpression", - "type": "UnaryExpression" - }, - "operator": "/", - "right": { - "commentStart": 0, - "end": 0, - "raw": "2", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 2.0, - "suffix": "None" - } - }, + "name": "width", "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "operator": "+", - "right": { - "commentStart": 0, - "end": 0, - "raw": "20", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 20.0, - "suffix": "None" - } + "type": "Identifier" }, + "path": [], "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - } - }, - { + "type": "Name", + "type": "Name" + }, "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, + "operator": "-", "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } + "type": "UnaryExpression", + "type": "UnaryExpression" }, - { + "operator": "/", + "right": { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, + "raw": "2", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } + "value": 2.0, + "suffix": "None" } + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + }, + "operator": "+", + "right": { + "commentStart": 0, + "end": 0, + "raw": "20", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 20.0, + "suffix": "None" } - ], + }, "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "BinaryExpression", + "type": "BinaryExpression" } }, { @@ -7404,7 +7288,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "key": { "commentStart": 0, "end": 0, - "name": "xAxis", + "name": "y", "start": 0, "type": "Identifier" }, @@ -7413,86 +7297,14 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - } - ], + "raw": "0", "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } } }, { @@ -7501,7 +7313,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "key": { "commentStart": 0, "end": 0, - "name": "yAxis", + "name": "z", "start": 0, "type": "Identifier" }, @@ -7510,86 +7322,61 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - } - ], + "raw": "0", "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "xAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } } }, { @@ -7598,7 +7385,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "key": { "commentStart": 0, "end": 0, - "name": "zAxis", + "name": "y", "start": 0, "type": "Identifier" }, @@ -7607,86 +7394,233 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - } - ], + "raw": "1", "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "yAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "y", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "zAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "y", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } } } ], diff --git a/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/ops.snap b/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/ops.snap index 3a5370a1e..7729553cf 100644 --- a/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/ops.snap @@ -9,8 +9,8 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl "type": "FunctionCall", "name": "bracketSketch", "functionSourceRange": [ - 1207, - 1731, + 1183, + 1707, 0 ], "unlabeledArg": null, @@ -20,181 +20,181 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { + "origin": { "type": "Object", "value": { - "origin": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 44.0, - "ty": { - "type": "Known", - "type": "Count" - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "xAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 44.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "yAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "xAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "z": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "zAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": -1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "yAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + } + }, + "zAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": -1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" } } } @@ -303,186 +303,181 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { + "origin": { "type": "Object", "value": { - "origin": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 49.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "xAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "yAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "z": { + "type": "Number", + "value": 49.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "xAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "zAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "z": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "yAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + } + }, + "zAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" } } } @@ -563,8 +558,13 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl "type": "Number", "value": 2.5, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -653,8 +653,13 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl "type": "Number", "value": 54.666666666666664, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -691,186 +696,181 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { + "origin": { "type": "Object", "value": { - "origin": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 49.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "xAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "yAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "z": { + "type": "Number", + "value": 49.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "xAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "zAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "z": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "yAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + } + }, + "zAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" } } } @@ -951,8 +951,13 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl "type": "Number", "value": 2.5, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -1041,8 +1046,13 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl "type": "Number", "value": 54.666666666666664, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -1079,181 +1089,181 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { + "origin": { "type": "Object", "value": { - "origin": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": -52.0, - "ty": { - "type": "Known", - "type": "Count" - } + "x": { + "type": "Number", + "value": -52.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "xAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "yAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "xAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "z": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "zAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "yAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + } + }, + "zAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" } } } @@ -1303,181 +1313,181 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { + "origin": { "type": "Object", "value": { - "origin": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": -52.0, - "ty": { - "type": "Known", - "type": "Count" - } + "x": { + "type": "Number", + "value": -52.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "xAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "yAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "xAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "z": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "zAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "yAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + } + }, + "zAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" } } } diff --git a/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/program_memory.snap index 3d598159e..cbed4b558 100644 --- a/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/program_memory.snap @@ -15,9 +15,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1349, - "end": 1355, - "start": 1349, + "commentStart": 1325, + "end": 1331, + "start": 1325, "type": "TagDeclarator", "value": "edge1" }, @@ -28,9 +28,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1406, - "end": 1412, - "start": 1406, + "commentStart": 1382, + "end": 1388, + "start": 1382, "type": "TagDeclarator", "value": "edge2" }, @@ -41,9 +41,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1466, - "end": 1472, - "start": 1466, + "commentStart": 1442, + "end": 1448, + "start": 1442, "type": "TagDeclarator", "value": "edge3" }, @@ -54,9 +54,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1522, - "end": 1528, - "start": 1522, + "commentStart": 1498, + "end": 1504, + "start": 1498, "type": "TagDeclarator", "value": "edge4" }, @@ -67,9 +67,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1574, - "end": 1580, - "start": 1574, + "commentStart": 1550, + "end": 1556, + "start": 1550, "type": "TagDeclarator", "value": "edge5" }, @@ -80,9 +80,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1627, - "end": 1633, - "start": 1627, + "commentStart": 1603, + "end": 1609, + "start": 1603, "type": "TagDeclarator", "value": "edge6" }, @@ -93,9 +93,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1684, - "end": 1690, - "start": 1684, + "commentStart": 1660, + "end": 1666, + "start": 1660, "type": "TagDeclarator", "value": "edge7" }, @@ -106,9 +106,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1711, - "end": 1717, - "start": 1711, + "commentStart": 1687, + "end": 1693, + "start": 1687, "type": "TagDeclarator", "value": "edge8" }, @@ -129,9 +129,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 49.0 ], "tag": { - "commentStart": 1349, - "end": 1355, - "start": 1349, + "commentStart": 1325, + "end": 1331, + "start": 1325, "type": "TagDeclarator", "value": "edge1" }, @@ -154,9 +154,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra -4.0 ], "tag": { - "commentStart": 1406, - "end": 1412, - "start": 1406, + "commentStart": 1382, + "end": 1388, + "start": 1382, "type": "TagDeclarator", "value": "edge2" }, @@ -179,9 +179,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra -4.0 ], "tag": { - "commentStart": 1466, - "end": 1472, - "start": 1466, + "commentStart": 1442, + "end": 1448, + "start": 1442, "type": "TagDeclarator", "value": "edge3" }, @@ -204,9 +204,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 49.0 ], "tag": { - "commentStart": 1522, - "end": 1528, - "start": 1522, + "commentStart": 1498, + "end": 1504, + "start": 1498, "type": "TagDeclarator", "value": "edge4" }, @@ -229,9 +229,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 49.0 ], "tag": { - "commentStart": 1574, - "end": 1580, - "start": 1574, + "commentStart": 1550, + "end": 1556, + "start": 1550, "type": "TagDeclarator", "value": "edge5" }, @@ -254,9 +254,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 0.0 ], "tag": { - "commentStart": 1627, - "end": 1633, - "start": 1627, + "commentStart": 1603, + "end": 1609, + "start": 1603, "type": "TagDeclarator", "value": "edge6" }, @@ -279,9 +279,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 0.0 ], "tag": { - "commentStart": 1684, - "end": 1690, - "start": 1684, + "commentStart": 1660, + "end": 1666, + "start": 1660, "type": "TagDeclarator", "value": "edge7" }, @@ -304,9 +304,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 49.0 ], "tag": { - "commentStart": 1711, - "end": 1717, - "start": 1711, + "commentStart": 1687, + "end": 1693, + "start": 1687, "type": "TagDeclarator", "value": "edge8" }, @@ -328,22 +328,34 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "origin": { "x": 0.0, "y": 44.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -414,28 +426,72 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra { "type": "fillet", "id": "[uuid]", - "radius": 6.0, + "radius": { + "n": 6.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 6.0, + "radius": { + "n": 6.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 6.0, + "radius": { + "n": 6.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 6.0, + "radius": { + "n": 6.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -448,177 +504,177 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "bracketPlane": { "type": "Object", "value": { - "plane": { + "origin": { "type": "Object", "value": { - "origin": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 44.0, - "ty": { - "type": "Known", - "type": "Count" - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "xAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 44.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "yAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "xAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "z": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "zAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": -1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "yAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + } + }, + "zAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": -1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" } } } @@ -645,9 +701,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 49.0 ], "tag": { - "commentStart": 1349, - "end": 1355, - "start": 1349, + "commentStart": 1325, + "end": 1331, + "start": 1325, "type": "TagDeclarator", "value": "edge1" }, @@ -670,9 +726,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra -4.0 ], "tag": { - "commentStart": 1406, - "end": 1412, - "start": 1406, + "commentStart": 1382, + "end": 1388, + "start": 1382, "type": "TagDeclarator", "value": "edge2" }, @@ -695,9 +751,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra -4.0 ], "tag": { - "commentStart": 1466, - "end": 1472, - "start": 1466, + "commentStart": 1442, + "end": 1448, + "start": 1442, "type": "TagDeclarator", "value": "edge3" }, @@ -720,9 +776,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 49.0 ], "tag": { - "commentStart": 1522, - "end": 1528, - "start": 1522, + "commentStart": 1498, + "end": 1504, + "start": 1498, "type": "TagDeclarator", "value": "edge4" }, @@ -745,9 +801,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 49.0 ], "tag": { - "commentStart": 1574, - "end": 1580, - "start": 1574, + "commentStart": 1550, + "end": 1556, + "start": 1550, "type": "TagDeclarator", "value": "edge5" }, @@ -770,9 +826,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 0.0 ], "tag": { - "commentStart": 1627, - "end": 1633, - "start": 1627, + "commentStart": 1603, + "end": 1609, + "start": 1603, "type": "TagDeclarator", "value": "edge6" }, @@ -795,9 +851,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 0.0 ], "tag": { - "commentStart": 1684, - "end": 1690, - "start": 1684, + "commentStart": 1660, + "end": 1666, + "start": 1660, "type": "TagDeclarator", "value": "edge7" }, @@ -820,9 +876,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 49.0 ], "tag": { - "commentStart": 1711, - "end": 1717, - "start": 1711, + "commentStart": 1687, + "end": 1693, + "start": 1687, "type": "TagDeclarator", "value": "edge8" }, @@ -844,22 +900,34 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "origin": { "x": 0.0, "y": 44.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1184,22 +1252,34 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "origin": { "x": -52.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1336,22 +1416,34 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "origin": { "x": -52.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1392,177 +1484,177 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "retPlane": { "type": "Object", "value": { - "plane": { + "origin": { "type": "Object", "value": { - "origin": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": -52.0, - "ty": { - "type": "Known", - "type": "Count" - } + "x": { + "type": "Number", + "value": -52.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "xAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "yAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "xAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "z": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "zAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "yAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + } + }, + "zAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" } } } @@ -1586,182 +1678,177 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "tabPlane": { "type": "Object", "value": { - "plane": { + "origin": { "type": "Object", "value": { - "origin": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 49.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "xAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "yAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "z": { + "type": "Number", + "value": 49.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "xAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "zAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - "z": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "yAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + } + }, + "zAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" } } } @@ -1810,9 +1897,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 3354, - "end": 3361, - "start": 3354, + "commentStart": 3306, + "end": 3313, + "start": 3306, "type": "TagDeclarator", "value": "edge21" }, @@ -1823,9 +1910,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 3410, - "end": 3417, - "start": 3410, + "commentStart": 3362, + "end": 3369, + "start": 3362, "type": "TagDeclarator", "value": "edge22" }, @@ -1836,9 +1923,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 3469, - "end": 3476, - "start": 3469, + "commentStart": 3421, + "end": 3428, + "start": 3421, "type": "TagDeclarator", "value": "edge23" }, @@ -1849,9 +1936,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 3495, - "end": 3502, - "start": 3495, + "commentStart": 3447, + "end": 3454, + "start": 3447, "type": "TagDeclarator", "value": "edge24" }, @@ -1872,9 +1959,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 44.0 ], "tag": { - "commentStart": 3354, - "end": 3361, - "start": 3354, + "commentStart": 3306, + "end": 3313, + "start": 3306, "type": "TagDeclarator", "value": "edge21" }, @@ -1897,9 +1984,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 35.6667 ], "tag": { - "commentStart": 3410, - "end": 3417, - "start": 3410, + "commentStart": 3362, + "end": 3369, + "start": 3362, "type": "TagDeclarator", "value": "edge22" }, @@ -1922,9 +2009,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 19.0 ], "tag": { - "commentStart": 3469, - "end": 3476, - "start": 3469, + "commentStart": 3421, + "end": 3428, + "start": 3421, "type": "TagDeclarator", "value": "edge23" }, @@ -1947,9 +2034,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 10.6667 ], "tag": { - "commentStart": 3495, - "end": 3502, - "start": 3495, + "commentStart": 3447, + "end": 3454, + "start": 3447, "type": "TagDeclarator", "value": "edge24" }, @@ -1971,22 +2058,34 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "origin": { "x": 0.0, "y": 0.0, - "z": 49.0 + "z": 49.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2041,14 +2140,36 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra { "type": "fillet", "id": "[uuid]", - "radius": 2.5, + "radius": { + "n": 2.5, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 2.5, + "radius": { + "n": 2.5, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -2070,9 +2191,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 3354, - "end": 3361, - "start": 3354, + "commentStart": 3306, + "end": 3313, + "start": 3306, "type": "TagDeclarator", "value": "edge21" }, @@ -2083,9 +2204,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 3410, - "end": 3417, - "start": 3410, + "commentStart": 3362, + "end": 3369, + "start": 3362, "type": "TagDeclarator", "value": "edge22" }, @@ -2096,9 +2217,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 3469, - "end": 3476, - "start": 3469, + "commentStart": 3421, + "end": 3428, + "start": 3421, "type": "TagDeclarator", "value": "edge23" }, @@ -2109,9 +2230,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 3495, - "end": 3502, - "start": 3495, + "commentStart": 3447, + "end": 3454, + "start": 3447, "type": "TagDeclarator", "value": "edge24" }, @@ -2132,9 +2253,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 44.0 ], "tag": { - "commentStart": 3354, - "end": 3361, - "start": 3354, + "commentStart": 3306, + "end": 3313, + "start": 3306, "type": "TagDeclarator", "value": "edge21" }, @@ -2157,9 +2278,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 35.6667 ], "tag": { - "commentStart": 3410, - "end": 3417, - "start": 3410, + "commentStart": 3362, + "end": 3369, + "start": 3362, "type": "TagDeclarator", "value": "edge22" }, @@ -2182,9 +2303,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 19.0 ], "tag": { - "commentStart": 3469, - "end": 3476, - "start": 3469, + "commentStart": 3421, + "end": 3428, + "start": 3421, "type": "TagDeclarator", "value": "edge23" }, @@ -2207,9 +2328,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 10.6667 ], "tag": { - "commentStart": 3495, - "end": 3502, - "start": 3495, + "commentStart": 3447, + "end": 3454, + "start": 3447, "type": "TagDeclarator", "value": "edge24" }, @@ -2231,22 +2352,34 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "origin": { "x": 0.0, "y": 0.0, - "z": 49.0 + "z": 49.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2301,14 +2434,36 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra { "type": "fillet", "id": "[uuid]", - "radius": 2.5, + "radius": { + "n": 2.5, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 2.5, + "radius": { + "n": 2.5, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -2335,9 +2490,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2538, - "end": 2545, - "start": 2538, + "commentStart": 2490, + "end": 2497, + "start": 2490, "type": "TagDeclarator", "value": "edge11" }, @@ -2348,9 +2503,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2594, - "end": 2601, - "start": 2594, + "commentStart": 2546, + "end": 2553, + "start": 2546, "type": "TagDeclarator", "value": "edge12" }, @@ -2361,9 +2516,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2654, - "end": 2661, - "start": 2654, + "commentStart": 2606, + "end": 2613, + "start": 2606, "type": "TagDeclarator", "value": "edge13" }, @@ -2374,9 +2529,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2680, - "end": 2687, - "start": 2680, + "commentStart": 2632, + "end": 2639, + "start": 2632, "type": "TagDeclarator", "value": "edge14" }, @@ -2397,9 +2552,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 44.0 ], "tag": { - "commentStart": 2538, - "end": 2545, - "start": 2538, + "commentStart": 2490, + "end": 2497, + "start": 2490, "type": "TagDeclarator", "value": "edge11" }, @@ -2422,9 +2577,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 35.6667 ], "tag": { - "commentStart": 2594, - "end": 2601, - "start": 2594, + "commentStart": 2546, + "end": 2553, + "start": 2546, "type": "TagDeclarator", "value": "edge12" }, @@ -2447,9 +2602,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 19.0 ], "tag": { - "commentStart": 2654, - "end": 2661, - "start": 2654, + "commentStart": 2606, + "end": 2613, + "start": 2606, "type": "TagDeclarator", "value": "edge13" }, @@ -2472,9 +2627,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 10.6667 ], "tag": { - "commentStart": 2680, - "end": 2687, - "start": 2680, + "commentStart": 2632, + "end": 2639, + "start": 2632, "type": "TagDeclarator", "value": "edge14" }, @@ -2496,22 +2651,34 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "origin": { "x": 0.0, "y": 0.0, - "z": 49.0 + "z": 49.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2566,14 +2733,36 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra { "type": "fillet", "id": "[uuid]", - "radius": 2.5, + "radius": { + "n": 2.5, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 2.5, + "radius": { + "n": 2.5, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -2595,9 +2784,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2538, - "end": 2545, - "start": 2538, + "commentStart": 2490, + "end": 2497, + "start": 2490, "type": "TagDeclarator", "value": "edge11" }, @@ -2608,9 +2797,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2594, - "end": 2601, - "start": 2594, + "commentStart": 2546, + "end": 2553, + "start": 2546, "type": "TagDeclarator", "value": "edge12" }, @@ -2621,9 +2810,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2654, - "end": 2661, - "start": 2654, + "commentStart": 2606, + "end": 2613, + "start": 2606, "type": "TagDeclarator", "value": "edge13" }, @@ -2634,9 +2823,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2680, - "end": 2687, - "start": 2680, + "commentStart": 2632, + "end": 2639, + "start": 2632, "type": "TagDeclarator", "value": "edge14" }, @@ -2657,9 +2846,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 44.0 ], "tag": { - "commentStart": 2538, - "end": 2545, - "start": 2538, + "commentStart": 2490, + "end": 2497, + "start": 2490, "type": "TagDeclarator", "value": "edge11" }, @@ -2682,9 +2871,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 35.6667 ], "tag": { - "commentStart": 2594, - "end": 2601, - "start": 2594, + "commentStart": 2546, + "end": 2553, + "start": 2546, "type": "TagDeclarator", "value": "edge12" }, @@ -2707,9 +2896,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 19.0 ], "tag": { - "commentStart": 2654, - "end": 2661, - "start": 2654, + "commentStart": 2606, + "end": 2613, + "start": 2606, "type": "TagDeclarator", "value": "edge13" }, @@ -2732,9 +2921,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra 10.6667 ], "tag": { - "commentStart": 2680, - "end": 2687, - "start": 2680, + "commentStart": 2632, + "end": 2639, + "start": 2632, "type": "TagDeclarator", "value": "edge14" }, @@ -2756,22 +2945,34 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra "origin": { "x": 0.0, "y": 0.0, - "z": 49.0 + "z": 49.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2826,14 +3027,36 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra { "type": "fillet", "id": "[uuid]", - "radius": 2.5, + "radius": { + "n": 2.5, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 2.5, + "radius": { + "n": 2.5, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } diff --git a/rust/kcl-lib/tests/kcl_samples/food-service-spatula/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/food-service-spatula/artifact_graph_flowchart.snap.md index d01f798c0..f14c7d9e7 100644 --- a/rust/kcl-lib/tests/kcl_samples/food-service-spatula/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/food-service-spatula/artifact_graph_flowchart.snap.md @@ -48,16 +48,16 @@ flowchart LR 57[Solid2d] end subgraph path83 [Path] - 83["Path
[3707, 3754, 0]"] - 84["Segment
[3760, 3810, 0]"] - 85["Segment
[3816, 3915, 0]"] - 86["Segment
[3921, 3972, 0]"] - 87["Segment
[3978, 4076, 0]"] - 88["Segment
[4082, 4135, 0]"] - 89["Segment
[4141, 4241, 0]"] - 90["Segment
[4247, 4321, 0]"] - 91["Segment
[4327, 4428, 0]"] - 92["Segment
[4434, 4441, 0]"] + 83["Path
[3683, 3730, 0]"] + 84["Segment
[3736, 3786, 0]"] + 85["Segment
[3792, 3891, 0]"] + 86["Segment
[3897, 3948, 0]"] + 87["Segment
[3954, 4052, 0]"] + 88["Segment
[4058, 4111, 0]"] + 89["Segment
[4117, 4217, 0]"] + 90["Segment
[4223, 4297, 0]"] + 91["Segment
[4303, 4404, 0]"] + 92["Segment
[4410, 4417, 0]"] 93[Solid2d] end subgraph path121 [Path] @@ -113,8 +113,8 @@ flowchart LR 79["SweepEdge Adjacent"] 80["SweepEdge Opposite"] 81["SweepEdge Adjacent"] - 82["Plane
[3633, 3659, 0]"] - 94["Sweep Extrusion
[4497, 4539, 0]"] + 82["Plane
[3609, 3635, 0]"] + 94["Sweep Extrusion
[4473, 4515, 0]"] 95[Wall] 96[Wall] 97[Wall] @@ -141,7 +141,7 @@ flowchart LR 118["SweepEdge Adjacent"] 119["SweepEdge Opposite"] 120["SweepEdge Adjacent"] - 128["Sweep Extrusion
[4767, 4817, 0]"] + 128["Sweep Extrusion
[4750, 4800, 0]"] 129[Wall] 130[Wall] 131[Wall] @@ -159,7 +159,7 @@ flowchart LR 143["EdgeCut Fillet
[3209, 3340, 0]"] 144["EdgeCut Fillet
[3209, 3340, 0]"] 145["StartSketchOnPlane
[2623, 2680, 0]"] - 146["StartSketchOnFace
[4598, 4630, 0]"] + 146["StartSketchOnFace
[4574, 4613, 0]"] 1 --- 2 1 --- 9 1 --- 16 diff --git a/rust/kcl-lib/tests/kcl_samples/food-service-spatula/ast.snap b/rust/kcl-lib/tests/kcl_samples/food-service-spatula/ast.snap index c91646deb..6a2679aa5 100644 --- a/rust/kcl-lib/tests/kcl_samples/food-service-spatula/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/food-service-spatula/ast.snap @@ -4900,7 +4900,7 @@ description: Result of parsing food-service-spatula.kcl "key": { "commentStart": 0, "end": 0, - "name": "plane", + "name": "origin", "start": 0, "type": "Identifier" }, @@ -4908,268 +4908,246 @@ description: Result of parsing food-service-spatula.kcl "type": "ObjectProperty", "value": { "commentStart": 0, - "end": 0, - "properties": [ + "elements": [ { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "origin", - "start": 0, - "type": "Identifier" - }, + "raw": "208.593833", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "208.593833", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 208.593833, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "75.921946", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 75.921946, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 208.593833, + "suffix": "None" } }, { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "xAxis", - "start": 0, - "type": "Identifier" - }, + "raw": "0.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.342020", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.34202, - "suffix": "None" - } - }, - { - "argument": { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - "commentStart": 0, - "end": 0, - "operator": "-", - "start": 0, - "type": "UnaryExpression", - "type": "UnaryExpression" - }, - { - "argument": { - "commentStart": 0, - "end": 0, - "raw": "0.939693", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.939693, - "suffix": "None" - } - }, - "commentStart": 0, - "end": 0, - "operator": "-", - "start": 0, - "type": "UnaryExpression", - "type": "UnaryExpression" - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.0, + "suffix": "None" } }, { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "yAxis", - "start": 0, - "type": "Identifier" - }, + "raw": "75.921946", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "zAxis", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.939693", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.939693, - "suffix": "None" - } - }, - { - "argument": { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - "commentStart": 0, - "end": 0, - "operator": "-", - "start": 0, - "type": "UnaryExpression", - "type": "UnaryExpression" - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.342020", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.34202, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 75.921946, + "suffix": "None" } } ], + "end": 0, "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "xAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0.342020", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.34202, + "suffix": "None" + } + }, + { + "argument": { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + "commentStart": 0, + "end": 0, + "operator": "-", + "start": 0, + "type": "UnaryExpression", + "type": "UnaryExpression" + }, + { + "argument": { + "commentStart": 0, + "end": 0, + "raw": "0.939693", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.939693, + "suffix": "None" + } + }, + "commentStart": 0, + "end": 0, + "operator": "-", + "start": 0, + "type": "UnaryExpression", + "type": "UnaryExpression" + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "yAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "zAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0.939693", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.939693, + "suffix": "None" + } + }, + { + "argument": { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + "commentStart": 0, + "end": 0, + "operator": "-", + "start": 0, + "type": "UnaryExpression", + "type": "UnaryExpression" + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.342020", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.34202, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" } } ], @@ -6430,36 +6408,30 @@ description: Result of parsing food-service-spatula.kcl "init": { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "grip", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "gripEdgeTop", + "name": { + "commentStart": 0, + "end": 0, + "name": "gripEdgeTop", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -6480,8 +6452,24 @@ description: Result of parsing food-service-spatula.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "grip", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, "start": 0, "type": "VariableDeclarator" diff --git a/rust/kcl-lib/tests/kcl_samples/food-service-spatula/ops.snap b/rust/kcl-lib/tests/kcl_samples/food-service-spatula/ops.snap index a4b6bcd6f..09b8f097b 100644 --- a/rust/kcl-lib/tests/kcl_samples/food-service-spatula/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/food-service-spatula/ops.snap @@ -5,7 +5,7 @@ description: Operations executed food-service-spatula.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -345,8 +345,13 @@ description: Operations executed food-service-spatula.kcl "type": "Number", "value": -7.5, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -365,7 +370,7 @@ description: Operations executed food-service-spatula.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -460,190 +465,185 @@ description: Operations executed food-service-spatula.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 208.593833, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 208.593833, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 75.921946, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.34202, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": -0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": -0.939693, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 75.921946, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.939693, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": -0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.34202, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.34202, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": -0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": -0.939693, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.939693, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": -0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.34202, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -689,16 +689,7 @@ description: Operations executed food-service-spatula.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "gripEdgeTop", @@ -710,7 +701,15 @@ description: Operations executed food-service-spatula.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "GroupBegin", diff --git a/rust/kcl-lib/tests/kcl_samples/food-service-spatula/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/food-service-spatula/program_memory.snap index e4a2fef02..af9d9f84b 100644 --- a/rust/kcl-lib/tests/kcl_samples/food-service-spatula/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/food-service-spatula/program_memory.snap @@ -177,22 +177,34 @@ description: Variables in memory after executing food-service-spatula.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -384,22 +396,34 @@ description: Variables in memory after executing food-service-spatula.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -445,22 +469,34 @@ description: Variables in memory after executing food-service-spatula.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -547,9 +583,9 @@ description: Variables in memory after executing food-service-spatula.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 4308, - "end": 4320, - "start": 4308, + "commentStart": 4284, + "end": 4296, + "start": 4284, "type": "TagDeclarator", "value": "gripEdgeTop" }, @@ -709,9 +745,9 @@ description: Variables in memory after executing food-service-spatula.kcl 7.0 ], "tag": { - "commentStart": 4308, - "end": 4320, - "start": 4308, + "commentStart": 4284, + "end": 4296, + "start": 4284, "type": "TagDeclarator", "value": "gripEdgeTop" }, @@ -777,22 +813,34 @@ description: Variables in memory after executing food-service-spatula.kcl "origin": { "x": 208.593833, "y": 0.0, - "z": 75.921946 + "z": 75.921946, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.34202, "y": -0.0, - "z": -0.939693 + "z": -0.939693, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.939693, "y": -0.0, - "z": 0.34202 + "z": 0.34202, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -987,17 +1035,26 @@ description: Variables in memory after executing food-service-spatula.kcl "xAxis": { "x": 0.34202, "y": -0.0, - "z": -0.939693 + "z": -0.939693, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.939693, "y": -0.0, - "z": 0.34202 + "z": 0.34202, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1051,9 +1108,9 @@ description: Variables in memory after executing food-service-spatula.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 4308, - "end": 4320, - "start": 4308, + "commentStart": 4284, + "end": 4296, + "start": 4284, "type": "TagDeclarator", "value": "gripEdgeTop" }, @@ -1213,9 +1270,9 @@ description: Variables in memory after executing food-service-spatula.kcl 7.0 ], "tag": { - "commentStart": 4308, - "end": 4320, - "start": 4308, + "commentStart": 4284, + "end": 4296, + "start": 4284, "type": "TagDeclarator", "value": "gripEdgeTop" }, @@ -1281,22 +1338,34 @@ description: Variables in memory after executing food-service-spatula.kcl "origin": { "x": 208.593833, "y": 0.0, - "z": 75.921946 + "z": 75.921946, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.34202, "y": -0.0, - "z": -0.939693 + "z": -0.939693, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.939693, "y": -0.0, - "z": 0.34202 + "z": 0.34202, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1529,9 +1598,9 @@ description: Variables in memory after executing food-service-spatula.kcl 7.0 ], "tag": { - "commentStart": 4308, - "end": 4320, - "start": 4308, + "commentStart": 4284, + "end": 4296, + "start": 4284, "type": "TagDeclarator", "value": "gripEdgeTop" }, @@ -1597,22 +1666,34 @@ description: Variables in memory after executing food-service-spatula.kcl "origin": { "x": 208.593833, "y": 0.0, - "z": 75.921946 + "z": 75.921946, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.34202, "y": -0.0, - "z": -0.939693 + "z": -0.939693, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.939693, "y": -0.0, - "z": 0.34202 + "z": 0.34202, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1658,22 +1739,34 @@ description: Variables in memory after executing food-service-spatula.kcl "origin": { "x": 208.593833, "y": 0.0, - "z": 75.921946 + "z": 75.921946, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.34202, "y": -0.0, - "z": -0.939693 + "z": -0.939693, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.939693, "y": -0.0, - "z": 0.34202 + "z": 0.34202, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1933,22 +2026,34 @@ description: Variables in memory after executing food-service-spatula.kcl "origin": { "x": 0.0, "y": 7.5, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2004,186 +2109,181 @@ description: Variables in memory after executing food-service-spatula.kcl "handlePlane": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 208.5938, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 208.5938, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 75.9219, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.342, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": -0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": -0.9397, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 75.9219, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.9397, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": -0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.342, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.342, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": -0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": -0.9397, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.9397, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": -0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.342, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -2347,22 +2447,34 @@ description: Variables in memory after executing food-service-spatula.kcl "origin": { "x": 0.0, "y": 7.5, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2412,22 +2524,34 @@ description: Variables in memory after executing food-service-spatula.kcl "origin": { "x": 0.0, "y": 7.5, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2461,17 +2585,26 @@ description: Variables in memory after executing food-service-spatula.kcl "xAxis": { "x": 0.34202, "y": -0.0, - "z": -0.939693 + "z": -0.939693, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.939693, "y": -0.0, - "z": 0.34202 + "z": 0.34202, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2525,9 +2658,9 @@ description: Variables in memory after executing food-service-spatula.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 4308, - "end": 4320, - "start": 4308, + "commentStart": 4284, + "end": 4296, + "start": 4284, "type": "TagDeclarator", "value": "gripEdgeTop" }, @@ -2687,9 +2820,9 @@ description: Variables in memory after executing food-service-spatula.kcl 7.0 ], "tag": { - "commentStart": 4308, - "end": 4320, - "start": 4308, + "commentStart": 4284, + "end": 4296, + "start": 4284, "type": "TagDeclarator", "value": "gripEdgeTop" }, @@ -2755,22 +2888,34 @@ description: Variables in memory after executing food-service-spatula.kcl "origin": { "x": 208.593833, "y": 0.0, - "z": 75.921946 + "z": 75.921946, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.34202, "y": -0.0, - "z": -0.939693 + "z": -0.939693, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.939693, "y": -0.0, - "z": 0.34202 + "z": 0.34202, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2941,22 +3086,34 @@ description: Variables in memory after executing food-service-spatula.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3107,22 +3264,34 @@ description: Variables in memory after executing food-service-spatula.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3273,22 +3442,34 @@ description: Variables in memory after executing food-service-spatula.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3441,22 +3622,34 @@ description: Variables in memory after executing food-service-spatula.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/kcl_samples/french-press/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/french-press/artifact_graph_flowchart.snap.md index 0cab3dd46..5f4c06cae 100644 --- a/rust/kcl-lib/tests/kcl_samples/french-press/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/french-press/artifact_graph_flowchart.snap.md @@ -10,114 +10,114 @@ flowchart LR 8[Solid2d] end subgraph path18 [Path] - 18["Path
[995, 1039, 0]"] - 19["Segment
[1045, 1064, 0]"] - 20["Segment
[1070, 1104, 0]"] - 21["Segment
[1110, 1194, 0]"] - 22["Segment
[1200, 1251, 0]"] - 23["Segment
[1257, 1341, 0]"] - 24["Segment
[1347, 1405, 0]"] - 25["Segment
[1411, 1493, 0]"] - 26["Segment
[1499, 1539, 0]"] - 27["Segment
[1545, 1564, 0]"] - 28["Segment
[1570, 1623, 0]"] - 29["Segment
[1629, 1711, 0]"] - 30["Segment
[1717, 1787, 0]"] - 31["Segment
[1793, 1877, 0]"] - 32["Segment
[1883, 1953, 0]"] - 33["Segment
[1959, 2043, 0]"] - 34["Segment
[2049, 2105, 0]"] - 35["Segment
[2111, 2118, 0]"] + 18["Path
[971, 1015, 0]"] + 19["Segment
[1021, 1040, 0]"] + 20["Segment
[1046, 1080, 0]"] + 21["Segment
[1086, 1170, 0]"] + 22["Segment
[1176, 1227, 0]"] + 23["Segment
[1233, 1317, 0]"] + 24["Segment
[1323, 1381, 0]"] + 25["Segment
[1387, 1469, 0]"] + 26["Segment
[1475, 1515, 0]"] + 27["Segment
[1521, 1540, 0]"] + 28["Segment
[1546, 1599, 0]"] + 29["Segment
[1605, 1687, 0]"] + 30["Segment
[1693, 1763, 0]"] + 31["Segment
[1769, 1853, 0]"] + 32["Segment
[1859, 1929, 0]"] + 33["Segment
[1935, 2019, 0]"] + 34["Segment
[2025, 2081, 0]"] + 35["Segment
[2087, 2094, 0]"] 36[Solid2d] end subgraph path89 [Path] - 89["Path
[2385, 2444, 0]"] - 90["Segment
[2385, 2444, 0]"] + 89["Path
[2361, 2420, 0]"] + 90["Segment
[2361, 2420, 0]"] 91[Solid2d] end subgraph path98 [Path] - 98["Path
[2545, 2575, 0]"] - 99["Segment
[2581, 2600, 0]"] - 100["Segment
[2606, 2689, 0]"] - 101["Segment
[2695, 2751, 0]"] - 102["Segment
[2757, 2764, 0]"] + 98["Path
[2528, 2558, 0]"] + 99["Segment
[2564, 2583, 0]"] + 100["Segment
[2589, 2672, 0]"] + 101["Segment
[2678, 2734, 0]"] + 102["Segment
[2740, 2747, 0]"] 103[Solid2d] end subgraph path117 [Path] - 117["Path
[3002, 3033, 0]"] - 118["Segment
[3039, 3084, 0]"] - 119["Segment
[3090, 3167, 0]"] - 120["Segment
[3173, 3212, 0]"] - 121["Segment
[3218, 3264, 0]"] - 122["Segment
[3270, 3295, 0]"] - 123["Segment
[3301, 3357, 0]"] - 124["Segment
[3363, 3370, 0]"] + 117["Path
[2985, 3016, 0]"] + 118["Segment
[3022, 3067, 0]"] + 119["Segment
[3073, 3150, 0]"] + 120["Segment
[3156, 3195, 0]"] + 121["Segment
[3201, 3247, 0]"] + 122["Segment
[3253, 3278, 0]"] + 123["Segment
[3284, 3340, 0]"] + 124["Segment
[3346, 3353, 0]"] 125[Solid2d] end subgraph path140 [Path] - 140["Path
[3450, 3477, 0]"] - 141["Segment
[3483, 3503, 0]"] - 142["Segment
[3509, 3552, 0]"] - 143["Segment
[3558, 3576, 0]"] - 144["Segment
[3582, 3602, 0]"] - 145["Segment
[3608, 3628, 0]"] - 146["Segment
[3634, 3682, 0]"] - 147["Segment
[3688, 3744, 0]"] - 148["Segment
[3750, 3757, 0]"] + 140["Path
[3433, 3460, 0]"] + 141["Segment
[3466, 3486, 0]"] + 142["Segment
[3492, 3535, 0]"] + 143["Segment
[3541, 3559, 0]"] + 144["Segment
[3565, 3585, 0]"] + 145["Segment
[3591, 3611, 0]"] + 146["Segment
[3617, 3665, 0]"] + 147["Segment
[3671, 3727, 0]"] + 148["Segment
[3733, 3740, 0]"] 149[Solid2d] end subgraph path166 [Path] - 166["Path
[3861, 3920, 0]"] - 167["Segment
[3861, 3920, 0]"] + 166["Path
[3844, 3903, 0]"] + 167["Segment
[3844, 3903, 0]"] 168[Solid2d] end subgraph path169 [Path] - 169["Path
[3931, 3968, 0]"] - 170["Segment
[3931, 3968, 0]"] + 169["Path
[3914, 3951, 0]"] + 170["Segment
[3914, 3951, 0]"] 171[Solid2d] end subgraph path178 [Path] - 178["Path
[4110, 4148, 0]"] - 179["Segment
[4110, 4148, 0]"] + 178["Path
[4100, 4138, 0]"] + 179["Segment
[4100, 4138, 0]"] 180[Solid2d] end subgraph path192 [Path] - 192["Path
[4421, 4459, 0]"] - 193["Segment
[4421, 4459, 0]"] + 192["Path
[4418, 4456, 0]"] + 193["Segment
[4418, 4456, 0]"] 194[Solid2d] end subgraph path203 [Path] - 203["Path
[4711, 4763, 0]"] - 204["Segment
[4711, 4763, 0]"] + 203["Path
[4708, 4760, 0]"] + 204["Segment
[4708, 4760, 0]"] 205[Solid2d] end subgraph path213 [Path] - 213["Path
[5010, 5054, 0]"] - 214["Segment
[5060, 5100, 0]"] - 215["Segment
[5106, 5125, 0]"] - 216["Segment
[5131, 5150, 0]"] - 217["Segment
[5156, 5175, 0]"] - 218["Segment
[5181, 5206, 0]"] - 219["Segment
[5212, 5352, 0]"] - 220["Segment
[5358, 5414, 0]"] - 221["Segment
[5420, 5427, 0]"] + 213["Path
[5007, 5051, 0]"] + 214["Segment
[5057, 5097, 0]"] + 215["Segment
[5103, 5122, 0]"] + 216["Segment
[5128, 5147, 0]"] + 217["Segment
[5153, 5172, 0]"] + 218["Segment
[5178, 5203, 0]"] + 219["Segment
[5209, 5349, 0]"] + 220["Segment
[5355, 5411, 0]"] + 221["Segment
[5417, 5424, 0]"] 222[Solid2d] end subgraph path239 [Path] - 239["Path
[5557, 5586, 0]"] - 240["Segment
[5592, 5613, 0]"] - 241["Segment
[5619, 5650, 0]"] - 242["Segment
[5656, 5687, 0]"] - 243["Segment
[5693, 5725, 0]"] - 244["Segment
[5731, 5753, 0]"] - 245["Segment
[5759, 5780, 0]"] - 246["Segment
[5786, 5811, 0]"] - 247["Segment
[5817, 5848, 0]"] - 248["Segment
[5854, 5886, 0]"] - 249["Segment
[5892, 5924, 0]"] - 250["Segment
[5930, 5951, 0]"] - 251["Segment
[5957, 6013, 0]"] - 252["Segment
[6019, 6026, 0]"] + 239["Path
[5554, 5583, 0]"] + 240["Segment
[5589, 5610, 0]"] + 241["Segment
[5616, 5647, 0]"] + 242["Segment
[5653, 5684, 0]"] + 243["Segment
[5690, 5722, 0]"] + 244["Segment
[5728, 5750, 0]"] + 245["Segment
[5756, 5777, 0]"] + 246["Segment
[5783, 5808, 0]"] + 247["Segment
[5814, 5845, 0]"] + 248["Segment
[5851, 5883, 0]"] + 249["Segment
[5889, 5921, 0]"] + 250["Segment
[5927, 5948, 0]"] + 251["Segment
[5954, 6010, 0]"] + 252["Segment
[6016, 6023, 0]"] 253[Solid2d] end 1["Plane
[242, 259, 0]"] @@ -129,8 +129,8 @@ flowchart LR 14["SweepEdge Adjacent"] 15["SweepEdge Adjacent"] 16["SweepEdge Adjacent"] - 17["Plane
[966, 989, 0]"] - 37["Sweep Extrusion
[2124, 2146, 0]"] + 17["Plane
[942, 965, 0]"] + 37["Sweep Extrusion
[2100, 2122, 0]"] 38[Wall] 39[Wall] 40[Wall] @@ -181,14 +181,14 @@ flowchart LR 85["SweepEdge Adjacent"] 86["SweepEdge Opposite"] 87["SweepEdge Adjacent"] - 88["Plane
[2351, 2378, 0]"] - 92["Sweep Extrusion
[2459, 2493, 0]"] + 88["Plane
[2327, 2354, 0]"] + 92["Sweep Extrusion
[2435, 2469, 0]"] 93[Wall] 94["Cap Start"] 95["Cap End"] 96["SweepEdge Opposite"] 97["SweepEdge Adjacent"] - 104["Sweep Extrusion
[2913, 2948, 0]"] + 104["Sweep Extrusion
[2896, 2931, 0]"] 105[Wall] 106[Wall] 107[Wall] @@ -198,10 +198,10 @@ flowchart LR 111["SweepEdge Adjacent"] 112["SweepEdge Opposite"] 113["SweepEdge Adjacent"] - 114["Sweep Extrusion
[2913, 2948, 0]"] - 115["Sweep Extrusion
[2913, 2948, 0]"] - 116["Plane
[2979, 2996, 0]"] - 126["Sweep Revolve
[3376, 3393, 0]"] + 114["Sweep Extrusion
[2896, 2931, 0]"] + 115["Sweep Extrusion
[2896, 2931, 0]"] + 116["Plane
[2962, 2979, 0]"] + 126["Sweep Revolve
[3359, 3376, 0]"] 127[Wall] 128[Wall] 129[Wall] @@ -214,8 +214,8 @@ flowchart LR 136["SweepEdge Adjacent"] 137["SweepEdge Adjacent"] 138["SweepEdge Adjacent"] - 139["Plane
[3427, 3444, 0]"] - 150["Sweep Revolve
[3763, 3780, 0]"] + 139["Plane
[3410, 3427, 0]"] + 150["Sweep Revolve
[3746, 3763, 0]"] 151[Wall] 152[Wall] 153[Wall] @@ -230,40 +230,40 @@ flowchart LR 162["SweepEdge Adjacent"] 163["SweepEdge Adjacent"] 164["SweepEdge Adjacent"] - 165["Plane
[3824, 3854, 0]"] - 172["Sweep Extrusion
[3987, 4021, 0]"] + 165["Plane
[3807, 3837, 0]"] + 172["Sweep Extrusion
[3970, 4004, 0]"] 173[Wall] 174["Cap Start"] 175["Cap End"] 176["SweepEdge Opposite"] 177["SweepEdge Adjacent"] - 181["Sweep Extrusion
[4297, 4332, 0]"] + 181["Sweep Extrusion
[4287, 4322, 0]"] 182[Wall] 183["SweepEdge Opposite"] 184["SweepEdge Adjacent"] - 185["Sweep Extrusion
[4297, 4332, 0]"] - 186["Sweep Extrusion
[4297, 4332, 0]"] - 187["Sweep Extrusion
[4297, 4332, 0]"] - 188["Sweep Extrusion
[4297, 4332, 0]"] - 189["Sweep Extrusion
[4297, 4332, 0]"] - 190["Sweep Extrusion
[4297, 4332, 0]"] - 191["Sweep Extrusion
[4297, 4332, 0]"] - 195["Sweep Extrusion
[4608, 4643, 0]"] + 185["Sweep Extrusion
[4287, 4322, 0]"] + 186["Sweep Extrusion
[4287, 4322, 0]"] + 187["Sweep Extrusion
[4287, 4322, 0]"] + 188["Sweep Extrusion
[4287, 4322, 0]"] + 189["Sweep Extrusion
[4287, 4322, 0]"] + 190["Sweep Extrusion
[4287, 4322, 0]"] + 191["Sweep Extrusion
[4287, 4322, 0]"] + 195["Sweep Extrusion
[4605, 4640, 0]"] 196[Wall] 197["SweepEdge Opposite"] 198["SweepEdge Adjacent"] - 199["Sweep Extrusion
[4608, 4643, 0]"] - 200["Sweep Extrusion
[4608, 4643, 0]"] - 201["Sweep Extrusion
[4608, 4643, 0]"] - 202["Plane
[4688, 4705, 0]"] - 206["Sweep Extrusion
[4859, 4900, 0]"] + 199["Sweep Extrusion
[4605, 4640, 0]"] + 200["Sweep Extrusion
[4605, 4640, 0]"] + 201["Sweep Extrusion
[4605, 4640, 0]"] + 202["Plane
[4685, 4702, 0]"] + 206["Sweep Extrusion
[4856, 4897, 0]"] 207[Wall] 208["Cap Start"] 209["Cap End"] 210["SweepEdge Opposite"] 211["SweepEdge Adjacent"] - 212["Plane
[4987, 5004, 0]"] - 223["Sweep Revolve
[5433, 5450, 0]"] + 212["Plane
[4984, 5001, 0]"] + 223["Sweep Revolve
[5430, 5447, 0]"] 224[Wall] 225[Wall] 226[Wall] @@ -278,8 +278,8 @@ flowchart LR 235["SweepEdge Adjacent"] 236["SweepEdge Adjacent"] 237["SweepEdge Adjacent"] - 238["Plane
[5505, 5550, 0]"] - 254["Sweep Extrusion
[6040, 6085, 0]"] + 238["Plane
[5502, 5547, 0]"] + 254["Sweep Extrusion
[6037, 6082, 0]"] 255[Wall] 256[Wall] 257[Wall] @@ -318,12 +318,12 @@ flowchart LR 290["SweepEdge Adjacent"] 291["SweepEdge Opposite"] 292["SweepEdge Adjacent"] - 293["StartSketchOnPlane
[2337, 2379, 0]"] - 294["StartSketchOnFace
[2507, 2539, 0]"] - 295["StartSketchOnPlane
[3810, 3855, 0]"] - 296["StartSketchOnFace
[4072, 4104, 0]"] - 297["StartSketchOnFace
[4383, 4415, 0]"] - 298["StartSketchOnPlane
[5491, 5551, 0]"] + 293["StartSketchOnPlane
[2313, 2355, 0]"] + 294["StartSketchOnFace
[2483, 2522, 0]"] + 295["StartSketchOnPlane
[3793, 3838, 0]"] + 296["StartSketchOnFace
[4055, 4094, 0]"] + 297["StartSketchOnFace
[4373, 4412, 0]"] + 298["StartSketchOnPlane
[5488, 5548, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/french-press/ast.snap b/rust/kcl-lib/tests/kcl_samples/french-press/ast.snap index e4f86513d..c540df235 100644 --- a/rust/kcl-lib/tests/kcl_samples/french-press/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/french-press/ast.snap @@ -893,7 +893,7 @@ description: Result of parsing french-press.kcl "key": { "commentStart": 0, "end": 0, - "name": "plane", + "name": "origin", "start": 0, "type": "Identifier" }, @@ -901,252 +901,230 @@ description: Result of parsing french-press.kcl "type": "ObjectProperty", "value": { "commentStart": 0, - "end": 0, - "properties": [ + "elements": [ + { + "argument": { + "commentStart": 0, + "end": 0, + "raw": "0.26", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.26, + "suffix": "None" + } + }, + "commentStart": 0, + "end": 0, + "operator": "-", + "start": 0, + "type": "UnaryExpression", + "type": "UnaryExpression" + }, { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "origin", - "start": 0, - "type": "Identifier" - }, + "raw": "0.26", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "argument": { - "commentStart": 0, - "end": 0, - "raw": "0.26", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.26, - "suffix": "None" - } - }, - "commentStart": 0, - "end": 0, - "operator": "-", - "start": 0, - "type": "UnaryExpression", - "type": "UnaryExpression" - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.26", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.26, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.26, + "suffix": "None" } }, { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "xAxis", - "start": 0, - "type": "Identifier" - }, + "raw": "0.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "yAxis", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "zAxis", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.0, + "suffix": "None" } } ], + "end": 0, "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "xAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "yAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "zAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" } } ], @@ -3603,29 +3581,23 @@ description: Result of parsing french-press.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'END'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "END" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'END'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "END" + } } ], "callee": { @@ -3646,8 +3618,24 @@ description: Result of parsing french-press.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -6246,29 +6234,23 @@ description: Result of parsing french-press.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude003", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'END'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "END" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'END'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "END" + } } ], "callee": { @@ -6289,8 +6271,24 @@ description: Result of parsing french-press.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude003", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -6642,29 +6640,23 @@ description: Result of parsing french-press.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude003", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'END'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "END" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'END'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "END" + } } ], "callee": { @@ -6685,8 +6677,24 @@ description: Result of parsing french-press.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude003", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/kcl_samples/french-press/ops.snap b/rust/kcl-lib/tests/kcl_samples/french-press/ops.snap index 6d76e439c..f30ed75e9 100644 --- a/rust/kcl-lib/tests/kcl_samples/french-press/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/french-press/ops.snap @@ -5,7 +5,7 @@ description: Operations executed french-press.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -122,190 +122,185 @@ description: Operations executed french-press.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": -0.26, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": -0.26, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.26, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.26, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -530,7 +525,7 @@ description: Operations executed french-press.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -577,16 +572,7 @@ description: Operations executed french-press.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -597,7 +583,15 @@ description: Operations executed french-press.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -650,7 +644,7 @@ description: Operations executed french-press.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -751,7 +745,7 @@ description: Operations executed french-press.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -882,7 +876,7 @@ description: Operations executed french-press.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -955,16 +949,7 @@ description: Operations executed french-press.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -975,7 +960,15 @@ description: Operations executed french-press.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1058,16 +1051,7 @@ description: Operations executed french-press.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -1078,7 +1062,15 @@ description: Operations executed french-press.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1137,7 +1129,7 @@ description: Operations executed french-press.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1228,7 +1220,7 @@ description: Operations executed french-press.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1334,8 +1326,13 @@ description: Operations executed french-press.kcl "type": "Number", "value": 0.325, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -1354,7 +1351,7 @@ description: Operations executed french-press.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/kcl_samples/french-press/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/french-press/program_memory.snap index 002d1146d..ca6333a67 100644 --- a/rust/kcl-lib/tests/kcl_samples/french-press/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/french-press/program_memory.snap @@ -117,22 +117,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -297,17 +309,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -360,22 +381,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -572,17 +605,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -635,22 +677,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -847,17 +901,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -910,22 +973,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1053,22 +1128,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1162,17 +1249,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1225,22 +1321,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1366,17 +1474,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1429,22 +1546,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1570,17 +1699,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1633,22 +1771,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1774,17 +1924,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1837,22 +1996,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1978,17 +2149,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2041,22 +2221,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2182,17 +2374,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2245,22 +2446,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2386,17 +2599,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2449,22 +2671,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2590,17 +2824,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2653,22 +2896,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2799,17 +3054,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2862,22 +3126,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -3003,17 +3279,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3066,22 +3351,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -3207,17 +3504,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3270,22 +3576,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -3411,17 +3729,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3474,22 +3801,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -3617,22 +3956,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -4052,22 +4403,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": -0.325, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -4121,186 +4484,181 @@ description: Variables in memory after executing french-press.kcl "plane001": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": -0.26, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": -0.26, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.26, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.26, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -4504,22 +4862,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -4593,9 +4963,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1097, - "end": 1103, - "start": 1097, + "commentStart": 1073, + "end": 1079, + "start": 1073, "type": "TagDeclarator", "value": "edge1" }, @@ -4613,9 +4983,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1244, - "end": 1250, - "start": 1244, + "commentStart": 1220, + "end": 1226, + "start": 1220, "type": "TagDeclarator", "value": "edge2" }, @@ -4633,9 +5003,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1398, - "end": 1404, - "start": 1398, + "commentStart": 1374, + "end": 1380, + "start": 1374, "type": "TagDeclarator", "value": "edge3" }, @@ -4653,9 +5023,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1530, - "end": 1538, - "start": 1530, + "commentStart": 1506, + "end": 1514, + "start": 1506, "type": "TagDeclarator", "value": "edgeLen" }, @@ -4673,9 +5043,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1616, - "end": 1622, - "start": 1616, + "commentStart": 1592, + "end": 1598, + "start": 1592, "type": "TagDeclarator", "value": "edge4" }, @@ -4693,9 +5063,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1780, - "end": 1786, - "start": 1780, + "commentStart": 1756, + "end": 1762, + "start": 1756, "type": "TagDeclarator", "value": "edge5" }, @@ -4713,9 +5083,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1946, - "end": 1952, - "start": 1946, + "commentStart": 1922, + "end": 1928, + "start": 1922, "type": "TagDeclarator", "value": "edge6" }, @@ -4769,9 +5139,9 @@ description: Variables in memory after executing french-press.kcl 5.7 ], "tag": { - "commentStart": 1097, - "end": 1103, - "start": 1097, + "commentStart": 1073, + "end": 1079, + "start": 1073, "type": "TagDeclarator", "value": "edge1" }, @@ -4819,9 +5189,9 @@ description: Variables in memory after executing french-press.kcl 0.3732 ], "tag": { - "commentStart": 1244, - "end": 1250, - "start": 1244, + "commentStart": 1220, + "end": 1226, + "start": 1220, "type": "TagDeclarator", "value": "edge2" }, @@ -4869,9 +5239,9 @@ description: Variables in memory after executing french-press.kcl -0.966 ], "tag": { - "commentStart": 1398, - "end": 1404, - "start": 1398, + "commentStart": 1374, + "end": 1380, + "start": 1374, "type": "TagDeclarator", "value": "edge3" }, @@ -4919,9 +5289,9 @@ description: Variables in memory after executing french-press.kcl -0.133 ], "tag": { - "commentStart": 1530, - "end": 1538, - "start": 1530, + "commentStart": 1506, + "end": 1514, + "start": 1506, "type": "TagDeclarator", "value": "edgeLen" }, @@ -4963,9 +5333,9 @@ description: Variables in memory after executing french-press.kcl -0.033 ], "tag": { - "commentStart": 1616, - "end": 1622, - "start": 1616, + "commentStart": 1592, + "end": 1598, + "start": 1592, "type": "TagDeclarator", "value": "edge4" }, @@ -5013,9 +5383,9 @@ description: Variables in memory after executing french-press.kcl -0.1134 ], "tag": { - "commentStart": 1780, - "end": 1786, - "start": 1780, + "commentStart": 1756, + "end": 1762, + "start": 1756, "type": "TagDeclarator", "value": "edge5" }, @@ -5063,9 +5433,9 @@ description: Variables in memory after executing french-press.kcl -0.1789 ], "tag": { - "commentStart": 1946, - "end": 1952, - "start": 1946, + "commentStart": 1922, + "end": 1928, + "start": 1922, "type": "TagDeclarator", "value": "edge6" }, @@ -5150,22 +5520,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": -0.26, "y": 0.26, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "xAxis": { "x": 1.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Inches" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "units": { "type": "Inches" @@ -5252,9 +5634,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1097, - "end": 1103, - "start": 1097, + "commentStart": 1073, + "end": 1079, + "start": 1073, "type": "TagDeclarator", "value": "edge1" }, @@ -5272,9 +5654,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1244, - "end": 1250, - "start": 1244, + "commentStart": 1220, + "end": 1226, + "start": 1220, "type": "TagDeclarator", "value": "edge2" }, @@ -5292,9 +5674,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1398, - "end": 1404, - "start": 1398, + "commentStart": 1374, + "end": 1380, + "start": 1374, "type": "TagDeclarator", "value": "edge3" }, @@ -5312,9 +5694,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1530, - "end": 1538, - "start": 1530, + "commentStart": 1506, + "end": 1514, + "start": 1506, "type": "TagDeclarator", "value": "edgeLen" }, @@ -5332,9 +5714,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1616, - "end": 1622, - "start": 1616, + "commentStart": 1592, + "end": 1598, + "start": 1592, "type": "TagDeclarator", "value": "edge4" }, @@ -5352,9 +5734,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1780, - "end": 1786, - "start": 1780, + "commentStart": 1756, + "end": 1762, + "start": 1756, "type": "TagDeclarator", "value": "edge5" }, @@ -5372,9 +5754,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1946, - "end": 1952, - "start": 1946, + "commentStart": 1922, + "end": 1928, + "start": 1922, "type": "TagDeclarator", "value": "edge6" }, @@ -5428,9 +5810,9 @@ description: Variables in memory after executing french-press.kcl 5.7 ], "tag": { - "commentStart": 1097, - "end": 1103, - "start": 1097, + "commentStart": 1073, + "end": 1079, + "start": 1073, "type": "TagDeclarator", "value": "edge1" }, @@ -5478,9 +5860,9 @@ description: Variables in memory after executing french-press.kcl 0.3732 ], "tag": { - "commentStart": 1244, - "end": 1250, - "start": 1244, + "commentStart": 1220, + "end": 1226, + "start": 1220, "type": "TagDeclarator", "value": "edge2" }, @@ -5528,9 +5910,9 @@ description: Variables in memory after executing french-press.kcl -0.966 ], "tag": { - "commentStart": 1398, - "end": 1404, - "start": 1398, + "commentStart": 1374, + "end": 1380, + "start": 1374, "type": "TagDeclarator", "value": "edge3" }, @@ -5578,9 +5960,9 @@ description: Variables in memory after executing french-press.kcl -0.133 ], "tag": { - "commentStart": 1530, - "end": 1538, - "start": 1530, + "commentStart": 1506, + "end": 1514, + "start": 1506, "type": "TagDeclarator", "value": "edgeLen" }, @@ -5622,9 +6004,9 @@ description: Variables in memory after executing french-press.kcl -0.033 ], "tag": { - "commentStart": 1616, - "end": 1622, - "start": 1616, + "commentStart": 1592, + "end": 1598, + "start": 1592, "type": "TagDeclarator", "value": "edge4" }, @@ -5672,9 +6054,9 @@ description: Variables in memory after executing french-press.kcl -0.1134 ], "tag": { - "commentStart": 1780, - "end": 1786, - "start": 1780, + "commentStart": 1756, + "end": 1762, + "start": 1756, "type": "TagDeclarator", "value": "edge5" }, @@ -5722,9 +6104,9 @@ description: Variables in memory after executing french-press.kcl -0.1789 ], "tag": { - "commentStart": 1946, - "end": 1952, - "start": 1946, + "commentStart": 1922, + "end": 1928, + "start": 1922, "type": "TagDeclarator", "value": "edge6" }, @@ -5809,22 +6191,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": -0.26, "y": 0.26, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "xAxis": { "x": 1.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Inches" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "units": { "type": "Inches" @@ -5911,9 +6305,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1097, - "end": 1103, - "start": 1097, + "commentStart": 1073, + "end": 1079, + "start": 1073, "type": "TagDeclarator", "value": "edge1" }, @@ -5931,9 +6325,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1244, - "end": 1250, - "start": 1244, + "commentStart": 1220, + "end": 1226, + "start": 1220, "type": "TagDeclarator", "value": "edge2" }, @@ -5951,9 +6345,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1398, - "end": 1404, - "start": 1398, + "commentStart": 1374, + "end": 1380, + "start": 1374, "type": "TagDeclarator", "value": "edge3" }, @@ -5971,9 +6365,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1530, - "end": 1538, - "start": 1530, + "commentStart": 1506, + "end": 1514, + "start": 1506, "type": "TagDeclarator", "value": "edgeLen" }, @@ -5991,9 +6385,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1616, - "end": 1622, - "start": 1616, + "commentStart": 1592, + "end": 1598, + "start": 1592, "type": "TagDeclarator", "value": "edge4" }, @@ -6011,9 +6405,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1780, - "end": 1786, - "start": 1780, + "commentStart": 1756, + "end": 1762, + "start": 1756, "type": "TagDeclarator", "value": "edge5" }, @@ -6031,9 +6425,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1946, - "end": 1952, - "start": 1946, + "commentStart": 1922, + "end": 1928, + "start": 1922, "type": "TagDeclarator", "value": "edge6" }, @@ -6087,9 +6481,9 @@ description: Variables in memory after executing french-press.kcl 5.7 ], "tag": { - "commentStart": 1097, - "end": 1103, - "start": 1097, + "commentStart": 1073, + "end": 1079, + "start": 1073, "type": "TagDeclarator", "value": "edge1" }, @@ -6137,9 +6531,9 @@ description: Variables in memory after executing french-press.kcl 0.3732 ], "tag": { - "commentStart": 1244, - "end": 1250, - "start": 1244, + "commentStart": 1220, + "end": 1226, + "start": 1220, "type": "TagDeclarator", "value": "edge2" }, @@ -6187,9 +6581,9 @@ description: Variables in memory after executing french-press.kcl -0.966 ], "tag": { - "commentStart": 1398, - "end": 1404, - "start": 1398, + "commentStart": 1374, + "end": 1380, + "start": 1374, "type": "TagDeclarator", "value": "edge3" }, @@ -6237,9 +6631,9 @@ description: Variables in memory after executing french-press.kcl -0.133 ], "tag": { - "commentStart": 1530, - "end": 1538, - "start": 1530, + "commentStart": 1506, + "end": 1514, + "start": 1506, "type": "TagDeclarator", "value": "edgeLen" }, @@ -6281,9 +6675,9 @@ description: Variables in memory after executing french-press.kcl -0.033 ], "tag": { - "commentStart": 1616, - "end": 1622, - "start": 1616, + "commentStart": 1592, + "end": 1598, + "start": 1592, "type": "TagDeclarator", "value": "edge4" }, @@ -6331,9 +6725,9 @@ description: Variables in memory after executing french-press.kcl -0.1134 ], "tag": { - "commentStart": 1780, - "end": 1786, - "start": 1780, + "commentStart": 1756, + "end": 1762, + "start": 1756, "type": "TagDeclarator", "value": "edge5" }, @@ -6381,9 +6775,9 @@ description: Variables in memory after executing french-press.kcl -0.1789 ], "tag": { - "commentStart": 1946, - "end": 1952, - "start": 1946, + "commentStart": 1922, + "end": 1928, + "start": 1922, "type": "TagDeclarator", "value": "edge6" }, @@ -6468,22 +6862,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": -0.26, "y": 0.26, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "xAxis": { "x": 1.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Inches" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "units": { "type": "Inches" @@ -6570,9 +6976,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1097, - "end": 1103, - "start": 1097, + "commentStart": 1073, + "end": 1079, + "start": 1073, "type": "TagDeclarator", "value": "edge1" }, @@ -6590,9 +6996,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1244, - "end": 1250, - "start": 1244, + "commentStart": 1220, + "end": 1226, + "start": 1220, "type": "TagDeclarator", "value": "edge2" }, @@ -6610,9 +7016,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1398, - "end": 1404, - "start": 1398, + "commentStart": 1374, + "end": 1380, + "start": 1374, "type": "TagDeclarator", "value": "edge3" }, @@ -6630,9 +7036,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1530, - "end": 1538, - "start": 1530, + "commentStart": 1506, + "end": 1514, + "start": 1506, "type": "TagDeclarator", "value": "edgeLen" }, @@ -6650,9 +7056,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1616, - "end": 1622, - "start": 1616, + "commentStart": 1592, + "end": 1598, + "start": 1592, "type": "TagDeclarator", "value": "edge4" }, @@ -6670,9 +7076,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1780, - "end": 1786, - "start": 1780, + "commentStart": 1756, + "end": 1762, + "start": 1756, "type": "TagDeclarator", "value": "edge5" }, @@ -6690,9 +7096,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1946, - "end": 1952, - "start": 1946, + "commentStart": 1922, + "end": 1928, + "start": 1922, "type": "TagDeclarator", "value": "edge6" }, @@ -6746,9 +7152,9 @@ description: Variables in memory after executing french-press.kcl 5.7 ], "tag": { - "commentStart": 1097, - "end": 1103, - "start": 1097, + "commentStart": 1073, + "end": 1079, + "start": 1073, "type": "TagDeclarator", "value": "edge1" }, @@ -6796,9 +7202,9 @@ description: Variables in memory after executing french-press.kcl 0.3732 ], "tag": { - "commentStart": 1244, - "end": 1250, - "start": 1244, + "commentStart": 1220, + "end": 1226, + "start": 1220, "type": "TagDeclarator", "value": "edge2" }, @@ -6846,9 +7252,9 @@ description: Variables in memory after executing french-press.kcl -0.966 ], "tag": { - "commentStart": 1398, - "end": 1404, - "start": 1398, + "commentStart": 1374, + "end": 1380, + "start": 1374, "type": "TagDeclarator", "value": "edge3" }, @@ -6896,9 +7302,9 @@ description: Variables in memory after executing french-press.kcl -0.133 ], "tag": { - "commentStart": 1530, - "end": 1538, - "start": 1530, + "commentStart": 1506, + "end": 1514, + "start": 1506, "type": "TagDeclarator", "value": "edgeLen" }, @@ -6940,9 +7346,9 @@ description: Variables in memory after executing french-press.kcl -0.033 ], "tag": { - "commentStart": 1616, - "end": 1622, - "start": 1616, + "commentStart": 1592, + "end": 1598, + "start": 1592, "type": "TagDeclarator", "value": "edge4" }, @@ -6990,9 +7396,9 @@ description: Variables in memory after executing french-press.kcl -0.1134 ], "tag": { - "commentStart": 1780, - "end": 1786, - "start": 1780, + "commentStart": 1756, + "end": 1762, + "start": 1756, "type": "TagDeclarator", "value": "edge5" }, @@ -7040,9 +7446,9 @@ description: Variables in memory after executing french-press.kcl -0.1789 ], "tag": { - "commentStart": 1946, - "end": 1952, - "start": 1946, + "commentStart": 1922, + "end": 1928, + "start": 1922, "type": "TagDeclarator", "value": "edge6" }, @@ -7127,22 +7533,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": -0.26, "y": 0.26, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "xAxis": { "x": 1.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Inches" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "units": { "type": "Inches" @@ -7252,22 +7670,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -7398,17 +7828,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -7461,22 +7900,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -7639,17 +8090,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -7702,22 +8162,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -7880,17 +8352,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -7943,22 +8424,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -8045,9 +8538,9 @@ description: Variables in memory after executing french-press.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 3161, - "end": 3166, - "start": 3161, + "commentStart": 3144, + "end": 3149, + "start": 3144, "type": "TagDeclarator", "value": "seg1" }, @@ -8115,9 +8608,9 @@ description: Variables in memory after executing french-press.kcl 1.11 ], "tag": { - "commentStart": 3161, - "end": 3166, - "start": 3161, + "commentStart": 3144, + "end": 3149, + "start": 3144, "type": "TagDeclarator", "value": "seg1" }, @@ -8234,22 +8727,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -8520,22 +9025,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -8613,22 +9130,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -8702,17 +9231,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -8765,22 +9303,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -8886,17 +9436,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -8949,22 +9508,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -9070,17 +9641,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -9133,22 +9713,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -9254,17 +9846,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -9317,22 +9918,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -9438,17 +10051,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -9501,22 +10123,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -9622,17 +10256,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -9685,22 +10328,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -9806,17 +10461,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -9869,22 +10533,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -9990,17 +10666,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -10053,22 +10738,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -10179,17 +10876,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -10242,22 +10948,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -10363,17 +11081,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -10426,22 +11153,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -10547,17 +11286,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -10610,22 +11358,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -10731,17 +11491,26 @@ description: Variables in memory after executing french-press.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -10794,22 +11563,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 1.12 + "z": 1.12, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -10917,22 +11698,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -11185,22 +11978,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -11530,22 +12335,34 @@ description: Variables in memory after executing french-press.kcl "origin": { "x": 0.0, "y": -0.325, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" diff --git a/rust/kcl-lib/tests/kcl_samples/gear-rack/ops.snap b/rust/kcl-lib/tests/kcl_samples/gear-rack/ops.snap index f016f5ee5..333d0ed6d 100644 --- a/rust/kcl-lib/tests/kcl_samples/gear-rack/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/gear-rack/ops.snap @@ -5,7 +5,7 @@ description: Operations executed gear-rack.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -67,7 +67,7 @@ description: Operations executed gear-rack.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -212,7 +212,7 @@ description: Operations executed gear-rack.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -259,7 +259,7 @@ description: Operations executed gear-rack.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/kcl_samples/gear-rack/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/gear-rack/program_memory.snap index 33553da18..7f9e81f89 100644 --- a/rust/kcl-lib/tests/kcl_samples/gear-rack/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/gear-rack/program_memory.snap @@ -133,22 +133,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -316,22 +328,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -546,22 +570,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -851,22 +887,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1153,22 +1201,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1455,22 +1515,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1757,22 +1829,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2059,22 +2143,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2361,22 +2457,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2663,22 +2771,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2965,22 +3085,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3267,22 +3399,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3569,22 +3713,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3871,22 +4027,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4173,22 +4341,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4475,22 +4655,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4777,22 +4969,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5079,22 +5283,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5381,22 +5597,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5683,22 +5911,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5985,22 +6225,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6287,22 +6539,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6589,22 +6853,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6891,22 +7167,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7193,22 +7481,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7495,22 +7795,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7797,22 +8109,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8099,22 +8423,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8401,22 +8737,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8703,22 +9051,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9005,22 +9365,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9307,22 +9679,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9609,22 +9993,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9911,22 +10307,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10213,22 +10621,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10515,22 +10935,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10817,22 +11249,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11119,22 +11563,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11421,22 +11877,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11723,22 +12191,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12025,22 +12505,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12327,22 +12819,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12629,22 +13133,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12931,22 +13447,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13233,22 +13761,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13535,22 +14075,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13837,22 +14389,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -14139,22 +14703,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -14441,22 +15017,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -14743,22 +15331,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -15045,22 +15645,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -15347,22 +15959,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -15649,22 +16273,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -15951,22 +16587,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -16253,22 +16901,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -16555,22 +17215,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -16857,22 +17529,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -17159,22 +17843,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -17461,22 +18157,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -17763,22 +18471,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -18065,22 +18785,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -18367,22 +19099,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -18669,22 +19413,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -18971,22 +19727,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -19273,22 +20041,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -19575,22 +20355,34 @@ description: Variables in memory after executing gear-rack.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/kcl_samples/gear/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/gear/artifact_graph_flowchart.snap.md index 7fd7bf34a..9a29ebaba 100644 --- a/rust/kcl-lib/tests/kcl_samples/gear/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/gear/artifact_graph_flowchart.snap.md @@ -214,13 +214,13 @@ flowchart LR 217[Solid2d] end subgraph path219 [Path] - 219["Path
[2569, 2669, 0]"] - 220["Segment
[2675, 2702, 0]"] - 221["Segment
[2708, 2736, 0]"] - 222["Segment
[2742, 2770, 0]"] - 223["Segment
[2776, 2896, 0]"] - 224["Segment
[2902, 3011, 0]"] - 225["Segment
[3017, 3024, 0]"] + 219["Path
[2576, 2676, 0]"] + 220["Segment
[2682, 2709, 0]"] + 221["Segment
[2715, 2743, 0]"] + 222["Segment
[2749, 2777, 0]"] + 223["Segment
[2783, 2903, 0]"] + 224["Segment
[2909, 3018, 0]"] + 225["Segment
[3024, 3031, 0]"] 226[Solid2d] end 1["Plane
[1299, 1316, 0]"] @@ -232,7 +232,7 @@ flowchart LR 10["SweepEdge Adjacent"] 11["Plane
[1826, 1843, 0]"] 218["Sweep Extrusion
[2099, 2127, 0]"] - 227["Sweep Extrusion
[3030, 3059, 0]"] + 227["Sweep Extrusion
[3037, 3066, 0]"] 228[Wall] 229[Wall] 230[Wall] @@ -245,7 +245,7 @@ flowchart LR 237["SweepEdge Adjacent"] 238["SweepEdge Opposite"] 239["SweepEdge Adjacent"] - 240["StartSketchOnFace
[2537, 2563, 0]"] + 240["StartSketchOnFace
[2537, 2570, 0]"] 1 --- 2 2 --- 3 2 ---- 5 diff --git a/rust/kcl-lib/tests/kcl_samples/gear/ast.snap b/rust/kcl-lib/tests/kcl_samples/gear/ast.snap index 1a429871e..4fd848940 100644 --- a/rust/kcl-lib/tests/kcl_samples/gear/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/gear/ast.snap @@ -3888,29 +3888,23 @@ description: Result of parsing gear.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "body", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'END'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "END" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'END'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "END" + } } ], "callee": { @@ -3931,8 +3925,24 @@ description: Result of parsing gear.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "body", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/kcl_samples/gear/ops.snap b/rust/kcl-lib/tests/kcl_samples/gear/ops.snap index d470ce75c..434efb4a4 100644 --- a/rust/kcl-lib/tests/kcl_samples/gear/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/gear/ops.snap @@ -5531,7 +5531,7 @@ description: Operations executed gear.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -5578,7 +5578,7 @@ description: Operations executed gear.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -9410,16 +9410,7 @@ description: Operations executed gear.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -9430,7 +9421,15 @@ description: Operations executed gear.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "GroupBegin", diff --git a/rust/kcl-lib/tests/kcl_samples/gear/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/gear/program_memory.snap index f07eceb70..3c12a8164 100644 --- a/rust/kcl-lib/tests/kcl_samples/gear/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/gear/program_memory.snap @@ -943,8 +943,13 @@ description: Variables in memory after executing gear.kcl "type": "Number", "value": 9.8668, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "body": { @@ -1000,22 +1005,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2012,17 +2029,26 @@ description: Variables in memory after executing gear.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2075,22 +2101,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2167,8 +2205,13 @@ description: Variables in memory after executing gear.kcl "type": "Number", "value": 0.125, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "keywayWidth": { @@ -2249,816 +2292,1326 @@ description: Variables in memory after executing gear.kcl "type": "Number", "value": 4.9334, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 4.9415, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 4.9496, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 4.9576, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 4.9657, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 4.9738, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 4.9819, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 4.99, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 4.9981, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0062, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0142, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0223, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0304, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0385, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0466, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0547, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0628, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0708, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0789, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.087, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0951, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1032, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1113, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1193, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1274, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1355, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1436, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1517, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1598, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1679, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1759, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.184, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1921, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2002, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2083, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2164, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2245, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2325, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2406, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2487, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2568, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2649, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.273, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2811, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2891, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2972, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3053, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3134, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3215, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3296, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3377, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3457, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3538, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3619, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.37, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3781, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3862, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3942, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4023, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4104, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4185, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4266, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4347, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4428, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4508, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4589, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.467, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4751, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4832, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4913, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4994, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5074, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5155, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5236, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5317, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5398, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5479, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.556, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.564, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5721, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5802, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5883, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5964, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6045, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6126, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6206, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6287, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6368, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6449, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.653, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6611, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6691, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6772, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6853, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6934, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.7015, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.7096, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.7177, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.7257, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.7338, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.7419, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.75, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } } ] @@ -3077,22 +3630,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -7037,22 +7602,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -10992,22 +11569,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -14947,22 +15536,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -18902,22 +19503,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -22857,22 +23470,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -26812,22 +27437,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -30767,22 +31404,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -34722,22 +35371,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -38677,22 +39338,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -42632,22 +43305,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -46587,22 +47272,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -50542,22 +51239,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -54497,22 +55206,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -58452,22 +59173,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -62407,22 +63140,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -66362,22 +67107,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -70317,22 +71074,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -74272,22 +75041,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -78227,22 +79008,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -82182,22 +82975,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -86137,22 +86942,34 @@ description: Variables in memory after executing gear.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -86209,8 +87026,13 @@ description: Variables in memory after executing gear.kcl "type": "Number", "value": 11.4286, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "xs": { @@ -86220,816 +87042,1326 @@ description: Variables in memory after executing gear.kcl "type": "Number", "value": 4.9334, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 4.9415, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 4.9496, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 4.9576, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 4.9657, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 4.9738, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 4.9819, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 4.99, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 4.9981, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0061, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0142, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0223, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0304, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0385, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0466, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0546, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0627, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0708, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0789, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.0869, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.095, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1031, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1112, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1192, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1273, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1354, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1434, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1515, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1596, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1676, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1757, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1837, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1918, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.1999, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2079, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.216, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.224, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2321, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2401, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2481, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2562, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2642, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2722, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2803, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2883, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.2963, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3044, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3124, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3204, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3284, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3364, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3444, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3525, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3605, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3685, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3765, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3845, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.3924, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4004, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4084, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4164, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4244, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4324, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4403, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4483, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4563, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4642, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4722, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4801, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.4881, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.496, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.504, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5119, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5198, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5277, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5357, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5436, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5515, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5594, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5673, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5752, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5831, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.591, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.5989, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6068, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6146, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6225, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6304, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6382, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6461, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6539, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6618, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6696, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6775, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6853, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.6931, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.7009, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.7087, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.7165, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.7243, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.7321, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 5.7399, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } } ] @@ -87041,816 +88373,1326 @@ description: Variables in memory after executing gear.kcl "type": "Number", "value": 0.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0003, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0009, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0016, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0025, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0035, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0046, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0058, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.007, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0084, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0098, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0114, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.013, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0146, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0164, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0182, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.02, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.022, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0239, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.026, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0281, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0303, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0325, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0347, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0371, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0394, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0419, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0443, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0469, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0494, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0521, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0547, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0575, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0602, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.063, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0659, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0688, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0717, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0747, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0778, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0808, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.084, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0871, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0903, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0936, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.0969, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1002, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1036, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.107, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1104, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1139, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1174, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.121, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1246, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1283, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.132, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1357, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1395, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1433, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1471, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.151, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1549, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1588, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1628, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1669, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1709, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.175, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1792, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1833, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1875, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1918, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.1961, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.2004, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.2047, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.2091, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.2135, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.218, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.2225, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.227, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.2316, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.2362, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.2408, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.2455, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.2502, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.2549, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.2597, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.2644, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.2693, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.2741, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.279, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.284, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.289, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.294, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.299, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.3041, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.3091, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.3143, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.3194, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.3246, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.3299, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.3351, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 0.3404, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } } ] diff --git a/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/ops.snap b/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/ops.snap index 1cbbdaefa..964702590 100644 --- a/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/ops.snap @@ -50,7 +50,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -171,16 +171,26 @@ description: Operations executed gridfinity-baseplate-magnets.kcl "type": "Number", "value": 21.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 21.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, { @@ -284,7 +294,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -480,16 +490,26 @@ description: Operations executed gridfinity-baseplate-magnets.kcl "type": "Number", "value": 21.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 21.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, { @@ -1068,7 +1088,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1098,7 +1118,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1128,7 +1148,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1357,7 +1377,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1387,7 +1407,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/program_memory.snap index c87e696ce..66e5ce4ef 100644 --- a/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/program_memory.snap @@ -224,22 +224,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -428,22 +440,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -632,22 +656,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -836,22 +872,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1040,22 +1088,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1244,22 +1304,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1448,22 +1520,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1652,22 +1736,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1856,22 +1952,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2060,22 +2168,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2264,22 +2384,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2468,22 +2600,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2672,22 +2816,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2876,22 +3032,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3080,22 +3248,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3284,22 +3464,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3488,22 +3680,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3692,22 +3896,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3896,22 +4112,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4100,22 +4328,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4304,22 +4544,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4508,22 +4760,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4712,22 +4976,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4916,22 +5192,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5125,22 +5413,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5329,22 +5629,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5533,22 +5845,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5737,22 +6061,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5941,22 +6277,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6145,22 +6493,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6349,22 +6709,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6553,22 +6925,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6757,22 +7141,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6961,22 +7357,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7165,22 +7573,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7369,22 +7789,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7573,22 +8005,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7777,22 +8221,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7981,22 +8437,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8185,22 +8653,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8389,22 +8869,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8593,22 +9085,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8797,22 +9301,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9001,22 +9517,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9205,22 +9733,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9409,22 +9949,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9613,22 +10165,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9817,22 +10381,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10052,22 +10628,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10256,22 +10844,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10460,22 +11060,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10664,22 +11276,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11012,22 +11636,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 0.0, "y": 0.0, - "z": -2.4 + "z": -2.4, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11256,22 +11892,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 0.0, "y": 0.0, - "z": -2.4 + "z": -2.4, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11326,28 +11974,72 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc { "type": "fillet", "id": "[uuid]", - "radius": 4.0, + "radius": { + "n": 4.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 4.0, + "radius": { + "n": 4.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 4.0, + "radius": { + "n": 4.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 4.0, + "radius": { + "n": 4.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -11530,22 +12222,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11774,22 +12478,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11844,28 +12560,72 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc { "type": "fillet", "id": "[uuid]", - "radius": 4.0, + "radius": { + "n": 4.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 4.0, + "radius": { + "n": 4.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 4.0, + "radius": { + "n": 4.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 4.0, + "radius": { + "n": 4.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -11990,22 +12750,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12169,22 +12941,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 0.0, "y": 0.0, - "z": -2.4 + "z": -2.4, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12276,22 +13060,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12362,22 +13158,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12448,22 +13256,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12534,22 +13354,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12749,22 +13581,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12953,22 +13797,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13157,22 +14013,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13361,22 +14229,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13567,22 +14447,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13771,22 +14663,34 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate/ops.snap b/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate/ops.snap index e96dd8f5a..acd5ac042 100644 --- a/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate/ops.snap @@ -50,7 +50,7 @@ description: Operations executed gridfinity-baseplate.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -171,16 +171,26 @@ description: Operations executed gridfinity-baseplate.kcl "type": "Number", "value": 21.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 21.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, { @@ -284,7 +294,7 @@ description: Operations executed gridfinity-baseplate.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -480,16 +490,26 @@ description: Operations executed gridfinity-baseplate.kcl "type": "Number", "value": 21.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 21.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, { diff --git a/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate/program_memory.snap index 4bb486534..bd1f3acfe 100644 --- a/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate/program_memory.snap @@ -224,22 +224,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -428,22 +440,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -632,22 +656,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -836,22 +872,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1040,22 +1088,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1244,22 +1304,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1448,22 +1520,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1652,22 +1736,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1856,22 +1952,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2060,22 +2168,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2264,22 +2384,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2468,22 +2600,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2672,22 +2816,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2876,22 +3032,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3080,22 +3248,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3284,22 +3464,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3488,22 +3680,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3692,22 +3896,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3896,22 +4112,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4100,22 +4328,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4304,22 +4544,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4508,22 +4760,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4712,22 +4976,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4916,22 +5192,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5125,22 +5413,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5329,22 +5629,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5533,22 +5845,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5737,22 +6061,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5941,22 +6277,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6145,22 +6493,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6349,22 +6709,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6553,22 +6925,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6757,22 +7141,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6961,22 +7357,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7165,22 +7573,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7369,22 +7789,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7573,22 +8005,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7777,22 +8221,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7981,22 +8437,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8185,22 +8653,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8389,22 +8869,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8593,22 +9085,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8797,22 +9301,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9001,22 +9517,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9205,22 +9733,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9409,22 +9949,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9613,22 +10165,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9817,22 +10381,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10052,22 +10628,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10256,22 +10844,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10460,22 +11060,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10664,22 +11276,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10941,22 +11565,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11145,22 +11781,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11349,22 +11997,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11553,22 +12213,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11759,22 +12431,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11963,22 +12647,34 @@ description: Variables in memory after executing gridfinity-baseplate.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/artifact_graph_flowchart.snap.md index 45620dc1c..d7efba818 100644 --- a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/artifact_graph_flowchart.snap.md @@ -29,64 +29,64 @@ flowchart LR 61[Solid2d] end subgraph path81 [Path] - 81["Path
[3136, 3302, 0]"] - 82["Segment
[3136, 3302, 0]"] + 81["Path
[3143, 3309, 0]"] + 82["Segment
[3143, 3309, 0]"] 83[Solid2d] end subgraph path93 [Path] - 93["Path
[4586, 4611, 0]"] - 94["Segment
[4617, 4689, 0]"] - 95["Segment
[4695, 4768, 0]"] - 96["Segment
[4774, 4827, 0]"] - 97["Segment
[4833, 4854, 0]"] + 93["Path
[4593, 4618, 0]"] + 94["Segment
[4624, 4696, 0]"] + 95["Segment
[4702, 4775, 0]"] + 96["Segment
[4781, 4834, 0]"] + 97["Segment
[4840, 4861, 0]"] 98[Solid2d] end subgraph path119 [Path] - 119["Path
[5323, 5348, 0]"] - 120["Segment
[5408, 5451, 0]"] - 121["Segment
[5459, 5568, 0]"] - 122["Segment
[5631, 5680, 0]"] - 123["Segment
[5688, 5713, 0]"] - 124["Segment
[5721, 5764, 0]"] - 125["Segment
[5772, 5797, 0]"] - 126["Segment
[5805, 5849, 0]"] - 127["Segment
[5857, 5864, 0]"] + 119["Path
[5330, 5355, 0]"] + 120["Segment
[5415, 5458, 0]"] + 121["Segment
[5466, 5575, 0]"] + 122["Segment
[5638, 5687, 0]"] + 123["Segment
[5695, 5720, 0]"] + 124["Segment
[5728, 5771, 0]"] + 125["Segment
[5779, 5804, 0]"] + 126["Segment
[5812, 5856, 0]"] + 127["Segment
[5864, 5871, 0]"] 128[Solid2d] end subgraph path157 [Path] - 157["Path
[5323, 5348, 0]"] - 158["Segment
[5408, 5451, 0]"] - 159["Segment
[5459, 5568, 0]"] - 160["Segment
[5631, 5680, 0]"] - 161["Segment
[5688, 5713, 0]"] - 162["Segment
[5721, 5764, 0]"] - 163["Segment
[5772, 5797, 0]"] - 164["Segment
[5805, 5849, 0]"] - 165["Segment
[5857, 5864, 0]"] + 157["Path
[5330, 5355, 0]"] + 158["Segment
[5415, 5458, 0]"] + 159["Segment
[5466, 5575, 0]"] + 160["Segment
[5638, 5687, 0]"] + 161["Segment
[5695, 5720, 0]"] + 162["Segment
[5728, 5771, 0]"] + 163["Segment
[5779, 5804, 0]"] + 164["Segment
[5812, 5856, 0]"] + 165["Segment
[5864, 5871, 0]"] 166[Solid2d] end subgraph path195 [Path] - 195["Path
[5323, 5348, 0]"] - 196["Segment
[5408, 5451, 0]"] - 197["Segment
[5459, 5568, 0]"] - 198["Segment
[5631, 5680, 0]"] - 199["Segment
[5688, 5713, 0]"] - 200["Segment
[5721, 5764, 0]"] - 201["Segment
[5772, 5797, 0]"] - 202["Segment
[5805, 5849, 0]"] - 203["Segment
[5857, 5864, 0]"] + 195["Path
[5330, 5355, 0]"] + 196["Segment
[5415, 5458, 0]"] + 197["Segment
[5466, 5575, 0]"] + 198["Segment
[5638, 5687, 0]"] + 199["Segment
[5695, 5720, 0]"] + 200["Segment
[5728, 5771, 0]"] + 201["Segment
[5779, 5804, 0]"] + 202["Segment
[5812, 5856, 0]"] + 203["Segment
[5864, 5871, 0]"] 204[Solid2d] end subgraph path233 [Path] - 233["Path
[5323, 5348, 0]"] - 234["Segment
[5408, 5451, 0]"] - 235["Segment
[5459, 5568, 0]"] - 236["Segment
[5631, 5680, 0]"] - 237["Segment
[5688, 5713, 0]"] - 238["Segment
[5721, 5764, 0]"] - 239["Segment
[5772, 5797, 0]"] - 240["Segment
[5805, 5849, 0]"] - 241["Segment
[5857, 5864, 0]"] + 233["Path
[5330, 5355, 0]"] + 234["Segment
[5415, 5458, 0]"] + 235["Segment
[5466, 5575, 0]"] + 236["Segment
[5638, 5687, 0]"] + 237["Segment
[5695, 5720, 0]"] + 238["Segment
[5728, 5771, 0]"] + 239["Segment
[5779, 5804, 0]"] + 240["Segment
[5812, 5856, 0]"] + 241["Segment
[5864, 5871, 0]"] 242[Solid2d] end 1["Plane
[1541, 1588, 0]"] @@ -147,16 +147,16 @@ flowchart LR 78["EdgeCut Fillet
[2846, 3076, 0]"] 79["EdgeCut Fillet
[2846, 3076, 0]"] 80["EdgeCut Fillet
[2846, 3076, 0]"] - 84["Sweep Extrusion
[3524, 3551, 0]"] + 84["Sweep Extrusion
[3531, 3558, 0]"] 85[Wall] 86["Cap Start"] 87["SweepEdge Opposite"] 88["SweepEdge Adjacent"] - 89["Sweep Extrusion
[3524, 3551, 0]"] - 90["Sweep Extrusion
[3524, 3551, 0]"] - 91["Sweep Extrusion
[3524, 3551, 0]"] - 92["Plane
[4547, 4579, 0]"] - 99["Sweep Extrusion
[4860, 4904, 0]"] + 89["Sweep Extrusion
[3531, 3558, 0]"] + 90["Sweep Extrusion
[3531, 3558, 0]"] + 91["Sweep Extrusion
[3531, 3558, 0]"] + 92["Plane
[4554, 4586, 0]"] + 99["Sweep Extrusion
[4867, 4911, 0]"] 100[Wall] 101[Wall] 102[Wall] @@ -171,12 +171,12 @@ flowchart LR 111["SweepEdge Adjacent"] 112["SweepEdge Opposite"] 113["SweepEdge Adjacent"] - 114["EdgeCut Fillet
[4910, 5143, 0]"] - 115["EdgeCut Fillet
[4910, 5143, 0]"] - 116["EdgeCut Fillet
[4910, 5143, 0]"] - 117["EdgeCut Fillet
[4910, 5143, 0]"] - 118["Plane
[5295, 5315, 0]"] - 129["Sweep Extrusion
[6635, 6747, 0]"] + 114["EdgeCut Fillet
[4917, 5150, 0]"] + 115["EdgeCut Fillet
[4917, 5150, 0]"] + 116["EdgeCut Fillet
[4917, 5150, 0]"] + 117["EdgeCut Fillet
[4917, 5150, 0]"] + 118["Plane
[5302, 5322, 0]"] + 129["Sweep Extrusion
[6546, 6658, 0]"] 130[Wall] 131[Wall] 132[Wall] @@ -203,8 +203,8 @@ flowchart LR 153["SweepEdge Adjacent"] 154["SweepEdge Opposite"] 155["SweepEdge Adjacent"] - 156["Plane
[5295, 5315, 0]"] - 167["Sweep Extrusion
[6813, 6927, 0]"] + 156["Plane
[5302, 5322, 0]"] + 167["Sweep Extrusion
[6724, 6838, 0]"] 168[Wall] 169[Wall] 170[Wall] @@ -231,8 +231,8 @@ flowchart LR 191["SweepEdge Adjacent"] 192["SweepEdge Opposite"] 193["SweepEdge Adjacent"] - 194["Plane
[5295, 5315, 0]"] - 205["Sweep Revolve
[7753, 7808, 0]"] + 194["Plane
[5302, 5322, 0]"] + 205["Sweep Revolve
[7664, 7719, 0]"] 206[Wall] 207[Wall] 208[Wall] @@ -259,8 +259,8 @@ flowchart LR 229["SweepEdge Adjacent"] 230["SweepEdge Opposite"] 231["SweepEdge Adjacent"] - 232["Plane
[5295, 5315, 0]"] - 243["Sweep Revolve
[7870, 7924, 0]"] + 232["Plane
[5302, 5322, 0]"] + 243["Sweep Revolve
[7781, 7835, 0]"] 244[Wall] 245[Wall] 246[Wall] @@ -289,8 +289,8 @@ flowchart LR 269["SweepEdge Adjacent"] 270["StartSketchOnPlane
[1159, 1179, 0]"] 271["StartSketchOnPlane
[1159, 1179, 0]"] - 272["StartSketchOnFace
[3093, 3130, 0]"] - 273["StartSketchOnPlane
[4533, 4580, 0]"] + 272["StartSketchOnFace
[3093, 3137, 0]"] + 273["StartSketchOnPlane
[4540, 4587, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/ast.snap b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/ast.snap index 613f738ae..8ea20e686 100644 --- a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/ast.snap @@ -3790,29 +3790,23 @@ description: Result of parsing gridfinity-bins-stacking-lip.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "singleBinFill", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "\"start\"", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "start" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "\"start\"", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "start" + } } ], "callee": { @@ -3833,8 +3827,24 @@ description: Result of parsing gridfinity-bins-stacking-lip.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "singleBinFill", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -7507,7 +7517,7 @@ description: Result of parsing gridfinity-bins-stacking-lip.kcl "key": { "commentStart": 0, "end": 0, - "name": "plane", + "name": "origin", "start": 0, "type": "Identifier" }, @@ -7515,300 +7525,278 @@ description: Result of parsing gridfinity-bins-stacking-lip.kcl "type": "ObjectProperty", "value": { "commentStart": 0, + "elements": [ + { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "cornerRadius", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "left": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "height", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "operator": "+", + "right": { + "commentStart": 0, + "end": 0, + "left": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "binHeight", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "operator": "*", + "right": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "countBinHeight", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + } + ], "end": 0, - "properties": [ + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "xAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "origin", - "start": 0, - "type": "Identifier" - }, + "raw": "0.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "cornerRadius", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "left": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "height", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "operator": "+", - "right": { - "commentStart": 0, - "end": 0, - "left": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "binHeight", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "operator": "*", - "right": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "countBinHeight", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.0, + "suffix": "None" } }, { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "xAxis", - "start": 0, - "type": "Identifier" - }, + "raw": "1.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 1.0, + "suffix": "None" } }, { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "yAxis", - "start": 0, - "type": "Identifier" - }, + "raw": "0.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "zAxis", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.0, + "suffix": "None" } } ], + "end": 0, "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "yAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "zAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" } } ], @@ -7847,7 +7835,7 @@ description: Result of parsing gridfinity-bins-stacking-lip.kcl "key": { "commentStart": 0, "end": 0, - "name": "plane", + "name": "origin", "start": 0, "type": "Identifier" }, @@ -7855,300 +7843,278 @@ description: Result of parsing gridfinity-bins-stacking-lip.kcl "type": "ObjectProperty", "value": { "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "cornerRadius", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + { + "commentStart": 0, + "end": 0, + "left": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "height", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "operator": "+", + "right": { + "commentStart": 0, + "end": 0, + "left": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "binHeight", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "operator": "*", + "right": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "countBinHeight", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + } + ], "end": 0, - "properties": [ + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "xAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "origin", - "start": 0, - "type": "Identifier" - }, + "raw": "1.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "cornerRadius", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "left": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "height", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "operator": "+", - "right": { - "commentStart": 0, - "end": 0, - "left": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "binHeight", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "operator": "*", - "right": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "countBinHeight", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 1.0, + "suffix": "None" } }, { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "xAxis", - "start": 0, - "type": "Identifier" - }, + "raw": "0.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.0, + "suffix": "None" } }, { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "yAxis", - "start": 0, - "type": "Identifier" - }, + "raw": "0.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "zAxis", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.0, + "suffix": "None" } } ], + "end": 0, "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "yAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "zAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" } } ], @@ -8187,7 +8153,7 @@ description: Result of parsing gridfinity-bins-stacking-lip.kcl "key": { "commentStart": 0, "end": 0, - "name": "plane", + "name": "origin", "start": 0, "type": "Identifier" }, @@ -8195,392 +8161,370 @@ description: Result of parsing gridfinity-bins-stacking-lip.kcl "type": "ObjectProperty", "value": { "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "left": { + "commentStart": 0, + "end": 0, + "left": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "countBinWidth", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "operator": "*", + "right": { + "commentStart": 0, + "end": 0, + "left": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "binLength", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "operator": "+", + "right": { + "commentStart": 0, + "end": 0, + "left": { + "commentStart": 0, + "end": 0, + "raw": "2", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 2.0, + "suffix": "None" + } + }, + "operator": "*", + "right": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "binTol", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + }, + "operator": "-", + "right": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "cornerRadius", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "left": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "height", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "operator": "+", + "right": { + "commentStart": 0, + "end": 0, + "left": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "binHeight", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "operator": "*", + "right": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "countBinHeight", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + } + ], "end": 0, - "properties": [ + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "xAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "origin", - "start": 0, - "type": "Identifier" - }, + "raw": "0.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "left": { - "commentStart": 0, - "end": 0, - "left": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "countBinWidth", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "operator": "*", - "right": { - "commentStart": 0, - "end": 0, - "left": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "binLength", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "operator": "+", - "right": { - "commentStart": 0, - "end": 0, - "left": { - "commentStart": 0, - "end": 0, - "raw": "2", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 2.0, - "suffix": "None" - } - }, - "operator": "*", - "right": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "binTol", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "operator": "-", - "right": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "cornerRadius", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "left": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "height", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "operator": "+", - "right": { - "commentStart": 0, - "end": 0, - "left": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "binHeight", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "operator": "*", - "right": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "countBinHeight", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.0, + "suffix": "None" } }, { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "xAxis", - "start": 0, - "type": "Identifier" - }, + "raw": "1.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 1.0, + "suffix": "None" } }, { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "yAxis", - "start": 0, - "type": "Identifier" - }, + "raw": "0.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "zAxis", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.0, + "suffix": "None" } } ], + "end": 0, "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "yAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "zAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" } } ], diff --git a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/ops.snap b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/ops.snap index b3711aa08..5399eed75 100644 --- a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/ops.snap @@ -50,7 +50,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -171,16 +171,26 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl "type": "Number", "value": 21.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 21.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, { @@ -284,7 +294,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -480,16 +490,26 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl "type": "Number", "value": 21.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 21.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, { @@ -548,7 +568,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -651,16 +671,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -671,7 +682,15 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1481,7 +1500,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1632,8 +1651,8 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl "type": "FunctionCall", "name": "lipFace", "functionSourceRange": [ - 5270, - 5886, + 5277, + 5893, 0 ], "unlabeledArg": null, @@ -1643,190 +1662,185 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 3.75, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 3.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 11.75, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 11.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -1879,8 +1893,8 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl "type": "FunctionCall", "name": "lipFace", "functionSourceRange": [ - 5270, - 5886, + 5277, + 5893, 0 ], "unlabeledArg": null, @@ -1890,190 +1904,185 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 3.75, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 11.75, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 3.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 11.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -2424,8 +2433,8 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl "type": "FunctionCall", "name": "lipFace", "functionSourceRange": [ - 5270, - 5886, + 5277, + 5893, 0 ], "unlabeledArg": null, @@ -2435,190 +2444,185 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 3.75, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 3.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 11.75, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 11.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -2746,8 +2750,8 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl "type": "FunctionCall", "name": "lipFace", "functionSourceRange": [ - 5270, - 5886, + 5277, + 5893, 0 ], "unlabeledArg": null, @@ -2757,190 +2761,185 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 80.25, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 80.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 11.75, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 11.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, diff --git a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/program_memory.snap index 0be4d44ce..1caaa9aa0 100644 --- a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/program_memory.snap @@ -328,22 +328,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -551,22 +563,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -774,22 +798,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -997,22 +1033,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1220,22 +1268,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1443,22 +1503,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1666,22 +1738,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1889,22 +1973,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2112,22 +2208,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2335,22 +2443,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2558,22 +2678,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2781,22 +2913,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3004,22 +3148,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3227,22 +3383,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3450,22 +3618,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3673,22 +3853,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3896,22 +4088,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4119,22 +4323,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4342,22 +4558,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4565,22 +4793,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4788,22 +5028,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5011,22 +5263,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5234,22 +5498,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5457,22 +5733,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5688,22 +5976,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5758,28 +6058,72 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -5962,22 +6306,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6032,28 +6388,72 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -6236,22 +6636,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6306,28 +6718,72 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -6510,22 +6966,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6580,28 +7048,72 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -6784,22 +7296,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6854,28 +7378,72 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -7058,22 +7626,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7128,28 +7708,72 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -7360,22 +7984,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7583,22 +8219,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7806,22 +8454,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8029,22 +8689,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8252,22 +8924,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8475,22 +9159,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8698,22 +9394,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8921,22 +9629,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9144,22 +9864,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9367,22 +10099,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9590,22 +10334,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9813,22 +10569,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10036,22 +10804,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10259,22 +11039,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10482,22 +11274,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10705,22 +11509,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10928,22 +11744,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11151,22 +11979,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11374,22 +12214,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11597,22 +12449,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11820,22 +12684,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12043,22 +12919,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12266,22 +13154,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12489,22 +13389,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12582,9 +13494,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 4680, - "end": 4688, - "start": 4680, + "commentStart": 4687, + "end": 4695, + "start": 4687, "type": "TagDeclarator", "value": "line010" }, @@ -12595,9 +13507,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 4759, - "end": 4767, - "start": 4759, + "commentStart": 4766, + "end": 4774, + "start": 4766, "type": "TagDeclarator", "value": "line011" }, @@ -12608,9 +13520,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 4818, - "end": 4826, - "start": 4818, + "commentStart": 4825, + "end": 4833, + "start": 4825, "type": "TagDeclarator", "value": "line012" }, @@ -12621,9 +13533,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 4845, - "end": 4853, - "start": 4845, + "commentStart": 4852, + "end": 4860, + "start": 4852, "type": "TagDeclarator", "value": "line013" }, @@ -12644,9 +13556,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 0.0 ], "tag": { - "commentStart": 4680, - "end": 4688, - "start": 4680, + "commentStart": 4687, + "end": 4695, + "start": 4687, "type": "TagDeclarator", "value": "line010" }, @@ -12669,9 +13581,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 0.0 ], "tag": { - "commentStart": 4759, - "end": 4767, - "start": 4759, + "commentStart": 4766, + "end": 4774, + "start": 4766, "type": "TagDeclarator", "value": "line011" }, @@ -12694,9 +13606,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 126.0 ], "tag": { - "commentStart": 4818, - "end": 4826, - "start": 4818, + "commentStart": 4825, + "end": 4833, + "start": 4825, "type": "TagDeclarator", "value": "line012" }, @@ -12719,9 +13631,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 126.0 ], "tag": { - "commentStart": 4845, - "end": 4853, - "start": 4845, + "commentStart": 4852, + "end": 4860, + "start": 4852, "type": "TagDeclarator", "value": "line013" }, @@ -12743,22 +13655,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 0.0, "y": 0.0, - "z": 4.75 + "z": 4.75, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12813,28 +13737,72 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc { "type": "fillet", "id": "[uuid]", - "radius": 3.75, + "radius": { + "n": 3.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 3.75, + "radius": { + "n": 3.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 3.75, + "radius": { + "n": 3.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 3.75, + "radius": { + "n": 3.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -13030,22 +13998,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13253,22 +14233,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13476,22 +14468,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13699,22 +14703,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13877,9 +14893,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -13890,9 +14906,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -13903,9 +14919,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -13961,9 +14977,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 0.0 ], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -13992,9 +15008,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc ], "radius": 0.5, "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -14017,9 +15033,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 6.1464 ], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -14136,22 +15152,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 3.75, "y": 0.0, - "z": 11.75 + "z": 11.75, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -14215,9 +15243,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -14228,9 +15256,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -14241,9 +15269,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -14299,9 +15327,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 0.0 ], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -14330,9 +15358,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc ], "radius": 0.5, "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -14355,9 +15383,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 6.1464 ], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -14474,22 +15502,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 3.75, "y": 0.0, - "z": 11.75 + "z": 11.75, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -14558,9 +15598,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -14571,9 +15611,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -14584,9 +15624,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -14642,9 +15682,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 0.0 ], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -14673,9 +15713,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc ], "radius": 0.5, "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -14698,9 +15738,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 6.1464 ], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -14817,22 +15857,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 80.25, "y": 0.0, - "z": 11.75 + "z": 11.75, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -14896,9 +15948,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -14909,9 +15961,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -14922,9 +15974,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -14980,9 +16032,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 0.0 ], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -15011,9 +16063,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc ], "radius": 0.5, "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -15036,9 +16088,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 6.1464 ], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -15155,22 +16207,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 80.25, "y": 0.0, - "z": 11.75 + "z": 11.75, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -15255,9 +16319,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -15268,9 +16332,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -15281,9 +16345,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -15339,9 +16403,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 0.0 ], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -15370,9 +16434,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc ], "radius": 0.5, "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -15395,9 +16459,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 6.1464 ], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -15514,22 +16578,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 3.75, "y": 0.0, - "z": 11.75 + "z": 11.75, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -15593,9 +16669,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -15606,9 +16682,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -15619,9 +16695,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -15677,9 +16753,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 0.0 ], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -15708,9 +16784,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc ], "radius": 0.5, "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -15733,9 +16809,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 6.1464 ], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -15852,22 +16928,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 3.75, "y": 0.0, - "z": 11.75 + "z": 11.75, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -15946,9 +17034,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -15959,9 +17047,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -15972,9 +17060,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -16030,9 +17118,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 0.0 ], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -16061,9 +17149,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc ], "radius": 0.5, "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -16086,9 +17174,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 6.1464 ], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -16205,22 +17293,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 3.75, "y": 0.0, - "z": 11.75 + "z": 11.75, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -16284,9 +17384,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -16297,9 +17397,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -16310,9 +17410,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -16368,9 +17468,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 0.0 ], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -16399,9 +17499,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc ], "radius": 0.5, "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -16424,9 +17524,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 6.1464 ], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -16543,22 +17643,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 3.75, "y": 0.0, - "z": 11.75 + "z": 11.75, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -16622,9 +17734,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -16635,9 +17747,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -16648,9 +17760,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -16706,9 +17818,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 0.0 ], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -16737,9 +17849,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc ], "radius": 0.5, "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -16762,9 +17874,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 6.1464 ], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -16881,22 +17993,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 0.0, "y": 3.75, - "z": 11.75 + "z": 11.75, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -16960,9 +18084,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -16973,9 +18097,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -16986,9 +18110,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -17044,9 +18168,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 0.0 ], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -17075,9 +18199,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc ], "radius": 0.5, "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -17100,9 +18224,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 6.1464 ], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -17219,22 +18343,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 80.25, "y": 0.0, - "z": 11.75 + "z": 11.75, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -17366,9 +18502,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -17379,9 +18515,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -17392,9 +18528,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -17450,9 +18586,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 0.0 ], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -17481,9 +18617,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc ], "radius": 0.5, "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -17506,9 +18642,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 6.1464 ], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -17625,22 +18761,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 0.0, "y": 3.75, - "z": 11.75 + "z": 11.75, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -17704,9 +18852,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -17717,9 +18865,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -17730,9 +18878,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -17788,9 +18936,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 0.0 ], "tag": { - "commentStart": 5442, - "end": 5450, - "start": 5442, + "commentStart": 5449, + "end": 5457, + "start": 5449, "type": "TagDeclarator", "value": "line000" }, @@ -17819,9 +18967,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc ], "radius": 0.5, "tag": { - "commentStart": 5560, - "end": 5567, - "start": 5560, + "commentStart": 5567, + "end": 5574, + "start": 5567, "type": "TagDeclarator", "value": "arc000" }, @@ -17844,9 +18992,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc 6.1464 ], "tag": { - "commentStart": 5671, - "end": 5679, - "start": 5671, + "commentStart": 5678, + "end": 5686, + "start": 5678, "type": "TagDeclarator", "value": "line001" }, @@ -17963,22 +19111,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 0.0, "y": 3.75, - "z": 11.75 + "z": 11.75, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -18088,17 +19248,26 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -18271,22 +19440,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -18341,28 +19522,72 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -18460,17 +19685,26 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -18643,22 +19877,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -18713,28 +19959,72 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -18832,17 +20122,26 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -19015,22 +20314,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -19085,28 +20396,72 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -19204,17 +20559,26 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -19387,22 +20751,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -19457,28 +20833,72 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -19567,558 +20987,543 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "plane000": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 3.75, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 3.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 11.75, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 11.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, "plane001": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 3.75, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 11.75, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 3.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 11.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, "plane002": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 80.25, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 80.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 11.75, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 11.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -20308,22 +21713,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -20531,22 +21948,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -20754,22 +22183,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -20977,22 +22418,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -21205,22 +22658,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -21275,28 +22740,72 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -21476,22 +22985,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -21699,22 +23220,34 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/artifact_graph_flowchart.snap.md index 06c025bfc..7917af109 100644 --- a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/artifact_graph_flowchart.snap.md @@ -29,16 +29,16 @@ flowchart LR 61[Solid2d] end subgraph path81 [Path] - 81["Path
[2877, 3043, 0]"] - 82["Segment
[2877, 3043, 0]"] + 81["Path
[2884, 3050, 0]"] + 82["Segment
[2884, 3050, 0]"] 83[Solid2d] end subgraph path93 [Path] - 93["Path
[4356, 4381, 0]"] - 94["Segment
[4387, 4459, 0]"] - 95["Segment
[4465, 4538, 0]"] - 96["Segment
[4544, 4597, 0]"] - 97["Segment
[4603, 4624, 0]"] + 93["Path
[4363, 4388, 0]"] + 94["Segment
[4394, 4466, 0]"] + 95["Segment
[4472, 4545, 0]"] + 96["Segment
[4551, 4604, 0]"] + 97["Segment
[4610, 4631, 0]"] 98[Solid2d] end 1["Plane
[1282, 1329, 0]"] @@ -99,16 +99,16 @@ flowchart LR 78["EdgeCut Fillet
[2587, 2817, 0]"] 79["EdgeCut Fillet
[2587, 2817, 0]"] 80["EdgeCut Fillet
[2587, 2817, 0]"] - 84["Sweep Extrusion
[3265, 3292, 0]"] + 84["Sweep Extrusion
[3272, 3299, 0]"] 85[Wall] 86["Cap Start"] 87["SweepEdge Opposite"] 88["SweepEdge Adjacent"] - 89["Sweep Extrusion
[3265, 3292, 0]"] - 90["Sweep Extrusion
[3265, 3292, 0]"] - 91["Sweep Extrusion
[3265, 3292, 0]"] - 92["Plane
[4317, 4349, 0]"] - 99["Sweep Extrusion
[4630, 4674, 0]"] + 89["Sweep Extrusion
[3272, 3299, 0]"] + 90["Sweep Extrusion
[3272, 3299, 0]"] + 91["Sweep Extrusion
[3272, 3299, 0]"] + 92["Plane
[4324, 4356, 0]"] + 99["Sweep Extrusion
[4637, 4681, 0]"] 100[Wall] 101[Wall] 102[Wall] @@ -123,14 +123,14 @@ flowchart LR 111["SweepEdge Adjacent"] 112["SweepEdge Opposite"] 113["SweepEdge Adjacent"] - 114["EdgeCut Fillet
[4680, 4913, 0]"] - 115["EdgeCut Fillet
[4680, 4913, 0]"] - 116["EdgeCut Fillet
[4680, 4913, 0]"] - 117["EdgeCut Fillet
[4680, 4913, 0]"] + 114["EdgeCut Fillet
[4687, 4920, 0]"] + 115["EdgeCut Fillet
[4687, 4920, 0]"] + 116["EdgeCut Fillet
[4687, 4920, 0]"] + 117["EdgeCut Fillet
[4687, 4920, 0]"] 118["StartSketchOnPlane
[900, 920, 0]"] 119["StartSketchOnPlane
[900, 920, 0]"] - 120["StartSketchOnFace
[2834, 2871, 0]"] - 121["StartSketchOnPlane
[4303, 4350, 0]"] + 120["StartSketchOnFace
[2834, 2878, 0]"] + 121["StartSketchOnPlane
[4310, 4357, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/ast.snap b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/ast.snap index 911d625a5..33a8f478e 100644 --- a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/ast.snap @@ -3459,29 +3459,23 @@ description: Result of parsing gridfinity-bins.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "singleBinFill", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "\"start\"", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "start" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "\"start\"", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "start" + } } ], "callee": { @@ -3502,8 +3496,24 @@ description: Result of parsing gridfinity-bins.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "singleBinFill", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/ops.snap b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/ops.snap index f6ab961a6..257b903f6 100644 --- a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/ops.snap @@ -50,7 +50,7 @@ description: Operations executed gridfinity-bins.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -171,16 +171,26 @@ description: Operations executed gridfinity-bins.kcl "type": "Number", "value": 21.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 21.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, { @@ -284,7 +294,7 @@ description: Operations executed gridfinity-bins.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -480,16 +490,26 @@ description: Operations executed gridfinity-bins.kcl "type": "Number", "value": 21.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, { "type": "Number", "value": 21.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, { @@ -548,7 +568,7 @@ description: Operations executed gridfinity-bins.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -651,16 +671,7 @@ description: Operations executed gridfinity-bins.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -671,7 +682,15 @@ description: Operations executed gridfinity-bins.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1481,7 +1500,7 @@ description: Operations executed gridfinity-bins.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/program_memory.snap index 37cc8e77d..82719e65e 100644 --- a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/program_memory.snap @@ -256,22 +256,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -479,22 +491,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -702,22 +726,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -925,22 +961,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1148,22 +1196,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1371,22 +1431,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1594,22 +1666,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1817,22 +1901,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2040,22 +2136,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2263,22 +2371,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2486,22 +2606,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2709,22 +2841,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2932,22 +3076,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3155,22 +3311,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3378,22 +3546,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3601,22 +3781,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3824,22 +4016,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4047,22 +4251,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4270,22 +4486,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4493,22 +4721,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4716,22 +4956,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4939,22 +5191,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5162,22 +5426,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5385,22 +5661,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5616,22 +5904,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5686,28 +5986,72 @@ description: Variables in memory after executing gridfinity-bins.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -5890,22 +6234,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5960,28 +6316,72 @@ description: Variables in memory after executing gridfinity-bins.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -6164,22 +6564,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6234,28 +6646,72 @@ description: Variables in memory after executing gridfinity-bins.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -6438,22 +6894,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6508,28 +6976,72 @@ description: Variables in memory after executing gridfinity-bins.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -6712,22 +7224,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6782,28 +7306,72 @@ description: Variables in memory after executing gridfinity-bins.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -6986,22 +7554,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7056,28 +7636,72 @@ description: Variables in memory after executing gridfinity-bins.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -7288,22 +7912,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7511,22 +8147,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7734,22 +8382,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7957,22 +8617,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8180,22 +8852,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8403,22 +9087,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8626,22 +9322,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8849,22 +9557,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9072,22 +9792,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9295,22 +10027,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9518,22 +10262,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9741,22 +10497,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9964,22 +10732,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10187,22 +10967,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10410,22 +11202,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10633,22 +11437,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10856,22 +11672,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11079,22 +11907,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11302,22 +12142,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11525,22 +12377,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11748,22 +12612,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11971,22 +12847,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12194,22 +13082,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12417,22 +13317,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12510,9 +13422,9 @@ description: Variables in memory after executing gridfinity-bins.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 4450, - "end": 4458, - "start": 4450, + "commentStart": 4457, + "end": 4465, + "start": 4457, "type": "TagDeclarator", "value": "line010" }, @@ -12523,9 +13435,9 @@ description: Variables in memory after executing gridfinity-bins.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 4529, - "end": 4537, - "start": 4529, + "commentStart": 4536, + "end": 4544, + "start": 4536, "type": "TagDeclarator", "value": "line011" }, @@ -12536,9 +13448,9 @@ description: Variables in memory after executing gridfinity-bins.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 4588, - "end": 4596, - "start": 4588, + "commentStart": 4595, + "end": 4603, + "start": 4595, "type": "TagDeclarator", "value": "line012" }, @@ -12549,9 +13461,9 @@ description: Variables in memory after executing gridfinity-bins.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 4615, - "end": 4623, - "start": 4615, + "commentStart": 4622, + "end": 4630, + "start": 4622, "type": "TagDeclarator", "value": "line013" }, @@ -12572,9 +13484,9 @@ description: Variables in memory after executing gridfinity-bins.kcl 0.0 ], "tag": { - "commentStart": 4450, - "end": 4458, - "start": 4450, + "commentStart": 4457, + "end": 4465, + "start": 4457, "type": "TagDeclarator", "value": "line010" }, @@ -12597,9 +13509,9 @@ description: Variables in memory after executing gridfinity-bins.kcl 0.0 ], "tag": { - "commentStart": 4529, - "end": 4537, - "start": 4529, + "commentStart": 4536, + "end": 4544, + "start": 4536, "type": "TagDeclarator", "value": "line011" }, @@ -12622,9 +13534,9 @@ description: Variables in memory after executing gridfinity-bins.kcl 126.0 ], "tag": { - "commentStart": 4588, - "end": 4596, - "start": 4588, + "commentStart": 4595, + "end": 4603, + "start": 4595, "type": "TagDeclarator", "value": "line012" }, @@ -12647,9 +13559,9 @@ description: Variables in memory after executing gridfinity-bins.kcl 126.0 ], "tag": { - "commentStart": 4615, - "end": 4623, - "start": 4615, + "commentStart": 4622, + "end": 4630, + "start": 4622, "type": "TagDeclarator", "value": "line013" }, @@ -12671,22 +13583,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 4.75 + "z": 4.75, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12741,28 +13665,72 @@ description: Variables in memory after executing gridfinity-bins.kcl { "type": "fillet", "id": "[uuid]", - "radius": 3.75, + "radius": { + "n": 3.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 3.75, + "radius": { + "n": 3.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 3.75, + "radius": { + "n": 3.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 3.75, + "radius": { + "n": 3.75, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -12958,22 +13926,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13181,22 +14161,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13404,22 +14396,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13627,22 +14631,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13846,17 +14862,26 @@ description: Variables in memory after executing gridfinity-bins.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -14029,22 +15054,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -14099,28 +15136,72 @@ description: Variables in memory after executing gridfinity-bins.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -14218,17 +15299,26 @@ description: Variables in memory after executing gridfinity-bins.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -14401,22 +15491,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -14471,28 +15573,72 @@ description: Variables in memory after executing gridfinity-bins.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -14590,17 +15736,26 @@ description: Variables in memory after executing gridfinity-bins.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -14773,22 +15928,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -14843,28 +16010,72 @@ description: Variables in memory after executing gridfinity-bins.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -14962,17 +16173,26 @@ description: Variables in memory after executing gridfinity-bins.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -15145,22 +16365,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -15215,28 +16447,72 @@ description: Variables in memory after executing gridfinity-bins.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -15508,22 +16784,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -15731,22 +17019,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -15954,22 +17254,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -16177,22 +17489,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -16405,22 +17729,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -16475,28 +17811,72 @@ description: Variables in memory after executing gridfinity-bins.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.8, + "radius": { + "n": 0.8, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -16676,22 +18056,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -16899,22 +18291,34 @@ description: Variables in memory after executing gridfinity-bins.kcl "origin": { "x": 4.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/kcl_samples/hex-nut/ops.snap b/rust/kcl-lib/tests/kcl_samples/hex-nut/ops.snap index d38cdded4..eaa34747c 100644 --- a/rust/kcl-lib/tests/kcl_samples/hex-nut/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/hex-nut/ops.snap @@ -20,7 +20,7 @@ description: Operations executed hex-nut.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/kcl_samples/i-beam/ops.snap b/rust/kcl-lib/tests/kcl_samples/i-beam/ops.snap index b5923de15..6a23fb2ba 100644 --- a/rust/kcl-lib/tests/kcl_samples/i-beam/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/i-beam/ops.snap @@ -5,7 +5,7 @@ description: Operations executed i-beam.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/kcl_samples/i-beam/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/i-beam/program_memory.snap index b2d258d41..d178fdb9e 100644 --- a/rust/kcl-lib/tests/kcl_samples/i-beam/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/i-beam/program_memory.snap @@ -175,22 +175,34 @@ description: Variables in memory after executing i-beam.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" diff --git a/rust/kcl-lib/tests/kcl_samples/keyboard/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/keyboard/artifact_graph_flowchart.snap.md index 45defc898..3d45e2e0f 100644 --- a/rust/kcl-lib/tests/kcl_samples/keyboard/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/keyboard/artifact_graph_flowchart.snap.md @@ -10,348 +10,348 @@ flowchart LR 8[Solid2d] end subgraph path28 [Path] - 28["Path
[1196, 1250, 0]"] - 29["Segment
[1196, 1250, 0]"] + 28["Path
[1203, 1257, 0]"] + 29["Segment
[1203, 1257, 0]"] 30[Solid2d] end subgraph path31 [Path] - 31["Path
[1264, 1317, 0]"] - 32["Segment
[1264, 1317, 0]"] + 31["Path
[1271, 1324, 0]"] + 32["Segment
[1271, 1324, 0]"] 33[Solid2d] end subgraph path34 [Path] - 34["Path
[1331, 1391, 0]"] - 35["Segment
[1331, 1391, 0]"] + 34["Path
[1338, 1398, 0]"] + 35["Segment
[1338, 1398, 0]"] 36[Solid2d] end subgraph path37 [Path] - 37["Path
[1405, 1464, 0]"] - 38["Segment
[1405, 1464, 0]"] + 37["Path
[1412, 1471, 0]"] + 38["Segment
[1412, 1471, 0]"] 39[Solid2d] end subgraph path61 [Path] - 61["Path
[2010, 2069, 0]"] - 62["Segment
[2077, 2169, 0]"] - 63["Segment
[2177, 2251, 0]"] - 64["Segment
[2259, 2306, 0]"] - 65["Segment
[2314, 2421, 0]"] - 66["Segment
[2429, 2476, 0]"] - 67["Segment
[2484, 2601, 0]"] - 68["Segment
[2609, 2656, 0]"] - 69["Segment
[2664, 2749, 0]"] - 70["Segment
[2757, 2764, 0]"] + 61["Path
[1993, 2052, 0]"] + 62["Segment
[2060, 2152, 0]"] + 63["Segment
[2160, 2234, 0]"] + 64["Segment
[2242, 2289, 0]"] + 65["Segment
[2297, 2404, 0]"] + 66["Segment
[2412, 2459, 0]"] + 67["Segment
[2467, 2584, 0]"] + 68["Segment
[2592, 2639, 0]"] + 69["Segment
[2647, 2732, 0]"] + 70["Segment
[2740, 2747, 0]"] 71[Solid2d] end subgraph path100 [Path] - 100["Path
[2010, 2069, 0]"] - 101["Segment
[2077, 2169, 0]"] - 102["Segment
[2177, 2251, 0]"] - 103["Segment
[2259, 2306, 0]"] - 104["Segment
[2314, 2421, 0]"] - 105["Segment
[2429, 2476, 0]"] - 106["Segment
[2484, 2601, 0]"] - 107["Segment
[2609, 2656, 0]"] - 108["Segment
[2664, 2749, 0]"] - 109["Segment
[2757, 2764, 0]"] + 100["Path
[1993, 2052, 0]"] + 101["Segment
[2060, 2152, 0]"] + 102["Segment
[2160, 2234, 0]"] + 103["Segment
[2242, 2289, 0]"] + 104["Segment
[2297, 2404, 0]"] + 105["Segment
[2412, 2459, 0]"] + 106["Segment
[2467, 2584, 0]"] + 107["Segment
[2592, 2639, 0]"] + 108["Segment
[2647, 2732, 0]"] + 109["Segment
[2740, 2747, 0]"] 110[Solid2d] end subgraph path139 [Path] - 139["Path
[2010, 2069, 0]"] - 140["Segment
[2077, 2169, 0]"] - 141["Segment
[2177, 2251, 0]"] - 142["Segment
[2259, 2306, 0]"] - 143["Segment
[2314, 2421, 0]"] - 144["Segment
[2429, 2476, 0]"] - 145["Segment
[2484, 2601, 0]"] - 146["Segment
[2609, 2656, 0]"] - 147["Segment
[2664, 2749, 0]"] - 148["Segment
[2757, 2764, 0]"] + 139["Path
[1993, 2052, 0]"] + 140["Segment
[2060, 2152, 0]"] + 141["Segment
[2160, 2234, 0]"] + 142["Segment
[2242, 2289, 0]"] + 143["Segment
[2297, 2404, 0]"] + 144["Segment
[2412, 2459, 0]"] + 145["Segment
[2467, 2584, 0]"] + 146["Segment
[2592, 2639, 0]"] + 147["Segment
[2647, 2732, 0]"] + 148["Segment
[2740, 2747, 0]"] 149[Solid2d] end subgraph path178 [Path] - 178["Path
[2010, 2069, 0]"] - 179["Segment
[2077, 2169, 0]"] - 180["Segment
[2177, 2251, 0]"] - 181["Segment
[2259, 2306, 0]"] - 182["Segment
[2314, 2421, 0]"] - 183["Segment
[2429, 2476, 0]"] - 184["Segment
[2484, 2601, 0]"] - 185["Segment
[2609, 2656, 0]"] - 186["Segment
[2664, 2749, 0]"] - 187["Segment
[2757, 2764, 0]"] + 178["Path
[1993, 2052, 0]"] + 179["Segment
[2060, 2152, 0]"] + 180["Segment
[2160, 2234, 0]"] + 181["Segment
[2242, 2289, 0]"] + 182["Segment
[2297, 2404, 0]"] + 183["Segment
[2412, 2459, 0]"] + 184["Segment
[2467, 2584, 0]"] + 185["Segment
[2592, 2639, 0]"] + 186["Segment
[2647, 2732, 0]"] + 187["Segment
[2740, 2747, 0]"] 188[Solid2d] end subgraph path217 [Path] - 217["Path
[2010, 2069, 0]"] - 218["Segment
[2077, 2169, 0]"] - 219["Segment
[2177, 2251, 0]"] - 220["Segment
[2259, 2306, 0]"] - 221["Segment
[2314, 2421, 0]"] - 222["Segment
[2429, 2476, 0]"] - 223["Segment
[2484, 2601, 0]"] - 224["Segment
[2609, 2656, 0]"] - 225["Segment
[2664, 2749, 0]"] - 226["Segment
[2757, 2764, 0]"] + 217["Path
[1993, 2052, 0]"] + 218["Segment
[2060, 2152, 0]"] + 219["Segment
[2160, 2234, 0]"] + 220["Segment
[2242, 2289, 0]"] + 221["Segment
[2297, 2404, 0]"] + 222["Segment
[2412, 2459, 0]"] + 223["Segment
[2467, 2584, 0]"] + 224["Segment
[2592, 2639, 0]"] + 225["Segment
[2647, 2732, 0]"] + 226["Segment
[2740, 2747, 0]"] 227[Solid2d] end subgraph path256 [Path] - 256["Path
[2010, 2069, 0]"] - 257["Segment
[2077, 2169, 0]"] - 258["Segment
[2177, 2251, 0]"] - 259["Segment
[2259, 2306, 0]"] - 260["Segment
[2314, 2421, 0]"] - 261["Segment
[2429, 2476, 0]"] - 262["Segment
[2484, 2601, 0]"] - 263["Segment
[2609, 2656, 0]"] - 264["Segment
[2664, 2749, 0]"] - 265["Segment
[2757, 2764, 0]"] + 256["Path
[1993, 2052, 0]"] + 257["Segment
[2060, 2152, 0]"] + 258["Segment
[2160, 2234, 0]"] + 259["Segment
[2242, 2289, 0]"] + 260["Segment
[2297, 2404, 0]"] + 261["Segment
[2412, 2459, 0]"] + 262["Segment
[2467, 2584, 0]"] + 263["Segment
[2592, 2639, 0]"] + 264["Segment
[2647, 2732, 0]"] + 265["Segment
[2740, 2747, 0]"] 266[Solid2d] end subgraph path295 [Path] - 295["Path
[2010, 2069, 0]"] - 296["Segment
[2077, 2169, 0]"] - 297["Segment
[2177, 2251, 0]"] - 298["Segment
[2259, 2306, 0]"] - 299["Segment
[2314, 2421, 0]"] - 300["Segment
[2429, 2476, 0]"] - 301["Segment
[2484, 2601, 0]"] - 302["Segment
[2609, 2656, 0]"] - 303["Segment
[2664, 2749, 0]"] - 304["Segment
[2757, 2764, 0]"] + 295["Path
[1993, 2052, 0]"] + 296["Segment
[2060, 2152, 0]"] + 297["Segment
[2160, 2234, 0]"] + 298["Segment
[2242, 2289, 0]"] + 299["Segment
[2297, 2404, 0]"] + 300["Segment
[2412, 2459, 0]"] + 301["Segment
[2467, 2584, 0]"] + 302["Segment
[2592, 2639, 0]"] + 303["Segment
[2647, 2732, 0]"] + 304["Segment
[2740, 2747, 0]"] 305[Solid2d] end subgraph path334 [Path] - 334["Path
[2010, 2069, 0]"] - 335["Segment
[2077, 2169, 0]"] - 336["Segment
[2177, 2251, 0]"] - 337["Segment
[2259, 2306, 0]"] - 338["Segment
[2314, 2421, 0]"] - 339["Segment
[2429, 2476, 0]"] - 340["Segment
[2484, 2601, 0]"] - 341["Segment
[2609, 2656, 0]"] - 342["Segment
[2664, 2749, 0]"] - 343["Segment
[2757, 2764, 0]"] + 334["Path
[1993, 2052, 0]"] + 335["Segment
[2060, 2152, 0]"] + 336["Segment
[2160, 2234, 0]"] + 337["Segment
[2242, 2289, 0]"] + 338["Segment
[2297, 2404, 0]"] + 339["Segment
[2412, 2459, 0]"] + 340["Segment
[2467, 2584, 0]"] + 341["Segment
[2592, 2639, 0]"] + 342["Segment
[2647, 2732, 0]"] + 343["Segment
[2740, 2747, 0]"] 344[Solid2d] end subgraph path373 [Path] - 373["Path
[2010, 2069, 0]"] - 374["Segment
[2077, 2169, 0]"] - 375["Segment
[2177, 2251, 0]"] - 376["Segment
[2259, 2306, 0]"] - 377["Segment
[2314, 2421, 0]"] - 378["Segment
[2429, 2476, 0]"] - 379["Segment
[2484, 2601, 0]"] - 380["Segment
[2609, 2656, 0]"] - 381["Segment
[2664, 2749, 0]"] - 382["Segment
[2757, 2764, 0]"] + 373["Path
[1993, 2052, 0]"] + 374["Segment
[2060, 2152, 0]"] + 375["Segment
[2160, 2234, 0]"] + 376["Segment
[2242, 2289, 0]"] + 377["Segment
[2297, 2404, 0]"] + 378["Segment
[2412, 2459, 0]"] + 379["Segment
[2467, 2584, 0]"] + 380["Segment
[2592, 2639, 0]"] + 381["Segment
[2647, 2732, 0]"] + 382["Segment
[2740, 2747, 0]"] 383[Solid2d] end subgraph path412 [Path] - 412["Path
[2010, 2069, 0]"] - 413["Segment
[2077, 2169, 0]"] - 414["Segment
[2177, 2251, 0]"] - 415["Segment
[2259, 2306, 0]"] - 416["Segment
[2314, 2421, 0]"] - 417["Segment
[2429, 2476, 0]"] - 418["Segment
[2484, 2601, 0]"] - 419["Segment
[2609, 2656, 0]"] - 420["Segment
[2664, 2749, 0]"] - 421["Segment
[2757, 2764, 0]"] + 412["Path
[1993, 2052, 0]"] + 413["Segment
[2060, 2152, 0]"] + 414["Segment
[2160, 2234, 0]"] + 415["Segment
[2242, 2289, 0]"] + 416["Segment
[2297, 2404, 0]"] + 417["Segment
[2412, 2459, 0]"] + 418["Segment
[2467, 2584, 0]"] + 419["Segment
[2592, 2639, 0]"] + 420["Segment
[2647, 2732, 0]"] + 421["Segment
[2740, 2747, 0]"] 422[Solid2d] end subgraph path451 [Path] - 451["Path
[2010, 2069, 0]"] - 452["Segment
[2077, 2169, 0]"] - 453["Segment
[2177, 2251, 0]"] - 454["Segment
[2259, 2306, 0]"] - 455["Segment
[2314, 2421, 0]"] - 456["Segment
[2429, 2476, 0]"] - 457["Segment
[2484, 2601, 0]"] - 458["Segment
[2609, 2656, 0]"] - 459["Segment
[2664, 2749, 0]"] - 460["Segment
[2757, 2764, 0]"] + 451["Path
[1993, 2052, 0]"] + 452["Segment
[2060, 2152, 0]"] + 453["Segment
[2160, 2234, 0]"] + 454["Segment
[2242, 2289, 0]"] + 455["Segment
[2297, 2404, 0]"] + 456["Segment
[2412, 2459, 0]"] + 457["Segment
[2467, 2584, 0]"] + 458["Segment
[2592, 2639, 0]"] + 459["Segment
[2647, 2732, 0]"] + 460["Segment
[2740, 2747, 0]"] 461[Solid2d] end subgraph path490 [Path] - 490["Path
[2010, 2069, 0]"] - 491["Segment
[2077, 2169, 0]"] - 492["Segment
[2177, 2251, 0]"] - 493["Segment
[2259, 2306, 0]"] - 494["Segment
[2314, 2421, 0]"] - 495["Segment
[2429, 2476, 0]"] - 496["Segment
[2484, 2601, 0]"] - 497["Segment
[2609, 2656, 0]"] - 498["Segment
[2664, 2749, 0]"] - 499["Segment
[2757, 2764, 0]"] + 490["Path
[1993, 2052, 0]"] + 491["Segment
[2060, 2152, 0]"] + 492["Segment
[2160, 2234, 0]"] + 493["Segment
[2242, 2289, 0]"] + 494["Segment
[2297, 2404, 0]"] + 495["Segment
[2412, 2459, 0]"] + 496["Segment
[2467, 2584, 0]"] + 497["Segment
[2592, 2639, 0]"] + 498["Segment
[2647, 2732, 0]"] + 499["Segment
[2740, 2747, 0]"] 500[Solid2d] end subgraph path529 [Path] - 529["Path
[2010, 2069, 0]"] - 530["Segment
[2077, 2169, 0]"] - 531["Segment
[2177, 2251, 0]"] - 532["Segment
[2259, 2306, 0]"] - 533["Segment
[2314, 2421, 0]"] - 534["Segment
[2429, 2476, 0]"] - 535["Segment
[2484, 2601, 0]"] - 536["Segment
[2609, 2656, 0]"] - 537["Segment
[2664, 2749, 0]"] - 538["Segment
[2757, 2764, 0]"] + 529["Path
[1993, 2052, 0]"] + 530["Segment
[2060, 2152, 0]"] + 531["Segment
[2160, 2234, 0]"] + 532["Segment
[2242, 2289, 0]"] + 533["Segment
[2297, 2404, 0]"] + 534["Segment
[2412, 2459, 0]"] + 535["Segment
[2467, 2584, 0]"] + 536["Segment
[2592, 2639, 0]"] + 537["Segment
[2647, 2732, 0]"] + 538["Segment
[2740, 2747, 0]"] 539[Solid2d] end subgraph path568 [Path] - 568["Path
[2010, 2069, 0]"] - 569["Segment
[2077, 2169, 0]"] - 570["Segment
[2177, 2251, 0]"] - 571["Segment
[2259, 2306, 0]"] - 572["Segment
[2314, 2421, 0]"] - 573["Segment
[2429, 2476, 0]"] - 574["Segment
[2484, 2601, 0]"] - 575["Segment
[2609, 2656, 0]"] - 576["Segment
[2664, 2749, 0]"] - 577["Segment
[2757, 2764, 0]"] + 568["Path
[1993, 2052, 0]"] + 569["Segment
[2060, 2152, 0]"] + 570["Segment
[2160, 2234, 0]"] + 571["Segment
[2242, 2289, 0]"] + 572["Segment
[2297, 2404, 0]"] + 573["Segment
[2412, 2459, 0]"] + 574["Segment
[2467, 2584, 0]"] + 575["Segment
[2592, 2639, 0]"] + 576["Segment
[2647, 2732, 0]"] + 577["Segment
[2740, 2747, 0]"] 578[Solid2d] end subgraph path607 [Path] - 607["Path
[2010, 2069, 0]"] - 608["Segment
[2077, 2169, 0]"] - 609["Segment
[2177, 2251, 0]"] - 610["Segment
[2259, 2306, 0]"] - 611["Segment
[2314, 2421, 0]"] - 612["Segment
[2429, 2476, 0]"] - 613["Segment
[2484, 2601, 0]"] - 614["Segment
[2609, 2656, 0]"] - 615["Segment
[2664, 2749, 0]"] - 616["Segment
[2757, 2764, 0]"] + 607["Path
[1993, 2052, 0]"] + 608["Segment
[2060, 2152, 0]"] + 609["Segment
[2160, 2234, 0]"] + 610["Segment
[2242, 2289, 0]"] + 611["Segment
[2297, 2404, 0]"] + 612["Segment
[2412, 2459, 0]"] + 613["Segment
[2467, 2584, 0]"] + 614["Segment
[2592, 2639, 0]"] + 615["Segment
[2647, 2732, 0]"] + 616["Segment
[2740, 2747, 0]"] 617[Solid2d] end subgraph path646 [Path] - 646["Path
[2010, 2069, 0]"] - 647["Segment
[2077, 2169, 0]"] - 648["Segment
[2177, 2251, 0]"] - 649["Segment
[2259, 2306, 0]"] - 650["Segment
[2314, 2421, 0]"] - 651["Segment
[2429, 2476, 0]"] - 652["Segment
[2484, 2601, 0]"] - 653["Segment
[2609, 2656, 0]"] - 654["Segment
[2664, 2749, 0]"] - 655["Segment
[2757, 2764, 0]"] + 646["Path
[1993, 2052, 0]"] + 647["Segment
[2060, 2152, 0]"] + 648["Segment
[2160, 2234, 0]"] + 649["Segment
[2242, 2289, 0]"] + 650["Segment
[2297, 2404, 0]"] + 651["Segment
[2412, 2459, 0]"] + 652["Segment
[2467, 2584, 0]"] + 653["Segment
[2592, 2639, 0]"] + 654["Segment
[2647, 2732, 0]"] + 655["Segment
[2740, 2747, 0]"] 656[Solid2d] end subgraph path685 [Path] - 685["Path
[2010, 2069, 0]"] - 686["Segment
[2077, 2169, 0]"] - 687["Segment
[2177, 2251, 0]"] - 688["Segment
[2259, 2306, 0]"] - 689["Segment
[2314, 2421, 0]"] - 690["Segment
[2429, 2476, 0]"] - 691["Segment
[2484, 2601, 0]"] - 692["Segment
[2609, 2656, 0]"] - 693["Segment
[2664, 2749, 0]"] - 694["Segment
[2757, 2764, 0]"] + 685["Path
[1993, 2052, 0]"] + 686["Segment
[2060, 2152, 0]"] + 687["Segment
[2160, 2234, 0]"] + 688["Segment
[2242, 2289, 0]"] + 689["Segment
[2297, 2404, 0]"] + 690["Segment
[2412, 2459, 0]"] + 691["Segment
[2467, 2584, 0]"] + 692["Segment
[2592, 2639, 0]"] + 693["Segment
[2647, 2732, 0]"] + 694["Segment
[2740, 2747, 0]"] 695[Solid2d] end subgraph path724 [Path] - 724["Path
[2010, 2069, 0]"] - 725["Segment
[2077, 2169, 0]"] - 726["Segment
[2177, 2251, 0]"] - 727["Segment
[2259, 2306, 0]"] - 728["Segment
[2314, 2421, 0]"] - 729["Segment
[2429, 2476, 0]"] - 730["Segment
[2484, 2601, 0]"] - 731["Segment
[2609, 2656, 0]"] - 732["Segment
[2664, 2749, 0]"] - 733["Segment
[2757, 2764, 0]"] + 724["Path
[1993, 2052, 0]"] + 725["Segment
[2060, 2152, 0]"] + 726["Segment
[2160, 2234, 0]"] + 727["Segment
[2242, 2289, 0]"] + 728["Segment
[2297, 2404, 0]"] + 729["Segment
[2412, 2459, 0]"] + 730["Segment
[2467, 2584, 0]"] + 731["Segment
[2592, 2639, 0]"] + 732["Segment
[2647, 2732, 0]"] + 733["Segment
[2740, 2747, 0]"] 734[Solid2d] end subgraph path763 [Path] - 763["Path
[2010, 2069, 0]"] - 764["Segment
[2077, 2169, 0]"] - 765["Segment
[2177, 2251, 0]"] - 766["Segment
[2259, 2306, 0]"] - 767["Segment
[2314, 2421, 0]"] - 768["Segment
[2429, 2476, 0]"] - 769["Segment
[2484, 2601, 0]"] - 770["Segment
[2609, 2656, 0]"] - 771["Segment
[2664, 2749, 0]"] - 772["Segment
[2757, 2764, 0]"] + 763["Path
[1993, 2052, 0]"] + 764["Segment
[2060, 2152, 0]"] + 765["Segment
[2160, 2234, 0]"] + 766["Segment
[2242, 2289, 0]"] + 767["Segment
[2297, 2404, 0]"] + 768["Segment
[2412, 2459, 0]"] + 769["Segment
[2467, 2584, 0]"] + 770["Segment
[2592, 2639, 0]"] + 771["Segment
[2647, 2732, 0]"] + 772["Segment
[2740, 2747, 0]"] 773[Solid2d] end subgraph path802 [Path] - 802["Path
[2010, 2069, 0]"] - 803["Segment
[2077, 2169, 0]"] - 804["Segment
[2177, 2251, 0]"] - 805["Segment
[2259, 2306, 0]"] - 806["Segment
[2314, 2421, 0]"] - 807["Segment
[2429, 2476, 0]"] - 808["Segment
[2484, 2601, 0]"] - 809["Segment
[2609, 2656, 0]"] - 810["Segment
[2664, 2749, 0]"] - 811["Segment
[2757, 2764, 0]"] + 802["Path
[1993, 2052, 0]"] + 803["Segment
[2060, 2152, 0]"] + 804["Segment
[2160, 2234, 0]"] + 805["Segment
[2242, 2289, 0]"] + 806["Segment
[2297, 2404, 0]"] + 807["Segment
[2412, 2459, 0]"] + 808["Segment
[2467, 2584, 0]"] + 809["Segment
[2592, 2639, 0]"] + 810["Segment
[2647, 2732, 0]"] + 811["Segment
[2740, 2747, 0]"] 812[Solid2d] end subgraph path841 [Path] - 841["Path
[2010, 2069, 0]"] - 842["Segment
[2077, 2169, 0]"] - 843["Segment
[2177, 2251, 0]"] - 844["Segment
[2259, 2306, 0]"] - 845["Segment
[2314, 2421, 0]"] - 846["Segment
[2429, 2476, 0]"] - 847["Segment
[2484, 2601, 0]"] - 848["Segment
[2609, 2656, 0]"] - 849["Segment
[2664, 2749, 0]"] - 850["Segment
[2757, 2764, 0]"] + 841["Path
[1993, 2052, 0]"] + 842["Segment
[2060, 2152, 0]"] + 843["Segment
[2160, 2234, 0]"] + 844["Segment
[2242, 2289, 0]"] + 845["Segment
[2297, 2404, 0]"] + 846["Segment
[2412, 2459, 0]"] + 847["Segment
[2467, 2584, 0]"] + 848["Segment
[2592, 2639, 0]"] + 849["Segment
[2647, 2732, 0]"] + 850["Segment
[2740, 2747, 0]"] 851[Solid2d] end subgraph path880 [Path] - 880["Path
[5020, 5107, 0]"] - 881["Segment
[5115, 5144, 0]"] - 882["Segment
[5152, 5180, 0]"] - 883["Segment
[5188, 5266, 0]"] - 884["Segment
[5274, 5321, 0]"] - 885["Segment
[5329, 5357, 0]"] - 886["Segment
[5365, 5394, 0]"] - 887["Segment
[5402, 5431, 0]"] - 888["Segment
[5439, 5505, 0]"] - 889["Segment
[5513, 5541, 0]"] - 890["Segment
[5549, 5578, 0]"] - 891["Segment
[5586, 5648, 0]"] - 892["Segment
[5656, 5684, 0]"] - 893["Segment
[5692, 5726, 0]"] - 894["Segment
[5734, 5764, 0]"] - 895["Segment
[5772, 5881, 0]"] - 896["Segment
[5889, 5896, 0]"] + 880["Path
[4979, 5066, 0]"] + 881["Segment
[5074, 5103, 0]"] + 882["Segment
[5111, 5139, 0]"] + 883["Segment
[5147, 5225, 0]"] + 884["Segment
[5233, 5280, 0]"] + 885["Segment
[5288, 5316, 0]"] + 886["Segment
[5324, 5353, 0]"] + 887["Segment
[5361, 5390, 0]"] + 888["Segment
[5398, 5464, 0]"] + 889["Segment
[5472, 5500, 0]"] + 890["Segment
[5508, 5537, 0]"] + 891["Segment
[5545, 5607, 0]"] + 892["Segment
[5615, 5643, 0]"] + 893["Segment
[5651, 5685, 0]"] + 894["Segment
[5693, 5723, 0]"] + 895["Segment
[5731, 5840, 0]"] + 896["Segment
[5848, 5855, 0]"] 897[Solid2d] end subgraph path950 [Path] - 950["Path
[6096, 6194, 0]"] - 951["Segment
[6202, 6321, 0]"] - 952["Segment
[6329, 6376, 0]"] - 953["Segment
[6384, 6505, 0]"] - 954["Segment
[6513, 6520, 0]"] + 950["Path
[6055, 6153, 0]"] + 951["Segment
[6161, 6280, 0]"] + 952["Segment
[6288, 6335, 0]"] + 953["Segment
[6343, 6464, 0]"] + 954["Segment
[6472, 6479, 0]"] 955[Solid2d] end subgraph path972 [Path] - 972["Path
[6628, 6725, 0]"] - 973["Segment
[6733, 6852, 0]"] - 974["Segment
[6860, 6908, 0]"] - 975["Segment
[6916, 7037, 0]"] - 976["Segment
[7045, 7052, 0]"] + 972["Path
[6587, 6684, 0]"] + 973["Segment
[6692, 6811, 0]"] + 974["Segment
[6819, 6867, 0]"] + 975["Segment
[6875, 6996, 0]"] + 976["Segment
[7004, 7011, 0]"] 977[Solid2d] end subgraph path994 [Path] - 994["Path
[6096, 6194, 0]"] - 995["Segment
[6202, 6321, 0]"] - 996["Segment
[6329, 6376, 0]"] - 997["Segment
[6384, 6505, 0]"] - 998["Segment
[6513, 6520, 0]"] + 994["Path
[6055, 6153, 0]"] + 995["Segment
[6161, 6280, 0]"] + 996["Segment
[6288, 6335, 0]"] + 997["Segment
[6343, 6464, 0]"] + 998["Segment
[6472, 6479, 0]"] 999[Solid2d] end subgraph path1016 [Path] - 1016["Path
[6628, 6725, 0]"] - 1017["Segment
[6733, 6852, 0]"] - 1018["Segment
[6860, 6908, 0]"] - 1019["Segment
[6916, 7037, 0]"] - 1020["Segment
[7045, 7052, 0]"] + 1016["Path
[6587, 6684, 0]"] + 1017["Segment
[6692, 6811, 0]"] + 1018["Segment
[6819, 6867, 0]"] + 1019["Segment
[6875, 6996, 0]"] + 1020["Segment
[7004, 7011, 0]"] 1021[Solid2d] end 1["Plane
[532, 549, 0]"] @@ -374,28 +374,28 @@ flowchart LR 25["EdgeCut Fillet
[914, 1071, 0]"] 26["EdgeCut Fillet
[914, 1071, 0]"] 27["EdgeCut Fillet
[914, 1071, 0]"] - 40["Sweep Extrusion
[1465, 1563, 0]"] + 40["Sweep Extrusion
[1472, 1570, 0]"] 41[Wall] 42["Cap End"] 43["SweepEdge Opposite"] 44["SweepEdge Adjacent"] - 45["Sweep Extrusion
[1465, 1563, 0]"] + 45["Sweep Extrusion
[1472, 1570, 0]"] 46[Wall] 47["Cap End"] 48["SweepEdge Opposite"] 49["SweepEdge Adjacent"] - 50["Sweep Extrusion
[1465, 1563, 0]"] + 50["Sweep Extrusion
[1472, 1570, 0]"] 51[Wall] 52["Cap End"] 53["SweepEdge Opposite"] 54["SweepEdge Adjacent"] - 55["Sweep Extrusion
[1465, 1563, 0]"] + 55["Sweep Extrusion
[1472, 1570, 0]"] 56[Wall] 57["Cap End"] 58["SweepEdge Opposite"] 59["SweepEdge Adjacent"] - 60["Plane
[1971, 1994, 0]"] - 72["Sweep Extrusion
[2772, 2798, 0]"] + 60["Plane
[1954, 1977, 0]"] + 72["Sweep Extrusion
[2755, 2781, 0]"] 73[Wall] 74[Wall] 75[Wall] @@ -422,8 +422,8 @@ flowchart LR 96["SweepEdge Adjacent"] 97["SweepEdge Opposite"] 98["SweepEdge Adjacent"] - 99["Plane
[1971, 1994, 0]"] - 111["Sweep Extrusion
[2772, 2798, 0]"] + 99["Plane
[1954, 1977, 0]"] + 111["Sweep Extrusion
[2755, 2781, 0]"] 112[Wall] 113[Wall] 114[Wall] @@ -450,8 +450,8 @@ flowchart LR 135["SweepEdge Adjacent"] 136["SweepEdge Opposite"] 137["SweepEdge Adjacent"] - 138["Plane
[1971, 1994, 0]"] - 150["Sweep Extrusion
[2772, 2798, 0]"] + 138["Plane
[1954, 1977, 0]"] + 150["Sweep Extrusion
[2755, 2781, 0]"] 151[Wall] 152[Wall] 153[Wall] @@ -478,8 +478,8 @@ flowchart LR 174["SweepEdge Adjacent"] 175["SweepEdge Opposite"] 176["SweepEdge Adjacent"] - 177["Plane
[1971, 1994, 0]"] - 189["Sweep Extrusion
[2772, 2798, 0]"] + 177["Plane
[1954, 1977, 0]"] + 189["Sweep Extrusion
[2755, 2781, 0]"] 190[Wall] 191[Wall] 192[Wall] @@ -506,8 +506,8 @@ flowchart LR 213["SweepEdge Adjacent"] 214["SweepEdge Opposite"] 215["SweepEdge Adjacent"] - 216["Plane
[1971, 1994, 0]"] - 228["Sweep Extrusion
[2772, 2798, 0]"] + 216["Plane
[1954, 1977, 0]"] + 228["Sweep Extrusion
[2755, 2781, 0]"] 229[Wall] 230[Wall] 231[Wall] @@ -534,8 +534,8 @@ flowchart LR 252["SweepEdge Adjacent"] 253["SweepEdge Opposite"] 254["SweepEdge Adjacent"] - 255["Plane
[1971, 1994, 0]"] - 267["Sweep Extrusion
[2772, 2798, 0]"] + 255["Plane
[1954, 1977, 0]"] + 267["Sweep Extrusion
[2755, 2781, 0]"] 268[Wall] 269[Wall] 270[Wall] @@ -562,8 +562,8 @@ flowchart LR 291["SweepEdge Adjacent"] 292["SweepEdge Opposite"] 293["SweepEdge Adjacent"] - 294["Plane
[1971, 1994, 0]"] - 306["Sweep Extrusion
[2772, 2798, 0]"] + 294["Plane
[1954, 1977, 0]"] + 306["Sweep Extrusion
[2755, 2781, 0]"] 307[Wall] 308[Wall] 309[Wall] @@ -590,8 +590,8 @@ flowchart LR 330["SweepEdge Adjacent"] 331["SweepEdge Opposite"] 332["SweepEdge Adjacent"] - 333["Plane
[1971, 1994, 0]"] - 345["Sweep Extrusion
[2772, 2798, 0]"] + 333["Plane
[1954, 1977, 0]"] + 345["Sweep Extrusion
[2755, 2781, 0]"] 346[Wall] 347[Wall] 348[Wall] @@ -618,8 +618,8 @@ flowchart LR 369["SweepEdge Adjacent"] 370["SweepEdge Opposite"] 371["SweepEdge Adjacent"] - 372["Plane
[1971, 1994, 0]"] - 384["Sweep Extrusion
[2772, 2798, 0]"] + 372["Plane
[1954, 1977, 0]"] + 384["Sweep Extrusion
[2755, 2781, 0]"] 385[Wall] 386[Wall] 387[Wall] @@ -646,8 +646,8 @@ flowchart LR 408["SweepEdge Adjacent"] 409["SweepEdge Opposite"] 410["SweepEdge Adjacent"] - 411["Plane
[1971, 1994, 0]"] - 423["Sweep Extrusion
[2772, 2798, 0]"] + 411["Plane
[1954, 1977, 0]"] + 423["Sweep Extrusion
[2755, 2781, 0]"] 424[Wall] 425[Wall] 426[Wall] @@ -674,8 +674,8 @@ flowchart LR 447["SweepEdge Adjacent"] 448["SweepEdge Opposite"] 449["SweepEdge Adjacent"] - 450["Plane
[1971, 1994, 0]"] - 462["Sweep Extrusion
[2772, 2798, 0]"] + 450["Plane
[1954, 1977, 0]"] + 462["Sweep Extrusion
[2755, 2781, 0]"] 463[Wall] 464[Wall] 465[Wall] @@ -702,8 +702,8 @@ flowchart LR 486["SweepEdge Adjacent"] 487["SweepEdge Opposite"] 488["SweepEdge Adjacent"] - 489["Plane
[1971, 1994, 0]"] - 501["Sweep Extrusion
[2772, 2798, 0]"] + 489["Plane
[1954, 1977, 0]"] + 501["Sweep Extrusion
[2755, 2781, 0]"] 502[Wall] 503[Wall] 504[Wall] @@ -730,8 +730,8 @@ flowchart LR 525["SweepEdge Adjacent"] 526["SweepEdge Opposite"] 527["SweepEdge Adjacent"] - 528["Plane
[1971, 1994, 0]"] - 540["Sweep Extrusion
[2772, 2798, 0]"] + 528["Plane
[1954, 1977, 0]"] + 540["Sweep Extrusion
[2755, 2781, 0]"] 541[Wall] 542[Wall] 543[Wall] @@ -758,8 +758,8 @@ flowchart LR 564["SweepEdge Adjacent"] 565["SweepEdge Opposite"] 566["SweepEdge Adjacent"] - 567["Plane
[1971, 1994, 0]"] - 579["Sweep Extrusion
[2772, 2798, 0]"] + 567["Plane
[1954, 1977, 0]"] + 579["Sweep Extrusion
[2755, 2781, 0]"] 580[Wall] 581[Wall] 582[Wall] @@ -786,8 +786,8 @@ flowchart LR 603["SweepEdge Adjacent"] 604["SweepEdge Opposite"] 605["SweepEdge Adjacent"] - 606["Plane
[1971, 1994, 0]"] - 618["Sweep Extrusion
[2772, 2798, 0]"] + 606["Plane
[1954, 1977, 0]"] + 618["Sweep Extrusion
[2755, 2781, 0]"] 619[Wall] 620[Wall] 621[Wall] @@ -814,8 +814,8 @@ flowchart LR 642["SweepEdge Adjacent"] 643["SweepEdge Opposite"] 644["SweepEdge Adjacent"] - 645["Plane
[1971, 1994, 0]"] - 657["Sweep Extrusion
[2772, 2798, 0]"] + 645["Plane
[1954, 1977, 0]"] + 657["Sweep Extrusion
[2755, 2781, 0]"] 658[Wall] 659[Wall] 660[Wall] @@ -842,8 +842,8 @@ flowchart LR 681["SweepEdge Adjacent"] 682["SweepEdge Opposite"] 683["SweepEdge Adjacent"] - 684["Plane
[1971, 1994, 0]"] - 696["Sweep Extrusion
[2772, 2798, 0]"] + 684["Plane
[1954, 1977, 0]"] + 696["Sweep Extrusion
[2755, 2781, 0]"] 697[Wall] 698[Wall] 699[Wall] @@ -870,8 +870,8 @@ flowchart LR 720["SweepEdge Adjacent"] 721["SweepEdge Opposite"] 722["SweepEdge Adjacent"] - 723["Plane
[1971, 1994, 0]"] - 735["Sweep Extrusion
[2772, 2798, 0]"] + 723["Plane
[1954, 1977, 0]"] + 735["Sweep Extrusion
[2755, 2781, 0]"] 736[Wall] 737[Wall] 738[Wall] @@ -898,8 +898,8 @@ flowchart LR 759["SweepEdge Adjacent"] 760["SweepEdge Opposite"] 761["SweepEdge Adjacent"] - 762["Plane
[1971, 1994, 0]"] - 774["Sweep Extrusion
[2772, 2798, 0]"] + 762["Plane
[1954, 1977, 0]"] + 774["Sweep Extrusion
[2755, 2781, 0]"] 775[Wall] 776[Wall] 777[Wall] @@ -926,8 +926,8 @@ flowchart LR 798["SweepEdge Adjacent"] 799["SweepEdge Opposite"] 800["SweepEdge Adjacent"] - 801["Plane
[1971, 1994, 0]"] - 813["Sweep Extrusion
[2772, 2798, 0]"] + 801["Plane
[1954, 1977, 0]"] + 813["Sweep Extrusion
[2755, 2781, 0]"] 814[Wall] 815[Wall] 816[Wall] @@ -954,8 +954,8 @@ flowchart LR 837["SweepEdge Adjacent"] 838["SweepEdge Opposite"] 839["SweepEdge Adjacent"] - 840["Plane
[1971, 1994, 0]"] - 852["Sweep Extrusion
[2772, 2798, 0]"] + 840["Plane
[1954, 1977, 0]"] + 852["Sweep Extrusion
[2755, 2781, 0]"] 853[Wall] 854[Wall] 855[Wall] @@ -982,8 +982,8 @@ flowchart LR 876["SweepEdge Adjacent"] 877["SweepEdge Opposite"] 878["SweepEdge Adjacent"] - 879["Plane
[4989, 5012, 0]"] - 898["Sweep Extrusion
[5904, 5928, 0]"] + 879["Plane
[4948, 4971, 0]"] + 898["Sweep Extrusion
[5863, 5887, 0]"] 899[Wall] 900[Wall] 901[Wall] @@ -1034,8 +1034,8 @@ flowchart LR 946["SweepEdge Adjacent"] 947["SweepEdge Opposite"] 948["SweepEdge Adjacent"] - 949["Plane
[6065, 6088, 0]"] - 956["Sweep Extrusion
[6528, 6552, 0]"] + 949["Plane
[6024, 6047, 0]"] + 956["Sweep Extrusion
[6487, 6511, 0]"] 957[Wall] 958[Wall] 959[Wall] @@ -1050,8 +1050,8 @@ flowchart LR 968["SweepEdge Adjacent"] 969["SweepEdge Opposite"] 970["SweepEdge Adjacent"] - 971["Plane
[6597, 6620, 0]"] - 978["Sweep Extrusion
[7060, 7084, 0]"] + 971["Plane
[6556, 6579, 0]"] + 978["Sweep Extrusion
[7019, 7043, 0]"] 979[Wall] 980[Wall] 981[Wall] @@ -1066,8 +1066,8 @@ flowchart LR 990["SweepEdge Adjacent"] 991["SweepEdge Opposite"] 992["SweepEdge Adjacent"] - 993["Plane
[6065, 6088, 0]"] - 1000["Sweep Extrusion
[6528, 6552, 0]"] + 993["Plane
[6024, 6047, 0]"] + 1000["Sweep Extrusion
[6487, 6511, 0]"] 1001[Wall] 1002[Wall] 1003[Wall] @@ -1082,8 +1082,8 @@ flowchart LR 1012["SweepEdge Adjacent"] 1013["SweepEdge Opposite"] 1014["SweepEdge Adjacent"] - 1015["Plane
[6597, 6620, 0]"] - 1022["Sweep Extrusion
[7060, 7084, 0]"] + 1015["Plane
[6556, 6579, 0]"] + 1022["Sweep Extrusion
[7019, 7043, 0]"] 1023[Wall] 1024[Wall] 1025[Wall] @@ -1098,7 +1098,7 @@ flowchart LR 1034["SweepEdge Adjacent"] 1035["SweepEdge Opposite"] 1036["SweepEdge Adjacent"] - 1037["StartSketchOnFace
[1151, 1182, 0]"] + 1037["StartSketchOnFace
[1151, 1189, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/keyboard/ast.snap b/rust/kcl-lib/tests/kcl_samples/keyboard/ast.snap index 8993067db..10191c27a 100644 --- a/rust/kcl-lib/tests/kcl_samples/keyboard/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/keyboard/ast.snap @@ -1613,36 +1613,30 @@ description: Result of parsing keyboard.kcl "init": { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "sketch001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg04", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg04", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -1663,8 +1657,24 @@ description: Result of parsing keyboard.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "sketch001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, "start": 0, "type": "VariableDeclarator" @@ -2367,7 +2377,7 @@ description: Result of parsing keyboard.kcl "key": { "commentStart": 0, "end": 0, - "name": "plane", + "name": "origin", "start": 0, "type": "Identifier" }, @@ -2375,292 +2385,270 @@ description: Result of parsing keyboard.kcl "type": "ObjectProperty", "value": { "commentStart": 0, - "end": 0, - "properties": [ + "elements": [ { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "origin", - "start": 0, - "type": "Identifier" - }, + "raw": "0.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.7", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.7, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.0, + "suffix": "None" } }, { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "xAxis", - "start": 0, - "type": "Identifier" - }, + "raw": "0.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.0, + "suffix": "None" } }, { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "yAxis", - "start": 0, - "type": "Identifier" - }, + "raw": "0.7", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "arguments": [ - { - "arguments": [ - { - "commentStart": 0, - "end": 0, - "raw": "7", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 7.0, - "suffix": "None" - } - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "toRadians", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "sin", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "zAxis", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.7, + "suffix": "None" } } ], + "end": 0, "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "xAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "yAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + { + "arguments": [ + { + "arguments": [ + { + "commentStart": 0, + "end": 0, + "raw": "7", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 7.0, + "suffix": "None" + } + } + ], + "callee": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "toRadians", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name" + }, + "commentStart": 0, + "end": 0, + "start": 0, + "type": "CallExpression", + "type": "CallExpression" + } + ], + "callee": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "sin", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name" + }, + "commentStart": 0, + "end": 0, + "start": 0, + "type": "CallExpression", + "type": "CallExpression" + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "zAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" } } ], @@ -7840,7 +7828,7 @@ description: Result of parsing keyboard.kcl "key": { "commentStart": 0, "end": 0, - "name": "plane", + "name": "origin", "start": 0, "type": "Identifier" }, @@ -7848,292 +7836,270 @@ description: Result of parsing keyboard.kcl "type": "ObjectProperty", "value": { "commentStart": 0, - "end": 0, - "properties": [ + "elements": [ { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "origin", - "start": 0, - "type": "Identifier" - }, + "raw": "0.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": ".81", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.81, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.0, + "suffix": "None" } }, { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "xAxis", - "start": 0, - "type": "Identifier" - }, + "raw": "0.0", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.0, + "suffix": "None" } }, { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "yAxis", - "start": 0, - "type": "Identifier" - }, + "raw": ".81", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - { - "arguments": [ - { - "arguments": [ - { - "commentStart": 0, - "end": 0, - "raw": "7", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 7.0, - "suffix": "None" - } - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "toRadians", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - } - ], - "callee": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "sin", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name" - }, - "commentStart": 0, - "end": 0, - "start": 0, - "type": "CallExpression", - "type": "CallExpression" - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "zAxis", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "elements": [ - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "0.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - }, - { - "commentStart": 0, - "end": 0, - "raw": "1.0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - ], - "end": 0, - "start": 0, - "type": "ArrayExpression", - "type": "ArrayExpression" + "value": 0.81, + "suffix": "None" } } ], + "end": 0, "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "xAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "yAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + { + "arguments": [ + { + "arguments": [ + { + "commentStart": 0, + "end": 0, + "raw": "7", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 7.0, + "suffix": "None" + } + } + ], + "callee": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "toRadians", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name" + }, + "commentStart": 0, + "end": 0, + "start": 0, + "type": "CallExpression", + "type": "CallExpression" + } + ], + "callee": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "sin", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name" + }, + "commentStart": 0, + "end": 0, + "start": 0, + "type": "CallExpression", + "type": "CallExpression" + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "zAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "elements": [ + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "0.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + }, + { + "commentStart": 0, + "end": 0, + "raw": "1.0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + ], + "end": 0, + "start": 0, + "type": "ArrayExpression", + "type": "ArrayExpression" } } ], diff --git a/rust/kcl-lib/tests/kcl_samples/keyboard/ops.snap b/rust/kcl-lib/tests/kcl_samples/keyboard/ops.snap index 3f3667ec6..725970914 100644 --- a/rust/kcl-lib/tests/kcl_samples/keyboard/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/keyboard/ops.snap @@ -5,7 +5,7 @@ description: Operations executed keyboard.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -110,16 +110,7 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg04", @@ -131,7 +122,15 @@ description: Operations executed keyboard.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -212,8 +211,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -223,185 +222,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -549,8 +543,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -560,185 +554,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -886,8 +875,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -897,185 +886,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -1223,8 +1207,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -1234,185 +1218,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -1560,8 +1539,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -1571,185 +1550,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -1897,8 +1871,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -1908,185 +1882,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -2234,8 +2203,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -2245,185 +2214,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -2571,8 +2535,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -2582,185 +2546,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -2908,8 +2867,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -2919,185 +2878,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -3245,8 +3199,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -3256,185 +3210,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -3582,8 +3531,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -3593,185 +3542,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -3919,8 +3863,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -3930,185 +3874,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -4256,8 +4195,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -4267,185 +4206,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -4593,8 +4527,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -4604,185 +4538,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -4930,8 +4859,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -4941,185 +4870,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -5267,8 +5191,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -5278,185 +5202,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -5604,8 +5523,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -5615,185 +5534,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -5941,8 +5855,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -5952,185 +5866,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -6278,8 +6187,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -6289,185 +6198,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -6615,8 +6519,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -6626,185 +6530,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -6952,8 +6851,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "keyFn", "functionSourceRange": [ - 1904, - 3056, + 1887, + 3039, 0 ], "unlabeledArg": null, @@ -6963,185 +6862,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -7307,8 +7201,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "z", "functionSourceRange": [ - 4958, - 5978, + 4917, + 5937, 0 ], "unlabeledArg": null, @@ -7318,185 +7212,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.81, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.81, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -7549,8 +7438,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "o", "functionSourceRange": [ - 6025, - 7134, + 5984, + 7093, 0 ], "unlabeledArg": null, @@ -7560,185 +7449,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.81, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.81, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -7784,185 +7668,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.81, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.81, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -8015,8 +7894,8 @@ description: Operations executed keyboard.kcl "type": "FunctionCall", "name": "o", "functionSourceRange": [ - 6025, - 7134, + 5984, + 7093, 0 ], "unlabeledArg": null, @@ -8026,185 +7905,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.81, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.81, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -8250,185 +8124,180 @@ description: Operations executed keyboard.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.81, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.81, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.12186934340514748, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.12186934340514748, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, diff --git a/rust/kcl-lib/tests/kcl_samples/keyboard/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/keyboard/program_memory.snap index 4f17173e9..6dfe5f6a6 100644 --- a/rust/kcl-lib/tests/kcl_samples/keyboard/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/keyboard/program_memory.snap @@ -50,362 +50,352 @@ description: Variables in memory after executing keyboard.kcl "plane001": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.7, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.7, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.1219, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.1219, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, "plane002": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.81, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.81, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.1219, - "ty": { - "type": "Known", - "type": "Count" - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "MixedArray", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.1219, + "ty": { + "type": "Known", + "type": "Count" + } + } + ] + }, + "zAxis": { + "type": "MixedArray", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -449,17 +439,26 @@ description: Variables in memory after executing keyboard.kcl "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -651,22 +650,34 @@ description: Variables in memory after executing keyboard.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -721,28 +732,72 @@ description: Variables in memory after executing keyboard.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -820,17 +875,26 @@ description: Variables in memory after executing keyboard.kcl "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1022,22 +1086,34 @@ description: Variables in memory after executing keyboard.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1092,28 +1168,72 @@ description: Variables in memory after executing keyboard.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -1191,17 +1311,26 @@ description: Variables in memory after executing keyboard.kcl "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1393,22 +1522,34 @@ description: Variables in memory after executing keyboard.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1463,28 +1604,72 @@ description: Variables in memory after executing keyboard.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -1562,17 +1747,26 @@ description: Variables in memory after executing keyboard.kcl "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1764,22 +1958,34 @@ description: Variables in memory after executing keyboard.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1834,28 +2040,72 @@ description: Variables in memory after executing keyboard.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -2183,22 +2433,34 @@ description: Variables in memory after executing keyboard.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2253,28 +2515,72 @@ description: Variables in memory after executing keyboard.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -2293,17 +2599,26 @@ description: Variables in memory after executing keyboard.kcl "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2495,22 +2810,34 @@ description: Variables in memory after executing keyboard.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2565,28 +2892,72 @@ description: Variables in memory after executing keyboard.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.6, + "radius": { + "n": 0.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } diff --git a/rust/kcl-lib/tests/kcl_samples/kitt/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/kitt/artifact_graph_flowchart.snap.md index c7cebedcc..ce9df25a4 100644 --- a/rust/kcl-lib/tests/kcl_samples/kitt/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/kitt/artifact_graph_flowchart.snap.md @@ -1,410 +1,410 @@ ```mermaid flowchart LR subgraph path2 [Path] - 2["Path
[625, 681, 0]"] - 3["Segment
[687, 717, 0]"] - 4["Segment
[723, 766, 0]"] - 5["Segment
[772, 817, 0]"] - 6["Segment
[823, 879, 0]"] - 7["Segment
[885, 892, 0]"] + 2["Path
[632, 688, 0]"] + 3["Segment
[694, 724, 0]"] + 4["Segment
[730, 773, 0]"] + 5["Segment
[779, 824, 0]"] + 6["Segment
[830, 886, 0]"] + 7["Segment
[892, 899, 0]"] 8[Solid2d] end subgraph path24 [Path] - 24["Path
[228, 269, 0]"] - 25["Segment
[277, 300, 0]"] - 26["Segment
[308, 330, 0]"] - 27["Segment
[338, 362, 0]"] - 28["Segment
[370, 426, 0]"] - 29["Segment
[434, 441, 0]"] + 24["Path
[235, 276, 0]"] + 25["Segment
[284, 307, 0]"] + 26["Segment
[315, 337, 0]"] + 27["Segment
[345, 369, 0]"] + 28["Segment
[377, 433, 0]"] + 29["Segment
[441, 448, 0]"] 30[Solid2d] end subgraph path45 [Path] - 45["Path
[1496, 1552, 0]"] - 46["Segment
[1558, 1576, 0]"] - 47["Segment
[1606, 1625, 0]"] - 48["Segment
[1657, 1687, 0]"] - 49["Segment
[1709, 1727, 0]"] - 50["Segment
[1760, 1778, 0]"] - 51["Segment
[1808, 1837, 0]"] - 52["Segment
[1863, 1882, 0]"] - 53["Segment
[1915, 1933, 0]"] - 54["Segment
[1967, 1998, 0]"] - 55["Segment
[2023, 2042, 0]"] - 56["Segment
[2075, 2094, 0]"] - 57["Segment
[2127, 2183, 0]"] - 58["Segment
[2189, 2196, 0]"] + 45["Path
[1510, 1566, 0]"] + 46["Segment
[1572, 1590, 0]"] + 47["Segment
[1620, 1639, 0]"] + 48["Segment
[1671, 1701, 0]"] + 49["Segment
[1723, 1741, 0]"] + 50["Segment
[1774, 1792, 0]"] + 51["Segment
[1822, 1851, 0]"] + 52["Segment
[1877, 1896, 0]"] + 53["Segment
[1929, 1947, 0]"] + 54["Segment
[1981, 2012, 0]"] + 55["Segment
[2037, 2056, 0]"] + 56["Segment
[2089, 2108, 0]"] + 57["Segment
[2141, 2197, 0]"] + 58["Segment
[2203, 2210, 0]"] 59[Solid2d] end subgraph path98 [Path] - 98["Path
[228, 269, 0]"] - 99["Segment
[277, 300, 0]"] - 100["Segment
[308, 330, 0]"] - 101["Segment
[338, 362, 0]"] - 102["Segment
[370, 426, 0]"] - 103["Segment
[434, 441, 0]"] + 98["Path
[235, 276, 0]"] + 99["Segment
[284, 307, 0]"] + 100["Segment
[315, 337, 0]"] + 101["Segment
[345, 369, 0]"] + 102["Segment
[377, 433, 0]"] + 103["Segment
[441, 448, 0]"] 104[Solid2d] end subgraph path119 [Path] - 119["Path
[228, 269, 0]"] - 120["Segment
[277, 300, 0]"] - 121["Segment
[308, 330, 0]"] - 122["Segment
[338, 362, 0]"] - 123["Segment
[370, 426, 0]"] - 124["Segment
[434, 441, 0]"] + 119["Path
[235, 276, 0]"] + 120["Segment
[284, 307, 0]"] + 121["Segment
[315, 337, 0]"] + 122["Segment
[345, 369, 0]"] + 123["Segment
[377, 433, 0]"] + 124["Segment
[441, 448, 0]"] 125[Solid2d] end subgraph path140 [Path] - 140["Path
[228, 269, 0]"] - 141["Segment
[277, 300, 0]"] - 142["Segment
[308, 330, 0]"] - 143["Segment
[338, 362, 0]"] - 144["Segment
[370, 426, 0]"] - 145["Segment
[434, 441, 0]"] + 140["Path
[235, 276, 0]"] + 141["Segment
[284, 307, 0]"] + 142["Segment
[315, 337, 0]"] + 143["Segment
[345, 369, 0]"] + 144["Segment
[377, 433, 0]"] + 145["Segment
[441, 448, 0]"] 146[Solid2d] end subgraph path161 [Path] - 161["Path
[228, 269, 0]"] - 162["Segment
[277, 300, 0]"] - 163["Segment
[308, 330, 0]"] - 164["Segment
[338, 362, 0]"] - 165["Segment
[370, 426, 0]"] - 166["Segment
[434, 441, 0]"] + 161["Path
[235, 276, 0]"] + 162["Segment
[284, 307, 0]"] + 163["Segment
[315, 337, 0]"] + 164["Segment
[345, 369, 0]"] + 165["Segment
[377, 433, 0]"] + 166["Segment
[441, 448, 0]"] 167[Solid2d] end subgraph path182 [Path] - 182["Path
[2880, 2921, 0]"] - 183["Segment
[2934, 2952, 0]"] - 184["Segment
[2975, 2993, 0]"] - 185["Segment
[3019, 3037, 0]"] - 186["Segment
[3058, 3077, 0]"] - 187["Segment
[3102, 3120, 0]"] - 188["Segment
[3143, 3161, 0]"] - 189["Segment
[3186, 3205, 0]"] - 190["Segment
[3231, 3250, 0]"] - 191["Segment
[3276, 3295, 0]"] - 192["Segment
[3318, 3336, 0]"] - 193["Segment
[3363, 3382, 0]"] - 194["Segment
[3408, 3464, 0]"] - 195["Segment
[3470, 3477, 0]"] + 182["Path
[2901, 2942, 0]"] + 183["Segment
[2955, 2973, 0]"] + 184["Segment
[2996, 3014, 0]"] + 185["Segment
[3040, 3058, 0]"] + 186["Segment
[3079, 3098, 0]"] + 187["Segment
[3123, 3141, 0]"] + 188["Segment
[3164, 3182, 0]"] + 189["Segment
[3207, 3226, 0]"] + 190["Segment
[3252, 3271, 0]"] + 191["Segment
[3297, 3316, 0]"] + 192["Segment
[3339, 3357, 0]"] + 193["Segment
[3384, 3403, 0]"] + 194["Segment
[3429, 3485, 0]"] + 195["Segment
[3491, 3498, 0]"] 196[Solid2d] end subgraph path235 [Path] - 235["Path
[228, 269, 0]"] - 236["Segment
[277, 300, 0]"] - 237["Segment
[308, 330, 0]"] - 238["Segment
[338, 362, 0]"] - 239["Segment
[370, 426, 0]"] - 240["Segment
[434, 441, 0]"] + 235["Path
[235, 276, 0]"] + 236["Segment
[284, 307, 0]"] + 237["Segment
[315, 337, 0]"] + 238["Segment
[345, 369, 0]"] + 239["Segment
[377, 433, 0]"] + 240["Segment
[441, 448, 0]"] 241[Solid2d] end subgraph path256 [Path] - 256["Path
[228, 269, 0]"] - 257["Segment
[277, 300, 0]"] - 258["Segment
[308, 330, 0]"] - 259["Segment
[338, 362, 0]"] - 260["Segment
[370, 426, 0]"] - 261["Segment
[434, 441, 0]"] + 256["Path
[235, 276, 0]"] + 257["Segment
[284, 307, 0]"] + 258["Segment
[315, 337, 0]"] + 259["Segment
[345, 369, 0]"] + 260["Segment
[377, 433, 0]"] + 261["Segment
[441, 448, 0]"] 262[Solid2d] end subgraph path277 [Path] - 277["Path
[228, 269, 0]"] - 278["Segment
[277, 300, 0]"] - 279["Segment
[308, 330, 0]"] - 280["Segment
[338, 362, 0]"] - 281["Segment
[370, 426, 0]"] - 282["Segment
[434, 441, 0]"] + 277["Path
[235, 276, 0]"] + 278["Segment
[284, 307, 0]"] + 279["Segment
[315, 337, 0]"] + 280["Segment
[345, 369, 0]"] + 281["Segment
[377, 433, 0]"] + 282["Segment
[441, 448, 0]"] 283[Solid2d] end subgraph path298 [Path] - 298["Path
[228, 269, 0]"] - 299["Segment
[277, 300, 0]"] - 300["Segment
[308, 330, 0]"] - 301["Segment
[338, 362, 0]"] - 302["Segment
[370, 426, 0]"] - 303["Segment
[434, 441, 0]"] + 298["Path
[235, 276, 0]"] + 299["Segment
[284, 307, 0]"] + 300["Segment
[315, 337, 0]"] + 301["Segment
[345, 369, 0]"] + 302["Segment
[377, 433, 0]"] + 303["Segment
[441, 448, 0]"] 304[Solid2d] end subgraph path319 [Path] - 319["Path
[228, 269, 0]"] - 320["Segment
[277, 300, 0]"] - 321["Segment
[308, 330, 0]"] - 322["Segment
[338, 362, 0]"] - 323["Segment
[370, 426, 0]"] - 324["Segment
[434, 441, 0]"] + 319["Path
[235, 276, 0]"] + 320["Segment
[284, 307, 0]"] + 321["Segment
[315, 337, 0]"] + 322["Segment
[345, 369, 0]"] + 323["Segment
[377, 433, 0]"] + 324["Segment
[441, 448, 0]"] 325[Solid2d] end subgraph path340 [Path] - 340["Path
[228, 269, 0]"] - 341["Segment
[277, 300, 0]"] - 342["Segment
[308, 330, 0]"] - 343["Segment
[338, 362, 0]"] - 344["Segment
[370, 426, 0]"] - 345["Segment
[434, 441, 0]"] + 340["Path
[235, 276, 0]"] + 341["Segment
[284, 307, 0]"] + 342["Segment
[315, 337, 0]"] + 343["Segment
[345, 369, 0]"] + 344["Segment
[377, 433, 0]"] + 345["Segment
[441, 448, 0]"] 346[Solid2d] end subgraph path361 [Path] - 361["Path
[228, 269, 0]"] - 362["Segment
[277, 300, 0]"] - 363["Segment
[308, 330, 0]"] - 364["Segment
[338, 362, 0]"] - 365["Segment
[370, 426, 0]"] - 366["Segment
[434, 441, 0]"] + 361["Path
[235, 276, 0]"] + 362["Segment
[284, 307, 0]"] + 363["Segment
[315, 337, 0]"] + 364["Segment
[345, 369, 0]"] + 365["Segment
[377, 433, 0]"] + 366["Segment
[441, 448, 0]"] 367[Solid2d] end subgraph path382 [Path] - 382["Path
[228, 269, 0]"] - 383["Segment
[277, 300, 0]"] - 384["Segment
[308, 330, 0]"] - 385["Segment
[338, 362, 0]"] - 386["Segment
[370, 426, 0]"] - 387["Segment
[434, 441, 0]"] + 382["Path
[235, 276, 0]"] + 383["Segment
[284, 307, 0]"] + 384["Segment
[315, 337, 0]"] + 385["Segment
[345, 369, 0]"] + 386["Segment
[377, 433, 0]"] + 387["Segment
[441, 448, 0]"] 388[Solid2d] end subgraph path403 [Path] - 403["Path
[228, 269, 0]"] - 404["Segment
[277, 300, 0]"] - 405["Segment
[308, 330, 0]"] - 406["Segment
[338, 362, 0]"] - 407["Segment
[370, 426, 0]"] - 408["Segment
[434, 441, 0]"] + 403["Path
[235, 276, 0]"] + 404["Segment
[284, 307, 0]"] + 405["Segment
[315, 337, 0]"] + 406["Segment
[345, 369, 0]"] + 407["Segment
[377, 433, 0]"] + 408["Segment
[441, 448, 0]"] 409[Solid2d] end subgraph path424 [Path] - 424["Path
[228, 269, 0]"] - 425["Segment
[277, 300, 0]"] - 426["Segment
[308, 330, 0]"] - 427["Segment
[338, 362, 0]"] - 428["Segment
[370, 426, 0]"] - 429["Segment
[434, 441, 0]"] + 424["Path
[235, 276, 0]"] + 425["Segment
[284, 307, 0]"] + 426["Segment
[315, 337, 0]"] + 427["Segment
[345, 369, 0]"] + 428["Segment
[377, 433, 0]"] + 429["Segment
[441, 448, 0]"] 430[Solid2d] end subgraph path445 [Path] - 445["Path
[228, 269, 0]"] - 446["Segment
[277, 300, 0]"] - 447["Segment
[308, 330, 0]"] - 448["Segment
[338, 362, 0]"] - 449["Segment
[370, 426, 0]"] - 450["Segment
[434, 441, 0]"] + 445["Path
[235, 276, 0]"] + 446["Segment
[284, 307, 0]"] + 447["Segment
[315, 337, 0]"] + 448["Segment
[345, 369, 0]"] + 449["Segment
[377, 433, 0]"] + 450["Segment
[441, 448, 0]"] 451[Solid2d] end subgraph path466 [Path] - 466["Path
[228, 269, 0]"] - 467["Segment
[277, 300, 0]"] - 468["Segment
[308, 330, 0]"] - 469["Segment
[338, 362, 0]"] - 470["Segment
[370, 426, 0]"] - 471["Segment
[434, 441, 0]"] + 466["Path
[235, 276, 0]"] + 467["Segment
[284, 307, 0]"] + 468["Segment
[315, 337, 0]"] + 469["Segment
[345, 369, 0]"] + 470["Segment
[377, 433, 0]"] + 471["Segment
[441, 448, 0]"] 472[Solid2d] end subgraph path487 [Path] - 487["Path
[228, 269, 0]"] - 488["Segment
[277, 300, 0]"] - 489["Segment
[308, 330, 0]"] - 490["Segment
[338, 362, 0]"] - 491["Segment
[370, 426, 0]"] - 492["Segment
[434, 441, 0]"] + 487["Path
[235, 276, 0]"] + 488["Segment
[284, 307, 0]"] + 489["Segment
[315, 337, 0]"] + 490["Segment
[345, 369, 0]"] + 491["Segment
[377, 433, 0]"] + 492["Segment
[441, 448, 0]"] 493[Solid2d] end subgraph path509 [Path] - 509["Path
[6227, 6278, 0]"] - 510["Segment
[6286, 6315, 0]"] - 511["Segment
[6323, 6354, 0]"] - 512["Segment
[6362, 6392, 0]"] - 513["Segment
[6400, 6456, 0]"] - 514["Segment
[6464, 6471, 0]"] + 509["Path
[6248, 6299, 0]"] + 510["Segment
[6307, 6336, 0]"] + 511["Segment
[6344, 6375, 0]"] + 512["Segment
[6383, 6413, 0]"] + 513["Segment
[6421, 6477, 0]"] + 514["Segment
[6485, 6492, 0]"] 515[Solid2d] end subgraph path531 [Path] - 531["Path
[228, 269, 0]"] - 532["Segment
[277, 300, 0]"] - 533["Segment
[308, 330, 0]"] - 534["Segment
[338, 362, 0]"] - 535["Segment
[370, 426, 0]"] - 536["Segment
[434, 441, 0]"] + 531["Path
[235, 276, 0]"] + 532["Segment
[284, 307, 0]"] + 533["Segment
[315, 337, 0]"] + 534["Segment
[345, 369, 0]"] + 535["Segment
[377, 433, 0]"] + 536["Segment
[441, 448, 0]"] 537[Solid2d] end subgraph path553 [Path] - 553["Path
[6227, 6278, 0]"] - 554["Segment
[6286, 6315, 0]"] - 555["Segment
[6323, 6354, 0]"] - 556["Segment
[6362, 6392, 0]"] - 557["Segment
[6400, 6456, 0]"] - 558["Segment
[6464, 6471, 0]"] + 553["Path
[6248, 6299, 0]"] + 554["Segment
[6307, 6336, 0]"] + 555["Segment
[6344, 6375, 0]"] + 556["Segment
[6383, 6413, 0]"] + 557["Segment
[6421, 6477, 0]"] + 558["Segment
[6485, 6492, 0]"] 559[Solid2d] end subgraph path575 [Path] - 575["Path
[228, 269, 0]"] - 576["Segment
[277, 300, 0]"] - 577["Segment
[308, 330, 0]"] - 578["Segment
[338, 362, 0]"] - 579["Segment
[370, 426, 0]"] - 580["Segment
[434, 441, 0]"] + 575["Path
[235, 276, 0]"] + 576["Segment
[284, 307, 0]"] + 577["Segment
[315, 337, 0]"] + 578["Segment
[345, 369, 0]"] + 579["Segment
[377, 433, 0]"] + 580["Segment
[441, 448, 0]"] 581[Solid2d] end subgraph path596 [Path] - 596["Path
[228, 269, 0]"] - 597["Segment
[277, 300, 0]"] - 598["Segment
[308, 330, 0]"] - 599["Segment
[338, 362, 0]"] - 600["Segment
[370, 426, 0]"] - 601["Segment
[434, 441, 0]"] + 596["Path
[235, 276, 0]"] + 597["Segment
[284, 307, 0]"] + 598["Segment
[315, 337, 0]"] + 599["Segment
[345, 369, 0]"] + 600["Segment
[377, 433, 0]"] + 601["Segment
[441, 448, 0]"] 602[Solid2d] end subgraph path617 [Path] - 617["Path
[228, 269, 0]"] - 618["Segment
[277, 300, 0]"] - 619["Segment
[308, 330, 0]"] - 620["Segment
[338, 362, 0]"] - 621["Segment
[370, 426, 0]"] - 622["Segment
[434, 441, 0]"] + 617["Path
[235, 276, 0]"] + 618["Segment
[284, 307, 0]"] + 619["Segment
[315, 337, 0]"] + 620["Segment
[345, 369, 0]"] + 621["Segment
[377, 433, 0]"] + 622["Segment
[441, 448, 0]"] 623[Solid2d] end subgraph path638 [Path] - 638["Path
[228, 269, 0]"] - 639["Segment
[277, 300, 0]"] - 640["Segment
[308, 330, 0]"] - 641["Segment
[338, 362, 0]"] - 642["Segment
[370, 426, 0]"] - 643["Segment
[434, 441, 0]"] + 638["Path
[235, 276, 0]"] + 639["Segment
[284, 307, 0]"] + 640["Segment
[315, 337, 0]"] + 641["Segment
[345, 369, 0]"] + 642["Segment
[377, 433, 0]"] + 643["Segment
[441, 448, 0]"] 644[Solid2d] end subgraph path659 [Path] - 659["Path
[228, 269, 0]"] - 660["Segment
[277, 300, 0]"] - 661["Segment
[308, 330, 0]"] - 662["Segment
[338, 362, 0]"] - 663["Segment
[370, 426, 0]"] - 664["Segment
[434, 441, 0]"] + 659["Path
[235, 276, 0]"] + 660["Segment
[284, 307, 0]"] + 661["Segment
[315, 337, 0]"] + 662["Segment
[345, 369, 0]"] + 663["Segment
[377, 433, 0]"] + 664["Segment
[441, 448, 0]"] 665[Solid2d] end subgraph path680 [Path] - 680["Path
[228, 269, 0]"] - 681["Segment
[277, 300, 0]"] - 682["Segment
[308, 330, 0]"] - 683["Segment
[338, 362, 0]"] - 684["Segment
[370, 426, 0]"] - 685["Segment
[434, 441, 0]"] + 680["Path
[235, 276, 0]"] + 681["Segment
[284, 307, 0]"] + 682["Segment
[315, 337, 0]"] + 683["Segment
[345, 369, 0]"] + 684["Segment
[377, 433, 0]"] + 685["Segment
[441, 448, 0]"] 686[Solid2d] end subgraph path701 [Path] - 701["Path
[228, 269, 0]"] - 702["Segment
[277, 300, 0]"] - 703["Segment
[308, 330, 0]"] - 704["Segment
[338, 362, 0]"] - 705["Segment
[370, 426, 0]"] - 706["Segment
[434, 441, 0]"] + 701["Path
[235, 276, 0]"] + 702["Segment
[284, 307, 0]"] + 703["Segment
[315, 337, 0]"] + 704["Segment
[345, 369, 0]"] + 705["Segment
[377, 433, 0]"] + 706["Segment
[441, 448, 0]"] 707[Solid2d] end subgraph path722 [Path] - 722["Path
[228, 269, 0]"] - 723["Segment
[277, 300, 0]"] - 724["Segment
[308, 330, 0]"] - 725["Segment
[338, 362, 0]"] - 726["Segment
[370, 426, 0]"] - 727["Segment
[434, 441, 0]"] + 722["Path
[235, 276, 0]"] + 723["Segment
[284, 307, 0]"] + 724["Segment
[315, 337, 0]"] + 725["Segment
[345, 369, 0]"] + 726["Segment
[377, 433, 0]"] + 727["Segment
[441, 448, 0]"] 728[Solid2d] end subgraph path743 [Path] - 743["Path
[228, 269, 0]"] - 744["Segment
[277, 300, 0]"] - 745["Segment
[308, 330, 0]"] - 746["Segment
[338, 362, 0]"] - 747["Segment
[370, 426, 0]"] - 748["Segment
[434, 441, 0]"] + 743["Path
[235, 276, 0]"] + 744["Segment
[284, 307, 0]"] + 745["Segment
[315, 337, 0]"] + 746["Segment
[345, 369, 0]"] + 747["Segment
[377, 433, 0]"] + 748["Segment
[441, 448, 0]"] 749[Solid2d] end subgraph path764 [Path] - 764["Path
[228, 269, 0]"] - 765["Segment
[277, 300, 0]"] - 766["Segment
[308, 330, 0]"] - 767["Segment
[338, 362, 0]"] - 768["Segment
[370, 426, 0]"] - 769["Segment
[434, 441, 0]"] + 764["Path
[235, 276, 0]"] + 765["Segment
[284, 307, 0]"] + 766["Segment
[315, 337, 0]"] + 767["Segment
[345, 369, 0]"] + 768["Segment
[377, 433, 0]"] + 769["Segment
[441, 448, 0]"] 770[Solid2d] end subgraph path785 [Path] - 785["Path
[228, 269, 0]"] - 786["Segment
[277, 300, 0]"] - 787["Segment
[308, 330, 0]"] - 788["Segment
[338, 362, 0]"] - 789["Segment
[370, 426, 0]"] - 790["Segment
[434, 441, 0]"] + 785["Path
[235, 276, 0]"] + 786["Segment
[284, 307, 0]"] + 787["Segment
[315, 337, 0]"] + 788["Segment
[345, 369, 0]"] + 789["Segment
[377, 433, 0]"] + 790["Segment
[441, 448, 0]"] 791[Solid2d] end subgraph path806 [Path] - 806["Path
[228, 269, 0]"] - 807["Segment
[277, 300, 0]"] - 808["Segment
[308, 330, 0]"] - 809["Segment
[338, 362, 0]"] - 810["Segment
[370, 426, 0]"] - 811["Segment
[434, 441, 0]"] + 806["Path
[235, 276, 0]"] + 807["Segment
[284, 307, 0]"] + 808["Segment
[315, 337, 0]"] + 809["Segment
[345, 369, 0]"] + 810["Segment
[377, 433, 0]"] + 811["Segment
[441, 448, 0]"] 812[Solid2d] end subgraph path827 [Path] - 827["Path
[228, 269, 0]"] - 828["Segment
[277, 300, 0]"] - 829["Segment
[308, 330, 0]"] - 830["Segment
[338, 362, 0]"] - 831["Segment
[370, 426, 0]"] - 832["Segment
[434, 441, 0]"] + 827["Path
[235, 276, 0]"] + 828["Segment
[284, 307, 0]"] + 829["Segment
[315, 337, 0]"] + 830["Segment
[345, 369, 0]"] + 831["Segment
[377, 433, 0]"] + 832["Segment
[441, 448, 0]"] 833[Solid2d] end subgraph path848 [Path] - 848["Path
[228, 269, 0]"] - 849["Segment
[277, 300, 0]"] - 850["Segment
[308, 330, 0]"] - 851["Segment
[338, 362, 0]"] - 852["Segment
[370, 426, 0]"] - 853["Segment
[434, 441, 0]"] + 848["Path
[235, 276, 0]"] + 849["Segment
[284, 307, 0]"] + 850["Segment
[315, 337, 0]"] + 851["Segment
[345, 369, 0]"] + 852["Segment
[377, 433, 0]"] + 853["Segment
[441, 448, 0]"] 854[Solid2d] end subgraph path869 [Path] - 869["Path
[228, 269, 0]"] - 870["Segment
[277, 300, 0]"] - 871["Segment
[308, 330, 0]"] - 872["Segment
[338, 362, 0]"] - 873["Segment
[370, 426, 0]"] - 874["Segment
[434, 441, 0]"] + 869["Path
[235, 276, 0]"] + 870["Segment
[284, 307, 0]"] + 871["Segment
[315, 337, 0]"] + 872["Segment
[345, 369, 0]"] + 873["Segment
[377, 433, 0]"] + 874["Segment
[441, 448, 0]"] 875[Solid2d] end subgraph path890 [Path] - 890["Path
[228, 269, 0]"] - 891["Segment
[277, 300, 0]"] - 892["Segment
[308, 330, 0]"] - 893["Segment
[338, 362, 0]"] - 894["Segment
[370, 426, 0]"] - 895["Segment
[434, 441, 0]"] + 890["Path
[235, 276, 0]"] + 891["Segment
[284, 307, 0]"] + 892["Segment
[315, 337, 0]"] + 893["Segment
[345, 369, 0]"] + 894["Segment
[377, 433, 0]"] + 895["Segment
[441, 448, 0]"] 896[Solid2d] end subgraph path911 [Path] - 911["Path
[228, 269, 0]"] - 912["Segment
[277, 300, 0]"] - 913["Segment
[308, 330, 0]"] - 914["Segment
[338, 362, 0]"] - 915["Segment
[370, 426, 0]"] - 916["Segment
[434, 441, 0]"] + 911["Path
[235, 276, 0]"] + 912["Segment
[284, 307, 0]"] + 913["Segment
[315, 337, 0]"] + 914["Segment
[345, 369, 0]"] + 915["Segment
[377, 433, 0]"] + 916["Segment
[441, 448, 0]"] 917[Solid2d] end subgraph path932 [Path] - 932["Path
[228, 269, 0]"] - 933["Segment
[277, 300, 0]"] - 934["Segment
[308, 330, 0]"] - 935["Segment
[338, 362, 0]"] - 936["Segment
[370, 426, 0]"] - 937["Segment
[434, 441, 0]"] + 932["Path
[235, 276, 0]"] + 933["Segment
[284, 307, 0]"] + 934["Segment
[315, 337, 0]"] + 935["Segment
[345, 369, 0]"] + 936["Segment
[377, 433, 0]"] + 937["Segment
[441, 448, 0]"] 938[Solid2d] end subgraph path953 [Path] - 953["Path
[228, 269, 0]"] - 954["Segment
[277, 300, 0]"] - 955["Segment
[308, 330, 0]"] - 956["Segment
[338, 362, 0]"] - 957["Segment
[370, 426, 0]"] - 958["Segment
[434, 441, 0]"] + 953["Path
[235, 276, 0]"] + 954["Segment
[284, 307, 0]"] + 955["Segment
[315, 337, 0]"] + 956["Segment
[345, 369, 0]"] + 957["Segment
[377, 433, 0]"] + 958["Segment
[441, 448, 0]"] 959[Solid2d] end - 1["Plane
[602, 619, 0]"] - 9["Sweep Extrusion
[898, 928, 0]"] + 1["Plane
[609, 626, 0]"] + 9["Sweep Extrusion
[905, 935, 0]"] 10[Wall] 11[Wall] 12[Wall] @@ -419,7 +419,7 @@ flowchart LR 21["SweepEdge Adjacent"] 22["SweepEdge Opposite"] 23["SweepEdge Adjacent"] - 31["Sweep Extrusion
[449, 472, 0]"] + 31["Sweep Extrusion
[456, 479, 0]"] 32[Wall] 33[Wall] 34[Wall] @@ -433,7 +433,7 @@ flowchart LR 42["SweepEdge Adjacent"] 43["SweepEdge Opposite"] 44["SweepEdge Adjacent"] - 60["Sweep Extrusion
[2202, 2233, 0]"] + 60["Sweep Extrusion
[2216, 2247, 0]"] 61[Wall] 62[Wall] 63[Wall] @@ -471,7 +471,7 @@ flowchart LR 95["SweepEdge Adjacent"] 96["SweepEdge Opposite"] 97["SweepEdge Adjacent"] - 105["Sweep Extrusion
[449, 472, 0]"] + 105["Sweep Extrusion
[456, 479, 0]"] 106[Wall] 107[Wall] 108[Wall] @@ -485,7 +485,7 @@ flowchart LR 116["SweepEdge Adjacent"] 117["SweepEdge Opposite"] 118["SweepEdge Adjacent"] - 126["Sweep Extrusion
[449, 472, 0]"] + 126["Sweep Extrusion
[456, 479, 0]"] 127[Wall] 128[Wall] 129[Wall] @@ -499,7 +499,7 @@ flowchart LR 137["SweepEdge Adjacent"] 138["SweepEdge Opposite"] 139["SweepEdge Adjacent"] - 147["Sweep Extrusion
[449, 472, 0]"] + 147["Sweep Extrusion
[456, 479, 0]"] 148[Wall] 149[Wall] 150[Wall] @@ -513,7 +513,7 @@ flowchart LR 158["SweepEdge Adjacent"] 159["SweepEdge Opposite"] 160["SweepEdge Adjacent"] - 168["Sweep Extrusion
[449, 472, 0]"] + 168["Sweep Extrusion
[456, 479, 0]"] 169[Wall] 170[Wall] 171[Wall] @@ -527,7 +527,7 @@ flowchart LR 179["SweepEdge Adjacent"] 180["SweepEdge Opposite"] 181["SweepEdge Adjacent"] - 197["Sweep Extrusion
[3483, 3512, 0]"] + 197["Sweep Extrusion
[3504, 3533, 0]"] 198[Wall] 199[Wall] 200[Wall] @@ -565,7 +565,7 @@ flowchart LR 232["SweepEdge Adjacent"] 233["SweepEdge Opposite"] 234["SweepEdge Adjacent"] - 242["Sweep Extrusion
[449, 472, 0]"] + 242["Sweep Extrusion
[456, 479, 0]"] 243[Wall] 244[Wall] 245[Wall] @@ -579,7 +579,7 @@ flowchart LR 253["SweepEdge Adjacent"] 254["SweepEdge Opposite"] 255["SweepEdge Adjacent"] - 263["Sweep Extrusion
[449, 472, 0]"] + 263["Sweep Extrusion
[456, 479, 0]"] 264[Wall] 265[Wall] 266[Wall] @@ -593,7 +593,7 @@ flowchart LR 274["SweepEdge Adjacent"] 275["SweepEdge Opposite"] 276["SweepEdge Adjacent"] - 284["Sweep Extrusion
[449, 472, 0]"] + 284["Sweep Extrusion
[456, 479, 0]"] 285[Wall] 286[Wall] 287[Wall] @@ -607,7 +607,7 @@ flowchart LR 295["SweepEdge Adjacent"] 296["SweepEdge Opposite"] 297["SweepEdge Adjacent"] - 305["Sweep Extrusion
[449, 472, 0]"] + 305["Sweep Extrusion
[456, 479, 0]"] 306[Wall] 307[Wall] 308[Wall] @@ -621,7 +621,7 @@ flowchart LR 316["SweepEdge Adjacent"] 317["SweepEdge Opposite"] 318["SweepEdge Adjacent"] - 326["Sweep Extrusion
[449, 472, 0]"] + 326["Sweep Extrusion
[456, 479, 0]"] 327[Wall] 328[Wall] 329[Wall] @@ -635,7 +635,7 @@ flowchart LR 337["SweepEdge Adjacent"] 338["SweepEdge Opposite"] 339["SweepEdge Adjacent"] - 347["Sweep Extrusion
[449, 472, 0]"] + 347["Sweep Extrusion
[456, 479, 0]"] 348[Wall] 349[Wall] 350[Wall] @@ -649,7 +649,7 @@ flowchart LR 358["SweepEdge Adjacent"] 359["SweepEdge Opposite"] 360["SweepEdge Adjacent"] - 368["Sweep Extrusion
[449, 472, 0]"] + 368["Sweep Extrusion
[456, 479, 0]"] 369[Wall] 370[Wall] 371[Wall] @@ -663,7 +663,7 @@ flowchart LR 379["SweepEdge Adjacent"] 380["SweepEdge Opposite"] 381["SweepEdge Adjacent"] - 389["Sweep Extrusion
[449, 472, 0]"] + 389["Sweep Extrusion
[456, 479, 0]"] 390[Wall] 391[Wall] 392[Wall] @@ -677,7 +677,7 @@ flowchart LR 400["SweepEdge Adjacent"] 401["SweepEdge Opposite"] 402["SweepEdge Adjacent"] - 410["Sweep Extrusion
[449, 472, 0]"] + 410["Sweep Extrusion
[456, 479, 0]"] 411[Wall] 412[Wall] 413[Wall] @@ -691,7 +691,7 @@ flowchart LR 421["SweepEdge Adjacent"] 422["SweepEdge Opposite"] 423["SweepEdge Adjacent"] - 431["Sweep Extrusion
[449, 472, 0]"] + 431["Sweep Extrusion
[456, 479, 0]"] 432[Wall] 433[Wall] 434[Wall] @@ -705,7 +705,7 @@ flowchart LR 442["SweepEdge Adjacent"] 443["SweepEdge Opposite"] 444["SweepEdge Adjacent"] - 452["Sweep Extrusion
[449, 472, 0]"] + 452["Sweep Extrusion
[456, 479, 0]"] 453[Wall] 454[Wall] 455[Wall] @@ -719,7 +719,7 @@ flowchart LR 463["SweepEdge Adjacent"] 464["SweepEdge Opposite"] 465["SweepEdge Adjacent"] - 473["Sweep Extrusion
[449, 472, 0]"] + 473["Sweep Extrusion
[456, 479, 0]"] 474[Wall] 475[Wall] 476[Wall] @@ -733,7 +733,7 @@ flowchart LR 484["SweepEdge Adjacent"] 485["SweepEdge Opposite"] 486["SweepEdge Adjacent"] - 494["Sweep Extrusion
[449, 472, 0]"] + 494["Sweep Extrusion
[456, 479, 0]"] 495[Wall] 496[Wall] 497[Wall] @@ -747,8 +747,8 @@ flowchart LR 505["SweepEdge Adjacent"] 506["SweepEdge Opposite"] 507["SweepEdge Adjacent"] - 508["Plane
[6202, 6219, 0]"] - 516["Sweep Extrusion
[6485, 6530, 0]"] + 508["Plane
[6223, 6240, 0]"] + 516["Sweep Extrusion
[6506, 6551, 0]"] 517[Wall] 518[Wall] 519[Wall] @@ -763,7 +763,7 @@ flowchart LR 528["SweepEdge Adjacent"] 529["SweepEdge Opposite"] 530["SweepEdge Adjacent"] - 538["Sweep Extrusion
[449, 472, 0]"] + 538["Sweep Extrusion
[456, 479, 0]"] 539[Wall] 540[Wall] 541[Wall] @@ -777,8 +777,8 @@ flowchart LR 549["SweepEdge Adjacent"] 550["SweepEdge Opposite"] 551["SweepEdge Adjacent"] - 552["Plane
[6202, 6219, 0]"] - 560["Sweep Extrusion
[6485, 6530, 0]"] + 552["Plane
[6223, 6240, 0]"] + 560["Sweep Extrusion
[6506, 6551, 0]"] 561[Wall] 562[Wall] 563[Wall] @@ -793,7 +793,7 @@ flowchart LR 572["SweepEdge Adjacent"] 573["SweepEdge Opposite"] 574["SweepEdge Adjacent"] - 582["Sweep Extrusion
[449, 472, 0]"] + 582["Sweep Extrusion
[456, 479, 0]"] 583[Wall] 584[Wall] 585[Wall] @@ -807,7 +807,7 @@ flowchart LR 593["SweepEdge Adjacent"] 594["SweepEdge Opposite"] 595["SweepEdge Adjacent"] - 603["Sweep Extrusion
[449, 472, 0]"] + 603["Sweep Extrusion
[456, 479, 0]"] 604[Wall] 605[Wall] 606[Wall] @@ -821,7 +821,7 @@ flowchart LR 614["SweepEdge Adjacent"] 615["SweepEdge Opposite"] 616["SweepEdge Adjacent"] - 624["Sweep Extrusion
[449, 472, 0]"] + 624["Sweep Extrusion
[456, 479, 0]"] 625[Wall] 626[Wall] 627[Wall] @@ -835,7 +835,7 @@ flowchart LR 635["SweepEdge Adjacent"] 636["SweepEdge Opposite"] 637["SweepEdge Adjacent"] - 645["Sweep Extrusion
[449, 472, 0]"] + 645["Sweep Extrusion
[456, 479, 0]"] 646[Wall] 647[Wall] 648[Wall] @@ -849,7 +849,7 @@ flowchart LR 656["SweepEdge Adjacent"] 657["SweepEdge Opposite"] 658["SweepEdge Adjacent"] - 666["Sweep Extrusion
[449, 472, 0]"] + 666["Sweep Extrusion
[456, 479, 0]"] 667[Wall] 668[Wall] 669[Wall] @@ -863,7 +863,7 @@ flowchart LR 677["SweepEdge Adjacent"] 678["SweepEdge Opposite"] 679["SweepEdge Adjacent"] - 687["Sweep Extrusion
[449, 472, 0]"] + 687["Sweep Extrusion
[456, 479, 0]"] 688[Wall] 689[Wall] 690[Wall] @@ -877,7 +877,7 @@ flowchart LR 698["SweepEdge Adjacent"] 699["SweepEdge Opposite"] 700["SweepEdge Adjacent"] - 708["Sweep Extrusion
[449, 472, 0]"] + 708["Sweep Extrusion
[456, 479, 0]"] 709[Wall] 710[Wall] 711[Wall] @@ -891,7 +891,7 @@ flowchart LR 719["SweepEdge Adjacent"] 720["SweepEdge Opposite"] 721["SweepEdge Adjacent"] - 729["Sweep Extrusion
[449, 472, 0]"] + 729["Sweep Extrusion
[456, 479, 0]"] 730[Wall] 731[Wall] 732[Wall] @@ -905,7 +905,7 @@ flowchart LR 740["SweepEdge Adjacent"] 741["SweepEdge Opposite"] 742["SweepEdge Adjacent"] - 750["Sweep Extrusion
[449, 472, 0]"] + 750["Sweep Extrusion
[456, 479, 0]"] 751[Wall] 752[Wall] 753[Wall] @@ -919,7 +919,7 @@ flowchart LR 761["SweepEdge Adjacent"] 762["SweepEdge Opposite"] 763["SweepEdge Adjacent"] - 771["Sweep Extrusion
[449, 472, 0]"] + 771["Sweep Extrusion
[456, 479, 0]"] 772[Wall] 773[Wall] 774[Wall] @@ -933,7 +933,7 @@ flowchart LR 782["SweepEdge Adjacent"] 783["SweepEdge Opposite"] 784["SweepEdge Adjacent"] - 792["Sweep Extrusion
[449, 472, 0]"] + 792["Sweep Extrusion
[456, 479, 0]"] 793[Wall] 794[Wall] 795[Wall] @@ -947,7 +947,7 @@ flowchart LR 803["SweepEdge Adjacent"] 804["SweepEdge Opposite"] 805["SweepEdge Adjacent"] - 813["Sweep Extrusion
[449, 472, 0]"] + 813["Sweep Extrusion
[456, 479, 0]"] 814[Wall] 815[Wall] 816[Wall] @@ -961,7 +961,7 @@ flowchart LR 824["SweepEdge Adjacent"] 825["SweepEdge Opposite"] 826["SweepEdge Adjacent"] - 834["Sweep Extrusion
[449, 472, 0]"] + 834["Sweep Extrusion
[456, 479, 0]"] 835[Wall] 836[Wall] 837[Wall] @@ -975,7 +975,7 @@ flowchart LR 845["SweepEdge Adjacent"] 846["SweepEdge Opposite"] 847["SweepEdge Adjacent"] - 855["Sweep Extrusion
[449, 472, 0]"] + 855["Sweep Extrusion
[456, 479, 0]"] 856[Wall] 857[Wall] 858[Wall] @@ -989,7 +989,7 @@ flowchart LR 866["SweepEdge Adjacent"] 867["SweepEdge Opposite"] 868["SweepEdge Adjacent"] - 876["Sweep Extrusion
[449, 472, 0]"] + 876["Sweep Extrusion
[456, 479, 0]"] 877[Wall] 878[Wall] 879[Wall] @@ -1003,7 +1003,7 @@ flowchart LR 887["SweepEdge Adjacent"] 888["SweepEdge Opposite"] 889["SweepEdge Adjacent"] - 897["Sweep Extrusion
[449, 472, 0]"] + 897["Sweep Extrusion
[456, 479, 0]"] 898[Wall] 899[Wall] 900[Wall] @@ -1017,7 +1017,7 @@ flowchart LR 908["SweepEdge Adjacent"] 909["SweepEdge Opposite"] 910["SweepEdge Adjacent"] - 918["Sweep Extrusion
[449, 472, 0]"] + 918["Sweep Extrusion
[456, 479, 0]"] 919[Wall] 920[Wall] 921[Wall] @@ -1031,7 +1031,7 @@ flowchart LR 929["SweepEdge Adjacent"] 930["SweepEdge Opposite"] 931["SweepEdge Adjacent"] - 939["Sweep Extrusion
[449, 472, 0]"] + 939["Sweep Extrusion
[456, 479, 0]"] 940[Wall] 941[Wall] 942[Wall] @@ -1045,7 +1045,7 @@ flowchart LR 950["SweepEdge Adjacent"] 951["SweepEdge Opposite"] 952["SweepEdge Adjacent"] - 960["Sweep Extrusion
[449, 472, 0]"] + 960["Sweep Extrusion
[456, 479, 0]"] 961[Wall] 962[Wall] 963[Wall] @@ -1059,46 +1059,46 @@ flowchart LR 971["SweepEdge Adjacent"] 972["SweepEdge Opposite"] 973["SweepEdge Adjacent"] - 974["StartSketchOnFace
[183, 220, 0]"] - 975["StartSketchOnFace
[1461, 1490, 0]"] - 976["StartSketchOnFace
[183, 220, 0]"] - 977["StartSketchOnFace
[183, 220, 0]"] - 978["StartSketchOnFace
[183, 220, 0]"] - 979["StartSketchOnFace
[183, 220, 0]"] - 980["StartSketchOnFace
[2843, 2874, 0]"] - 981["StartSketchOnFace
[183, 220, 0]"] - 982["StartSketchOnFace
[183, 220, 0]"] - 983["StartSketchOnFace
[183, 220, 0]"] - 984["StartSketchOnFace
[183, 220, 0]"] - 985["StartSketchOnFace
[183, 220, 0]"] - 986["StartSketchOnFace
[183, 220, 0]"] - 987["StartSketchOnFace
[183, 220, 0]"] - 988["StartSketchOnFace
[183, 220, 0]"] - 989["StartSketchOnFace
[183, 220, 0]"] - 990["StartSketchOnFace
[183, 220, 0]"] - 991["StartSketchOnFace
[183, 220, 0]"] - 992["StartSketchOnFace
[183, 220, 0]"] - 993["StartSketchOnFace
[183, 220, 0]"] - 994["StartSketchOnFace
[183, 220, 0]"] - 995["StartSketchOnFace
[183, 220, 0]"] - 996["StartSketchOnFace
[183, 220, 0]"] - 997["StartSketchOnFace
[183, 220, 0]"] - 998["StartSketchOnFace
[183, 220, 0]"] - 999["StartSketchOnFace
[183, 220, 0]"] - 1000["StartSketchOnFace
[183, 220, 0]"] - 1001["StartSketchOnFace
[183, 220, 0]"] - 1002["StartSketchOnFace
[183, 220, 0]"] - 1003["StartSketchOnFace
[183, 220, 0]"] - 1004["StartSketchOnFace
[183, 220, 0]"] - 1005["StartSketchOnFace
[183, 220, 0]"] - 1006["StartSketchOnFace
[183, 220, 0]"] - 1007["StartSketchOnFace
[183, 220, 0]"] - 1008["StartSketchOnFace
[183, 220, 0]"] - 1009["StartSketchOnFace
[183, 220, 0]"] - 1010["StartSketchOnFace
[183, 220, 0]"] - 1011["StartSketchOnFace
[183, 220, 0]"] - 1012["StartSketchOnFace
[183, 220, 0]"] - 1013["StartSketchOnFace
[183, 220, 0]"] + 974["StartSketchOnFace
[183, 227, 0]"] + 975["StartSketchOnFace
[1468, 1504, 0]"] + 976["StartSketchOnFace
[183, 227, 0]"] + 977["StartSketchOnFace
[183, 227, 0]"] + 978["StartSketchOnFace
[183, 227, 0]"] + 979["StartSketchOnFace
[183, 227, 0]"] + 980["StartSketchOnFace
[2857, 2895, 0]"] + 981["StartSketchOnFace
[183, 227, 0]"] + 982["StartSketchOnFace
[183, 227, 0]"] + 983["StartSketchOnFace
[183, 227, 0]"] + 984["StartSketchOnFace
[183, 227, 0]"] + 985["StartSketchOnFace
[183, 227, 0]"] + 986["StartSketchOnFace
[183, 227, 0]"] + 987["StartSketchOnFace
[183, 227, 0]"] + 988["StartSketchOnFace
[183, 227, 0]"] + 989["StartSketchOnFace
[183, 227, 0]"] + 990["StartSketchOnFace
[183, 227, 0]"] + 991["StartSketchOnFace
[183, 227, 0]"] + 992["StartSketchOnFace
[183, 227, 0]"] + 993["StartSketchOnFace
[183, 227, 0]"] + 994["StartSketchOnFace
[183, 227, 0]"] + 995["StartSketchOnFace
[183, 227, 0]"] + 996["StartSketchOnFace
[183, 227, 0]"] + 997["StartSketchOnFace
[183, 227, 0]"] + 998["StartSketchOnFace
[183, 227, 0]"] + 999["StartSketchOnFace
[183, 227, 0]"] + 1000["StartSketchOnFace
[183, 227, 0]"] + 1001["StartSketchOnFace
[183, 227, 0]"] + 1002["StartSketchOnFace
[183, 227, 0]"] + 1003["StartSketchOnFace
[183, 227, 0]"] + 1004["StartSketchOnFace
[183, 227, 0]"] + 1005["StartSketchOnFace
[183, 227, 0]"] + 1006["StartSketchOnFace
[183, 227, 0]"] + 1007["StartSketchOnFace
[183, 227, 0]"] + 1008["StartSketchOnFace
[183, 227, 0]"] + 1009["StartSketchOnFace
[183, 227, 0]"] + 1010["StartSketchOnFace
[183, 227, 0]"] + 1011["StartSketchOnFace
[183, 227, 0]"] + 1012["StartSketchOnFace
[183, 227, 0]"] + 1013["StartSketchOnFace
[183, 227, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/kitt/ast.snap b/rust/kcl-lib/tests/kcl_samples/kitt/ast.snap index f5869156f..2ca644b01 100644 --- a/rust/kcl-lib/tests/kcl_samples/kitt/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/kitt/ast.snap @@ -37,36 +37,30 @@ description: Result of parsing kitt.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "kitExtrude", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "extrudeTag", + "name": { + "commentStart": 0, + "end": 0, + "name": "extrudeTag", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -87,8 +81,24 @@ description: Result of parsing kitt.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "kitExtrude", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -2210,29 +2220,23 @@ description: Result of parsing kitt.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "kitHead", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'END'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "END" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'END'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "END" + } } ], "callee": { @@ -2253,8 +2257,24 @@ description: Result of parsing kitt.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "kitHead", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -4442,29 +4462,23 @@ description: Result of parsing kitt.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "kitFace", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'START'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "START" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'START'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "START" + } } ], "callee": { @@ -4485,8 +4499,24 @@ description: Result of parsing kitt.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "kitFace", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/kcl_samples/kitt/ops.snap b/rust/kcl-lib/tests/kcl_samples/kitt/ops.snap index 528763b2c..a104284c8 100644 --- a/rust/kcl-lib/tests/kcl_samples/kitt/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/kitt/ops.snap @@ -5,7 +5,7 @@ description: Operations executed kitt.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -57,7 +57,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -67,16 +67,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -87,7 +78,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -126,16 +125,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -146,7 +136,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -187,7 +185,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -197,16 +195,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -217,7 +206,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -261,7 +258,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -271,16 +268,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -291,7 +279,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -335,7 +331,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -345,16 +341,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -365,7 +352,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -409,7 +404,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -419,16 +414,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -439,7 +425,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -478,16 +472,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -498,7 +483,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -539,7 +532,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -549,16 +542,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -569,7 +553,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -613,7 +605,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -623,16 +615,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -643,7 +626,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -687,7 +678,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -697,16 +688,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -717,7 +699,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -761,7 +751,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -771,16 +761,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -791,7 +772,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -835,7 +824,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -845,16 +834,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -865,7 +845,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -909,7 +897,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -919,16 +907,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -939,7 +918,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -983,7 +970,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -993,16 +980,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -1013,7 +991,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1057,7 +1043,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -1067,16 +1053,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -1087,7 +1064,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1131,7 +1116,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -1141,16 +1126,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -1161,7 +1137,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1205,7 +1189,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -1215,16 +1199,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -1235,7 +1210,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1279,7 +1262,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -1289,16 +1272,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -1309,7 +1283,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1353,7 +1335,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -1363,16 +1345,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -1383,7 +1356,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1427,7 +1408,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -1437,16 +1418,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -1457,7 +1429,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1500,8 +1480,8 @@ description: Operations executed kitt.kcl "type": "FunctionCall", "name": "kitLeg", "functionSourceRange": [ - 6080, - 6895, + 6101, + 6916, 0 ], "unlabeledArg": null, @@ -1511,7 +1491,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1563,7 +1543,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -1573,16 +1553,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -1593,7 +1564,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1639,8 +1618,8 @@ description: Operations executed kitt.kcl "type": "FunctionCall", "name": "kitLeg", "functionSourceRange": [ - 6080, - 6895, + 6101, + 6916, 0 ], "unlabeledArg": null, @@ -1650,7 +1629,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1702,7 +1681,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -1712,16 +1691,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -1732,7 +1702,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1778,8 +1756,8 @@ description: Operations executed kitt.kcl "type": "FunctionCall", "name": "kitEar", "functionSourceRange": [ - 7082, - 8003, + 7103, + 8024, 0 ], "unlabeledArg": null, @@ -1794,7 +1772,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -1804,16 +1782,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg01", @@ -1825,7 +1794,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1869,7 +1846,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -1879,16 +1856,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -1899,7 +1867,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1943,7 +1919,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -1953,16 +1929,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -1973,7 +1940,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -2017,7 +1992,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -2027,16 +2002,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -2047,7 +2013,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -2093,8 +2067,8 @@ description: Operations executed kitt.kcl "type": "FunctionCall", "name": "kitEar", "functionSourceRange": [ - 7082, - 8003, + 7103, + 8024, 0 ], "unlabeledArg": null, @@ -2109,7 +2083,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -2119,16 +2093,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg01", @@ -2140,7 +2105,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -2184,7 +2157,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -2194,16 +2167,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -2214,7 +2178,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -2258,7 +2230,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -2268,16 +2240,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -2288,7 +2251,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -2332,7 +2303,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -2342,16 +2313,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -2362,7 +2324,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -2409,7 +2379,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -2419,16 +2389,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg02", @@ -2440,7 +2401,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -2484,7 +2453,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -2494,16 +2463,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg02", @@ -2515,7 +2475,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -2559,7 +2527,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -2569,16 +2537,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg02", @@ -2590,7 +2549,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -2634,7 +2601,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -2644,16 +2611,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg02", @@ -2665,7 +2623,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -2709,7 +2675,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -2719,16 +2685,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg02", @@ -2740,7 +2697,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -2784,7 +2749,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -2794,16 +2759,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg02", @@ -2815,7 +2771,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -2859,7 +2823,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -2869,16 +2833,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg02", @@ -2890,7 +2845,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -2934,7 +2897,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -2944,16 +2907,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg02", @@ -2965,7 +2919,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -3009,7 +2971,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -3019,16 +2981,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg02", @@ -3040,7 +2993,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -3084,7 +3045,7 @@ description: Operations executed kitt.kcl "name": "pixelBox", "functionSourceRange": [ 95, - 496, + 503, 0 ], "unlabeledArg": null, @@ -3094,16 +3055,7 @@ description: Operations executed kitt.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg02", @@ -3115,7 +3067,15 @@ description: Operations executed kitt.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/kcl_samples/kitt/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/kitt/program_memory.snap index b8b1e4123..0580bbeaf 100644 --- a/rust/kcl-lib/tests/kcl_samples/kitt/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/kitt/program_memory.snap @@ -212,17 +212,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -241,9 +250,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -254,9 +263,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -303,9 +312,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -328,9 +337,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -390,22 +399,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -632,17 +653,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -661,9 +691,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -674,9 +704,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -723,9 +753,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -748,9 +778,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -810,22 +840,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1052,17 +1094,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1081,9 +1132,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -1094,9 +1145,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -1143,9 +1194,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -1168,9 +1219,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -1230,22 +1281,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1472,17 +1535,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1501,9 +1573,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -1514,9 +1586,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -1563,9 +1635,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -1588,9 +1660,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -1650,22 +1722,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1892,17 +1976,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1921,9 +2014,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -1934,9 +2027,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -1983,9 +2076,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -2008,9 +2101,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -2070,22 +2163,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2312,17 +2417,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2341,9 +2455,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -2354,9 +2468,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -2403,9 +2517,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -2428,9 +2542,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -2490,22 +2604,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2732,17 +2858,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2761,9 +2896,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -2774,9 +2909,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -2823,9 +2958,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -2848,9 +2983,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -2910,22 +3045,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3230,17 +3377,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3259,9 +3415,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -3272,9 +3428,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -3321,9 +3477,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -3346,9 +3502,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -3408,22 +3564,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3650,17 +3818,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3679,9 +3856,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -3692,9 +3869,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -3741,9 +3918,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -3766,9 +3943,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -3828,22 +4005,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3969,8 +4158,13 @@ description: Variables in memory after executing kitt.kcl "type": "Number", "value": 9.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "kitBellyButtonWidth": { @@ -4057,9 +4251,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -4070,9 +4264,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -4119,9 +4313,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -4144,9 +4338,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -4206,22 +4400,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4465,17 +4671,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -4619,17 +4834,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -4648,9 +4872,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -4661,9 +4885,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -4710,9 +4934,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -4735,9 +4959,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -4797,22 +5021,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5074,17 +5310,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -5228,17 +5473,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -5257,9 +5511,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -5270,9 +5524,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -5319,9 +5573,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -5344,9 +5598,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -5406,22 +5660,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5683,17 +5949,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -5837,17 +6112,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -5866,9 +6150,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -5879,9 +6163,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -5928,9 +6212,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -5953,9 +6237,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -6015,22 +6299,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6659,17 +6955,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -6813,17 +7118,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -6842,9 +7156,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -6855,9 +7169,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -6904,9 +7218,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -6929,9 +7243,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -6991,22 +7305,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7320,17 +7646,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -7474,17 +7809,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -7503,9 +7847,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -7516,9 +7860,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -7565,9 +7909,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -7590,9 +7934,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -7652,22 +7996,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7929,17 +8285,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -8083,17 +8448,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -8112,9 +8486,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -8125,9 +8499,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -8174,9 +8548,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -8199,9 +8573,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -8261,22 +8635,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8538,17 +8924,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -8692,17 +9087,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -8721,9 +9125,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -8734,9 +9138,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -8783,9 +9187,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -8808,9 +9212,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -8870,22 +9274,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9046,8 +9462,13 @@ description: Variables in memory after executing kitt.kcl "type": "Number", "value": 11.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "kitFloppyWidth": { @@ -9207,17 +9628,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -9236,9 +9666,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -9249,9 +9679,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -9298,9 +9728,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -9323,9 +9753,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -9385,22 +9815,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9692,17 +10134,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -9721,9 +10172,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -9734,9 +10185,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -9783,9 +10234,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -9808,9 +10259,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -9870,22 +10321,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10112,17 +10575,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -10474,17 +10946,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -10628,17 +11109,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -10657,9 +11147,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -10670,9 +11160,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -10719,9 +11209,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -10744,9 +11234,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -10806,22 +11296,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -11118,17 +11620,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -11480,17 +11991,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -11634,17 +12154,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -11663,9 +12192,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -11676,9 +12205,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -11725,9 +12254,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -11750,9 +12279,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -11812,22 +12341,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -12124,17 +12665,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -12486,17 +13036,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -12640,17 +13199,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -12669,9 +13237,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -12682,9 +13250,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -12731,9 +13299,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -12756,9 +13324,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -12818,22 +13386,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13130,22 +13710,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -13343,17 +13935,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -13705,17 +14306,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -13859,17 +14469,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -13888,9 +14507,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -13901,9 +14520,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -13950,9 +14569,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -13975,9 +14594,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -14037,22 +14656,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -14349,17 +14980,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -14711,17 +15351,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -14865,17 +15514,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -14894,9 +15552,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -14907,9 +15565,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -14956,9 +15614,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -14981,9 +15639,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -15043,22 +15701,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -15381,17 +16051,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -15743,17 +16422,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -15897,17 +16585,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -15926,9 +16623,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -15939,9 +16636,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -15988,9 +16685,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -16013,9 +16710,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -16075,22 +16772,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -16387,17 +17096,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -16749,17 +17467,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -16903,17 +17630,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -16932,9 +17668,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -16945,9 +17681,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -16994,9 +17730,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -17019,9 +17755,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -17081,22 +17817,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -17601,17 +18349,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -17963,17 +18720,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -18117,17 +18883,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -18146,9 +18921,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -18159,9 +18934,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -18208,9 +18983,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -18233,9 +19008,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -18295,22 +19070,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -18620,17 +19407,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -18649,9 +19445,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -18662,9 +19458,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -18711,9 +19507,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -18736,9 +19532,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -18798,22 +19594,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -19040,17 +19848,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -19402,17 +20219,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -19556,17 +20382,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -19585,9 +20420,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -19598,9 +20433,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -19647,9 +20482,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -19672,9 +20507,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -19734,22 +20569,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -20046,22 +20893,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -20282,17 +21141,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -20436,17 +21304,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -20465,9 +21342,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -20478,9 +21355,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -20527,9 +21404,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -20552,9 +21429,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -20614,22 +21491,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -20943,17 +21832,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -20972,9 +21870,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -20985,9 +21883,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -21034,9 +21932,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -21059,9 +21957,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -21121,22 +22019,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -21363,17 +22273,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -21392,9 +22311,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -21405,9 +22324,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -21454,9 +22373,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -21479,9 +22398,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -21541,22 +22460,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -21783,17 +22714,26 @@ description: Variables in memory after executing kitt.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -21812,9 +22752,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -21825,9 +22765,9 @@ description: Variables in memory after executing kitt.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -21874,9 +22814,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 759, - "end": 765, - "start": 759, + "commentStart": 766, + "end": 772, + "start": 766, "type": "TagDeclarator", "value": "seg01" }, @@ -21899,9 +22839,9 @@ description: Variables in memory after executing kitt.kcl 31.0 ], "tag": { - "commentStart": 810, - "end": 816, - "start": 810, + "commentStart": 817, + "end": 823, + "start": 817, "type": "TagDeclarator", "value": "seg02" }, @@ -21961,22 +22901,34 @@ description: Variables in memory after executing kitt.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/kcl_samples/lego/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/lego/artifact_graph_flowchart.snap.md index b709c2502..1c87ac32b 100644 --- a/rust/kcl-lib/tests/kcl_samples/lego/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/lego/artifact_graph_flowchart.snap.md @@ -9,21 +9,21 @@ flowchart LR 7[Solid2d] end subgraph path23 [Path] - 23["Path
[1403, 1490, 0]"] - 24["Segment
[1496, 1533, 0]"] - 25["Segment
[1539, 1577, 0]"] - 26["Segment
[1583, 1623, 0]"] - 27["Segment
[1629, 1636, 0]"] + 23["Path
[1410, 1497, 0]"] + 24["Segment
[1503, 1540, 0]"] + 25["Segment
[1546, 1584, 0]"] + 26["Segment
[1590, 1630, 0]"] + 27["Segment
[1636, 1643, 0]"] 28[Solid2d] end subgraph path43 [Path] - 43["Path
[1755, 1902, 0]"] - 44["Segment
[1755, 1902, 0]"] + 43["Path
[1769, 1916, 0]"] + 44["Segment
[1769, 1916, 0]"] 45[Solid2d] end subgraph path56 [Path] - 56["Path
[2187, 2362, 0]"] - 57["Segment
[2187, 2362, 0]"] + 56["Path
[2208, 2383, 0]"] + 57["Segment
[2208, 2383, 0]"] 58[Solid2d] end 1["Plane
[970, 987, 0]"] @@ -42,7 +42,7 @@ flowchart LR 20["SweepEdge Adjacent"] 21["SweepEdge Opposite"] 22["SweepEdge Adjacent"] - 29["Sweep Extrusion
[1642, 1673, 0]"] + 29["Sweep Extrusion
[1649, 1680, 0]"] 30[Wall] 31[Wall] 32[Wall] @@ -56,25 +56,25 @@ flowchart LR 40["SweepEdge Adjacent"] 41["SweepEdge Opposite"] 42["SweepEdge Adjacent"] - 46["Sweep Extrusion
[2056, 2084, 0]"] + 46["Sweep Extrusion
[2070, 2098, 0]"] 47[Wall] 48["Cap End"] 49["SweepEdge Opposite"] 50["SweepEdge Adjacent"] - 51["Sweep Extrusion
[2056, 2084, 0]"] - 52["Sweep Extrusion
[2056, 2084, 0]"] - 53["Sweep Extrusion
[2056, 2084, 0]"] - 54["Sweep Extrusion
[2056, 2084, 0]"] - 55["Sweep Extrusion
[2056, 2084, 0]"] - 59["Sweep Extrusion
[2524, 2552, 0]"] + 51["Sweep Extrusion
[2070, 2098, 0]"] + 52["Sweep Extrusion
[2070, 2098, 0]"] + 53["Sweep Extrusion
[2070, 2098, 0]"] + 54["Sweep Extrusion
[2070, 2098, 0]"] + 55["Sweep Extrusion
[2070, 2098, 0]"] + 59["Sweep Extrusion
[2545, 2573, 0]"] 60[Wall] 61["Cap End"] 62["SweepEdge Opposite"] 63["SweepEdge Adjacent"] - 64["Sweep Extrusion
[2524, 2552, 0]"] - 65["StartSketchOnFace
[1369, 1397, 0]"] - 66["StartSketchOnFace
[1723, 1749, 0]"] - 67["StartSketchOnFace
[2145, 2181, 0]"] + 64["Sweep Extrusion
[2545, 2573, 0]"] + 65["StartSketchOnFace
[1369, 1404, 0]"] + 66["StartSketchOnFace
[1730, 1763, 0]"] + 67["StartSketchOnFace
[2159, 2202, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/lego/ast.snap b/rust/kcl-lib/tests/kcl_samples/lego/ast.snap index 33c838428..187b7dff1 100644 --- a/rust/kcl-lib/tests/kcl_samples/lego/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/lego/ast.snap @@ -1439,29 +1439,23 @@ description: Result of parsing lego.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "base", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "\"start\"", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "start" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "\"start\"", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "start" + } } ], "callee": { @@ -1482,8 +1476,24 @@ description: Result of parsing lego.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "base", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -2174,29 +2184,23 @@ description: Result of parsing lego.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "base", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'end'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "end" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'end'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "end" + } } ], "callee": { @@ -2217,8 +2221,24 @@ description: Result of parsing lego.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "base", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -2828,29 +2848,23 @@ description: Result of parsing lego.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "shellExtrude", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'start'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "start" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'start'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "start" + } } ], "callee": { @@ -2871,8 +2885,24 @@ description: Result of parsing lego.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "shellExtrude", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/kcl_samples/lego/ops.snap b/rust/kcl-lib/tests/kcl_samples/lego/ops.snap index c47422d0a..1956612e7 100644 --- a/rust/kcl-lib/tests/kcl_samples/lego/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/lego/ops.snap @@ -5,7 +5,7 @@ description: Operations executed lego.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -52,16 +52,7 @@ description: Operations executed lego.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -72,7 +63,15 @@ description: Operations executed lego.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -81,8 +80,13 @@ description: Operations executed lego.kcl "type": "Number", "value": -1.7000000000000002, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -103,16 +107,7 @@ description: Operations executed lego.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -123,7 +118,15 @@ description: Operations executed lego.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -194,16 +197,7 @@ description: Operations executed lego.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -214,7 +208,15 @@ description: Operations executed lego.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/kcl_samples/lego/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/lego/program_memory.snap index 87ac6fe1f..05c671136 100644 --- a/rust/kcl-lib/tests/kcl_samples/lego/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/lego/program_memory.snap @@ -128,22 +128,34 @@ description: Variables in memory after executing lego.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -237,8 +249,13 @@ description: Variables in memory after executing lego.kcl "type": "Number", "value": 7.9333, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "lbumps": { @@ -310,17 +327,26 @@ description: Variables in memory after executing lego.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -445,22 +471,34 @@ description: Variables in memory after executing lego.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -586,17 +624,26 @@ description: Variables in memory after executing lego.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -721,22 +768,34 @@ description: Variables in memory after executing lego.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -862,17 +921,26 @@ description: Variables in memory after executing lego.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -997,22 +1065,34 @@ description: Variables in memory after executing lego.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1138,17 +1218,26 @@ description: Variables in memory after executing lego.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1273,22 +1362,34 @@ description: Variables in memory after executing lego.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1414,17 +1515,26 @@ description: Variables in memory after executing lego.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1549,22 +1659,34 @@ description: Variables in memory after executing lego.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1690,17 +1812,26 @@ description: Variables in memory after executing lego.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1825,22 +1956,34 @@ description: Variables in memory after executing lego.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1932,8 +2075,13 @@ description: Variables in memory after executing lego.kcl "type": "Number", "value": 6.5, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "shellExtrude": { @@ -2061,17 +2209,26 @@ description: Variables in memory after executing lego.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2196,22 +2353,34 @@ description: Variables in memory after executing lego.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2288,8 +2457,13 @@ description: Variables in memory after executing lego.kcl "type": "Number", "value": 1.5, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "totalLength": { @@ -2374,17 +2548,26 @@ description: Variables in memory after executing lego.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2509,17 +2692,26 @@ description: Variables in memory after executing lego.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2644,22 +2836,34 @@ description: Variables in memory after executing lego.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2820,17 +3024,26 @@ description: Variables in memory after executing lego.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2955,17 +3168,26 @@ description: Variables in memory after executing lego.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3090,22 +3312,34 @@ description: Variables in memory after executing lego.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -3219,8 +3453,13 @@ description: Variables in memory after executing lego.kcl "type": "Number", "value": 7.9, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "wbumps": { diff --git a/rust/kcl-lib/tests/kcl_samples/makeup-mirror/ops.snap b/rust/kcl-lib/tests/kcl_samples/makeup-mirror/ops.snap index 61722a726..ceb7e751e 100644 --- a/rust/kcl-lib/tests/kcl_samples/makeup-mirror/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/makeup-mirror/ops.snap @@ -50,7 +50,7 @@ description: Operations executed makeup-mirror.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -145,7 +145,7 @@ description: Operations executed makeup-mirror.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -240,7 +240,7 @@ description: Operations executed makeup-mirror.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -335,7 +335,7 @@ description: Operations executed makeup-mirror.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -430,7 +430,7 @@ description: Operations executed makeup-mirror.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -525,7 +525,7 @@ description: Operations executed makeup-mirror.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -620,7 +620,7 @@ description: Operations executed makeup-mirror.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -685,7 +685,7 @@ description: Operations executed makeup-mirror.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -750,7 +750,7 @@ description: Operations executed makeup-mirror.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -820,8 +820,13 @@ description: Operations executed makeup-mirror.kcl "type": "Number", "value": 165.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -840,7 +845,7 @@ description: Operations executed makeup-mirror.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/kcl_samples/makeup-mirror/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/makeup-mirror/program_memory.snap index 7524c744d..392b9807e 100644 --- a/rust/kcl-lib/tests/kcl_samples/makeup-mirror/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/makeup-mirror/program_memory.snap @@ -7,8 +7,13 @@ description: Variables in memory after executing makeup-mirror.kcl "type": "Number", "value": 90.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "archThickness": { @@ -106,22 +111,34 @@ description: Variables in memory after executing makeup-mirror.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -212,22 +229,34 @@ description: Variables in memory after executing makeup-mirror.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -360,22 +389,34 @@ description: Variables in memory after executing makeup-mirror.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -466,22 +507,34 @@ description: Variables in memory after executing makeup-mirror.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 24.5 + "z": 24.5, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -572,22 +625,34 @@ description: Variables in memory after executing makeup-mirror.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 49.0 + "z": 49.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -678,22 +743,34 @@ description: Variables in memory after executing makeup-mirror.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 24.5 + "z": 24.5, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -784,22 +861,34 @@ description: Variables in memory after executing makeup-mirror.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 49.0 + "z": 49.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -890,22 +979,34 @@ description: Variables in memory after executing makeup-mirror.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 49.0 + "z": 49.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -996,22 +1097,34 @@ description: Variables in memory after executing makeup-mirror.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 73.5 + "z": 73.5, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1115,22 +1228,34 @@ description: Variables in memory after executing makeup-mirror.kcl "origin": { "x": 0.0, "y": -165.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1175,8 +1300,13 @@ description: Variables in memory after executing makeup-mirror.kcl "type": "Number", "value": 85.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "mirrorThickness": { diff --git a/rust/kcl-lib/tests/kcl_samples/mounting-plate/ops.snap b/rust/kcl-lib/tests/kcl_samples/mounting-plate/ops.snap index 9e60d9709..546639cd9 100644 --- a/rust/kcl-lib/tests/kcl_samples/mounting-plate/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/mounting-plate/ops.snap @@ -20,7 +20,7 @@ description: Operations executed mounting-plate.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/kcl_samples/mounting-plate/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/mounting-plate/program_memory.snap index ea4fa9f24..a89a83a66 100644 --- a/rust/kcl-lib/tests/kcl_samples/mounting-plate/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/mounting-plate/program_memory.snap @@ -248,22 +248,34 @@ description: Variables in memory after executing mounting-plate.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -318,28 +330,72 @@ description: Variables in memory after executing mounting-plate.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -506,22 +562,34 @@ description: Variables in memory after executing mounting-plate.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" diff --git a/rust/kcl-lib/tests/kcl_samples/multi-axis-robot/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/multi-axis-robot/artifact_graph_flowchart.snap.md index adc866842..88bc58e54 100644 --- a/rust/kcl-lib/tests/kcl_samples/multi-axis-robot/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/multi-axis-robot/artifact_graph_flowchart.snap.md @@ -10,23 +10,23 @@ flowchart LR 8[Solid2d] end subgraph path28 [Path] - 28["Path
[1146, 1203, 5]"] - 29["Segment
[1146, 1203, 5]"] + 28["Path
[1153, 1210, 5]"] + 29["Segment
[1153, 1210, 5]"] 30[Solid2d] end subgraph path36 [Path] - 36["Path
[1401, 1438, 5]"] - 37["Segment
[1401, 1438, 5]"] + 36["Path
[1415, 1452, 5]"] + 37["Segment
[1415, 1452, 5]"] 38[Solid2d] end subgraph path44 [Path] - 44["Path
[1570, 1710, 5]"] - 45["Segment
[1570, 1710, 5]"] + 44["Path
[1591, 1731, 5]"] + 45["Segment
[1591, 1731, 5]"] 46[Solid2d] end subgraph path54 [Path] - 54["Path
[1956, 2096, 5]"] - 55["Segment
[1956, 2096, 5]"] + 54["Path
[1984, 2124, 5]"] + 55["Segment
[1984, 2124, 5]"] 56[Solid2d] end subgraph path65 [Path] @@ -44,23 +44,23 @@ flowchart LR 81[Solid2d] end subgraph path97 [Path] - 97["Path
[893, 1068, 6]"] - 98["Segment
[893, 1068, 6]"] + 97["Path
[900, 1075, 6]"] + 98["Segment
[900, 1075, 6]"] 99[Solid2d] end subgraph path105 [Path] - 105["Path
[1272, 1419, 6]"] - 106["Segment
[1272, 1419, 6]"] + 105["Path
[1286, 1433, 6]"] + 106["Segment
[1286, 1433, 6]"] 107[Solid2d] end subgraph path116 [Path] - 116["Path
[1736, 1910, 6]"] - 117["Segment
[1736, 1910, 6]"] + 116["Path
[1757, 1931, 6]"] + 117["Segment
[1757, 1931, 6]"] 118[Solid2d] end subgraph path125 [Path] - 125["Path
[2135, 2175, 6]"] - 126["Segment
[2135, 2175, 6]"] + 125["Path
[2156, 2196, 6]"] + 126["Segment
[2156, 2196, 6]"] 127[Solid2d] end subgraph path137 [Path] @@ -73,28 +73,28 @@ flowchart LR 143[Solid2d] end subgraph path159 [Path] - 159["Path
[887, 951, 7]"] - 160["Segment
[887, 951, 7]"] + 159["Path
[894, 958, 7]"] + 160["Segment
[894, 958, 7]"] 161[Solid2d] end subgraph path167 [Path] - 167["Path
[1120, 1328, 7]"] - 168["Segment
[1120, 1328, 7]"] + 167["Path
[1134, 1342, 7]"] + 168["Segment
[1134, 1342, 7]"] 169[Solid2d] end subgraph path175 [Path] - 175["Path
[1531, 1575, 7]"] - 176["Segment
[1531, 1575, 7]"] + 175["Path
[1552, 1596, 7]"] + 176["Segment
[1552, 1596, 7]"] 177[Solid2d] end subgraph path190 [Path] - 190["Path
[1813, 2005, 7]"] - 191["Segment
[1813, 2005, 7]"] + 190["Path
[1841, 2033, 7]"] + 191["Segment
[1841, 2033, 7]"] 192[Solid2d] end subgraph path201 [Path] - 201["Path
[2358, 2533, 7]"] - 202["Segment
[2358, 2533, 7]"] + 201["Path
[2393, 2568, 7]"] + 202["Segment
[2393, 2568, 7]"] 203[Solid2d] end subgraph path210 [Path] @@ -107,52 +107,52 @@ flowchart LR 216[Solid2d] end subgraph path232 [Path] - 232["Path
[1017, 1226, 8]"] - 233["Segment
[1017, 1226, 8]"] + 232["Path
[1024, 1233, 8]"] + 233["Segment
[1024, 1233, 8]"] 234[Solid2d] end subgraph path240 [Path] - 240["Path
[1431, 1620, 8]"] - 241["Segment
[1431, 1620, 8]"] + 240["Path
[1445, 1634, 8]"] + 241["Segment
[1445, 1634, 8]"] 242[Solid2d] end subgraph path255 [Path] - 255["Path
[2041, 2327, 8]"] - 256["Segment
[2041, 2327, 8]"] + 255["Path
[2062, 2348, 8]"] + 256["Segment
[2062, 2348, 8]"] 257[Solid2d] end subgraph path264 [Path] - 264["Path
[2426, 2710, 8]"] - 265["Segment
[2426, 2710, 8]"] + 264["Path
[2454, 2738, 8]"] + 265["Segment
[2454, 2738, 8]"] 266[Solid2d] end subgraph path273 [Path] - 273["Path
[2864, 2902, 8]"] - 274["Segment
[2864, 2902, 8]"] + 273["Path
[2899, 2937, 8]"] + 274["Segment
[2899, 2937, 8]"] 275[Solid2d] end subgraph path282 [Path] - 282["Path
[3032, 3257, 8]"] - 283["Segment
[3263, 3331, 8]"] - 284["Segment
[3337, 3480, 8]"] - 285["Segment
[3486, 3554, 8]"] - 286["Segment
[3560, 3636, 8]"] - 287["Segment
[3642, 3718, 8]"] - 288["Segment
[3724, 3798, 8]"] - 289["Segment
[3804, 3860, 8]"] - 290["Segment
[3866, 3873, 8]"] + 282["Path
[3074, 3299, 8]"] + 283["Segment
[3305, 3373, 8]"] + 284["Segment
[3379, 3522, 8]"] + 285["Segment
[3528, 3596, 8]"] + 286["Segment
[3602, 3678, 8]"] + 287["Segment
[3684, 3760, 8]"] + 288["Segment
[3766, 3840, 8]"] + 289["Segment
[3846, 3902, 8]"] + 290["Segment
[3908, 3915, 8]"] 291[Solid2d] end subgraph path316 [Path] - 316["Path
[4002, 4227, 8]"] - 317["Segment
[4233, 4303, 8]"] - 318["Segment
[4309, 4457, 8]"] - 319["Segment
[4463, 4533, 8]"] - 320["Segment
[4539, 4617, 8]"] - 321["Segment
[4623, 4701, 8]"] - 322["Segment
[4707, 4783, 8]"] - 323["Segment
[4789, 4845, 8]"] - 324["Segment
[4851, 4858, 8]"] + 316["Path
[4051, 4276, 8]"] + 317["Segment
[4282, 4352, 8]"] + 318["Segment
[4358, 4506, 8]"] + 319["Segment
[4512, 4582, 8]"] + 320["Segment
[4588, 4666, 8]"] + 321["Segment
[4672, 4750, 8]"] + 322["Segment
[4756, 4832, 8]"] + 323["Segment
[4838, 4894, 8]"] + 324["Segment
[4900, 4907, 8]"] 325[Solid2d] end 1["Plane
[201, 218, 5]"] @@ -175,30 +175,30 @@ flowchart LR 25["EdgeCut Chamfer
[777, 1054, 5]"] 26["EdgeCut Chamfer
[777, 1054, 5]"] 27["EdgeCut Chamfer
[777, 1054, 5]"] - 31["Sweep Extrusion
[1217, 1283, 5]"] + 31["Sweep Extrusion
[1224, 1290, 5]"] 32[Wall] 33["Cap End"] 34["SweepEdge Opposite"] 35["SweepEdge Adjacent"] - 39["Sweep Extrusion
[1452, 1482, 5]"] + 39["Sweep Extrusion
[1466, 1496, 5]"] 40[Wall] 41["Cap End"] 42["SweepEdge Opposite"] 43["SweepEdge Adjacent"] - 47["Sweep Extrusion
[1858, 1905, 5]"] + 47["Sweep Extrusion
[1879, 1926, 5]"] 48[Wall] 49["SweepEdge Opposite"] 50["SweepEdge Adjacent"] - 51["Sweep Extrusion
[1858, 1905, 5]"] - 52["Sweep Extrusion
[1858, 1905, 5]"] - 53["Sweep Extrusion
[1858, 1905, 5]"] - 57["Sweep Extrusion
[2232, 2279, 5]"] + 51["Sweep Extrusion
[1879, 1926, 5]"] + 52["Sweep Extrusion
[1879, 1926, 5]"] + 53["Sweep Extrusion
[1879, 1926, 5]"] + 57["Sweep Extrusion
[2260, 2307, 5]"] 58[Wall] 59["SweepEdge Opposite"] 60["SweepEdge Adjacent"] - 61["Sweep Extrusion
[2232, 2279, 5]"] - 62["Sweep Extrusion
[2232, 2279, 5]"] - 63["Sweep Extrusion
[2232, 2279, 5]"] + 61["Sweep Extrusion
[2260, 2307, 5]"] + 62["Sweep Extrusion
[2260, 2307, 5]"] + 63["Sweep Extrusion
[2260, 2307, 5]"] 64["Plane
[174, 197, 6]"] 68["Sweep Extrusion
[277, 315, 6]"] 69[Wall] @@ -222,33 +222,33 @@ flowchart LR 94["SweepEdge Adjacent"] 95["SweepEdge Opposite"] 96["SweepEdge Adjacent"] - 100["Sweep Extrusion
[1082, 1114, 6]"] + 100["Sweep Extrusion
[1089, 1121, 6]"] 101[Wall] 102["Cap End"] 103["SweepEdge Opposite"] 104["SweepEdge Adjacent"] - 108["Sweep Extrusion
[1652, 1684, 6]"] + 108["Sweep Extrusion
[1666, 1698, 6]"] 109[Wall] 110["Cap End"] 111["SweepEdge Opposite"] 112["SweepEdge Adjacent"] - 113["Sweep Extrusion
[1652, 1684, 6]"] - 114["Sweep Extrusion
[1652, 1684, 6]"] - 115["Sweep Extrusion
[1652, 1684, 6]"] - 119["Sweep Extrusion
[1924, 1957, 6]"] + 113["Sweep Extrusion
[1666, 1698, 6]"] + 114["Sweep Extrusion
[1666, 1698, 6]"] + 115["Sweep Extrusion
[1666, 1698, 6]"] + 119["Sweep Extrusion
[1945, 1978, 6]"] 120[Wall] 121["Cap End"] 122["SweepEdge Opposite"] 123["SweepEdge Adjacent"] - 124["Plane
[2106, 2129, 6]"] - 128["Sweep Extrusion
[2177, 2208, 6]"] + 124["Plane
[2127, 2150, 6]"] + 128["Sweep Extrusion
[2198, 2229, 6]"] 129[Wall] 130["Cap Start"] 131["Cap End"] 132["SweepEdge Opposite"] 133["SweepEdge Adjacent"] 134["EdgeCut Fillet
[321, 383, 6]"] - 135["EdgeCut Fillet
[1963, 2025, 6]"] + 135["EdgeCut Fillet
[1984, 2046, 6]"] 136["Plane
[222, 245, 7]"] 144["Sweep Extrusion
[785, 833, 7]"] 145[Wall] @@ -265,37 +265,37 @@ flowchart LR 156["SweepEdge Adjacent"] 157["SweepEdge Opposite"] 158["SweepEdge Adjacent"] - 162["Sweep Extrusion
[966, 999, 7]"] + 162["Sweep Extrusion
[973, 1006, 7]"] 163[Wall] 164["Cap End"] 165["SweepEdge Opposite"] 166["SweepEdge Adjacent"] - 170["Sweep Extrusion
[1343, 1373, 7]"] + 170["Sweep Extrusion
[1357, 1387, 7]"] 171[Wall] 172["Cap End"] 173["SweepEdge Opposite"] 174["SweepEdge Adjacent"] - 178["Sweep Extrusion
[1728, 1761, 7]"] + 178["Sweep Extrusion
[1749, 1782, 7]"] 179[Wall] 180["Cap End"] 181["SweepEdge Opposite"] 182["SweepEdge Adjacent"] - 183["Sweep Extrusion
[1728, 1761, 7]"] - 184["Sweep Extrusion
[1728, 1761, 7]"] - 185["Sweep Extrusion
[1728, 1761, 7]"] - 186["Sweep Extrusion
[1728, 1761, 7]"] - 187["Sweep Extrusion
[1728, 1761, 7]"] - 188["Sweep Extrusion
[1728, 1761, 7]"] - 189["Sweep Extrusion
[1728, 1761, 7]"] - 193["Sweep Extrusion
[2273, 2306, 7]"] + 183["Sweep Extrusion
[1749, 1782, 7]"] + 184["Sweep Extrusion
[1749, 1782, 7]"] + 185["Sweep Extrusion
[1749, 1782, 7]"] + 186["Sweep Extrusion
[1749, 1782, 7]"] + 187["Sweep Extrusion
[1749, 1782, 7]"] + 188["Sweep Extrusion
[1749, 1782, 7]"] + 189["Sweep Extrusion
[1749, 1782, 7]"] + 193["Sweep Extrusion
[2301, 2334, 7]"] 194[Wall] 195["Cap End"] 196["SweepEdge Opposite"] 197["SweepEdge Adjacent"] - 198["Sweep Extrusion
[2273, 2306, 7]"] - 199["Sweep Extrusion
[2273, 2306, 7]"] - 200["Sweep Extrusion
[2273, 2306, 7]"] - 204["Sweep Extrusion
[2535, 2565, 7]"] + 198["Sweep Extrusion
[2301, 2334, 7]"] + 199["Sweep Extrusion
[2301, 2334, 7]"] + 200["Sweep Extrusion
[2301, 2334, 7]"] + 204["Sweep Extrusion
[2570, 2600, 7]"] 205[Wall] 206["Cap End"] 207["SweepEdge Opposite"] @@ -316,42 +316,42 @@ flowchart LR 229["SweepEdge Adjacent"] 230["SweepEdge Opposite"] 231["SweepEdge Adjacent"] - 235["Sweep Extrusion
[1241, 1274, 8]"] + 235["Sweep Extrusion
[1248, 1281, 8]"] 236[Wall] 237["Cap End"] 238["SweepEdge Opposite"] 239["SweepEdge Adjacent"] - 243["Sweep Extrusion
[1885, 1918, 8]"] + 243["Sweep Extrusion
[1899, 1932, 8]"] 244[Wall] 245["Cap End"] 246["SweepEdge Opposite"] 247["SweepEdge Adjacent"] - 248["Sweep Extrusion
[1885, 1918, 8]"] - 249["Sweep Extrusion
[1885, 1918, 8]"] - 250["Sweep Extrusion
[1885, 1918, 8]"] - 251["Sweep Extrusion
[1885, 1918, 8]"] - 252["Sweep Extrusion
[1885, 1918, 8]"] - 253["Sweep Extrusion
[1885, 1918, 8]"] - 254["Sweep Extrusion
[1885, 1918, 8]"] - 258["Sweep Extrusion
[2341, 2374, 8]"] + 248["Sweep Extrusion
[1899, 1932, 8]"] + 249["Sweep Extrusion
[1899, 1932, 8]"] + 250["Sweep Extrusion
[1899, 1932, 8]"] + 251["Sweep Extrusion
[1899, 1932, 8]"] + 252["Sweep Extrusion
[1899, 1932, 8]"] + 253["Sweep Extrusion
[1899, 1932, 8]"] + 254["Sweep Extrusion
[1899, 1932, 8]"] + 258["Sweep Extrusion
[2362, 2395, 8]"] 259[Wall] 260["Cap Start"] 261["Cap End"] 262["SweepEdge Opposite"] 263["SweepEdge Adjacent"] - 267["Sweep Extrusion
[2725, 2758, 8]"] + 267["Sweep Extrusion
[2753, 2786, 8]"] 268[Wall] 269["Cap Start"] 270["Cap End"] 271["SweepEdge Opposite"] 272["SweepEdge Adjacent"] - 276["Sweep Extrusion
[2917, 2951, 8]"] + 276["Sweep Extrusion
[2952, 2986, 8]"] 277[Wall] 278["Cap Start"] 279["Cap End"] 280["SweepEdge Opposite"] 281["SweepEdge Adjacent"] - 292["Sweep Extrusion
[3888, 3921, 8]"] + 292["Sweep Extrusion
[3930, 3963, 8]"] 293[Wall] 294[Wall] 295[Wall] @@ -375,7 +375,7 @@ flowchart LR 313["SweepEdge Adjacent"] 314["SweepEdge Opposite"] 315["SweepEdge Adjacent"] - 326["Sweep Extrusion
[4860, 4893, 8]"] + 326["Sweep Extrusion
[4909, 4942, 8]"] 327[Wall] 328[Wall] 329[Wall] @@ -399,25 +399,25 @@ flowchart LR 347["SweepEdge Adjacent"] 348["SweepEdge Opposite"] 349["SweepEdge Adjacent"] - 350["StartSketchOnFace
[1108, 1140, 5]"] - 351["StartSketchOnFace
[1363, 1395, 5]"] - 352["StartSketchOnFace
[1532, 1564, 5]"] - 353["StartSketchOnFace
[1918, 1950, 5]"] - 354["StartSketchOnFace
[855, 887, 6]"] - 355["StartSketchOnFace
[1234, 1266, 6]"] - 356["StartSketchOnFace
[1698, 1730, 6]"] - 357["StartSketchOnFace
[847, 881, 7]"] - 358["StartSketchOnFace
[1080, 1114, 7]"] - 359["StartSketchOnFace
[1493, 1525, 7]"] - 360["StartSketchOnFace
[1775, 1807, 7]"] - 361["StartSketchOnFace
[2320, 2352, 7]"] - 362["StartSketchOnFace
[979, 1011, 8]"] - 363["StartSketchOnFace
[1393, 1425, 8]"] - 364["StartSketchOnFace
[2001, 2035, 8]"] - 365["StartSketchOnFace
[2388, 2420, 8]"] - 366["StartSketchOnFace
[2824, 2858, 8]"] - 367["StartSketchOnFace
[2992, 3026, 8]"] - 368["StartSketchOnFace
[3962, 3996, 8]"] + 350["StartSketchOnFace
[1108, 1147, 5]"] + 351["StartSketchOnFace
[1370, 1409, 5]"] + 352["StartSketchOnFace
[1546, 1585, 5]"] + 353["StartSketchOnFace
[1939, 1978, 5]"] + 354["StartSketchOnFace
[855, 894, 6]"] + 355["StartSketchOnFace
[1241, 1280, 6]"] + 356["StartSketchOnFace
[1712, 1751, 6]"] + 357["StartSketchOnFace
[847, 888, 7]"] + 358["StartSketchOnFace
[1087, 1128, 7]"] + 359["StartSketchOnFace
[1507, 1546, 7]"] + 360["StartSketchOnFace
[1796, 1835, 7]"] + 361["StartSketchOnFace
[2348, 2387, 7]"] + 362["StartSketchOnFace
[979, 1018, 8]"] + 363["StartSketchOnFace
[1400, 1439, 8]"] + 364["StartSketchOnFace
[2015, 2056, 8]"] + 365["StartSketchOnFace
[2409, 2448, 8]"] + 366["StartSketchOnFace
[2852, 2893, 8]"] + 367["StartSketchOnFace
[3027, 3068, 8]"] + 368["StartSketchOnFace
[4004, 4045, 8]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/multi-axis-robot/ops.snap b/rust/kcl-lib/tests/kcl_samples/multi-axis-robot/ops.snap index 86df7dd0f..832e95d19 100644 --- a/rust/kcl-lib/tests/kcl_samples/multi-axis-robot/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/multi-axis-robot/ops.snap @@ -14,7 +14,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -117,16 +117,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -137,7 +128,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -217,16 +216,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -237,7 +227,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -273,16 +271,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -293,7 +282,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -352,16 +349,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -372,7 +360,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -443,190 +439,185 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 3.6, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 3.6, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -716,180 +707,175 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.984807753012208, - "ty": { - "type": "Known", - "type": "Count" - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.17364817766693041, - "ty": { - "type": "Known", - "type": "Count" - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.984807753012208, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.17364817766693041, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -935,16 +921,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -955,7 +932,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "GroupBegin", @@ -1071,16 +1056,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -1091,7 +1067,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "GroupBegin", @@ -1222,16 +1206,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -1242,7 +1217,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "GroupBegin", @@ -1358,180 +1341,175 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.984807753012208, - "ty": { - "type": "Known", - "type": "Count" - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.17364817766693041, - "ty": { - "type": "Known", - "type": "Count" - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.984807753012208, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.17364817766693041, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -1589,180 +1567,175 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": -0.1, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": -0.1, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.984807753012208, - "ty": { - "type": "Known", - "type": "Count" - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.17364817766693041, - "ty": { - "type": "Known", - "type": "Count" - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.984807753012208, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.17364817766693041, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -1844,16 +1817,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -1864,7 +1828,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1944,16 +1916,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -1964,7 +1927,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "GroupBegin", @@ -2080,16 +2051,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -2100,7 +2062,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -2183,16 +2153,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -2203,7 +2164,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "GroupBegin", @@ -2334,16 +2303,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -2354,7 +2314,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "GroupBegin", @@ -2438,180 +2406,175 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { - "type": "Object", - "value": { - "origin": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "origin": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "xAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.984807753012208, - "ty": { - "type": "Known", - "type": "Count" - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.17364817766693041, - "ty": { - "type": "Known", - "type": "Count" - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] + } }, - "yAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } - ] - }, - "zAxis": { - "type": "Array", - "value": [ - { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - } - ] + } } - } + ] + }, + "xAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.984807753012208, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.17364817766693041, + "ty": { + "type": "Known", + "type": "Count" + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "yAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] + }, + "zAxis": { + "type": "Array", + "value": [ + { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + ] } } }, @@ -2729,16 +2692,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -2749,7 +2703,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "GroupBegin", @@ -2865,16 +2827,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -2885,7 +2838,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "GroupBegin", @@ -3040,16 +3001,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -3060,7 +3012,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "GroupBegin", @@ -3168,16 +3128,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -3188,7 +3139,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "GroupBegin", @@ -3296,16 +3255,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -3316,7 +3266,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -3352,16 +3310,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -3372,7 +3321,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "GroupBegin", @@ -3480,16 +3437,7 @@ description: Operations executed multi-axis-robot.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -3500,7 +3448,15 @@ description: Operations executed multi-axis-robot.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "GroupBegin", diff --git a/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/artifact_graph_flowchart.snap.md index f5466cdcb..6536bcdd6 100644 --- a/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/artifact_graph_flowchart.snap.md @@ -9,18 +9,18 @@ flowchart LR 7[Solid2d] end subgraph path23 [Path] - 23["Path
[1061, 1208, 0]"] - 24["Segment
[1061, 1208, 0]"] + 23["Path
[1068, 1215, 0]"] + 24["Segment
[1068, 1215, 0]"] 25[Solid2d] end subgraph path34 [Path] - 34["Path
[1450, 1599, 0]"] - 35["Segment
[1450, 1599, 0]"] + 34["Path
[1464, 1613, 0]"] + 35["Segment
[1464, 1613, 0]"] 36[Solid2d] end subgraph path44 [Path] - 44["Path
[1846, 1894, 0]"] - 45["Segment
[1846, 1894, 0]"] + 44["Path
[1867, 1915, 0]"] + 45["Segment
[1867, 1915, 0]"] 46[Solid2d] end 1["Plane
[750, 767, 0]"] @@ -39,28 +39,28 @@ flowchart LR 20["SweepEdge Adjacent"] 21["SweepEdge Opposite"] 22["SweepEdge Adjacent"] - 26["Sweep Extrusion
[1373, 1402, 0]"] + 26["Sweep Extrusion
[1380, 1409, 0]"] 27[Wall] 28["Cap Start"] 29["SweepEdge Opposite"] 30["SweepEdge Adjacent"] - 31["Sweep Extrusion
[1373, 1402, 0]"] - 32["Sweep Extrusion
[1373, 1402, 0]"] - 33["Sweep Extrusion
[1373, 1402, 0]"] - 37["Sweep Extrusion
[1764, 1799, 0]"] + 31["Sweep Extrusion
[1380, 1409, 0]"] + 32["Sweep Extrusion
[1380, 1409, 0]"] + 33["Sweep Extrusion
[1380, 1409, 0]"] + 37["Sweep Extrusion
[1778, 1813, 0]"] 38[Wall] 39["SweepEdge Opposite"] 40["SweepEdge Adjacent"] - 41["Sweep Extrusion
[1764, 1799, 0]"] - 42["Sweep Extrusion
[1764, 1799, 0]"] - 43["Sweep Extrusion
[1764, 1799, 0]"] - 47["Sweep Extrusion
[1900, 1925, 0]"] + 41["Sweep Extrusion
[1778, 1813, 0]"] + 42["Sweep Extrusion
[1778, 1813, 0]"] + 43["Sweep Extrusion
[1778, 1813, 0]"] + 47["Sweep Extrusion
[1921, 1946, 0]"] 48[Wall] 49["SweepEdge Opposite"] 50["SweepEdge Adjacent"] - 51["StartSketchOnFace
[1029, 1055, 0]"] - 52["StartSketchOnFace
[1416, 1444, 0]"] - 53["StartSketchOnFace
[1814, 1840, 0]"] + 51["StartSketchOnFace
[1029, 1062, 0]"] + 52["StartSketchOnFace
[1423, 1458, 0]"] + 53["StartSketchOnFace
[1828, 1861, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/ast.snap b/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/ast.snap index 4c18c82b9..4ac0964b7 100644 --- a/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/ast.snap @@ -930,29 +930,23 @@ description: Result of parsing parametric-bearing-pillow-block.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "body", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'end'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "end" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'end'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "end" + } } ], "callee": { @@ -973,8 +967,24 @@ description: Result of parsing parametric-bearing-pillow-block.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "body", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -1620,29 +1630,23 @@ description: Result of parsing parametric-bearing-pillow-block.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "body", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'start'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "start" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'start'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "start" + } } ], "callee": { @@ -1663,8 +1667,24 @@ description: Result of parsing parametric-bearing-pillow-block.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "body", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -2328,29 +2348,23 @@ description: Result of parsing parametric-bearing-pillow-block.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "body", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'end'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "end" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'end'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "end" + } } ], "callee": { @@ -2371,8 +2385,24 @@ description: Result of parsing parametric-bearing-pillow-block.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "body", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/ops.snap b/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/ops.snap index 4de9b201a..c583809a7 100644 --- a/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/ops.snap @@ -5,7 +5,7 @@ description: Operations executed parametric-bearing-pillow-block.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -52,16 +52,7 @@ description: Operations executed parametric-bearing-pillow-block.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -72,7 +63,15 @@ description: Operations executed parametric-bearing-pillow-block.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -131,16 +130,7 @@ description: Operations executed parametric-bearing-pillow-block.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -151,7 +141,15 @@ description: Operations executed parametric-bearing-pillow-block.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -210,16 +208,7 @@ description: Operations executed parametric-bearing-pillow-block.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -230,7 +219,15 @@ description: Operations executed parametric-bearing-pillow-block.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/program_memory.snap index 4cce54d01..0ea6008da 100644 --- a/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/program_memory.snap @@ -141,22 +141,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -250,17 +262,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -385,22 +406,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -526,17 +559,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -661,22 +703,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -802,17 +856,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -937,22 +1000,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1078,17 +1153,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1213,22 +1297,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1382,17 +1478,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1517,22 +1622,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1661,17 +1778,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1796,22 +1922,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1937,17 +2075,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2072,22 +2219,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2213,17 +2372,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2348,22 +2516,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2489,17 +2669,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2624,22 +2813,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" diff --git a/rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/artifact_graph_flowchart.snap.md index e4aef649d..1bea8b76b 100644 --- a/rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/artifact_graph_flowchart.snap.md @@ -11,18 +11,18 @@ flowchart LR 8[Solid2d] end subgraph path15 [Path] - 15["Path
[1187, 1246, 7]"] - 16["Segment
[1187, 1246, 7]"] + 15["Path
[1194, 1253, 7]"] + 16["Segment
[1194, 1253, 7]"] 17[Solid2d] end subgraph path23 [Path] - 23["Path
[1348, 1408, 7]"] - 24["Segment
[1348, 1408, 7]"] + 23["Path
[1362, 1422, 7]"] + 24["Segment
[1362, 1422, 7]"] 25[Solid2d] end subgraph path31 [Path] - 31["Path
[1565, 1618, 7]"] - 32["Segment
[1565, 1618, 7]"] + 31["Path
[1586, 1639, 7]"] + 32["Segment
[1586, 1639, 7]"] 33[Solid2d] end subgraph path39 [Path] @@ -36,18 +36,18 @@ flowchart LR 45[Solid2d] end subgraph path52 [Path] - 52["Path
[1187, 1246, 7]"] - 53["Segment
[1187, 1246, 7]"] + 52["Path
[1194, 1253, 7]"] + 53["Segment
[1194, 1253, 7]"] 54[Solid2d] end subgraph path60 [Path] - 60["Path
[1348, 1408, 7]"] - 61["Segment
[1348, 1408, 7]"] + 60["Path
[1362, 1422, 7]"] + 61["Segment
[1362, 1422, 7]"] 62[Solid2d] end subgraph path68 [Path] - 68["Path
[1565, 1618, 7]"] - 69["Segment
[1565, 1618, 7]"] + 68["Path
[1586, 1639, 7]"] + 69["Segment
[1586, 1639, 7]"] 70[Solid2d] end subgraph path76 [Path] @@ -56,8 +56,8 @@ flowchart LR 78[Solid2d] end subgraph path85 [Path] - 85["Path
[617, 677, 6]"] - 86["Segment
[617, 677, 6]"] + 85["Path
[624, 684, 6]"] + 86["Segment
[624, 684, 6]"] 87[Solid2d] end subgraph path93 [Path] @@ -66,8 +66,8 @@ flowchart LR 95[Solid2d] end subgraph path102 [Path] - 102["Path
[596, 648, 8]"] - 103["Segment
[596, 648, 8]"] + 102["Path
[603, 655, 8]"] + 103["Segment
[603, 655, 8]"] 104[Solid2d] end subgraph path110 [Path] @@ -76,18 +76,18 @@ flowchart LR 112[Solid2d] end subgraph path121 [Path] - 121["Path
[773, 860, 9]"] - 122["Segment
[868, 919, 9]"] - 123["Segment
[927, 978, 9]"] - 124["Segment
[986, 1037, 9]"] - 125["Segment
[1045, 1095, 9]"] - 126["Segment
[1103, 1153, 9]"] - 127["Segment
[1161, 1168, 9]"] + 121["Path
[780, 867, 9]"] + 122["Segment
[875, 926, 9]"] + 123["Segment
[934, 985, 9]"] + 124["Segment
[993, 1044, 9]"] + 125["Segment
[1052, 1102, 9]"] + 126["Segment
[1110, 1160, 9]"] + 127["Segment
[1168, 1175, 9]"] 128[Solid2d] end subgraph path149 [Path] - 149["Path
[1302, 1371, 9]"] - 150["Segment
[1302, 1371, 9]"] + 149["Path
[1316, 1385, 9]"] + 150["Segment
[1316, 1385, 9]"] 151[Solid2d] end subgraph path158 [Path] @@ -101,8 +101,8 @@ flowchart LR 165[Solid2d] end subgraph path187 [Path] - 187["Path
[962, 1014, 10]"] - 188["Segment
[962, 1014, 10]"] + 187["Path
[969, 1021, 10]"] + 188["Segment
[969, 1021, 10]"] 189[Solid2d] end subgraph path195 [Path] @@ -111,8 +111,8 @@ flowchart LR 197[Solid2d] end subgraph path204 [Path] - 204["Path
[522, 577, 11]"] - 205["Segment
[522, 577, 11]"] + 204["Path
[529, 584, 11]"] + 205["Segment
[529, 584, 11]"] 206[Solid2d] end subgraph path212 [Path] @@ -121,8 +121,8 @@ flowchart LR 214[Solid2d] end subgraph path221 [Path] - 221["Path
[522, 577, 11]"] - 222["Segment
[522, 577, 11]"] + 221["Path
[529, 584, 11]"] + 222["Segment
[529, 584, 11]"] 223[Solid2d] end 1["Plane
[570, 587, 7]"] @@ -133,17 +133,17 @@ flowchart LR 12["Cap End"] 13["SweepEdge Opposite"] 14["SweepEdge Adjacent"] - 18["Sweep Extrusion
[1254, 1291, 7]"] + 18["Sweep Extrusion
[1261, 1298, 7]"] 19[Wall] 20["Cap End"] 21["SweepEdge Opposite"] 22["SweepEdge Adjacent"] - 26["Sweep Extrusion
[1416, 1454, 7]"] + 26["Sweep Extrusion
[1430, 1468, 7]"] 27[Wall] 28["Cap End"] 29["SweepEdge Opposite"] 30["SweepEdge Adjacent"] - 34["Sweep Extrusion
[1626, 1668, 7]"] + 34["Sweep Extrusion
[1647, 1689, 7]"] 35[Wall] 36["SweepEdge Opposite"] 37["SweepEdge Adjacent"] @@ -155,17 +155,17 @@ flowchart LR 49["Cap End"] 50["SweepEdge Opposite"] 51["SweepEdge Adjacent"] - 55["Sweep Extrusion
[1254, 1291, 7]"] + 55["Sweep Extrusion
[1261, 1298, 7]"] 56[Wall] 57["Cap End"] 58["SweepEdge Opposite"] 59["SweepEdge Adjacent"] - 63["Sweep Extrusion
[1416, 1454, 7]"] + 63["Sweep Extrusion
[1430, 1468, 7]"] 64[Wall] 65["Cap End"] 66["SweepEdge Opposite"] 67["SweepEdge Adjacent"] - 71["Sweep Extrusion
[1626, 1668, 7]"] + 71["Sweep Extrusion
[1647, 1689, 7]"] 72[Wall] 73["SweepEdge Opposite"] 74["SweepEdge Adjacent"] @@ -176,7 +176,7 @@ flowchart LR 82["Cap End"] 83["SweepEdge Opposite"] 84["SweepEdge Adjacent"] - 88["Sweep Extrusion
[683, 720, 6]"] + 88["Sweep Extrusion
[690, 727, 6]"] 89[Wall] 90["SweepEdge Opposite"] 91["SweepEdge Adjacent"] @@ -187,7 +187,7 @@ flowchart LR 99["Cap End"] 100["SweepEdge Opposite"] 101["SweepEdge Adjacent"] - 105["Sweep Extrusion
[656, 693, 8]"] + 105["Sweep Extrusion
[663, 700, 8]"] 106[Wall] 107["SweepEdge Opposite"] 108["SweepEdge Adjacent"] @@ -200,7 +200,7 @@ flowchart LR 118["SweepEdge Adjacent"] 119["EdgeCut Fillet
[558, 624, 9]"] 120["EdgeCut Fillet
[558, 624, 9]"] - 129["Sweep Extrusion
[1176, 1216, 9]"] + 129["Sweep Extrusion
[1183, 1223, 9]"] 130[Wall] 131[Wall] 132[Wall] @@ -220,7 +220,7 @@ flowchart LR 146["SweepEdge Adjacent"] 147["SweepEdge Opposite"] 148["SweepEdge Adjacent"] - 152["Sweep Extrusion
[1379, 1407, 9]"] + 152["Sweep Extrusion
[1393, 1421, 9]"] 153[Wall] 154["Cap End"] 155["SweepEdge Opposite"] @@ -247,7 +247,7 @@ flowchart LR 184["SweepEdge Adjacent"] 185["SweepEdge Opposite"] 186["SweepEdge Adjacent"] - 190["Sweep Extrusion
[1022, 1059, 10]"] + 190["Sweep Extrusion
[1029, 1066, 10]"] 191[Wall] 192["SweepEdge Opposite"] 193["SweepEdge Adjacent"] @@ -258,7 +258,7 @@ flowchart LR 201["Cap End"] 202["SweepEdge Opposite"] 203["SweepEdge Adjacent"] - 207["Sweep Extrusion
[585, 617, 11]"] + 207["Sweep Extrusion
[592, 624, 11]"] 208[Wall] 209["SweepEdge Opposite"] 210["SweepEdge Adjacent"] @@ -269,23 +269,23 @@ flowchart LR 218["Cap End"] 219["SweepEdge Opposite"] 220["SweepEdge Adjacent"] - 224["Sweep Extrusion
[585, 617, 11]"] + 224["Sweep Extrusion
[592, 624, 11]"] 225[Wall] 226["SweepEdge Opposite"] 227["SweepEdge Adjacent"] - 228["StartSketchOnFace
[1145, 1179, 7]"] - 229["StartSketchOnFace
[1308, 1340, 7]"] - 230["StartSketchOnFace
[1524, 1557, 7]"] - 231["StartSketchOnFace
[1145, 1179, 7]"] - 232["StartSketchOnFace
[1308, 1340, 7]"] - 233["StartSketchOnFace
[1524, 1557, 7]"] - 234["StartSketchOnFace
[579, 611, 6]"] - 235["StartSketchOnFace
[556, 588, 8]"] - 236["StartSketchOnFace
[733, 765, 9]"] - 237["StartSketchOnFace
[1264, 1294, 9]"] - 238["StartSketchOnFace
[922, 954, 10]"] - 239["StartSketchOnFace
[484, 514, 11]"] - 240["StartSketchOnFace
[484, 514, 11]"] + 228["StartSketchOnFace
[1145, 1186, 7]"] + 229["StartSketchOnFace
[1315, 1354, 7]"] + 230["StartSketchOnFace
[1538, 1578, 7]"] + 231["StartSketchOnFace
[1145, 1186, 7]"] + 232["StartSketchOnFace
[1315, 1354, 7]"] + 233["StartSketchOnFace
[1538, 1578, 7]"] + 234["StartSketchOnFace
[579, 618, 6]"] + 235["StartSketchOnFace
[556, 595, 8]"] + 236["StartSketchOnFace
[733, 772, 9]"] + 237["StartSketchOnFace
[1271, 1308, 9]"] + 238["StartSketchOnFace
[922, 961, 10]"] + 239["StartSketchOnFace
[484, 521, 11]"] + 240["StartSketchOnFace
[484, 521, 11]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/ops.snap b/rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/ops.snap index 842767bd1..084bb8297 100644 --- a/rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/ops.snap @@ -10,7 +10,7 @@ description: Operations executed pipe-flange-assembly.kcl "name": "flange", "functionSourceRange": [ 509, - 1728, + 1749, 7 ], "unlabeledArg": null, @@ -20,7 +20,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -35,7 +35,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -131,16 +131,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -151,7 +142,15 @@ description: Operations executed pipe-flange-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -187,16 +186,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -207,7 +197,15 @@ description: Operations executed pipe-flange-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -243,16 +241,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -263,7 +252,15 @@ description: Operations executed pipe-flange-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -307,7 +304,7 @@ description: Operations executed pipe-flange-assembly.kcl "name": "flange", "functionSourceRange": [ 509, - 1728, + 1749, 7 ], "unlabeledArg": null, @@ -317,7 +314,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -332,7 +329,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -428,16 +425,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -448,7 +436,15 @@ description: Operations executed pipe-flange-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -484,16 +480,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -504,7 +491,15 @@ description: Operations executed pipe-flange-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -540,16 +535,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -560,7 +546,15 @@ description: Operations executed pipe-flange-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -608,7 +602,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -655,16 +649,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -675,7 +660,15 @@ description: Operations executed pipe-flange-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -719,7 +712,7 @@ description: Operations executed pipe-flange-assembly.kcl "name": "washer", "functionSourceRange": [ 331, - 752, + 759, 8 ], "unlabeledArg": null, @@ -729,7 +722,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -776,16 +769,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -796,7 +780,15 @@ description: Operations executed pipe-flange-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1107,7 +1099,7 @@ description: Operations executed pipe-flange-assembly.kcl "name": "bolt", "functionSourceRange": [ 358, - 1497, + 1511, 9 ], "unlabeledArg": null, @@ -1117,7 +1109,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1213,16 +1205,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -1233,7 +1216,15 @@ description: Operations executed pipe-flange-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1269,16 +1260,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -1289,7 +1271,15 @@ description: Operations executed pipe-flange-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1482,7 +1472,7 @@ description: Operations executed pipe-flange-assembly.kcl "name": "hexNut", "functionSourceRange": [ 344, - 1118, + 1125, 10 ], "unlabeledArg": null, @@ -1492,7 +1482,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1512,8 +1502,13 @@ description: Operations executed pipe-flange-assembly.kcl "type": "Number", "value": 0.546875, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -1534,16 +1529,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -1554,7 +1540,15 @@ description: Operations executed pipe-flange-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1563,8 +1557,13 @@ description: Operations executed pipe-flange-assembly.kcl "type": "Number", "value": -0.546875, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -1742,7 +1741,7 @@ description: Operations executed pipe-flange-assembly.kcl "name": "pipe", "functionSourceRange": [ 256, - 670, + 677, 11 ], "unlabeledArg": null, @@ -1752,7 +1751,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1799,16 +1798,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -1819,7 +1809,15 @@ description: Operations executed pipe-flange-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -1863,7 +1861,7 @@ description: Operations executed pipe-flange-assembly.kcl "name": "pipe", "functionSourceRange": [ 256, - 670, + 677, 11 ], "unlabeledArg": null, @@ -1873,7 +1871,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1920,16 +1918,7 @@ description: Operations executed pipe-flange-assembly.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -1940,7 +1929,15 @@ description: Operations executed pipe-flange-assembly.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/program_memory.snap index 59cd75fbf..17a71f1af 100644 --- a/rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/program_memory.snap @@ -49,16 +49,26 @@ description: Variables in memory after executing pipe-flange-assembly.kcl "type": "Number", "value": 0.5, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "boltHexFlatLength": { "type": "Number", "value": 0.2887, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "boltLength": { @@ -236,32 +246,52 @@ description: Variables in memory after executing pipe-flange-assembly.kcl "type": "Number", "value": 0.625, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "hexNutFlatLength": { "type": "Number", "value": 0.5413, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "hexNutFlatToFlat": { "type": "Number", "value": 0.9375, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "hexNutThickness": { "type": "Number", "value": 0.5469, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "mountingHoleDiameter": { diff --git a/rust/kcl-lib/tests/kcl_samples/pipe-with-bend/ops.snap b/rust/kcl-lib/tests/kcl_samples/pipe-with-bend/ops.snap index e25e6a259..e61671785 100644 --- a/rust/kcl-lib/tests/kcl_samples/pipe-with-bend/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/pipe-with-bend/ops.snap @@ -5,7 +5,7 @@ description: Operations executed pipe-with-bend.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/kcl_samples/pipe-with-bend/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/pipe-with-bend/program_memory.snap index 36546d52f..3add7b9e9 100644 --- a/rust/kcl-lib/tests/kcl_samples/pipe-with-bend/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/pipe-with-bend/program_memory.snap @@ -82,22 +82,34 @@ description: Variables in memory after executing pipe-with-bend.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -181,22 +193,34 @@ description: Variables in memory after executing pipe-with-bend.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -280,22 +304,34 @@ description: Variables in memory after executing pipe-with-bend.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -373,22 +409,34 @@ description: Variables in memory after executing pipe-with-bend.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -428,22 +476,34 @@ description: Variables in memory after executing pipe-with-bend.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" diff --git a/rust/kcl-lib/tests/kcl_samples/pipe/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/pipe/artifact_graph_flowchart.snap.md index bc694e6fa..c516a104d 100644 --- a/rust/kcl-lib/tests/kcl_samples/pipe/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/pipe/artifact_graph_flowchart.snap.md @@ -6,8 +6,8 @@ flowchart LR 4[Solid2d] end subgraph path11 [Path] - 11["Path
[430, 485, 0]"] - 12["Segment
[430, 485, 0]"] + 11["Path
[437, 492, 0]"] + 12["Segment
[437, 492, 0]"] 13[Solid2d] end 1["Plane
[218, 235, 0]"] @@ -17,11 +17,11 @@ flowchart LR 8["Cap End"] 9["SweepEdge Opposite"] 10["SweepEdge Adjacent"] - 14["Sweep Extrusion
[491, 523, 0]"] + 14["Sweep Extrusion
[498, 530, 0]"] 15[Wall] 16["SweepEdge Opposite"] 17["SweepEdge Adjacent"] - 18["StartSketchOnFace
[394, 424, 0]"] + 18["StartSketchOnFace
[394, 431, 0]"] 1 --- 2 2 --- 3 2 ---- 5 diff --git a/rust/kcl-lib/tests/kcl_samples/pipe/ast.snap b/rust/kcl-lib/tests/kcl_samples/pipe/ast.snap index ab5496843..db0aced13 100644 --- a/rust/kcl-lib/tests/kcl_samples/pipe/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/pipe/ast.snap @@ -394,29 +394,23 @@ description: Result of parsing pipe.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "pipeBase", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'end'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "end" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'end'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "end" + } } ], "callee": { @@ -437,8 +431,24 @@ description: Result of parsing pipe.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "pipeBase", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/kcl_samples/pipe/ops.snap b/rust/kcl-lib/tests/kcl_samples/pipe/ops.snap index 94da20cdf..5a3304cb7 100644 --- a/rust/kcl-lib/tests/kcl_samples/pipe/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/pipe/ops.snap @@ -5,7 +5,7 @@ description: Operations executed pipe.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -52,16 +52,7 @@ description: Operations executed pipe.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -72,7 +63,15 @@ description: Operations executed pipe.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/kcl_samples/pipe/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/pipe/program_memory.snap index 7741aa6ac..b4b76b0e8 100644 --- a/rust/kcl-lib/tests/kcl_samples/pipe/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/pipe/program_memory.snap @@ -56,17 +56,26 @@ description: Variables in memory after executing pipe.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -119,22 +128,34 @@ description: Variables in memory after executing pipe.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -260,22 +281,34 @@ description: Variables in memory after executing pipe.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" diff --git a/rust/kcl-lib/tests/kcl_samples/poopy-shoe/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/poopy-shoe/artifact_graph_flowchart.snap.md index bf4a5ad66..fd914fa94 100644 --- a/rust/kcl-lib/tests/kcl_samples/poopy-shoe/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/poopy-shoe/artifact_graph_flowchart.snap.md @@ -35,60 +35,60 @@ flowchart LR 74[Solid2d] end subgraph path118 [Path] - 118["Path
[2063, 2088, 0]"] - 119["Segment
[2094, 2144, 0]"] - 120["Segment
[2150, 2190, 0]"] - 121["Segment
[2196, 2203, 0]"] + 118["Path
[2031, 2056, 0]"] + 119["Segment
[2062, 2112, 0]"] + 120["Segment
[2118, 2158, 0]"] + 121["Segment
[2164, 2171, 0]"] 122[Solid2d] end subgraph path135 [Path] - 135["Path
[2332, 2357, 0]"] - 136["Segment
[2363, 2390, 0]"] - 137["Segment
[2396, 2430, 0]"] - 138["Segment
[2436, 2471, 0]"] - 139["Segment
[2477, 2558, 0]"] - 140["Segment
[2564, 2593, 0]"] - 141["Segment
[2599, 2652, 0]"] - 142["Segment
[2658, 2685, 0]"] - 143["Segment
[2691, 2720, 0]"] - 144["Segment
[2726, 2850, 0]"] - 145["Segment
[2856, 2901, 0]"] - 146["Segment
[2907, 2929, 0]"] - 147["Segment
[2935, 2954, 0]"] + 135["Path
[2307, 2332, 0]"] + 136["Segment
[2338, 2365, 0]"] + 137["Segment
[2371, 2405, 0]"] + 138["Segment
[2411, 2446, 0]"] + 139["Segment
[2452, 2533, 0]"] + 140["Segment
[2539, 2568, 0]"] + 141["Segment
[2574, 2627, 0]"] + 142["Segment
[2633, 2660, 0]"] + 143["Segment
[2666, 2695, 0]"] + 144["Segment
[2701, 2825, 0]"] + 145["Segment
[2831, 2876, 0]"] + 146["Segment
[2882, 2904, 0]"] + 147["Segment
[2910, 2929, 0]"] 148[Solid2d] end subgraph path189 [Path] - 189["Path
[3282, 3307, 0]"] - 190["Segment
[3313, 3340, 0]"] - 191["Segment
[3346, 3377, 0]"] - 192["Segment
[3383, 3507, 0]"] - 193["Segment
[3513, 3558, 0]"] - 194["Segment
[3564, 3600, 0]"] - 195["Segment
[3606, 3613, 0]"] + 189["Path
[3225, 3250, 0]"] + 190["Segment
[3256, 3283, 0]"] + 191["Segment
[3289, 3320, 0]"] + 192["Segment
[3326, 3450, 0]"] + 193["Segment
[3456, 3501, 0]"] + 194["Segment
[3507, 3543, 0]"] + 195["Segment
[3549, 3556, 0]"] 196[Solid2d] end subgraph path218 [Path] - 218["Path
[3701, 3751, 0]"] - 219["Segment
[3757, 3789, 0]"] - 220["Segment
[3795, 3822, 0]"] - 221["Segment
[3828, 3850, 0]"] - 222["Segment
[3856, 3863, 0]"] + 218["Path
[3651, 3701, 0]"] + 219["Segment
[3707, 3739, 0]"] + 220["Segment
[3745, 3772, 0]"] + 221["Segment
[3778, 3800, 0]"] + 222["Segment
[3806, 3813, 0]"] 223[Solid2d] end subgraph path239 [Path] - 239["Path
[3951, 3976, 0]"] - 240["Segment
[3982, 4016, 0]"] - 241["Segment
[4022, 4049, 0]"] - 242["Segment
[4055, 4077, 0]"] - 243["Segment
[4083, 4090, 0]"] + 239["Path
[3908, 3933, 0]"] + 240["Segment
[3939, 3973, 0]"] + 241["Segment
[3979, 4006, 0]"] + 242["Segment
[4012, 4034, 0]"] + 243["Segment
[4040, 4047, 0]"] 244[Solid2d] end subgraph path261 [Path] - 261["Path
[4450, 4499, 0]"] - 262["Segment
[4505, 4537, 0]"] - 263["Segment
[4543, 4591, 0]"] - 264["Segment
[4597, 4631, 0]"] - 265["Segment
[4637, 4644, 0]"] + 261["Path
[4375, 4424, 0]"] + 262["Segment
[4430, 4462, 0]"] + 263["Segment
[4468, 4516, 0]"] + 264["Segment
[4522, 4556, 0]"] + 265["Segment
[4562, 4569, 0]"] 266[Solid2d] end 1["Plane
[338, 356, 0]"] @@ -177,8 +177,8 @@ flowchart LR 114["SweepEdge Adjacent"] 115["SweepEdge Opposite"] 116["SweepEdge Adjacent"] - 117["Plane
[2031, 2057, 0]"] - 123["Sweep Extrusion
[2209, 2240, 0]"] + 117["Plane
[1999, 2025, 0]"] + 123["Sweep Extrusion
[2177, 2208, 0]"] 124[Wall] 125[Wall] 126[Wall] @@ -190,7 +190,7 @@ flowchart LR 132["SweepEdge Adjacent"] 133["SweepEdge Opposite"] 134["SweepEdge Adjacent"] - 149["Sweep Extrusion
[2960, 2991, 0]"] + 149["Sweep Extrusion
[2935, 2966, 0]"] 150[Wall] 151[Wall] 152[Wall] @@ -229,8 +229,8 @@ flowchart LR 185["SweepEdge Adjacent"] 186["SweepEdge Opposite"] 187["SweepEdge Adjacent"] - 188["Plane
[3249, 3276, 0]"] - 197["Sweep Extrusion
[3619, 3650, 0]"] + 188["Plane
[3192, 3219, 0]"] + 197["Sweep Extrusion
[3562, 3593, 0]"] 198[Wall] 199[Wall] 200[Wall] @@ -251,7 +251,7 @@ flowchart LR 215["SweepEdge Adjacent"] 216["SweepEdge Opposite"] 217["SweepEdge Adjacent"] - 224["Sweep Extrusion
[3869, 3900, 0]"] + 224["Sweep Extrusion
[3819, 3850, 0]"] 225[Wall] 226[Wall] 227[Wall] @@ -266,7 +266,7 @@ flowchart LR 236["SweepEdge Adjacent"] 237["SweepEdge Opposite"] 238["SweepEdge Adjacent"] - 245["Sweep Extrusion
[4096, 4146, 0]"] + 245["Sweep Extrusion
[4053, 4103, 0]"] 246[Wall] 247[Wall] 248[Wall] @@ -281,8 +281,8 @@ flowchart LR 257["SweepEdge Adjacent"] 258["SweepEdge Opposite"] 259["SweepEdge Adjacent"] - 260["Plane
[4417, 4444, 0]"] - 267["Sweep Extrusion
[4650, 4682, 0]"] + 260["Plane
[4342, 4369, 0]"] + 267["Sweep Extrusion
[4575, 4607, 0]"] 268[Wall] 269[Wall] 270[Wall] @@ -297,9 +297,9 @@ flowchart LR 279["SweepEdge Adjacent"] 280["SweepEdge Opposite"] 281["SweepEdge Adjacent"] - 282["StartSketchOnFace
[2295, 2326, 0]"] - 283["StartSketchOnFace
[3664, 3695, 0]"] - 284["StartSketchOnFace
[3914, 3945, 0]"] + 282["StartSketchOnFace
[2263, 2301, 0]"] + 283["StartSketchOnFace
[3607, 3645, 0]"] + 284["StartSketchOnFace
[3864, 3902, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/poopy-shoe/ast.snap b/rust/kcl-lib/tests/kcl_samples/poopy-shoe/ast.snap index 8ac941ea7..5aae238ce 100644 --- a/rust/kcl-lib/tests/kcl_samples/poopy-shoe/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/poopy-shoe/ast.snap @@ -2733,7 +2733,7 @@ description: Result of parsing poopy-shoe.kcl "key": { "commentStart": 0, "end": 0, - "name": "plane", + "name": "origin", "start": 0, "type": "Identifier" }, @@ -2749,7 +2749,7 @@ description: Result of parsing poopy-shoe.kcl "key": { "commentStart": 0, "end": 0, - "name": "origin", + "name": "x", "start": 0, "type": "Identifier" }, @@ -2758,461 +2758,439 @@ description: Result of parsing poopy-shoe.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "y", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "argument": { + "commentStart": 0, + "end": 0, + "left": { "commentStart": 0, "end": 0, - "key": { + "left": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "argument": { + "name": { "commentStart": 0, "end": 0, - "left": { - "commentStart": 0, - "end": 0, - "left": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "wallsWidth", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "operator": "/", - "right": { - "commentStart": 0, - "end": 0, - "raw": "2", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 2.0, - "suffix": "None" - } - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "operator": "-", - "right": { - "commentStart": 0, - "end": 0, - "left": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "wallThickness", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "operator": "/", - "right": { - "commentStart": 0, - "end": 0, - "raw": "2", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 2.0, - "suffix": "None" - } - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, + "name": "wallsWidth", "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" + "type": "Identifier" }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + }, + "operator": "/", + "right": { "commentStart": 0, "end": 0, - "operator": "-", + "raw": "2", "start": 0, - "type": "UnaryExpression", - "type": "UnaryExpression" - } + "type": "Literal", + "type": "Literal", + "value": { + "value": 2.0, + "suffix": "None" + } + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" }, - { + "operator": "-", + "right": { "commentStart": 0, "end": 0, - "key": { + "left": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - } - ], - "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "xAxis", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - } - ], - "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "yAxis", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - } - ], - "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "zAxis", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "argument": { + "name": { "commentStart": 0, "end": 0, - "raw": "1", + "name": "wallThickness", "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } + "type": "Identifier" }, - "commentStart": 0, - "end": 0, - "operator": "-", + "path": [], "start": 0, - "type": "UnaryExpression", - "type": "UnaryExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" + "type": "Name", + "type": "Name" }, - "start": 0, - "type": "ObjectProperty", - "value": { + "operator": "/", + "right": { "commentStart": 0, "end": 0, - "raw": "0", + "raw": "2", "start": 0, "type": "Literal", "type": "Literal", "value": { - "value": 0.0, + "value": 2.0, "suffix": "None" } - } - } - ], + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + }, + "commentStart": 0, + "end": 0, + "operator": "-", "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "UnaryExpression", + "type": "UnaryExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "xAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "y", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "yAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "y", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "zAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "y", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "argument": { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + "commentStart": 0, + "end": 0, + "operator": "-", + "start": 0, + "type": "UnaryExpression", + "type": "UnaryExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } } } ], @@ -3641,29 +3619,23 @@ description: Result of parsing poopy-shoe.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "sketch002", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'END'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "END" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'END'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "END" + } } ], "callee": { @@ -3684,8 +3656,24 @@ description: Result of parsing poopy-shoe.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "sketch002", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -4794,7 +4782,7 @@ description: Result of parsing poopy-shoe.kcl "key": { "commentStart": 0, "end": 0, - "name": "plane", + "name": "origin", "start": 0, "type": "Identifier" }, @@ -4810,7 +4798,7 @@ description: Result of parsing poopy-shoe.kcl "key": { "commentStart": 0, "end": 0, - "name": "origin", + "name": "x", "start": 0, "type": "Identifier" }, @@ -4819,166 +4807,94 @@ description: Result of parsing poopy-shoe.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { + "left": { + "argument": { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, + "raw": "1", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "end": 0, - "left": { - "argument": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - "commentStart": 0, - "end": 0, - "operator": "-", - "start": 0, - "type": "UnaryExpression", - "type": "UnaryExpression" - }, - "operator": "*", - "right": { - "commentStart": 0, - "end": 0, - "left": { - "commentStart": 0, - "end": 0, - "left": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "backLength", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "operator": "-", - "right": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "height", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "operator": "+", - "right": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "wallsWidth", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" + "value": 1.0, + "suffix": "None" } }, - { + "commentStart": 0, + "end": 0, + "operator": "-", + "start": 0, + "type": "UnaryExpression", + "type": "UnaryExpression" + }, + "operator": "*", + "right": { + "commentStart": 0, + "end": 0, + "left": { "commentStart": 0, "end": 0, - "key": { + "left": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "y", + "name": { + "commentStart": 0, + "end": 0, + "name": "backLength", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" + "type": "Name", + "type": "Name" + }, + "operator": "-", + "right": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "height", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" }, "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } + "type": "BinaryExpression", + "type": "BinaryExpression" }, - { + "operator": "+", + "right": { + "abs_path": false, "commentStart": 0, "end": 0, - "key": { + "name": { "commentStart": 0, "end": 0, - "name": "z", + "name": "wallsWidth", "start": 0, "type": "Identifier" }, + "path": [], "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - } - ], + "type": "Name", + "type": "Name" + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + }, "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "BinaryExpression", + "type": "BinaryExpression" } }, { @@ -4987,7 +4903,7 @@ description: Result of parsing poopy-shoe.kcl "key": { "commentStart": 0, "end": 0, - "name": "xAxis", + "name": "y", "start": 0, "type": "Identifier" }, @@ -4996,94 +4912,14 @@ description: Result of parsing poopy-shoe.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "argument": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - "commentStart": 0, - "end": 0, - "operator": "-", - "start": 0, - "type": "UnaryExpression", - "type": "UnaryExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - } - ], + "raw": "0", "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } } }, { @@ -5092,7 +4928,7 @@ description: Result of parsing poopy-shoe.kcl "key": { "commentStart": 0, "end": 0, - "name": "yAxis", + "name": "z", "start": 0, "type": "Identifier" }, @@ -5101,86 +4937,61 @@ description: Result of parsing poopy-shoe.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - } - ], + "raw": "0", "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "xAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } } }, { @@ -5189,7 +5000,40 @@ description: Result of parsing poopy-shoe.kcl "key": { "commentStart": 0, "end": 0, - "name": "zAxis", + "name": "y", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "argument": { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + "commentStart": 0, + "end": 0, + "operator": "-", + "start": 0, + "type": "UnaryExpression", + "type": "UnaryExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", "start": 0, "type": "Identifier" }, @@ -5198,86 +5042,208 @@ description: Result of parsing poopy-shoe.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - } - ], + "raw": "0", "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "yAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "y", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "zAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "y", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } } } ], @@ -5972,36 +5938,30 @@ description: Result of parsing poopy-shoe.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "sketch005", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg03", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg03", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -6022,8 +5982,24 @@ description: Result of parsing poopy-shoe.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "sketch005", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -6417,29 +6393,23 @@ description: Result of parsing poopy-shoe.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "sketch004", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'END'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "END" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'END'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "END" + } } ], "callee": { @@ -6460,8 +6430,24 @@ description: Result of parsing poopy-shoe.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "sketch004", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -6832,7 +6818,7 @@ description: Result of parsing poopy-shoe.kcl "key": { "commentStart": 0, "end": 0, - "name": "plane", + "name": "origin", "start": 0, "type": "Identifier" }, @@ -6848,7 +6834,7 @@ description: Result of parsing poopy-shoe.kcl "key": { "commentStart": 0, "end": 0, - "name": "origin", + "name": "x", "start": 0, "type": "Identifier" }, @@ -6857,157 +6843,41 @@ description: Result of parsing poopy-shoe.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { + "left": { + "argument": { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, + "raw": "1", "start": 0, - "type": "ObjectProperty", + "type": "Literal", + "type": "Literal", "value": { - "commentStart": 0, - "end": 0, - "left": { - "argument": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - }, - "commentStart": 0, - "end": 0, - "operator": "-", - "start": 0, - "type": "UnaryExpression", - "type": "UnaryExpression" - }, - "operator": "*", - "right": { - "commentStart": 0, - "end": 0, - "left": { - "commentStart": 0, - "end": 0, - "left": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "backLength", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "operator": "-", - "right": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "height", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "operator": "+", - "right": { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "wallsWidth", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" - }, - "start": 0, - "type": "BinaryExpression", - "type": "BinaryExpression" + "value": 1.0, + "suffix": "None" } }, - { + "commentStart": 0, + "end": 0, + "operator": "-", + "start": 0, + "type": "UnaryExpression", + "type": "UnaryExpression" + }, + "operator": "*", + "right": { + "commentStart": 0, + "end": 0, + "left": { "commentStart": 0, "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { + "left": { "abs_path": false, "commentStart": 0, "end": 0, "name": { "commentStart": 0, "end": 0, - "name": "wallThickness", + "name": "backLength", "start": 0, "type": "Identifier" }, @@ -7015,117 +6885,52 @@ description: Result of parsing poopy-shoe.kcl "start": 0, "type": "Name", "type": "Name" - } - } - ], - "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "xAxis", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" }, - "start": 0, - "type": "ObjectProperty", - "value": { + "operator": "-", + "right": { + "abs_path": false, "commentStart": 0, "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "argument": { + "name": { "commentStart": 0, "end": 0, - "raw": "1", + "name": "height", "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } + "type": "Identifier" }, - "commentStart": 0, - "end": 0, - "operator": "-", + "path": [], "start": 0, - "type": "UnaryExpression", - "type": "UnaryExpression" - } + "type": "Name", + "type": "Name" + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" }, - { + "operator": "+", + "right": { + "abs_path": false, "commentStart": 0, "end": 0, - "key": { + "name": { "commentStart": 0, "end": 0, - "name": "z", + "name": "wallsWidth", "start": 0, "type": "Identifier" }, + "path": [], "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - } - ], + "type": "Name", + "type": "Name" + }, + "start": 0, + "type": "BinaryExpression", + "type": "BinaryExpression" + }, "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "BinaryExpression", + "type": "BinaryExpression" } }, { @@ -7134,7 +6939,7 @@ description: Result of parsing poopy-shoe.kcl "key": { "commentStart": 0, "end": 0, - "name": "yAxis", + "name": "y", "start": 0, "type": "Identifier" }, @@ -7143,86 +6948,14 @@ description: Result of parsing poopy-shoe.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - } - ], + "raw": "0", "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } } }, { @@ -7231,7 +6964,58 @@ description: Result of parsing poopy-shoe.kcl "key": { "commentStart": 0, "end": 0, - "name": "zAxis", + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "wallThickness", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "xAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", "start": 0, "type": "Identifier" }, @@ -7240,86 +7024,266 @@ description: Result of parsing poopy-shoe.kcl "value": { "commentStart": 0, "end": 0, - "properties": [ - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "x", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "y", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "0", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 0.0, - "suffix": "None" - } - } - }, - { - "commentStart": 0, - "end": 0, - "key": { - "commentStart": 0, - "end": 0, - "name": "z", - "start": 0, - "type": "Identifier" - }, - "start": 0, - "type": "ObjectProperty", - "value": { - "commentStart": 0, - "end": 0, - "raw": "1", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": { - "value": 1.0, - "suffix": "None" - } - } - } - ], + "raw": "0", "start": 0, - "type": "ObjectExpression", - "type": "ObjectExpression" + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "y", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "argument": { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + }, + "commentStart": 0, + "end": 0, + "operator": "-", + "start": 0, + "type": "UnaryExpression", + "type": "UnaryExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "yAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "y", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + } + ], + "start": 0, + "type": "ObjectExpression", + "type": "ObjectExpression" + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "zAxis", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "properties": [ + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "x", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "y", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "0", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 0.0, + "suffix": "None" + } + } + }, + { + "commentStart": 0, + "end": 0, + "key": { + "commentStart": 0, + "end": 0, + "name": "z", + "start": 0, + "type": "Identifier" + }, + "start": 0, + "type": "ObjectProperty", + "value": { + "commentStart": 0, + "end": 0, + "raw": "1", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": { + "value": 1.0, + "suffix": "None" + } } } ], diff --git a/rust/kcl-lib/tests/kcl_samples/poopy-shoe/ops.snap b/rust/kcl-lib/tests/kcl_samples/poopy-shoe/ops.snap index 4ab19a53b..870c2ed03 100644 --- a/rust/kcl-lib/tests/kcl_samples/poopy-shoe/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/poopy-shoe/ops.snap @@ -5,7 +5,7 @@ description: Operations executed poopy-shoe.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -127,7 +127,7 @@ description: Operations executed poopy-shoe.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -174,181 +174,181 @@ description: Operations executed poopy-shoe.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { + "origin": { "type": "Object", "value": { - "origin": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": -1.4375, - "ty": { - "type": "Known", - "type": "Count" - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "xAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": -1.4375, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "yAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "xAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "z": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "zAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": -1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "yAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + } + }, + "zAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": -1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" } } } @@ -398,16 +398,7 @@ description: Operations executed poopy-shoe.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -418,7 +409,15 @@ description: Operations executed poopy-shoe.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -454,186 +453,181 @@ description: Operations executed poopy-shoe.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { + "origin": { "type": "Object", "value": { - "origin": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": -3.875, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "x": { + "type": "Number", + "value": -3.875, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "xAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": -1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "yAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "xAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "z": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "zAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": -1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "yAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + } + }, + "zAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" } } } @@ -683,16 +677,7 @@ description: Operations executed poopy-shoe.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg03", @@ -704,7 +689,15 @@ description: Operations executed poopy-shoe.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -740,16 +733,7 @@ description: Operations executed poopy-shoe.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -760,7 +744,15 @@ description: Operations executed poopy-shoe.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -796,186 +788,181 @@ description: Operations executed poopy-shoe.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Object", "value": { - "plane": { + "origin": { "type": "Object", "value": { - "origin": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": -3.875, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "x": { + "type": "Number", + "value": -3.875, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.125, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "xAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": -1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "yAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "z": { + "type": "Number", + "value": 0.125, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "xAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "zAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": -1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "z": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "yAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + } + }, + "zAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" } } } diff --git a/rust/kcl-lib/tests/kcl_samples/poopy-shoe/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/poopy-shoe/program_memory.snap index 09cf05a0c..b5f5b3eac 100644 --- a/rust/kcl-lib/tests/kcl_samples/poopy-shoe/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/poopy-shoe/program_memory.snap @@ -19,177 +19,177 @@ description: Variables in memory after executing poopy-shoe.kcl "customPlane": { "type": "Object", "value": { - "plane": { + "origin": { "type": "Object", "value": { - "origin": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": -1.4375, - "ty": { - "type": "Known", - "type": "Count" - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "xAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": -1.4375, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "yAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "xAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "z": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "zAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": -1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "yAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + } + }, + "zAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": -1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" } } } @@ -200,182 +200,177 @@ description: Variables in memory after executing poopy-shoe.kcl "customPlane2": { "type": "Object", "value": { - "plane": { + "origin": { "type": "Object", "value": { - "origin": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": -3.875, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "x": { + "type": "Number", + "value": -3.875, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "xAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": -1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "yAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "xAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "z": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "zAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": -1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "yAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + } + }, + "zAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" } } } @@ -386,182 +381,177 @@ description: Variables in memory after executing poopy-shoe.kcl "customPlane3": { "type": "Object", "value": { - "plane": { + "origin": { "type": "Object", "value": { - "origin": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": -3.875, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "x": { + "type": "Number", + "value": -3.875, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.125, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "xAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": -1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } - }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "yAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "z": { + "type": "Number", + "value": 0.125, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "xAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "z": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" } } }, - "zAxis": { - "type": "Object", - "value": { - "x": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "y": { + "type": "Number", + "value": -1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "y": { - "type": "Number", - "value": 0.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" }, - "z": { - "type": "Number", - "value": 1.0, - "ty": { - "type": "Default", - "len": { - "type": "Inches" - }, - "angle": { - "type": "Degrees" - } - } + "angle": { + "type": "Degrees" + } + } + } + } + }, + "yAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + } + } + }, + "zAxis": { + "type": "Object", + "value": { + "x": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "y": { + "type": "Number", + "value": 0.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, + "z": { + "type": "Number", + "value": 1.0, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" } } } @@ -992,22 +982,34 @@ description: Variables in memory after executing poopy-shoe.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1339,22 +1341,34 @@ description: Variables in memory after executing poopy-shoe.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1762,22 +1776,34 @@ description: Variables in memory after executing poopy-shoe.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1925,22 +1951,34 @@ description: Variables in memory after executing poopy-shoe.kcl "origin": { "x": 0.0, "y": -1.4375, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Inches" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "units": { "type": "Inches" @@ -2067,9 +2105,9 @@ description: Variables in memory after executing poopy-shoe.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2947, - "end": 2953, - "start": 2947, + "commentStart": 2922, + "end": 2928, + "start": 2922, "type": "TagDeclarator", "value": "seg04" }, @@ -2309,9 +2347,9 @@ description: Variables in memory after executing poopy-shoe.kcl 0.0 ], "tag": { - "commentStart": 2947, - "end": 2953, - "start": 2947, + "commentStart": 2922, + "end": 2928, + "start": 2922, "type": "TagDeclarator", "value": "seg04" }, @@ -2333,17 +2371,26 @@ description: Variables in memory after executing poopy-shoe.kcl "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2714,22 +2761,34 @@ description: Variables in memory after executing poopy-shoe.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2854,9 +2913,9 @@ description: Variables in memory after executing poopy-shoe.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 3593, - "end": 3599, - "start": 3593, + "commentStart": 3536, + "end": 3542, + "start": 3536, "type": "TagDeclarator", "value": "seg03" }, @@ -2970,9 +3029,9 @@ description: Variables in memory after executing poopy-shoe.kcl 1.0 ], "tag": { - "commentStart": 3593, - "end": 3599, - "start": 3593, + "commentStart": 3536, + "end": 3542, + "start": 3536, "type": "TagDeclarator", "value": "seg03" }, @@ -3013,22 +3072,34 @@ description: Variables in memory after executing poopy-shoe.kcl "origin": { "x": -3.875, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "xAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Inches" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "units": { "type": "Inches" @@ -3197,17 +3268,26 @@ description: Variables in memory after executing poopy-shoe.kcl "xAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Inches" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "solid": { "type": "Solid", @@ -3247,9 +3327,9 @@ description: Variables in memory after executing poopy-shoe.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 3593, - "end": 3599, - "start": 3593, + "commentStart": 3536, + "end": 3542, + "start": 3536, "type": "TagDeclarator", "value": "seg03" }, @@ -3363,9 +3443,9 @@ description: Variables in memory after executing poopy-shoe.kcl 1.0 ], "tag": { - "commentStart": 3593, - "end": 3599, - "start": 3593, + "commentStart": 3536, + "end": 3542, + "start": 3536, "type": "TagDeclarator", "value": "seg03" }, @@ -3406,22 +3486,34 @@ description: Variables in memory after executing poopy-shoe.kcl "origin": { "x": -3.875, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "xAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Inches" + } }, "zAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "units": { "type": "Inches" @@ -3625,17 +3717,26 @@ description: Variables in memory after executing poopy-shoe.kcl "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3724,9 +3825,9 @@ description: Variables in memory after executing poopy-shoe.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2947, - "end": 2953, - "start": 2947, + "commentStart": 2922, + "end": 2928, + "start": 2922, "type": "TagDeclarator", "value": "seg04" }, @@ -3966,9 +4067,9 @@ description: Variables in memory after executing poopy-shoe.kcl 0.0 ], "tag": { - "commentStart": 2947, - "end": 2953, - "start": 2947, + "commentStart": 2922, + "end": 2928, + "start": 2922, "type": "TagDeclarator", "value": "seg04" }, @@ -3990,17 +4091,26 @@ description: Variables in memory after executing poopy-shoe.kcl "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -4371,22 +4481,34 @@ description: Variables in memory after executing poopy-shoe.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -4631,22 +4753,34 @@ description: Variables in memory after executing poopy-shoe.kcl "origin": { "x": -3.875, "y": 0.0, - "z": 0.125 + "z": 0.125, + "units": { + "type": "Inches" + } }, "xAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "yAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Inches" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Inches" + } }, "units": { "type": "Inches" diff --git a/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/artifact_graph_flowchart.snap.md index 59be33eba..64644b4f0 100644 --- a/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/artifact_graph_flowchart.snap.md @@ -26,30 +26,30 @@ flowchart LR 24[Solid2d] end subgraph path85 [Path] - 85["Path
[1888, 1932, 0]"] - 86["Segment
[1938, 2018, 0]"] - 87["Segment
[2024, 2134, 0]"] - 88["Segment
[2140, 2257, 0]"] - 89["Segment
[2263, 2319, 0]"] - 90["Segment
[2325, 2332, 0]"] + 85["Path
[1895, 1939, 0]"] + 86["Segment
[1945, 2025, 0]"] + 87["Segment
[2031, 2141, 0]"] + 88["Segment
[2147, 2264, 0]"] + 89["Segment
[2270, 2326, 0]"] + 90["Segment
[2332, 2339, 0]"] 91[Solid2d] end subgraph path107 [Path] - 107["Path
[2488, 2533, 0]"] - 108["Segment
[2539, 2617, 0]"] - 109["Segment
[2623, 2733, 0]"] - 110["Segment
[2739, 2856, 0]"] - 111["Segment
[2862, 2918, 0]"] - 112["Segment
[2924, 2931, 0]"] + 107["Path
[2502, 2547, 0]"] + 108["Segment
[2553, 2631, 0]"] + 109["Segment
[2637, 2747, 0]"] + 110["Segment
[2753, 2870, 0]"] + 111["Segment
[2876, 2932, 0]"] + 112["Segment
[2938, 2945, 0]"] 113[Solid2d] end subgraph path129 [Path] - 129["Path
[3085, 3130, 0]"] - 130["Segment
[3136, 3221, 0]"] - 131["Segment
[3227, 3337, 0]"] - 132["Segment
[3343, 3460, 0]"] - 133["Segment
[3466, 3522, 0]"] - 134["Segment
[3528, 3535, 0]"] + 129["Path
[3106, 3151, 0]"] + 130["Segment
[3157, 3242, 0]"] + 131["Segment
[3248, 3358, 0]"] + 132["Segment
[3364, 3481, 0]"] + 133["Segment
[3487, 3543, 0]"] + 134["Segment
[3549, 3556, 0]"] 135[Solid2d] end 1["Plane
[515, 532, 0]"] @@ -113,7 +113,7 @@ flowchart LR 82["SweepEdge Adjacent"] 83["SweepEdge Opposite"] 84["SweepEdge Adjacent"] - 92["Sweep Extrusion
[2376, 2407, 0]"] + 92["Sweep Extrusion
[2383, 2414, 0]"] 93[Wall] 94[Wall] 95[Wall] @@ -128,7 +128,7 @@ flowchart LR 104["SweepEdge Adjacent"] 105["SweepEdge Opposite"] 106["SweepEdge Adjacent"] - 114["Sweep Extrusion
[2974, 3005, 0]"] + 114["Sweep Extrusion
[2988, 3019, 0]"] 115[Wall] 116[Wall] 117[Wall] @@ -143,7 +143,7 @@ flowchart LR 126["SweepEdge Adjacent"] 127["SweepEdge Opposite"] 128["SweepEdge Adjacent"] - 136["Sweep Extrusion
[3579, 3609, 0]"] + 136["Sweep Extrusion
[3600, 3630, 0]"] 137[Wall] 138[Wall] 139[Wall] @@ -158,9 +158,9 @@ flowchart LR 148["SweepEdge Adjacent"] 149["SweepEdge Opposite"] 150["SweepEdge Adjacent"] - 151["StartSketchOnFace
[1848, 1882, 0]"] - 152["StartSketchOnFace
[2448, 2482, 0]"] - 153["StartSketchOnFace
[3047, 3079, 0]"] + 151["StartSketchOnFace
[1848, 1889, 0]"] + 152["StartSketchOnFace
[2455, 2496, 0]"] + 153["StartSketchOnFace
[3061, 3100, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/ast.snap b/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/ast.snap index 35f5ec904..ebce2edcb 100644 --- a/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/ast.snap @@ -2755,29 +2755,23 @@ description: Result of parsing router-template-cross-bar.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'START'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "START" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'START'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "START" + } } ], "callee": { @@ -2798,8 +2792,24 @@ description: Result of parsing router-template-cross-bar.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -3518,29 +3528,23 @@ description: Result of parsing router-template-cross-bar.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'START'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "START" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'START'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "START" + } } ], "callee": { @@ -3561,8 +3565,24 @@ description: Result of parsing router-template-cross-bar.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -4289,29 +4309,23 @@ description: Result of parsing router-template-cross-bar.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude002", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'END'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "END" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'END'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "END" + } } ], "callee": { @@ -4332,8 +4346,24 @@ description: Result of parsing router-template-cross-bar.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude002", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/ops.snap b/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/ops.snap index 2bee7226c..281316dbf 100644 --- a/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/ops.snap @@ -5,7 +5,7 @@ description: Operations executed router-template-cross-bar.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -52,16 +52,7 @@ description: Operations executed router-template-cross-bar.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -72,7 +63,15 @@ description: Operations executed router-template-cross-bar.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -108,16 +107,7 @@ description: Operations executed router-template-cross-bar.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -128,7 +118,15 @@ description: Operations executed router-template-cross-bar.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -164,16 +162,7 @@ description: Operations executed router-template-cross-bar.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -184,7 +173,15 @@ description: Operations executed router-template-cross-bar.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/program_memory.snap index 9984f579a..8583faab3 100644 --- a/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/program_memory.snap @@ -20,8 +20,13 @@ description: Variables in memory after executing router-template-cross-bar.kcl "type": "Number", "value": 32.6313, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "extrude001": { @@ -709,22 +714,34 @@ description: Variables in memory after executing router-template-cross-bar.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -816,9 +833,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1996, - "end": 2017, - "start": 1996, + "commentStart": 2003, + "end": 2024, + "start": 2003, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -829,9 +846,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2112, - "end": 2133, - "start": 2112, + "commentStart": 2119, + "end": 2140, + "start": 2119, "type": "TagDeclarator", "value": "rectangleSegmentB002" }, @@ -842,9 +859,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2235, - "end": 2256, - "start": 2235, + "commentStart": 2242, + "end": 2263, + "start": 2242, "type": "TagDeclarator", "value": "rectangleSegmentC002" }, @@ -872,9 +889,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl 0.0 ], "tag": { - "commentStart": 1996, - "end": 2017, - "start": 1996, + "commentStart": 2003, + "end": 2024, + "start": 2003, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -897,9 +914,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl 0.0 ], "tag": { - "commentStart": 2112, - "end": 2133, - "start": 2112, + "commentStart": 2119, + "end": 2140, + "start": 2119, "type": "TagDeclarator", "value": "rectangleSegmentB002" }, @@ -922,9 +939,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl -10.0 ], "tag": { - "commentStart": 2235, - "end": 2256, - "start": 2235, + "commentStart": 2242, + "end": 2263, + "start": 2242, "type": "TagDeclarator", "value": "rectangleSegmentC002" }, @@ -984,17 +1001,26 @@ description: Variables in memory after executing router-template-cross-bar.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1679,22 +1705,34 @@ description: Variables in memory after executing router-template-cross-bar.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1835,9 +1873,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2595, - "end": 2616, - "start": 2595, + "commentStart": 2609, + "end": 2630, + "start": 2609, "type": "TagDeclarator", "value": "rectangleSegmentA001" }, @@ -1848,9 +1886,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2711, - "end": 2732, - "start": 2711, + "commentStart": 2725, + "end": 2746, + "start": 2725, "type": "TagDeclarator", "value": "rectangleSegmentB001" }, @@ -1861,9 +1899,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2834, - "end": 2855, - "start": 2834, + "commentStart": 2848, + "end": 2869, + "start": 2848, "type": "TagDeclarator", "value": "rectangleSegmentC001" }, @@ -1891,9 +1929,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl 0.0 ], "tag": { - "commentStart": 2595, - "end": 2616, - "start": 2595, + "commentStart": 2609, + "end": 2630, + "start": 2609, "type": "TagDeclarator", "value": "rectangleSegmentA001" }, @@ -1916,9 +1954,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl 0.0 ], "tag": { - "commentStart": 2711, - "end": 2732, - "start": 2711, + "commentStart": 2725, + "end": 2746, + "start": 2725, "type": "TagDeclarator", "value": "rectangleSegmentB001" }, @@ -1941,9 +1979,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl -10.0 ], "tag": { - "commentStart": 2834, - "end": 2855, - "start": 2834, + "commentStart": 2848, + "end": 2869, + "start": 2848, "type": "TagDeclarator", "value": "rectangleSegmentC001" }, @@ -2003,17 +2041,26 @@ description: Variables in memory after executing router-template-cross-bar.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2698,22 +2745,34 @@ description: Variables in memory after executing router-template-cross-bar.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2854,9 +2913,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 3199, - "end": 3220, - "start": 3199, + "commentStart": 3220, + "end": 3241, + "start": 3220, "type": "TagDeclarator", "value": "rectangleSegmentA003" }, @@ -2867,9 +2926,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 3315, - "end": 3336, - "start": 3315, + "commentStart": 3336, + "end": 3357, + "start": 3336, "type": "TagDeclarator", "value": "rectangleSegmentB003" }, @@ -2880,9 +2939,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 3438, - "end": 3459, - "start": 3438, + "commentStart": 3459, + "end": 3480, + "start": 3459, "type": "TagDeclarator", "value": "rectangleSegmentC003" }, @@ -2910,9 +2969,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl 0.0 ], "tag": { - "commentStart": 3199, - "end": 3220, - "start": 3199, + "commentStart": 3220, + "end": 3241, + "start": 3220, "type": "TagDeclarator", "value": "rectangleSegmentA003" }, @@ -2935,9 +2994,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl 0.0 ], "tag": { - "commentStart": 3315, - "end": 3336, - "start": 3315, + "commentStart": 3336, + "end": 3357, + "start": 3336, "type": "TagDeclarator", "value": "rectangleSegmentB003" }, @@ -2960,9 +3019,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl -10.0 ], "tag": { - "commentStart": 3438, - "end": 3459, - "start": 3438, + "commentStart": 3459, + "end": 3480, + "start": 3459, "type": "TagDeclarator", "value": "rectangleSegmentC003" }, @@ -3022,17 +3081,26 @@ description: Variables in memory after executing router-template-cross-bar.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3044,9 +3112,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1996, - "end": 2017, - "start": 1996, + "commentStart": 2003, + "end": 2024, + "start": 2003, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -3057,9 +3125,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2112, - "end": 2133, - "start": 2112, + "commentStart": 2119, + "end": 2140, + "start": 2119, "type": "TagDeclarator", "value": "rectangleSegmentB002" }, @@ -3070,9 +3138,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2235, - "end": 2256, - "start": 2235, + "commentStart": 2242, + "end": 2263, + "start": 2242, "type": "TagDeclarator", "value": "rectangleSegmentC002" }, @@ -3100,9 +3168,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl 0.0 ], "tag": { - "commentStart": 1996, - "end": 2017, - "start": 1996, + "commentStart": 2003, + "end": 2024, + "start": 2003, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -3125,9 +3193,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl 0.0 ], "tag": { - "commentStart": 2112, - "end": 2133, - "start": 2112, + "commentStart": 2119, + "end": 2140, + "start": 2119, "type": "TagDeclarator", "value": "rectangleSegmentB002" }, @@ -3150,9 +3218,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl -10.0 ], "tag": { - "commentStart": 2235, - "end": 2256, - "start": 2235, + "commentStart": 2242, + "end": 2263, + "start": 2242, "type": "TagDeclarator", "value": "rectangleSegmentC002" }, @@ -3212,17 +3280,26 @@ description: Variables in memory after executing router-template-cross-bar.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3907,22 +3984,34 @@ description: Variables in memory after executing router-template-cross-bar.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4720,22 +4809,34 @@ description: Variables in memory after executing router-template-cross-bar.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4824,9 +4925,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl 0.0 ], "tag": { - "commentStart": 1996, - "end": 2017, - "start": 1996, + "commentStart": 2003, + "end": 2024, + "start": 2003, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -4849,9 +4950,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl 0.0 ], "tag": { - "commentStart": 2112, - "end": 2133, - "start": 2112, + "commentStart": 2119, + "end": 2140, + "start": 2119, "type": "TagDeclarator", "value": "rectangleSegmentB002" }, @@ -4874,9 +4975,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl -10.0 ], "tag": { - "commentStart": 2235, - "end": 2256, - "start": 2235, + "commentStart": 2242, + "end": 2263, + "start": 2242, "type": "TagDeclarator", "value": "rectangleSegmentC002" }, @@ -4936,17 +5037,26 @@ description: Variables in memory after executing router-template-cross-bar.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -5631,22 +5741,34 @@ description: Variables in memory after executing router-template-cross-bar.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5784,9 +5906,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl 0.0 ], "tag": { - "commentStart": 2595, - "end": 2616, - "start": 2595, + "commentStart": 2609, + "end": 2630, + "start": 2609, "type": "TagDeclarator", "value": "rectangleSegmentA001" }, @@ -5809,9 +5931,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl 0.0 ], "tag": { - "commentStart": 2711, - "end": 2732, - "start": 2711, + "commentStart": 2725, + "end": 2746, + "start": 2725, "type": "TagDeclarator", "value": "rectangleSegmentB001" }, @@ -5834,9 +5956,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl -10.0 ], "tag": { - "commentStart": 2834, - "end": 2855, - "start": 2834, + "commentStart": 2848, + "end": 2869, + "start": 2848, "type": "TagDeclarator", "value": "rectangleSegmentC001" }, @@ -5896,17 +6018,26 @@ description: Variables in memory after executing router-template-cross-bar.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -6591,22 +6722,34 @@ description: Variables in memory after executing router-template-cross-bar.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6744,9 +6887,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl 0.0 ], "tag": { - "commentStart": 3199, - "end": 3220, - "start": 3199, + "commentStart": 3220, + "end": 3241, + "start": 3220, "type": "TagDeclarator", "value": "rectangleSegmentA003" }, @@ -6769,9 +6912,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl 0.0 ], "tag": { - "commentStart": 3315, - "end": 3336, - "start": 3315, + "commentStart": 3336, + "end": 3357, + "start": 3336, "type": "TagDeclarator", "value": "rectangleSegmentB003" }, @@ -6794,9 +6937,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl -10.0 ], "tag": { - "commentStart": 3438, - "end": 3459, - "start": 3438, + "commentStart": 3459, + "end": 3480, + "start": 3459, "type": "TagDeclarator", "value": "rectangleSegmentC003" }, @@ -6856,17 +6999,26 @@ description: Variables in memory after executing router-template-cross-bar.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -6878,9 +7030,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1996, - "end": 2017, - "start": 1996, + "commentStart": 2003, + "end": 2024, + "start": 2003, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -6891,9 +7043,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2112, - "end": 2133, - "start": 2112, + "commentStart": 2119, + "end": 2140, + "start": 2119, "type": "TagDeclarator", "value": "rectangleSegmentB002" }, @@ -6904,9 +7056,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2235, - "end": 2256, - "start": 2235, + "commentStart": 2242, + "end": 2263, + "start": 2242, "type": "TagDeclarator", "value": "rectangleSegmentC002" }, @@ -6934,9 +7086,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl 0.0 ], "tag": { - "commentStart": 1996, - "end": 2017, - "start": 1996, + "commentStart": 2003, + "end": 2024, + "start": 2003, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -6959,9 +7111,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl 0.0 ], "tag": { - "commentStart": 2112, - "end": 2133, - "start": 2112, + "commentStart": 2119, + "end": 2140, + "start": 2119, "type": "TagDeclarator", "value": "rectangleSegmentB002" }, @@ -6984,9 +7136,9 @@ description: Variables in memory after executing router-template-cross-bar.kcl -10.0 ], "tag": { - "commentStart": 2235, - "end": 2256, - "start": 2235, + "commentStart": 2242, + "end": 2263, + "start": 2242, "type": "TagDeclarator", "value": "rectangleSegmentC002" }, @@ -7046,17 +7198,26 @@ description: Variables in memory after executing router-template-cross-bar.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -7741,22 +7902,34 @@ description: Variables in memory after executing router-template-cross-bar.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7931,8 +8104,13 @@ description: Variables in memory after executing router-template-cross-bar.kcl "type": "Number", "value": 20.75, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "templateDiameter": { @@ -7952,8 +8130,13 @@ description: Variables in memory after executing router-template-cross-bar.kcl "type": "Number", "value": 1.8812, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "templateThickness": { diff --git a/rust/kcl-lib/tests/kcl_samples/router-template-slate/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/router-template-slate/artifact_graph_flowchart.snap.md index 0e721f3e5..794c4f908 100644 --- a/rust/kcl-lib/tests/kcl_samples/router-template-slate/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/router-template-slate/artifact_graph_flowchart.snap.md @@ -18,21 +18,21 @@ flowchart LR 16[Solid2d] end subgraph path52 [Path] - 52["Path
[1485, 1585, 0]"] - 53["Segment
[1591, 1638, 0]"] - 54["Segment
[1644, 1756, 0]"] - 55["Segment
[1762, 1879, 0]"] - 56["Segment
[1885, 1941, 0]"] - 57["Segment
[1947, 1954, 0]"] + 52["Path
[1492, 1592, 0]"] + 53["Segment
[1598, 1645, 0]"] + 54["Segment
[1651, 1763, 0]"] + 55["Segment
[1769, 1886, 0]"] + 56["Segment
[1892, 1948, 0]"] + 57["Segment
[1954, 1961, 0]"] 58[Solid2d] end subgraph path74 [Path] - 74["Path
[2111, 2210, 0]"] - 75["Segment
[2216, 2262, 0]"] - 76["Segment
[2268, 2351, 0]"] - 77["Segment
[2357, 2445, 0]"] - 78["Segment
[2451, 2507, 0]"] - 79["Segment
[2513, 2520, 0]"] + 74["Path
[2125, 2224, 0]"] + 75["Segment
[2230, 2276, 0]"] + 76["Segment
[2282, 2365, 0]"] + 77["Segment
[2371, 2459, 0]"] + 78["Segment
[2465, 2521, 0]"] + 79["Segment
[2527, 2534, 0]"] 80[Solid2d] end 1["Plane
[514, 531, 0]"] @@ -71,7 +71,7 @@ flowchart LR 49["SweepEdge Opposite"] 50["SweepEdge Adjacent"] 51["SweepEdge Opposite"] - 59["Sweep Extrusion
[1998, 2030, 0]"] + 59["Sweep Extrusion
[2005, 2037, 0]"] 60[Wall] 61[Wall] 62[Wall] @@ -86,7 +86,7 @@ flowchart LR 71["SweepEdge Adjacent"] 72["SweepEdge Opposite"] 73["SweepEdge Adjacent"] - 81["Sweep Extrusion
[2563, 2595, 0]"] + 81["Sweep Extrusion
[2577, 2609, 0]"] 82[Wall] 83[Wall] 84[Wall] @@ -101,8 +101,8 @@ flowchart LR 93["SweepEdge Adjacent"] 94["SweepEdge Opposite"] 95["SweepEdge Adjacent"] - 96["StartSketchOnFace
[1445, 1479, 0]"] - 97["StartSketchOnFace
[2071, 2105, 0]"] + 96["StartSketchOnFace
[1445, 1486, 0]"] + 97["StartSketchOnFace
[2078, 2119, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/router-template-slate/ast.snap b/rust/kcl-lib/tests/kcl_samples/router-template-slate/ast.snap index 9a4737664..e14c64607 100644 --- a/rust/kcl-lib/tests/kcl_samples/router-template-slate/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/router-template-slate/ast.snap @@ -2017,29 +2017,23 @@ description: Result of parsing router-template-slate.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'START'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "START" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'START'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "START" + } } ], "callee": { @@ -2060,8 +2054,24 @@ description: Result of parsing router-template-slate.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -2846,29 +2856,23 @@ description: Result of parsing router-template-slate.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'START'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "START" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'START'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "START" + } } ], "callee": { @@ -2889,8 +2893,24 @@ description: Result of parsing router-template-slate.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/kcl_samples/router-template-slate/ops.snap b/rust/kcl-lib/tests/kcl_samples/router-template-slate/ops.snap index 5f0e48be7..1da7335a5 100644 --- a/rust/kcl-lib/tests/kcl_samples/router-template-slate/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/router-template-slate/ops.snap @@ -5,7 +5,7 @@ description: Operations executed router-template-slate.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -52,16 +52,7 @@ description: Operations executed router-template-slate.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -72,7 +63,15 @@ description: Operations executed router-template-slate.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -108,16 +107,7 @@ description: Operations executed router-template-slate.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "START" @@ -128,7 +118,15 @@ description: Operations executed router-template-slate.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/kcl_samples/router-template-slate/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/router-template-slate/program_memory.snap index 68629dc70..d1fdd290a 100644 --- a/rust/kcl-lib/tests/kcl_samples/router-template-slate/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/router-template-slate/program_memory.snap @@ -427,22 +427,34 @@ description: Variables in memory after executing router-template-slate.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -514,9 +526,9 @@ description: Variables in memory after executing router-template-slate.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1616, - "end": 1637, - "start": 1616, + "commentStart": 1623, + "end": 1644, + "start": 1623, "type": "TagDeclarator", "value": "rectangleSegmentA001" }, @@ -527,9 +539,9 @@ description: Variables in memory after executing router-template-slate.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1734, - "end": 1755, - "start": 1734, + "commentStart": 1741, + "end": 1762, + "start": 1741, "type": "TagDeclarator", "value": "rectangleSegmentB001" }, @@ -540,9 +552,9 @@ description: Variables in memory after executing router-template-slate.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1857, - "end": 1878, - "start": 1857, + "commentStart": 1864, + "end": 1885, + "start": 1864, "type": "TagDeclarator", "value": "rectangleSegmentC001" }, @@ -570,9 +582,9 @@ description: Variables in memory after executing router-template-slate.kcl -12.4937 ], "tag": { - "commentStart": 1616, - "end": 1637, - "start": 1616, + "commentStart": 1623, + "end": 1644, + "start": 1623, "type": "TagDeclarator", "value": "rectangleSegmentA001" }, @@ -595,9 +607,9 @@ description: Variables in memory after executing router-template-slate.kcl -12.4937 ], "tag": { - "commentStart": 1734, - "end": 1755, - "start": 1734, + "commentStart": 1741, + "end": 1762, + "start": 1741, "type": "TagDeclarator", "value": "rectangleSegmentB001" }, @@ -620,9 +632,9 @@ description: Variables in memory after executing router-template-slate.kcl -92.4938 ], "tag": { - "commentStart": 1857, - "end": 1878, - "start": 1857, + "commentStart": 1864, + "end": 1885, + "start": 1864, "type": "TagDeclarator", "value": "rectangleSegmentC001" }, @@ -682,17 +694,26 @@ description: Variables in memory after executing router-template-slate.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1103,22 +1124,34 @@ description: Variables in memory after executing router-template-slate.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1239,9 +1272,9 @@ description: Variables in memory after executing router-template-slate.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 2240, - "end": 2261, - "start": 2240, + "commentStart": 2254, + "end": 2275, + "start": 2254, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -1283,9 +1316,9 @@ description: Variables in memory after executing router-template-slate.kcl -12.4937 ], "tag": { - "commentStart": 2240, - "end": 2261, - "start": 2240, + "commentStart": 2254, + "end": 2275, + "start": 2254, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -1383,17 +1416,26 @@ description: Variables in memory after executing router-template-slate.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1804,22 +1846,34 @@ description: Variables in memory after executing router-template-slate.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1924,8 +1978,13 @@ description: Variables in memory after executing router-template-slate.kcl "type": "Number", "value": 10.75, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "length002": { @@ -2329,22 +2388,34 @@ description: Variables in memory after executing router-template-slate.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2413,9 +2484,9 @@ description: Variables in memory after executing router-template-slate.kcl -12.4937 ], "tag": { - "commentStart": 1616, - "end": 1637, - "start": 1616, + "commentStart": 1623, + "end": 1644, + "start": 1623, "type": "TagDeclarator", "value": "rectangleSegmentA001" }, @@ -2438,9 +2509,9 @@ description: Variables in memory after executing router-template-slate.kcl -12.4937 ], "tag": { - "commentStart": 1734, - "end": 1755, - "start": 1734, + "commentStart": 1741, + "end": 1762, + "start": 1741, "type": "TagDeclarator", "value": "rectangleSegmentB001" }, @@ -2463,9 +2534,9 @@ description: Variables in memory after executing router-template-slate.kcl -92.4938 ], "tag": { - "commentStart": 1857, - "end": 1878, - "start": 1857, + "commentStart": 1864, + "end": 1885, + "start": 1864, "type": "TagDeclarator", "value": "rectangleSegmentC001" }, @@ -2525,17 +2596,26 @@ description: Variables in memory after executing router-template-slate.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2946,22 +3026,34 @@ description: Variables in memory after executing router-template-slate.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3079,9 +3171,9 @@ description: Variables in memory after executing router-template-slate.kcl -12.4937 ], "tag": { - "commentStart": 2240, - "end": 2261, - "start": 2240, + "commentStart": 2254, + "end": 2275, + "start": 2254, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -3179,17 +3271,26 @@ description: Variables in memory after executing router-template-slate.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3600,22 +3701,34 @@ description: Variables in memory after executing router-template-slate.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3713,8 +3826,13 @@ description: Variables in memory after executing router-template-slate.kcl "type": "Number", "value": 20.75, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "templateDiameter": { @@ -3734,8 +3852,13 @@ description: Variables in memory after executing router-template-slate.kcl "type": "Number", "value": 1.8812, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "templateThickness": { diff --git a/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/artifact_graph_flowchart.snap.md index 8bd9d4a78..f13fe8b89 100644 --- a/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/artifact_graph_flowchart.snap.md @@ -28,23 +28,23 @@ flowchart LR 26[Solid2d] end subgraph path94 [Path] - 94["Path
[3129, 3218, 0]"] - 95["Segment
[3129, 3218, 0]"] + 94["Path
[3136, 3225, 0]"] + 95["Segment
[3136, 3225, 0]"] 96[Solid2d] end subgraph path102 [Path] - 102["Path
[3493, 3581, 0]"] - 103["Segment
[3493, 3581, 0]"] + 102["Path
[3507, 3595, 0]"] + 103["Segment
[3507, 3595, 0]"] 104[Solid2d] end subgraph path110 [Path] - 110["Path
[3863, 4043, 0]"] - 111["Segment
[3863, 4043, 0]"] + 110["Path
[3884, 4064, 0]"] + 111["Segment
[3884, 4064, 0]"] 112[Solid2d] end subgraph path120 [Path] - 120["Path
[4459, 4515, 0]"] - 121["Segment
[4459, 4515, 0]"] + 120["Path
[4487, 4543, 0]"] + 121["Segment
[4487, 4543, 0]"] 122[Solid2d] end 1["Plane
[1205, 1222, 0]"] @@ -115,31 +115,31 @@ flowchart LR 91["EdgeCut Fillet
[2842, 3013, 0]"] 92["EdgeCut Fillet
[2842, 3013, 0]"] 93["EdgeCut Fillet
[2842, 3013, 0]"] - 97["Sweep Extrusion
[3347, 3375, 0]"] + 97["Sweep Extrusion
[3354, 3382, 0]"] 98[Wall] 99["SweepEdge Opposite"] 100["SweepEdge Adjacent"] - 101["Sweep Extrusion
[3347, 3375, 0]"] - 105["Sweep Extrusion
[3710, 3738, 0]"] + 101["Sweep Extrusion
[3354, 3382, 0]"] + 105["Sweep Extrusion
[3724, 3752, 0]"] 106[Wall] 107["SweepEdge Opposite"] 108["SweepEdge Adjacent"] - 109["Sweep Extrusion
[3710, 3738, 0]"] - 113["Sweep Extrusion
[4297, 4325, 0]"] + 109["Sweep Extrusion
[3724, 3752, 0]"] + 113["Sweep Extrusion
[4318, 4346, 0]"] 114[Wall] 115["SweepEdge Opposite"] 116["SweepEdge Adjacent"] - 117["Sweep Extrusion
[4297, 4325, 0]"] - 118["Sweep Extrusion
[4297, 4325, 0]"] - 119["Sweep Extrusion
[4297, 4325, 0]"] - 123["Sweep Extrusion
[4521, 4549, 0]"] + 117["Sweep Extrusion
[4318, 4346, 0]"] + 118["Sweep Extrusion
[4318, 4346, 0]"] + 119["Sweep Extrusion
[4318, 4346, 0]"] + 123["Sweep Extrusion
[4549, 4577, 0]"] 124[Wall] 125["SweepEdge Opposite"] 126["SweepEdge Adjacent"] - 127["StartSketchOnFace
[3087, 3123, 0]"] - 128["StartSketchOnFace
[3451, 3487, 0]"] - 129["StartSketchOnFace
[3821, 3857, 0]"] - 130["StartSketchOnFace
[4417, 4453, 0]"] + 127["StartSketchOnFace
[3087, 3130, 0]"] + 128["StartSketchOnFace
[3458, 3501, 0]"] + 129["StartSketchOnFace
[3835, 3878, 0]"] + 130["StartSketchOnFace
[4438, 4481, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/ast.snap b/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/ast.snap index b4a96fb91..6b7ecb08f 100644 --- a/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/ast.snap @@ -3315,36 +3315,30 @@ description: Result of parsing sheet-metal-bracket.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "bracketProfile", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg04", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg04", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -3365,8 +3359,24 @@ description: Result of parsing sheet-metal-bracket.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "bracketProfile", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -3750,36 +3760,30 @@ description: Result of parsing sheet-metal-bracket.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "bracketProfile", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg06", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg06", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -3800,8 +3804,24 @@ description: Result of parsing sheet-metal-bracket.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "bracketProfile", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -4177,36 +4197,30 @@ description: Result of parsing sheet-metal-bracket.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "bracketProfile", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg05", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg05", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -4227,8 +4241,24 @@ description: Result of parsing sheet-metal-bracket.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "bracketProfile", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -4806,36 +4836,30 @@ description: Result of parsing sheet-metal-bracket.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "bracketProfile", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg05", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg05", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -4856,8 +4880,24 @@ description: Result of parsing sheet-metal-bracket.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "bracketProfile", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/ops.snap b/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/ops.snap index be173ab6e..87a69af5f 100644 --- a/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/ops.snap @@ -5,7 +5,7 @@ description: Operations executed sheet-metal-bracket.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -57,8 +57,13 @@ description: Operations executed sheet-metal-bracket.kcl "type": "Number", "value": 0.5, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -105,16 +110,7 @@ description: Operations executed sheet-metal-bracket.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg04", @@ -126,7 +122,15 @@ description: Operations executed sheet-metal-bracket.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -173,16 +177,7 @@ description: Operations executed sheet-metal-bracket.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg06", @@ -194,7 +189,15 @@ description: Operations executed sheet-metal-bracket.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -241,16 +244,7 @@ description: Operations executed sheet-metal-bracket.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg05", @@ -262,7 +256,15 @@ description: Operations executed sheet-metal-bracket.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -321,16 +323,7 @@ description: Operations executed sheet-metal-bracket.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg05", @@ -342,7 +335,15 @@ description: Operations executed sheet-metal-bracket.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/program_memory.snap index 04cac3a18..69e39a41f 100644 --- a/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/program_memory.snap @@ -738,22 +738,34 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -820,28 +832,72 @@ description: Variables in memory after executing sheet-metal-bracket.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -904,17 +960,26 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1636,22 +1701,34 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -1718,28 +1795,72 @@ description: Variables in memory after executing sheet-metal-bracket.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -1788,8 +1909,13 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "type": "Number", "value": 0.1875, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "componentBoltPatternX": { @@ -1848,8 +1974,13 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "type": "Number", "value": 1.5, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "hatHeight": { @@ -1934,17 +2065,26 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2666,22 +2806,34 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -2748,28 +2900,72 @@ description: Variables in memory after executing sheet-metal-bracket.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -2867,17 +3063,26 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3599,22 +3804,34 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -3681,28 +3898,72 @@ description: Variables in memory after executing sheet-metal-bracket.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -3753,8 +4014,13 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "type": "Number", "value": 0.25, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "mountingBoltPatternX": { @@ -3787,8 +4053,13 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "type": "Number", "value": 0.75, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "rightFlangeBoltPattern": { @@ -3847,17 +4118,26 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -4579,22 +4859,34 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -4661,28 +4953,72 @@ description: Variables in memory after executing sheet-metal-bracket.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -4780,17 +5116,26 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -5512,22 +5857,34 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -5594,28 +5951,72 @@ description: Variables in memory after executing sheet-metal-bracket.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -5766,17 +6167,26 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -6498,22 +6908,34 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -6580,28 +7002,72 @@ description: Variables in memory after executing sheet-metal-bracket.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -6699,17 +7165,26 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -7431,22 +7906,34 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -7513,28 +8000,72 @@ description: Variables in memory after executing sheet-metal-bracket.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -7632,17 +8163,26 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -8364,22 +8904,34 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -8446,28 +8998,72 @@ description: Variables in memory after executing sheet-metal-bracket.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -8565,17 +9161,26 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -9297,22 +9902,34 @@ description: Variables in memory after executing sheet-metal-bracket.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -9379,28 +9996,72 @@ description: Variables in memory after executing sheet-metal-bracket.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5, + "radius": { + "n": 0.5, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } diff --git a/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/artifact_graph_flowchart.snap.md index 216418b8b..6235f4e1c 100644 --- a/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/artifact_graph_flowchart.snap.md @@ -6,18 +6,18 @@ flowchart LR 4[Solid2d] end subgraph path13 [Path] - 13["Path
[971, 1052, 0]"] - 14["Segment
[1058, 1109, 0]"] - 15["Segment
[1115, 1166, 0]"] - 16["Segment
[1172, 1223, 0]"] - 17["Segment
[1229, 1279, 0]"] - 18["Segment
[1285, 1335, 0]"] - 19["Segment
[1341, 1348, 0]"] + 13["Path
[978, 1059, 0]"] + 14["Segment
[1065, 1116, 0]"] + 15["Segment
[1122, 1173, 0]"] + 16["Segment
[1179, 1230, 0]"] + 17["Segment
[1236, 1286, 0]"] + 18["Segment
[1292, 1342, 0]"] + 19["Segment
[1348, 1355, 0]"] 20[Solid2d] end subgraph path41 [Path] - 41["Path
[1442, 1511, 0]"] - 42["Segment
[1442, 1511, 0]"] + 41["Path
[1456, 1525, 0]"] + 42["Segment
[1456, 1525, 0]"] 43[Solid2d] end 1["Plane
[650, 667, 0]"] @@ -29,7 +29,7 @@ flowchart LR 10["SweepEdge Adjacent"] 11["EdgeCut Fillet
[788, 854, 0]"] 12["EdgeCut Fillet
[788, 854, 0]"] - 21["Sweep Extrusion
[1354, 1394, 0]"] + 21["Sweep Extrusion
[1361, 1401, 0]"] 22[Wall] 23[Wall] 24[Wall] @@ -49,14 +49,14 @@ flowchart LR 38["SweepEdge Adjacent"] 39["SweepEdge Opposite"] 40["SweepEdge Adjacent"] - 44["Sweep Extrusion
[1517, 1545, 0]"] + 44["Sweep Extrusion
[1531, 1559, 0]"] 45[Wall] 46["Cap End"] 47["SweepEdge Opposite"] 48["SweepEdge Adjacent"] - 49["EdgeCut Fillet
[1551, 1610, 0]"] - 50["StartSketchOnFace
[933, 965, 0]"] - 51["StartSketchOnFace
[1406, 1436, 0]"] + 49["EdgeCut Fillet
[1565, 1624, 0]"] + 50["StartSketchOnFace
[933, 972, 0]"] + 51["StartSketchOnFace
[1413, 1450, 0]"] 1 --- 2 2 --- 3 2 ---- 5 diff --git a/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/ast.snap b/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/ast.snap index e2ce42f59..035bc9519 100644 --- a/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/ast.snap +++ b/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/ast.snap @@ -745,29 +745,23 @@ description: Result of parsing socket-head-cap-screw.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "boltHead", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'start'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "start" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'start'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "start" + } } ], "callee": { @@ -788,8 +782,24 @@ description: Result of parsing socket-head-cap-screw.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "boltHead", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -1403,29 +1413,23 @@ description: Result of parsing socket-head-cap-screw.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "boltHead", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'end'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "end" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'end'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "end" + } } ], "callee": { @@ -1446,8 +1450,24 @@ description: Result of parsing socket-head-cap-screw.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "boltHead", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/ops.snap b/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/ops.snap index 390ddb7fc..e1cb2f566 100644 --- a/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/ops.snap @@ -23,7 +23,7 @@ description: Operations executed socket-head-cap-screw.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -119,16 +119,7 @@ description: Operations executed socket-head-cap-screw.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -139,7 +130,15 @@ description: Operations executed socket-head-cap-screw.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -175,16 +174,7 @@ description: Operations executed socket-head-cap-screw.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -195,7 +185,15 @@ description: Operations executed socket-head-cap-screw.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/program_memory.snap index f71936b7a..13e528cef 100644 --- a/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/program_memory.snap @@ -15,9 +15,9 @@ description: Variables in memory after executing socket-head-cap-screw.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1499, - "end": 1510, - "start": 1499, + "commentStart": 1513, + "end": 1524, + "start": 1513, "type": "TagDeclarator", "value": "filletEdge" }, @@ -44,9 +44,9 @@ description: Variables in memory after executing socket-head-cap-screw.kcl ], "radius": 0.095, "tag": { - "commentStart": 1499, - "end": 1510, - "start": 1499, + "commentStart": 1513, + "end": 1524, + "start": 1513, "type": "TagDeclarator", "value": "filletEdge" }, @@ -68,17 +68,26 @@ description: Variables in memory after executing socket-head-cap-screw.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -143,22 +152,34 @@ description: Variables in memory after executing socket-head-cap-screw.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -201,14 +222,36 @@ description: Variables in memory after executing socket-head-cap-screw.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.02, + "radius": { + "n": 0.02, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.02, + "radius": { + "n": 0.02, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -258,7 +301,18 @@ description: Variables in memory after executing socket-head-cap-screw.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.02, + "radius": { + "n": 0.02, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -346,22 +400,34 @@ description: Variables in memory after executing socket-head-cap-screw.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -404,14 +470,36 @@ description: Variables in memory after executing socket-head-cap-screw.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.02, + "radius": { + "n": 0.02, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.02, + "radius": { + "n": 0.02, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -451,16 +539,26 @@ description: Variables in memory after executing socket-head-cap-screw.kcl "type": "Number", "value": 0.1563, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "boltHexFlatLength": { "type": "Number", "value": 0.0902, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "boltLength": { @@ -658,17 +756,26 @@ description: Variables in memory after executing socket-head-cap-screw.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -733,22 +840,34 @@ description: Variables in memory after executing socket-head-cap-screw.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -791,14 +910,36 @@ description: Variables in memory after executing socket-head-cap-screw.kcl { "type": "fillet", "id": "[uuid]", - "radius": 0.02, + "radius": { + "n": 0.02, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.02, + "radius": { + "n": 0.02, + "ty": { + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } diff --git a/rust/kcl-lib/tests/kcl_samples/walkie-talkie/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/walkie-talkie/artifact_graph_flowchart.snap.md index 196e24fd6..53ad33b67 100644 --- a/rust/kcl-lib/tests/kcl_samples/walkie-talkie/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/walkie-talkie/artifact_graph_flowchart.snap.md @@ -9,32 +9,32 @@ flowchart LR 7[Solid2d] end subgraph path27 [Path] - 27["Path
[963, 1088, 6]"] - 28["Segment
[1094, 1152, 6]"] - 29["Segment
[1158, 1283, 6]"] - 30["Segment
[1289, 1347, 6]"] - 31["Segment
[1353, 1481, 6]"] - 32["Segment
[1487, 1548, 6]"] - 33["Segment
[1554, 1683, 6]"] - 34["Segment
[1689, 1749, 6]"] - 35["Segment
[1755, 1762, 6]"] + 27["Path
[970, 1095, 6]"] + 28["Segment
[1101, 1159, 6]"] + 29["Segment
[1165, 1290, 6]"] + 30["Segment
[1296, 1354, 6]"] + 31["Segment
[1360, 1488, 6]"] + 32["Segment
[1494, 1555, 6]"] + 33["Segment
[1561, 1690, 6]"] + 34["Segment
[1696, 1756, 6]"] + 35["Segment
[1762, 1769, 6]"] 36[Solid2d] end subgraph path63 [Path] - 63["Path
[1912, 1966, 6]"] - 64["Segment
[1972, 2013, 6]"] - 65["Segment
[2019, 2048, 6]"] - 66["Segment
[2054, 2084, 6]"] - 67["Segment
[2090, 2146, 6]"] - 68["Segment
[2152, 2159, 6]"] + 63["Path
[1926, 1980, 6]"] + 64["Segment
[1986, 2027, 6]"] + 65["Segment
[2033, 2062, 6]"] + 66["Segment
[2068, 2098, 6]"] + 67["Segment
[2104, 2160, 6]"] + 68["Segment
[2166, 2173, 6]"] 69[Solid2d] end subgraph path84 [Path] - 84["Path
[2297, 2334, 6]"] - 85["Segment
[2340, 2371, 6]"] - 86["Segment
[2377, 2410, 6]"] - 87["Segment
[2416, 2448, 6]"] - 88["Segment
[2454, 2461, 6]"] + 84["Path
[2318, 2355, 6]"] + 85["Segment
[2361, 2392, 6]"] + 86["Segment
[2398, 2431, 6]"] + 87["Segment
[2437, 2469, 6]"] + 88["Segment
[2475, 2482, 6]"] 89[Solid2d] end subgraph path105 [Path] @@ -199,7 +199,7 @@ flowchart LR 24["EdgeCut Chamfer
[639, 870, 6]"] 25["EdgeCut Chamfer
[639, 870, 6]"] 26["EdgeCut Chamfer
[639, 870, 6]"] - 37["Sweep Extrusion
[1776, 1819, 6]"] + 37["Sweep Extrusion
[1783, 1826, 6]"] 38[Wall] 39[Wall] 40[Wall] @@ -225,7 +225,7 @@ flowchart LR 60["SweepEdge Adjacent"] 61["SweepEdge Opposite"] 62["SweepEdge Adjacent"] - 70["Sweep Extrusion
[2173, 2216, 6]"] + 70["Sweep Extrusion
[2187, 2230, 6]"] 71[Wall] 72[Wall] 73[Wall] @@ -239,7 +239,7 @@ flowchart LR 81["SweepEdge Adjacent"] 82["SweepEdge Opposite"] 83["SweepEdge Adjacent"] - 90["Sweep Extrusion
[2463, 2496, 6]"] + 90["Sweep Extrusion
[2484, 2517, 6]"] 91[Wall] 92[Wall] 93[Wall] @@ -408,9 +408,9 @@ flowchart LR 366["SweepEdge Adjacent"] 367["EdgeCut Chamfer
[689, 835, 11]"] 368["EdgeCut Chamfer
[689, 835, 11]"] - 369["StartSketchOnFace
[931, 957, 6]"] - 370["StartSketchOnFace
[1872, 1906, 6]"] - 371["StartSketchOnFace
[2257, 2291, 6]"] + 369["StartSketchOnFace
[931, 964, 6]"] + 370["StartSketchOnFace
[1879, 1920, 6]"] + 371["StartSketchOnFace
[2271, 2312, 6]"] 372["StartSketchOnPlane
[594, 618, 8]"] 1 --- 2 2 --- 3 diff --git a/rust/kcl-lib/tests/kcl_samples/walkie-talkie/ops.snap b/rust/kcl-lib/tests/kcl_samples/walkie-talkie/ops.snap index ea1ff9d7b..8b4c90be7 100644 --- a/rust/kcl-lib/tests/kcl_samples/walkie-talkie/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/walkie-talkie/ops.snap @@ -14,7 +14,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -117,16 +117,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -137,7 +128,15 @@ description: Operations executed walkie-talkie.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "GroupBegin", @@ -245,16 +244,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -265,7 +255,15 @@ description: Operations executed walkie-talkie.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -301,16 +299,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -321,7 +310,15 @@ description: Operations executed walkie-talkie.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -369,7 +366,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -414,7 +411,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -469,7 +466,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -484,7 +481,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -499,7 +496,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1495,7 +1492,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1554,7 +1551,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1613,7 +1610,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1672,7 +1669,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1731,7 +1728,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1834,7 +1831,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -1949,7 +1946,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -2068,7 +2065,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -2181,7 +2178,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -2294,7 +2291,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -2407,7 +2404,7 @@ description: Operations executed walkie-talkie.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/kcl_samples/walkie-talkie/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/walkie-talkie/program_memory.snap index ac8abcdd1..f1fb6a1e5 100644 --- a/rust/kcl-lib/tests/kcl_samples/walkie-talkie/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/walkie-talkie/program_memory.snap @@ -83,8 +83,13 @@ description: Variables in memory after executing walkie-talkie.kcl "type": "Number", "value": 0.48, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "buttonThickness": { @@ -255,8 +260,13 @@ description: Variables in memory after executing walkie-talkie.kcl "type": "Number", "value": 1.25, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Inches" + }, + "angle": { + "type": "Degrees" + } } }, "speakerBoxHeight": { diff --git a/rust/kcl-lib/tests/kcl_samples/washer/ops.snap b/rust/kcl-lib/tests/kcl_samples/washer/ops.snap index 38ba6db5f..7bf11febc 100644 --- a/rust/kcl-lib/tests/kcl_samples/washer/ops.snap +++ b/rust/kcl-lib/tests/kcl_samples/washer/ops.snap @@ -5,7 +5,7 @@ description: Operations executed washer.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/kcl_samples/washer/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/washer/program_memory.snap index ba2fff7dd..0f055dd74 100644 --- a/rust/kcl-lib/tests/kcl_samples/washer/program_memory.snap +++ b/rust/kcl-lib/tests/kcl_samples/washer/program_memory.snap @@ -121,22 +121,34 @@ description: Variables in memory after executing washer.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" @@ -214,22 +226,34 @@ description: Variables in memory after executing washer.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Inches" diff --git a/rust/kcl-lib/tests/kittycad_svg/ops.snap b/rust/kcl-lib/tests/kittycad_svg/ops.snap index 67a3bfb53..c33a24f64 100644 --- a/rust/kcl-lib/tests/kittycad_svg/ops.snap +++ b/rust/kcl-lib/tests/kittycad_svg/ops.snap @@ -5,7 +5,7 @@ description: Operations executed kittycad_svg.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/kittycad_svg/program_memory.snap b/rust/kcl-lib/tests/kittycad_svg/program_memory.snap index 5db6ce745..967e0ad4a 100644 --- a/rust/kcl-lib/tests/kittycad_svg/program_memory.snap +++ b/rust/kcl-lib/tests/kittycad_svg/program_memory.snap @@ -7349,22 +7349,34 @@ description: Variables in memory after executing kittycad_svg.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/linear_pattern3d_a_pattern/ops.snap b/rust/kcl-lib/tests/linear_pattern3d_a_pattern/ops.snap index 023666a35..5ef7bbaa6 100644 --- a/rust/kcl-lib/tests/linear_pattern3d_a_pattern/ops.snap +++ b/rust/kcl-lib/tests/linear_pattern3d_a_pattern/ops.snap @@ -5,7 +5,7 @@ description: Operations executed linear_pattern3d_a_pattern.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XZ" diff --git a/rust/kcl-lib/tests/linear_pattern3d_a_pattern/program_memory.snap b/rust/kcl-lib/tests/linear_pattern3d_a_pattern/program_memory.snap index c4e1bd709..6e0438086 100644 --- a/rust/kcl-lib/tests/linear_pattern3d_a_pattern/program_memory.snap +++ b/rust/kcl-lib/tests/linear_pattern3d_a_pattern/program_memory.snap @@ -128,22 +128,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -309,22 +321,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -487,22 +511,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -665,22 +701,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -843,22 +891,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1021,22 +1081,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1199,22 +1271,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1377,22 +1461,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1560,22 +1656,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1738,22 +1846,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1916,22 +2036,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2094,22 +2226,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2272,22 +2416,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2450,22 +2606,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2628,22 +2796,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2806,22 +2986,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2984,22 +3176,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3162,22 +3366,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3340,22 +3556,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3518,22 +3746,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3696,22 +3936,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3874,22 +4126,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4052,22 +4316,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4230,22 +4506,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4408,22 +4696,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4586,22 +4886,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4764,22 +5076,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4942,22 +5266,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5120,22 +5456,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5298,22 +5646,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5476,22 +5836,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5654,22 +6026,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5832,22 +6216,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6010,22 +6406,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6188,22 +6596,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6366,22 +6786,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6544,22 +6976,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6722,22 +7166,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6900,22 +7356,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7078,22 +7546,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7256,22 +7736,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7434,22 +7926,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7612,22 +8116,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7790,22 +8306,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7968,22 +8496,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8146,22 +8686,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8324,22 +8876,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8502,22 +9066,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8680,22 +9256,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8858,22 +9446,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9036,22 +9636,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9214,22 +9826,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9392,22 +10016,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9570,22 +10206,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9748,22 +10396,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9926,22 +10586,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10104,22 +10776,34 @@ description: Variables in memory after executing linear_pattern3d_a_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/mike_stress_test/ops.snap b/rust/kcl-lib/tests/mike_stress_test/ops.snap index 2121fe4e6..87309a4b6 100644 --- a/rust/kcl-lib/tests/mike_stress_test/ops.snap +++ b/rust/kcl-lib/tests/mike_stress_test/ops.snap @@ -5,7 +5,7 @@ description: Operations executed mike_stress_test.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/mike_stress_test/program_memory.snap b/rust/kcl-lib/tests/mike_stress_test/program_memory.snap index cf2776f15..ba25b9013 100644 --- a/rust/kcl-lib/tests/mike_stress_test/program_memory.snap +++ b/rust/kcl-lib/tests/mike_stress_test/program_memory.snap @@ -26050,22 +26050,34 @@ description: Variables in memory after executing mike_stress_test.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/multi_transform/ops.snap b/rust/kcl-lib/tests/multi_transform/ops.snap index 7757e0ccd..6485f5753 100644 --- a/rust/kcl-lib/tests/multi_transform/ops.snap +++ b/rust/kcl-lib/tests/multi_transform/ops.snap @@ -5,7 +5,7 @@ description: Operations executed multi_transform.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/neg_xz_plane/ops.snap b/rust/kcl-lib/tests/neg_xz_plane/ops.snap index 79dcc98a1..c1baa4c64 100644 --- a/rust/kcl-lib/tests/neg_xz_plane/ops.snap +++ b/rust/kcl-lib/tests/neg_xz_plane/ops.snap @@ -5,7 +5,7 @@ description: Operations executed neg_xz_plane.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "-XZ" diff --git a/rust/kcl-lib/tests/neg_xz_plane/program_memory.snap b/rust/kcl-lib/tests/neg_xz_plane/program_memory.snap index 92b3aed91..4369f0d8a 100644 --- a/rust/kcl-lib/tests/neg_xz_plane/program_memory.snap +++ b/rust/kcl-lib/tests/neg_xz_plane/program_memory.snap @@ -102,22 +102,34 @@ description: Variables in memory after executing neg_xz_plane.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/out_of_band_sketches/ops.snap b/rust/kcl-lib/tests/out_of_band_sketches/ops.snap index e314bbd5d..748f99646 100644 --- a/rust/kcl-lib/tests/out_of_band_sketches/ops.snap +++ b/rust/kcl-lib/tests/out_of_band_sketches/ops.snap @@ -5,7 +5,7 @@ description: Operations executed out_of_band_sketches.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XZ" @@ -20,7 +20,7 @@ description: Operations executed out_of_band_sketches.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/out_of_band_sketches/program_memory.snap b/rust/kcl-lib/tests/out_of_band_sketches/program_memory.snap index 7bfaf0e6c..b63b95ffb 100644 --- a/rust/kcl-lib/tests/out_of_band_sketches/program_memory.snap +++ b/rust/kcl-lib/tests/out_of_band_sketches/program_memory.snap @@ -56,22 +56,34 @@ description: Variables in memory after executing out_of_band_sketches.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -193,22 +205,34 @@ description: Variables in memory after executing out_of_band_sketches.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -292,22 +316,34 @@ description: Variables in memory after executing out_of_band_sketches.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -429,22 +465,34 @@ description: Variables in memory after executing out_of_band_sketches.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -484,22 +532,34 @@ description: Variables in memory after executing out_of_band_sketches.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -515,22 +575,34 @@ description: Variables in memory after executing out_of_band_sketches.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/parametric/ops.snap b/rust/kcl-lib/tests/parametric/ops.snap index 291df6e66..ff5e3ed62 100644 --- a/rust/kcl-lib/tests/parametric/ops.snap +++ b/rust/kcl-lib/tests/parametric/ops.snap @@ -5,7 +5,7 @@ description: Operations executed parametric.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/parametric/program_memory.snap b/rust/kcl-lib/tests/parametric/program_memory.snap index 21086085b..3eeeb6f62 100644 --- a/rust/kcl-lib/tests/parametric/program_memory.snap +++ b/rust/kcl-lib/tests/parametric/program_memory.snap @@ -193,22 +193,34 @@ description: Variables in memory after executing parametric.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -315,7 +327,13 @@ description: Variables in memory after executing parametric.kcl "type": "Number", "value": 0.1852, "ty": { - "type": "Unknown" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "width": { diff --git a/rust/kcl-lib/tests/parametric_with_tan_arc/ops.snap b/rust/kcl-lib/tests/parametric_with_tan_arc/ops.snap index 358477221..5be457cdf 100644 --- a/rust/kcl-lib/tests/parametric_with_tan_arc/ops.snap +++ b/rust/kcl-lib/tests/parametric_with_tan_arc/ops.snap @@ -5,7 +5,7 @@ description: Operations executed parametric_with_tan_arc.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/parametric_with_tan_arc/program_memory.snap b/rust/kcl-lib/tests/parametric_with_tan_arc/program_memory.snap index a014e87ba..2989ccc15 100644 --- a/rust/kcl-lib/tests/parametric_with_tan_arc/program_memory.snap +++ b/rust/kcl-lib/tests/parametric_with_tan_arc/program_memory.snap @@ -255,22 +255,34 @@ description: Variables in memory after executing parametric_with_tan_arc.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -325,7 +337,13 @@ description: Variables in memory after executing parametric_with_tan_arc.kcl "type": "Number", "value": 0.7236, "ty": { - "type": "Unknown" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "p": { @@ -371,7 +389,13 @@ description: Variables in memory after executing parametric_with_tan_arc.kcl "type": "Number", "value": 0.3618, "ty": { - "type": "Unknown" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "wallMountL": { diff --git a/rust/kcl-lib/tests/pattern_circular_in_module/ops.snap b/rust/kcl-lib/tests/pattern_circular_in_module/ops.snap index fe886e3d7..fbcb3fbc0 100644 --- a/rust/kcl-lib/tests/pattern_circular_in_module/ops.snap +++ b/rust/kcl-lib/tests/pattern_circular_in_module/ops.snap @@ -20,7 +20,7 @@ description: Operations executed pattern_circular_in_module.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/pattern_linear_in_module/ops.snap b/rust/kcl-lib/tests/pattern_linear_in_module/ops.snap index 8cb2fb9ea..3a3cc55aa 100644 --- a/rust/kcl-lib/tests/pattern_linear_in_module/ops.snap +++ b/rust/kcl-lib/tests/pattern_linear_in_module/ops.snap @@ -20,7 +20,7 @@ description: Operations executed pattern_linear_in_module.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/pentagon_fillet_sugar/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/pentagon_fillet_sugar/artifact_graph_flowchart.snap.md index d53ef1583..7f6041800 100644 --- a/rust/kcl-lib/tests/pentagon_fillet_sugar/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/pentagon_fillet_sugar/artifact_graph_flowchart.snap.md @@ -1,25 +1,25 @@ ```mermaid flowchart LR subgraph path2 [Path] - 2["Path
[163, 188, 0]"] - 3["Segment
[194, 248, 0]"] - 4["Segment
[254, 309, 0]"] - 5["Segment
[315, 370, 0]"] + 2["Path
[161, 186, 0]"] + 3["Segment
[192, 246, 0]"] + 4["Segment
[252, 307, 0]"] + 5["Segment
[313, 368, 0]"] end subgraph path18 [Path] - 18["Path
[469, 520, 0]"] - 19["Segment
[528, 550, 0]"] - 20["Segment
[558, 566, 0]"] + 18["Path
[474, 525, 0]"] + 19["Segment
[533, 555, 0]"] + 20["Segment
[563, 571, 0]"] 21[Solid2d] end subgraph path29 [Path] - 29["Path
[469, 520, 0]"] - 30["Segment
[528, 550, 0]"] - 31["Segment
[558, 566, 0]"] + 29["Path
[474, 525, 0]"] + 30["Segment
[533, 555, 0]"] + 31["Segment
[563, 571, 0]"] 32[Solid2d] end - 1["Plane
[138, 157, 0]"] - 6["Sweep Extrusion
[376, 408, 0]"] + 1["Plane
[138, 155, 0]"] + 6["Sweep Extrusion
[374, 406, 0]"] 7[Wall] 8[Wall] 9[Wall] @@ -31,22 +31,22 @@ flowchart LR 15["SweepEdge Adjacent"] 16["SweepEdge Opposite"] 17["SweepEdge Adjacent"] - 22["Sweep Extrusion
[609, 637, 0]"] + 22["Sweep Extrusion
[614, 642, 0]"] 23[Wall] 24["Cap End"] 25["SweepEdge Opposite"] 26["SweepEdge Adjacent"] - 27["EdgeCut Fillet
[643, 770, 0]"] - 28["EdgeCut Fillet
[643, 770, 0]"] - 33["Sweep Extrusion
[809, 837, 0]"] + 27["EdgeCut Fillet
[648, 775, 0]"] + 28["EdgeCut Fillet
[648, 775, 0]"] + 33["Sweep Extrusion
[814, 842, 0]"] 34[Wall] 35["Cap End"] 36["SweepEdge Opposite"] 37["SweepEdge Adjacent"] - 38["EdgeCut Fillet
[843, 970, 0]"] - 39["EdgeCut Fillet
[843, 970, 0]"] - 40["StartSketchOnFace
[439, 461, 0]"] - 41["StartSketchOnFace
[439, 461, 0]"] + 38["EdgeCut Fillet
[848, 975, 0]"] + 39["EdgeCut Fillet
[848, 975, 0]"] + 40["StartSketchOnFace
[437, 466, 0]"] + 41["StartSketchOnFace
[437, 466, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/pentagon_fillet_sugar/ast.snap b/rust/kcl-lib/tests/pentagon_fillet_sugar/ast.snap index 07606e57e..52b9b2a81 100644 --- a/rust/kcl-lib/tests/pentagon_fillet_sugar/ast.snap +++ b/rust/kcl-lib/tests/pentagon_fillet_sugar/ast.snap @@ -263,13 +263,20 @@ description: Result of parsing pentagon_fillet_sugar.kcl { "arguments": [ { + "abs_path": false, "commentStart": 0, "end": 0, - "raw": "'XY'", + "name": { + "commentStart": 0, + "end": 0, + "name": "XY", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Literal", - "type": "Literal", - "value": "XY" + "type": "Name", + "type": "Name" } ], "callee": { @@ -718,36 +725,30 @@ description: Result of parsing pentagon_fillet_sugar.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { - "commentStart": 0, - "end": 0, - "name": "p", - "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "arg": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "face", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -768,8 +769,24 @@ description: Result of parsing pentagon_fillet_sugar.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "p", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/pentagon_fillet_sugar/input.kcl b/rust/kcl-lib/tests/pentagon_fillet_sugar/input.kcl index a3569244c..9f3e304f6 100644 --- a/rust/kcl-lib/tests/pentagon_fillet_sugar/input.kcl +++ b/rust/kcl-lib/tests/pentagon_fillet_sugar/input.kcl @@ -8,7 +8,7 @@ circ = { } triangleLen = 500 -p = startSketchOn('XY') +p = startSketchOn(XY) |> startProfileAt([0, 0], %) |> angledLine(angle = 60, length = triangleLen, tag = $a) |> angledLine(angle = 180, length = triangleLen, tag = $b) @@ -16,7 +16,7 @@ p = startSketchOn('XY') |> extrude(length = triangleHeight) fn circl(x, face) { - return startSketchOn(p, face) + return startSketchOn(p, face = face) |> startProfileAt([x + radius, triangleHeight / 2], %) |> arc(circ, %, $arc_tag) |> close(%) diff --git a/rust/kcl-lib/tests/pentagon_fillet_sugar/ops.snap b/rust/kcl-lib/tests/pentagon_fillet_sugar/ops.snap index d9655fb89..3be272b64 100644 --- a/rust/kcl-lib/tests/pentagon_fillet_sugar/ops.snap +++ b/rust/kcl-lib/tests/pentagon_fillet_sugar/ops.snap @@ -5,10 +5,10 @@ description: Operations executed pentagon_fillet_sugar.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { - "type": "String", - "value": "XY" + "type": "Plane", + "artifact_id": "[uuid]" }, "sourceRange": [] } @@ -56,8 +56,8 @@ description: Operations executed pentagon_fillet_sugar.kcl "type": "FunctionCall", "name": "circl", "functionSourceRange": [ - 418, - 568, + 416, + 573, 0 ], "unlabeledArg": null, @@ -67,16 +67,7 @@ description: Operations executed pentagon_fillet_sugar.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "c", @@ -88,7 +79,15 @@ description: Operations executed pentagon_fillet_sugar.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "GroupEnd" @@ -180,8 +179,8 @@ description: Operations executed pentagon_fillet_sugar.kcl "type": "FunctionCall", "name": "circl", "functionSourceRange": [ - 418, - 568, + 416, + 573, 0 ], "unlabeledArg": null, @@ -191,16 +190,7 @@ description: Operations executed pentagon_fillet_sugar.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "a", @@ -212,7 +202,15 @@ description: Operations executed pentagon_fillet_sugar.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "type": "GroupEnd" diff --git a/rust/kcl-lib/tests/pentagon_fillet_sugar/program_memory.snap b/rust/kcl-lib/tests/pentagon_fillet_sugar/program_memory.snap index 09b35a5b4..658bffbf6 100644 --- a/rust/kcl-lib/tests/pentagon_fillet_sugar/program_memory.snap +++ b/rust/kcl-lib/tests/pentagon_fillet_sugar/program_memory.snap @@ -45,9 +45,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl ], "radius": 80.0, "tag": { - "commentStart": 541, - "end": 549, - "start": 541, + "commentStart": 546, + "end": 554, + "start": 546, "type": "TagDeclarator", "value": "arc_tag" }, @@ -88,17 +88,26 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -110,9 +119,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 245, - "end": 247, - "start": 245, + "commentStart": 243, + "end": 245, + "start": 243, "type": "TagDeclarator", "value": "a" }, @@ -123,9 +132,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 306, - "end": 308, - "start": 306, + "commentStart": 304, + "end": 306, + "start": 304, "type": "TagDeclarator", "value": "b" }, @@ -136,9 +145,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 367, - "end": 369, - "start": 367, + "commentStart": 365, + "end": 367, + "start": 365, "type": "TagDeclarator", "value": "c" }, @@ -159,9 +168,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl 0.0 ], "tag": { - "commentStart": 245, - "end": 247, - "start": 245, + "commentStart": 243, + "end": 245, + "start": 243, "type": "TagDeclarator", "value": "a" }, @@ -184,9 +193,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl 433.0127 ], "tag": { - "commentStart": 306, - "end": 308, - "start": 306, + "commentStart": 304, + "end": 306, + "start": 304, "type": "TagDeclarator", "value": "b" }, @@ -209,9 +218,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl 433.0127 ], "tag": { - "commentStart": 367, - "end": 369, - "start": 367, + "commentStart": 365, + "end": 367, + "start": 365, "type": "TagDeclarator", "value": "c" }, @@ -233,22 +242,34 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -356,9 +377,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl ], "radius": 80.0, "tag": { - "commentStart": 541, - "end": 549, - "start": 541, + "commentStart": 546, + "end": 554, + "start": 546, "type": "TagDeclarator", "value": "arc_tag" }, @@ -399,17 +420,26 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -421,9 +451,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 245, - "end": 247, - "start": 245, + "commentStart": 243, + "end": 245, + "start": 243, "type": "TagDeclarator", "value": "a" }, @@ -434,9 +464,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 306, - "end": 308, - "start": 306, + "commentStart": 304, + "end": 306, + "start": 304, "type": "TagDeclarator", "value": "b" }, @@ -447,9 +477,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 367, - "end": 369, - "start": 367, + "commentStart": 365, + "end": 367, + "start": 365, "type": "TagDeclarator", "value": "c" }, @@ -470,9 +500,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl 0.0 ], "tag": { - "commentStart": 245, - "end": 247, - "start": 245, + "commentStart": 243, + "end": 245, + "start": 243, "type": "TagDeclarator", "value": "a" }, @@ -495,9 +525,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl 433.0127 ], "tag": { - "commentStart": 306, - "end": 308, - "start": 306, + "commentStart": 304, + "end": 306, + "start": 304, "type": "TagDeclarator", "value": "b" }, @@ -520,9 +550,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl 433.0127 ], "tag": { - "commentStart": 367, - "end": 369, - "start": 367, + "commentStart": 365, + "end": 367, + "start": 365, "type": "TagDeclarator", "value": "c" }, @@ -544,22 +574,34 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -704,9 +746,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 245, - "end": 247, - "start": 245, + "commentStart": 243, + "end": 245, + "start": 243, "type": "TagDeclarator", "value": "a" }, @@ -717,9 +759,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 306, - "end": 308, - "start": 306, + "commentStart": 304, + "end": 306, + "start": 304, "type": "TagDeclarator", "value": "b" }, @@ -730,9 +772,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 367, - "end": 369, - "start": 367, + "commentStart": 365, + "end": 367, + "start": 365, "type": "TagDeclarator", "value": "c" }, @@ -753,9 +795,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl 0.0 ], "tag": { - "commentStart": 245, - "end": 247, - "start": 245, + "commentStart": 243, + "end": 245, + "start": 243, "type": "TagDeclarator", "value": "a" }, @@ -778,9 +820,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl 433.0127 ], "tag": { - "commentStart": 306, - "end": 308, - "start": 306, + "commentStart": 304, + "end": 306, + "start": 304, "type": "TagDeclarator", "value": "b" }, @@ -803,9 +845,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl 433.0127 ], "tag": { - "commentStart": 367, - "end": 369, - "start": 367, + "commentStart": 365, + "end": 367, + "start": 365, "type": "TagDeclarator", "value": "c" }, @@ -827,22 +869,34 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -906,9 +960,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 541, - "end": 549, - "start": 541, + "commentStart": 546, + "end": 554, + "start": 546, "type": "TagDeclarator", "value": "arc_tag" }, @@ -935,9 +989,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl ], "radius": 80.0, "tag": { - "commentStart": 541, - "end": 549, - "start": 541, + "commentStart": 546, + "end": 554, + "start": 546, "type": "TagDeclarator", "value": "arc_tag" }, @@ -978,17 +1032,26 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1000,9 +1063,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 245, - "end": 247, - "start": 245, + "commentStart": 243, + "end": 245, + "start": 243, "type": "TagDeclarator", "value": "a" }, @@ -1013,9 +1076,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 306, - "end": 308, - "start": 306, + "commentStart": 304, + "end": 306, + "start": 304, "type": "TagDeclarator", "value": "b" }, @@ -1026,9 +1089,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 367, - "end": 369, - "start": 367, + "commentStart": 365, + "end": 367, + "start": 365, "type": "TagDeclarator", "value": "c" }, @@ -1049,9 +1112,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl 0.0 ], "tag": { - "commentStart": 245, - "end": 247, - "start": 245, + "commentStart": 243, + "end": 245, + "start": 243, "type": "TagDeclarator", "value": "a" }, @@ -1074,9 +1137,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl 433.0127 ], "tag": { - "commentStart": 306, - "end": 308, - "start": 306, + "commentStart": 304, + "end": 306, + "start": 304, "type": "TagDeclarator", "value": "b" }, @@ -1099,9 +1162,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl 433.0127 ], "tag": { - "commentStart": 367, - "end": 369, - "start": 367, + "commentStart": 365, + "end": 367, + "start": 365, "type": "TagDeclarator", "value": "c" }, @@ -1123,22 +1186,34 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1230,14 +1305,36 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl { "type": "fillet", "id": "[uuid]", - "radius": 5.0, + "radius": { + "n": 5.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 5.0, + "radius": { + "n": 5.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -1259,9 +1356,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 541, - "end": 549, - "start": 541, + "commentStart": 546, + "end": 554, + "start": 546, "type": "TagDeclarator", "value": "arc_tag" }, @@ -1288,9 +1385,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl ], "radius": 80.0, "tag": { - "commentStart": 541, - "end": 549, - "start": 541, + "commentStart": 546, + "end": 554, + "start": 546, "type": "TagDeclarator", "value": "arc_tag" }, @@ -1331,17 +1428,26 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1353,9 +1459,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 245, - "end": 247, - "start": 245, + "commentStart": 243, + "end": 245, + "start": 243, "type": "TagDeclarator", "value": "a" }, @@ -1366,9 +1472,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 306, - "end": 308, - "start": 306, + "commentStart": 304, + "end": 306, + "start": 304, "type": "TagDeclarator", "value": "b" }, @@ -1379,9 +1485,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 367, - "end": 369, - "start": 367, + "commentStart": 365, + "end": 367, + "start": 365, "type": "TagDeclarator", "value": "c" }, @@ -1402,9 +1508,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl 0.0 ], "tag": { - "commentStart": 245, - "end": 247, - "start": 245, + "commentStart": 243, + "end": 245, + "start": 243, "type": "TagDeclarator", "value": "a" }, @@ -1427,9 +1533,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl 433.0127 ], "tag": { - "commentStart": 306, - "end": 308, - "start": 306, + "commentStart": 304, + "end": 306, + "start": 304, "type": "TagDeclarator", "value": "b" }, @@ -1452,9 +1558,9 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl 433.0127 ], "tag": { - "commentStart": 367, - "end": 369, - "start": 367, + "commentStart": 365, + "end": 367, + "start": 365, "type": "TagDeclarator", "value": "c" }, @@ -1476,22 +1582,34 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1583,14 +1701,36 @@ description: Variables in memory after executing pentagon_fillet_sugar.kcl { "type": "fillet", "id": "[uuid]", - "radius": 5.0, + "radius": { + "n": 5.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 5.0, + "radius": { + "n": 5.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } diff --git a/rust/kcl-lib/tests/pentagon_fillet_sugar/unparsed.snap b/rust/kcl-lib/tests/pentagon_fillet_sugar/unparsed.snap index dc1ff380d..d20d9a206 100644 --- a/rust/kcl-lib/tests/pentagon_fillet_sugar/unparsed.snap +++ b/rust/kcl-lib/tests/pentagon_fillet_sugar/unparsed.snap @@ -20,7 +20,7 @@ p = startSketchOn(XY) |> extrude(length = triangleHeight) fn circl(x, face) { - return startSketchOn(p, face) + return startSketchOn(p, face = face) |> startProfileAt([x + radius, triangleHeight / 2], %) |> arc(circ, %, $arc_tag) |> close(%) diff --git a/rust/kcl-lib/tests/pipe_as_arg/ops.snap b/rust/kcl-lib/tests/pipe_as_arg/ops.snap index abff22b8c..fe7aeadd2 100644 --- a/rust/kcl-lib/tests/pipe_as_arg/ops.snap +++ b/rust/kcl-lib/tests/pipe_as_arg/ops.snap @@ -38,7 +38,7 @@ description: Operations executed pipe_as_arg.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/pipe_as_arg/program_memory.snap b/rust/kcl-lib/tests/pipe_as_arg/program_memory.snap index ad063dc3a..43a3ebba9 100644 --- a/rust/kcl-lib/tests/pipe_as_arg/program_memory.snap +++ b/rust/kcl-lib/tests/pipe_as_arg/program_memory.snap @@ -153,22 +153,34 @@ description: Variables in memory after executing pipe_as_arg.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/poop_chute/ops.snap b/rust/kcl-lib/tests/poop_chute/ops.snap index 71ba40277..e85084311 100644 --- a/rust/kcl-lib/tests/poop_chute/ops.snap +++ b/rust/kcl-lib/tests/poop_chute/ops.snap @@ -5,7 +5,7 @@ description: Operations executed poop_chute.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -127,7 +127,7 @@ description: Operations executed poop_chute.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/poop_chute/program_memory.snap b/rust/kcl-lib/tests/poop_chute/program_memory.snap index 7d3ac0c42..1628af01f 100644 --- a/rust/kcl-lib/tests/poop_chute/program_memory.snap +++ b/rust/kcl-lib/tests/poop_chute/program_memory.snap @@ -491,22 +491,34 @@ description: Variables in memory after executing poop_chute.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -828,22 +840,34 @@ description: Variables in memory after executing poop_chute.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1251,22 +1275,34 @@ description: Variables in memory after executing poop_chute.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": -1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/revolve_about_edge/ops.snap b/rust/kcl-lib/tests/revolve_about_edge/ops.snap index bbc004ccc..d764efd56 100644 --- a/rust/kcl-lib/tests/revolve_about_edge/ops.snap +++ b/rust/kcl-lib/tests/revolve_about_edge/ops.snap @@ -5,7 +5,7 @@ description: Operations executed revolve_about_edge.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" @@ -20,7 +20,7 @@ description: Operations executed revolve_about_edge.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/revolve_about_edge/program_memory.snap b/rust/kcl-lib/tests/revolve_about_edge/program_memory.snap index aa22243d0..2b18be91a 100644 --- a/rust/kcl-lib/tests/revolve_about_edge/program_memory.snap +++ b/rust/kcl-lib/tests/revolve_about_edge/program_memory.snap @@ -48,22 +48,34 @@ description: Variables in memory after executing revolve_about_edge.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -153,22 +165,34 @@ description: Variables in memory after executing revolve_about_edge.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/riddle_small/ops.snap b/rust/kcl-lib/tests/riddle_small/ops.snap index 0c34850a5..40301406d 100644 --- a/rust/kcl-lib/tests/riddle_small/ops.snap +++ b/rust/kcl-lib/tests/riddle_small/ops.snap @@ -41,7 +41,7 @@ description: Operations executed riddle_small.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XZ" diff --git a/rust/kcl-lib/tests/riddle_small/program_memory.snap b/rust/kcl-lib/tests/riddle_small/program_memory.snap index 51506fb1e..b32fcb564 100644 --- a/rust/kcl-lib/tests/riddle_small/program_memory.snap +++ b/rust/kcl-lib/tests/riddle_small/program_memory.snap @@ -20,16 +20,26 @@ description: Variables in memory after executing riddle_small.kcl "type": "Number", "value": -26.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "oy": { "type": "Number", "value": 34.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "r": { @@ -157,22 +167,34 @@ description: Variables in memory after executing riddle_small.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/rotate_after_fillet/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/rotate_after_fillet/artifact_graph_flowchart.snap.md index d3f417d5b..e4b679728 100644 --- a/rust/kcl-lib/tests/rotate_after_fillet/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/rotate_after_fillet/artifact_graph_flowchart.snap.md @@ -1,35 +1,35 @@ ```mermaid flowchart LR subgraph path2 [Path] - 2["Path
[347, 417, 0]"] - 3["Segment
[347, 417, 0]"] + 2["Path
[345, 415, 0]"] + 3["Segment
[345, 415, 0]"] 4[Solid2d] end subgraph path13 [Path] - 13["Path
[655, 742, 0]"] - 14["Segment
[750, 829, 0]"] - 15["Segment
[837, 916, 0]"] - 16["Segment
[924, 1003, 0]"] - 17["Segment
[1011, 1089, 0]"] - 18["Segment
[1097, 1175, 0]"] - 19["Segment
[1183, 1190, 0]"] + 13["Path
[660, 747, 0]"] + 14["Segment
[755, 834, 0]"] + 15["Segment
[842, 921, 0]"] + 16["Segment
[929, 1008, 0]"] + 17["Segment
[1016, 1094, 0]"] + 18["Segment
[1102, 1180, 0]"] + 19["Segment
[1188, 1195, 0]"] 20[Solid2d] end subgraph path41 [Path] - 41["Path
[1291, 1360, 0]"] - 42["Segment
[1291, 1360, 0]"] + 41["Path
[1303, 1372, 0]"] + 42["Segment
[1303, 1372, 0]"] 43[Solid2d] end - 1["Plane
[320, 339, 0]"] - 5["Sweep Extrusion
[425, 458, 0]"] + 1["Plane
[320, 337, 0]"] + 5["Sweep Extrusion
[423, 456, 0]"] 6[Wall] 7["Cap Start"] 8["Cap End"] 9["SweepEdge Opposite"] 10["SweepEdge Adjacent"] - 11["EdgeCut Fillet
[466, 532, 0]"] - 12["EdgeCut Fillet
[466, 532, 0]"] - 21["Sweep Extrusion
[1198, 1238, 0]"] + 11["EdgeCut Fillet
[464, 530, 0]"] + 12["EdgeCut Fillet
[464, 530, 0]"] + 21["Sweep Extrusion
[1203, 1243, 0]"] 22[Wall] 23[Wall] 24[Wall] @@ -49,14 +49,14 @@ flowchart LR 38["SweepEdge Adjacent"] 39["SweepEdge Opposite"] 40["SweepEdge Adjacent"] - 44["Sweep Extrusion
[1368, 1396, 0]"] + 44["Sweep Extrusion
[1380, 1408, 0]"] 45[Wall] 46["Cap End"] 47["SweepEdge Opposite"] 48["SweepEdge Adjacent"] - 49["EdgeCut Fillet
[1404, 1463, 0]"] - 50["StartSketchOnFace
[615, 647, 0]"] - 51["StartSketchOnFace
[1253, 1283, 0]"] + 49["EdgeCut Fillet
[1416, 1475, 0]"] + 50["StartSketchOnFace
[613, 652, 0]"] + 51["StartSketchOnFace
[1258, 1295, 0]"] 1 --- 2 2 --- 3 2 ---- 5 diff --git a/rust/kcl-lib/tests/rotate_after_fillet/ast.snap b/rust/kcl-lib/tests/rotate_after_fillet/ast.snap index 9eb865837..359cb9cd2 100644 --- a/rust/kcl-lib/tests/rotate_after_fillet/ast.snap +++ b/rust/kcl-lib/tests/rotate_after_fillet/ast.snap @@ -391,13 +391,20 @@ description: Result of parsing rotate_after_fillet.kcl { "arguments": [ { + "abs_path": false, "commentStart": 0, "end": 0, - "raw": "'XZ'", + "name": { + "commentStart": 0, + "end": 0, + "name": "XZ", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Literal", - "type": "Literal", - "value": "XZ" + "type": "Name", + "type": "Name" } ], "callee": { @@ -788,29 +795,23 @@ description: Result of parsing rotate_after_fillet.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "boltHead", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'start'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "start" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'start'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "start" + } } ], "callee": { @@ -831,8 +832,24 @@ description: Result of parsing rotate_after_fillet.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "boltHead", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -1446,29 +1463,23 @@ description: Result of parsing rotate_after_fillet.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "boltHead", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'end'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "end" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'end'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "end" + } } ], "callee": { @@ -1489,8 +1500,24 @@ description: Result of parsing rotate_after_fillet.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "boltHead", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/rotate_after_fillet/input.kcl b/rust/kcl-lib/tests/rotate_after_fillet/input.kcl index 3837fe5fd..a9e3e3a76 100644 --- a/rust/kcl-lib/tests/rotate_after_fillet/input.kcl +++ b/rust/kcl-lib/tests/rotate_after_fillet/input.kcl @@ -8,13 +8,13 @@ export boltThreadLength = 1.75 export fn bolt() { // Create the head of the cap screw - boltHead = startSketchOn('XZ') + boltHead = startSketchOn(XZ) |> circle(center = [0, 0], radius = boltHeadDiameter / 2, tag = $topEdge) |> extrude(length = -boltHeadLength) |> fillet(radius = 0.020, tags = [topEdge, getOppositeEdge(topEdge)]) // Define the sketch of the hex pattern on the screw head - hexPatternSketch = startSketchOn(boltHead, 'start') + hexPatternSketch = startSketchOn(boltHead, face = 'start') |> startProfileAt([ boltHexDrive / 2, boltHexFlatLength / 2 @@ -42,7 +42,7 @@ export fn bolt() { |> close() |> extrude(length = -boltHeadLength * 0.75) - boltBody = startSketchOn(boltHead, 'end') + boltBody = startSketchOn(boltHead, face = 'end') |> circle(center = [0, 0], radius = boltDiameter / 2, tag = $filletEdge) |> extrude(length = boltLength) |> fillet(radius = .020, tags = [getOppositeEdge(filletEdge)]) diff --git a/rust/kcl-lib/tests/rotate_after_fillet/ops.snap b/rust/kcl-lib/tests/rotate_after_fillet/ops.snap index 27ad6f376..cea782a16 100644 --- a/rust/kcl-lib/tests/rotate_after_fillet/ops.snap +++ b/rust/kcl-lib/tests/rotate_after_fillet/ops.snap @@ -28,7 +28,7 @@ description: Operations executed rotate_after_fillet.kcl "name": "bolt", "functionSourceRange": [ 264, - 1553, + 1565, 0 ], "unlabeledArg": null, @@ -38,10 +38,10 @@ description: Operations executed rotate_after_fillet.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { - "type": "String", - "value": "XZ" + "type": "Plane", + "artifact_id": "[uuid]" }, "sourceRange": [] } @@ -134,16 +134,7 @@ description: Operations executed rotate_after_fillet.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -154,7 +145,15 @@ description: Operations executed rotate_after_fillet.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -190,16 +189,7 @@ description: Operations executed rotate_after_fillet.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -210,7 +200,15 @@ description: Operations executed rotate_after_fillet.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/rotate_after_fillet/program_memory.snap b/rust/kcl-lib/tests/rotate_after_fillet/program_memory.snap index 8f1922dc3..8176dc7b8 100644 --- a/rust/kcl-lib/tests/rotate_after_fillet/program_memory.snap +++ b/rust/kcl-lib/tests/rotate_after_fillet/program_memory.snap @@ -49,16 +49,26 @@ description: Variables in memory after executing rotate_after_fillet.kcl "type": "Number", "value": 0.5, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "boltHexFlatLength": { "type": "Number", "value": 0.2887, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "boltLength": { diff --git a/rust/kcl-lib/tests/rotate_after_fillet/unparsed.snap b/rust/kcl-lib/tests/rotate_after_fillet/unparsed.snap index 06d1e3657..d052cdd94 100644 --- a/rust/kcl-lib/tests/rotate_after_fillet/unparsed.snap +++ b/rust/kcl-lib/tests/rotate_after_fillet/unparsed.snap @@ -18,7 +18,7 @@ export fn bolt() { |> fillet(radius = 0.020, tags = [topEdge, getOppositeEdge(topEdge)]) // Define the sketch of the hex pattern on the screw head - hexPatternSketch = startSketchOn(boltHead, 'start') + hexPatternSketch = startSketchOn(boltHead, face = 'start') |> startProfileAt([ boltHexDrive / 2, boltHexFlatLength / 2 @@ -31,7 +31,7 @@ export fn bolt() { |> close() |> extrude(length = -boltHeadLength * 0.75) - boltBody = startSketchOn(boltHead, 'end') + boltBody = startSketchOn(boltHead, face = 'end') |> circle(center = [0, 0], radius = boltDiameter / 2, tag = $filletEdge) |> extrude(length = boltLength) |> fillet(radius = .020, tags = [getOppositeEdge(filletEdge)]) diff --git a/rust/kcl-lib/tests/scale_after_fillet/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/scale_after_fillet/artifact_graph_flowchart.snap.md index d3f417d5b..e4b679728 100644 --- a/rust/kcl-lib/tests/scale_after_fillet/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/scale_after_fillet/artifact_graph_flowchart.snap.md @@ -1,35 +1,35 @@ ```mermaid flowchart LR subgraph path2 [Path] - 2["Path
[347, 417, 0]"] - 3["Segment
[347, 417, 0]"] + 2["Path
[345, 415, 0]"] + 3["Segment
[345, 415, 0]"] 4[Solid2d] end subgraph path13 [Path] - 13["Path
[655, 742, 0]"] - 14["Segment
[750, 829, 0]"] - 15["Segment
[837, 916, 0]"] - 16["Segment
[924, 1003, 0]"] - 17["Segment
[1011, 1089, 0]"] - 18["Segment
[1097, 1175, 0]"] - 19["Segment
[1183, 1190, 0]"] + 13["Path
[660, 747, 0]"] + 14["Segment
[755, 834, 0]"] + 15["Segment
[842, 921, 0]"] + 16["Segment
[929, 1008, 0]"] + 17["Segment
[1016, 1094, 0]"] + 18["Segment
[1102, 1180, 0]"] + 19["Segment
[1188, 1195, 0]"] 20[Solid2d] end subgraph path41 [Path] - 41["Path
[1291, 1360, 0]"] - 42["Segment
[1291, 1360, 0]"] + 41["Path
[1303, 1372, 0]"] + 42["Segment
[1303, 1372, 0]"] 43[Solid2d] end - 1["Plane
[320, 339, 0]"] - 5["Sweep Extrusion
[425, 458, 0]"] + 1["Plane
[320, 337, 0]"] + 5["Sweep Extrusion
[423, 456, 0]"] 6[Wall] 7["Cap Start"] 8["Cap End"] 9["SweepEdge Opposite"] 10["SweepEdge Adjacent"] - 11["EdgeCut Fillet
[466, 532, 0]"] - 12["EdgeCut Fillet
[466, 532, 0]"] - 21["Sweep Extrusion
[1198, 1238, 0]"] + 11["EdgeCut Fillet
[464, 530, 0]"] + 12["EdgeCut Fillet
[464, 530, 0]"] + 21["Sweep Extrusion
[1203, 1243, 0]"] 22[Wall] 23[Wall] 24[Wall] @@ -49,14 +49,14 @@ flowchart LR 38["SweepEdge Adjacent"] 39["SweepEdge Opposite"] 40["SweepEdge Adjacent"] - 44["Sweep Extrusion
[1368, 1396, 0]"] + 44["Sweep Extrusion
[1380, 1408, 0]"] 45[Wall] 46["Cap End"] 47["SweepEdge Opposite"] 48["SweepEdge Adjacent"] - 49["EdgeCut Fillet
[1404, 1463, 0]"] - 50["StartSketchOnFace
[615, 647, 0]"] - 51["StartSketchOnFace
[1253, 1283, 0]"] + 49["EdgeCut Fillet
[1416, 1475, 0]"] + 50["StartSketchOnFace
[613, 652, 0]"] + 51["StartSketchOnFace
[1258, 1295, 0]"] 1 --- 2 2 --- 3 2 ---- 5 diff --git a/rust/kcl-lib/tests/scale_after_fillet/ast.snap b/rust/kcl-lib/tests/scale_after_fillet/ast.snap index 3d4b1c5bd..aeb7091fa 100644 --- a/rust/kcl-lib/tests/scale_after_fillet/ast.snap +++ b/rust/kcl-lib/tests/scale_after_fillet/ast.snap @@ -391,13 +391,20 @@ description: Result of parsing scale_after_fillet.kcl { "arguments": [ { + "abs_path": false, "commentStart": 0, "end": 0, - "raw": "'XZ'", + "name": { + "commentStart": 0, + "end": 0, + "name": "XZ", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Literal", - "type": "Literal", - "value": "XZ" + "type": "Name", + "type": "Name" } ], "callee": { @@ -788,29 +795,23 @@ description: Result of parsing scale_after_fillet.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "boltHead", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'start'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "start" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'start'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "start" + } } ], "callee": { @@ -831,8 +832,24 @@ description: Result of parsing scale_after_fillet.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "boltHead", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -1446,29 +1463,23 @@ description: Result of parsing scale_after_fillet.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "boltHead", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'end'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "end" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'end'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "end" + } } ], "callee": { @@ -1489,8 +1500,24 @@ description: Result of parsing scale_after_fillet.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "boltHead", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/scale_after_fillet/input.kcl b/rust/kcl-lib/tests/scale_after_fillet/input.kcl index acff71862..ba0ab767a 100644 --- a/rust/kcl-lib/tests/scale_after_fillet/input.kcl +++ b/rust/kcl-lib/tests/scale_after_fillet/input.kcl @@ -8,13 +8,13 @@ export boltThreadLength = 1.75 export fn bolt() { // Create the head of the cap screw - boltHead = startSketchOn('XZ') + boltHead = startSketchOn(XZ) |> circle(center = [0, 0], radius = boltHeadDiameter / 2, tag = $topEdge) |> extrude(length = -boltHeadLength) |> fillet(radius = 0.020, tags = [topEdge, getOppositeEdge(topEdge)]) // Define the sketch of the hex pattern on the screw head - hexPatternSketch = startSketchOn(boltHead, 'start') + hexPatternSketch = startSketchOn(boltHead, face = 'start') |> startProfileAt([ boltHexDrive / 2, boltHexFlatLength / 2 @@ -42,7 +42,7 @@ export fn bolt() { |> close() |> extrude(length = -boltHeadLength * 0.75) - boltBody = startSketchOn(boltHead, 'end') + boltBody = startSketchOn(boltHead, face = 'end') |> circle(center = [0, 0], radius = boltDiameter / 2, tag = $filletEdge) |> extrude(length = boltLength) |> fillet(radius = .020, tags = [getOppositeEdge(filletEdge)]) diff --git a/rust/kcl-lib/tests/scale_after_fillet/ops.snap b/rust/kcl-lib/tests/scale_after_fillet/ops.snap index 93ee5ee23..07f2c1b46 100644 --- a/rust/kcl-lib/tests/scale_after_fillet/ops.snap +++ b/rust/kcl-lib/tests/scale_after_fillet/ops.snap @@ -28,7 +28,7 @@ description: Operations executed scale_after_fillet.kcl "name": "bolt", "functionSourceRange": [ 264, - 1553, + 1565, 0 ], "unlabeledArg": null, @@ -38,10 +38,10 @@ description: Operations executed scale_after_fillet.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { - "type": "String", - "value": "XZ" + "type": "Plane", + "artifact_id": "[uuid]" }, "sourceRange": [] } @@ -134,16 +134,7 @@ description: Operations executed scale_after_fillet.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -154,7 +145,15 @@ description: Operations executed scale_after_fillet.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -190,16 +189,7 @@ description: Operations executed scale_after_fillet.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -210,7 +200,15 @@ description: Operations executed scale_after_fillet.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/scale_after_fillet/program_memory.snap b/rust/kcl-lib/tests/scale_after_fillet/program_memory.snap index cad8fc41e..faefbe5f1 100644 --- a/rust/kcl-lib/tests/scale_after_fillet/program_memory.snap +++ b/rust/kcl-lib/tests/scale_after_fillet/program_memory.snap @@ -49,16 +49,26 @@ description: Variables in memory after executing scale_after_fillet.kcl "type": "Number", "value": 0.5, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "boltHexFlatLength": { "type": "Number", "value": 0.2887, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "boltLength": { diff --git a/rust/kcl-lib/tests/scale_after_fillet/unparsed.snap b/rust/kcl-lib/tests/scale_after_fillet/unparsed.snap index 96f0bd8b7..8f1e765b2 100644 --- a/rust/kcl-lib/tests/scale_after_fillet/unparsed.snap +++ b/rust/kcl-lib/tests/scale_after_fillet/unparsed.snap @@ -18,7 +18,7 @@ export fn bolt() { |> fillet(radius = 0.020, tags = [topEdge, getOppositeEdge(topEdge)]) // Define the sketch of the hex pattern on the screw head - hexPatternSketch = startSketchOn(boltHead, 'start') + hexPatternSketch = startSketchOn(boltHead, face = 'start') |> startProfileAt([ boltHexDrive / 2, boltHexFlatLength / 2 @@ -31,7 +31,7 @@ export fn bolt() { |> close() |> extrude(length = -boltHeadLength * 0.75) - boltBody = startSketchOn(boltHead, 'end') + boltBody = startSketchOn(boltHead, face = 'end') |> circle(center = [0, 0], radius = boltDiameter / 2, tag = $filletEdge) |> extrude(length = boltLength) |> fillet(radius = .020, tags = [getOppositeEdge(filletEdge)]) diff --git a/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/artifact_graph_flowchart.snap.md index a41d04c40..baa3b210b 100644 --- a/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/artifact_graph_flowchart.snap.md @@ -1,34 +1,34 @@ ```mermaid flowchart LR subgraph path2 [Path] - 2["Path
[37, 69, 0]"] - 3["Segment
[105, 172, 0]"] - 4["Segment
[178, 262, 0]"] - 5["Segment
[268, 356, 0]"] - 6["Segment
[362, 432, 0]"] - 7["Segment
[438, 445, 0]"] + 2["Path
[35, 67, 0]"] + 3["Segment
[103, 170, 0]"] + 4["Segment
[176, 260, 0]"] + 5["Segment
[266, 354, 0]"] + 6["Segment
[360, 430, 0]"] + 7["Segment
[436, 443, 0]"] 8[Solid2d] end subgraph path27 [Path] - 27["Path
[713, 747, 0]"] - 28["Segment
[753, 819, 0]"] - 29["Segment
[825, 923, 0]"] - 30["Segment
[929, 1046, 0]"] - 31["Segment
[1052, 1108, 0]"] - 32["Segment
[1114, 1121, 0]"] + 27["Path
[718, 752, 0]"] + 28["Segment
[758, 824, 0]"] + 29["Segment
[830, 928, 0]"] + 30["Segment
[934, 1051, 0]"] + 31["Segment
[1057, 1113, 0]"] + 32["Segment
[1119, 1126, 0]"] 33[Solid2d] end subgraph path34 [Path] - 34["Path
[1172, 1207, 0]"] - 35["Segment
[1213, 1279, 0]"] - 36["Segment
[1285, 1384, 0]"] - 37["Segment
[1390, 1507, 0]"] - 38["Segment
[1513, 1569, 0]"] - 39["Segment
[1575, 1582, 0]"] + 34["Path
[1184, 1219, 0]"] + 35["Segment
[1225, 1291, 0]"] + 36["Segment
[1297, 1396, 0]"] + 37["Segment
[1402, 1519, 0]"] + 38["Segment
[1525, 1581, 0]"] + 39["Segment
[1587, 1594, 0]"] 40[Solid2d] end - 1["Plane
[12, 31, 0]"] - 9["Sweep Extrusion
[459, 491, 0]"] + 1["Plane
[12, 29, 0]"] + 9["Sweep Extrusion
[457, 489, 0]"] 10[Wall] 11[Wall] 12[Wall] @@ -43,10 +43,10 @@ flowchart LR 21["SweepEdge Adjacent"] 22["SweepEdge Opposite"] 23["SweepEdge Adjacent"] - 24["EdgeCut Fillet
[497, 532, 0]"] - 25["Plane
[1172, 1207, 0]"] - 26["Plane
[713, 747, 0]"] - 41["Sweep Extrusion
[1596, 1627, 0]"] + 24["EdgeCut Fillet
[495, 530, 0]"] + 25["Plane
[1184, 1219, 0]"] + 26["Plane
[718, 752, 0]"] + 41["Sweep Extrusion
[1608, 1639, 0]"] 42[Wall] 43[Wall] 44[Wall] @@ -60,8 +60,8 @@ flowchart LR 52["SweepEdge Adjacent"] 53["SweepEdge Opposite"] 54["SweepEdge Adjacent"] - 55["StartSketchOnFace
[675, 707, 0]"] - 56["StartSketchOnFace
[1134, 1166, 0]"] + 55["StartSketchOnFace
[673, 712, 0]"] + 56["StartSketchOnFace
[1139, 1178, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/ast.snap b/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/ast.snap index 4191b581c..a9d4c56bd 100644 --- a/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/ast.snap +++ b/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/ast.snap @@ -22,13 +22,20 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl { "arguments": [ { + "abs_path": false, "commentStart": 0, "end": 0, - "raw": "'XZ'", + "name": { + "commentStart": 0, + "end": 0, + "name": "XZ", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Literal", - "type": "Literal", - "value": "XZ" + "type": "Name", + "type": "Name" } ], "callee": { @@ -1067,36 +1074,30 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg04", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg04", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -1117,8 +1118,24 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -1727,36 +1744,30 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg03", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg03", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -1777,8 +1788,24 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/input.kcl b/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/input.kcl index 12a1da4ce..e0f64e0f9 100644 --- a/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/input.kcl +++ b/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/input.kcl @@ -1,4 +1,4 @@ -sketch001 = startSketchOn('XZ') +sketch001 = startSketchOn(XZ) |> startProfileAt([75.8, 317.2], %) // [$startCapTag, $EndCapTag] |> angledLine(angle = 0, length = 268.43, tag = $rectangleSegmentA001) |> angledLine(angle = segAng(rectangleSegmentA001) - 90, length = 217.26, tag = $seg01) @@ -10,14 +10,14 @@ extrude001 = extrude(sketch001, length = 100) |> chamfer(length = 50, tags = [getOppositeEdge(seg01)], tag = $seg03) |> chamfer(length = 50, tags = [seg02], tag = $seg04) -sketch003 = startSketchOn(extrude001, seg04) +sketch003 = startSketchOn(extrude001, face = seg04) |> startProfileAt([-69.1, 277.34], %) |> angledLine(angle = 0, length = 41.48, tag = $rectangleSegmentA003) |> angledLine(angle = segAng(rectangleSegmentA003) - 90, length = 104.8, tag = $rectangleSegmentB002) |> angledLine(angle = segAng(rectangleSegmentA003), length = -segLen(rectangleSegmentA003), tag = $rectangleSegmentC002) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() -sketch002 = startSketchOn(extrude001, seg03) +sketch002 = startSketchOn(extrude001, face = seg03) |> startProfileAt([159.25, 278.35], %) |> angledLine(angle = 0, length = 40.82, tag = $rectangleSegmentA002) |> angledLine(angle = segAng(rectangleSegmentA002) - 90, length = 132.27, tag = $rectangleSegmentB001) diff --git a/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/ops.snap b/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/ops.snap index 68ada9588..84abe0c9d 100644 --- a/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/ops.snap +++ b/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/ops.snap @@ -5,10 +5,10 @@ description: Operations executed sketch-on-chamfer-two-times-different-order.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { - "type": "String", - "value": "XZ" + "type": "Plane", + "artifact_id": "[uuid]" }, "sourceRange": [] } @@ -200,16 +200,7 @@ description: Operations executed sketch-on-chamfer-two-times-different-order.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg04", @@ -221,20 +212,19 @@ description: Operations executed sketch-on-chamfer-two-times-different-order.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg03", @@ -246,7 +236,15 @@ description: Operations executed sketch-on-chamfer-two-times-different-order.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/program_memory.snap b/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/program_memory.snap index ea7423441..497929215 100644 --- a/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/program_memory.snap +++ b/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/program_memory.snap @@ -15,9 +15,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 150, - "end": 171, - "start": 150, + "commentStart": 148, + "end": 169, + "start": 148, "type": "TagDeclarator", "value": "rectangleSegmentA001" }, @@ -28,9 +28,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 255, - "end": 261, - "start": 255, + "commentStart": 253, + "end": 259, + "start": 253, "type": "TagDeclarator", "value": "seg01" }, @@ -48,9 +48,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 425, - "end": 431, - "start": 425, + "commentStart": 423, + "end": 429, + "start": 423, "type": "TagDeclarator", "value": "seg02" }, @@ -61,9 +61,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 598, - "end": 604, - "start": 598, + "commentStart": 596, + "end": 602, + "start": 596, "type": "TagDeclarator", "value": "seg03" }, @@ -74,9 +74,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 654, - "end": 660, - "start": 654, + "commentStart": 652, + "end": 658, + "start": 652, "type": "TagDeclarator", "value": "seg04" }, @@ -97,9 +97,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 317.2 ], "tag": { - "commentStart": 150, - "end": 171, - "start": 150, + "commentStart": 148, + "end": 169, + "start": 148, "type": "TagDeclarator", "value": "rectangleSegmentA001" }, @@ -122,9 +122,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 317.2 ], "tag": { - "commentStart": 255, - "end": 261, - "start": 255, + "commentStart": 253, + "end": 259, + "start": 253, "type": "TagDeclarator", "value": "seg01" }, @@ -166,9 +166,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 99.94 ], "tag": { - "commentStart": 425, - "end": 431, - "start": 425, + "commentStart": 423, + "end": 429, + "start": 423, "type": "TagDeclarator", "value": "seg02" }, @@ -209,22 +209,34 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -283,19 +295,41 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif { "type": "fillet", "id": "[uuid]", - "radius": 20.0, + "radius": { + "n": 20.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "chamfer", "id": "[uuid]", - "length": 50.0, + "length": { + "n": 50.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": { - "commentStart": 598, - "end": 604, - "start": 598, + "commentStart": 596, + "end": 602, + "start": 596, "type": "TagDeclarator", "value": "seg03" } @@ -303,12 +337,23 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif { "type": "chamfer", "id": "[uuid]", - "length": 50.0, + "length": { + "n": 50.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": { - "commentStart": 654, - "end": 660, - "start": 654, + "commentStart": 652, + "end": 658, + "start": 652, "type": "TagDeclarator", "value": "seg04" } @@ -331,9 +376,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1257, - "end": 1278, - "start": 1257, + "commentStart": 1269, + "end": 1290, + "start": 1269, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -344,9 +389,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1362, - "end": 1383, - "start": 1362, + "commentStart": 1374, + "end": 1395, + "start": 1374, "type": "TagDeclarator", "value": "rectangleSegmentB001" }, @@ -357,9 +402,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1485, - "end": 1506, - "start": 1485, + "commentStart": 1497, + "end": 1518, + "start": 1497, "type": "TagDeclarator", "value": "rectangleSegmentC001" }, @@ -387,9 +432,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 278.35 ], "tag": { - "commentStart": 1257, - "end": 1278, - "start": 1257, + "commentStart": 1269, + "end": 1290, + "start": 1269, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -412,9 +457,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 278.35 ], "tag": { - "commentStart": 1362, - "end": 1383, - "start": 1362, + "commentStart": 1374, + "end": 1395, + "start": 1374, "type": "TagDeclarator", "value": "rectangleSegmentB001" }, @@ -437,9 +482,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 146.08 ], "tag": { - "commentStart": 1485, - "end": 1506, - "start": 1485, + "commentStart": 1497, + "end": 1518, + "start": 1497, "type": "TagDeclarator", "value": "rectangleSegmentC001" }, @@ -499,17 +544,26 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -521,9 +575,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 150, - "end": 171, - "start": 150, + "commentStart": 148, + "end": 169, + "start": 148, "type": "TagDeclarator", "value": "rectangleSegmentA001" }, @@ -534,9 +588,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 255, - "end": 261, - "start": 255, + "commentStart": 253, + "end": 259, + "start": 253, "type": "TagDeclarator", "value": "seg01" }, @@ -554,9 +608,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 425, - "end": 431, - "start": 425, + "commentStart": 423, + "end": 429, + "start": 423, "type": "TagDeclarator", "value": "seg02" }, @@ -567,9 +621,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 598, - "end": 604, - "start": 598, + "commentStart": 596, + "end": 602, + "start": 596, "type": "TagDeclarator", "value": "seg03" }, @@ -580,9 +634,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 654, - "end": 660, - "start": 654, + "commentStart": 652, + "end": 658, + "start": 652, "type": "TagDeclarator", "value": "seg04" }, @@ -603,9 +657,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 317.2 ], "tag": { - "commentStart": 150, - "end": 171, - "start": 150, + "commentStart": 148, + "end": 169, + "start": 148, "type": "TagDeclarator", "value": "rectangleSegmentA001" }, @@ -628,9 +682,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 317.2 ], "tag": { - "commentStart": 255, - "end": 261, - "start": 255, + "commentStart": 253, + "end": 259, + "start": 253, "type": "TagDeclarator", "value": "seg01" }, @@ -672,9 +726,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 99.94 ], "tag": { - "commentStart": 425, - "end": 431, - "start": 425, + "commentStart": 423, + "end": 429, + "start": 423, "type": "TagDeclarator", "value": "seg02" }, @@ -715,22 +769,34 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -789,19 +855,41 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif { "type": "fillet", "id": "[uuid]", - "radius": 20.0, + "radius": { + "n": 20.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "chamfer", "id": "[uuid]", - "length": 50.0, + "length": { + "n": 50.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": { - "commentStart": 598, - "end": 604, - "start": 598, + "commentStart": 596, + "end": 602, + "start": 596, "type": "TagDeclarator", "value": "seg03" } @@ -809,12 +897,23 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif { "type": "chamfer", "id": "[uuid]", - "length": 50.0, + "length": { + "n": 50.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": { - "commentStart": 654, - "end": 660, - "start": 654, + "commentStart": 652, + "end": 658, + "start": 652, "type": "TagDeclarator", "value": "seg04" } @@ -945,9 +1044,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 317.2 ], "tag": { - "commentStart": 150, - "end": 171, - "start": 150, + "commentStart": 148, + "end": 169, + "start": 148, "type": "TagDeclarator", "value": "rectangleSegmentA001" }, @@ -970,9 +1069,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 317.2 ], "tag": { - "commentStart": 255, - "end": 261, - "start": 255, + "commentStart": 253, + "end": 259, + "start": 253, "type": "TagDeclarator", "value": "seg01" }, @@ -1014,9 +1113,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 99.94 ], "tag": { - "commentStart": 425, - "end": 431, - "start": 425, + "commentStart": 423, + "end": 429, + "start": 423, "type": "TagDeclarator", "value": "seg02" }, @@ -1057,22 +1156,34 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1141,9 +1252,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 278.35 ], "tag": { - "commentStart": 1257, - "end": 1278, - "start": 1257, + "commentStart": 1269, + "end": 1290, + "start": 1269, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -1166,9 +1277,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 278.35 ], "tag": { - "commentStart": 1362, - "end": 1383, - "start": 1362, + "commentStart": 1374, + "end": 1395, + "start": 1374, "type": "TagDeclarator", "value": "rectangleSegmentB001" }, @@ -1191,9 +1302,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 146.08 ], "tag": { - "commentStart": 1485, - "end": 1506, - "start": 1485, + "commentStart": 1497, + "end": 1518, + "start": 1497, "type": "TagDeclarator", "value": "rectangleSegmentC001" }, @@ -1253,17 +1364,26 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1275,9 +1395,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 150, - "end": 171, - "start": 150, + "commentStart": 148, + "end": 169, + "start": 148, "type": "TagDeclarator", "value": "rectangleSegmentA001" }, @@ -1288,9 +1408,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 255, - "end": 261, - "start": 255, + "commentStart": 253, + "end": 259, + "start": 253, "type": "TagDeclarator", "value": "seg01" }, @@ -1308,9 +1428,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 425, - "end": 431, - "start": 425, + "commentStart": 423, + "end": 429, + "start": 423, "type": "TagDeclarator", "value": "seg02" }, @@ -1321,9 +1441,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 598, - "end": 604, - "start": 598, + "commentStart": 596, + "end": 602, + "start": 596, "type": "TagDeclarator", "value": "seg03" }, @@ -1334,9 +1454,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 654, - "end": 660, - "start": 654, + "commentStart": 652, + "end": 658, + "start": 652, "type": "TagDeclarator", "value": "seg04" }, @@ -1357,9 +1477,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 317.2 ], "tag": { - "commentStart": 150, - "end": 171, - "start": 150, + "commentStart": 148, + "end": 169, + "start": 148, "type": "TagDeclarator", "value": "rectangleSegmentA001" }, @@ -1382,9 +1502,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 317.2 ], "tag": { - "commentStart": 255, - "end": 261, - "start": 255, + "commentStart": 253, + "end": 259, + "start": 253, "type": "TagDeclarator", "value": "seg01" }, @@ -1426,9 +1546,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 99.94 ], "tag": { - "commentStart": 425, - "end": 431, - "start": 425, + "commentStart": 423, + "end": 429, + "start": 423, "type": "TagDeclarator", "value": "seg02" }, @@ -1469,22 +1589,34 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1543,19 +1675,41 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif { "type": "fillet", "id": "[uuid]", - "radius": 20.0, + "radius": { + "n": 20.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "chamfer", "id": "[uuid]", - "length": 50.0, + "length": { + "n": 50.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": { - "commentStart": 598, - "end": 604, - "start": 598, + "commentStart": 596, + "end": 602, + "start": 596, "type": "TagDeclarator", "value": "seg03" } @@ -1563,12 +1717,23 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif { "type": "chamfer", "id": "[uuid]", - "length": 50.0, + "length": { + "n": 50.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": { - "commentStart": 654, - "end": 660, - "start": 654, + "commentStart": 652, + "end": 658, + "start": 652, "type": "TagDeclarator", "value": "seg04" } @@ -1637,9 +1802,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 277.34 ], "tag": { - "commentStart": 797, - "end": 818, - "start": 797, + "commentStart": 802, + "end": 823, + "start": 802, "type": "TagDeclarator", "value": "rectangleSegmentA003" }, @@ -1662,9 +1827,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 277.34 ], "tag": { - "commentStart": 901, - "end": 922, - "start": 901, + "commentStart": 906, + "end": 927, + "start": 906, "type": "TagDeclarator", "value": "rectangleSegmentB002" }, @@ -1687,9 +1852,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 172.54 ], "tag": { - "commentStart": 1024, - "end": 1045, - "start": 1024, + "commentStart": 1029, + "end": 1050, + "start": 1029, "type": "TagDeclarator", "value": "rectangleSegmentC002" }, @@ -1749,17 +1914,26 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1771,9 +1945,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 150, - "end": 171, - "start": 150, + "commentStart": 148, + "end": 169, + "start": 148, "type": "TagDeclarator", "value": "rectangleSegmentA001" }, @@ -1784,9 +1958,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 255, - "end": 261, - "start": 255, + "commentStart": 253, + "end": 259, + "start": 253, "type": "TagDeclarator", "value": "seg01" }, @@ -1804,9 +1978,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 425, - "end": 431, - "start": 425, + "commentStart": 423, + "end": 429, + "start": 423, "type": "TagDeclarator", "value": "seg02" }, @@ -1817,9 +1991,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 598, - "end": 604, - "start": 598, + "commentStart": 596, + "end": 602, + "start": 596, "type": "TagDeclarator", "value": "seg03" }, @@ -1830,9 +2004,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 654, - "end": 660, - "start": 654, + "commentStart": 652, + "end": 658, + "start": 652, "type": "TagDeclarator", "value": "seg04" }, @@ -1853,9 +2027,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 317.2 ], "tag": { - "commentStart": 150, - "end": 171, - "start": 150, + "commentStart": 148, + "end": 169, + "start": 148, "type": "TagDeclarator", "value": "rectangleSegmentA001" }, @@ -1878,9 +2052,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 317.2 ], "tag": { - "commentStart": 255, - "end": 261, - "start": 255, + "commentStart": 253, + "end": 259, + "start": 253, "type": "TagDeclarator", "value": "seg01" }, @@ -1922,9 +2096,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif 99.94 ], "tag": { - "commentStart": 425, - "end": 431, - "start": 425, + "commentStart": 423, + "end": 429, + "start": 423, "type": "TagDeclarator", "value": "seg02" }, @@ -1965,22 +2139,34 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2039,19 +2225,41 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif { "type": "fillet", "id": "[uuid]", - "radius": 20.0, + "radius": { + "n": 20.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "chamfer", "id": "[uuid]", - "length": 50.0, + "length": { + "n": 50.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": { - "commentStart": 598, - "end": 604, - "start": 598, + "commentStart": 596, + "end": 602, + "start": 596, "type": "TagDeclarator", "value": "seg03" } @@ -2059,12 +2267,23 @@ description: Variables in memory after executing sketch-on-chamfer-two-times-dif { "type": "chamfer", "id": "[uuid]", - "length": 50.0, + "length": { + "n": 50.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": { - "commentStart": 654, - "end": 660, - "start": 654, + "commentStart": 652, + "end": 658, + "start": 652, "type": "TagDeclarator", "value": "seg04" } diff --git a/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/unparsed.snap b/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/unparsed.snap index d501e66e2..c60ce4618 100644 --- a/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/unparsed.snap +++ b/rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/unparsed.snap @@ -14,14 +14,14 @@ extrude001 = extrude(sketch001, length = 100) |> chamfer(length = 50, tags = [getOppositeEdge(seg01)], tag = $seg03) |> chamfer(length = 50, tags = [seg02], tag = $seg04) -sketch003 = startSketchOn(extrude001, seg04) +sketch003 = startSketchOn(extrude001, face = seg04) |> startProfileAt([-69.1, 277.34], %) |> angledLine(angle = 0, length = 41.48, tag = $rectangleSegmentA003) |> angledLine(angle = segAng(rectangleSegmentA003) - 90, length = 104.8, tag = $rectangleSegmentB002) |> angledLine(angle = segAng(rectangleSegmentA003), length = -segLen(rectangleSegmentA003), tag = $rectangleSegmentC002) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() -sketch002 = startSketchOn(extrude001, seg03) +sketch002 = startSketchOn(extrude001, face = seg03) |> startProfileAt([159.25, 278.35], %) |> angledLine(angle = 0, length = 40.82, tag = $rectangleSegmentA002) |> angledLine(angle = segAng(rectangleSegmentA002) - 90, length = 132.27, tag = $rectangleSegmentB001) diff --git a/rust/kcl-lib/tests/sketch-on-chamfer-two-times/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/sketch-on-chamfer-two-times/artifact_graph_flowchart.snap.md index eca03264f..f3faf2140 100644 --- a/rust/kcl-lib/tests/sketch-on-chamfer-two-times/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/sketch-on-chamfer-two-times/artifact_graph_flowchart.snap.md @@ -10,21 +10,21 @@ flowchart LR 8[Solid2d] end subgraph path27 [Path] - 27["Path
[714, 748, 0]"] - 28["Segment
[754, 820, 0]"] - 29["Segment
[826, 924, 0]"] - 30["Segment
[930, 1047, 0]"] - 31["Segment
[1053, 1109, 0]"] - 32["Segment
[1115, 1123, 0]"] + 27["Path
[721, 755, 0]"] + 28["Segment
[761, 827, 0]"] + 29["Segment
[833, 931, 0]"] + 30["Segment
[937, 1054, 0]"] + 31["Segment
[1060, 1116, 0]"] + 32["Segment
[1122, 1130, 0]"] 33[Solid2d] end subgraph path34 [Path] - 34["Path
[1174, 1209, 0]"] - 35["Segment
[1215, 1281, 0]"] - 36["Segment
[1287, 1386, 0]"] - 37["Segment
[1392, 1509, 0]"] - 38["Segment
[1515, 1571, 0]"] - 39["Segment
[1577, 1585, 0]"] + 34["Path
[1188, 1223, 0]"] + 35["Segment
[1229, 1295, 0]"] + 36["Segment
[1301, 1400, 0]"] + 37["Segment
[1406, 1523, 0]"] + 38["Segment
[1529, 1585, 0]"] + 39["Segment
[1591, 1599, 0]"] 40[Solid2d] end 1["Plane
[12, 31, 0]"] @@ -44,9 +44,9 @@ flowchart LR 22["SweepEdge Opposite"] 23["SweepEdge Adjacent"] 24["EdgeCut Fillet
[498, 533, 0]"] - 25["Plane
[714, 748, 0]"] - 26["Plane
[1174, 1209, 0]"] - 41["Sweep Extrusion
[1599, 1630, 0]"] + 25["Plane
[721, 755, 0]"] + 26["Plane
[1188, 1223, 0]"] + 41["Sweep Extrusion
[1613, 1644, 0]"] 42[Wall] 43[Wall] 44[Wall] @@ -60,8 +60,8 @@ flowchart LR 52["SweepEdge Adjacent"] 53["SweepEdge Opposite"] 54["SweepEdge Adjacent"] - 55["StartSketchOnFace
[676, 708, 0]"] - 56["StartSketchOnFace
[1136, 1168, 0]"] + 55["StartSketchOnFace
[676, 715, 0]"] + 56["StartSketchOnFace
[1143, 1182, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/sketch-on-chamfer-two-times/ast.snap b/rust/kcl-lib/tests/sketch-on-chamfer-two-times/ast.snap index 2ed41e474..900918343 100644 --- a/rust/kcl-lib/tests/sketch-on-chamfer-two-times/ast.snap +++ b/rust/kcl-lib/tests/sketch-on-chamfer-two-times/ast.snap @@ -1075,36 +1075,30 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg04", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg04", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -1125,8 +1119,24 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -1743,36 +1753,30 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg03", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg03", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -1793,8 +1797,24 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/sketch-on-chamfer-two-times/input.kcl b/rust/kcl-lib/tests/sketch-on-chamfer-two-times/input.kcl index e200218b8..edd8f56b3 100644 --- a/rust/kcl-lib/tests/sketch-on-chamfer-two-times/input.kcl +++ b/rust/kcl-lib/tests/sketch-on-chamfer-two-times/input.kcl @@ -10,14 +10,14 @@ extrude001 = extrude(sketch001, length = 100) |> chamfer(length = 50, tags = [seg02], tag = $seg04) |> chamfer(length = 50, tags = [getOppositeEdge(seg01)], tag = $seg03) -sketch003 = startSketchOn(extrude001, seg04) +sketch003 = startSketchOn(extrude001, face = seg04) |> startProfileAt([-69.1, 277.34], %) |> angledLine(angle = 0, length = 41.48, tag = $rectangleSegmentA003) |> angledLine(angle = segAng(rectangleSegmentA003) - 90, length = 104.8, tag = $rectangleSegmentB002) |> angledLine(angle = segAng(rectangleSegmentA003), length = -segLen(rectangleSegmentA003), tag = $rectangleSegmentC002) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close(%) -sketch002 = startSketchOn(extrude001, seg03) +sketch002 = startSketchOn(extrude001, face = seg03) |> startProfileAt([159.25, 278.35], %) |> angledLine(angle = 0, length = 40.82, tag = $rectangleSegmentA002) |> angledLine(angle = segAng(rectangleSegmentA002) - 90, length = 132.27, tag = $rectangleSegmentB001) diff --git a/rust/kcl-lib/tests/sketch-on-chamfer-two-times/ops.snap b/rust/kcl-lib/tests/sketch-on-chamfer-two-times/ops.snap index 5e3cabf1c..4c66ae168 100644 --- a/rust/kcl-lib/tests/sketch-on-chamfer-two-times/ops.snap +++ b/rust/kcl-lib/tests/sketch-on-chamfer-two-times/ops.snap @@ -5,7 +5,7 @@ description: Operations executed sketch-on-chamfer-two-times.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XZ" @@ -200,16 +200,7 @@ description: Operations executed sketch-on-chamfer-two-times.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg04", @@ -221,20 +212,19 @@ description: Operations executed sketch-on-chamfer-two-times.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg03", @@ -246,7 +236,15 @@ description: Operations executed sketch-on-chamfer-two-times.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/sketch-on-chamfer-two-times/program_memory.snap b/rust/kcl-lib/tests/sketch-on-chamfer-two-times/program_memory.snap index 405740a22..9c8638a8b 100644 --- a/rust/kcl-lib/tests/sketch-on-chamfer-two-times/program_memory.snap +++ b/rust/kcl-lib/tests/sketch-on-chamfer-two-times/program_memory.snap @@ -209,22 +209,34 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -283,14 +295,36 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl { "type": "fillet", "id": "[uuid]", - "radius": 20.0, + "radius": { + "n": 20.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "chamfer", "id": "[uuid]", - "length": 50.0, + "length": { + "n": 50.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": { "commentStart": 582, @@ -303,7 +337,18 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl { "type": "chamfer", "id": "[uuid]", - "length": 50.0, + "length": { + "n": 50.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": { "commentStart": 655, @@ -331,9 +376,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1259, - "end": 1280, - "start": 1259, + "commentStart": 1273, + "end": 1294, + "start": 1273, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -344,9 +389,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1364, - "end": 1385, - "start": 1364, + "commentStart": 1378, + "end": 1399, + "start": 1378, "type": "TagDeclarator", "value": "rectangleSegmentB001" }, @@ -357,9 +402,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1487, - "end": 1508, - "start": 1487, + "commentStart": 1501, + "end": 1522, + "start": 1501, "type": "TagDeclarator", "value": "rectangleSegmentC001" }, @@ -387,9 +432,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl 278.35 ], "tag": { - "commentStart": 1259, - "end": 1280, - "start": 1259, + "commentStart": 1273, + "end": 1294, + "start": 1273, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -412,9 +457,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl 278.35 ], "tag": { - "commentStart": 1364, - "end": 1385, - "start": 1364, + "commentStart": 1378, + "end": 1399, + "start": 1378, "type": "TagDeclarator", "value": "rectangleSegmentB001" }, @@ -437,9 +482,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl 146.08 ], "tag": { - "commentStart": 1487, - "end": 1508, - "start": 1487, + "commentStart": 1501, + "end": 1522, + "start": 1501, "type": "TagDeclarator", "value": "rectangleSegmentC001" }, @@ -499,17 +544,26 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -715,22 +769,34 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -789,14 +855,36 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl { "type": "fillet", "id": "[uuid]", - "radius": 20.0, + "radius": { + "n": 20.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "chamfer", "id": "[uuid]", - "length": 50.0, + "length": { + "n": 50.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": { "commentStart": 582, @@ -809,7 +897,18 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl { "type": "chamfer", "id": "[uuid]", - "length": 50.0, + "length": { + "n": 50.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": { "commentStart": 655, @@ -1057,22 +1156,34 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1141,9 +1252,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl 278.35 ], "tag": { - "commentStart": 1259, - "end": 1280, - "start": 1259, + "commentStart": 1273, + "end": 1294, + "start": 1273, "type": "TagDeclarator", "value": "rectangleSegmentA002" }, @@ -1166,9 +1277,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl 278.35 ], "tag": { - "commentStart": 1364, - "end": 1385, - "start": 1364, + "commentStart": 1378, + "end": 1399, + "start": 1378, "type": "TagDeclarator", "value": "rectangleSegmentB001" }, @@ -1191,9 +1302,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl 146.08 ], "tag": { - "commentStart": 1487, - "end": 1508, - "start": 1487, + "commentStart": 1501, + "end": 1522, + "start": 1501, "type": "TagDeclarator", "value": "rectangleSegmentC001" }, @@ -1253,17 +1364,26 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1469,22 +1589,34 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1543,14 +1675,36 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl { "type": "fillet", "id": "[uuid]", - "radius": 20.0, + "radius": { + "n": 20.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "chamfer", "id": "[uuid]", - "length": 50.0, + "length": { + "n": 50.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": { "commentStart": 582, @@ -1563,7 +1717,18 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl { "type": "chamfer", "id": "[uuid]", - "length": 50.0, + "length": { + "n": 50.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": { "commentStart": 655, @@ -1637,9 +1802,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl 277.34 ], "tag": { - "commentStart": 798, - "end": 819, - "start": 798, + "commentStart": 805, + "end": 826, + "start": 805, "type": "TagDeclarator", "value": "rectangleSegmentA003" }, @@ -1662,9 +1827,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl 277.34 ], "tag": { - "commentStart": 902, - "end": 923, - "start": 902, + "commentStart": 909, + "end": 930, + "start": 909, "type": "TagDeclarator", "value": "rectangleSegmentB002" }, @@ -1687,9 +1852,9 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl 172.54 ], "tag": { - "commentStart": 1025, - "end": 1046, - "start": 1025, + "commentStart": 1032, + "end": 1053, + "start": 1032, "type": "TagDeclarator", "value": "rectangleSegmentC002" }, @@ -1749,17 +1914,26 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1965,22 +2139,34 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2039,14 +2225,36 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl { "type": "fillet", "id": "[uuid]", - "radius": 20.0, + "radius": { + "n": 20.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "chamfer", "id": "[uuid]", - "length": 50.0, + "length": { + "n": 50.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": { "commentStart": 582, @@ -2059,7 +2267,18 @@ description: Variables in memory after executing sketch-on-chamfer-two-times.kcl { "type": "chamfer", "id": "[uuid]", - "length": 50.0, + "length": { + "n": 50.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": { "commentStart": 655, diff --git a/rust/kcl-lib/tests/sketch-on-chamfer-two-times/unparsed.snap b/rust/kcl-lib/tests/sketch-on-chamfer-two-times/unparsed.snap index a25848ab5..46e6aca48 100644 --- a/rust/kcl-lib/tests/sketch-on-chamfer-two-times/unparsed.snap +++ b/rust/kcl-lib/tests/sketch-on-chamfer-two-times/unparsed.snap @@ -14,14 +14,14 @@ extrude001 = extrude(sketch001, length = 100) |> chamfer(length = 50, tags = [seg02], tag = $seg04) |> chamfer(length = 50, tags = [getOppositeEdge(seg01)], tag = $seg03) -sketch003 = startSketchOn(extrude001, seg04) +sketch003 = startSketchOn(extrude001, face = seg04) |> startProfileAt([-69.1, 277.34], %) |> angledLine(angle = 0, length = 41.48, tag = $rectangleSegmentA003) |> angledLine(angle = segAng(rectangleSegmentA003) - 90, length = 104.8, tag = $rectangleSegmentB002) |> angledLine(angle = segAng(rectangleSegmentA003), length = -segLen(rectangleSegmentA003), tag = $rectangleSegmentC002) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close(%) -sketch002 = startSketchOn(extrude001, seg03) +sketch002 = startSketchOn(extrude001, face = seg03) |> startProfileAt([159.25, 278.35], %) |> angledLine(angle = 0, length = 40.82, tag = $rectangleSegmentA002) |> angledLine(angle = segAng(rectangleSegmentA002) - 90, length = 132.27, tag = $rectangleSegmentB001) diff --git a/rust/kcl-lib/tests/sketch_in_object/ops.snap b/rust/kcl-lib/tests/sketch_in_object/ops.snap index 92988bbe3..c17be92d9 100644 --- a/rust/kcl-lib/tests/sketch_in_object/ops.snap +++ b/rust/kcl-lib/tests/sketch_in_object/ops.snap @@ -20,7 +20,7 @@ description: Operations executed sketch_in_object.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" @@ -85,7 +85,7 @@ description: Operations executed sketch_in_object.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/sketch_in_object/program_memory.snap b/rust/kcl-lib/tests/sketch_in_object/program_memory.snap index f9e1f8095..2681dd03a 100644 --- a/rust/kcl-lib/tests/sketch_in_object/program_memory.snap +++ b/rust/kcl-lib/tests/sketch_in_object/program_memory.snap @@ -100,22 +100,34 @@ description: Variables in memory after executing sketch_in_object.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -243,22 +255,34 @@ description: Variables in memory after executing sketch_in_object.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/sketch_on_face/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/sketch_on_face/artifact_graph_flowchart.snap.md index 46364e066..fb9410054 100644 --- a/rust/kcl-lib/tests/sketch_on_face/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/sketch_on_face/artifact_graph_flowchart.snap.md @@ -1,23 +1,23 @@ ```mermaid flowchart LR subgraph path2 [Path] - 2["Path
[35, 68, 0]"] - 3["Segment
[74, 114, 0]"] - 4["Segment
[120, 147, 0]"] - 5["Segment
[153, 180, 0]"] - 6["Segment
[186, 194, 0]"] + 2["Path
[33, 66, 0]"] + 3["Segment
[72, 112, 0]"] + 4["Segment
[118, 145, 0]"] + 5["Segment
[151, 178, 0]"] + 6["Segment
[184, 192, 0]"] 7[Solid2d] end subgraph path23 [Path] - 23["Path
[265, 290, 0]"] - 24["Segment
[296, 315, 0]"] - 25["Segment
[321, 340, 0]"] - 26["Segment
[346, 366, 0]"] - 27["Segment
[372, 380, 0]"] + 23["Path
[270, 295, 0]"] + 24["Segment
[301, 320, 0]"] + 25["Segment
[326, 345, 0]"] + 26["Segment
[351, 371, 0]"] + 27["Segment
[377, 385, 0]"] 28[Solid2d] end - 1["Plane
[10, 29, 0]"] - 8["Sweep Extrusion
[200, 219, 0]"] + 1["Plane
[10, 27, 0]"] + 8["Sweep Extrusion
[198, 217, 0]"] 9[Wall] 10[Wall] 11[Wall] @@ -32,7 +32,7 @@ flowchart LR 20["SweepEdge Adjacent"] 21["SweepEdge Opposite"] 22["SweepEdge Adjacent"] - 29["Sweep Extrusion
[386, 405, 0]"] + 29["Sweep Extrusion
[391, 410, 0]"] 30[Wall] 31[Wall] 32[Wall] @@ -47,7 +47,7 @@ flowchart LR 41["SweepEdge Adjacent"] 42["SweepEdge Opposite"] 43["SweepEdge Adjacent"] - 44["StartSketchOnFace
[231, 259, 0]"] + 44["StartSketchOnFace
[229, 264, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/sketch_on_face/ast.snap b/rust/kcl-lib/tests/sketch_on_face/ast.snap index f7ec89332..9d2561461 100644 --- a/rust/kcl-lib/tests/sketch_on_face/ast.snap +++ b/rust/kcl-lib/tests/sketch_on_face/ast.snap @@ -22,13 +22,20 @@ description: Result of parsing sketch_on_face.kcl { "arguments": [ { + "abs_path": false, "commentStart": 0, "end": 0, - "raw": "'XY'", + "name": { + "commentStart": 0, + "end": 0, + "name": "XY", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Literal", - "type": "Literal", - "value": "XY" + "type": "Name", + "type": "Name" } ], "callee": { @@ -481,36 +488,30 @@ description: Result of parsing sketch_on_face.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "part001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "here", + "name": { + "commentStart": 0, + "end": 0, + "name": "here", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -531,8 +532,24 @@ description: Result of parsing sketch_on_face.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "part001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/sketch_on_face/input.kcl b/rust/kcl-lib/tests/sketch_on_face/input.kcl index 0502a4a02..a11057668 100644 --- a/rust/kcl-lib/tests/sketch_on_face/input.kcl +++ b/rust/kcl-lib/tests/sketch_on_face/input.kcl @@ -1,4 +1,4 @@ -part001 = startSketchOn('XY') +part001 = startSketchOn(XY) |> startProfileAt([11.19, 28.35], %) |> line(end = [28.67, -13.25], tag = $here) |> line(end = [-4.12, -22.81]) @@ -6,7 +6,7 @@ part001 = startSketchOn('XY') |> close(%) |> extrude(length = 5) -part002 = startSketchOn(part001, here) +part002 = startSketchOn(part001, face = here) |> startProfileAt([0, 0], %) |> line(end = [0, 10]) |> line(end = [10, 0]) diff --git a/rust/kcl-lib/tests/sketch_on_face/ops.snap b/rust/kcl-lib/tests/sketch_on_face/ops.snap index 9bc535e05..450ac01f6 100644 --- a/rust/kcl-lib/tests/sketch_on_face/ops.snap +++ b/rust/kcl-lib/tests/sketch_on_face/ops.snap @@ -5,66 +5,9 @@ description: Operations executed sketch_on_face.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { - "type": "String", - "value": "XY" - }, - "sourceRange": [] - } - }, - "name": "startSketchOn", - "sourceRange": [], - "type": "StdLibCall", - "unlabeledArg": null - }, - { - "labeledArgs": { - "length": { - "value": { - "type": "Number", - "value": 5.0, - "ty": { - "type": "Default", - "len": { - "type": "Mm" - }, - "angle": { - "type": "Degrees" - } - } - }, - "sourceRange": [] - } - }, - "name": "extrude", - "sourceRange": [], - "type": "StdLibCall", - "unlabeledArg": { - "value": { - "type": "Sketch", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - } - }, - { - "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { - "value": { - "type": "TagIdentifier", - "value": "here", + "type": "Plane", "artifact_id": "[uuid]" }, "sourceRange": [] @@ -75,6 +18,62 @@ description: Operations executed sketch_on_face.kcl "type": "StdLibCall", "unlabeledArg": null }, + { + "labeledArgs": { + "length": { + "value": { + "type": "Number", + "value": 5.0, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, + "sourceRange": [] + } + }, + "name": "extrude", + "sourceRange": [], + "type": "StdLibCall", + "unlabeledArg": { + "value": { + "type": "Sketch", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } + }, + { + "labeledArgs": { + "face": { + "value": { + "type": "TagIdentifier", + "value": "here", + "artifact_id": "[uuid]" + }, + "sourceRange": [] + } + }, + "name": "startSketchOn", + "sourceRange": [], + "type": "StdLibCall", + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } + }, { "labeledArgs": { "length": { diff --git a/rust/kcl-lib/tests/sketch_on_face/program_memory.snap b/rust/kcl-lib/tests/sketch_on_face/program_memory.snap index 7f19d90b6..4a4d2f2db 100644 --- a/rust/kcl-lib/tests/sketch_on_face/program_memory.snap +++ b/rust/kcl-lib/tests/sketch_on_face/program_memory.snap @@ -20,9 +20,9 @@ description: Variables in memory after executing sketch_on_face.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 108, - "end": 113, - "start": 108, + "commentStart": 106, + "end": 111, + "start": 106, "type": "TagDeclarator", "value": "here" }, @@ -64,9 +64,9 @@ description: Variables in memory after executing sketch_on_face.kcl 28.35 ], "tag": { - "commentStart": 108, - "end": 113, - "start": 108, + "commentStart": 106, + "end": 111, + "start": 106, "type": "TagDeclarator", "value": "here" }, @@ -145,22 +145,34 @@ description: Variables in memory after executing sketch_on_face.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -329,17 +341,26 @@ description: Variables in memory after executing sketch_on_face.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -351,9 +372,9 @@ description: Variables in memory after executing sketch_on_face.kcl "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 108, - "end": 113, - "start": 108, + "commentStart": 106, + "end": 111, + "start": 106, "type": "TagDeclarator", "value": "here" }, @@ -395,9 +416,9 @@ description: Variables in memory after executing sketch_on_face.kcl 28.35 ], "tag": { - "commentStart": 108, - "end": 113, - "start": 108, + "commentStart": 106, + "end": 111, + "start": 106, "type": "TagDeclarator", "value": "here" }, @@ -476,22 +497,34 @@ description: Variables in memory after executing sketch_on_face.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/sketch_on_face/unparsed.snap b/rust/kcl-lib/tests/sketch_on_face/unparsed.snap index 7e33de2b2..59c3c0ee2 100644 --- a/rust/kcl-lib/tests/sketch_on_face/unparsed.snap +++ b/rust/kcl-lib/tests/sketch_on_face/unparsed.snap @@ -10,7 +10,7 @@ part001 = startSketchOn(XY) |> close(%) |> extrude(length = 5) -part002 = startSketchOn(part001, here) +part002 = startSketchOn(part001, face = here) |> startProfileAt([0, 0], %) |> line(end = [0, 10]) |> line(end = [10, 0]) diff --git a/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/artifact_graph_flowchart.snap.md index fc5b87035..84866b6dd 100644 --- a/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/artifact_graph_flowchart.snap.md @@ -1,26 +1,26 @@ ```mermaid flowchart LR subgraph path2 [Path] - 2["Path
[1016, 1041, 0]"] - 3["Segment
[1047, 1092, 0]"] - 4["Segment
[1098, 1141, 0]"] - 5["Segment
[1147, 1174, 0]"] - 6["Segment
[1180, 1238, 0]"] - 7["Segment
[1244, 1284, 0]"] - 8["Segment
[1290, 1298, 0]"] + 2["Path
[1014, 1039, 0]"] + 3["Segment
[1045, 1090, 0]"] + 4["Segment
[1096, 1139, 0]"] + 5["Segment
[1145, 1172, 0]"] + 6["Segment
[1178, 1236, 0]"] + 7["Segment
[1242, 1282, 0]"] + 8["Segment
[1288, 1296, 0]"] 9[Solid2d] end subgraph path33 [Path] - 33["Path
[1530, 1561, 0]"] - 34["Segment
[1567, 1592, 0]"] - 35["Segment
[1598, 1623, 0]"] - 36["Segment
[1629, 1654, 0]"] - 37["Segment
[1660, 1716, 0]"] - 38["Segment
[1722, 1730, 0]"] + 33["Path
[1535, 1566, 0]"] + 34["Segment
[1572, 1597, 0]"] + 35["Segment
[1603, 1628, 0]"] + 36["Segment
[1634, 1659, 0]"] + 37["Segment
[1665, 1721, 0]"] + 38["Segment
[1727, 1735, 0]"] 39[Solid2d] end - 1["Plane
[991, 1010, 0]"] - 10["Sweep Extrusion
[1304, 1327, 0]"] + 1["Plane
[991, 1008, 0]"] + 10["Sweep Extrusion
[1302, 1325, 0]"] 11[Wall] 12[Wall] 13[Wall] @@ -41,9 +41,9 @@ flowchart LR 28["SweepEdge Adjacent"] 29["SweepEdge Opposite"] 30["SweepEdge Adjacent"] - 31["EdgeCut Fillet
[1333, 1398, 0]"] - 32["EdgeCut Fillet
[1404, 1481, 0]"] - 40["Sweep Extrusion
[1736, 1756, 0]"] + 31["EdgeCut Fillet
[1331, 1396, 0]"] + 32["EdgeCut Fillet
[1402, 1479, 0]"] + 40["Sweep Extrusion
[1741, 1761, 0]"] 41[Wall] 42[Wall] 43[Wall] @@ -57,7 +57,7 @@ flowchart LR 51["SweepEdge Adjacent"] 52["SweepEdge Opposite"] 53["SweepEdge Adjacent"] - 54["StartSketchOnFace
[1495, 1524, 0]"] + 54["StartSketchOnFace
[1493, 1529, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/ast.snap b/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/ast.snap index 02b7b4238..34788d3c9 100644 --- a/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/ast.snap +++ b/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/ast.snap @@ -538,13 +538,20 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl { "arguments": [ { + "abs_path": false, "commentStart": 0, "end": 0, - "raw": "'XY'", + "name": { + "commentStart": 0, + "end": 0, + "name": "XY", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Literal", - "type": "Literal", - "value": "XY" + "type": "Name", + "type": "Name" } ], "callee": { @@ -1482,36 +1489,30 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "bracket", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg01", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg01", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -1532,8 +1533,24 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "bracket", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/input.kcl b/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/input.kcl index 803c8f605..2cd53685b 100644 --- a/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/input.kcl +++ b/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/input.kcl @@ -22,7 +22,7 @@ thickness = sqrt(6 * M * FOS / (width * sigmaAllow)) filletR = 0.25 // Sketch the bracket and extrude with fillets -bracket = startSketchOn('XY') +bracket = startSketchOn(XY) |> startProfileAt([0, 0], %) |> line(end = [0, wallMountL], tag = $outerEdge) |> line(end = [-shelfMountL, 0], tag = $seg01) @@ -34,7 +34,7 @@ bracket = startSketchOn('XY') |> fillet(radius = filletR, tags = [getNextAdjacentEdge(innerEdge)]) |> fillet(radius = filletR + thickness, tags = [getNextAdjacentEdge(outerEdge)]) -sketch001 = startSketchOn(bracket, seg01) +sketch001 = startSketchOn(bracket, face = seg01) |> startProfileAt([4.28, 3.83], %) |> line(end = [2.17, -0.03]) |> line(end = [-0.07, -1.8]) diff --git a/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/ops.snap b/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/ops.snap index 6ac462fc4..18725f3a2 100644 --- a/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/ops.snap +++ b/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/ops.snap @@ -5,10 +5,10 @@ description: Operations executed sketch_on_face_after_fillets_referencing_face.k [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { - "type": "String", - "value": "XY" + "type": "Plane", + "artifact_id": "[uuid]" }, "sourceRange": [] } @@ -101,7 +101,13 @@ description: Operations executed sketch_on_face_after_fillets_referencing_face.k "type": "Number", "value": 0.5707134902949093, "ty": { - "type": "Unknown" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "sourceRange": [] @@ -134,16 +140,7 @@ description: Operations executed sketch_on_face_after_fillets_referencing_face.k }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg01", @@ -155,7 +152,15 @@ description: Operations executed sketch_on_face_after_fillets_referencing_face.k "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/program_memory.snap b/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/program_memory.snap index 0306ff232..bedc4a2d3 100644 --- a/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/program_memory.snap +++ b/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/program_memory.snap @@ -33,8 +33,13 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re "type": "Number", "value": 1800.0, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "bracket": { @@ -49,9 +54,9 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1081, - "end": 1091, - "start": 1081, + "commentStart": 1079, + "end": 1089, + "start": 1079, "type": "TagDeclarator", "value": "outerEdge" }, @@ -62,9 +67,9 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1134, - "end": 1140, - "start": 1134, + "commentStart": 1132, + "end": 1138, + "start": 1132, "type": "TagDeclarator", "value": "seg01" }, @@ -82,9 +87,9 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1227, - "end": 1237, - "start": 1227, + "commentStart": 1225, + "end": 1235, + "start": 1225, "type": "TagDeclarator", "value": "innerEdge" }, @@ -119,9 +124,9 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re 0.0 ], "tag": { - "commentStart": 1081, - "end": 1091, - "start": 1081, + "commentStart": 1079, + "end": 1089, + "start": 1079, "type": "TagDeclarator", "value": "outerEdge" }, @@ -144,9 +149,9 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re 6.0 ], "tag": { - "commentStart": 1134, - "end": 1140, - "start": 1134, + "commentStart": 1132, + "end": 1138, + "start": 1132, "type": "TagDeclarator", "value": "seg01" }, @@ -188,9 +193,9 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re 5.6793 ], "tag": { - "commentStart": 1227, - "end": 1237, - "start": 1227, + "commentStart": 1225, + "end": 1235, + "start": 1225, "type": "TagDeclarator", "value": "innerEdge" }, @@ -250,22 +255,34 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -316,14 +333,36 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5707134902949093, + "radius": { + "n": 0.5707134902949093, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -544,17 +583,26 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -566,9 +614,9 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1081, - "end": 1091, - "start": 1081, + "commentStart": 1079, + "end": 1089, + "start": 1079, "type": "TagDeclarator", "value": "outerEdge" }, @@ -579,9 +627,9 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1134, - "end": 1140, - "start": 1134, + "commentStart": 1132, + "end": 1138, + "start": 1132, "type": "TagDeclarator", "value": "seg01" }, @@ -599,9 +647,9 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 1227, - "end": 1237, - "start": 1227, + "commentStart": 1225, + "end": 1235, + "start": 1225, "type": "TagDeclarator", "value": "innerEdge" }, @@ -636,9 +684,9 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re 0.0 ], "tag": { - "commentStart": 1081, - "end": 1091, - "start": 1081, + "commentStart": 1079, + "end": 1089, + "start": 1079, "type": "TagDeclarator", "value": "outerEdge" }, @@ -661,9 +709,9 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re 6.0 ], "tag": { - "commentStart": 1134, - "end": 1140, - "start": 1134, + "commentStart": 1132, + "end": 1138, + "start": 1132, "type": "TagDeclarator", "value": "seg01" }, @@ -705,9 +753,9 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re 5.6793 ], "tag": { - "commentStart": 1227, - "end": 1237, - "start": 1227, + "commentStart": 1225, + "end": 1235, + "start": 1225, "type": "TagDeclarator", "value": "innerEdge" }, @@ -767,22 +815,34 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -833,14 +893,36 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re { "type": "fillet", "id": "[uuid]", - "radius": 0.25, + "radius": { + "n": 0.25, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null }, { "type": "fillet", "id": "[uuid]", - "radius": 0.5707134902949093, + "radius": { + "n": 0.5707134902949093, + "ty": { + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } + } + }, "edgeId": "[uuid]", "tag": null } @@ -889,7 +971,13 @@ description: Variables in memory after executing sketch_on_face_after_fillets_re "type": "Number", "value": 0.3207, "ty": { - "type": "Unknown" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "wallMountL": { diff --git a/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/unparsed.snap b/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/unparsed.snap index ab9101f90..d10f473a5 100644 --- a/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/unparsed.snap +++ b/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/unparsed.snap @@ -38,7 +38,7 @@ bracket = startSketchOn(XY) |> fillet(radius = filletR, tags = [getNextAdjacentEdge(innerEdge)]) |> fillet(radius = filletR + thickness, tags = [getNextAdjacentEdge(outerEdge)]) -sketch001 = startSketchOn(bracket, seg01) +sketch001 = startSketchOn(bracket, face = seg01) |> startProfileAt([4.28, 3.83], %) |> line(end = [2.17, -0.03]) |> line(end = [-0.07, -1.8]) diff --git a/rust/kcl-lib/tests/sketch_on_face_circle_tagged/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/sketch_on_face_circle_tagged/artifact_graph_flowchart.snap.md index 4c36a063c..b56ebc39d 100644 --- a/rust/kcl-lib/tests/sketch_on_face_circle_tagged/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/sketch_on_face_circle_tagged/artifact_graph_flowchart.snap.md @@ -9,8 +9,8 @@ flowchart LR 7[Solid2d] end subgraph path23 [Path] - 23["Path
[298, 350, 0]"] - 24["Segment
[298, 350, 0]"] + 23["Path
[305, 357, 0]"] + 24["Segment
[305, 357, 0]"] 25[Solid2d] end 1["Plane
[29, 48, 0]"] @@ -29,13 +29,13 @@ flowchart LR 20["SweepEdge Adjacent"] 21["SweepEdge Opposite"] 22["SweepEdge Adjacent"] - 26["Sweep Extrusion
[356, 375, 0]"] + 26["Sweep Extrusion
[363, 382, 0]"] 27[Wall] 28["Cap Start"] 29["Cap End"] 30["SweepEdge Opposite"] 31["SweepEdge Adjacent"] - 32["StartSketchOnFace
[263, 292, 0]"] + 32["StartSketchOnFace
[263, 299, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/sketch_on_face_circle_tagged/ast.snap b/rust/kcl-lib/tests/sketch_on_face_circle_tagged/ast.snap index b6ed6af48..bd1ef93ae 100644 --- a/rust/kcl-lib/tests/sketch_on_face_circle_tagged/ast.snap +++ b/rust/kcl-lib/tests/sketch_on_face_circle_tagged/ast.snap @@ -629,29 +629,23 @@ description: Result of parsing sketch_on_face_circle_tagged.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "part001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "\"end\"", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "end" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "\"end\"", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "end" + } } ], "callee": { @@ -672,8 +666,24 @@ description: Result of parsing sketch_on_face_circle_tagged.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "part001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/sketch_on_face_circle_tagged/input.kcl b/rust/kcl-lib/tests/sketch_on_face_circle_tagged/input.kcl index dd7e1427d..8f77a5568 100644 --- a/rust/kcl-lib/tests/sketch_on_face_circle_tagged/input.kcl +++ b/rust/kcl-lib/tests/sketch_on_face_circle_tagged/input.kcl @@ -11,6 +11,6 @@ part001 = cube([0, 0], 20) |> close(%) |> extrude(length = 20) -part002 = startSketchOn(part001, "end") +part002 = startSketchOn(part001, face = "end") |> circle(center = [0, 0], radius = 5, tag = $myCircle) |> extrude(length = 5) diff --git a/rust/kcl-lib/tests/sketch_on_face_circle_tagged/ops.snap b/rust/kcl-lib/tests/sketch_on_face_circle_tagged/ops.snap index 34022b5d4..cccd1da51 100644 --- a/rust/kcl-lib/tests/sketch_on_face_circle_tagged/ops.snap +++ b/rust/kcl-lib/tests/sketch_on_face_circle_tagged/ops.snap @@ -20,7 +20,7 @@ description: Operations executed sketch_on_face_circle_tagged.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" @@ -70,16 +70,7 @@ description: Operations executed sketch_on_face_circle_tagged.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -90,7 +81,15 @@ description: Operations executed sketch_on_face_circle_tagged.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/sketch_on_face_circle_tagged/program_memory.snap b/rust/kcl-lib/tests/sketch_on_face_circle_tagged/program_memory.snap index e8cb422f6..bb4b9031d 100644 --- a/rust/kcl-lib/tests/sketch_on_face_circle_tagged/program_memory.snap +++ b/rust/kcl-lib/tests/sketch_on_face_circle_tagged/program_memory.snap @@ -136,22 +136,34 @@ description: Variables in memory after executing sketch_on_face_circle_tagged.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -201,9 +213,9 @@ description: Variables in memory after executing sketch_on_face_circle_tagged.kc "id": "[uuid]", "sourceRange": [], "tag": { - "commentStart": 340, - "end": 349, - "start": 340, + "commentStart": 347, + "end": 356, + "start": 347, "type": "TagDeclarator", "value": "myCircle" }, @@ -230,9 +242,9 @@ description: Variables in memory after executing sketch_on_face_circle_tagged.kc ], "radius": 5.0, "tag": { - "commentStart": 340, - "end": 349, - "start": 340, + "commentStart": 347, + "end": 356, + "start": 347, "type": "TagDeclarator", "value": "myCircle" }, @@ -254,17 +266,26 @@ description: Variables in memory after executing sketch_on_face_circle_tagged.kc "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -389,22 +410,34 @@ description: Variables in memory after executing sketch_on_face_circle_tagged.kc "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/sketch_on_face_circle_tagged/unparsed.snap b/rust/kcl-lib/tests/sketch_on_face_circle_tagged/unparsed.snap index 681d35e42..4dd4b0206 100644 --- a/rust/kcl-lib/tests/sketch_on_face_circle_tagged/unparsed.snap +++ b/rust/kcl-lib/tests/sketch_on_face_circle_tagged/unparsed.snap @@ -15,6 +15,6 @@ part001 = cube([0, 0], 20) |> close(%) |> extrude(length = 20) -part002 = startSketchOn(part001, "end") +part002 = startSketchOn(part001, face = "end") |> circle(center = [0, 0], radius = 5, tag = $myCircle) |> extrude(length = 5) diff --git a/rust/kcl-lib/tests/sketch_on_face_end/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/sketch_on_face_end/artifact_graph_flowchart.snap.md index 980c800db..d804536af 100644 --- a/rust/kcl-lib/tests/sketch_on_face_end/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/sketch_on_face_end/artifact_graph_flowchart.snap.md @@ -9,11 +9,11 @@ flowchart LR 7[Solid2d] end subgraph path23 [Path] - 23["Path
[298, 323, 0]"] - 24["Segment
[329, 348, 0]"] - 25["Segment
[354, 373, 0]"] - 26["Segment
[379, 399, 0]"] - 27["Segment
[405, 413, 0]"] + 23["Path
[305, 330, 0]"] + 24["Segment
[336, 355, 0]"] + 25["Segment
[361, 380, 0]"] + 26["Segment
[386, 406, 0]"] + 27["Segment
[412, 420, 0]"] 28[Solid2d] end 1["Plane
[29, 48, 0]"] @@ -32,7 +32,7 @@ flowchart LR 20["SweepEdge Adjacent"] 21["SweepEdge Opposite"] 22["SweepEdge Adjacent"] - 29["Sweep Extrusion
[419, 438, 0]"] + 29["Sweep Extrusion
[426, 445, 0]"] 30[Wall] 31[Wall] 32[Wall] @@ -47,7 +47,7 @@ flowchart LR 41["SweepEdge Adjacent"] 42["SweepEdge Opposite"] 43["SweepEdge Adjacent"] - 44["StartSketchOnFace
[263, 292, 0]"] + 44["StartSketchOnFace
[263, 299, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/sketch_on_face_end/ast.snap b/rust/kcl-lib/tests/sketch_on_face_end/ast.snap index c29bb3a39..b8cef3cbc 100644 --- a/rust/kcl-lib/tests/sketch_on_face_end/ast.snap +++ b/rust/kcl-lib/tests/sketch_on_face_end/ast.snap @@ -629,29 +629,23 @@ description: Result of parsing sketch_on_face_end.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "part001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "\"END\"", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "END" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "\"END\"", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "END" + } } ], "callee": { @@ -672,8 +666,24 @@ description: Result of parsing sketch_on_face_end.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "part001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/sketch_on_face_end/input.kcl b/rust/kcl-lib/tests/sketch_on_face_end/input.kcl index 8cac5eb0c..3b0b6add6 100644 --- a/rust/kcl-lib/tests/sketch_on_face_end/input.kcl +++ b/rust/kcl-lib/tests/sketch_on_face_end/input.kcl @@ -11,7 +11,7 @@ part001 = cube([0, 0], 20) |> close(%) |> extrude(length = 20) -part002 = startSketchOn(part001, "END") +part002 = startSketchOn(part001, face = "END") |> startProfileAt([0, 0], %) |> line(end = [0, 10]) |> line(end = [10, 0]) diff --git a/rust/kcl-lib/tests/sketch_on_face_end/ops.snap b/rust/kcl-lib/tests/sketch_on_face_end/ops.snap index 861df19a9..cd0a9684e 100644 --- a/rust/kcl-lib/tests/sketch_on_face_end/ops.snap +++ b/rust/kcl-lib/tests/sketch_on_face_end/ops.snap @@ -20,7 +20,7 @@ description: Operations executed sketch_on_face_end.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" @@ -70,16 +70,7 @@ description: Operations executed sketch_on_face_end.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -90,7 +81,15 @@ description: Operations executed sketch_on_face_end.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/sketch_on_face_end/program_memory.snap b/rust/kcl-lib/tests/sketch_on_face_end/program_memory.snap index 98e0df61b..496c49ee5 100644 --- a/rust/kcl-lib/tests/sketch_on_face_end/program_memory.snap +++ b/rust/kcl-lib/tests/sketch_on_face_end/program_memory.snap @@ -131,22 +131,34 @@ description: Variables in memory after executing sketch_on_face_end.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -309,17 +321,26 @@ description: Variables in memory after executing sketch_on_face_end.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -444,22 +465,34 @@ description: Variables in memory after executing sketch_on_face_end.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/sketch_on_face_end/unparsed.snap b/rust/kcl-lib/tests/sketch_on_face_end/unparsed.snap index d5f655826..a4b98806c 100644 --- a/rust/kcl-lib/tests/sketch_on_face_end/unparsed.snap +++ b/rust/kcl-lib/tests/sketch_on_face_end/unparsed.snap @@ -15,7 +15,7 @@ part001 = cube([0, 0], 20) |> close(%) |> extrude(length = 20) -part002 = startSketchOn(part001, "END") +part002 = startSketchOn(part001, face = "END") |> startProfileAt([0, 0], %) |> line(end = [0, 10]) |> line(end = [10, 0]) diff --git a/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/artifact_graph_flowchart.snap.md index 6edf4c78a..93c97330d 100644 --- a/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/artifact_graph_flowchart.snap.md @@ -9,11 +9,11 @@ flowchart LR 7[Solid2d] end subgraph path23 [Path] - 23["Path
[298, 323, 0]"] - 24["Segment
[329, 348, 0]"] - 25["Segment
[354, 373, 0]"] - 26["Segment
[379, 399, 0]"] - 27["Segment
[405, 413, 0]"] + 23["Path
[305, 330, 0]"] + 24["Segment
[336, 355, 0]"] + 25["Segment
[361, 380, 0]"] + 26["Segment
[386, 406, 0]"] + 27["Segment
[412, 420, 0]"] 28[Solid2d] end 1["Plane
[29, 48, 0]"] @@ -32,7 +32,7 @@ flowchart LR 20["SweepEdge Adjacent"] 21["SweepEdge Opposite"] 22["SweepEdge Adjacent"] - 29["Sweep Extrusion
[419, 439, 0]"] + 29["Sweep Extrusion
[426, 446, 0]"] 30[Wall] 31[Wall] 32[Wall] @@ -47,7 +47,7 @@ flowchart LR 41["SweepEdge Adjacent"] 42["SweepEdge Opposite"] 43["SweepEdge Adjacent"] - 44["StartSketchOnFace
[263, 292, 0]"] + 44["StartSketchOnFace
[263, 299, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/ast.snap b/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/ast.snap index 152ea1f0d..a7ee9184a 100644 --- a/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/ast.snap +++ b/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/ast.snap @@ -629,29 +629,23 @@ description: Result of parsing sketch_on_face_end_negative_extrude.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "part001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "\"END\"", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "END" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "\"END\"", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "END" + } } ], "callee": { @@ -672,8 +666,24 @@ description: Result of parsing sketch_on_face_end_negative_extrude.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "part001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/input.kcl b/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/input.kcl index 210f81f22..9d0ca7f69 100644 --- a/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/input.kcl +++ b/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/input.kcl @@ -11,7 +11,7 @@ part001 = cube([0, 0], 20) |> close(%) |> extrude(length = 20) -part002 = startSketchOn(part001, "END") +part002 = startSketchOn(part001, face = "END") |> startProfileAt([0, 0], %) |> line(end = [0, 10]) |> line(end = [10, 0]) diff --git a/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/ops.snap b/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/ops.snap index c22cd7de5..c177f9906 100644 --- a/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/ops.snap +++ b/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/ops.snap @@ -20,7 +20,7 @@ description: Operations executed sketch_on_face_end_negative_extrude.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" @@ -70,16 +70,7 @@ description: Operations executed sketch_on_face_end_negative_extrude.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "END" @@ -90,7 +81,15 @@ description: Operations executed sketch_on_face_end_negative_extrude.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/program_memory.snap b/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/program_memory.snap index 5b066daf8..2d6f8c8df 100644 --- a/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/program_memory.snap +++ b/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/program_memory.snap @@ -131,22 +131,34 @@ description: Variables in memory after executing sketch_on_face_end_negative_ext "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -309,17 +321,26 @@ description: Variables in memory after executing sketch_on_face_end_negative_ext "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -444,22 +465,34 @@ description: Variables in memory after executing sketch_on_face_end_negative_ext "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/unparsed.snap b/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/unparsed.snap index c92c89d30..bab14470a 100644 --- a/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/unparsed.snap +++ b/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/unparsed.snap @@ -15,7 +15,7 @@ part001 = cube([0, 0], 20) |> close(%) |> extrude(length = 20) -part002 = startSketchOn(part001, "END") +part002 = startSketchOn(part001, face = "END") |> startProfileAt([0, 0], %) |> line(end = [0, 10]) |> line(end = [10, 0]) diff --git a/rust/kcl-lib/tests/sketch_on_face_start/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/sketch_on_face_start/artifact_graph_flowchart.snap.md index 4f7d16174..9a2d230e9 100644 --- a/rust/kcl-lib/tests/sketch_on_face_start/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/sketch_on_face_start/artifact_graph_flowchart.snap.md @@ -1,23 +1,23 @@ ```mermaid flowchart LR subgraph path2 [Path] - 2["Path
[56, 78, 0]"] - 3["Segment
[86, 108, 0]"] - 4["Segment
[116, 138, 0]"] - 5["Segment
[146, 169, 0]"] - 6["Segment
[217, 225, 0]"] + 2["Path
[54, 76, 0]"] + 3["Segment
[84, 106, 0]"] + 4["Segment
[114, 136, 0]"] + 5["Segment
[144, 167, 0]"] + 6["Segment
[215, 223, 0]"] 7[Solid2d] end subgraph path23 [Path] - 23["Path
[303, 328, 0]"] - 24["Segment
[334, 353, 0]"] - 25["Segment
[359, 378, 0]"] - 26["Segment
[384, 404, 0]"] - 27["Segment
[410, 418, 0]"] + 23["Path
[308, 333, 0]"] + 24["Segment
[339, 358, 0]"] + 25["Segment
[364, 383, 0]"] + 26["Segment
[389, 409, 0]"] + 27["Segment
[415, 423, 0]"] 28[Solid2d] end - 1["Plane
[29, 48, 0]"] - 8["Sweep Extrusion
[231, 251, 0]"] + 1["Plane
[29, 46, 0]"] + 8["Sweep Extrusion
[229, 249, 0]"] 9[Wall] 10[Wall] 11[Wall] @@ -32,7 +32,7 @@ flowchart LR 20["SweepEdge Adjacent"] 21["SweepEdge Opposite"] 22["SweepEdge Adjacent"] - 29["Sweep Extrusion
[424, 443, 0]"] + 29["Sweep Extrusion
[429, 448, 0]"] 30[Wall] 31[Wall] 32[Wall] @@ -47,7 +47,7 @@ flowchart LR 41["SweepEdge Adjacent"] 42["SweepEdge Opposite"] 43["SweepEdge Adjacent"] - 44["StartSketchOnFace
[270, 297, 0]"] + 44["StartSketchOnFace
[268, 302, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/sketch_on_face_start/ast.snap b/rust/kcl-lib/tests/sketch_on_face_start/ast.snap index 9ae3e7063..38b368fa0 100644 --- a/rust/kcl-lib/tests/sketch_on_face_start/ast.snap +++ b/rust/kcl-lib/tests/sketch_on_face_start/ast.snap @@ -37,13 +37,20 @@ description: Result of parsing sketch_on_face_start.kcl { "arguments": [ { + "abs_path": false, "commentStart": 0, "end": 0, - "raw": "'XY'", + "name": { + "commentStart": 0, + "end": 0, + "name": "XY", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Literal", - "type": "Literal", - "value": "XY" + "type": "Name", + "type": "Name" } ], "callee": { @@ -643,29 +650,23 @@ description: Result of parsing sketch_on_face_start.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "foo", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "\"start\"", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "start" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "\"start\"", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "start" + } } ], "callee": { @@ -686,8 +687,24 @@ description: Result of parsing sketch_on_face_start.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "foo", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/sketch_on_face_start/input.kcl b/rust/kcl-lib/tests/sketch_on_face_start/input.kcl index 27997b240..6023775e9 100644 --- a/rust/kcl-lib/tests/sketch_on_face_start/input.kcl +++ b/rust/kcl-lib/tests/sketch_on_face_start/input.kcl @@ -1,5 +1,5 @@ fn cube(pos, scale) { - sg = startSketchOn('XY') + sg = startSketchOn(XY) |> startProfileAt(pos, %) |> line(end = [0, scale]) |> line(end = [scale, 0]) @@ -11,7 +11,7 @@ part001 = cube([0, 0], 20) |> close(%) |> extrude(length = 20) as foo -part002 = startSketchOn(foo, "start") +part002 = startSketchOn(foo, face = "start") |> startProfileAt([0, 0], %) |> line(end = [0, 10]) |> line(end = [10, 0]) diff --git a/rust/kcl-lib/tests/sketch_on_face_start/ops.snap b/rust/kcl-lib/tests/sketch_on_face_start/ops.snap index d36a28eb9..f8965773c 100644 --- a/rust/kcl-lib/tests/sketch_on_face_start/ops.snap +++ b/rust/kcl-lib/tests/sketch_on_face_start/ops.snap @@ -10,7 +10,7 @@ description: Operations executed sketch_on_face_start.kcl "name": "cube", "functionSourceRange": [ 7, - 184, + 182, 0 ], "unlabeledArg": null, @@ -20,10 +20,10 @@ description: Operations executed sketch_on_face_start.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { - "type": "String", - "value": "XY" + "type": "Plane", + "artifact_id": "[uuid]" }, "sourceRange": [] } @@ -70,16 +70,7 @@ description: Operations executed sketch_on_face_start.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -90,7 +81,15 @@ description: Operations executed sketch_on_face_start.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/sketch_on_face_start/program_memory.snap b/rust/kcl-lib/tests/sketch_on_face_start/program_memory.snap index 2ee2dea7d..2630b017b 100644 --- a/rust/kcl-lib/tests/sketch_on_face_start/program_memory.snap +++ b/rust/kcl-lib/tests/sketch_on_face_start/program_memory.snap @@ -131,22 +131,34 @@ description: Variables in memory after executing sketch_on_face_start.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -309,22 +321,34 @@ description: Variables in memory after executing sketch_on_face_start.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -487,17 +511,26 @@ description: Variables in memory after executing sketch_on_face_start.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -622,22 +655,34 @@ description: Variables in memory after executing sketch_on_face_start.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/sketch_on_face_start/unparsed.snap b/rust/kcl-lib/tests/sketch_on_face_start/unparsed.snap index c08390a4f..894a9a85f 100644 --- a/rust/kcl-lib/tests/sketch_on_face_start/unparsed.snap +++ b/rust/kcl-lib/tests/sketch_on_face_start/unparsed.snap @@ -15,7 +15,7 @@ part001 = cube([0, 0], 20) |> close(%) |> extrude(length = 20) as foo -part002 = startSketchOn(foo, "start") +part002 = startSketchOn(foo, face = "start") |> startProfileAt([0, 0], %) |> line(end = [0, 10]) |> line(end = [10, 0]) diff --git a/rust/kcl-lib/tests/ssi_pattern/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/ssi_pattern/artifact_graph_flowchart.snap.md index 2512c43fd..58941d3ba 100644 --- a/rust/kcl-lib/tests/ssi_pattern/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/ssi_pattern/artifact_graph_flowchart.snap.md @@ -11,8 +11,8 @@ flowchart LR 9[Solid2d] end subgraph path28 [Path] - 28["Path
[382, 426, 0]"] - 29["Segment
[382, 426, 0]"] + 28["Path
[389, 433, 0]"] + 29["Segment
[389, 433, 0]"] 30[Solid2d] end 1["Plane
[12, 31, 0]"] @@ -34,40 +34,40 @@ flowchart LR 25["SweepEdge Adjacent"] 26["SweepEdge Opposite"] 27["SweepEdge Adjacent"] - 31["Sweep Extrusion
[616, 637, 0]"] + 31["Sweep Extrusion
[623, 644, 0]"] 32[Wall] 33["SweepEdge Opposite"] 34["SweepEdge Adjacent"] - 35["Sweep Extrusion
[616, 637, 0]"] - 36["Sweep Extrusion
[616, 637, 0]"] - 37["Sweep Extrusion
[616, 637, 0]"] - 38["Sweep Extrusion
[616, 637, 0]"] - 39["Sweep Extrusion
[616, 637, 0]"] - 40["Sweep Extrusion
[616, 637, 0]"] - 41["Sweep Extrusion
[616, 637, 0]"] - 42["Sweep Extrusion
[616, 637, 0]"] - 43["Sweep Extrusion
[616, 637, 0]"] - 44["Sweep Extrusion
[616, 637, 0]"] - 45["Sweep Extrusion
[616, 637, 0]"] - 46["Sweep Extrusion
[616, 637, 0]"] - 47["Sweep Extrusion
[616, 637, 0]"] - 48["Sweep Extrusion
[616, 637, 0]"] - 49["Sweep Extrusion
[616, 637, 0]"] - 50["Sweep Extrusion
[616, 637, 0]"] - 51["Sweep Extrusion
[616, 637, 0]"] - 52["Sweep Extrusion
[616, 637, 0]"] - 53["Sweep Extrusion
[616, 637, 0]"] - 54["Sweep Extrusion
[616, 637, 0]"] - 55["Sweep Extrusion
[616, 637, 0]"] - 56["Sweep Extrusion
[616, 637, 0]"] - 57["Sweep Extrusion
[616, 637, 0]"] - 58["Sweep Extrusion
[616, 637, 0]"] - 59["Sweep Extrusion
[616, 637, 0]"] - 60["Sweep Extrusion
[616, 637, 0]"] - 61["Sweep Extrusion
[616, 637, 0]"] - 62["Sweep Extrusion
[616, 637, 0]"] - 63["Sweep Extrusion
[616, 637, 0]"] - 64["StartSketchOnFace
[344, 376, 0]"] + 35["Sweep Extrusion
[623, 644, 0]"] + 36["Sweep Extrusion
[623, 644, 0]"] + 37["Sweep Extrusion
[623, 644, 0]"] + 38["Sweep Extrusion
[623, 644, 0]"] + 39["Sweep Extrusion
[623, 644, 0]"] + 40["Sweep Extrusion
[623, 644, 0]"] + 41["Sweep Extrusion
[623, 644, 0]"] + 42["Sweep Extrusion
[623, 644, 0]"] + 43["Sweep Extrusion
[623, 644, 0]"] + 44["Sweep Extrusion
[623, 644, 0]"] + 45["Sweep Extrusion
[623, 644, 0]"] + 46["Sweep Extrusion
[623, 644, 0]"] + 47["Sweep Extrusion
[623, 644, 0]"] + 48["Sweep Extrusion
[623, 644, 0]"] + 49["Sweep Extrusion
[623, 644, 0]"] + 50["Sweep Extrusion
[623, 644, 0]"] + 51["Sweep Extrusion
[623, 644, 0]"] + 52["Sweep Extrusion
[623, 644, 0]"] + 53["Sweep Extrusion
[623, 644, 0]"] + 54["Sweep Extrusion
[623, 644, 0]"] + 55["Sweep Extrusion
[623, 644, 0]"] + 56["Sweep Extrusion
[623, 644, 0]"] + 57["Sweep Extrusion
[623, 644, 0]"] + 58["Sweep Extrusion
[623, 644, 0]"] + 59["Sweep Extrusion
[623, 644, 0]"] + 60["Sweep Extrusion
[623, 644, 0]"] + 61["Sweep Extrusion
[623, 644, 0]"] + 62["Sweep Extrusion
[623, 644, 0]"] + 63["Sweep Extrusion
[623, 644, 0]"] + 64["StartSketchOnFace
[344, 383, 0]"] 1 --- 2 2 --- 3 2 --- 4 diff --git a/rust/kcl-lib/tests/ssi_pattern/ast.snap b/rust/kcl-lib/tests/ssi_pattern/ast.snap index 559376708..0fba757d6 100644 --- a/rust/kcl-lib/tests/ssi_pattern/ast.snap +++ b/rust/kcl-lib/tests/ssi_pattern/ast.snap @@ -637,36 +637,30 @@ description: Result of parsing ssi_pattern.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "extrude001", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "arg": { + "abs_path": false, "commentStart": 0, "end": 0, - "name": "seg01", + "name": { + "commentStart": 0, + "end": 0, + "name": "seg01", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Identifier" - }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" + "type": "Name", + "type": "Name" + } } ], "callee": { @@ -687,8 +681,24 @@ description: Result of parsing ssi_pattern.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "extrude001", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/ssi_pattern/input.kcl b/rust/kcl-lib/tests/ssi_pattern/input.kcl index f03508c12..a14584f39 100644 --- a/rust/kcl-lib/tests/ssi_pattern/input.kcl +++ b/rust/kcl-lib/tests/ssi_pattern/input.kcl @@ -9,7 +9,7 @@ sketch001 = startSketchOn('XZ') extrude001 = extrude(sketch001, length = 50) -sketch002 = startSketchOn(extrude001, seg01) +sketch002 = startSketchOn(extrude001, face = seg01) |> circle(center = [-2.08, 47.7], radius = 1.4) |> patternLinear2d(instances = 5, distance = 5, axis = [1, 0]) // Instances was reduced from 12 to speed this up. diff --git a/rust/kcl-lib/tests/ssi_pattern/ops.snap b/rust/kcl-lib/tests/ssi_pattern/ops.snap index db8b4181a..083ec46d2 100644 --- a/rust/kcl-lib/tests/ssi_pattern/ops.snap +++ b/rust/kcl-lib/tests/ssi_pattern/ops.snap @@ -5,7 +5,7 @@ description: Operations executed ssi_pattern.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XZ" @@ -52,16 +52,7 @@ description: Operations executed ssi_pattern.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "TagIdentifier", "value": "seg01", @@ -73,7 +64,15 @@ description: Operations executed ssi_pattern.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/ssi_pattern/program_memory.snap b/rust/kcl-lib/tests/ssi_pattern/program_memory.snap index f388be277..2ab83c61a 100644 --- a/rust/kcl-lib/tests/ssi_pattern/program_memory.snap +++ b/rust/kcl-lib/tests/ssi_pattern/program_memory.snap @@ -190,22 +190,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -394,22 +406,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -502,17 +526,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -699,22 +732,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -846,17 +891,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1043,22 +1097,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1190,17 +1256,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1387,22 +1462,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1534,17 +1621,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -1731,22 +1827,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -1878,17 +1986,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2075,22 +2192,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2222,17 +2351,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2419,22 +2557,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2566,17 +2716,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -2763,22 +2922,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -2910,17 +3081,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3107,22 +3287,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3254,17 +3446,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3451,22 +3652,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3598,17 +3811,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -3795,22 +4017,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -3942,17 +4176,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -4139,22 +4382,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4286,17 +4541,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -4483,22 +4747,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4630,17 +4906,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -4827,22 +5112,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -4974,17 +5271,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -5171,22 +5477,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5318,17 +5636,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -5515,22 +5842,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -5662,17 +6001,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -5859,22 +6207,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6006,17 +6366,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -6203,22 +6572,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6350,17 +6731,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -6547,22 +6937,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -6694,17 +7096,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -6891,22 +7302,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7038,17 +7461,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -7235,22 +7667,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7382,17 +7826,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -7579,22 +8032,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -7726,17 +8191,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -7923,22 +8397,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8070,17 +8556,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -8267,22 +8762,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8414,17 +8921,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -8611,22 +9127,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -8758,17 +9286,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -8955,22 +9492,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9102,17 +9651,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -9299,22 +9857,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9446,17 +10016,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -9643,22 +10222,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -9790,17 +10381,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -9987,22 +10587,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10134,17 +10746,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -10331,22 +10952,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -10478,17 +11111,26 @@ description: Variables in memory after executing ssi_pattern.kcl "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "solid": { "type": "Solid", @@ -10675,22 +11317,34 @@ description: Variables in memory after executing ssi_pattern.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/ssi_pattern/unparsed.snap b/rust/kcl-lib/tests/ssi_pattern/unparsed.snap index e3384349a..4fd353e6e 100644 --- a/rust/kcl-lib/tests/ssi_pattern/unparsed.snap +++ b/rust/kcl-lib/tests/ssi_pattern/unparsed.snap @@ -13,7 +13,7 @@ sketch001 = startSketchOn(XZ) extrude001 = extrude(sketch001, length = 50) -sketch002 = startSketchOn(extrude001, seg01) +sketch002 = startSketchOn(extrude001, face = seg01) |> circle(center = [-2.08, 47.7], radius = 1.4) |> patternLinear2d(instances = 5, distance = 5, axis = [1, 0]) // Instances was reduced from 12 to speed this up. diff --git a/rust/kcl-lib/tests/subtract_cylinder_from_cube/ops.snap b/rust/kcl-lib/tests/subtract_cylinder_from_cube/ops.snap index e7f8f4f97..f74160b0f 100644 --- a/rust/kcl-lib/tests/subtract_cylinder_from_cube/ops.snap +++ b/rust/kcl-lib/tests/subtract_cylinder_from_cube/ops.snap @@ -20,7 +20,7 @@ description: Operations executed subtract_cylinder_from_cube.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -70,7 +70,7 @@ description: Operations executed subtract_cylinder_from_cube.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/subtract_cylinder_from_cube/program_memory.snap b/rust/kcl-lib/tests/subtract_cylinder_from_cube/program_memory.snap index c03b6bc87..872aee02e 100644 --- a/rust/kcl-lib/tests/subtract_cylinder_from_cube/program_memory.snap +++ b/rust/kcl-lib/tests/subtract_cylinder_from_cube/program_memory.snap @@ -134,22 +134,34 @@ description: Variables in memory after executing subtract_cylinder_from_cube.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -312,22 +324,34 @@ description: Variables in memory after executing subtract_cylinder_from_cube.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -492,22 +516,34 @@ description: Variables in memory after executing subtract_cylinder_from_cube.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -598,22 +634,34 @@ description: Variables in memory after executing subtract_cylinder_from_cube.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/tan_arc_x_line/ops.snap b/rust/kcl-lib/tests/tan_arc_x_line/ops.snap index 1cf7c08d6..e528f214f 100644 --- a/rust/kcl-lib/tests/tan_arc_x_line/ops.snap +++ b/rust/kcl-lib/tests/tan_arc_x_line/ops.snap @@ -5,7 +5,7 @@ description: Operations executed tan_arc_x_line.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XY" diff --git a/rust/kcl-lib/tests/tangential_arc/ops.snap b/rust/kcl-lib/tests/tangential_arc/ops.snap index f66ededd8..6957fafac 100644 --- a/rust/kcl-lib/tests/tangential_arc/ops.snap +++ b/rust/kcl-lib/tests/tangential_arc/ops.snap @@ -5,7 +5,7 @@ description: Operations executed tangential_arc.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/tangential_arc/program_memory.snap b/rust/kcl-lib/tests/tangential_arc/program_memory.snap index db039e8fe..dce5b27b5 100644 --- a/rust/kcl-lib/tests/tangential_arc/program_memory.snap +++ b/rust/kcl-lib/tests/tangential_arc/program_memory.snap @@ -107,22 +107,34 @@ description: Variables in memory after executing tangential_arc.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/translate_after_fillet/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/translate_after_fillet/artifact_graph_flowchart.snap.md index d3f417d5b..e4b679728 100644 --- a/rust/kcl-lib/tests/translate_after_fillet/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/translate_after_fillet/artifact_graph_flowchart.snap.md @@ -1,35 +1,35 @@ ```mermaid flowchart LR subgraph path2 [Path] - 2["Path
[347, 417, 0]"] - 3["Segment
[347, 417, 0]"] + 2["Path
[345, 415, 0]"] + 3["Segment
[345, 415, 0]"] 4[Solid2d] end subgraph path13 [Path] - 13["Path
[655, 742, 0]"] - 14["Segment
[750, 829, 0]"] - 15["Segment
[837, 916, 0]"] - 16["Segment
[924, 1003, 0]"] - 17["Segment
[1011, 1089, 0]"] - 18["Segment
[1097, 1175, 0]"] - 19["Segment
[1183, 1190, 0]"] + 13["Path
[660, 747, 0]"] + 14["Segment
[755, 834, 0]"] + 15["Segment
[842, 921, 0]"] + 16["Segment
[929, 1008, 0]"] + 17["Segment
[1016, 1094, 0]"] + 18["Segment
[1102, 1180, 0]"] + 19["Segment
[1188, 1195, 0]"] 20[Solid2d] end subgraph path41 [Path] - 41["Path
[1291, 1360, 0]"] - 42["Segment
[1291, 1360, 0]"] + 41["Path
[1303, 1372, 0]"] + 42["Segment
[1303, 1372, 0]"] 43[Solid2d] end - 1["Plane
[320, 339, 0]"] - 5["Sweep Extrusion
[425, 458, 0]"] + 1["Plane
[320, 337, 0]"] + 5["Sweep Extrusion
[423, 456, 0]"] 6[Wall] 7["Cap Start"] 8["Cap End"] 9["SweepEdge Opposite"] 10["SweepEdge Adjacent"] - 11["EdgeCut Fillet
[466, 532, 0]"] - 12["EdgeCut Fillet
[466, 532, 0]"] - 21["Sweep Extrusion
[1198, 1238, 0]"] + 11["EdgeCut Fillet
[464, 530, 0]"] + 12["EdgeCut Fillet
[464, 530, 0]"] + 21["Sweep Extrusion
[1203, 1243, 0]"] 22[Wall] 23[Wall] 24[Wall] @@ -49,14 +49,14 @@ flowchart LR 38["SweepEdge Adjacent"] 39["SweepEdge Opposite"] 40["SweepEdge Adjacent"] - 44["Sweep Extrusion
[1368, 1396, 0]"] + 44["Sweep Extrusion
[1380, 1408, 0]"] 45[Wall] 46["Cap End"] 47["SweepEdge Opposite"] 48["SweepEdge Adjacent"] - 49["EdgeCut Fillet
[1404, 1463, 0]"] - 50["StartSketchOnFace
[615, 647, 0]"] - 51["StartSketchOnFace
[1253, 1283, 0]"] + 49["EdgeCut Fillet
[1416, 1475, 0]"] + 50["StartSketchOnFace
[613, 652, 0]"] + 51["StartSketchOnFace
[1258, 1295, 0]"] 1 --- 2 2 --- 3 2 ---- 5 diff --git a/rust/kcl-lib/tests/translate_after_fillet/ast.snap b/rust/kcl-lib/tests/translate_after_fillet/ast.snap index e5ebc1db7..0f803c13a 100644 --- a/rust/kcl-lib/tests/translate_after_fillet/ast.snap +++ b/rust/kcl-lib/tests/translate_after_fillet/ast.snap @@ -391,13 +391,20 @@ description: Result of parsing translate_after_fillet.kcl { "arguments": [ { + "abs_path": false, "commentStart": 0, "end": 0, - "raw": "'XZ'", + "name": { + "commentStart": 0, + "end": 0, + "name": "XZ", + "start": 0, + "type": "Identifier" + }, + "path": [], "start": 0, - "type": "Literal", - "type": "Literal", - "value": "XZ" + "type": "Name", + "type": "Name" } ], "callee": { @@ -788,29 +795,23 @@ description: Result of parsing translate_after_fillet.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "boltHead", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'start'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "start" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'start'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "start" + } } ], "callee": { @@ -831,8 +832,24 @@ description: Result of parsing translate_after_fillet.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "boltHead", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ @@ -1446,29 +1463,23 @@ description: Result of parsing translate_after_fillet.kcl { "arguments": [ { - "abs_path": false, - "commentStart": 0, - "end": 0, - "name": { + "type": "LabeledArg", + "label": { "commentStart": 0, "end": 0, - "name": "boltHead", + "name": "face", "start": 0, "type": "Identifier" }, - "path": [], - "start": 0, - "type": "Name", - "type": "Name" - }, - { - "commentStart": 0, - "end": 0, - "raw": "'end'", - "start": 0, - "type": "Literal", - "type": "Literal", - "value": "end" + "arg": { + "commentStart": 0, + "end": 0, + "raw": "'end'", + "start": 0, + "type": "Literal", + "type": "Literal", + "value": "end" + } } ], "callee": { @@ -1489,8 +1500,24 @@ description: Result of parsing translate_after_fillet.kcl "commentStart": 0, "end": 0, "start": 0, - "type": "CallExpression", - "type": "CallExpression" + "type": "CallExpressionKw", + "type": "CallExpressionKw", + "unlabeled": { + "abs_path": false, + "commentStart": 0, + "end": 0, + "name": { + "commentStart": 0, + "end": 0, + "name": "boltHead", + "start": 0, + "type": "Identifier" + }, + "path": [], + "start": 0, + "type": "Name", + "type": "Name" + } }, { "arguments": [ diff --git a/rust/kcl-lib/tests/translate_after_fillet/input.kcl b/rust/kcl-lib/tests/translate_after_fillet/input.kcl index 4a6ffd1af..cec01967a 100644 --- a/rust/kcl-lib/tests/translate_after_fillet/input.kcl +++ b/rust/kcl-lib/tests/translate_after_fillet/input.kcl @@ -8,13 +8,13 @@ export boltThreadLength = 1.75 export fn bolt() { // Create the head of the cap screw - boltHead = startSketchOn('XZ') + boltHead = startSketchOn(XZ) |> circle(center = [0, 0], radius = boltHeadDiameter / 2, tag = $topEdge) |> extrude(length = -boltHeadLength) |> fillet(radius = 0.020, tags = [topEdge, getOppositeEdge(topEdge)]) // Define the sketch of the hex pattern on the screw head - hexPatternSketch = startSketchOn(boltHead, 'start') + hexPatternSketch = startSketchOn(boltHead, face = 'start') |> startProfileAt([ boltHexDrive / 2, boltHexFlatLength / 2 @@ -42,7 +42,7 @@ export fn bolt() { |> close() |> extrude(length = -boltHeadLength * 0.75) - boltBody = startSketchOn(boltHead, 'end') + boltBody = startSketchOn(boltHead, face = 'end') |> circle(center = [0, 0], radius = boltDiameter / 2, tag = $filletEdge) |> extrude(length = boltLength) |> fillet(radius = .020, tags = [getOppositeEdge(filletEdge)]) diff --git a/rust/kcl-lib/tests/translate_after_fillet/ops.snap b/rust/kcl-lib/tests/translate_after_fillet/ops.snap index 328297744..5f8dba9b2 100644 --- a/rust/kcl-lib/tests/translate_after_fillet/ops.snap +++ b/rust/kcl-lib/tests/translate_after_fillet/ops.snap @@ -28,7 +28,7 @@ description: Operations executed translate_after_fillet.kcl "name": "bolt", "functionSourceRange": [ 264, - 1553, + 1565, 0 ], "unlabeledArg": null, @@ -38,10 +38,10 @@ description: Operations executed translate_after_fillet.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { - "type": "String", - "value": "XZ" + "type": "Plane", + "artifact_id": "[uuid]" }, "sourceRange": [] } @@ -134,16 +134,7 @@ description: Operations executed translate_after_fillet.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "start" @@ -154,7 +145,15 @@ description: Operations executed translate_after_fillet.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { @@ -190,16 +189,7 @@ description: Operations executed translate_after_fillet.kcl }, { "labeledArgs": { - "data": { - "value": { - "type": "Solid", - "value": { - "artifactId": "[uuid]" - } - }, - "sourceRange": [] - }, - "tag": { + "face": { "value": { "type": "String", "value": "end" @@ -210,7 +200,15 @@ description: Operations executed translate_after_fillet.kcl "name": "startSketchOn", "sourceRange": [], "type": "StdLibCall", - "unlabeledArg": null + "unlabeledArg": { + "value": { + "type": "Solid", + "value": { + "artifactId": "[uuid]" + } + }, + "sourceRange": [] + } }, { "labeledArgs": { diff --git a/rust/kcl-lib/tests/translate_after_fillet/program_memory.snap b/rust/kcl-lib/tests/translate_after_fillet/program_memory.snap index 3ab1dcea8..4cf278276 100644 --- a/rust/kcl-lib/tests/translate_after_fillet/program_memory.snap +++ b/rust/kcl-lib/tests/translate_after_fillet/program_memory.snap @@ -49,16 +49,26 @@ description: Variables in memory after executing translate_after_fillet.kcl "type": "Number", "value": 0.5, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "boltHexFlatLength": { "type": "Number", "value": 0.2887, "ty": { - "type": "Known", - "type": "Count" + "type": "Default", + "len": { + "type": "Mm" + }, + "angle": { + "type": "Degrees" + } } }, "boltLength": { diff --git a/rust/kcl-lib/tests/translate_after_fillet/unparsed.snap b/rust/kcl-lib/tests/translate_after_fillet/unparsed.snap index 9ca228aa6..747005173 100644 --- a/rust/kcl-lib/tests/translate_after_fillet/unparsed.snap +++ b/rust/kcl-lib/tests/translate_after_fillet/unparsed.snap @@ -18,7 +18,7 @@ export fn bolt() { |> fillet(radius = 0.020, tags = [topEdge, getOppositeEdge(topEdge)]) // Define the sketch of the hex pattern on the screw head - hexPatternSketch = startSketchOn(boltHead, 'start') + hexPatternSketch = startSketchOn(boltHead, face = 'start') |> startProfileAt([ boltHexDrive / 2, boltHexFlatLength / 2 @@ -31,7 +31,7 @@ export fn bolt() { |> close() |> extrude(length = -boltHeadLength * 0.75) - boltBody = startSketchOn(boltHead, 'end') + boltBody = startSketchOn(boltHead, face = 'end') |> circle(center = [0, 0], radius = boltDiameter / 2, tag = $filletEdge) |> extrude(length = boltLength) |> fillet(radius = .020, tags = [getOppositeEdge(filletEdge)]) diff --git a/rust/kcl-lib/tests/union_cubes/ops.snap b/rust/kcl-lib/tests/union_cubes/ops.snap index 388e0e6ee..8224d7b05 100644 --- a/rust/kcl-lib/tests/union_cubes/ops.snap +++ b/rust/kcl-lib/tests/union_cubes/ops.snap @@ -20,7 +20,7 @@ description: Operations executed union_cubes.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" @@ -85,7 +85,7 @@ description: Operations executed union_cubes.kcl }, { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "Plane", "artifact_id": "[uuid]" diff --git a/rust/kcl-lib/tests/union_cubes/program_memory.snap b/rust/kcl-lib/tests/union_cubes/program_memory.snap index 4963a0198..f9aabe747 100644 --- a/rust/kcl-lib/tests/union_cubes/program_memory.snap +++ b/rust/kcl-lib/tests/union_cubes/program_memory.snap @@ -134,22 +134,34 @@ description: Variables in memory after executing union_cubes.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -312,22 +324,34 @@ description: Variables in memory after executing union_cubes.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -492,22 +516,34 @@ description: Variables in memory after executing union_cubes.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" @@ -670,22 +706,34 @@ description: Variables in memory after executing union_cubes.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-lib/tests/xz_plane/ops.snap b/rust/kcl-lib/tests/xz_plane/ops.snap index f003462e5..f33952b87 100644 --- a/rust/kcl-lib/tests/xz_plane/ops.snap +++ b/rust/kcl-lib/tests/xz_plane/ops.snap @@ -5,7 +5,7 @@ description: Operations executed xz_plane.kcl [ { "labeledArgs": { - "data": { + "planeOrSolid": { "value": { "type": "String", "value": "XZ" diff --git a/rust/kcl-lib/tests/xz_plane/program_memory.snap b/rust/kcl-lib/tests/xz_plane/program_memory.snap index c3b5ccc2d..286ec9b51 100644 --- a/rust/kcl-lib/tests/xz_plane/program_memory.snap +++ b/rust/kcl-lib/tests/xz_plane/program_memory.snap @@ -102,22 +102,34 @@ description: Variables in memory after executing xz_plane.kcl "origin": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "xAxis": { "x": 1.0, "y": 0.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "yAxis": { "x": 0.0, "y": 0.0, - "z": 1.0 + "z": 1.0, + "units": { + "type": "Mm" + } }, "zAxis": { "x": 0.0, "y": -1.0, - "z": 0.0 + "z": 0.0, + "units": { + "type": "Mm" + } }, "units": { "type": "Mm" diff --git a/rust/kcl-wasm-lib/src/wasm.rs b/rust/kcl-wasm-lib/src/wasm.rs index 957875761..78c5c19c4 100644 --- a/rust/kcl-wasm-lib/src/wasm.rs +++ b/rust/kcl-wasm-lib/src/wasm.rs @@ -1,7 +1,7 @@ //! Wasm bindings for `kcl`. use gloo_utils::format::JsValueSerdeExt; -use kcl_lib::{pretty::NumericSuffix, CoreDump, Point2d, Program}; +use kcl_lib::{pretty::NumericSuffix, CoreDump, Program}; use wasm_bindgen::prelude::*; // wasm_bindgen wrapper for execute @@ -234,15 +234,11 @@ pub struct WasmCircleParams { /// Calculate a circle from 3 points. #[wasm_bindgen] pub fn calculate_circle_from_3_points(ax: f64, ay: f64, bx: f64, by: f64, cx: f64, cy: f64) -> WasmCircleParams { - let result = kcl_lib::std::utils::calculate_circle_from_3_points([ - Point2d { x: ax, y: ay }, - Point2d { x: bx, y: by }, - Point2d { x: cx, y: cy }, - ]); + let result = kcl_lib::std::utils::calculate_circle_from_3_points([[ax, ay], [bx, by], [cx, cy]]); WasmCircleParams { - center_x: result.center.x, - center_y: result.center.y, + center_x: result.center[0], + center_y: result.center[1], radius: result.radius, } } diff --git a/src/lang/modifyAst.test.ts b/src/lang/modifyAst.test.ts index 7a75a0fcc..ab529488e 100644 --- a/src/lang/modifyAst.test.ts +++ b/src/lang/modifyAst.test.ts @@ -438,7 +438,7 @@ describe('testing sketchOnExtrudedFace', () => { |> line(end = [8.62, -9.57]) |> close() |> extrude(length = 5 + 7) -sketch001 = startSketchOn(part001, seg01)`) +sketch001 = startSketchOn(part001, face = seg01)`) }) test('it should be able to extrude on close segments', async () => { const code = `part001 = startSketchOn(-XZ) @@ -476,7 +476,7 @@ sketch001 = startSketchOn(part001, seg01)`) |> line(end = [8.62, -9.57]) |> close(tag = $seg01) |> extrude(length = 5 + 7) -sketch001 = startSketchOn(part001, seg01)`) +sketch001 = startSketchOn(part001, face = seg01)`) }) test('it should be able to extrude on start-end caps', async () => { const code = `part001 = startSketchOn(-XZ) @@ -515,7 +515,7 @@ sketch001 = startSketchOn(part001, seg01)`) |> line(end = [8.62, -9.57]) |> close() |> extrude(length = 5 + 7) -sketch001 = startSketchOn(part001, 'END')`) +sketch001 = startSketchOn(part001, face = 'END')`) }) test('it should ensure that the new sketch is inserted after the extrude', async () => { const code = `sketch001 = startSketchOn(-XZ) @@ -554,7 +554,7 @@ sketch001 = startSketchOn(part001, 'END')`) if (err(updatedAst)) throw updatedAst const newCode = recast(updatedAst.modifiedAst) expect(newCode).toContain(`part001 = extrude(sketch001, length = 5 + 7) -sketch002 = startSketchOn(part001, seg01)`) +sketch002 = startSketchOn(part001, face = seg01)`) }) }) @@ -912,7 +912,7 @@ sketch003 = startSketchOn(XZ) // |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) // |> close() // const extrude001 = extrude(sketch001, length = 5) - // sketch002 = startSketchOn(extrude001, seg01) + // sketch002 = startSketchOn(extrude001, face = seg01) // |> startProfileAt([-12.55, 2.89], %) // |> line(end = [3.02, 1.9]) // |> line(end = [1.82, -1.49], tag = $seg02) @@ -933,12 +933,10 @@ sketch003 = startSketchOn(XZ) // |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) // |> close() // sketch002 = startSketchOn({ - // plane = { // origin = { x = 1, y = 2, z = 3 }, // xAxis = { x = 4, y = 5, z = 6 }, // yAxis = { x = 7, y = 8, z = 9 }, // zAxis = { x = 10, y = 11, z = 12 } - // } // }) // |> startProfileAt([-12.55, 2.89], %) // |> line(end = [3.02, 1.9]) @@ -968,7 +966,7 @@ sketch003 = startSketchOn(XZ) // |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) // |> close() // const extrude001 = extrude(sketch001, length = 5) - // sketch002 = startSketchOn(extrude001, seg01) + // sketch002 = startSketchOn(extrude001, face = seg01) // |> startProfileAt([-12.55, 2.89], %) // |> line(end = [3.02, 1.9]) // |> line(end = [1.82, -1.49], tag = $seg02) @@ -989,12 +987,10 @@ sketch003 = startSketchOn(XZ) // |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) // |> close() // sketch002 = startSketchOn({ - // plane = { // origin = { x = 1, y = 2, z = 3 }, // xAxis = { x = 4, y = 5, z = 6 }, // yAxis = { x = 7, y = 8, z = 9 }, // zAxis = { x = 10, y = 11, z = 12 } - // } // }) // |> startProfileAt([-12.55, 2.89], %) // |> line(end = [3.02, 1.9]) diff --git a/src/lang/modifyAst.ts b/src/lang/modifyAst.ts index cb7619a47..d318e376c 100644 --- a/src/lang/modifyAst.ts +++ b/src/lang/modifyAst.ts @@ -98,9 +98,11 @@ export function startSketchOnDefault( const _name = name || findUniqueName(node, KCL_DEFAULT_CONSTANT_PREFIXES.SKETCH) - const startSketchOn = createCallExpressionStdLib('startSketchOn', [ + const startSketchOn = createCallExpressionStdLibKw( + 'startSketchOn', createLiteral(axis), - ]) + [] + ) const variableDeclaration = createVariableDeclaration(_name, startSketchOn) _node.body = [...node.body, variableDeclaration] @@ -180,9 +182,11 @@ export function addSketchTo( const _name = name || findUniqueName(node, KCL_DEFAULT_CONSTANT_PREFIXES.SKETCH) - const startSketchOn = createCallExpressionStdLib('startSketchOn', [ + const startSketchOn = createCallExpressionStdLibKw( + 'startSketchOn', createLiteral(axis.toUpperCase()), - ]) + [] + ) const startProfileAt = createCallExpressionStdLib('startProfileAt', [ createLiteral('default'), createPipeSubstitution(), @@ -727,10 +731,11 @@ export function sketchOnExtrudedFace( } const newSketch = createVariableDeclaration( newSketchName, - createCallExpressionStdLib('startSketchOn', [ + createCallExpressionStdLibKw( + 'startSketchOn', createLocalName(extrudeName ? extrudeName : oldSketchName), - _tag, - ]), + [createLabeledArg('face', _tag)] + ), undefined, 'const' ) @@ -987,9 +992,11 @@ export function sketchOnOffsetPlane( ) const newSketch = createVariableDeclaration( newSketchName, - createCallExpressionStdLib('startSketchOn', [ + createCallExpressionStdLibKw( + 'startSketchOn', createLocalName(offsetPlaneName), - ]), + [] + ), undefined, 'const' ) @@ -1535,32 +1542,32 @@ export async function deleteFromSelection( ) { continue } - const expression = createCallExpressionStdLib('startSketchOn', [ + const expression = createCallExpressionStdLibKw( + 'startSketchOn', createObjectExpression({ - plane: createObjectExpression({ - origin: createObjectExpression({ - x: roundLiteral(faceDetails.origin.x), - y: roundLiteral(faceDetails.origin.y), - z: roundLiteral(faceDetails.origin.z), - }), - xAxis: createObjectExpression({ - x: roundLiteral(faceDetails.x_axis.x), - y: roundLiteral(faceDetails.x_axis.y), - z: roundLiteral(faceDetails.x_axis.z), - }), - yAxis: createObjectExpression({ - x: roundLiteral(faceDetails.y_axis.x), - y: roundLiteral(faceDetails.y_axis.y), - z: roundLiteral(faceDetails.y_axis.z), - }), - zAxis: createObjectExpression({ - x: roundLiteral(faceDetails.z_axis.x), - y: roundLiteral(faceDetails.z_axis.y), - z: roundLiteral(faceDetails.z_axis.z), - }), + origin: createObjectExpression({ + x: roundLiteral(faceDetails.origin.x), + y: roundLiteral(faceDetails.origin.y), + z: roundLiteral(faceDetails.origin.z), + }), + xAxis: createObjectExpression({ + x: roundLiteral(faceDetails.x_axis.x), + y: roundLiteral(faceDetails.x_axis.y), + z: roundLiteral(faceDetails.x_axis.z), + }), + yAxis: createObjectExpression({ + x: roundLiteral(faceDetails.y_axis.x), + y: roundLiteral(faceDetails.y_axis.y), + z: roundLiteral(faceDetails.y_axis.z), + }), + zAxis: createObjectExpression({ + x: roundLiteral(faceDetails.z_axis.x), + y: roundLiteral(faceDetails.z_axis.y), + z: roundLiteral(faceDetails.z_axis.z), }), }), - ]) + [] + ) if ( parentInit.type === 'VariableDeclarator' && lastKey === 'init' @@ -1584,7 +1591,8 @@ export async function deleteFromSelection( selection?.artifact?.type === 'segment' && selection?.artifact?.surfaceId ) if ( - pipeBody[0].type === 'CallExpression' && + (pipeBody[0].type === 'CallExpression' || + pipeBody[0].type === 'CallExpressionKw') && doNotDeleteProfileIfItHasBeenExtruded && (pipeBody[0].callee.name.name === 'startSketchOn' || pipeBody[0].callee.name.name === 'startProfileAt') diff --git a/src/lang/modifyAst/addEdgeTreatment.test.ts b/src/lang/modifyAst/addEdgeTreatment.test.ts index 35576ace8..3ec92e0a8 100644 --- a/src/lang/modifyAst/addEdgeTreatment.test.ts +++ b/src/lang/modifyAst/addEdgeTreatment.test.ts @@ -254,7 +254,7 @@ extrude003 = extrude(sketch003, length = -15)` |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() |> extrude(length = 50) -sketch002 = startSketchOn(sketch001, 'END') +sketch002 = startSketchOn(sketch001, face = 'END') |> startProfileAt([-15, -15], %) |> yLine(length = 30) |> xLine(length = 30) @@ -279,7 +279,7 @@ sketch002 = startSketchOn(sketch001, 'END') |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() extrude001 = extrude(sketch001, length = 50) -sketch002 = startSketchOn(extrude001, 'END') +sketch002 = startSketchOn(extrude001, face = 'END') |> startProfileAt([-15, -15], %) |> yLine(length = 30) |> xLine(length = 30) diff --git a/src/lang/queryAst.test.ts b/src/lang/queryAst.test.ts index 8c691d46f..1d9fa8a90 100644 --- a/src/lang/queryAst.test.ts +++ b/src/lang/queryAst.test.ts @@ -487,13 +487,13 @@ describe('Testing hasSketchPipeBeenExtruded', () => { |> line(end = [-17.67, 0.85]) |> close() extrude001 = extrude(sketch001, length = 10) -sketch002 = startSketchOn(extrude001, seg01) +sketch002 = startSketchOn(extrude001, face = seg01) |> startProfileAt([-12.94, 6.6], %) |> line(end = [2.45, -0.2]) |> line(end = [-2, -1.25]) |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> close() -sketch003 = startSketchOn(extrude001, 'END') +sketch003 = startSketchOn(extrude001, face = 'END') |> startProfileAt([8.14, 2.8], %) |> line(end = [-1.24, 4.39]) |> line(end = [3.79, 1.91]) @@ -564,7 +564,7 @@ describe('Testing doesSceneHaveSweepableSketch', () => { |> line(end = [-17.67, 0.85]) |> close() extrude001 = extrude(sketch001, length = 10) -sketch002 = startSketchOn(extrude001, $seg01) +sketch002 = startSketchOn(extrude001, face = $seg01) |> startProfileAt([-12.94, 6.6], %) |> line(end = [2.45, -0.2]) |> line(end = [-2, -1.25]) diff --git a/src/lang/queryAst.ts b/src/lang/queryAst.ts index 2c9180c16..0ffe4539e 100644 --- a/src/lang/queryAst.ts +++ b/src/lang/queryAst.ts @@ -934,10 +934,13 @@ export function getBodyIndex(pathToNode: PathToNode): number | Error { } export function isCallExprWithName( - expr: Expr | CallExpression, + expr: Expr | CallExpression | CallExpressionKw, name: string -): expr is CallExpression { - if (expr.type === 'CallExpression' && expr.callee.type === 'Name') { +): expr is CallExpression | CallExpressionKw { + if ( + (expr.type === 'CallExpression' || expr.type === 'CallExpressionKw') && + expr.callee.type === 'Name' + ) { return expr.callee.name.name === name } return false diff --git a/src/lib/exampleKcl.ts b/src/lib/exampleKcl.ts index ec92a48fb..54bc623d7 100644 --- a/src/lib/exampleKcl.ts +++ b/src/lib/exampleKcl.ts @@ -35,14 +35,14 @@ extrude001 = extrude(sketch001, length = width) |> fillet(radius = filletRadius, tags = [seg02, getOppositeEdge(seg02)]) |> fillet(radius = filletRadius, tags = [seg05, getOppositeEdge(seg05)]) -sketch002 = startSketchOn(extrude001, seg03) +sketch002 = startSketchOn(extrude001, face = seg03) |> circle(center = [-1.25, 1], radius = mountingHoleDiameter / 2) |> patternLinear2d(instances = 2, distance = 2.5, axis = [-1, 0]) |> patternLinear2d(instances = 2, distance = 4, axis = [0, 1]) extrude002 = extrude(sketch002, length = -thickness - .01) -sketch003 = startSketchOn(extrude002, seg04) +sketch003 = startSketchOn(extrude002, face = seg04) |> circle(center = [1, -1], radius = mountingHoleDiameter / 2) |> patternLinear2d(instances = 2, distance = 4, axis = [1, 0]) diff --git a/src/lib/promptToEdit.ts b/src/lib/promptToEdit.ts index c8289f2df..455f9c9f8 100644 --- a/src/lib/promptToEdit.ts +++ b/src/lib/promptToEdit.ts @@ -81,7 +81,7 @@ export async function submitPromptToEditToQueue({ The source range most likely refers to "startProfileAt" simply because this is the start of the profile that was swept. If you need to operate on this cap, for example for sketching on the face, you can use the special string ${ artifact.subType === 'end' ? 'END' : 'START' - } i.e. \`startSketchOn(someSweepVariable, ${ + } i.e. \`startSketchOn(someSweepVariable, face = ${ artifact.subType === 'end' ? 'END' : 'START' })\` When they made this selection they main have intended this surface directly or meant something more general like the sweep body. @@ -102,7 +102,7 @@ See later source ranges for more context.`, if (artifact?.type === 'wall') { prompts.push({ prompt: `The users main selection is the wall of a general-sweep (that is an extrusion, revolve, sweep or loft). -The source range though is for the original segment before it was extruded, you can add a tag to that segment in order to refer to this wall, for example "startSketchOn(someSweepVariable, segmentTag)" +The source range though is for the original segment before it was extruded, you can add a tag to that segment in order to refer to this wall, for example "startSketchOn(someSweepVariable, face = segmentTag)" But it's also worth bearing in mind that the user may have intended to select the sweep itself, not this individual wall, see later source ranges for more context. about the sweep`, range: convertAppRangeToApiRange(selection.codeRef.range, code), })