forked from 1b-agent/opencadstudio-upstream
feat(ucs): interactive UCS command — UCS Z 90 typable everywhere (F2, #169)
Bare `UCS` now enters an interactive front-end (UcsCommand) that gathers the option then its value as separate steps, instead of the command line submitting `UCS` alone on the first Space. The front-end delegates execution back to the existing inline `UCS <option> …` handler via a new `CmdResult::Dispatch(String)`, so the coordinate-system math and the save/persist path are untouched. Now `UCS Z 90` works the same from the command line (Space-separated), headless automation, and any source that feeds the active command — closing the input half of #169. Inline `UCS Z 90` (one-shot / paste) still hits the inline handler directly. Second phase of routing input sources through the unified step driver: the interactive command is driven by feed_command like any tool. Adds headless test ucs_interactive_inline_args. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
1 parent
5fdd212592
commit
36d2f33301
6 files changed
+159
-2
No files matched your search
@@ -15,6 +15,7 @@ mod solid;
|
||||
mod tile_horiz;
|
||||
mod tile_vert;
|
||||
mod tool_palettes;
|
||||
pub mod ucs_cmd;
|
||||
mod ucs_icon;
|
||||
mod view_front;
|
||||
mod view_iso;
|
||||
|
||||
@@ -0,0 +1,110 @@
|
||||
//! Interactive front-end for the UCS command.
|
||||
//!
|
||||
//! Bare `UCS` enters this command so the option and its value are entered
|
||||
//! step-by-step — `UCS` ⏎ → option ⏎ → value ⏎ — and so a single line
|
||||
//! `UCS Z 90` (typed in the command line with Space between tokens, or sent
|
||||
//! headless as `{"op":"run","cmd":"UCS Z 90"}`) feeds the option then the value
|
||||
//! as text steps. Execution is delegated to the existing inline `UCS …` handler
|
||||
//! via [`CmdResult::Dispatch`], so the coordinate-system math and persistence
|
||||
//! stay in one place. (#169)
|
||||
|
||||
use crate::command::{CadCommand, CmdResult};
|
||||
use glam::DVec3;
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct UcsCommand {
|
||||
/// The chosen option keyword (uppercased), once entered; `None` until then.
|
||||
option: Option<String>,
|
||||
}
|
||||
|
||||
impl UcsCommand {
|
||||
pub fn new() -> Self {
|
||||
Self::default()
|
||||
}
|
||||
|
||||
/// Options that take no further argument and execute immediately.
|
||||
fn is_zero_arg(opt: &str) -> bool {
|
||||
matches!(opt, "W" | "WORLD" | "LIST" | "?")
|
||||
}
|
||||
|
||||
/// Options whose argument is a coordinate (so a click is accepted too).
|
||||
fn takes_point(opt: &str) -> bool {
|
||||
matches!(opt, "ORIGIN" | "O")
|
||||
}
|
||||
|
||||
/// Options that expect one more typed argument (angle or name).
|
||||
fn takes_value(opt: &str) -> bool {
|
||||
matches!(
|
||||
opt,
|
||||
"Z" | "X" | "Y" | "ORIGIN" | "O" | "SAVE" | "S" | "DELETE" | "DEL" | "D"
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
impl CadCommand for UcsCommand {
|
||||
fn name(&self) -> &'static str {
|
||||
"UCS"
|
||||
}
|
||||
|
||||
fn prompt(&self) -> String {
|
||||
match self.option.as_deref() {
|
||||
None => "UCS option [World/Z/X/Y/Origin/Save/Delete] or name:".into(),
|
||||
Some("Z") => "UCS rotation angle about Z (degrees):".into(),
|
||||
Some("X") => "UCS rotation angle about X (degrees):".into(),
|
||||
Some("Y") => "UCS rotation angle about Y (degrees):".into(),
|
||||
Some("ORIGIN") | Some("O") => "UCS new origin point:".into(),
|
||||
Some("SAVE") | Some("S") => "UCS name to save current UCS as:".into(),
|
||||
Some("DELETE") | Some("DEL") | Some("D") => "UCS name of UCS to delete:".into(),
|
||||
Some(_) => "UCS value:".into(),
|
||||
}
|
||||
}
|
||||
|
||||
fn wants_text_input(&self) -> bool {
|
||||
true
|
||||
}
|
||||
|
||||
fn on_text_input(&mut self, text: &str) -> Option<CmdResult> {
|
||||
let t = text.trim();
|
||||
match self.option.take() {
|
||||
// First token: the option keyword (or a named UCS to restore).
|
||||
None => {
|
||||
if t.is_empty() {
|
||||
// Bare Enter → list (delegate to inline `UCS`).
|
||||
return Some(CmdResult::Dispatch("UCS LIST".into()));
|
||||
}
|
||||
let up = t.to_uppercase();
|
||||
if Self::is_zero_arg(&up) {
|
||||
Some(CmdResult::Dispatch(format!("UCS {up}")))
|
||||
} else if Self::takes_value(&up) {
|
||||
// Needs a value next; keep the command active and re-prompt.
|
||||
self.option = Some(up);
|
||||
Some(CmdResult::NeedPoint)
|
||||
} else {
|
||||
// Not a keyword → a named UCS to activate.
|
||||
Some(CmdResult::Dispatch(format!("UCS {t}")))
|
||||
}
|
||||
}
|
||||
// Second token: the option's value → run the assembled command.
|
||||
Some(opt) => Some(CmdResult::Dispatch(format!("UCS {opt} {t}"))),
|
||||
}
|
||||
}
|
||||
|
||||
fn on_point(&mut self, pt: DVec3) -> CmdResult {
|
||||
// A clicked point only makes sense for the Origin option; otherwise a
|
||||
// stray click is ignored (keep waiting for the typed keyword / value).
|
||||
if matches!(self.option.as_deref(), Some(o) if Self::takes_point(o)) {
|
||||
let opt = self.option.take().unwrap_or_default();
|
||||
return CmdResult::Dispatch(format!("UCS {opt} {},{},{}", pt.x, pt.y, pt.z));
|
||||
}
|
||||
CmdResult::NeedPoint
|
||||
}
|
||||
|
||||
fn on_enter(&mut self) -> CmdResult {
|
||||
match self.option.take() {
|
||||
// No option chosen yet → behave like bare `UCS` (list).
|
||||
None => CmdResult::Dispatch("UCS LIST".into()),
|
||||
// Option chosen but no value supplied → cancel cleanly.
|
||||
Some(_) => CmdResult::Cancel,
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user