Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Preserve face sense in STEP import/export
Yuechen Li7b40a4f19b16
diff --git a/.gitignore b/.gitignoreindex bf4ad379..1dc4035a 100644--- a/.gitignore+++ b/.gitignore@@ -363,3 +363,4 @@ MigrationBackup/FodyWeavers.xsd/testdata/step214/handcrafted/baseline/stair.STEP/Aetheris.Kernel.Core.Tests/TessellationHoleDiagnosticsTests.cs+/Aetheris.Kernel.Core/Brep/Boolean/Aetheris Boolean Gemini Action Packet.zipdiff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242Ftc06SameSenseRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242Ftc06SameSenseRegressionTests.csnew file mode 100644index 00000000..b502b03f--- /dev/null+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242Ftc06SameSenseRegressionTests.cs@@ -0,0 +1,307 @@+using Aetheris.Kernel.Core.Brep;+using Aetheris.Kernel.Core.Geometry;+using Aetheris.Kernel.Core.Step242;+using System.Globalization;+using System.Text;++namespace Aetheris.Kernel.Core.Tests.Step242;++public sealed class Step242Ftc06SameSenseRegressionTests+{+ [Fact]+ public void ExportBody_ImportedCylindricalFaceWithFalseSameSense_PreservesAdvancedFaceSense()+ {+ const string cylinderFace = @"ISO-10303-21;+HEADER;+ENDSEC;+DATA;+#1=MANIFOLD_SOLID_BREP('solid',#2);+#2=CLOSED_SHELL($,(#3));+#3=ADVANCED_FACE((#4),#5,.F.);+#4=FACE_OUTER_BOUND($,#6,.T.);+#5=CYLINDRICAL_SURFACE($,#30,1.0);+#6=EDGE_LOOP($,(#7,#8,#9,#10));+#7=ORIENTED_EDGE($,$,$,#11,.T.);+#8=ORIENTED_EDGE($,$,$,#12,.T.);+#9=ORIENTED_EDGE($,$,$,#13,.T.);+#10=ORIENTED_EDGE($,$,$,#14,.T.);+#11=EDGE_CURVE($,#15,#16,#17,.T.);+#12=EDGE_CURVE($,#16,#16,#18,.T.);+#13=EDGE_CURVE($,#16,#15,#19,.T.);+#14=EDGE_CURVE($,#15,#15,#20,.T.);+#15=VERTEX_POINT($,#21);+#16=VERTEX_POINT($,#22);+#17=LINE($,#21,#23);+#18=CIRCLE($,#31,1.0);+#19=LINE($,#22,#24);+#20=CIRCLE($,#30,1.0);+#21=CARTESIAN_POINT($,(1,0,0));+#22=CARTESIAN_POINT($,(1,0,1));+#23=VECTOR($,#25,1.0);+#24=VECTOR($,#26,1.0);+#25=DIRECTION($,(0,0,1));+#26=DIRECTION($,(0,0,-1));+#30=AXIS2_PLACEMENT_3D($,#27,#28,#29);+#31=AXIS2_PLACEMENT_3D($,#32,#28,#29);+#32=CARTESIAN_POINT($,(0,0,1));+#27=CARTESIAN_POINT($,(0,0,0));+#28=DIRECTION($,(0,0,1));+#29=DIRECTION($,(1,0,0));+ENDSEC;+END-ISO-10303-21;";++ var import = Step242Importer.ImportBody(cylinderFace);+ Assert.True(import.IsSuccess);++ var curvedFace = Assert.Single(import.Value.Topology.Faces);+ Assert.True(import.Value.Bindings.TryGetFaceBinding(curvedFace.Id, out var binding));+ Assert.False(binding.SameSense);++ var export = Step242Exporter.ExportBody(import.Value);+ Assert.True(export.IsSuccess);++ var advancedFace = Assert.Single(ParseAdvancedFacesBySurfaceType(export.Value, "CYLINDRICAL_SURFACE"));+ Assert.False(advancedFace.SameSense);+ }++ [Fact]+ public void Step242Ftc06Import_DoesNotRegress()+ {+ var source = LoadFixture("testdata/step242/nist/FTC/nist_ftc_06_asme1_ap242-e2.stp");++ var import = Step242Importer.ImportBody(source);++ Assert.True(import.IsSuccess);+ Assert.Equal(187, import.Value.Topology.Faces.Count());+ Assert.Equal(476, import.Value.Topology.Edges.Count());+ Assert.Equal(310, import.Value.Topology.Vertices.Count());+ }++ [Fact]+ public void Step242Ftc06Export_HasStableTopologySummary()+ {+ var source = LoadFixture("testdata/step242/nist/FTC/nist_ftc_06_asme1_ap242-e2.stp");++ var import = Step242Importer.ImportBody(source);+ Assert.True(import.IsSuccess);++ var export = Step242Exporter.ExportBody(import.Value);+ Assert.True(export.IsSuccess);++ var roundTrip = Step242Importer.ImportBody(export.Value);+ Assert.True(roundTrip.IsSuccess);++ Assert.Equal(import.Value.Topology.Faces.Count(), roundTrip.Value.Topology.Faces.Count());+ Assert.Equal(import.Value.Topology.Edges.Count(), roundTrip.Value.Topology.Edges.Count());+ Assert.Equal(import.Value.Topology.Vertices.Count(), roundTrip.Value.Topology.Vertices.Count());+ Assert.Equal(BuildSurfaceFamilyCounts(import.Value), BuildSurfaceFamilyCounts(roundTrip.Value));+ }++ [Fact]+ public void Step242Ftc06ProblemFace_AdvancedFaceSameSense_Regression()+ {+ var source = LoadFixture("testdata/step242/nist/FTC/nist_ftc_06_asme1_ap242-e2.stp");+ var sourceSummary = SummarizeAdvancedFaceSense(source);++ Assert.Equal(65, sourceSummary[("CYLINDRICAL_SURFACE", false)]);+ Assert.Equal(12, sourceSummary[("TOROIDAL_SURFACE", false)]);+ Assert.Equal(4, sourceSummary[("SPHERICAL_SURFACE", false)]);+ Assert.Equal(4, sourceSummary[("CONICAL_SURFACE", false)]);++ var import = Step242Importer.ImportBody(source);+ Assert.True(import.IsSuccess);++ var importedBindingSummary = SummarizeCurvedFaceBindingSense(import.Value);+ Assert.Equal(sourceSummary[("CYLINDRICAL_SURFACE", false)], importedBindingSummary[("CYLINDRICAL_SURFACE", false)]);+ Assert.Equal(sourceSummary[("TOROIDAL_SURFACE", false)], importedBindingSummary[("TOROIDAL_SURFACE", false)]);+ Assert.Equal(sourceSummary[("SPHERICAL_SURFACE", false)], importedBindingSummary[("SPHERICAL_SURFACE", false)]);+ Assert.Equal(sourceSummary[("CONICAL_SURFACE", false)], importedBindingSummary[("CONICAL_SURFACE", false)]);++ var export = Step242Exporter.ExportBody(import.Value);+ Assert.True(export.IsSuccess);++ var exportSummary = SummarizeAdvancedFaceSense(export.Value);+ Assert.Equal(sourceSummary, exportSummary);+ }++ [Fact]+ public void Step242Ftc06_DiagnosticsIdentifyNoKnownInvalidTrimCondition()+ {+ var source = LoadFixture("testdata/step242/nist/FTC/nist_ftc_06_asme1_ap242-e2.stp");+ var import = Step242Importer.ImportBody(source);+ Assert.True(import.IsSuccess);++ var export = Step242Exporter.ExportBody(import.Value);+ Assert.True(export.IsSuccess);++ var mismatches = FindCurvedAdvancedFaceSameSenseLosses(source, export.Value);+ Assert.Empty(mismatches);+ }++ private static Dictionary<(string SurfaceType, bool SameSense), int> SummarizeAdvancedFaceSense(string stepText)+ {+ var summary = new Dictionary<(string SurfaceType, bool SameSense), int>();+ foreach (var face in ParseAdvancedFaces(stepText))+ {+ var key = (face.SurfaceType, face.SameSense);+ summary[key] = summary.TryGetValue(key, out var count) ? count + 1 : 1;+ }++ return summary;+ }++ private static Dictionary<(string SurfaceType, bool SameSense), int> SummarizeCurvedFaceBindingSense(BrepBody body)+ {+ var summary = new Dictionary<(string SurfaceType, bool SameSense), int>();+ foreach (var face in body.Topology.Faces.OrderBy(face => face.Id.Value))+ {+ Assert.True(body.Bindings.TryGetFaceBinding(face.Id, out var binding));+ Assert.True(body.Geometry.TryGetSurface(binding.SurfaceGeometryId, out var surface));+ Assert.NotNull(surface);++ var surfaceType = surface!.Kind switch+ {+ SurfaceGeometryKind.Cylinder => "CYLINDRICAL_SURFACE",+ SurfaceGeometryKind.Cone => "CONICAL_SURFACE",+ SurfaceGeometryKind.Sphere => "SPHERICAL_SURFACE",+ SurfaceGeometryKind.Torus => "TOROIDAL_SURFACE",+ _ => null+ };++ if (surfaceType is null)+ {+ continue;+ }++ var key = (surfaceType, binding.SameSense);+ summary[key] = summary.TryGetValue(key, out var count) ? count + 1 : 1;+ }++ return summary;+ }++ private static IReadOnlyList<string> FindCurvedAdvancedFaceSameSenseLosses(string sourceStepText, string exportedStepText)+ {+ var sourceSummary = SummarizeAdvancedFaceSense(sourceStepText);+ var exportSummary = SummarizeAdvancedFaceSense(exportedStepText);+ var interestingSurfaceTypes = new[]+ {+ "CYLINDRICAL_SURFACE",+ "CONICAL_SURFACE",+ "SPHERICAL_SURFACE",+ "TOROIDAL_SURFACE"+ };++ var losses = new List<string>();+ foreach (var surfaceType in interestingSurfaceTypes)+ {+ var sourceFalse = sourceSummary.GetValueOrDefault((surfaceType, false));+ var exportFalse = exportSummary.GetValueOrDefault((surfaceType, false));+ if (sourceFalse != exportFalse)+ {+ losses.Add($"{surfaceType}: source false-sense faces={sourceFalse}, export false-sense faces={exportFalse}");+ }+ }++ return losses;+ }++ private static Dictionary<string, int> BuildSurfaceFamilyCounts(BrepBody body)+ {+ var counts = new Dictionary<string, int>(StringComparer.Ordinal);+ foreach (var face in body.Topology.Faces)+ {+ Assert.True(body.Bindings.TryGetFaceBinding(face.Id, out var binding));+ Assert.True(body.Geometry.TryGetSurface(binding.SurfaceGeometryId, out var surface));+ Assert.NotNull(surface);++ var key = surface!.Kind.ToString();+ counts[key] = counts.TryGetValue(key, out var count) ? count + 1 : 1;+ }++ return counts;+ }++ private static IReadOnlyList<AdvancedFaceRecord> ParseAdvancedFacesBySurfaceType(string stepText, string surfaceType) =>+ ParseAdvancedFaces(stepText).Where(face => string.Equals(face.SurfaceType, surfaceType, StringComparison.Ordinal)).ToArray();++ private static IReadOnlyList<AdvancedFaceRecord> ParseAdvancedFaces(string stepText)+ {+ var entityMap = ParseEntityMap(stepText);+ var faces = new List<AdvancedFaceRecord>();+ foreach (var (entityId, rhs) in entityMap)+ {+ if (!rhs.StartsWith("ADVANCED_FACE(", StringComparison.Ordinal))+ {+ continue;+ }++ var surfaceEntityId = ReadLastReferenceBeforeSameSense(rhs);+ var sameSense = rhs.EndsWith(".T.)", StringComparison.Ordinal)+ ? true+ : rhs.EndsWith(".F.)", StringComparison.Ordinal)+ ? false+ : throw new InvalidOperationException($"Could not parse ADVANCED_FACE same_sense from '{rhs}'.");++ var surfaceRhs = entityMap[surfaceEntityId];+ var surfaceType = surfaceRhs[..surfaceRhs.IndexOf('(')];+ faces.Add(new AdvancedFaceRecord(entityId, surfaceType, sameSense));+ }++ return faces;+ }++ private static Dictionary<int, string> ParseEntityMap(string stepText)+ {+ var map = new Dictionary<int, string>();+ foreach (var rawLine in stepText.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))+ {+ if (!rawLine.StartsWith("#", StringComparison.Ordinal))+ {+ continue;+ }++ var equalsIndex = rawLine.IndexOf('=');+ if (equalsIndex <= 1)+ {+ continue;+ }++ var id = int.Parse(rawLine.AsSpan(1, equalsIndex - 1), CultureInfo.InvariantCulture);+ map[id] = rawLine[(equalsIndex + 1)..^1];+ }++ return map;+ }++ private static int ReadLastReferenceBeforeSameSense(string rhs)+ {+ var markerIndex = rhs.LastIndexOf(",.", StringComparison.Ordinal);+ if (markerIndex < 0)+ {+ throw new InvalidOperationException($"Could not find same_sense marker in '{rhs}'.");+ }++ var referenceIndex = rhs.LastIndexOf('#', markerIndex);+ if (referenceIndex < 0)+ {+ throw new InvalidOperationException($"Could not find surface reference in '{rhs}'.");+ }++ var end = referenceIndex + 1;+ while (end < rhs.Length && char.IsDigit(rhs[end]))+ {+ end++;+ }++ return int.Parse(rhs.AsSpan(referenceIndex + 1, end - referenceIndex - 1), CultureInfo.InvariantCulture);+ }++ private static string LoadFixture(string relativePath)+ {+ var path = Path.Combine(Step242CorpusManifestRunner.RepoRoot(), relativePath.Replace('/', Path.DirectorySeparatorChar));+ return File.ReadAllText(path, Encoding.UTF8);+ }++ private sealed record AdvancedFaceRecord(int FaceEntityId, string SurfaceType, bool SameSense);+}diff --git a/Aetheris.Kernel.Core/Brep/BrepBindings.cs b/Aetheris.Kernel.Core/Brep/BrepBindings.csindex 958f4b9d..e873822d 100644--- a/Aetheris.Kernel.Core/Brep/BrepBindings.cs+++ b/Aetheris.Kernel.Core/Brep/BrepBindings.cs@@ -9,7 +9,10 @@ public readonly record struct EdgeGeometryBinding(ParameterInterval? TrimInterval = null,bool OrientedEdgeSense = true);-public readonly record struct FaceGeometryBinding(FaceId FaceId, SurfaceGeometryId SurfaceGeometryId);+public readonly record struct FaceGeometryBinding(+ FaceId FaceId,+ SurfaceGeometryId SurfaceGeometryId,+ bool SameSense = true);/// <summary>/// Explicit topology-to-geometry binding container.diff --git a/Aetheris.Kernel.Core/Step242/Step242Exporter.cs b/Aetheris.Kernel.Core/Step242/Step242Exporter.csindex c23e794a..0ac2e61b 100644--- a/Aetheris.Kernel.Core/Step242/Step242Exporter.cs+++ b/Aetheris.Kernel.Core/Step242/Step242Exporter.cs@@ -203,7 +203,7 @@ public static class Step242ExporterStep242TextWriter.String(string.Empty),Step242TextWriter.List(loopBoundIds.ToArray()),Step242TextWriter.Ref(surfaceIdResult.Value),- Step242TextWriter.BooleanLogical(true));+ Step242TextWriter.BooleanLogical(faceBinding.SameSense));faceIds.Add(advancedFaceId);}diff --git a/Aetheris.Kernel.Core/Step242/Step242Importer.cs b/Aetheris.Kernel.Core/Step242/Step242Importer.csindex c3c4fb9e..485c1928 100644--- a/Aetheris.Kernel.Core/Step242/Step242Importer.cs+++ b/Aetheris.Kernel.Core/Step242/Step242Importer.cs@@ -455,7 +455,7 @@ public static class Step242Importervar (surfaceGeometryId, surfaceGeometry) = bindSurfaceResult.Value;nextSurfaceGeometryId++;geometry.AddSurface(surfaceGeometryId, surfaceGeometry);- bindings.AddFaceBinding(new FaceGeometryBinding(faceId, surfaceGeometryId));+ bindings.AddFaceBinding(new FaceGeometryBinding(faceId, surfaceGeometryId, faceSameSenseResult.Value));}foreach (var coedge in coedges)diff --git a/docs/step-ap242-ftc06-import-validity-house-call.md b/docs/step-ap242-ftc06-import-validity-house-call.mdnew file mode 100644index 00000000..58823c47--- /dev/null+++ b/docs/step-ap242-ftc06-import-validity-house-call.md@@ -0,0 +1,115 @@+# STEP-AP242-HARDEN-X1 — FTC-06 import validity house call++## 1. Problem statement++FTC-06 imported into Aetheris, re-exported as STEP, and then opened in SolidWorks with import diagnostics showing faulty faces. The visible symptom cluster was concentrated around spherical, toroidal, cylindrical, and conical trimmed features rather than open-shell gaps.++## 2. FTC-06 / FTC-07 correction++This house call is FTC-06 only.++- FTC-06: import/export validity defect investigated here.+- FTC-07: separate current issue where local import hangs.++No FTC-07 hang work is included in this change.++## 3. Reproduction commands++Locate the fixture:++```powershell+rg -n "FTC-06|FTC06|ftc_06|nist_ftc_06|NIST.*06|Ftc.*06" .+```++Reproduce the import/export path:++```powershell+dotnet run --project Aetheris.CLI -- canon testdata\step242\nist\FTC\nist_ftc_06_asme1_ap242-e2.stp --out artifacts\ftc06\nist_ftc_06_canonical.step --json+dotnet run --project Aetheris.CLI -- analyze testdata\step242\nist\FTC\nist_ftc_06_asme1_ap242-e2.stp --json+dotnet run --project Aetheris.CLI -- analyze artifacts\ftc06\nist_ftc_06_canonical.step --json+```++Focused regression lane:++```powershell+dotnet test Aetheris.Kernel.Core.Tests\Aetheris.Kernel.Core.Tests.csproj -f net10.0 --filter "Step242Ftc06SameSenseRegressionTests|ImportedCylindricalFaceWithFalseSameSense|FTC06|Ftc06|same_sense" --logger "console;verbosity=minimal"+```++## 4. Observed SolidWorks symptom summary++- SolidWorks opened the exported FTC-06 artifact but reported faulty faces.+- The visible hotspots were spherical/toroidal/cylindrical/conical trimmed features.+- Reported gaps were zero in the screenshot, suggesting invalid face orientation/trim semantics rather than shell leakage.++## 5. Aetheris internal diagnosis++FTC-06 imports as one enclosed manifold body with stable topology counts:++- faces: 187+- edges: 476+- vertices: 310+- surface families: 71 plane, 88 cylinder, 8 cone, 8 sphere, 12 torus++The critical forensic finding was face orientation loss on curved faces:++- the source FTC-06 STEP contains many curved `ADVANCED_FACE(...,.F.)` entries+- importer preserved `same_sense` only for planar faces+- importer dropped `same_sense` for cylinders, cones, spheres, and tori+- exporter then wrote every `ADVANCED_FACE` back out as `.T.`++Source FTC-06 curved false-sense counts:++- cylindrical: 65+- toroidal: 12+- spherical: 4+- conical: 4++This means Aetheris was changing the orientation contract of many curved faces during round-trip export even when topology counts stayed stable.++## 6. Root cause found++Minimal root cause:++- `ADVANCED_FACE.same_sense` was not preserved in `FaceGeometryBinding` for non-planar faces.+- `Step242Exporter` serialized all faces with `same_sense = .T.` regardless of imported orientation.++This is especially dangerous for periodic/trimmed analytic faces such as cylinders, spheres, toroids, and cones, which matches the external symptom cluster in FTC-06.++## 7. Fix applied++Applied narrow fix:++- extended `FaceGeometryBinding` with `SameSense`+- stored imported `ADVANCED_FACE.same_sense` in the binding model+- emitted `ADVANCED_FACE` with the preserved binding sense during export++No general NURBS work, Boolean work, or topology redesign was introduced.++## 8. Tests added++Added focused regressions:++- `ExportBody_ImportedCylindricalFaceWithFalseSameSense_PreservesAdvancedFaceSense`+- `Step242Ftc06Import_DoesNotRegress`+- `Step242Ftc06Export_HasStableTopologySummary`+- `Step242Ftc06ProblemFace_AdvancedFaceSameSense_Regression`+- `Step242Ftc06_DiagnosticsIdentifyNoKnownInvalidTrimCondition`++The FTC-06 regression verifies that the exported curved-face false-sense mix now matches the source FTC-06 orientation ledger instead of being flattened to `.T.`.++## 9. Remaining limitations / blockers++- This fix addresses curved `ADVANCED_FACE.same_sense` loss only.+- It does not prove that every SolidWorks faulty-face report is eliminated; SolidWorks automation is not part of the repo evidence lane.+- Full solution build currently has an unrelated `Aetheris.Server` file-lock failure in this workspace.+- The broad STEP/NIST filter also hits pre-existing canonical SHA snapshot drift unrelated to this FTC-06 orientation fix.++## 10. Non-goals++- FTC-07 hang+- general NURBS support+- general Boolean behavior changes+- Firmament V2 feature work+- AIR Region route policy changes+- CIR authority model changes+- broad BRep redesigndiff --git a/testdata/firmament/exports/m3b-valid-box-subtract-straight-slot.step b/testdata/firmament/exports/m3b-valid-box-subtract-straight-slot.stepindex b56df9a1..71343f4b 100644--- a/testdata/firmament/exports/m3b-valid-box-subtract-straight-slot.step+++ b/testdata/firmament/exports/m3b-valid-box-subtract-straight-slot.step@@ -94,7 +94,7 @@ DATA;#87=LINE($,#84,#86);#88=EDGE_CURVE($,#75,#83,#87,.T.);#89=ORIENTED_EDGE($,$,$,#88,.F.);-#90=CARTESIAN_POINT($,(11.6955181300451,-1.53073372946036,-10));+#90=CARTESIAN_POINT($,(11.6955181300451,-1.53073372946035,-10));#91=VERTEX_POINT($,#90);#92=CARTESIAN_POINT($,(10.8284271247462,-2.82842712474619,-10));#93=DIRECTION($,(0.555570233019603,0.831469612302545,0));@@ -104,7 +104,7 @@ DATA;#97=ORIENTED_EDGE($,$,$,#96,.F.);#98=CARTESIAN_POINT($,(12,-0,-10));#99=VERTEX_POINT($,#98);-#100=CARTESIAN_POINT($,(11.6955181300451,-1.53073372946036,-10));+#100=CARTESIAN_POINT($,(11.6955181300451,-1.53073372946035,-10));#101=DIRECTION($,(0.195090322016128,0.980785280403231,0));#102=VECTOR($,#101,1);#103=LINE($,#100,#102);@@ -280,7 +280,7 @@ DATA;#273=LINE($,#270,#272);#274=EDGE_CURVE($,#261,#269,#273,.T.);#275=ORIENTED_EDGE($,$,$,#274,.T.);-#276=CARTESIAN_POINT($,(11.6955181300451,-1.53073372946036,10));+#276=CARTESIAN_POINT($,(11.6955181300451,-1.53073372946035,10));#277=VERTEX_POINT($,#276);#278=CARTESIAN_POINT($,(10.8284271247462,-2.82842712474619,10));#279=DIRECTION($,(0.555570233019603,0.831469612302545,0));@@ -290,7 +290,7 @@ DATA;#283=ORIENTED_EDGE($,$,$,#282,.T.);#284=CARTESIAN_POINT($,(12,0,10));#285=VERTEX_POINT($,#284);-#286=CARTESIAN_POINT($,(11.6955181300451,-1.53073372946036,10));+#286=CARTESIAN_POINT($,(11.6955181300451,-1.53073372946035,10));#287=DIRECTION($,(0.195090322016128,0.980785280403231,0));#288=VECTOR($,#287,1);#289=LINE($,#286,#288);@@ -560,7 +560,7 @@ DATA;#553=ORIENTED_EDGE($,$,$,#96,.F.);#554=ORIENTED_EDGE($,$,$,#543,.T.);#555=ORIENTED_EDGE($,$,$,#282,.T.);-#556=CARTESIAN_POINT($,(11.6955181300451,-1.53073372946036,-10));+#556=CARTESIAN_POINT($,(11.6955181300451,-1.53073372946035,-10));#557=DIRECTION($,(0,0,1));#558=VECTOR($,#557,1);#559=LINE($,#556,#558);diff --git a/testdata/firmament/exports/part.step b/testdata/firmament/exports/part.stepindex 92c23cf0..ce1ec737 100644--- a/testdata/firmament/exports/part.step+++ b/testdata/firmament/exports/part.step@@ -5,38 +5,38 @@ FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris')FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));ENDSEC;DATA;-#1=CARTESIAN_POINT($,(0,0,4));+#1=CARTESIAN_POINT($,(0,0,-8));#2=DIRECTION($,(0,0,-1));#3=DIRECTION($,(1,0,0));#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);#5=PLANE($,#4);-#6=CARTESIAN_POINT($,(-19,-15,4));+#6=CARTESIAN_POINT($,(-35,-20,-8));#7=VERTEX_POINT($,#6);-#8=CARTESIAN_POINT($,(41,-15,4));+#8=CARTESIAN_POINT($,(35,-20,-8));#9=VERTEX_POINT($,#8);-#10=CARTESIAN_POINT($,(-19,-15,4));+#10=CARTESIAN_POINT($,(-35,-20,-8));#11=DIRECTION($,(1,0,0));#12=VECTOR($,#11,1);#13=LINE($,#10,#12);#14=EDGE_CURVE($,#7,#9,#13,.T.);#15=ORIENTED_EDGE($,$,$,#14,.T.);-#16=CARTESIAN_POINT($,(41,15,4));+#16=CARTESIAN_POINT($,(35,20,-8));#17=VERTEX_POINT($,#16);-#18=CARTESIAN_POINT($,(41,-15,4));+#18=CARTESIAN_POINT($,(35,-20,-8));#19=DIRECTION($,(0,1,0));#20=VECTOR($,#19,1);#21=LINE($,#18,#20);#22=EDGE_CURVE($,#9,#17,#21,.T.);#23=ORIENTED_EDGE($,$,$,#22,.T.);-#24=CARTESIAN_POINT($,(-19,15,4));+#24=CARTESIAN_POINT($,(-35,20,-8));#25=VERTEX_POINT($,#24);-#26=CARTESIAN_POINT($,(41,15,4));+#26=CARTESIAN_POINT($,(35,20,-8));#27=DIRECTION($,(-1,0,0));#28=VECTOR($,#27,1);#29=LINE($,#26,#28);#30=EDGE_CURVE($,#17,#25,#29,.T.);#31=ORIENTED_EDGE($,$,$,#30,.T.);-#32=CARTESIAN_POINT($,(-19,15,4));+#32=CARTESIAN_POINT($,(-35,20,-8));#33=DIRECTION($,(0,-1,0));#34=VECTOR($,#33,1);#35=LINE($,#32,#34);@@ -44,9 +44,9 @@ DATA;#37=ORIENTED_EDGE($,$,$,#36,.T.);#38=EDGE_LOOP($,(#15,#23,#31,#37));#39=FACE_OUTER_BOUND('',#38,.T.);-#40=CARTESIAN_POINT($,(-11.5,0,4));+#40=CARTESIAN_POINT($,(3.5,0,-8));#41=VERTEX_POINT($,#40);-#42=CARTESIAN_POINT($,(-15,0,4));+#42=CARTESIAN_POINT($,(0,0,-8));#43=DIRECTION($,(0,0,1));#44=DIRECTION($,(1,0,0));#45=AXIS2_PLACEMENT_3D($,#42,#43,#44);@@ -55,226 +55,225 @@ DATA;#48=ORIENTED_EDGE($,$,$,#47,.F.);#49=EDGE_LOOP($,(#48));#50=FACE_BOUND('',#49,.T.);-#51=CARTESIAN_POINT($,(29.5,0,18));-#52=VERTEX_POINT($,#51);-#53=CARTESIAN_POINT($,(26,0,18));-#54=DIRECTION($,(0,0,1));-#55=DIRECTION($,(1,0,0));-#56=AXIS2_PLACEMENT_3D($,#53,#54,#55);-#57=CIRCLE($,#56,3.5);-#58=EDGE_CURVE($,#52,#52,#57,.T.);-#59=ORIENTED_EDGE($,$,$,#58,.F.);-#60=EDGE_LOOP($,(#59));-#61=FACE_BOUND('',#60,.T.);-#62=ADVANCED_FACE('',(#39,#50,#61),#5,.T.);-#63=CARTESIAN_POINT($,(0,0,44));-#64=DIRECTION($,(0,0,1));-#65=DIRECTION($,(1,0,0));-#66=AXIS2_PLACEMENT_3D($,#63,#64,#65);-#67=PLANE($,#66);-#68=CARTESIAN_POINT($,(-19,-15,44));-#69=VERTEX_POINT($,#68);-#70=CARTESIAN_POINT($,(41,-15,44));-#71=VERTEX_POINT($,#70);-#72=CARTESIAN_POINT($,(-19,-15,44));-#73=DIRECTION($,(1,0,0));-#74=VECTOR($,#73,1);-#75=LINE($,#72,#74);-#76=EDGE_CURVE($,#69,#71,#75,.T.);-#77=ORIENTED_EDGE($,$,$,#76,.T.);-#78=CARTESIAN_POINT($,(41,15,44));-#79=VERTEX_POINT($,#78);-#80=CARTESIAN_POINT($,(41,-15,44));-#81=DIRECTION($,(0,1,0));-#82=VECTOR($,#81,1);-#83=LINE($,#80,#82);-#84=EDGE_CURVE($,#71,#79,#83,.T.);-#85=ORIENTED_EDGE($,$,$,#84,.T.);-#86=CARTESIAN_POINT($,(-19,15,44));-#87=VERTEX_POINT($,#86);-#88=CARTESIAN_POINT($,(41,15,44));-#89=DIRECTION($,(-1,0,0));-#90=VECTOR($,#89,1);-#91=LINE($,#88,#90);-#92=EDGE_CURVE($,#79,#87,#91,.T.);-#93=ORIENTED_EDGE($,$,$,#92,.T.);-#94=CARTESIAN_POINT($,(-19,15,44));-#95=DIRECTION($,(0,-1,0));-#96=VECTOR($,#95,1);-#97=LINE($,#94,#96);-#98=EDGE_CURVE($,#87,#69,#97,.T.);+#51=ADVANCED_FACE('',(#39,#50),#5,.T.);+#52=CARTESIAN_POINT($,(0,0,8));+#53=DIRECTION($,(0,0,1));+#54=DIRECTION($,(1,0,0));+#55=AXIS2_PLACEMENT_3D($,#52,#53,#54);+#56=PLANE($,#55);+#57=CARTESIAN_POINT($,(-35,-20,8));+#58=VERTEX_POINT($,#57);+#59=CARTESIAN_POINT($,(35,-20,8));+#60=VERTEX_POINT($,#59);+#61=CARTESIAN_POINT($,(-35,-20,8));+#62=DIRECTION($,(1,0,0));+#63=VECTOR($,#62,1);+#64=LINE($,#61,#63);+#65=EDGE_CURVE($,#58,#60,#64,.T.);+#66=ORIENTED_EDGE($,$,$,#65,.T.);+#67=CARTESIAN_POINT($,(35,20,8));+#68=VERTEX_POINT($,#67);+#69=CARTESIAN_POINT($,(35,-20,8));+#70=DIRECTION($,(0,1,0));+#71=VECTOR($,#70,1);+#72=LINE($,#69,#71);+#73=EDGE_CURVE($,#60,#68,#72,.T.);+#74=ORIENTED_EDGE($,$,$,#73,.T.);+#75=CARTESIAN_POINT($,(-35,20,8));+#76=VERTEX_POINT($,#75);+#77=CARTESIAN_POINT($,(35,20,8));+#78=DIRECTION($,(-1,0,0));+#79=VECTOR($,#78,1);+#80=LINE($,#77,#79);+#81=EDGE_CURVE($,#68,#76,#80,.T.);+#82=ORIENTED_EDGE($,$,$,#81,.T.);+#83=CARTESIAN_POINT($,(-35,20,8));+#84=DIRECTION($,(0,-1,0));+#85=VECTOR($,#84,1);+#86=LINE($,#83,#85);+#87=EDGE_CURVE($,#76,#58,#86,.T.);+#88=ORIENTED_EDGE($,$,$,#87,.T.);+#89=EDGE_LOOP($,(#66,#74,#82,#88));+#90=FACE_OUTER_BOUND('',#89,.T.);+#91=CARTESIAN_POINT($,(7,0,8));+#92=VERTEX_POINT($,#91);+#93=CARTESIAN_POINT($,(0,0,8));+#94=DIRECTION($,(0,0,1));+#95=DIRECTION($,(1,0,0));+#96=AXIS2_PLACEMENT_3D($,#93,#94,#95);+#97=CIRCLE($,#96,7);+#98=EDGE_CURVE($,#92,#92,#97,.T.);#99=ORIENTED_EDGE($,$,$,#98,.T.);-#100=EDGE_LOOP($,(#77,#85,#93,#99));-#101=FACE_OUTER_BOUND('',#100,.T.);-#102=ADVANCED_FACE('',(#101),#67,.T.);-#103=CARTESIAN_POINT($,(0,-15,0));+#100=EDGE_LOOP($,(#99));+#101=FACE_BOUND('',#100,.T.);+#102=ADVANCED_FACE('',(#90,#101),#56,.T.);+#103=CARTESIAN_POINT($,(0,-20,0));#104=DIRECTION($,(0,-1,0));#105=DIRECTION($,(1,0,0));#106=AXIS2_PLACEMENT_3D($,#103,#104,#105);#107=PLANE($,#106);#108=ORIENTED_EDGE($,$,$,#14,.T.);-#109=CARTESIAN_POINT($,(41,-15,4));+#109=CARTESIAN_POINT($,(35,-20,-8));#110=DIRECTION($,(0,0,1));#111=VECTOR($,#110,1);#112=LINE($,#109,#111);-#113=EDGE_CURVE($,#9,#71,#112,.T.);+#113=EDGE_CURVE($,#9,#60,#112,.T.);#114=ORIENTED_EDGE($,$,$,#113,.T.);-#115=ORIENTED_EDGE($,$,$,#76,.F.);-#116=CARTESIAN_POINT($,(-19,-15,4));+#115=ORIENTED_EDGE($,$,$,#65,.F.);+#116=CARTESIAN_POINT($,(-35,-20,-8));#117=DIRECTION($,(0,0,1));#118=VECTOR($,#117,1);#119=LINE($,#116,#118);-#120=EDGE_CURVE($,#7,#69,#119,.T.);+#120=EDGE_CURVE($,#7,#58,#119,.T.);#121=ORIENTED_EDGE($,$,$,#120,.F.);#122=EDGE_LOOP($,(#108,#114,#115,#121));#123=FACE_OUTER_BOUND('',#122,.T.);#124=ADVANCED_FACE('',(#123),#107,.T.);-#125=CARTESIAN_POINT($,(41,0,0));+#125=CARTESIAN_POINT($,(35,0,0));#126=DIRECTION($,(1,0,0));#127=DIRECTION($,(0,1,0));#128=AXIS2_PLACEMENT_3D($,#125,#126,#127);#129=PLANE($,#128);#130=ORIENTED_EDGE($,$,$,#22,.T.);-#131=CARTESIAN_POINT($,(41,15,4));+#131=CARTESIAN_POINT($,(35,20,-8));#132=DIRECTION($,(0,0,1));#133=VECTOR($,#132,1);#134=LINE($,#131,#133);-#135=EDGE_CURVE($,#17,#79,#134,.T.);+#135=EDGE_CURVE($,#17,#68,#134,.T.);#136=ORIENTED_EDGE($,$,$,#135,.T.);-#137=ORIENTED_EDGE($,$,$,#84,.F.);+#137=ORIENTED_EDGE($,$,$,#73,.F.);#138=ORIENTED_EDGE($,$,$,#113,.F.);#139=EDGE_LOOP($,(#130,#136,#137,#138));#140=FACE_OUTER_BOUND('',#139,.T.);#141=ADVANCED_FACE('',(#140),#129,.T.);-#142=CARTESIAN_POINT($,(0,15,0));+#142=CARTESIAN_POINT($,(0,20,0));#143=DIRECTION($,(0,1,0));#144=DIRECTION($,(-1,0,0));#145=AXIS2_PLACEMENT_3D($,#142,#143,#144);#146=PLANE($,#145);#147=ORIENTED_EDGE($,$,$,#30,.T.);-#148=CARTESIAN_POINT($,(-19,15,4));+#148=CARTESIAN_POINT($,(-35,20,-8));#149=DIRECTION($,(0,0,1));#150=VECTOR($,#149,1);#151=LINE($,#148,#150);-#152=EDGE_CURVE($,#25,#87,#151,.T.);+#152=EDGE_CURVE($,#25,#76,#151,.T.);#153=ORIENTED_EDGE($,$,$,#152,.T.);-#154=ORIENTED_EDGE($,$,$,#92,.F.);+#154=ORIENTED_EDGE($,$,$,#81,.F.);#155=ORIENTED_EDGE($,$,$,#135,.F.);#156=EDGE_LOOP($,(#147,#153,#154,#155));#157=FACE_OUTER_BOUND('',#156,.T.);#158=ADVANCED_FACE('',(#157),#146,.T.);-#159=CARTESIAN_POINT($,(-19,0,0));+#159=CARTESIAN_POINT($,(-35,0,0));#160=DIRECTION($,(-1,0,0));#161=DIRECTION($,(0,1,0));#162=AXIS2_PLACEMENT_3D($,#159,#160,#161);#163=PLANE($,#162);#164=ORIENTED_EDGE($,$,$,#36,.T.);#165=ORIENTED_EDGE($,$,$,#120,.T.);-#166=ORIENTED_EDGE($,$,$,#98,.F.);+#166=ORIENTED_EDGE($,$,$,#87,.F.);#167=ORIENTED_EDGE($,$,$,#152,.F.);#168=EDGE_LOOP($,(#164,#165,#166,#167));#169=FACE_OUTER_BOUND('',#168,.T.);#170=ADVANCED_FACE('',(#169),#163,.T.);-#171=CARTESIAN_POINT($,(-15,0,4));+#171=CARTESIAN_POINT($,(0,0,-3));#172=DIRECTION($,(0,0,1));#173=DIRECTION($,(1,0,0));#174=AXIS2_PLACEMENT_3D($,#171,#172,#173);-#175=CYLINDRICAL_SURFACE($,#174,3.5);-#176=CARTESIAN_POINT($,(-11.5,0,10));+#175=CYLINDRICAL_SURFACE($,#174,7);+#176=CARTESIAN_POINT($,(7,0,8));#177=VERTEX_POINT($,#176);-#178=CARTESIAN_POINT($,(-11.5,0,4));+#178=CARTESIAN_POINT($,(7,0,-3));#179=VERTEX_POINT($,#178);-#180=CARTESIAN_POINT($,(-11.5,0,10));+#180=CARTESIAN_POINT($,(7,0,8));#181=DIRECTION($,(0,0,-1));#182=VECTOR($,#181,1);#183=LINE($,#180,#182);#184=EDGE_CURVE($,#177,#179,#183,.T.);#185=ORIENTED_EDGE($,$,$,#184,.T.);-#186=CARTESIAN_POINT($,(-11.5,0,10));-#187=VERTEX_POINT($,#186);-#188=CARTESIAN_POINT($,(-15,0,10));-#189=DIRECTION($,(0,0,1));-#190=DIRECTION($,(1,0,0));-#191=AXIS2_PLACEMENT_3D($,#188,#189,#190);-#192=CIRCLE($,#191,3.5);-#193=EDGE_CURVE($,#187,#187,#192,.T.);-#194=ORIENTED_EDGE($,$,$,#193,.F.);-#195=ORIENTED_EDGE($,$,$,#184,.F.);-#196=ORIENTED_EDGE($,$,$,#47,.T.);-#197=EDGE_LOOP($,(#185,#194,#195,#196));+#186=ORIENTED_EDGE($,$,$,#98,.F.);+#187=ORIENTED_EDGE($,$,$,#184,.F.);+#188=CARTESIAN_POINT($,(7,0,-3));+#189=VERTEX_POINT($,#188);+#190=CARTESIAN_POINT($,(0,0,-3));+#191=DIRECTION($,(0,0,1));+#192=DIRECTION($,(1,0,0));+#193=AXIS2_PLACEMENT_3D($,#190,#191,#192);+#194=CIRCLE($,#193,7);+#195=EDGE_CURVE($,#189,#189,#194,.T.);+#196=ORIENTED_EDGE($,$,$,#195,.T.);+#197=EDGE_LOOP($,(#185,#186,#187,#196));#198=FACE_OUTER_BOUND('',#197,.T.);#199=ADVANCED_FACE('',(#198),#175,.T.);-#200=CARTESIAN_POINT($,(26,0,18));-#201=DIRECTION($,(0,0,1));+#200=CARTESIAN_POINT($,(0,0,-3));+#201=DIRECTION($,(0,0,-1));#202=DIRECTION($,(1,0,0));#203=AXIS2_PLACEMENT_3D($,#200,#201,#202);-#204=CYLINDRICAL_SURFACE($,#203,3.5);-#205=CARTESIAN_POINT($,(29.5,0,38));-#206=VERTEX_POINT($,#205);-#207=CARTESIAN_POINT($,(29.5,0,18));-#208=VERTEX_POINT($,#207);-#209=CARTESIAN_POINT($,(29.5,0,38));-#210=DIRECTION($,(0,0,-1));-#211=VECTOR($,#210,1);-#212=LINE($,#209,#211);-#213=EDGE_CURVE($,#206,#208,#212,.T.);-#214=ORIENTED_EDGE($,$,$,#213,.T.);-#215=CARTESIAN_POINT($,(29.5,0,38));-#216=VERTEX_POINT($,#215);-#217=CARTESIAN_POINT($,(26,0,38));-#218=DIRECTION($,(0,0,1));-#219=DIRECTION($,(1,0,0));-#220=AXIS2_PLACEMENT_3D($,#217,#218,#219);-#221=CIRCLE($,#220,3.5);-#222=EDGE_CURVE($,#216,#216,#221,.T.);-#223=ORIENTED_EDGE($,$,$,#222,.F.);-#224=ORIENTED_EDGE($,$,$,#213,.F.);-#225=ORIENTED_EDGE($,$,$,#58,.T.);-#226=EDGE_LOOP($,(#214,#223,#224,#225));-#227=FACE_OUTER_BOUND('',#226,.T.);-#228=ADVANCED_FACE('',(#227),#204,.T.);-#229=CARTESIAN_POINT($,(-15,0,10));-#230=DIRECTION($,(-0,-0,-1));-#231=DIRECTION($,(1,0,0));-#232=AXIS2_PLACEMENT_3D($,#229,#230,#231);-#233=PLANE($,#232);-#234=ORIENTED_EDGE($,$,$,#193,.T.);-#235=EDGE_LOOP($,(#234));-#236=FACE_OUTER_BOUND('',#235,.T.);-#237=ADVANCED_FACE('',(#236),#233,.T.);-#238=CARTESIAN_POINT($,(26,0,38));-#239=DIRECTION($,(-0,-0,-1));-#240=DIRECTION($,(1,0,0));-#241=AXIS2_PLACEMENT_3D($,#238,#239,#240);-#242=PLANE($,#241);-#243=ORIENTED_EDGE($,$,$,#222,.T.);-#244=EDGE_LOOP($,(#243));-#245=FACE_OUTER_BOUND('',#244,.T.);-#246=ADVANCED_FACE('',(#245),#242,.T.);-#247=CLOSED_SHELL($,(#62,#102,#124,#141,#158,#170,#199,#228,#237,#246));-#248=MANIFOLD_SOLID_BREP('AetherisBody',#247);-#249=APPLICATION_CONTEXT('mechanical design');-#250=PRODUCT_CONTEXT('',#249,'mechanical');-#251=PRODUCT('AETHERIS','AetherisBody','',(#250));-#252=PRODUCT_DEFINITION_FORMATION('','',#251);-#253=PRODUCT_DEFINITION_CONTEXT('design',#249,'design');-#254=PRODUCT_DEFINITION('','',#252,#253);-#255=PRODUCT_DEFINITION_SHAPE('','',#254);-#256=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));-#257=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));-#258=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());-#259=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#256,#257,#258))REPRESENTATION_CONTEXT('3','3D'));-#260=SHAPE_ASPECT('firmament-feature:base_hole','supported cylinder through-hole feature',#255,.FALSE.);-#261=PROPERTY_DEFINITION('diameter:base_hole','auto-derived semantic PMI diameter',#260);-#262=MEASURE_REPRESENTATION_ITEM('diameter',7,#256);-#263=SHAPE_DIMENSION_REPRESENTATION('diameter:base_hole',(#262),#259);-#264=PROPERTY_DEFINITION_REPRESENTATION(#261,#263);-#265=SHAPE_ASPECT('firmament-feature:upright_hole','supported cylinder through-hole feature',#255,.FALSE.);-#266=PROPERTY_DEFINITION('diameter:upright_hole','auto-derived semantic PMI diameter',#265);-#267=MEASURE_REPRESENTATION_ITEM('diameter',7,#256);-#268=SHAPE_DIMENSION_REPRESENTATION('diameter:upright_hole',(#267),#259);-#269=PROPERTY_DEFINITION_REPRESENTATION(#266,#268);-#270=SHAPE_REPRESENTATION('AetherisBody',(#248),#259);-#271=SHAPE_DEFINITION_REPRESENTATION(#255,#270);+#204=PLANE($,#203);+#205=ORIENTED_EDGE($,$,$,#195,.T.);+#206=EDGE_LOOP($,(#205));+#207=FACE_OUTER_BOUND('',#206,.T.);+#208=CARTESIAN_POINT($,(3.5,0,-3));+#209=VERTEX_POINT($,#208);+#210=CARTESIAN_POINT($,(0,0,-3));+#211=DIRECTION($,(0,0,1));+#212=DIRECTION($,(1,0,0));+#213=AXIS2_PLACEMENT_3D($,#210,#211,#212);+#214=CIRCLE($,#213,3.5);+#215=EDGE_CURVE($,#209,#209,#214,.T.);+#216=ORIENTED_EDGE($,$,$,#215,.F.);+#217=EDGE_LOOP($,(#216));+#218=FACE_BOUND('',#217,.T.);+#219=ADVANCED_FACE('',(#207,#218),#204,.T.);+#220=CARTESIAN_POINT($,(0,0,-8));+#221=DIRECTION($,(0,0,1));+#222=DIRECTION($,(1,0,0));+#223=AXIS2_PLACEMENT_3D($,#220,#221,#222);+#224=CYLINDRICAL_SURFACE($,#223,3.5);+#225=CARTESIAN_POINT($,(3.5,0,-3));+#226=VERTEX_POINT($,#225);+#227=CARTESIAN_POINT($,(3.5,0,-8));+#228=VERTEX_POINT($,#227);+#229=CARTESIAN_POINT($,(3.5,0,-3));+#230=DIRECTION($,(0,0,-1));+#231=VECTOR($,#230,1);+#232=LINE($,#229,#231);+#233=EDGE_CURVE($,#226,#228,#232,.T.);+#234=ORIENTED_EDGE($,$,$,#233,.T.);+#235=ORIENTED_EDGE($,$,$,#215,.F.);+#236=ORIENTED_EDGE($,$,$,#233,.F.);+#237=ORIENTED_EDGE($,$,$,#47,.T.);+#238=EDGE_LOOP($,(#234,#235,#236,#237));+#239=FACE_OUTER_BOUND('',#238,.T.);+#240=ADVANCED_FACE('',(#239),#224,.T.);+#241=CLOSED_SHELL($,(#51,#102,#124,#141,#158,#170,#199,#219,#240));+#242=MANIFOLD_SOLID_BREP('AetherisBody',#241);+#243=APPLICATION_CONTEXT('mechanical design');+#244=PRODUCT_CONTEXT('',#243,'mechanical');+#245=PRODUCT('AETHERIS','AetherisBody','',(#244));+#246=PRODUCT_DEFINITION_FORMATION('','',#245);+#247=PRODUCT_DEFINITION_CONTEXT('design',#243,'design');+#248=PRODUCT_DEFINITION('','',#246,#247);+#249=PRODUCT_DEFINITION_SHAPE('','',#248);+#250=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));+#251=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));+#252=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());+#253=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#250,#251,#252))REPRESENTATION_CONTEXT('3','3D'));+#254=SHAPE_ASPECT('firmament-feature:counterbore_pocket','supported cylinder through-hole feature',#249,.FALSE.);+#255=PROPERTY_DEFINITION('diameter:counterbore_pocket','auto-derived semantic PMI diameter',#254);+#256=MEASURE_REPRESENTATION_ITEM('diameter',14,#250);+#257=SHAPE_DIMENSION_REPRESENTATION('diameter:counterbore_pocket',(#256),#253);+#258=PROPERTY_DEFINITION_REPRESENTATION(#255,#257);+#259=SHAPE_ASPECT('firmament-feature:counterbore_through','supported cylinder through-hole feature',#249,.FALSE.);+#260=PROPERTY_DEFINITION('diameter:counterbore_through','auto-derived semantic PMI diameter',#259);+#261=MEASURE_REPRESENTATION_ITEM('diameter',7,#250);+#262=SHAPE_DIMENSION_REPRESENTATION('diameter:counterbore_through',(#261),#253);+#263=PROPERTY_DEFINITION_REPRESENTATION(#260,#262);+#264=SHAPE_ASPECT('firmament-feature:counterbore_through','supported cylinder through-hole feature',#249,.FALSE.);+#265=PROPERTY_DEFINITION('diameter:counterbore_through','auto-derived semantic PMI diameter',#264);+#266=MEASURE_REPRESENTATION_ITEM('diameter',14,#250);+#267=SHAPE_DIMENSION_REPRESENTATION('diameter:counterbore_through',(#266),#253);+#268=PROPERTY_DEFINITION_REPRESENTATION(#265,#267);+#269=SHAPE_REPRESENTATION('AetherisBody',(#242),#253);+#270=SHAPE_DEFINITION_REPRESENTATION(#249,#269);ENDSEC;END-ISO-10303-21;diff --git a/testdata/firmament/exports/straight_slot_basic.step b/testdata/firmament/exports/straight_slot_basic.stepindex 00cd446f..c0da7eb5 100644--- a/testdata/firmament/exports/straight_slot_basic.step+++ b/testdata/firmament/exports/straight_slot_basic.step@@ -23,7 +23,7 @@ DATA;#16=CARTESIAN_POINT($,(13.5355339059327,-3.53553390593274,-0));#17=VERTEX_POINT($,#16);#18=CARTESIAN_POINT($,(11.9134171618255,-4.61939766255643,-0));-#19=DIRECTION($,(0.831469612302545,0.555570233019603,0));+#19=DIRECTION($,(0.831469612302545,0.555570233019602,0));#20=VECTOR($,#19,1);#21=LINE($,#18,#20);#22=EDGE_CURVE($,#9,#17,#21,.T.);@@ -52,7 +52,7 @@ DATA;#45=LINE($,#42,#44);#46=EDGE_CURVE($,#33,#41,#45,.T.);#47=ORIENTED_EDGE($,$,$,#46,.T.);-#48=CARTESIAN_POINT($,(13.5355339059327,3.53553390593274,-0));+#48=CARTESIAN_POINT($,(13.5355339059327,3.53553390593273,-0));#49=VERTEX_POINT($,#48);#50=CARTESIAN_POINT($,(14.6193976625564,1.91341716182545,-0));#51=DIRECTION($,(-0.555570233019602,0.831469612302545,0));@@ -60,17 +60,17 @@ DATA;#53=LINE($,#50,#52);#54=EDGE_CURVE($,#41,#49,#53,.T.);#55=ORIENTED_EDGE($,$,$,#54,.T.);-#56=CARTESIAN_POINT($,(11.9134171618255,4.61939766255643,-0));+#56=CARTESIAN_POINT($,(11.9134171618254,4.61939766255643,-0));#57=VERTEX_POINT($,#56);-#58=CARTESIAN_POINT($,(13.5355339059327,3.53553390593274,-0));-#59=DIRECTION($,(-0.831469612302545,0.555570233019603,0));+#58=CARTESIAN_POINT($,(13.5355339059327,3.53553390593273,-0));+#59=DIRECTION($,(-0.831469612302545,0.555570233019602,0));#60=VECTOR($,#59,1);#61=LINE($,#58,#60);#62=EDGE_CURVE($,#49,#57,#61,.T.);#63=ORIENTED_EDGE($,$,$,#62,.T.);#64=CARTESIAN_POINT($,(10,5,-0));#65=VERTEX_POINT($,#64);-#66=CARTESIAN_POINT($,(11.9134171618255,4.61939766255643,-0));+#66=CARTESIAN_POINT($,(11.9134171618254,4.61939766255643,-0));#67=DIRECTION($,(-0.980785280403231,0.195090322016128,0));#68=VECTOR($,#67,1);#69=LINE($,#66,#68);@@ -175,7 +175,7 @@ DATA;#168=CARTESIAN_POINT($,(13.5355339059327,-3.53553390593274,8));#169=VERTEX_POINT($,#168);#170=CARTESIAN_POINT($,(11.9134171618255,-4.61939766255643,8));-#171=DIRECTION($,(0.831469612302545,0.555570233019603,0));+#171=DIRECTION($,(0.831469612302545,0.555570233019602,0));#172=VECTOR($,#171,1);#173=LINE($,#170,#172);#174=EDGE_CURVE($,#161,#169,#173,.T.);@@ -204,7 +204,7 @@ DATA;#197=LINE($,#194,#196);#198=EDGE_CURVE($,#185,#193,#197,.T.);#199=ORIENTED_EDGE($,$,$,#198,.F.);-#200=CARTESIAN_POINT($,(13.5355339059327,3.53553390593274,8));+#200=CARTESIAN_POINT($,(13.5355339059327,3.53553390593273,8));#201=VERTEX_POINT($,#200);#202=CARTESIAN_POINT($,(14.6193976625564,1.91341716182545,8));#203=DIRECTION($,(-0.555570233019602,0.831469612302545,0));@@ -212,17 +212,17 @@ DATA;#205=LINE($,#202,#204);#206=EDGE_CURVE($,#193,#201,#205,.T.);#207=ORIENTED_EDGE($,$,$,#206,.F.);-#208=CARTESIAN_POINT($,(11.9134171618255,4.61939766255643,8));+#208=CARTESIAN_POINT($,(11.9134171618254,4.61939766255643,8));#209=VERTEX_POINT($,#208);-#210=CARTESIAN_POINT($,(13.5355339059327,3.53553390593274,8));-#211=DIRECTION($,(-0.831469612302545,0.555570233019603,0));+#210=CARTESIAN_POINT($,(13.5355339059327,3.53553390593273,8));+#211=DIRECTION($,(-0.831469612302545,0.555570233019602,0));#212=VECTOR($,#211,1);#213=LINE($,#210,#212);#214=EDGE_CURVE($,#201,#209,#213,.T.);#215=ORIENTED_EDGE($,$,$,#214,.F.);#216=CARTESIAN_POINT($,(10,5,8));#217=VERTEX_POINT($,#216);-#218=CARTESIAN_POINT($,(11.9134171618255,4.61939766255643,8));+#218=CARTESIAN_POINT($,(11.9134171618254,4.61939766255643,8));#219=DIRECTION($,(-0.980785280403231,0.195090322016128,0));#220=VECTOR($,#219,1);#221=LINE($,#218,#220);@@ -332,7 +332,7 @@ DATA;#325=FACE_OUTER_BOUND('',#324,.T.);#326=ADVANCED_FACE('',(#325),#309,.T.);#327=CARTESIAN_POINT($,(11.9134171618254,-4.61939766255643,0));-#328=DIRECTION($,(0.555570233019603,-0.831469612302545,0));+#328=DIRECTION($,(0.555570233019602,-0.831469612302545,0));#329=DIRECTION($,(0,0,1));#330=AXIS2_PLACEMENT_3D($,#327,#328,#329);#331=PLANE($,#330);@@ -405,7 +405,7 @@ DATA;#398=AXIS2_PLACEMENT_3D($,#395,#396,#397);#399=PLANE($,#398);#400=ORIENTED_EDGE($,$,$,#54,.T.);-#401=CARTESIAN_POINT($,(13.5355339059327,3.53553390593274,-0));+#401=CARTESIAN_POINT($,(13.5355339059327,3.53553390593273,-0));#402=DIRECTION($,(0,0,1));#403=VECTOR($,#402,1);#404=LINE($,#401,#403);@@ -417,12 +417,12 @@ DATA;#410=FACE_OUTER_BOUND('',#409,.T.);#411=ADVANCED_FACE('',(#410),#399,.T.);#412=CARTESIAN_POINT($,(13.5355339059327,3.53553390593274,0));-#413=DIRECTION($,(0.555570233019603,0.831469612302545,-0));+#413=DIRECTION($,(0.555570233019602,0.831469612302545,-0));#414=DIRECTION($,(0,0,1));#415=AXIS2_PLACEMENT_3D($,#412,#413,#414);#416=PLANE($,#415);#417=ORIENTED_EDGE($,$,$,#62,.T.);-#418=CARTESIAN_POINT($,(11.9134171618255,4.61939766255643,-0));+#418=CARTESIAN_POINT($,(11.9134171618254,4.61939766255643,-0));#419=DIRECTION($,(0,0,1));#420=VECTOR($,#419,1);#421=LINE($,#418,#420);