[--format auto|step|iges|stl|obj]
- [--id-prefix ] [--preserve-assembly] [--heal-on-import]
+ [--id-prefix
] [--preserve-assembly] [--heal-on-import] [--allow-invalid]
import (JSON request from file)
import (JSON request from stdin)
"""
@@ -55,6 +55,7 @@ enum ImportCommand: Subcommand {
var idPrefix: String
var preserveAssembly: Bool
var healOnImport: Bool
+ var allowInvalid: Bool
}
private enum Format: String, Decodable {
@@ -68,6 +69,7 @@ enum ImportCommand: Subcommand {
let idPrefix: String?
let preserveAssembly: Bool?
let healOnImport: Bool?
+ let allowInvalid: Bool?
}
struct Response: Encodable {
@@ -107,7 +109,8 @@ enum ImportCommand: Subcommand {
let document = try loadDocumentSTEP(path: req.inputPath)
assembly = try walkAssembly(
document: document, emitDir: emitDir,
- idPrefix: req.idPrefix, bodies: &bodies, addedIds: &addedIds
+ idPrefix: req.idPrefix, allowInvalid: req.allowInvalid,
+ bodies: &bodies, addedIds: &addedIds
)
} else {
if req.preserveAssembly && format != .step {
@@ -116,7 +119,7 @@ enum ImportCommand: Subcommand {
let shape = try loadSingleShape(format: format, path: req.inputPath)
let id = "\(req.idPrefix)_0"
let bodyURL = emitDir.appendingPathComponent("\(id).brep")
- try GraphIO.writeBREP(shape, to: bodyURL.path)
+ try GraphIO.writeBREP(shape, to: bodyURL.path, allowInvalid: req.allowInvalid)
bodies.append(BodyDescriptor(id: id, file: "\(id).brep"))
addedIds.append(id)
}
@@ -185,6 +188,7 @@ enum ImportCommand: Subcommand {
document: Document,
emitDir: URL,
idPrefix: String,
+ allowInvalid: Bool,
bodies: inout [BodyDescriptor],
addedIds: inout [String]
) throws -> Response.Assembly {
@@ -195,7 +199,8 @@ enum ImportCommand: Subcommand {
for root in roots {
let component = try walkNode(
node: root, idPrefix: idPrefix, parentPathSegment: nil,
- emitDir: emitDir, bodies: &bodies, addedIds: &addedIds, counter: &counter
+ emitDir: emitDir, allowInvalid: allowInvalid,
+ bodies: &bodies, addedIds: &addedIds, counter: &counter
)
components.append(component)
}
@@ -209,6 +214,7 @@ enum ImportCommand: Subcommand {
idPrefix: String,
parentPathSegment: String?,
emitDir: URL,
+ allowInvalid: Bool,
bodies: inout [BodyDescriptor],
addedIds: inout [String],
counter: inout Int
@@ -219,7 +225,7 @@ enum ImportCommand: Subcommand {
// Write geometry if this node has any (pure-assembly nodes have no shape).
if let shape = node.shape {
let bodyURL = emitDir.appendingPathComponent("\(id).brep")
- try GraphIO.writeBREP(shape, to: bodyURL.path)
+ try GraphIO.writeBREP(shape, to: bodyURL.path, allowInvalid: allowInvalid)
bodies.append(BodyDescriptor(
id: id,
file: "\(id).brep",
@@ -238,7 +244,8 @@ enum ImportCommand: Subcommand {
for child in node.children {
children.append(try walkNode(
node: child, idPrefix: idPrefix, parentPathSegment: id,
- emitDir: emitDir, bodies: &bodies, addedIds: &addedIds, counter: &counter
+ emitDir: emitDir, allowInvalid: allowInvalid,
+ bodies: &bodies, addedIds: &addedIds, counter: &counter
))
}
@@ -272,6 +279,7 @@ enum ImportCommand: Subcommand {
var idPrefix: String = "imported"
var preserveAssembly = false
var healOnImport = false
+ var allowInvalid = false
var i = 1
while i < args.count {
switch args[i] {
@@ -290,6 +298,8 @@ enum ImportCommand: Subcommand {
preserveAssembly = true
case "--heal-on-import":
healOnImport = true
+ case "--allow-invalid":
+ allowInvalid = true
default:
throw ScriptError.message("Unknown flag: \(args[i])")
}
@@ -298,7 +308,7 @@ enum ImportCommand: Subcommand {
guard let emitManifest else { throw ScriptError.message("--emit-manifest is required") }
return Request(inputPath: inputPath, emitManifest: emitManifest, format: format,
idPrefix: idPrefix, preserveAssembly: preserveAssembly,
- healOnImport: healOnImport)
+ healOnImport: healOnImport, allowInvalid: allowInvalid)
}
private static func valueOrThrow(args: [String], i: Int, flag: String) throws -> String {
@@ -326,7 +336,8 @@ enum ImportCommand: Subcommand {
format: raw.format ?? .auto,
idPrefix: raw.idPrefix ?? "imported",
preserveAssembly: raw.preserveAssembly ?? false,
- healOnImport: raw.healOnImport ?? false
+ healOnImport: raw.healOnImport ?? false,
+ allowInvalid: raw.allowInvalid ?? false
)
}
}
diff --git a/Sources/occtkit/Commands/LoadBrep.swift b/Sources/occtkit/Commands/LoadBrep.swift
index 1d860e9..2193c47 100644
--- a/Sources/occtkit/Commands/LoadBrep.swift
+++ b/Sources/occtkit/Commands/LoadBrep.swift
@@ -29,7 +29,7 @@ enum LoadBrepCommand: Subcommand {
static let summary = "Load a BREP and emit a manifest entry for OCCTSwiftViewport"
static let usage = """
Usage:
- load-brep --emit-manifest [--id ] [--color ]
+ load-brep --emit-manifest [--id ] [--color ] [--allow-invalid]
load-brep (JSON request from file)
load-brep (JSON request from stdin)
"""
@@ -39,6 +39,7 @@ enum LoadBrepCommand: Subcommand {
var emitManifest: String
var id: String?
var color: String?
+ var allowInvalid: Bool
}
private struct JSONRequest: Decodable {
@@ -46,6 +47,7 @@ enum LoadBrepCommand: Subcommand {
let emitManifest: String
let id: String?
let color: String?
+ let allowInvalid: Bool?
}
struct Response: Encodable {
@@ -71,7 +73,7 @@ enum LoadBrepCommand: Subcommand {
let emitDir = URL(fileURLWithPath: req.emitManifest)
try? FileManager.default.createDirectory(at: emitDir, withIntermediateDirectories: true)
let bodyURL = emitDir.appendingPathComponent("\(bodyId).brep")
- try GraphIO.writeBREP(shape, to: bodyURL.path)
+ try GraphIO.writeBREP(shape, to: bodyURL.path, allowInvalid: req.allowInvalid)
let manifest = ScriptManifest(
description: "Imported via load-brep",
@@ -104,6 +106,7 @@ enum LoadBrepCommand: Subcommand {
var emitManifest: String?
var id: String?
var color: String?
+ var allowInvalid = false
var i = 1
while i < args.count {
switch args[i] {
@@ -119,13 +122,16 @@ enum LoadBrepCommand: Subcommand {
i += 1
guard i < args.count else { throw ScriptError.message("--color expects a value") }
color = args[i]
+ case "--allow-invalid":
+ allowInvalid = true
default:
throw ScriptError.message("Unknown flag: \(args[i])")
}
i += 1
}
guard let emitManifest else { throw ScriptError.message("--emit-manifest is required") }
- return Request(inputBrep: inputBrep, emitManifest: emitManifest, id: id, color: color)
+ return Request(inputBrep: inputBrep, emitManifest: emitManifest, id: id, color: color,
+ allowInvalid: allowInvalid)
}
private static func readFile(_ path: String) throws -> Data {
@@ -143,7 +149,7 @@ enum LoadBrepCommand: Subcommand {
throw ScriptError.message("Invalid JSON: \(error.localizedDescription)")
}
return Request(inputBrep: raw.inputBrep, emitManifest: raw.emitManifest,
- id: raw.id, color: raw.color)
+ id: raw.id, color: raw.color, allowInvalid: raw.allowInvalid ?? false)
}
// MARK: - Helpers (shared with Import)