likang/cdsl-cad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: resolve main integration conflicts

Browse Source
This commit is contained in:
李康
2026-09-09 10:39:34 +08:00
parent 2f89d7930c 9ab20db443
commit a5c3ec1f36
18 changed files with 839 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/engine/cdsl_engine/cdsl_schema.json
+41 -6
View File
@@ -190,7 +190,8 @@
"type": "object",
"properties": {
"radius_mm": {"$ref": "#/$defs/positive"},
"center_mm": {"$ref": "#/$defs/point3"}
"center_mm": {"$ref": "#/$defs/point3"},
"result_mode": {"enum": ["fuse", "new_body"]}
},
"required": ["radius_mm", "center_mm"],
"additionalProperties": false
@@ -201,7 +202,8 @@
"length_mm": {"$ref": "#/$defs/positive"},
"width_mm": {"$ref": "#/$defs/positive"},
"height_mm": {"$ref": "#/$defs/positive"},
"center_mm": {"$ref": "#/$defs/point3"}
"center_mm": {"$ref": "#/$defs/point3"},
"result_mode": {"enum": ["fuse", "new_body"]}
},
"required": ["length_mm", "width_mm", "height_mm", "center_mm"],
"additionalProperties": false
@@ -211,7 +213,8 @@
"properties": {
"radius_mm": {"$ref": "#/$defs/positive"},
"height_mm": {"$ref": "#/$defs/positive"},
"axis": {"$ref": "#/$defs/axis"}
"axis": {"$ref": "#/$defs/axis"},
"result_mode": {"enum": ["fuse", "new_body"]}
},
"required": ["radius_mm", "height_mm"],
"additionalProperties": false
@@ -243,11 +246,40 @@
},
"required": ["origin_mm", "x_dir", "y_dir", "normal"],
"additionalProperties": false
}
},
"result_mode": {"enum": ["fuse", "new_body"]}
},
"required": ["thickness_mm", "width_mm", "chain"],
"additionalProperties": false
},
"gearAddParams": {
"type": "object",
"properties": {
"module_mm": {"$ref": "#/$defs/positive"},
"teeth_count": {"type": "integer", "minimum": 8, "maximum": 200},
"width_mm": {"$ref": "#/$defs/positive"},
"axis": {"$ref": "#/$defs/axis"},
"helix_angle_rad": {"type": "number", "minimum": 0, "exclusiveMaximum": 0.7853981633974483},
"pressure_angle_rad": {"type": "number", "exclusiveMinimum": 0, "maximum": 0.6108652381980153},
"herringbone": {"type": "boolean"},
"result_mode": {"enum": ["fuse", "new_body"]}
},
"required": ["module_mm", "teeth_count", "width_mm", "axis"],
"additionalProperties": false
},
"rackAddParams": {
"type": "object",
"properties": {
"module_mm": {"$ref": "#/$defs/positive"},
"teeth_count": {"type": "integer", "minimum": 1, "maximum": 2000},
"thickness_mm": {"$ref": "#/$defs/positive"},
"axis": {"$ref": "#/$defs/axis"},
"pressure_angle_rad": {"type": "number", "exclusiveMinimum": 0, "maximum": 0.6108652381980153},
"result_mode": {"enum": ["fuse", "new_body"]}
},
"required": ["module_mm", "teeth_count", "thickness_mm", "axis"],
"additionalProperties": false
},
"threadAddParams": {
"type": "object",
"properties": {
@@ -260,7 +292,8 @@
"lefthand": {"type": "boolean"},
"relief_length_mm": {"type": "number", "minimum": 0},
"crest_radius_mm": {"type": "number", "minimum": 0},
"root_radius_mm": {"type": "number", "minimum": 0}
"root_radius_mm": {"type": "number", "minimum": 0},
"result_mode": {"enum": ["fuse", "new_body"]}
},
"required": ["major_diameter_mm", "minor_diameter_mm", "pitch_mm", "length_mm", "axis"],
"additionalProperties": false
@@ -651,7 +684,7 @@
"required": ["type", "source_entities", "selections"],
"additionalProperties": false
},
"feature_atomic_ids": {"enum": ["extrude_add_blind", "extrude_add_blind_with_hole", "extrude_add_two_sided", "extrude_cut_blind", "extrude_cut_two_sided", "extrude_cut_through", "extrude_from_face", "extrude_surface", "loft_add", "loft_add_with_cap_face", "sweep_add", "revolve_add", "revolve_cut", "revolve_surface", "hole_blind", "hole_countersink", "hole_counterbore", "sphere_add", "box_add", "cylinder_add", "thread_add", "thread_cut", "bend_add", "fillet", "chamfer", "shell", "boolean_bodies", "transform_bodies", "delete_bodies", "pattern_linear", "pattern_mirror", "pattern_circular", "reference_plane", "reference_axis", "hole_wizard"]},
"feature_atomic_ids": {"enum": ["extrude_add_blind", "extrude_add_blind_with_hole", "extrude_add_two_sided", "extrude_cut_blind", "extrude_cut_two_sided", "extrude_cut_through", "extrude_from_face", "extrude_surface", "loft_add", "loft_add_with_cap_face", "sweep_add", "revolve_add", "revolve_cut", "revolve_surface", "hole_blind", "hole_countersink", "hole_counterbore", "sphere_add", "box_add", "cylinder_add", "thread_add", "thread_cut", "bend_add", "gear_add", "rack_add", "fillet", "chamfer", "shell", "boolean_bodies", "transform_bodies", "delete_bodies", "pattern_linear", "pattern_mirror", "pattern_circular", "reference_plane", "reference_axis", "hole_wizard"]},
"feature": {
"type": "object",
"properties": {
@@ -686,6 +719,8 @@
{"if": {"properties": {"atomic_id": {"const": "box_add"}}}, "then": {"properties": {"params": {"$ref": "#/$defs/boxParams"}}}},
{"if": {"properties": {"atomic_id": {"const": "cylinder_add"}}}, "then": {"properties": {"params": {"$ref": "#/$defs/cylinderParams"}}}},
{"if": {"properties": {"atomic_id": {"const": "bend_add"}}}, "then": {"properties": {"params": {"$ref": "#/$defs/bendAddParams"}}}},
{"if": {"properties": {"atomic_id": {"const": "gear_add"}}}, "then": {"properties": {"params": {"$ref": "#/$defs/gearAddParams"}}}},
{"if": {"properties": {"atomic_id": {"const": "rack_add"}}}, "then": {"properties": {"params": {"$ref": "#/$defs/rackAddParams"}}}},
{"if": {"properties": {"atomic_id": {"const": "thread_add"}}}, "then": {"properties": {"params": {"$ref": "#/$defs/threadAddParams"}}}},
{"if": {"properties": {"atomic_id": {"const": "thread_cut"}}}, "then": {"properties": {"params": {"$ref": "#/$defs/threadCutParams"}}}},
{"if": {"properties": {"atomic_id": {"const": "hole_blind"}}}, "then": {"properties": {"params": {"$ref": "#/$defs/holeBlindParams"}}}},