likang
738934416e
- 扩展 CDSL engine 的 shell、sweep、loft、reference plane、pattern 等运行时能力， 支持新的实体结果模式、双向拉伸、曲线扫掠、镜像/圆周阵列及相关 selector 解析。 - 完善 Build123d 适配层的拓扑快照、Compound/ShapeList 兼容处理和旋转曲面识别， 兼容 Python 3.12 / 当前 Build123d 缺少 axis_of_rotation 的合法曲面场景。 - 扩展 CDSL schema、profile schema、capability analysis、semantic validation 和 sketch solver，使新增建模操作能够被校验、执行并保留可诊断的部分结果。 - 完善 CADFS FeatureScript lowering： 支持 shell、sweep、surface/实体 loft、圆周阵列副本、镜像副本、删除阵列实例、 新 body 操作、更多拉伸终止条件和 reference plane 变体。 - 补齐椭圆、B-spline、环形区域、imprint、SWEPT_FACE、CAP_FACE、OFFSET_FACE 等 草图和拓扑引用的转换逻辑，改善后续特征的工作平面、轴线和 profile 定位精度。 - 改进 selector binding：支持 pattern 前缀复合 B-rep 快照、交集顶点引用、 多面 match_mode=all、圆柱轴线/半径和面积下限等稳定匹配条件。 - 修复 MID_PLANE 法向统一后交线方向未同步的问题，恢复 00287955 基准面的正确位置； 修复 00542223 sweep 路径反转后的切线契约和 00423838 的拓扑面数不稳定测试假设。 - 修正 CADFS 比较模块 import 路径，补充重建报告、批量重建脚本、目标文档和 README。 - 新增并扩展 engine、lowering、parser、selector binding、reports、integration 和 Onshape pipeline 回归测试，覆盖代表性 CADFS 特征链及运行时兼容性。
75 lines
3.4 KiB
Python
75 lines
3.4 KiB
Python
from __future__ import annotations
|
|
|
|
import unittest
|
|
from cadfs_to_cdsl.featurescript_lexer import lex
|
|
from cadfs_to_cdsl.featurescript_parser import parse_featurescript
|
|
from cadfs_to_cdsl.ir import Call
|
|
from cadfs_to_cdsl.lowering import _queries, _source_refs
|
|
from cadfs_to_cdsl.query_parser import parse_query
|
|
from cadfs_to_cdsl.units import length_mm
|
|
|
|
|
|
SOURCE = r'''
|
|
FeatureScript 1511;
|
|
export const f = defineFeature(function(context, id, definition) {
|
|
{ var Q0; Q0=qCreatedBy(makeId("Top.planeOp"), FACE);
|
|
var sketch = newSketch(context, id + "F0", {"sketchPlane":qUnion([Q0])});
|
|
skCircle(sketch, "E0", {"center":v(0, 0) * mm, "radius":9.53 * mm}); skSolve(sketch); }
|
|
{ var Q0; Q0=qSketchRegion(id + "F0", true);
|
|
extrude(context, id + "F1", {"entities":qUnion([Q0]), "depth":120 * mm}); }
|
|
});
|
|
'''
|
|
|
|
TRANSFORM_SOURCE = SOURCE.replace(
|
|
'\n});\n',
|
|
'''
|
|
transform(context, id + "F2", {"entities":qCreatedBy(id + "F1", BODY), "transformType":TransformType.TRANSLATION_3D, "dx":10 * mm, "dy":0 * mm, "dz":0 * mm, "makeCopy":false});
|
|
});
|
|
''',
|
|
)
|
|
|
|
|
|
class ParserTests(unittest.TestCase):
|
|
def test_lexer_ignores_comments_and_preserves_lines(self):
|
|
tokens = lex('// a\nfoo(/*b*/"x")')
|
|
self.assertEqual([token.value for token in tokens[:-1]], ["foo", "(", '"x"', ")"])
|
|
self.assertEqual(tokens[0].line, 2)
|
|
|
|
def test_nested_feature_script(self):
|
|
model = parse_featurescript(SOURCE, "00000173")
|
|
self.assertEqual([step.feature_id for step in model.steps], ["F0", "F1"])
|
|
self.assertEqual(model.sketches[0].entities[0].operation, "skCircle")
|
|
self.assertIsInstance(model.features[0].params["entities"], Call)
|
|
|
|
def test_transform_is_preserved_as_a_feature(self):
|
|
model = parse_featurescript(TRANSFORM_SOURCE, "transform")
|
|
self.assertEqual([step.feature_id for step in model.steps], ["F0", "F1", "F2"])
|
|
self.assertEqual(model.features[-1].operation, "transform")
|
|
self.assertEqual(model.features[-1].params["transformType"], "TransformType.TRANSLATION_3D")
|
|
|
|
def test_query_parser(self):
|
|
query = Call("makeQuery", [Call("__binary__", ["id", "+", "F1.opExtrude"]), "CAP_EDGE", "EDGE", {"isStart": False, "x": Call("sQuery", [Call("__binary__", ["id", "+", "F0.wireOp"]), "EDGE", "E0"])}])
|
|
value = parse_query(query)
|
|
self.assertEqual((value.owner_feature, value.source_sketch, value.source_entity), ("F1", "F0", "E0"))
|
|
self.assertFalse(value.is_start)
|
|
|
|
def test_block_scoped_query_aliases_do_not_use_the_last_assignment(self):
|
|
source = r'''
|
|
{ var Q0;
|
|
{ var subQ0=sQuery(id + "F2.wireOp", EDGE, "E2"); Q0=makeQuery(id + "F4.opExtrude", "SWEPT_FACE", FACE, {"derivedFrom":subQ0}); }
|
|
var Q1;
|
|
{ var subQ0=sQuery(id + "F2.wireOp", EDGE, "E4"); Q1=makeQuery(id + "F4.opExtrude", "SWEPT_FACE", FACE, {"derivedFrom":subQ0}); }
|
|
chamfer(context, id + "F5", {"entities":qUnion([Q0, Q1]), "width":5 * mm}); }
|
|
'''
|
|
model = parse_featurescript(source, "scoped-query")
|
|
queries = _queries(model.features[0].params["entities"])
|
|
self.assertEqual([_source_refs(query)[0] for query in queries], [("F2", "E2"), ("F2", "E4")])
|
|
|
|
def test_safe_units(self):
|
|
self.assertEqual(length_mm("2 * inch"), 50.8)
|
|
self.assertEqual(length_mm("25.4 / 2 * mm"), 12.7)
|
|
with self.assertRaises(ValueError): length_mm("external.value * mm")
|
|
|
|
|
|
if __name__ == "__main__": unittest.main()
|