几个几何操作的微小bug

This commit is contained in:
2026-09-08 19:57:52 +08:00
parent 235d3bf0c8
commit 7a2ce157f1
4 changed files with 51 additions and 109 deletions
+31 -8
View File
@@ -831,9 +831,32 @@ def _execute_reference_axis(node: FeaturePlanNode, session: ExecutionSession) ->
return session.result(node, context=axis)
def _register_added_solid(
session: ExecutionSession,
node: FeaturePlanNode,
solid: Any,
) -> None:
"""Register an additive primitive solid (box/cyl/sphere/thread/gear/rack/bend).
When ``node.params['result_mode'] == "new_body"`` the primitive is kept as
an independent body member so that downstream ``boolean_bodies`` can
reference it without pulling in the accumulated fuse history. The current
body is replaced by a Compound that preserves both, matching the
``extrude_add_blind`` ``new_body`` semantics. Any other value (including
missing) falls back to the legacy fuse-into-body behavior.
"""
if node.params.get("result_mode") == "new_body":
combined = session.adapter.combine(session.body, solid)
members = {**session.body_members, node.feature_id: solid}
session.register_body(node.feature_id, combined, replay_node=node, body_members=members)
return
fused = session.adapter.fuse(session.body, solid)
session.register_body(node.feature_id, fused, replay_node=node)
def _execute_sphere(node: FeaturePlanNode, session: ExecutionSession) -> FeatureResult:
# 球体特征(sphere_add)执行入口:按球心与半径生成球体并并入当前主体。
# 1. 解析参数:半径 radius_mm 与球心 center_mm。
radius = float(node.params.get("radius_mm") or 0.0)
center = node.params.get("center_mm") or []
@@ -843,7 +866,7 @@ def _execute_sphere(node: FeaturePlanNode, session: ExecutionSession) -> Feature
# 3. 由适配器创建球体实体。
solid = session.adapter.sphere(radius, (float(center[0]), float(center[1]), float(center[2])))
# 4. 球体与当前主体做布尔并(fuse)后登记为新主体,并返回该特征的结果对象。
session.register_body(node.feature_id, session.adapter.fuse(session.body, solid), replay_node=node)
_register_added_solid(session, node, solid)
return session.result(node)
@@ -869,7 +892,7 @@ def _execute_box(node: FeaturePlanNode, session: ExecutionSession) -> FeatureRes
plane = PlaneSpec.from_mapping({"origin_mm": corner, "x_dir": [1, 0, 0], "normal": [0, 0, 1]})
solid = session.adapter.box(length, width, height, plane)
# 3. 与当前主体做布尔并后登记为新主体,并返回该特征的结果对象。
session.register_body(node.feature_id, session.adapter.fuse(session.body, solid), replay_node=node)
_register_added_solid(session, node, solid)
return session.result(node)
@@ -893,7 +916,7 @@ def _execute_cylinder(node: FeaturePlanNode, session: ExecutionSession) -> Featu
# 2. 由适配器创建原生圆柱(axis=None 即世界 +Z 过原点)。
solid = session.adapter.cylinder(radius, height, axis)
# 3. 与当前主体做布尔并后登记为新主体,并返回该特征的结果对象。
session.register_body(node.feature_id, session.adapter.fuse(session.body, solid), replay_node=node)
_register_added_solid(session, node, solid)
return session.result(node)
@@ -904,7 +927,7 @@ def _execute_thread(node: FeaturePlanNode, session: ExecutionSession) -> Feature
# 2. 由适配器门面生成沿 spec.axis 放置的外螺纹实心段。
solid = session.adapter.thread_solid(spec)
# 3. 与当前主体做布尔并(fuse)后登记为新主体,并返回该特征的结果对象。
session.register_body(node.feature_id, session.adapter.fuse(session.body, solid), replay_node=node)
_register_added_solid(session, node, solid)
return session.result(node)
@@ -938,7 +961,7 @@ def _execute_bend(node: FeaturePlanNode, session: ExecutionSession) -> FeatureRe
# 2. 由适配器门面生成沿 spec.frame 放置的折弯实心段。
solid = session.adapter.bend_solid(spec)
# 3. 与当前主体做布尔并(fuse)后登记为新主体,并返回该特征的结果对象。
session.register_body(node.feature_id, session.adapter.fuse(session.body, solid), replay_node=node)
_register_added_solid(session, node, solid)
return session.result(node)
@@ -955,7 +978,7 @@ def _execute_gear(node: FeaturePlanNode, session: ExecutionSession) -> FeatureRe
# 2. 由适配器门面生成沿 spec.axis 放置的齿轮实体(直齿/斜齿/人字齿)。
solid = session.adapter.gear_solid(spec)
# 3. 与当前主体做布尔并(fuse)后登记为新主体,并返回该特征的结果对象。
session.register_body(node.feature_id, session.adapter.fuse(session.body, solid), replay_node=node)
_register_added_solid(session, node, solid)
# 4. 小齿数根切风险:不阻断执行,附加 info 级诊断供完成报告如实披露。
diagnostics: list[RuntimeDiagnostic] = []
if spec.teeth_count < 17:
@@ -983,7 +1006,7 @@ def _execute_rack(node: FeaturePlanNode, session: ExecutionSession) -> FeatureRe
# 2. 由适配器门面生成沿 spec.axis 放置的齿条实体(齿沿轴方向伸出)。
solid = session.adapter.rack_solid(spec)
# 3. 与当前主体做布尔并(fuse)后登记为新主体,并返回该特征的结果对象。
session.register_body(node.feature_id, session.adapter.fuse(session.body, solid), replay_node=node)
_register_added_solid(session, node, solid)
return session.result(node)