forked from 1b-agent/opencadstudio-upstream
feat(commands): integrate standard CAD commands and fix behavior gaps
Broad pass over the command set: integrate missing commands, wire previously-unreachable ribbon/menu buttons, and correct name/behaviour mismatches. Every UI command token now resolves (real handler where the infrastructure exists, an honest "not yet implemented" status otherwise). New commands: - Draw: 3DPOLY, 2D solid (SO/SOLID2D), HELIX, TRACE, SKETCH, DIMCENTER (DCE/CENTERMARK) - Modify/inquiry: REVERSE, MEASUREGEOM (MEA), DBLIST - Data/manage: BASE, OVERKILL (exact-duplicate removal), AUDIT (read-only integrity report), SETVAR (system-variable get/set), SCRIPT (.scr runner), FINDNONPURGEABLE Behaviour fixes: - LINE and SPLINE gain Close/Undo; AREA computes area/perimeter in f64 (correct at large coordinates) - ATTEDIT/ATE unified so the alias and the ribbon button open the interactive editor; -ATTEDIT is the command-line form - Linear/aligned/radius/diameter dimensions gain a text override (Text) and text angle (Angle) option - INSERT gains Scale/Rotate options; COPY gains an Array option - LINETYPE SET sets the current entity linetype; SETBYLAYER resets overrides - UNDO accepts a step count Integrations: standard dimension/block aliases (DLI/DRA/DAN, BMAKE, EXPORTPDF, DDIM), drafting-aid and screen toggles (GRID/SNAP/POLAR/OSNAP/ DSETTINGS/CLEANSCREEN/QUICKPROPERTIES), viewport tiling (CASCADE/HORIZONTAL/VERTICAL/VPJOIN), and customization entry points (CUI/ALIASEDIT). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
1 parent
e04b580a70
commit
0ca3954b5d
32 files changed
+2763
-67
No files matched your search
@@ -35,6 +35,10 @@ pub struct CopyCommand {
|
||||
wire_models: Vec<WireModel>,
|
||||
step: Step,
|
||||
count: usize,
|
||||
/// Number of items for an Array copy (None = place copies one at a time).
|
||||
array_count: Option<usize>,
|
||||
/// True while the next typed value is captured as the array item count.
|
||||
awaiting_count: bool,
|
||||
}
|
||||
|
||||
impl CopyCommand {
|
||||
@@ -44,6 +48,8 @@ impl CopyCommand {
|
||||
wire_models,
|
||||
step: Step::Base,
|
||||
count: 0,
|
||||
array_count: None,
|
||||
awaiting_count: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -54,15 +60,27 @@ impl CadCommand for CopyCommand {
|
||||
}
|
||||
|
||||
fn prompt(&self) -> String {
|
||||
if self.awaiting_count {
|
||||
return "COPY Enter number of items to array:".to_string();
|
||||
}
|
||||
match &self.step {
|
||||
Step::Base => format!(
|
||||
"COPY Specify base point [{} objects]:",
|
||||
self.handles.len()
|
||||
),
|
||||
Step::Placing(base) => format!(
|
||||
"COPY Specify destination [{} copies so far | Enter=done | base {:.3},{:.3}]:",
|
||||
self.count, base.x, base.y
|
||||
),
|
||||
Step::Placing(base) => {
|
||||
if let Some(n) = self.array_count {
|
||||
format!(
|
||||
"COPY Specify second point for {n}-item array [base {:.3},{:.3}]:",
|
||||
base.x, base.y
|
||||
)
|
||||
} else {
|
||||
format!(
|
||||
"COPY Specify destination [{} copies so far | Array | Enter=done | base {:.3},{:.3}]:",
|
||||
self.count, base.x, base.y
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,19 +92,65 @@ impl CadCommand for CopyCommand {
|
||||
}
|
||||
Step::Placing(base) => {
|
||||
let delta = pt - *base;
|
||||
self.count += 1;
|
||||
CmdResult::CopySelected(self.handles.clone(), EntityTransform::Translate(delta))
|
||||
if let Some(n) = self.array_count {
|
||||
// Array: place n-1 copies at delta, 2·delta, … so the result
|
||||
// is n evenly spaced items including the original. Ends here.
|
||||
let transforms: Vec<EntityTransform> = (1..n)
|
||||
.map(|k| EntityTransform::Translate(delta * k as f64))
|
||||
.collect();
|
||||
CmdResult::BatchCopy(self.handles.clone(), transforms)
|
||||
} else {
|
||||
self.count += 1;
|
||||
CmdResult::CopySelected(
|
||||
self.handles.clone(),
|
||||
EntityTransform::Translate(delta),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn on_enter(&mut self) -> CmdResult {
|
||||
// Cancel an in-progress Array count entry; otherwise finish.
|
||||
if self.awaiting_count {
|
||||
self.awaiting_count = false;
|
||||
return CmdResult::NeedPoint;
|
||||
}
|
||||
CmdResult::Cancel
|
||||
}
|
||||
fn on_escape(&mut self) -> CmdResult {
|
||||
CmdResult::Cancel
|
||||
}
|
||||
|
||||
fn wants_text_input(&self) -> bool {
|
||||
matches!(self.step, Step::Placing(_))
|
||||
}
|
||||
|
||||
fn point_step_accepts_keywords(&self) -> bool {
|
||||
// Accept the Array keyword while placing, but route the typed item
|
||||
// count straight through on_text_input.
|
||||
matches!(self.step, Step::Placing(_)) && !self.awaiting_count
|
||||
}
|
||||
|
||||
fn on_text_input(&mut self, text: &str) -> Option<CmdResult> {
|
||||
if self.awaiting_count {
|
||||
if let Ok(n) = text.trim().parse::<usize>() {
|
||||
if n >= 2 {
|
||||
self.array_count = Some(n);
|
||||
}
|
||||
}
|
||||
self.awaiting_count = false;
|
||||
return Some(CmdResult::NeedPoint);
|
||||
}
|
||||
match text.trim().to_uppercase().as_str() {
|
||||
"A" | "ARRAY" => {
|
||||
self.awaiting_count = true;
|
||||
Some(CmdResult::NeedPoint)
|
||||
}
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
fn on_preview_wires(&mut self, pt: DVec3) -> Vec<WireModel> {
|
||||
let Step::Placing(base) = &self.step else {
|
||||
return vec![];
|
||||
|
||||
Reference in new issue
Block a user