forked from 1b-agent/opencadstudio-upstream
Lift the MText parser + renderer into a reusable `layout_mtext` helper in `text_support` and re-point the remaining text-bearing entities at it, so every inline format code (`\f`, `\C`/`\c`, `\H`, `\W`, `\Q`, `\T`, `\A`, `\p…`, decorations, stacked fractions, paragraph indents, tab stops, …) reaches the stroke output uniformly. Per-entity changes: - TABLE cell ([entities/table.rs]) — anchor + alignment math now feeds `layout_mtext`; `\C7;Red`-style codes no longer render as literal glyph noise. - MLEADER MText content (both entity path in [entities/multileader.rs] and the LOD-aware path in [scene/tessellate.rs]) — drops the `strip_mtext_codes` + per-line `tessellate_text_ex` chain; the LOD 0 baseline / LOD 1 greek rect / LOD 2 stroke ladder and the text-frame / bg-fill rectangle now read line widths from the layout. - ATTRIB / ATTDEF — when `mtext_flag` is MultiLine / ConstantMultiLine the value goes through the MText pipeline (SingleLine stays on the Text-style anchor maths because the DXF spec disallows codes there). - DIMENSION text_override — `dimension_text_entity` emits a synthetic MText (instead of Text) whenever the value contains MText escapes; the LOD ladder via `tessellate_entity_dim_text` handles both kinds. Infrastructure: - `MTextVAnchor` gains `MiddleOfTopLine`, `MiddleOfBottomLine`, `BottomOfTopLine` so MLEADER's 9 attachment variants all map cleanly. - `MTextLayout` returns `line_widths` / `line_height` / `v_offset` so callers that draw chrome (frames, fills, baselines, greek rects) share the same numbers as the rendered strokes. - `mtext_line_count` re-routed through the new parser so LOD row counts and rendered row counts can never disagree. - Legacy helpers (`strip_mtext_codes`, `split_mtext_lines`, `measure_mtext_chars`, `word_wrap`, `cxf::measure_text`, the `v_offset_for_attachment` MLEADER offset table, `MTextLine::plain_text`) deleted — all callers migrated. Audit (TEXT_FORMAT_CODE_INTEGRATION.md) removed; its plan is implemented here. Co-Authored-By: Claude Opus 4.7 <[email protected]>
320 lines
11 KiB
Rust
320 lines
11 KiB
Rust
use acadrust::entities::{AttachmentPoint, DrawingDirection, MText};
|
|
use glam::Vec3;
|
|
|
|
use crate::command::EntityTransform;
|
|
use crate::entities::common::{edit_prop as edit, ro_prop as ro, square_grip, triangle_grip};
|
|
use crate::entities::text_support::{
|
|
layout_mtext, resolve_text_style, MTextRenderOpts, MTextVAnchor,
|
|
};
|
|
use crate::entities::traits::{Grippable, PropertyEditable, Transformable, TruckConvertible};
|
|
use crate::scene::acad_to_truck::{TruckEntity, TruckObject};
|
|
use crate::scene::object::{GripApply, GripDef, PropSection, PropValue, Property};
|
|
use crate::scene::wire_model::SnapHint;
|
|
|
|
fn attachment_str(a: &AttachmentPoint) -> &'static str {
|
|
match a {
|
|
AttachmentPoint::TopLeft => "Top Left",
|
|
AttachmentPoint::TopCenter => "Top Center",
|
|
AttachmentPoint::TopRight => "Top Right",
|
|
AttachmentPoint::MiddleLeft => "Middle Left",
|
|
AttachmentPoint::MiddleCenter => "Middle Center",
|
|
AttachmentPoint::MiddleRight => "Middle Right",
|
|
AttachmentPoint::BottomLeft => "Bottom Left",
|
|
AttachmentPoint::BottomCenter => "Bottom Center",
|
|
AttachmentPoint::BottomRight => "Bottom Right",
|
|
}
|
|
}
|
|
|
|
fn mtext_halign_str(a: &AttachmentPoint) -> &'static str {
|
|
match a {
|
|
AttachmentPoint::TopLeft | AttachmentPoint::MiddleLeft | AttachmentPoint::BottomLeft => {
|
|
"Left"
|
|
}
|
|
AttachmentPoint::TopCenter
|
|
| AttachmentPoint::MiddleCenter
|
|
| AttachmentPoint::BottomCenter => "Center",
|
|
AttachmentPoint::TopRight | AttachmentPoint::MiddleRight | AttachmentPoint::BottomRight => {
|
|
"Right"
|
|
}
|
|
}
|
|
}
|
|
|
|
fn mtext_valign_str(a: &AttachmentPoint) -> &'static str {
|
|
match a {
|
|
AttachmentPoint::TopLeft | AttachmentPoint::TopCenter | AttachmentPoint::TopRight => "Top",
|
|
AttachmentPoint::MiddleLeft
|
|
| AttachmentPoint::MiddleCenter
|
|
| AttachmentPoint::MiddleRight => "Middle",
|
|
AttachmentPoint::BottomLeft
|
|
| AttachmentPoint::BottomCenter
|
|
| AttachmentPoint::BottomRight => "Bottom",
|
|
}
|
|
}
|
|
|
|
fn mtext_attachment_from_align(h: &str, v: &str) -> Option<AttachmentPoint> {
|
|
Some(match (h, v) {
|
|
("Left", "Top") => AttachmentPoint::TopLeft,
|
|
("Center", "Top") => AttachmentPoint::TopCenter,
|
|
("Right", "Top") => AttachmentPoint::TopRight,
|
|
("Left", "Middle") => AttachmentPoint::MiddleLeft,
|
|
("Center", "Middle") => AttachmentPoint::MiddleCenter,
|
|
("Right", "Middle") => AttachmentPoint::MiddleRight,
|
|
("Left", "Bottom") => AttachmentPoint::BottomLeft,
|
|
("Center", "Bottom") => AttachmentPoint::BottomCenter,
|
|
("Right", "Bottom") => AttachmentPoint::BottomRight,
|
|
_ => return None,
|
|
})
|
|
}
|
|
|
|
fn drawing_dir_str(d: &DrawingDirection) -> &'static str {
|
|
match d {
|
|
DrawingDirection::LeftToRight => "Left to Right",
|
|
DrawingDirection::TopToBottom => "Top to Bottom",
|
|
DrawingDirection::ByStyle => "By Style",
|
|
}
|
|
}
|
|
|
|
fn to_truck(t: &MText, document: &acadrust::CadDocument) -> TruckEntity {
|
|
let resolved_style = resolve_text_style(&t.style, document);
|
|
let attach_h_anchor: f32 = match t.attachment_point {
|
|
AttachmentPoint::TopCenter
|
|
| AttachmentPoint::MiddleCenter
|
|
| AttachmentPoint::BottomCenter => 0.5,
|
|
AttachmentPoint::TopRight | AttachmentPoint::MiddleRight | AttachmentPoint::BottomRight => {
|
|
1.0
|
|
}
|
|
_ => 0.0,
|
|
};
|
|
let v_anchor = match t.attachment_point {
|
|
AttachmentPoint::TopLeft | AttachmentPoint::TopCenter | AttachmentPoint::TopRight => {
|
|
MTextVAnchor::Top
|
|
}
|
|
AttachmentPoint::MiddleLeft
|
|
| AttachmentPoint::MiddleCenter
|
|
| AttachmentPoint::MiddleRight => MTextVAnchor::Middle,
|
|
AttachmentPoint::BottomLeft
|
|
| AttachmentPoint::BottomCenter
|
|
| AttachmentPoint::BottomRight => MTextVAnchor::Bottom,
|
|
};
|
|
let rotation = if resolved_style.is_upside_down {
|
|
t.rotation as f32 + std::f32::consts::PI
|
|
} else {
|
|
t.rotation as f32
|
|
};
|
|
let layout = layout_mtext(&MTextRenderOpts {
|
|
value: &t.value,
|
|
insertion: [t.insertion_point.x, t.insertion_point.y, t.insertion_point.z],
|
|
height: t.height as f32,
|
|
rect_w: t.rectangle_width as f32,
|
|
rotation,
|
|
style: &resolved_style,
|
|
attach_h_anchor,
|
|
v_anchor,
|
|
line_spacing_factor: t.line_spacing_factor as f32,
|
|
vertical_text: matches!(t.drawing_direction, DrawingDirection::TopToBottom),
|
|
});
|
|
let insertion = Vec3::new(
|
|
t.insertion_point.x as f32,
|
|
t.insertion_point.y as f32,
|
|
t.insertion_point.z as f32,
|
|
);
|
|
TruckEntity {
|
|
object: TruckObject::Text(layout.strokes),
|
|
snap_pts: vec![(insertion, SnapHint::Insertion)],
|
|
tangent_geoms: vec![],
|
|
key_vertices: vec![],
|
|
fill_tris: vec![],
|
|
}
|
|
}
|
|
|
|
fn grips(t: &MText) -> Vec<GripDef> {
|
|
let p = Vec3::new(
|
|
t.insertion_point.x as f32,
|
|
t.insertion_point.y as f32,
|
|
t.insertion_point.z as f32,
|
|
);
|
|
let dir = Vec3::new((t.rotation as f32).cos(), (t.rotation as f32).sin(), 0.0);
|
|
let width_grip = p + dir * t.rectangle_width.max(0.0) as f32;
|
|
vec![square_grip(0, p), triangle_grip(1, width_grip)]
|
|
}
|
|
|
|
fn properties(t: &MText, text_style_names: &[String]) -> PropSection {
|
|
PropSection {
|
|
title: "Geometry".into(),
|
|
props: vec![
|
|
edit("Insert X", "ins_x", t.insertion_point.x),
|
|
edit("Insert Y", "ins_y", t.insertion_point.y),
|
|
edit("Insert Z", "ins_z", t.insertion_point.z),
|
|
edit("Height", "height", t.height),
|
|
edit("Width", "rect_w", t.rectangle_width),
|
|
edit("Rect Height", "rect_h", t.rectangle_height.unwrap_or(0.0)),
|
|
edit("Rotation", "rotation", t.rotation.to_degrees()),
|
|
edit("Line Spacing", "line_spacing", t.line_spacing_factor),
|
|
Property {
|
|
label: "H-Align".into(),
|
|
field: "h_align",
|
|
value: PropValue::Choice {
|
|
selected: mtext_halign_str(&t.attachment_point).to_string(),
|
|
options: ["Left", "Center", "Right"]
|
|
.into_iter()
|
|
.map(str::to_string)
|
|
.collect(),
|
|
},
|
|
},
|
|
Property {
|
|
label: "V-Align".into(),
|
|
field: "v_align",
|
|
value: PropValue::Choice {
|
|
selected: mtext_valign_str(&t.attachment_point).to_string(),
|
|
options: ["Top", "Middle", "Bottom"]
|
|
.into_iter()
|
|
.map(str::to_string)
|
|
.collect(),
|
|
},
|
|
},
|
|
ro(
|
|
"Attachment",
|
|
"attachment",
|
|
attachment_str(&t.attachment_point).to_string(),
|
|
),
|
|
ro(
|
|
"Direction",
|
|
"direction",
|
|
drawing_dir_str(&t.drawing_direction).to_string(),
|
|
),
|
|
Property {
|
|
label: "Content".into(),
|
|
field: "content",
|
|
value: PropValue::EditText(t.value.clone()),
|
|
},
|
|
Property {
|
|
label: "Style".into(),
|
|
field: "style",
|
|
value: PropValue::Choice {
|
|
selected: if t.style.trim().is_empty() {
|
|
"Standard".into()
|
|
} else {
|
|
t.style.clone()
|
|
},
|
|
options: text_style_names.to_vec(),
|
|
},
|
|
},
|
|
],
|
|
}
|
|
}
|
|
|
|
fn apply_geom_prop(t: &mut MText, field: &str, value: &str) {
|
|
match field {
|
|
"content" => {
|
|
t.value = value.to_string();
|
|
return;
|
|
}
|
|
"style" => {
|
|
t.style = value.to_string();
|
|
return;
|
|
}
|
|
"h_align" => {
|
|
if let Some(next) =
|
|
mtext_attachment_from_align(value, mtext_valign_str(&t.attachment_point))
|
|
{
|
|
t.attachment_point = next;
|
|
}
|
|
return;
|
|
}
|
|
"v_align" => {
|
|
if let Some(next) =
|
|
mtext_attachment_from_align(mtext_halign_str(&t.attachment_point), value)
|
|
{
|
|
t.attachment_point = next;
|
|
}
|
|
return;
|
|
}
|
|
_ => {}
|
|
}
|
|
let Some(v) = crate::entities::common::parse_f64(value) else {
|
|
return;
|
|
};
|
|
match field {
|
|
"ins_x" => t.insertion_point.x = v,
|
|
"ins_y" => t.insertion_point.y = v,
|
|
"ins_z" => t.insertion_point.z = v,
|
|
"height" if v > 0.0 => t.height = v,
|
|
"rect_w" if v > 0.0 => t.rectangle_width = v,
|
|
"rect_h" if v > 0.0 => t.rectangle_height = Some(v),
|
|
"rotation" => t.rotation = v.to_radians(),
|
|
"line_spacing" if v > 0.0 => t.line_spacing_factor = v,
|
|
_ => {}
|
|
}
|
|
}
|
|
|
|
fn apply_grip(t: &mut MText, grip_id: usize, apply: GripApply) {
|
|
match (grip_id, apply) {
|
|
(0, GripApply::Absolute(p)) => {
|
|
t.insertion_point.x = p.x as f64;
|
|
t.insertion_point.y = p.y as f64;
|
|
t.insertion_point.z = p.z as f64;
|
|
}
|
|
(0, GripApply::Translate(d)) => {
|
|
t.insertion_point.x += d.x as f64;
|
|
t.insertion_point.y += d.y as f64;
|
|
t.insertion_point.z += d.z as f64;
|
|
}
|
|
(1, GripApply::Absolute(p)) => {
|
|
let dir_x = t.rotation.cos();
|
|
let dir_y = t.rotation.sin();
|
|
let dx = p.x as f64 - t.insertion_point.x;
|
|
let dy = p.y as f64 - t.insertion_point.y;
|
|
let projected = dx * dir_x + dy * dir_y;
|
|
t.rectangle_width = projected.max(0.01);
|
|
}
|
|
_ => {}
|
|
}
|
|
}
|
|
|
|
fn apply_transform(t: &mut MText, tr: &EntityTransform) {
|
|
crate::scene::transform::apply_standard_entity_transform(t, tr, |entity, p1, p2| {
|
|
crate::scene::transform::reflect_xy_point(
|
|
&mut entity.insertion_point.x,
|
|
&mut entity.insertion_point.y,
|
|
p1,
|
|
p2,
|
|
);
|
|
let dx = (p2.x - p1.x) as f64;
|
|
let dy = (p2.y - p1.y) as f64;
|
|
let line_angle = dy.atan2(dx);
|
|
entity.rotation = 2.0 * line_angle - entity.rotation;
|
|
});
|
|
}
|
|
|
|
impl TruckConvertible for MText {
|
|
fn to_truck(&self, document: &acadrust::CadDocument) -> Option<TruckEntity> {
|
|
Some(to_truck(self, document))
|
|
}
|
|
}
|
|
|
|
impl Grippable for MText {
|
|
fn grips(&self) -> Vec<GripDef> {
|
|
grips(self)
|
|
}
|
|
|
|
fn apply_grip(&mut self, grip_id: usize, apply: GripApply) {
|
|
apply_grip(self, grip_id, apply);
|
|
}
|
|
}
|
|
|
|
impl PropertyEditable for MText {
|
|
fn geometry_properties(&self, text_style_names: &[String]) -> PropSection {
|
|
properties(self, text_style_names)
|
|
}
|
|
|
|
fn apply_geom_prop(&mut self, field: &str, value: &str) {
|
|
apply_geom_prop(self, field, value);
|
|
}
|
|
}
|
|
|
|
impl Transformable for MText {
|
|
fn apply_transform(&mut self, t: &EntityTransform) {
|
|
apply_transform(self, t);
|
|
}
|
|
}
|