Merge upstream main; codec and kernel patches on branches merged with it

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ramox81andClaude Opus 5.5 committed 2026-10-16 22:12:01 +03:00
commit 0158ea533f
48 files changed
+5133 -52

No files matched your search

+49
View File
@@ -1119,6 +1119,45 @@ bg={bg_ms:.1}ms n={view_count}"
)
}),
)
.chain(
crate::scene::block_basepoint::parameter(
&tab.scene.document,
session.br_handle,
)
.map(|(_, p)| {
let mut g = crate::scene::block_distance_parameter::Graphic::default();
g.base_grips.push(p.parameter.definition_point);
(g, p.parameter.definition_point)
}),
)
.chain(
crate::scene::block_lookup::parameters(
&tab.scene.document,
session.br_handle,
)
.into_iter()
.map(|(_, p)| {
let mut g = crate::scene::block_distance_parameter::Graphic::default();
g.lookup_grips.push(p.parameter.definition_point);
g.labels
.push((p.parameter.definition_point, p.lookup_name.clone()));
(g, p.parameter.definition_point)
}),
)
.chain(
crate::scene::block_actions::actions(
&tab.scene.document,
session.br_handle,
)
.into_iter()
.map(|(_, action, _, _)| {
let mut g = crate::scene::block_distance_parameter::Graphic::default();
g.grips.push((action.display_location, false));
g.labels
.push((action.display_location, action.element.name.clone()));
(g, action.display_location)
}),
)
.filter_map(|(graphic, marker_tail)| {
let project = |p: codec::types::Vector3| {
let p = tab
@@ -1155,6 +1194,16 @@ bg={bg_ms:.1}ms n={view_count}"
.collect::<Option<Vec<_>>>()?;
Some(crate::ui::overlay::AuthoringDimension {
lines,
base_grips: graphic
.base_grips
.into_iter()
.map(project)
.collect::<Option<Vec<_>>>()?,
lookup_grips: graphic
.lookup_grips
.into_iter()
.map(project)
.collect::<Option<Vec<_>>>()?,
round_grips: graphic
.round_grips
.into_iter()
+7
View File
@@ -89,6 +89,7 @@ impl OpenCADStudio {
Some(K::BlockEditChanges) => crate::t!("Block Editor").into_owned(),
Some(K::BlockEditPicker) => crate::t!("Edit Block Definition").into_owned(),
Some(K::BlockVisibility) => crate::t!("Visibility States").into_owned(),
Some(K::BlockLookup) => crate::t!("Property Lookup Table").into_owned(),
Some(K::BlockSaveAs) => crate::t!("Save Block As").into_owned(),
Some(K::PointStyle) => crate::tr!("modal", "point-style"),
Some(K::AttributeEditor) => crate::tr!("modal", "attribute-editor"),
@@ -523,6 +524,12 @@ impl OpenCADStudio {
crate::ui::window::block_edit_picker::view(state, flow)
})
}
super::super::ModalKind::BlockLookup => {
let state = self.block_lookup.as_ref()?;
sized_flow(ex, 940, 600, |flow| {
crate::ui::window::block_lookup::view(state, flow)
})
}
super::super::ModalKind::BlockVisibility => {
let state = self.block_visibility.as_ref()?;
sized_flow(ex, 580, 470, |flow| {