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

feat(spline): correct property semantics

Browse Source 
Merge PR #824 while keeping periodic and coplanarity geometry in cadkernel.
This commit is contained in:
Hakan Seven committed 2026-08-20 12:13:35 +03:00
2 parents 9202297d1b 96e8d75cc5
commit dcedf945ea
11 files changed
+208 -73
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/app/properties.rs
+5 -5
View File
@@ -121,13 +121,13 @@ impl OpenCADStudio {
acadrust::EntityType::LwPolyline(polyline) => Some(polyline.vertices.len()),
acadrust::EntityType::Polyline2D(polyline) => Some(polyline.vertices.len()),
acadrust::EntityType::Leader(leader) => Some(leader.vertices.len()),
acadrust::EntityType::Spline(spline) => Some(
if crate::entities::spline::uses_fit_method(spline) {
acadrust::EntityType::Spline(spline) => {
Some(if crate::entities::spline::shows_fit_points(spline) {
spline.fit_points.len()
} else {
spline.control_points.len()
},
),
crate::entities::spline::control_vertex_count(spline)
})
}
_ => None,
});
vertex_count.map_or(prop_vertex, |count| prop_vertex.min(count.saturating_sub(1)))
src/app/update/command.rs
+4 -2
View File
@@ -1758,7 +1758,7 @@ pub(super) fn on_tab_close(&mut self, idx: usize) -> Task<Message> {
};
match field {
"spline_method" => {
value == if crate::entities::spline::uses_fit_method(spline) {
value == if crate::entities::spline::shows_fit_points(spline) {
"Fit"
} else {
"Control Vertices"
@@ -2193,7 +2193,9 @@ pub(super) fn on_tab_close(&mut self, idx: usize) -> Task<Message> {
(
"current_control_point",
acadrust::EntityType::Spline(spline),
) => Some(spline.control_points.len()),
) => Some(
crate::entities::spline::control_vertex_count(spline),
),
_ => None,
}
})
src/app/view/mod.rs
+2 -6
View File
@@ -423,12 +423,8 @@ impl OpenCADStudio {
.and_then(|h| {
let indexed = match tab.scene.document.get_entity(h) {
Some(acadrust::EntityType::LwPolyline(_))
| Some(acadrust::EntityType::Polyline2D(_)) => true,
Some(acadrust::EntityType::Spline(spline)) => {
!crate::entities::spline::uses_fit_method(spline)
|| !spline.cv_frame_visible
|| crate::entities::curve::spline_curve(spline).is_none()
}
| Some(acadrust::EntityType::Polyline2D(_))
| Some(acadrust::EntityType::Spline(_)) => true,
_ => false,
};
indexed.then_some(tab.properties.prop_vertex)