Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

Extract STEP242 exact BRep lane ownership

Yuechen Li093a8abd121b
diff --git a/Aetheris.Kernel.Core.Tests/Step242/ImportOrchestratorTests.cs b/Aetheris.Kernel.Core.Tests/Step242/ImportOrchestratorTests.cs
index d5a01831..c7eda00c 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/ImportOrchestratorTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/ImportOrchestratorTests.cs
@@ -1,3 +1,4 @@
+using Aetheris.Kernel.Core.Step242;
using Aetheris.Kernel.Core.Import;
namespace Aetheris.Kernel.Core.Tests.Step242;
@@ -38,6 +39,22 @@ public sealed class ImportOrchestratorTests
Assert.Equal(first.Lane, second.Lane);
}
+
+ [Fact]
+ public void ExactLane_ImportsExactRootViaExtractedLaneOwner()
+ {
+ var parse = Step242SubsetParser.Parse(Step242FixtureCorpus.CanonicalBoxGolden);
+ Assert.True(parse.IsSuccess);
+
+ var lane = new Step242ExactBRepImportLane();
+ var document = new StepParsedSourceDocument(parse.Value);
+
+ var import = lane.Import(document, new ImportPolicy(ImportLaneKind.ExactBRep));
+
+ Assert.True(import.IsSuccess, string.Join(" | ", import.Diagnostics.Select(d => $"{d.Source}: {d.Message}")));
+ Assert.Equal(6, import.Value.Topology.Faces.Count());
+ }
+
private static string LoadFixture(string relativePath)
{
var path = Path.Combine(Step242CorpusManifestRunner.RepoRoot(), relativePath.Replace('/', Path.DirectorySeparatorChar));
diff --git a/Aetheris.Kernel.Core/Step242/Step242Importer.cs b/Aetheris.Kernel.Core/Step242/Step242Importer.cs
index b8edf5ad..741b8f2f 100644
--- a/Aetheris.Kernel.Core/Step242/Step242Importer.cs
+++ b/Aetheris.Kernel.Core/Step242/Step242Importer.cs
@@ -70,7 +70,7 @@ public static class Step242Importer
return laneKind switch
{
ImportLaneKind.Auto => ImportAuto(document),
- ImportLaneKind.ExactBRep => MapSubsetExact(document),
+ ImportLaneKind.ExactBRep => Step242ExactBRepImportLane.ImportExactBrep(document),
ImportLaneKind.Tessellated => ImportTessellated(document),
_ => KernelResult<BrepBody>.Failure([
new KernelDiagnostic(
@@ -101,7 +101,7 @@ public static class Step242Importer
return tessellatedSolidResult;
}
- return MapSubsetExact(document);
+ return Step242ExactBRepImportLane.ImportExactBrep(document);
}
private static KernelResult<BrepBody> ImportTessellated(Step242ParsedDocument document)
@@ -115,7 +115,7 @@ public static class Step242Importer
return Failure("Requested tessellated import lane, but no TESSELLATED_SOLID root was found.", "Importer.TessellatedSolid.MissingRoot");
}
- private static KernelResult<BrepBody> MapSubsetExact(Step242ParsedDocument document)
+ internal static KernelResult<BrepBody> ImportExactBrepCore(Step242ParsedDocument document)
{
var manifoldSolidBreps = document.Entities
.Where(e => string.Equals(e.Name, "MANIFOLD_SOLID_BREP", StringComparison.OrdinalIgnoreCase))
diff --git a/Aetheris.Kernel.Core/Step242/StepImportConnectorAndLanes.cs b/Aetheris.Kernel.Core/Step242/StepImportConnectorAndLanes.cs
index 27aa7815..7634a6c7 100644
--- a/Aetheris.Kernel.Core/Step242/StepImportConnectorAndLanes.cs
+++ b/Aetheris.Kernel.Core/Step242/StepImportConnectorAndLanes.cs
@@ -1,4 +1,5 @@
using Aetheris.Kernel.Core.Brep;
+using Aetheris.Kernel.Core.Diagnostics;
using Aetheris.Kernel.Core.Import;
using Aetheris.Kernel.Core.Results;
@@ -52,7 +53,25 @@ internal sealed class Step242ExactBRepImportLane : IImportLane
public KernelResult<BrepBody> Import(IParsedSourceDocument document, ImportPolicy policy)
{
var stepDocument = (StepParsedSourceDocument)document;
- return Step242Importer.ImportParsedDocumentForLane(stepDocument.Document, Kind);
+ return ImportExactBrep(stepDocument.Document);
+ }
+
+ internal static KernelResult<BrepBody> ImportExactBrep(Step242ParsedDocument document)
+ {
+ try
+ {
+ return Step242Importer.ImportExactBrepCore(document);
+ }
+ catch (Exception ex) when (ex is ArgumentException or InvalidOperationException)
+ {
+ return KernelResult<BrepBody>.Failure([
+ new KernelDiagnostic(
+ KernelDiagnosticCode.InvalidArgument,
+ KernelDiagnosticSeverity.Error,
+ $"Importer rejected parseable STEP input: {ex.Message}",
+ "Importer.Guardrail")
+ ]);
+ }
}
}