6cd422e5b9
PLOTWINDOW / PW now forces Endpoint object-snap while picking its two corners, independent of the global OSNAP toggle, so the plot area lands exactly on frame corners. The snapper's master toggle and configured modes are saved and restored around the pick, so the user's OSNAP settings are unchanged afterward. - CadCommand::forces_endpoint_snap() opt-in (default false; PlotWindowCommand true). - Snapper::snap_forced_corners() forces Endpoint only, then restores state. Intersection is deliberately excluded: it is O(n^2) over the hit-test wire set and froze the UI on large drawings when a plot window is picked zoomed-out. Frame corners are endpoints, so Endpoint alone suffices. - the cursor-move handler routes the plot-window pick through the forced path. Works in model and paper space (shared pick path). Tests: opt-in flag; forced mode set is endpoint-only; snapper state is restored after the call.
98 lines
2.7 KiB
Rust
98 lines
2.7 KiB
Rust
// PLOTWINDOW command — pick two corners to define the plot window area.
|
|
//
|
|
// In paper space it writes the layout's PlotSettings (PlotType::Window); in
|
|
// model space the host stores the window for the plot dialog.
|
|
|
|
use crate::command::{CadCommand, CmdResult};
|
|
use crate::scene::model::wire_model::WireModel;
|
|
use glam::{DVec3, Vec3};
|
|
|
|
pub struct PlotWindowCommand {
|
|
p1: Option<Vec3>,
|
|
}
|
|
|
|
impl PlotWindowCommand {
|
|
pub fn new() -> Self {
|
|
Self { p1: None }
|
|
}
|
|
}
|
|
|
|
impl CadCommand for PlotWindowCommand {
|
|
fn name(&self) -> &'static str {
|
|
"PLOTWINDOW"
|
|
}
|
|
|
|
fn forces_endpoint_snap(&self) -> bool {
|
|
true
|
|
}
|
|
|
|
fn prompt(&self) -> String {
|
|
if self.p1.is_none() {
|
|
"PLOTWINDOW Specify first corner of plot window:".into()
|
|
} else {
|
|
"PLOTWINDOW Specify opposite corner:".into()
|
|
}
|
|
}
|
|
|
|
fn on_point(&mut self, pt: DVec3) -> CmdResult { let pt = pt.as_vec3();
|
|
match self.p1 {
|
|
None => {
|
|
self.p1 = Some(pt);
|
|
CmdResult::NeedPoint
|
|
}
|
|
Some(p1) => CmdResult::SetPlotWindow { p1: p1.as_dvec3(), p2: pt.as_dvec3() },
|
|
}
|
|
}
|
|
|
|
fn on_enter(&mut self) -> CmdResult {
|
|
CmdResult::Cancel
|
|
}
|
|
|
|
fn on_mouse_move(&mut self, pt: DVec3) -> Option<WireModel> { let pt = pt.as_vec3();
|
|
let p1 = self.p1?;
|
|
// Draw the selection rectangle.
|
|
Some(WireModel {
|
|
name: "plotwindow_preview".into(),
|
|
points: vec![
|
|
[p1.x, p1.y, p1.z],
|
|
[pt.x, p1.y, p1.z],
|
|
[pt.x, p1.y, p1.z],
|
|
[pt.x, pt.y, pt.z],
|
|
[pt.x, pt.y, pt.z],
|
|
[p1.x, pt.y, pt.z],
|
|
[p1.x, pt.y, pt.z],
|
|
[p1.x, p1.y, p1.z],
|
|
],
|
|
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: &["PLOTWINDOW", "PW"] }); // PlotWindowCommand
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn plot_window_forces_endpoint_snap() {
|
|
let cmd = PlotWindowCommand::new();
|
|
assert!(cmd.forces_endpoint_snap());
|
|
}
|
|
}
|