1b-agent/OneCAD-Draft
1
0 Fork 0
forked from 1b-agent/opencadstudio-upstream
Code Pull Requests Activity

feat: node graph overlay; move to opencadcodec/opencadkernel/opencadgraph

Browse Source 
The codec and kernel repositories and crates are renamed opencadcodec and
opencadkernel. Inside OCS they are depended on under short keys, so code
reads `codec::`, `kernel::` and the new `graph::` (opencadgraph, the node
graph engine). File-format and protocol spellings stay as they were: the
ACIS product id `acadrust`, the ACADRUST_* switches and the plugin
version keys `acadrust_version` / `acadrust_source`.

A button left of MCP on the command line opens a translucent node graph
over the viewport, with a palette of object, input, math, logic, list,
text and geometry nodes added by click or drag. An object node owns
drawing entities and its rows are the Properties panel's own rows for
them: the single-object page is extracted from refresh_properties as
entity_property_sections, values use the control protocol's
property_json, and writes go through set_property_value with a property
target override, so the panel, MCP and the graph share one read/write
path. A list reaching an object row makes one entity per element. Each
graph action is one undo step; the canvas pans and zooms.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Hakan SevenandClaude Opus 5.5 committed 2026-09-25 07:34:23 +03:00
1 parent 56c04408d6
commit f537aff75c
430 files changed
+9925 -8540
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/app/commands/draw.rs
+50 -50
View File
@@ -23,7 +23,7 @@ impl OpenCADStudio {
.objects
.iter()
.filter_map(|(handle, object)| match object {
acadrust::objects::ObjectType::MLineStyle(style) => {
codec::objects::ObjectType::MLineStyle(style) => {
Some((*handle, style.clone()))
}
_ => None,
@@ -110,7 +110,7 @@ impl OpenCADStudio {
.trim_start_matches("ATTEDIT")
.trim();
let parts: Vec<&str> = rest.splitn(2, char::is_whitespace).collect();
let selected_handles: Vec<acadrust::Handle> = self.tabs[i]
let selected_handles: Vec<codec::Handle> = self.tabs[i]
.scene
.selected_entities()
.iter()
@@ -122,7 +122,7 @@ impl OpenCADStudio {
} else {
let mut found_any = false;
for sh in &selected_handles {
if let Some(acadrust::EntityType::Insert(ins)) = self.tabs[i]
if let Some(codec::EntityType::Insert(ins)) = self.tabs[i]
.scene
.document
.entities()
@@ -166,7 +166,7 @@ impl OpenCADStudio {
if self.tabs[i].scene.is_layer_locked(*sh) {
continue;
}
if let Some(acadrust::EntityType::Insert(ins)) = self.tabs[i]
if let Some(codec::EntityType::Insert(ins)) = self.tabs[i]
.scene
.document
.entities_mut()
@@ -225,7 +225,7 @@ impl OpenCADStudio {
.document
.entities()
.filter_map(|entity| {
matches!(entity, acadrust::EntityType::AttributeDefinition(_))
matches!(entity, codec::EntityType::AttributeDefinition(_))
.then_some(entity.common().handle)
})
.filter(|handle| !self.tabs[i].scene.is_layer_locked(*handle))
@@ -233,7 +233,7 @@ impl OpenCADStudio {
self.push_undo_snapshot(i, "ATTDISP");
let mut count = 0usize;
for handle in handles {
if let Some(acadrust::EntityType::AttributeDefinition(ad)) =
if let Some(codec::EntityType::AttributeDefinition(ad)) =
self.tabs[i].scene.document.get_entity_mut(handle)
{
match sub.as_str() {
@@ -488,7 +488,7 @@ impl OpenCADStudio {
.document
.entities()
.filter_map(|entity| match entity {
acadrust::EntityType::Face3D(face) => {
codec::EntityType::Face3D(face) => {
Some((face.common.handle, face.clone()))
}
_ => None,
@@ -549,12 +549,12 @@ impl OpenCADStudio {
.iter()
.copied()
.filter(|handle| {
let Some(acadrust::EntityType::Line(line)) =
let Some(codec::EntityType::Line(line)) =
self.tabs[i].scene.document.get_entity(*handle)
else {
return false;
};
acadrust::entities::CenterMarkAssociation::read(&line.common.extended_data)
codec::entities::CenterMarkAssociation::read(&line.common.extended_data)
.is_some()
})
.collect();
@@ -793,7 +793,7 @@ impl OpenCADStudio {
let normal = working_plane.z.normalize_or(glam::DVec3::Z);
let elevation = working_plane.origin.dot(normal);
let storage = crate::entities::curve::ocs_plane(
acadrust::types::Vector3::new(normal.x, normal.y, normal.z),
codec::types::Vector3::new(normal.x, normal.y, normal.z),
elevation,
);
let plane = crate::command::WorkingPlane::new(
@@ -837,7 +837,7 @@ impl OpenCADStudio {
)
});
let (scale, angle) = match entity {
Some(acadrust::EntityType::Hatch(hatch)) => (
Some(codec::EntityType::Hatch(hatch)) => (
hatch.pattern_scale as f32,
hatch.pattern_angle.to_degrees() as f32,
),
@@ -1131,7 +1131,7 @@ impl OpenCADStudio {
self.command_line.push_output("No constraints found.");
return None;
}
let dimensions: Vec<acadrust::Handle> = ids
let dimensions: Vec<codec::Handle> = ids
.iter()
.filter_map(|id| before.dimensions.get(id).copied())
.collect();
@@ -1456,7 +1456,7 @@ impl OpenCADStudio {
annotational,
decimals,
);
if let Some(acadrust::EntityType::Dimension(mut dimension)) =
if let Some(codec::EntityType::Dimension(mut dimension)) =
self.tabs[i].scene.document.get_entity(handle).cloned()
{
let before = self.tabs[i].scene.document.get_entity_arc(handle);
@@ -1472,7 +1472,7 @@ impl OpenCADStudio {
dimension.base_mut().common.layer =
crate::scene::parametric_constraints::DYNAMIC_DIMENSION_LAYER
.to_string();
dimension.base_mut().common.color = acadrust::types::Color::Rgb {
dimension.base_mut().common.color = codec::types::Color::Rgb {
r: 103,
g: 109,
b: 118,
@@ -1480,7 +1480,7 @@ impl OpenCADStudio {
}
self.tabs[i]
.scene
.update_entity(acadrust::EntityType::Dimension(dimension));
.update_entity(codec::EntityType::Dimension(dimension));
}
let set = self.tabs[i].scene.parametric_constraint_set_mut(scope);
let id = set.add(kind, refs, Some(DrivingValue::Named(name)));
@@ -1554,7 +1554,7 @@ impl OpenCADStudio {
return Some(self.apply_cmd_result(CmdResult::AddHorizontalConstraint {
kind,
selection: HorizontalConstraintSelection::Reference(reference),
direction: acadrust::types::Vector3::new(
direction: codec::types::Vector3::new(
direction.x,
direction.y,
direction.z,
@@ -2105,7 +2105,7 @@ impl OpenCADStudio {
.filter(|handle| {
matches!(
self.tabs[i].scene.document.get_entity(*handle),
Some(acadrust::EntityType::Solid3D(_))
Some(codec::EntityType::Solid3D(_))
)
})
.collect::<Vec<_>>();
@@ -2166,12 +2166,12 @@ impl OpenCADStudio {
matches!(
scene.document.get_entity(*handle),
Some(
acadrust::EntityType::Solid3D(_)
| acadrust::EntityType::Region(_)
| acadrust::EntityType::Surface(_)
| acadrust::EntityType::Mesh(_)
| acadrust::EntityType::PolygonMesh(_)
| acadrust::EntityType::PolyfaceMesh(_)
codec::EntityType::Solid3D(_)
| codec::EntityType::Region(_)
| codec::EntityType::Surface(_)
| codec::EntityType::Mesh(_)
| codec::EntityType::PolygonMesh(_)
| codec::EntityType::PolyfaceMesh(_)
)
)
})
@@ -2180,9 +2180,9 @@ impl OpenCADStudio {
matches!(
scene.document.get_entity(*handle),
Some(
acadrust::EntityType::Mesh(_)
| acadrust::EntityType::PolygonMesh(_)
| acadrust::EntityType::PolyfaceMesh(_)
codec::EntityType::Mesh(_)
| codec::EntityType::PolygonMesh(_)
| codec::EntityType::PolyfaceMesh(_)
)
)
});
@@ -2218,12 +2218,12 @@ impl OpenCADStudio {
.find(|(_, entity)| {
matches!(
entity,
acadrust::EntityType::Line(_)
| acadrust::EntityType::Arc(_)
| acadrust::EntityType::Circle(_)
| acadrust::EntityType::Ellipse(_)
| acadrust::EntityType::LwPolyline(_)
| acadrust::EntityType::Spline(_)
codec::EntityType::Line(_)
| codec::EntityType::Arc(_)
| codec::EntityType::Circle(_)
| codec::EntityType::Ellipse(_)
| codec::EntityType::LwPolyline(_)
| codec::EntityType::Spline(_)
)
})
.map(|(handle, entity)| (handle, entity.clone()));
@@ -2246,18 +2246,18 @@ impl OpenCADStudio {
self.tabs[i].active_cmd = Some(Box::new(command));
return Some(iced::Task::none());
}
use acadrust::entities::Region;
use acadrust::types::Vector3;
use codec::entities::Region;
use codec::types::Vector3;
let mut regions = Vec::new();
let mut sources = Vec::new();
for (handle, e) in self.tabs[i].scene.selected_entities().iter() {
if !matches!(e, acadrust::EntityType::Region(_)) {
if !matches!(e, codec::EntityType::Region(_)) {
let Some((plane, loops, true)) =
crate::scene::model::presspull_model::profile_geometry(e)
else {
continue;
};
let Some(body) = cadkernel::brep::planar_region(plane, &loops) else {
let Some(body) = kernel::brep::planar_region(plane, &loops) else {
continue;
};
let mut region = Region::new();
@@ -2276,7 +2276,7 @@ impl OpenCADStudio {
.filter(|(handle, _)| !sources.contains(handle))
.filter_map(|(_, entity)| crate::entities::curve::entity_curve(entity))
.collect();
let open_plane = cadkernel::space::common_curve_plane(&open_curves, 1.0e-6);
let open_plane = kernel::space::common_curve_plane(&open_curves, 1.0e-6);
let open_plane_rejected = !open_curves.is_empty() && open_plane.is_none();
if let Some(plane) = open_plane {
let working_plane = crate::command::WorkingPlane::new(
@@ -2314,7 +2314,7 @@ impl OpenCADStudio {
else {
continue;
};
let Some(body) = cadkernel::brep::planar_region(plane, &[curves]) else {
let Some(body) = kernel::brep::planar_region(plane, &[curves]) else {
continue;
};
let mut region = Region::new();
@@ -2427,10 +2427,10 @@ impl OpenCADStudio {
.filter_map(|entity| {
matches!(
entity,
acadrust::EntityType::Solid3D(_)
| acadrust::EntityType::Surface(_)
| acadrust::EntityType::Region(_)
| acadrust::EntityType::Body(_)
codec::EntityType::Solid3D(_)
| codec::EntityType::Surface(_)
| codec::EntityType::Region(_)
| codec::EntityType::Body(_)
)
.then_some(entity.common().handle)
})
@@ -2452,10 +2452,10 @@ impl OpenCADStudio {
.document
.entities()
.filter_map(|entity| {
let acadrust::EntityType::Extended(extended) = entity else {
let codec::EntityType::Extended(extended) = entity else {
return None;
};
let acadrust::entities::ExtendedEntityData::SectionObject(data) =
let codec::entities::ExtendedEntityData::SectionObject(data) =
&extended.data
else {
return None;
@@ -2583,8 +2583,8 @@ impl OpenCADStudio {
matches!(
scene.document.get_entity(*handle),
Some(
acadrust::EntityType::Solid3D(_)
| acadrust::EntityType::Surface(_)
codec::EntityType::Solid3D(_)
| codec::EntityType::Surface(_)
)
)
})
@@ -2641,7 +2641,7 @@ impl OpenCADStudio {
1 => ([0.0, v, 0.0], [0.0, 0.0, 1.0], [0.0, 1.0, 0.0]),
_ => ([0.0, 0.0, v], [1.0, 0.0, 0.0], [0.0, 0.0, 1.0]),
};
let plane = cadkernel::space::Plane::orthonormal(origin, x, normal)
let plane = kernel::space::Plane::orthonormal(origin, x, normal)
.expect("fixed world axes define a plane");
let side = glam::DVec3::from_array(origin)
+ glam::DVec3::from_array(normal) * if keep_low { -1.0 } else { 1.0 };
@@ -2680,7 +2680,7 @@ impl OpenCADStudio {
let editable = (sel.len() == 1).then(|| sel[0].0).filter(|h| {
self.tabs[i].scene.document.get_entity(*h).is_some_and(|e| {
super::super::text_inline::read_text_field(e).is_some()
|| matches!(e, acadrust::EntityType::Leader(_))
|| matches!(e, codec::EntityType::Leader(_))
})
});
if let Some(h) = editable {
@@ -2759,7 +2759,7 @@ mod region_tests {
.map(|entity| {
(
entity.common().handle,
matches!(entity, acadrust::EntityType::Circle(_)),
matches!(entity, codec::EntityType::Circle(_)),
)
})
.collect();
@@ -2780,7 +2780,7 @@ mod region_tests {
.scene
.document
.entities()
.filter(|entity| matches!(entity, acadrust::EntityType::Region(_)))
.filter(|entity| matches!(entity, codec::EntityType::Region(_)))
.count();
assert_eq!(region_count, 1);