forked from 1b-agent/opencadstudio-upstream
feat(annotative): scale text/dims/tables/blocks at the annotation scale + editable property pickers
Render: annotative-ness is resolved centrally in scene::annotative::is_annotative (per-object context dictionary, legacy XDATA, or annotative style) so the bake and the properties panel agree. Text, dimensions, tables and blocks now display at the current annotation scale in model space. An annotative block scales as one uniform unit about its insertion point — its internal geometry and attributes are carried by that scale instead of being scaled individually, fixing the block-attribute size regression. Tables scale their column/row/margin geometry. Properties: the handle- and flag-backed rows are now editable pickers — MLEADER multileader style / text style / arrowhead / leader linetype, General Material, and Plot style (named plot-style mode only; the color-dependent mode stays read-only, which is correct). A picked name is resolved back to its handle in the update loop, where the document is in scope. Annotative Yes/No and the annotation-scale row are shown per object. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
1 parent
8ef65f59f8
commit
1b037a68aa
9 files changed
+539
-228
No files matched your search
Vendored
+21
-1
@@ -591,9 +591,29 @@ pub fn expand_insert(
|
||||
// from native content.
|
||||
is_xref: bool,
|
||||
bg_color: [f32; 4],
|
||||
// Current annotation scale. An annotative block scales as one uniform unit
|
||||
// about its insertion point; a non-annotative block is unaffected.
|
||||
anno_scale: f32,
|
||||
) -> Option<Vec<WireModel>> {
|
||||
let defn = cache.defn(&ins.block_name)?;
|
||||
let xform = ins.get_transform();
|
||||
let mut xform = ins.get_transform();
|
||||
// Annotative blocks (the flag lives on the block definition; the instance is
|
||||
// marked with the AcAnnotativeData XDATA) scale as ONE uniform unit about
|
||||
// their insertion point — internal geometry/text/attributes are carried by
|
||||
// this transform, never scaled individually (which would double-scale).
|
||||
if (anno_scale - 1.0).abs() > 1e-6
|
||||
&& ins
|
||||
.common
|
||||
.extended_data
|
||||
.get_record("AcAnnotativeData")
|
||||
.is_some()
|
||||
{
|
||||
let p = ins.insert_point;
|
||||
let scale_about_p = Transform::from_translation(Vector3::new(-p.x, -p.y, -p.z))
|
||||
.then(&Transform::from_scale(anno_scale as f64))
|
||||
.then(&Transform::from_translation(Vector3::new(p.x, p.y, p.z)));
|
||||
xform = xform.then(&scale_about_p);
|
||||
}
|
||||
let name = ins_handle.value().to_string();
|
||||
let mut batches = Batches::default();
|
||||
let mut visited: Vec<String> = Vec::with_capacity(8);
|
||||
|
||||
Reference in new issue
Block a user