mirror of
https://github.com/storytold/cadcraft.git
synced 2026-11-20 04:41:47 -06:00
feat(engine): implement -ATTEDIT Position/Height/Angle/Style and -RENAME VPort
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
|
||||
use cadcraft_doc::color::Color;
|
||||
use cadcraft_doc::{AttribProps, Common, EntityKind, Handle};
|
||||
use cadcraft_geom::Vec3;
|
||||
use serde_json::{Map, Value, json};
|
||||
|
||||
use crate::cmd::curves::KW;
|
||||
@@ -149,6 +150,18 @@ fn set_props(s: &mut Session, (h, k): (Handle, usize), f: impl FnOnce(&mut Attri
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Modify the attribute `k` of block reference `h`.
|
||||
fn modify_attrib(s: &mut Session, (h, k): (Handle, usize), f: impl FnOnce(&mut cadcraft_doc::Attrib)) -> Result<()> {
|
||||
s.doc_mut()?.modify_entity(h, |e| {
|
||||
if let EntityKind::Insert(ins) = &mut e.kind
|
||||
&& let Some(a) = ins.attribs.get_mut(k)
|
||||
{
|
||||
f(a);
|
||||
}
|
||||
})?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// The layer and colour attribute `k` of block reference `h` is drawn with: its own, else its
|
||||
/// definition's (layer 0 is the reference's layer).
|
||||
fn current_props(s: &Session, (h, k): (Handle, usize)) -> Option<(String, Color)> {
|
||||
@@ -164,6 +177,14 @@ fn current_props(s: &Session, (h, k): (Handle, usize)) -> Option<(String, Color)
|
||||
Some((layer, c.color))
|
||||
}
|
||||
|
||||
/// The current text properties of attribute `k` of block reference `h`.
|
||||
fn current_text(s: &Session, (h, k): (Handle, usize)) -> Option<cadcraft_doc::Text> {
|
||||
let d = s.doc().ok()?;
|
||||
let e = d.entity(h)?;
|
||||
let EntityKind::Insert(ins) = &e.kind else { return None };
|
||||
ins.attribs.get(k).map(|a| a.text.clone())
|
||||
}
|
||||
|
||||
/// Replace every `find` in `value` with `with`, unless the result would be too long.
|
||||
fn replaced(value: &str, find: &str, with: &str) -> Option<String> {
|
||||
if find.is_empty() || !value.contains(find) {
|
||||
@@ -276,6 +297,10 @@ enum Stage {
|
||||
Select,
|
||||
/// One at a time: what to do with the current attribute.
|
||||
Option,
|
||||
Position,
|
||||
Height,
|
||||
Angle,
|
||||
Style,
|
||||
ValueKind,
|
||||
NewValue,
|
||||
Layer,
|
||||
@@ -349,6 +374,7 @@ impl Interactive for DashAtteditM {
|
||||
}
|
||||
fn prompt(&self, s: &Session) -> Prompt {
|
||||
let cur = self.items.get(self.cur).and_then(|it| current_props(s, *it));
|
||||
let cur_text = self.items.get(self.cur).and_then(|it| current_text(s, *it));
|
||||
match self.stage {
|
||||
Stage::OneAtATime => Prompt::new("Edit attributes one at a time?", KW).kw(&["Yes", "No"]).default("Y"),
|
||||
Stage::VisibleOnly => Prompt::new("Edit only attributes visible on screen?", KW).kw(&["Yes", "No"]).default("Y"),
|
||||
@@ -356,7 +382,31 @@ impl Interactive for DashAtteditM {
|
||||
Stage::TagSpec => Prompt::new("Enter attribute tag specification", Accept::TEXT).default("*"),
|
||||
Stage::ValueSpec => Prompt::new("Enter attribute value specification", Accept::TEXT).default("*"),
|
||||
Stage::Select => Prompt::new("Select attributes", Accept::SELECT),
|
||||
Stage::Option => Prompt::new("Enter an option", KW).kw(&["Value", "Layer", "Color", "Next"]).default("N"),
|
||||
Stage::Option => {
|
||||
Prompt::new("Enter an option", KW).kw(&["Value", "Position", "Height", "Angle", "Style", "Layer", "Color", "Next"]).default("N")
|
||||
}
|
||||
Stage::Position => Prompt::new("Enter new text insertion point", Accept::POINT),
|
||||
Stage::Height => {
|
||||
let p = Prompt::new("Enter new text height", Accept::POINT_OR_NUMBER);
|
||||
match cur_text {
|
||||
Some(t) => p.default(format!("{:.4}", t.height)),
|
||||
None => p,
|
||||
}
|
||||
}
|
||||
Stage::Angle => {
|
||||
let p = Prompt::new("Enter new text rotation angle", Accept::POINT_OR_NUMBER);
|
||||
match cur_text {
|
||||
Some(t) => p.default(format!("{:.4}", t.rotation.to_degrees())),
|
||||
None => p,
|
||||
}
|
||||
}
|
||||
Stage::Style => {
|
||||
let p = Prompt::new("Enter new text style", Accept::TEXT);
|
||||
match cur_text {
|
||||
Some(t) => p.default(t.style),
|
||||
None => p,
|
||||
}
|
||||
}
|
||||
Stage::ValueKind => Prompt::new("Enter type of value modification", KW).kw(&["Change", "Replace"]).default("R"),
|
||||
Stage::NewValue => Prompt::new("Enter new attribute value", Accept::TEXT),
|
||||
Stage::Layer => {
|
||||
@@ -430,6 +480,10 @@ impl Interactive for DashAtteditM {
|
||||
}
|
||||
Stage::Option => match &i {
|
||||
Input::Keyword(k) if k == "Value" => self.stage = Stage::ValueKind,
|
||||
Input::Keyword(k) if k == "Position" => self.stage = Stage::Position,
|
||||
Input::Keyword(k) if k == "Height" => self.stage = Stage::Height,
|
||||
Input::Keyword(k) if k == "Angle" => self.stage = Stage::Angle,
|
||||
Input::Keyword(k) if k == "Style" => self.stage = Stage::Style,
|
||||
Input::Keyword(k) if k == "Layer" => self.stage = Stage::Layer,
|
||||
Input::Keyword(k) if k == "Color" => self.stage = Stage::Color,
|
||||
Input::Keyword(_) | Input::Enter => {
|
||||
@@ -441,14 +495,110 @@ impl Interactive for DashAtteditM {
|
||||
}
|
||||
Input::Text(t) => {
|
||||
let tl = t.trim().to_ascii_lowercase();
|
||||
let later = ["Position", "Height", "Angle", "Style"];
|
||||
return match later.iter().find(|k| !tl.is_empty() && k.to_ascii_lowercase().starts_with(&tl)) {
|
||||
Some(k) => Err(EngineError::Other(format!("{k} is not available yet."))),
|
||||
None => Err(invalid_keyword()),
|
||||
};
|
||||
let opts = ["Value", "Position", "Height", "Angle", "Style", "Layer", "Color", "Next"];
|
||||
match opts.iter().find(|k| !tl.is_empty() && k.to_ascii_lowercase().starts_with(&tl)) {
|
||||
Some(&"Value") => self.stage = Stage::ValueKind,
|
||||
Some(&"Position") => self.stage = Stage::Position,
|
||||
Some(&"Height") => self.stage = Stage::Height,
|
||||
Some(&"Angle") => self.stage = Stage::Angle,
|
||||
Some(&"Style") => self.stage = Stage::Style,
|
||||
Some(&"Layer") => self.stage = Stage::Layer,
|
||||
Some(&"Color") => self.stage = Stage::Color,
|
||||
Some(&"Next") => {
|
||||
self.cur += 1;
|
||||
if self.cur >= self.items.len() {
|
||||
return Ok(Step::Done);
|
||||
}
|
||||
self.show_current(s);
|
||||
}
|
||||
_ => return Err(invalid_keyword()),
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
},
|
||||
Stage::Position => {
|
||||
let p = match i {
|
||||
Input::Point(p) => p,
|
||||
Input::Enter => {
|
||||
self.stage = Stage::Option;
|
||||
return Ok(Step::Continue);
|
||||
}
|
||||
_ => return Ok(Step::Continue),
|
||||
};
|
||||
if let Some(it) = self.items.get(self.cur).copied() {
|
||||
modify_attrib(s, it, |a| {
|
||||
a.text.insert = Vec3::new(p.x, p.y, a.text.insert.z);
|
||||
if a.text.align_pt.is_some() {
|
||||
a.text.align_pt = Some(Vec3::new(p.x, p.y, a.text.insert.z));
|
||||
}
|
||||
})?;
|
||||
}
|
||||
self.stage = Stage::Option;
|
||||
}
|
||||
Stage::Height => {
|
||||
let h = match &i {
|
||||
Input::Point(p) => {
|
||||
let cur_pt = self.items.get(self.cur).and_then(|it| current_text(s, *it)).map(|t| t.insert.xy());
|
||||
match cur_pt {
|
||||
Some(base) => base.dist(*p).max(1e-9),
|
||||
None => p.len().max(1e-9),
|
||||
}
|
||||
}
|
||||
Input::Text(t) if !t.trim().is_empty() => crate::units::parse_distance(t.trim())
|
||||
.filter(|v| *v > 0.0)
|
||||
.ok_or_else(|| EngineError::Other("Requires a positive number.".into()))?,
|
||||
Input::Enter => {
|
||||
self.stage = Stage::Option;
|
||||
return Ok(Step::Continue);
|
||||
}
|
||||
_ => return Ok(Step::Continue),
|
||||
};
|
||||
if let Some(it) = self.items.get(self.cur).copied() {
|
||||
modify_attrib(s, it, |a| {
|
||||
a.text.height = h;
|
||||
})?;
|
||||
}
|
||||
self.stage = Stage::Option;
|
||||
}
|
||||
Stage::Angle => {
|
||||
let ang = match &i {
|
||||
Input::Point(p) => {
|
||||
let cur_pt = self.items.get(self.cur).and_then(|it| current_text(s, *it)).map(|t| t.insert.xy());
|
||||
match cur_pt {
|
||||
Some(base) => base.angle_to(*p),
|
||||
None => p.y.atan2(p.x),
|
||||
}
|
||||
}
|
||||
Input::Text(t) if !t.trim().is_empty() => {
|
||||
s.angle_settings().direction(t.trim()).ok_or_else(|| EngineError::Other("Requires an angle.".into()))?
|
||||
}
|
||||
Input::Enter => {
|
||||
self.stage = Stage::Option;
|
||||
return Ok(Step::Continue);
|
||||
}
|
||||
_ => return Ok(Step::Continue),
|
||||
};
|
||||
if let Some(it) = self.items.get(self.cur).copied() {
|
||||
modify_attrib(s, it, |a| {
|
||||
a.text.rotation = ang;
|
||||
})?;
|
||||
}
|
||||
self.stage = Stage::Option;
|
||||
}
|
||||
Stage::Style => {
|
||||
let Some(t) = text else { return Ok(Step::Continue) };
|
||||
let t = t.trim();
|
||||
if !t.is_empty() {
|
||||
let st =
|
||||
s.doc()?.text_style(t).map(|st| st.name.clone()).ok_or_else(|| EngineError::Other(format!("Cannot find style \"{t}\".")))?;
|
||||
if let Some(it) = self.items.get(self.cur).copied() {
|
||||
modify_attrib(s, it, |a| {
|
||||
a.text.style = st;
|
||||
})?;
|
||||
}
|
||||
}
|
||||
self.stage = Stage::Option;
|
||||
}
|
||||
Stage::ValueKind => match &i {
|
||||
Input::Keyword(k) if k == "Change" => self.stage = Stage::Find,
|
||||
Input::Keyword(_) | Input::Enter => self.stage = Stage::NewValue,
|
||||
|
||||
@@ -72,7 +72,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
CommandSpec::new("rename", "Rename...", run_rename)
|
||||
.menu(&["Format", "Rename..."])
|
||||
.alias(&["ren", "-rename"])
|
||||
.params("{table: layer|linetype|style|dimstyle|block|mleaderstyle|tablestyle|view|ucs, from, to}")
|
||||
.params("{table: layer|linetype|style|dimstyle|block|mleaderstyle|tablestyle|view|ucs|vport, from, to}")
|
||||
.interactive(|_| Ok(Box::new(rename::RenameM::default()))),
|
||||
]
|
||||
}
|
||||
@@ -1125,7 +1125,7 @@ fn run_rename(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
}
|
||||
"block" => rename::block(s, &from, &to)?,
|
||||
"mleaderstyle" | "multileaderstyle" => rename::simple(s, "mleaderstyle", &from, &to)?,
|
||||
"tablestyle" | "view" | "ucs" => rename::simple(s, &table, &from, &to)?,
|
||||
"tablestyle" | "view" | "ucs" | "vport" => rename::simple(s, &table, &from, &to)?,
|
||||
"style" | "textstyle" => {
|
||||
run_style_rename(s, &json!({ "from": from, "to": to }))?;
|
||||
}
|
||||
|
||||
@@ -87,12 +87,16 @@ pub(super) fn simple(s: &mut Session, table: &str, from: &str, to: &str) -> Resu
|
||||
if matches!(table, "mleaderstyle" | "tablestyle") && from.eq_ignore_ascii_case("Standard") {
|
||||
return Err(bad("rename", "the Standard style cannot be renamed"));
|
||||
}
|
||||
if table == "vport" && from.eq_ignore_ascii_case(cadcraft_doc::VportConfig::ACTIVE) {
|
||||
return Err(bad("rename", "the active viewport configuration cannot be renamed"));
|
||||
}
|
||||
let d = s.doc_mut()?;
|
||||
let mut names: Vec<&mut String> = match table {
|
||||
"mleaderstyle" => d.mleader_styles.iter_mut().map(|t| &mut t.name).collect(),
|
||||
"tablestyle" => d.table_styles.iter_mut().map(|t| &mut t.name).collect(),
|
||||
"view" => d.views.iter_mut().map(|t| &mut t.name).collect(),
|
||||
"ucs" => d.ucss.iter_mut().map(|t| &mut t.name).collect(),
|
||||
"vport" => d.vports.iter_mut().filter(|c| !c.is_active()).map(|t| &mut t.name).collect(),
|
||||
_ => return Err(bad("rename", "unsupported table")),
|
||||
};
|
||||
if !to.eq_ignore_ascii_case(from) && names.iter().any(|n| n.eq_ignore_ascii_case(&to)) {
|
||||
@@ -136,7 +140,7 @@ const TYPES: &[(&str, Option<&str>, &str)] = &[
|
||||
("Tablestyle", Some("tablestyle"), "table style"),
|
||||
("Ucs", Some("ucs"), "UCS"),
|
||||
("VIew", Some("view"), "view"),
|
||||
("VPort", None, "viewport configuration"),
|
||||
("VPort", Some("vport"), "viewport configuration"),
|
||||
];
|
||||
|
||||
/// Keyword-only: spaces separate inputs.
|
||||
@@ -159,6 +163,7 @@ fn exists(d: &Drawing, table: &str, name: &str) -> bool {
|
||||
"tablestyle" => any_named(d.table_styles.iter().map(|t| &t.name), name),
|
||||
"view" => any_named(d.views.iter().map(|t| &t.name), name),
|
||||
"ucs" => any_named(d.ucss.iter().map(|t| &t.name), name),
|
||||
"vport" => any_named(d.vports.iter().filter(|c| !c.is_active()).map(|c| &c.name), name),
|
||||
_ => true,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,14 +83,22 @@ fn dash_attedit_one_at_a_time_edits_the_selected_attributes() {
|
||||
let mut s = with_block();
|
||||
let h = handle(&insert(&mut s, 100.0, json!({"T": "abc"})));
|
||||
type_lines(&mut s, &["-attedit", "y", "", "T", "", "105,0", ""]);
|
||||
assert!(s.prompt_text().contains("[Value/Layer/Color/Next] <N>"), "{}", s.prompt_text());
|
||||
// Unsupported options say so and keep the prompt.
|
||||
s.cmdline("p").unwrap();
|
||||
assert!(s.log.iter().any(|l| l.contains("Position is not available yet")), "{:?}", s.log);
|
||||
assert!(s.prompt_text().contains("[Value/Position/Height/Angle/Style/Layer/Color/Next] <N>"), "{}", s.prompt_text());
|
||||
// Edit Position, Height, Angle, and Style
|
||||
type_lines(&mut s, &["p", "10,20", "h", "2.5", "a", "45", "s", "Standard"]);
|
||||
// Edit Value: change and replace
|
||||
type_lines(&mut s, &["v", "c", "b", "B", "v", "r", "replaced value", "n"]);
|
||||
assert!(s.running.is_none(), "{}", s.prompt_text());
|
||||
assert_eq!(value(&s, h, "T"), "replaced value");
|
||||
assert_eq!(value(&s, h, "U"), "u");
|
||||
|
||||
let EntityKind::Insert(ins) = &s.doc().unwrap().entity(h).unwrap().kind else { panic!("not an insert") };
|
||||
let att = ins.attribs.iter().find(|a| a.tag == "T").unwrap();
|
||||
assert!((att.text.insert.x - 10.0).abs() < 1e-6);
|
||||
assert!((att.text.insert.y - 20.0).abs() < 1e-6);
|
||||
assert!((att.text.height - 2.5).abs() < 1e-6);
|
||||
assert!((att.text.rotation.to_degrees() - 45.0).abs() < 1e-4);
|
||||
assert_eq!(att.text.style, "Standard");
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -38,7 +38,7 @@ fn dash_attedit_sets_layer_and_colour_of_one_attribute() {
|
||||
for t in ["-attedit", "y", "", "T", "", "105,0", ""] {
|
||||
s.cmdline(t).unwrap();
|
||||
}
|
||||
assert!(s.prompt_text().contains("[Value/Layer/Color/Next] <N>"), "{}", s.prompt_text());
|
||||
assert!(s.prompt_text().contains("[Value/Position/Height/Angle/Style/Layer/Color/Next] <N>"), "{}", s.prompt_text());
|
||||
s.cmdline("l").unwrap();
|
||||
assert!(s.prompt_text().contains("Enter new layer name <0>"), "{}", s.prompt_text());
|
||||
// An unknown layer is refused and asked again.
|
||||
|
||||
@@ -81,8 +81,19 @@ fn rename_prompts_type_old_and_new_name() {
|
||||
assert!(s.running.is_none(), "{}", s.prompt_text());
|
||||
assert!(s.doc().unwrap().layer("Newer").is_some());
|
||||
let n = s.log.len();
|
||||
s.script("-RENAME VP a b\nLINE 0,0 2,0\n\n").unwrap();
|
||||
s.script("-RENAME M a b\nLINE 0,0 2,0\n\n").unwrap();
|
||||
assert!(s.running.is_none(), "{}", s.prompt_text());
|
||||
assert!(s.log[n..].iter().any(|l| l.contains("not available yet")), "{:?}", &s.log[n..]);
|
||||
assert_eq!(s.doc().unwrap().model.iter().filter(|e| matches!(e.kind, EntityKind::Line(_))).count(), 2);
|
||||
|
||||
// VPort configuration rename
|
||||
s.doc_mut().unwrap().vports.push(cadcraft_doc::VportConfig { name: "MyVP".into(), tiles: vec![] });
|
||||
s.script("-RENAME VP MyVP NewVP\n").unwrap();
|
||||
assert!(s.running.is_none(), "{}", s.prompt_text());
|
||||
let d = s.doc().unwrap();
|
||||
assert!(d.vports.iter().any(|v| v.name == "NewVP"));
|
||||
assert!(!d.vports.iter().any(|v| v.name == "MyVP"));
|
||||
|
||||
// Cannot rename *Active viewport configuration
|
||||
assert!(s.execute("rename", &json!({ "table": "vport", "from": "*Active", "to": "Active2" })).is_err());
|
||||
}
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@ do them first.
|
||||
|
||||
| # | Gap | Evidence | User impact | Est. |
|
||||
|---|---|---|---|---|
|
||||
| F1 | **[alpha blocker]** Prompt options that still print "not available yet": -ATTEDIT one-at-a-time Position, Height, Angle and Style, colour books in -ATTEDIT Color, -RENAME of materials, plot styles and viewport configurations. SPLINEDIT Join, Edit vertex Add and Elevate order (#559), PEDIT Edit vertex and the other SPLINEDIT options (#558) done: Edit vertex Tangent directions last for the PEDIT session only (LWPOLYLINE stores none). MTEXT Dynamic/Static columns done (#547). SPLINE, MTEXT and MLEADER options done (#408): SPLINE Object fits the polyline's vertices (no spline frame is kept) (STRETCH polygon, CP and WP, and fence selection done; TRIM/EXTEND, PLINE arc mode and Length, XLINE done (#397); OFFSET, ROTATE and FILLET options done earlier) | `cmd/blocks/attedit.rs`, `cmd/props/rename.rs` | Low: the most-used commands are done | 1–3 |
|
||||
| F1 | **[alpha blocker]** Prompt options that still print "not available yet": colour books in -ATTEDIT Color, -RENAME of materials and plot styles. -ATTEDIT one-at-a-time Position, Height, Angle and Style done; -RENAME of viewport configurations (VPort) done. SPLINEDIT Join, Edit vertex Add and Elevate order (#559), PEDIT Edit vertex and the other SPLINEDIT options (#558) done: Edit vertex Tangent directions last for the PEDIT session only (LWPOLYLINE stores none). MTEXT Dynamic/Static columns done (#547). SPLINE, MTEXT and MLEADER options done (#408): SPLINE Object fits the polyline's vertices (no spline frame is kept) (STRETCH polygon, CP and WP, and fence selection done; TRIM/EXTEND, PLINE arc mode and Length, XLINE done (#397); OFFSET, ROTATE and FILLET options done earlier) | `cmd/blocks/attedit.rs`, `cmd/props/rename.rs` | Low: the most-used commands are done | 1–2 |
|
||||
| F2 | XREF editing in place and clipping: XCLIP is missing. REFEDIT, REFSET and REFCLOSE edit a block reference in place (working set, faded rest of the block, everything else locked, save or discard; #813); left: editing an xref in place (its source drawing is not written back; XOPEN opens it), picking nested references, a dimmed look for the locked drawing and a banner with Save and Discard, attribute sync of other references (ATTSYNC). XATTACH, the External References palette, -XREF (Bind/Detach/Path/Unload/Reload/Overlay), XBIND, XOPEN, overlays, relative paths and loading at open are done (#525). Unloaded state and xref-layer overrides last only for the session | `cmd/blocks/xref.rs` | Medium: xrefs can't be edited in place or clipped | 15–25 |
|
||||
| F3 | **[alpha blocker]** (dynamic-block authoring is beta) No dynamic-block authoring: parameters and actions can't be added in the Block Editor. Dynamic blocks from other files are read and their references edited (visibility, distances, stretch and move, lookups, grips). BEDIT (with the Edit Block Definition dialog, which also starts new blocks), BSAVE, BSAVEAS and BCLOSE edit a static block definition, and every reference updates; REFEDIT edits a reference in place; no authoring palettes yet | issue #185 offers help | High: standard libraries are dynamic | 40–65 |
|
||||
| F4 | Autosave leftovers: no autosave in the web build (browser storage); autosave files are DXF, not DWG; no separate RECOVER mode in the file readers (SAVETIME, Drawing Recovery, AUDIT and RECOVER landed with #406; AUDITCTL `.adt` log landed) | `engine/src/autosave.rs`, `engine/src/audit.rs` | Low-medium (web users) | 2–4 |
|
||||
|
||||
Reference in New Issue
Block a user