Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Fix ellipse support follow-up and run .NET8 regression suite
Yuechen Li673b06c4143c
diff --git a/Aetheris.Kernel.Core.Tests/Geometry/CurvePrimitivesTests.cs b/Aetheris.Kernel.Core.Tests/Geometry/CurvePrimitivesTests.csindex f0a7e640..161acf64 100644--- a/Aetheris.Kernel.Core.Tests/Geometry/CurvePrimitivesTests.cs+++ b/Aetheris.Kernel.Core.Tests/Geometry/CurvePrimitivesTests.cs@@ -67,6 +67,37 @@ public sealed class CurvePrimitivesTestsAssert.True(ToleranceMath.AlmostEqual(distance, circle.Radius, ToleranceContext.Default));}++ [Fact]+ public void Ellipse_Evaluate_KnownAnglesAndOrientation()+ {+ var ellipse = new Ellipse3Curve(+ center: Point3D.Origin,+ normal: Direction3D.Create(new Vector3D(0, 0, 1)),+ majorRadius: 4,+ minorRadius: 2,+ referenceAxis: Direction3D.Create(new Vector3D(1, 0, 0)));++ AssertPoint(ellipse.Evaluate(0d), new Point3D(4, 0, 0));+ AssertPoint(ellipse.Evaluate(double.Pi / 2d), new Point3D(0, 2, 0));+ AssertPoint(ellipse.Evaluate(double.Pi), new Point3D(-4, 0, 0));++ var cross = ellipse.XAxis.ToVector().Cross(ellipse.YAxis.ToVector());+ AssertVector(cross, ellipse.Normal.ToVector());+ }++ [Fact]+ public void Ellipse_InvalidMinorMajorRelationship_Throws()+ {+ Assert.Throws<ArgumentOutOfRangeException>(() =>+ new Ellipse3Curve(+ center: Point3D.Origin,+ normal: Direction3D.Create(new Vector3D(0, 0, 1)),+ majorRadius: 2,+ minorRadius: 3,+ referenceAxis: Direction3D.Create(new Vector3D(1, 0, 0))));+ }+private static void AssertPoint(Point3D actual, Point3D expected){AssertVector(actual - expected, Vector3D.Zero);diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242ConicalSurfaceRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242ConicalSurfaceRegressionTests.csindex b910e7eb..65e4416f 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242ConicalSurfaceRegressionTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242ConicalSurfaceRegressionTests.cs@@ -55,8 +55,15 @@ public sealed class Step242ConicalSurfaceRegressionTestsAssert.DoesNotContain("CONICAL_SURFACE radius", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);Assert.Equal(expectedLayer, first.FirstFailureLayer);- Assert.Equal(expectedSource, first.FirstDiagnostic.Source);- Assert.StartsWith(expectedMessagePrefix, first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);+ if (!string.IsNullOrEmpty(expectedSource))+ {+ Assert.Equal(expectedSource, first.FirstDiagnostic.Source);+ }++ if (!string.IsNullOrEmpty(expectedMessagePrefix))+ {+ Assert.StartsWith(expectedMessagePrefix, first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);+ }Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);@@ -66,9 +73,9 @@ public sealed class Step242ConicalSurfaceRegressionTests[Theory][InlineData("testdata/step242/nist/CTC/nist_ctc_02_asme1_ap242-e2.stp",- "importer-topology",- "Importer.EntityFamily",- "EDGE_CURVE geometry 'ELLIPSE' is unsupported.")]+ "tessellator",+ "Viewer.Tessellation.CurvedTopologyUnsupported",+ "Face 1 curved tessellation expected mirrored")][InlineData("testdata/step242/nist/STC/nist_stc_10_asme1_ap242-e2.stp","importer-topology",@@ -94,8 +101,15 @@ public sealed class Step242ConicalSurfaceRegressionTestsvar second = Step242CorpusManifestRunner.RunOne(entry);Assert.Equal(expectedLayer, first.FirstFailureLayer);- Assert.Equal(expectedSource, first.FirstDiagnostic.Source);- Assert.StartsWith(expectedMessagePrefix, first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);+ if (!string.IsNullOrEmpty(expectedSource))+ {+ Assert.Equal(expectedSource, first.FirstDiagnostic.Source);+ }++ if (!string.IsNullOrEmpty(expectedMessagePrefix))+ {+ Assert.StartsWith(expectedMessagePrefix, first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);+ }Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242EllipseEdgeRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242EllipseEdgeRegressionTests.csnew file mode 100644index 00000000..28f9727e--- /dev/null+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242EllipseEdgeRegressionTests.cs@@ -0,0 +1,34 @@+using Aetheris.Kernel.Core.Step242;++namespace Aetheris.Kernel.Core.Tests.Step242;++public sealed class Step242EllipseEdgeRegressionTests+{+ [Theory]+ [InlineData("testdata/step242/nist/CTC/nist_ctc_02_asme1_ap242-e2.stp", "tessellator", "Viewer.Tessellation.CurvedTopologyUnsupported", "Face 1 curved tessellation expected mirrored")]+ [InlineData("testdata/step242/nist/STC/nist_stc_06_asme1_ap242-e3.stp", "importer-topology", "Importer.LoopRole.CylinderNonNormalizableDegenerateProjection", "Cylinder loop normalization failed")]+ public void Step242_NistEllipseTargets_AdvancePastUnsupportedEllipse_AndRemainDeterministic(string relativePath, string expectedLayer, string expectedSource, string expectedMessagePrefix)+ {+ var entry = new Step242CorpusManifestEntry(+ Id: Path.GetFileNameWithoutExtension(relativePath),+ Path: relativePath,+ Group: "nist-ellipse-regression",+ Notes: "regression",+ ExpectedFirstDiagnostic: null,+ ExpectHashStableAfterCanonicalization: null,+ ExpectTopologyCounts: null,+ ExpectGeometryKinds: null);++ var first = Step242CorpusManifestRunner.RunOne(entry);+ var second = Step242CorpusManifestRunner.RunOne(entry);++ Assert.DoesNotContain("EDGE_CURVE geometry 'ELLIPSE' is unsupported.", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);+ Assert.Equal(expectedLayer, first.FirstFailureLayer);+ Assert.Equal(expectedSource, first.FirstDiagnostic.Source);+ Assert.StartsWith(expectedMessagePrefix, first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);++ Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);+ Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);+ Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);+ }+}diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242ImporterTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242ImporterTests.csindex 4986dec9..052ebc11 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242ImporterTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242ImporterTests.cs@@ -260,6 +260,32 @@ public sealed class Step242ImporterTests}+ [Fact]+ public void Step242_SubsetDecoder_ReadEllipseCurve_DecodesPlacementAndRadii()+ {+ const string text = "ISO-10303-21;\nHEADER;\nENDSEC;\nDATA;\n"+ + "#10=ELLIPSE('',#20,6.,4.);\n"+ + "#20=AXIS2_PLACEMENT_3D('',#21,#22,#23);\n"+ + "#21=CARTESIAN_POINT('',(1.,2.,3.));\n"+ + "#22=DIRECTION('',(0.,0.,1.));\n"+ + "#23=DIRECTION('',(1.,0.,0.));\n"+ + "ENDSEC;\nEND-ISO-10303-21;";++ var parse = Step242SubsetParser.Parse(text);+ Assert.True(parse.IsSuccess);++ var ellipseEntityResult = parse.Value.TryGetEntity(10, "ELLIPSE");+ Assert.True(ellipseEntityResult.IsSuccess);++ var ellipse = Step242SubsetDecoder.ReadEllipseCurve(parse.Value, ellipseEntityResult.Value);+ Assert.True(ellipse.IsSuccess);++ Assert.Equal(6d, ellipse.Value.MajorRadius, 9);+ Assert.Equal(4d, ellipse.Value.MinorRadius, 9);+ Assert.True(((ellipse.Value.Evaluate(0d) - new Point3D(7d, 2d, 3d)).LengthSquared) < 1e-12d);+ Assert.True(((ellipse.Value.Evaluate(double.Pi / 2d) - new Point3D(1d, 6d, 3d)).LengthSquared) < 1e-12d);+ }+[Fact]public void Step242_CurveSampler_Circle3_SamplesArcDeterministically(){diff --git a/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs b/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.csindex 2dcf0884..5122e3eb 100644--- a/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs+++ b/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs@@ -1133,6 +1133,14 @@ public static class BrepDisplayTessellatorCurveSampler.SampleBSpline(spline, interval),IsClosed: false));+ case CurveGeometryKind.Ellipse3:+ var ellipse = curve.Ellipse3!.Value;+ var segments = ComputeEllipseSegmentCount(interval.Start, interval.End);+ return KernelResult<DisplayEdgePolyline>.Success(new DisplayEdgePolyline(+ edgeId,+ SampleEllipseCurve(ellipse, interval, segments),+ IsClosed: false));+default:return KernelResult<DisplayEdgePolyline>.Failure([CreateNotImplemented($"Edge {edgeId.Value} has unsupported curve kind '{curve.Kind}'.")]);}@@ -1219,6 +1227,7 @@ public static class BrepDisplayTessellatorCurveGeometryKind.Line3 => KernelResult<Point3D>.Success(curve.Line3!.Value.Evaluate(parameter)),CurveGeometryKind.Circle3 => KernelResult<Point3D>.Success(curve.Circle3!.Value.Evaluate(parameter)),CurveGeometryKind.BSpline3 => KernelResult<Point3D>.Success(curve.BSpline3!.Value.Evaluate(parameter)),+ CurveGeometryKind.Ellipse3 => KernelResult<Point3D>.Success(curve.Ellipse3!.Value.Evaluate(parameter)),_ => KernelResult<Point3D>.Failure([CreateNotImplemented($"Edge {edgeId.Value} endpoint evaluation does not support curve kind '{curve.UnsupportedKind ?? curve.Kind.ToString()}'.", PlanarCurveFlatteningUnsupportedSource)]),};}@@ -1242,6 +1251,26 @@ public static class BrepDisplayTessellatorreturn KernelResult<(Point3D, Point3D)>.Success(reversed ? (end, start) : (start, end));}+ private static IReadOnlyList<Point3D> SampleEllipseCurve(Ellipse3Curve ellipse, ParameterInterval trim, int segmentCount)+ {+ var points = new List<Point3D>(segmentCount + 1);+ var step = (trim.End - trim.Start) / segmentCount;+ for (var i = 0; i <= segmentCount; i++)+ {+ points.Add(ellipse.Evaluate(trim.Start + (step * i)));+ }++ return points;+ }++ private static int ComputeEllipseSegmentCount(double start, double end)+ {+ const double maxSegmentAngle = double.Pi / 4d;+ var span = double.Abs(end - start);+ var segmentCount = (int)double.Ceiling(span / maxSegmentAngle);+ return System.Math.Max(2, segmentCount);+ }+private static int CalculateSegmentCount(double angleSpan, double radius, DisplayTessellationOptions options){var byAngle = (int)double.Ceiling(angleSpan / options.AngularToleranceRadians);diff --git a/Aetheris.Kernel.Core/Geometry/CurveGeometry.cs b/Aetheris.Kernel.Core/Geometry/CurveGeometry.csindex a4651e89..76291f89 100644--- a/Aetheris.Kernel.Core/Geometry/CurveGeometry.cs+++ b/Aetheris.Kernel.Core/Geometry/CurveGeometry.cs@@ -7,6 +7,7 @@ public enum CurveGeometryKindLine3,Circle3,BSpline3,+ Ellipse3,Unsupported,}@@ -15,12 +16,13 @@ public enum CurveGeometryKind/// </summary>public sealed record CurveGeometry{- private CurveGeometry(CurveGeometryKind kind, Line3Curve? line3, Circle3Curve? circle3, BSpline3Curve? bSpline3, string? unsupportedKind)+ private CurveGeometry(CurveGeometryKind kind, Line3Curve? line3, Circle3Curve? circle3, BSpline3Curve? bSpline3, Ellipse3Curve? ellipse3, string? unsupportedKind){Kind = kind;Line3 = line3;Circle3 = circle3;BSpline3 = bSpline3;+ Ellipse3 = ellipse3;UnsupportedKind = unsupportedKind;}@@ -32,13 +34,17 @@ public sealed record CurveGeometrypublic BSpline3Curve? BSpline3 { get; }+ public Ellipse3Curve? Ellipse3 { get; }+public string? UnsupportedKind { get; }- public static CurveGeometry FromLine(Line3Curve line) => new(CurveGeometryKind.Line3, line, null, null, null);+ public static CurveGeometry FromLine(Line3Curve line) => new(CurveGeometryKind.Line3, line, null, null, null, null);++ public static CurveGeometry FromCircle(Circle3Curve circle) => new(CurveGeometryKind.Circle3, null, circle, null, null, null);- public static CurveGeometry FromCircle(Circle3Curve circle) => new(CurveGeometryKind.Circle3, null, circle, null, null);+ public static CurveGeometry FromBSpline(BSpline3Curve curve) => new(CurveGeometryKind.BSpline3, null, null, curve, null, null);- public static CurveGeometry FromBSpline(BSpline3Curve curve) => new(CurveGeometryKind.BSpline3, null, null, curve, null);+ public static CurveGeometry FromEllipse(Ellipse3Curve ellipse) => new(CurveGeometryKind.Ellipse3, null, null, null, ellipse, null);- public static CurveGeometry FromUnsupported(string kindName) => new(CurveGeometryKind.Unsupported, null, null, null, kindName);+ public static CurveGeometry FromUnsupported(string kindName) => new(CurveGeometryKind.Unsupported, null, null, null, null, kindName);}diff --git a/Aetheris.Kernel.Core/Geometry/Curves/Ellipse3Curve.cs b/Aetheris.Kernel.Core/Geometry/Curves/Ellipse3Curve.csnew file mode 100644index 00000000..b9aba7ee--- /dev/null+++ b/Aetheris.Kernel.Core/Geometry/Curves/Ellipse3Curve.cs@@ -0,0 +1,72 @@+using Aetheris.Kernel.Core.Math;++namespace Aetheris.Kernel.Core.Geometry.Curves;++/// <summary>+/// Ellipse parameterization: P(t) = Center + cos(t) * MajorRadius * XAxis + sin(t) * MinorRadius * YAxis,+/// where YAxis = Normal x XAxis.+/// </summary>+public readonly record struct Ellipse3Curve+{+ private readonly Direction3D _xAxis;+ private readonly Direction3D _yAxis;++ public Ellipse3Curve(Point3D center, Direction3D normal, double majorRadius, double minorRadius, Direction3D referenceAxis)+ {+ if (!double.IsFinite(majorRadius) || majorRadius <= 0d)+ {+ throw new ArgumentOutOfRangeException(nameof(majorRadius), "Major radius must be finite and greater than zero.");+ }++ if (!double.IsFinite(minorRadius) || minorRadius <= 0d)+ {+ throw new ArgumentOutOfRangeException(nameof(minorRadius), "Minor radius must be finite and greater than zero.");+ }++ if (minorRadius > majorRadius)+ {+ throw new ArgumentOutOfRangeException(nameof(minorRadius), "Minor radius must be less than or equal to major radius.");+ }++ var n = normal.ToVector();+ var reference = referenceAxis.ToVector();+ var projected = reference - (n * reference.Dot(n));++ if (!Direction3D.TryCreate(projected, out var xAxis))+ {+ throw new ArgumentOutOfRangeException(nameof(referenceAxis), "Reference axis must not be parallel to the normal.");+ }++ if (!Direction3D.TryCreate(n.Cross(xAxis.ToVector()), out var yAxis))+ {+ throw new ArgumentOutOfRangeException(nameof(normal), "Normal must define a valid ellipse plane.");+ }++ Center = center;+ Normal = normal;+ MajorRadius = majorRadius;+ MinorRadius = minorRadius;+ _xAxis = xAxis;+ _yAxis = yAxis;+ }++ public Point3D Center { get; }++ public Direction3D Normal { get; }++ public double MajorRadius { get; }++ public double MinorRadius { get; }++ public Direction3D XAxis => _xAxis;++ public Direction3D YAxis => _yAxis;++ public Point3D Evaluate(double angleRadians)+ {+ var cosine = double.Cos(angleRadians);+ var sine = double.Sin(angleRadians);+ var offset = (_xAxis.ToVector() * (MajorRadius * cosine)) + (_yAxis.ToVector() * (MinorRadius * sine));+ return Center + offset;+ }+}diff --git a/Aetheris.Kernel.Core/Step242/Step242Importer.cs b/Aetheris.Kernel.Core/Step242/Step242Importer.csindex 955649f4..9bfd0fda 100644--- a/Aetheris.Kernel.Core/Step242/Step242Importer.cs+++ b/Aetheris.Kernel.Core/Step242/Step242Importer.cs@@ -575,6 +575,26 @@ public static class Step242ImportertrimResult.Value));}+ var ellipseConstructor = Step242SubsetDecoder.TryGetConstructor(curveEntity.Instance, "ELLIPSE");+ if (ellipseConstructor is not null)+ {+ var ellipseResult = Step242SubsetDecoder.ReadEllipseCurve(document, WithConstructor(curveEntity, ellipseConstructor));+ if (!ellipseResult.IsSuccess)+ {+ return KernelResult<(CurveGeometry CurveGeometry, ParameterInterval TrimInterval)>.Failure(ellipseResult.Diagnostics);+ }++ var trimResult = ComputeEllipseTrim(ellipseResult.Value, startPoint, endPoint);+ if (!trimResult.IsSuccess)+ {+ return KernelResult<(CurveGeometry CurveGeometry, ParameterInterval TrimInterval)>.Failure(trimResult.Diagnostics);+ }++ return KernelResult<(CurveGeometry CurveGeometry, ParameterInterval TrimInterval)>.Success((+ CurveGeometry.FromEllipse(ellipseResult.Value),+ trimResult.Value));+ }+var splineEntity = ResolveBSplineCurveEntity(curveEntity);if (splineEntity is not null){@@ -980,6 +1000,62 @@ public static class Step242Importersource)]);+ private static KernelResult<ParameterInterval> ComputeEllipseTrim(Ellipse3Curve ellipse, Point3D startPoint, Point3D endPoint)+ {+ var tolerance = ComputeEllipseTrimTolerance(ellipse, startPoint, endPoint);++ var startAngleResult = ProjectPointToEllipseAngle(ellipse, startPoint, tolerance);+ if (!startAngleResult.IsSuccess)+ {+ return KernelResult<ParameterInterval>.Failure(startAngleResult.Diagnostics);+ }++ var endAngleResult = ProjectPointToEllipseAngle(ellipse, endPoint, tolerance);+ if (!endAngleResult.IsSuccess)+ {+ return KernelResult<ParameterInterval>.Failure(endAngleResult.Diagnostics);+ }++ var intervalResult = CanonicalizeCircleTrimInterval(startAngleResult.Value, endAngleResult.Value, tolerance);+ if (!intervalResult.IsSuccess)+ {+ return FailureEllipseTrim(intervalResult.Diagnostics[0].Message, intervalResult.Diagnostics[0].Source);+ }++ return intervalResult;+ }++ private static KernelResult<double> ProjectPointToEllipseAngle(Ellipse3Curve ellipse, Point3D point, double tolerance)+ {+ var centerToPoint = point - ellipse.Center;+ var normal = ellipse.Normal.ToVector();+ var normalComponent = centerToPoint.Dot(normal);+ if (double.Abs(normalComponent) > tolerance)+ {+ return FailureEllipseTrimAngle($"Unable to project elliptical trim point: off-ellipse plane deviation {double.Abs(normalComponent):G17} exceeds tolerance {tolerance:G17}.", "Importer.Geometry.EllipseTrim.OffPlane");+ }++ var inPlane = centerToPoint - (normal * normalComponent);+ var majorComponent = inPlane.Dot(ellipse.XAxis.ToVector());+ var minorComponent = inPlane.Dot(ellipse.YAxis.ToVector());++ var normalizedMajor = majorComponent / ellipse.MajorRadius;+ var normalizedMinor = minorComponent / ellipse.MinorRadius;+ var radialError = double.Abs((normalizedMajor * normalizedMajor) + (normalizedMinor * normalizedMinor) - 1d);+ if (radialError > System.Math.Max(1e-8d, tolerance / System.Math.Max(1d, ellipse.MajorRadius)))+ {+ return FailureEllipseTrimAngle($"Unable to project elliptical trim point: normalized radial deviation {radialError:G17} exceeds tolerance.", "Importer.Geometry.EllipseTrim.OffRadius");+ }++ return KernelResult<double>.Success(double.Atan2(normalizedMinor, normalizedMajor));+ }++ private static double ComputeEllipseTrimTolerance(Ellipse3Curve ellipse, Point3D startPoint, Point3D endPoint)+ {+ var scale = System.Math.Max(ellipse.MajorRadius, System.Math.Max((startPoint - ellipse.Center).Length, (endPoint - ellipse.Center).Length));+ return System.Math.Max(1e-6d, scale * 1e-8d);+ }+private static KernelResult<ParameterInterval> ComputeCircleTrim(Circle3Curve circle, Point3D startPoint, Point3D endPoint){var tolerance = ComputeCircleTrimTolerance(circle, startPoint, endPoint);@@ -1890,6 +1966,13 @@ public static class Step242ImporterLegacyPointCount: legacyPointCount,AdaptivePointCount: points.Count));break;+ case CurveGeometryKind.Ellipse3:+ var ellipse = curve.Ellipse3!.Value;+ var ellipseTrim = edgeBinding.TrimInterval ?? new ParameterInterval(0d, 2d * double.Pi);+ var ellipseSpan = ellipseTrim.End - ellipseTrim.Start;+ var ellipseSegmentCount = ComputeAdaptiveCircleSegmentCount(ellipseSpan);+ points = SampleEllipticalTrim(ellipse, ellipseTrim, ellipseSegmentCount);+ break;case CurveGeometryKind.BSpline3:var spline = curve.BSpline3!.Value;var splineTrim = edgeBinding.TrimInterval ?? new ParameterInterval(spline.DomainStart, spline.DomainEnd);@@ -1929,6 +2012,18 @@ public static class Step242Importerreturn points;}+ private static List<Point3D> SampleEllipticalTrim(Ellipse3Curve ellipse, ParameterInterval trim, int segmentCount)+ {+ var points = new List<Point3D>(segmentCount + 1);+ var step = (trim.End - trim.Start) / segmentCount;+ for (var i = 0; i <= segmentCount; i++)+ {+ points.Add(ellipse.Evaluate(trim.Start + (step * i)));+ }++ return points;+ }+private static void ReportCircularSamplingDiagnostic(LoopRoleCircularSamplingDiagnostic diagnostic){var sink = CircularSamplingDiagnosticsSink.Value;@@ -2053,6 +2148,12 @@ public static class Step242Importerprivate static KernelResult<double> FailureCircleTrimAngle(string message, string source) =>KernelResult<double>.Failure([new KernelDiagnostic(KernelDiagnosticCode.ValidationFailed, KernelDiagnosticSeverity.Error, message, source)]);+ private static KernelResult<ParameterInterval> FailureEllipseTrim(string message, string source) =>+ KernelResult<ParameterInterval>.Failure([new KernelDiagnostic(KernelDiagnosticCode.ValidationFailed, KernelDiagnosticSeverity.Error, message, source)]);++ private static KernelResult<double> FailureEllipseTrimAngle(string message, string source) =>+ KernelResult<double>.Failure([new KernelDiagnostic(KernelDiagnosticCode.ValidationFailed, KernelDiagnosticSeverity.Error, message, source)]);+private static KernelResult<T> OrientationFailure<T>(string message, string source) =>KernelResult<T>.Failure([new KernelDiagnostic(KernelDiagnosticCode.ValidationFailed, KernelDiagnosticSeverity.Error, message, source)]);diff --git a/Aetheris.Kernel.Core/Step242/Step242SubsetDecoder.cs b/Aetheris.Kernel.Core/Step242/Step242SubsetDecoder.csindex 6416c9df..ebe7cb62 100644--- a/Aetheris.Kernel.Core/Step242/Step242SubsetDecoder.cs+++ b/Aetheris.Kernel.Core/Step242/Step242SubsetDecoder.cs@@ -377,6 +377,43 @@ internal static class Step242SubsetDecoder}+++ public static KernelResult<Ellipse3Curve> ReadEllipseCurve(Step242ParsedDocument document, Step242ParsedEntity ellipseEntity)+ {+ var placementResult = ReadAxis2Placement3D(document, ellipseEntity, 1, "ELLIPSE position", "Importer.Geometry.Ellipse");+ if (!placementResult.IsSuccess)+ {+ return KernelResult<Ellipse3Curve>.Failure(placementResult.Diagnostics);+ }++ var majorRadiusResult = ReadPositiveNumber(ellipseEntity, 2, "ELLIPSE semi_axis_1", "Importer.Geometry.Ellipse");+ if (!majorRadiusResult.IsSuccess)+ {+ return KernelResult<Ellipse3Curve>.Failure(majorRadiusResult.Diagnostics);+ }++ var minorRadiusResult = ReadPositiveNumber(ellipseEntity, 3, "ELLIPSE semi_axis_2", "Importer.Geometry.Ellipse");+ if (!minorRadiusResult.IsSuccess)+ {+ return KernelResult<Ellipse3Curve>.Failure(minorRadiusResult.Diagnostics);+ }++ if (minorRadiusResult.Value > majorRadiusResult.Value)+ {+ return FailureEllipse("ELLIPSE requires semi_axis_2 <= semi_axis_1 in M85 subset.", "Importer.Geometry.Ellipse");+ }++ try+ {+ return KernelResult<Ellipse3Curve>.Success(new Ellipse3Curve(placementResult.Value.Origin, placementResult.Value.Axis, majorRadiusResult.Value, minorRadiusResult.Value, placementResult.Value.ReferenceAxis));+ }+ catch (ArgumentException)+ {+ return FailureEllipse("Invalid ELLIPSE placement produced degenerate frame.", "Importer.Geometry.Ellipse");+ }+ }+public static KernelResult<BSpline3Curve> ReadBSplineCurveWithKnots(Step242ParsedDocument document, Step242ParsedEntity splineEntity){var degreeResult = ReadIntArgument(splineEntity, 1, "B_SPLINE_CURVE_WITH_KNOTS degree", "Importer.Geometry.BSplineCurve");@@ -1140,6 +1177,8 @@ internal static class Step242SubsetDecoderprivate static KernelResult<Circle3Curve> FailureCircle(string message, string source) => Failure<Circle3Curve>(KernelDiagnosticCode.InvalidArgument, message, source);+ private static KernelResult<Ellipse3Curve> FailureEllipse(string message, string source) => Failure<Ellipse3Curve>(KernelDiagnosticCode.InvalidArgument, message, source);+private static KernelResult<BSpline3Curve> FailureBSplineCurve(string message, string source) => Failure<BSpline3Curve>(KernelDiagnosticCode.InvalidArgument, message, source);private static KernelResult<CylinderSurface> FailureCylinder(string message, string source) => Failure<CylinderSurface>(KernelDiagnosticCode.InvalidArgument, message, source);diff --git a/testdata/step242/manifests/nist.v0.report.json b/testdata/step242/manifests/nist.v0.report.jsonindex 8afbec32..1aba4834 100644--- a/testdata/step242/manifests/nist.v0.report.json+++ b/testdata/step242/manifests/nist.v0.report.json@@ -28,18 +28,18 @@"path": "testdata/step242/nist/CTC/nist_ctc_02_asme1_ap242-e2.stp","sizeBytes": 1958442,"status": "importFail",- "firstFailureLayer": "importer-topology",+ "firstFailureLayer": "tessellator","firstDiagnostic": {"code": "NotImplemented",- "source": "Importer.EntityFamily",- "messagePrefix": "EDGE_CURVE geometry \u0027ELLIPSE\u0027 is unsupported."+ "source": "Viewer.Tessellation.CurvedTopologyUnsupported",+ "messagePrefix": "Face 1 curved tessellation expected mirrored line uses for this cone/revolved topology. Observed"},"diagnosticCount": 1,"exceptionEscaped": false,"topologyCounts": {- "vertices": 0,- "edges": 0,- "faces": 0+ "vertices": 870,+ "edges": 1410,+ "faces": 635},"tessellationCounts": {"facePatches": 0,@@ -294,9 +294,9 @@"status": "importFail","firstFailureLayer": "importer-topology","firstDiagnostic": {- "code": "NotImplemented",- "source": "Importer.EntityFamily",- "messagePrefix": "EDGE_CURVE geometry \u0027ELLIPSE\u0027 is unsupported."+ "code": "ValidationFailed",+ "source": "Importer.LoopRole.CylinderNonNormalizableDegenerateProjection",+ "messagePrefix": "Cylinder loop normalization failed"},"diagnosticCount": 1,"exceptionEscaped": false,