forked from 1b-agent/opencadstudio-upstream
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>
96 lines
3.0 KiB
Rust
96 lines
3.0 KiB
Rust
// AREA command — compute area and perimeter of a polygon picked point by point.
|
|
// Press Enter to close and calculate.
|
|
|
|
use glam::DVec3;
|
|
|
|
use crate::command::{CadCommand, CmdResult};
|
|
use crate::scene::model::wire_model::WireModel;
|
|
|
|
pub struct AreaCommand {
|
|
points: Vec<DVec3>,
|
|
}
|
|
|
|
impl AreaCommand {
|
|
pub fn new() -> Self {
|
|
Self { points: vec![] }
|
|
}
|
|
}
|
|
|
|
impl CadCommand for AreaCommand {
|
|
fn name(&self) -> &'static str {
|
|
"AREA"
|
|
}
|
|
|
|
fn prompt(&self) -> String {
|
|
if self.points.is_empty() {
|
|
"AREA Specify first corner point (Enter to cancel):".into()
|
|
} else {
|
|
format!(
|
|
"AREA Specify next point ({} picked, Enter to calculate):",
|
|
self.points.len()
|
|
)
|
|
}
|
|
}
|
|
|
|
fn on_point(&mut self, pt: DVec3) -> CmdResult {
|
|
self.points.push(pt);
|
|
CmdResult::NeedPoint
|
|
}
|
|
|
|
fn on_enter(&mut self) -> CmdResult {
|
|
if self.points.len() < 3 {
|
|
return CmdResult::Cancel;
|
|
}
|
|
// Shoelace formula in the world XY plane, evaluated in f64 relative to
|
|
// the first vertex. Subtracting that origin keeps the cross-product
|
|
// terms small even at large (survey/UTM) coordinates, avoiding the
|
|
// catastrophic cancellation a raw f32/absolute evaluation suffers.
|
|
let n = self.points.len();
|
|
let origin = self.points[0];
|
|
let mut area_sum = 0.0f64;
|
|
let mut perimeter = 0.0f64;
|
|
for idx in 0..n {
|
|
let a = self.points[idx] - origin;
|
|
let b = self.points[(idx + 1) % n] - origin;
|
|
area_sum += a.x * b.y - b.x * a.y;
|
|
perimeter += (self.points[(idx + 1) % n] - self.points[idx]).length();
|
|
}
|
|
let area = (area_sum * 0.5).abs();
|
|
let msg = format!("Area = {area:.4}, Perimeter = {perimeter:.4}");
|
|
CmdResult::Measurement(msg)
|
|
}
|
|
|
|
fn on_mouse_move(&mut self, pt: DVec3) -> Option<WireModel> {
|
|
if self.points.is_empty() {
|
|
return None;
|
|
}
|
|
let f = |p: DVec3| [p.x as f32, p.y as f32, p.z as f32];
|
|
let mut pts: Vec<[f32; 3]> = self.points.iter().map(|p| f(*p)).collect();
|
|
pts.push(f(pt));
|
|
pts.push(f(self.points[0]));
|
|
Some(WireModel {
|
|
name: "area_preview".into(),
|
|
points: pts,
|
|
points_low: Vec::new(),
|
|
color: WireModel::CYAN,
|
|
selected: false,
|
|
pattern_length: 0.0,
|
|
pattern: [0.0; 8],
|
|
line_weight_px: 1.0,
|
|
snap_pts: vec![],
|
|
tangent_geoms: vec![],
|
|
aci: 0,
|
|
key_vertices: vec![],
|
|
aabb: WireModel::UNBOUNDED_AABB,
|
|
plinegen: true,
|
|
vp_scissor: None,
|
|
fill_tris: vec![],
|
|
fill_tris_low: Vec::new(),
|
|
})
|
|
}
|
|
}
|
|
|
|
|
|
// ── Autocomplete registry ─────────────────────────────────
|
|
inventory::submit!(crate::command::CommandRegistration { names: &["AREA"] }); // AreaCommand
|