mirror of
https://github.com/storytold/cadcraft.git
synced 2026-11-19 20:30:42 -06:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d1cb40332b | ||
|
|
b7d5ed3401 | ||
|
|
6b767073d8 | ||
|
|
7bcfe25938 | ||
|
|
3886fb952d | ||
|
|
6c9eedd7e1 | ||
|
|
6411c1a4ab | ||
|
|
6f203fb64b | ||
|
|
a2d209e10b | ||
|
|
cd226cdf0f | ||
|
|
8d2c9d1a26 | ||
|
|
0156fd9b9f | ||
|
|
df2a5131af | ||
|
|
5644c6c946 | ||
|
|
0fa45daf25 | ||
|
|
a92fb047d8 | ||
|
|
33dc795c5f | ||
|
|
4255108429 | ||
|
|
0b585fa8cb | ||
|
|
21d9627840 | ||
|
|
1c611d610d | ||
|
|
076b7761a3 | ||
|
|
71a0ef2260 | ||
|
|
4fadc54dbe | ||
|
|
9c2ebc0e12 | ||
|
|
98240d82d0 | ||
|
|
1e1cf10a1c | ||
|
|
af460caac6 | ||
|
|
ad072e6cb0 |
@@ -233,11 +233,38 @@ fn saved_window(app_ron: &str) -> bool {
|
||||
ron::from_str::<std::collections::HashMap<String, String>>(app_ron).is_ok_and(|kv| kv.contains_key(WINDOW_KEY))
|
||||
}
|
||||
|
||||
/// The window state from the last session is saved and will be restored (#2595).
|
||||
/// The window state from the last session is saved and will be restored (#2595). A saved size
|
||||
/// below the minimum (seen on Windows: 64×64 points, which eframe restores un-maximized and
|
||||
/// unusable) is dropped first, so the window opens at its default size.
|
||||
fn restores_window() -> bool {
|
||||
eframe::storage_dir(APP_ID).and_then(|dir| std::fs::read_to_string(dir.join("app.ron")).ok()).is_some_and(|ron| saved_window(&ron))
|
||||
let Some(path) = eframe::storage_dir(APP_ID).map(|dir| dir.join("app.ron")) else { return false };
|
||||
let Ok(mut ron) = std::fs::read_to_string(&path) else { return false };
|
||||
if let Some(fixed) = without_tiny_window(&ron)
|
||||
&& std::fs::write(&path, &fixed).is_ok()
|
||||
{
|
||||
ron = fixed;
|
||||
}
|
||||
saved_window(&ron)
|
||||
}
|
||||
|
||||
/// `app_ron` without its window entry when that entry's inner size is below `MIN_INNER_SIZE`;
|
||||
/// `None` when there is nothing to drop (no entry, a usable size, or an unreadable file).
|
||||
fn without_tiny_window(app_ron: &str) -> Option<String> {
|
||||
let mut kv = ron::from_str::<std::collections::BTreeMap<String, String>>(app_ron).ok()?;
|
||||
let w = kv.get(WINDOW_KEY)?;
|
||||
let size = &w[w.find("inner_size_points:")?..];
|
||||
let num = |k: &str| size[size.find(k)? + k.len()..].split([',', ')']).next()?.trim().parse::<f32>().ok();
|
||||
let (x, y) = (num("x:")?, num("y:")?);
|
||||
if x >= MIN_INNER_SIZE[0] && y >= MIN_INNER_SIZE[1] {
|
||||
return None;
|
||||
}
|
||||
kv.remove(WINDOW_KEY);
|
||||
ron::ser::to_string_pretty(&kv, ron::ser::PrettyConfig::default()).ok()
|
||||
}
|
||||
|
||||
/// The smallest main window, in points.
|
||||
const MIN_INNER_SIZE: [f32; 2] = [900.0, 560.0];
|
||||
|
||||
/// The main window: its size, title bar, placement and rendering needs. `restoring`: a window state
|
||||
/// saved by the last session is restored instead of opening centred.
|
||||
fn window_options(restoring: bool) -> eframe::NativeOptions {
|
||||
@@ -245,7 +272,7 @@ fn window_options(restoring: bool) -> eframe::NativeOptions {
|
||||
viewport: egui::ViewportBuilder::default()
|
||||
.with_title("CADCraft")
|
||||
.with_inner_size([1600.0, 1000.0])
|
||||
.with_min_inner_size([900.0, 560.0])
|
||||
.with_min_inner_size(MIN_INNER_SIZE)
|
||||
.with_drag_and_drop(true)
|
||||
.with_fullsize_content_view(true)
|
||||
.with_titlebar_shown(false)
|
||||
@@ -403,6 +430,9 @@ fn main() -> eframe::Result {
|
||||
app.ui = ui;
|
||||
}
|
||||
app.set_system_cursor_default(vars.system_cursor == Switch::On);
|
||||
// macOS: CADCRAFT_NO_NATIVE_MENU=1 keeps the menus inside the window.
|
||||
#[cfg(target_os = "macos")]
|
||||
app.set_native_menus(vars.no_native_menu != Switch::On);
|
||||
if let Some(error) = &workspace_error {
|
||||
eprintln!("CADCraft workspace: {error}");
|
||||
app.set_status(error);
|
||||
@@ -481,7 +511,7 @@ fn main() -> eframe::Result {
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::{filters_for_save, follow_desktop, saved_window, window_options};
|
||||
use super::{filters_for_save, follow_desktop, saved_window, window_options, without_tiny_window};
|
||||
|
||||
#[test]
|
||||
fn save_dialog_offers_dwg_with_the_drawing_format_first() {
|
||||
@@ -525,6 +555,17 @@ mod tests {
|
||||
assert!(!saved_window("not ron at all"));
|
||||
}
|
||||
|
||||
/// A saved 64×64 window (below the minimum) is dropped; a usable one is kept.
|
||||
#[test]
|
||||
fn a_tiny_saved_window_is_dropped() {
|
||||
let tiny = r#"{"window": "(normal_geometry:(outer_position_pixels:Some((x:0.0,y:0.0)),scale_factor:1.25,inner_size_points:(x:64.0,y:64.0)),fullscreen:false,maximized:true)", "cadcraft.prefs": "{}"}"#;
|
||||
let fixed = without_tiny_window(tiny).expect("dropped");
|
||||
assert!(!saved_window(&fixed) && fixed.contains("cadcraft.prefs"));
|
||||
let ok = tiny.replace("x:64.0,y:64.0)),", "x:1600.0,y:1000.0)),");
|
||||
assert_eq!(without_tiny_window(&ok), None);
|
||||
assert_eq!(without_tiny_window("not ron"), None);
|
||||
}
|
||||
|
||||
/// View ▸ Theme ▸ System on Linux: winit reports no theme, so the desktop's answer stands in;
|
||||
/// without one (or where winit answers and the desktop doesn't) the input is left alone.
|
||||
#[test]
|
||||
|
||||
@@ -22,6 +22,7 @@ pub(crate) mod groups;
|
||||
pub(crate) mod hatch;
|
||||
mod image;
|
||||
mod inquiry;
|
||||
pub mod interface;
|
||||
mod layer;
|
||||
mod layout;
|
||||
mod lisp;
|
||||
@@ -212,6 +213,7 @@ pub fn command_specs() -> &'static [CommandSpec] {
|
||||
v.extend(inquiry::specs());
|
||||
v.extend(settings::specs());
|
||||
v.extend(options::specs());
|
||||
v.extend(interface::specs());
|
||||
v.extend(utility::specs());
|
||||
v.extend(table::specs());
|
||||
v.extend(tolerance::specs());
|
||||
|
||||
@@ -564,17 +564,7 @@ pub fn seg_param(s: &Segment, p: Vec2) -> f64 {
|
||||
match s {
|
||||
Segment::Line(l) => l.param_of(p).clamp(0.0, 1.0),
|
||||
Segment::Arc { arc, ccw } => {
|
||||
// A point just outside the sweep (on the arc within tolerance of an end) goes to the
|
||||
// nearer end: a hair before the start is the start, not round the circle to the end.
|
||||
let a = cadcraft_geom::norm_angle(arc.center.angle_to(p) - arc.start);
|
||||
let sweep = arc.sweep().max(1e-15);
|
||||
let t = if a <= sweep {
|
||||
a / sweep
|
||||
} else if a - sweep < TAU - a {
|
||||
1.0
|
||||
} else {
|
||||
0.0
|
||||
};
|
||||
let t = (cadcraft_geom::norm_angle(arc.center.angle_to(p) - arc.start) / arc.sweep().max(1e-15)).clamp(0.0, 1.0);
|
||||
if *ccw { t } else { 1.0 - t }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -601,25 +601,6 @@ fn measure_spline_by_its_own_parameter() {
|
||||
assert!(pts.len() == 3 && [7.0, 4.0, 1.0].iter().all(|x| pts.iter().any(|p| near(*p, *x, 0.0))), "{pts:?}");
|
||||
}
|
||||
|
||||
/// A pick a hair outside an arc's sweep beside its start is at its start, for an arc and for a
|
||||
/// polyline's arc span alike: MEASURE runs from there (round the circle it was the far end).
|
||||
#[test]
|
||||
fn measure_from_a_pick_a_hair_before_an_arcs_start() {
|
||||
let curves = [
|
||||
("arc", json!({"center": [0, 0], "radius": 1, "start": 0, "end": 180})),
|
||||
("pline", json!({"vertices": [{"p": [1, 0], "bulge": 1}, [-1, 0]]})),
|
||||
];
|
||||
for (cmd, args) in curves {
|
||||
let mut s = Session::new();
|
||||
let e = h(&s.execute(cmd, &args).unwrap());
|
||||
s.execute("measure", &json!({"handle": e, "length": 1, "from": [1, -1e-13]})).unwrap();
|
||||
let pts: Vec<Vec2> =
|
||||
s.doc().unwrap().model.iter().filter_map(|e| if let EntityKind::Point(p) = &e.kind { Some(p.p.xy()) } else { None }).collect();
|
||||
// From (1, 0), a point every radian.
|
||||
assert!(pts.len() == 3 && [1.0f64, 2.0, 3.0].iter().all(|a| pts.iter().any(|p| near(*p, a.cos(), a.sin()))), "{cmd}: {pts:?}");
|
||||
}
|
||||
}
|
||||
|
||||
/// MEASURE counts every vertex in a polyline's parameter, coincident ones too (AutoCAD's polyline
|
||||
/// parameter is the vertex index; the chain drops zero-length spans), and picks an ellipse's end
|
||||
/// by the ellipse parameter like any other curve: AutoCAD 2024 runs both measured cases below from
|
||||
|
||||
@@ -0,0 +1,134 @@
|
||||
//! MENUBAR and TOOLBAR: show or hide the window's menu bar and tool bar from the command line, as
|
||||
//! in AutoCAD. With the menu bar hidden on Windows and Linux (where it is the only menu), typing
|
||||
//! these is the way back.
|
||||
//!
|
||||
//! The UI owns the bars: it reports what it shows in [`Session::bars_shown`] and applies
|
||||
//! [`Session::bars_request`], which these commands set.
|
||||
|
||||
use serde_json::{Value, json};
|
||||
|
||||
use super::{CommandSpec, always, bad};
|
||||
use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
|
||||
|
||||
/// The interface bars MENUBAR and TOOLBAR control.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub struct InterfaceBars {
|
||||
pub menubar: bool,
|
||||
pub toolbar: bool,
|
||||
}
|
||||
|
||||
impl Default for InterfaceBars {
|
||||
fn default() -> Self {
|
||||
InterfaceBars { menubar: true, toolbar: true }
|
||||
}
|
||||
}
|
||||
|
||||
/// A change MENUBAR or TOOLBAR asked for: only the bars a command set, so the UI leaves the other
|
||||
/// as it is (it may have been changed since).
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
|
||||
pub struct BarsRequest {
|
||||
pub menubar: Option<bool>,
|
||||
pub toolbar: Option<bool>,
|
||||
}
|
||||
|
||||
pub fn specs() -> Vec<CommandSpec> {
|
||||
vec![
|
||||
CommandSpec::new("menubar", "Menu Bar", run_menubar)
|
||||
.params("{value?: 0|1} (1 shows the in-window menu bar, 0 hides it; without it, reports it)")
|
||||
.enabled(always)
|
||||
.noundo()
|
||||
.interactive(|s| Ok(Box::new(MenubarM { current: s.bars_shown.menubar }))),
|
||||
CommandSpec::new("toolbar", "Tool Bar", run_toolbar)
|
||||
.alias(&["-toolbar"])
|
||||
.params("{show?: bool} (without it, reports it)")
|
||||
.enabled(always)
|
||||
.noundo()
|
||||
.interactive(|_| Ok(Box::new(ToolbarM))),
|
||||
]
|
||||
}
|
||||
|
||||
fn set_menubar(s: &mut Session, on: bool) {
|
||||
s.bars_shown.menubar = on;
|
||||
s.bars_request.menubar = Some(on);
|
||||
}
|
||||
|
||||
fn set_toolbar(s: &mut Session, show: bool) {
|
||||
s.bars_shown.toolbar = show;
|
||||
s.bars_request.toolbar = Some(show);
|
||||
}
|
||||
|
||||
fn run_menubar(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let v = match p.get("value") {
|
||||
None | Some(Value::Null) => return Ok(json!({ "value": u8::from(s.bars_shown.menubar) })),
|
||||
Some(v) => v
|
||||
.as_u64()
|
||||
.or_else(|| v.as_str().and_then(|t| t.trim().parse().ok()))
|
||||
.filter(|v| *v <= 1)
|
||||
.ok_or_else(|| bad("menubar", "`value` must be 0 or 1"))?,
|
||||
};
|
||||
set_menubar(s, v == 1);
|
||||
Ok(json!({ "value": v }))
|
||||
}
|
||||
|
||||
fn run_toolbar(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let Some(show) = p.get("show").filter(|v| !v.is_null()) else { return Ok(json!({ "show": s.bars_shown.toolbar })) };
|
||||
let show = show.as_bool().ok_or_else(|| bad("toolbar", "`show` must be true or false"))?;
|
||||
set_toolbar(s, show);
|
||||
Ok(json!({ "show": show }))
|
||||
}
|
||||
|
||||
/// Typed MENUBAR: "Enter new value for MENUBAR <1>:".
|
||||
struct MenubarM {
|
||||
current: bool,
|
||||
}
|
||||
|
||||
impl Interactive for MenubarM {
|
||||
fn name(&self) -> &'static str {
|
||||
"MENUBAR"
|
||||
}
|
||||
fn prompt(&self, _s: &Session) -> Prompt {
|
||||
Prompt::new("Enter new value for MENUBAR", Accept::NUMBER).default(u8::from(self.current).to_string())
|
||||
}
|
||||
fn input(&mut self, s: &mut Session, i: Input) -> Result<Step> {
|
||||
match i {
|
||||
Input::Enter => Ok(Step::Done),
|
||||
Input::Text(t) => match run_menubar(s, &json!({ "value": t })) {
|
||||
Ok(_) => Ok(Step::Done),
|
||||
Err(_) => {
|
||||
s.echo("Requires 0 or 1.");
|
||||
Ok(Step::Continue)
|
||||
}
|
||||
},
|
||||
_ => Ok(Step::Continue),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Typed TOOLBAR: "Enter tool bar option [Show/Hide] <Show>:" (CADCraft has one tool bar).
|
||||
struct ToolbarM;
|
||||
|
||||
impl Interactive for ToolbarM {
|
||||
fn name(&self) -> &'static str {
|
||||
"TOOLBAR"
|
||||
}
|
||||
fn prompt(&self, _s: &Session) -> Prompt {
|
||||
Prompt::new("Enter tool bar option", Accept::TEXT).kw(&["Show", "Hide"]).default("Show")
|
||||
}
|
||||
fn input(&mut self, s: &mut Session, i: Input) -> Result<Step> {
|
||||
let word = match &i {
|
||||
Input::Enter => "show".to_string(),
|
||||
Input::Keyword(k) | Input::Text(k) => k.trim().to_ascii_lowercase(),
|
||||
_ => return Ok(Step::Continue),
|
||||
};
|
||||
let show = if !word.is_empty() && "show".starts_with(&word) {
|
||||
true
|
||||
} else if !word.is_empty() && "hide".starts_with(&word) {
|
||||
false
|
||||
} else {
|
||||
s.echo("Invalid option keyword.");
|
||||
return Ok(Step::Continue);
|
||||
};
|
||||
run_toolbar(s, &json!({ "show": show }))?;
|
||||
Ok(Step::Done)
|
||||
}
|
||||
}
|
||||
@@ -26,7 +26,7 @@ mod stretch;
|
||||
mod transform;
|
||||
mod trim;
|
||||
|
||||
use break_join::{BreakAtPointM, BreakM, run_break, run_breakat, run_join};
|
||||
use break_join::{BreakM, run_break, run_breakat, run_join};
|
||||
use explode::run_explode;
|
||||
pub(crate) use explode::{explode_kind, explode_with};
|
||||
use fillet::{FilletM, run_chamfer, run_fillet};
|
||||
@@ -37,7 +37,7 @@ use select_then::{DisplaceM, Op, SelectThen};
|
||||
use stretch::{StretchM, run_stretch};
|
||||
pub(crate) use transform::{holds_ole_frame, ole_refusal, refuse_ole_frames, transform_entities};
|
||||
use transform::{run_copy, run_erase, run_mirror, run_move, run_rotate, run_scale};
|
||||
pub(crate) use trim::{CUT_ONCE, Edges, extend, json_pick_error, trim};
|
||||
pub(crate) use trim::{Edges, extend, trim};
|
||||
|
||||
pub fn specs() -> Vec<CommandSpec> {
|
||||
vec![
|
||||
@@ -85,24 +85,14 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
CommandSpec::new("trim", "Trim", trimextend::run_trim)
|
||||
.menu(&["Modify", "Trim"])
|
||||
.alias(&["tr"])
|
||||
.params(concat!(
|
||||
"{handle, pick: [x,y]} | {fence: [[x,y],...]} | {crossing: [[x,y],[x,y]]}; edges?: [hex] (default: every object; a polyline that is one of them, or every object in Standard mode, also cuts itself at its vertices and crossings), edgeMode?: \"extend\"|\"none\", mode?: \"quick\"|\"standard\" ",
|
||||
"→ {handles: the object (kept, reshaped) then the new pieces; none when it was erased} (pick) | {trimmed} (fence, crossing). ",
|
||||
"For handle+pick: handle is the object to trim; pick selects the portion of that object to remove ",
|
||||
"(normally a point on it, away from a cutting intersection); edges are the cutting edges. The JSON default is standard mode."
|
||||
))
|
||||
.params(
|
||||
"{handle, pick: [x,y] | fence: [[x,y],...] | crossing: [[x,y],[x,y]], edges?: [hex], edgeMode?: \"extend\"|\"none\", mode?: \"quick\"|\"standard\"} → {handles: the object (kept, reshaped) then the new pieces; none when it was erased} (pick) | {trimmed} (fence, crossing)",
|
||||
)
|
||||
.interactive(|_| Ok(Box::new(TrimM::new(false)))),
|
||||
CommandSpec::new("extend", "Extend", trimextend::run_extend)
|
||||
.menu(&["Modify", "Extend"])
|
||||
.alias(&["ex"])
|
||||
.params(concat!(
|
||||
"{handle, pick: [x,y]} | {fence: [[x,y],...]} | {crossing: [[x,y],[x,y]]}; ",
|
||||
"edges?: [hex], edgeMode?: \"extend\"|\"none\". ",
|
||||
"For handle+pick: handle is the object to extend; pick points toward the boundary to extend to ",
|
||||
"(normally a point on that boundary), selecting the nearer end of the object ",
|
||||
"(of an open polyline, the end on the pick's side of its middle parameter); ",
|
||||
"edges are the boundary edges, and the nearest forward intersection is used."
|
||||
))
|
||||
.params("{handle, pick: [x,y] | fence: [[x,y],...] | crossing: [[x,y],[x,y]], edges?: [hex], edgeMode?: \"extend\"|\"none\"}")
|
||||
.interactive(|_| Ok(Box::new(TrimM::new(true)))),
|
||||
CommandSpec::new("fillet", "Fillet", run_fillet)
|
||||
.menu(&["Modify", "Fillet"])
|
||||
@@ -124,10 +114,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
.alias(&["br"])
|
||||
.params("{handle, p1, p2} → {handles: the object (kept, reshaped) then the new pieces; none when nothing is left}")
|
||||
.interactive(|_| Ok(Box::new(BreakM::default()))),
|
||||
CommandSpec::new("breakatpoint", "Break At Point", run_breakat)
|
||||
.menu(&["Modify", "Break At Point"])
|
||||
.params("{handle, at} → {handles: the object (kept, reshaped) then the new piece}")
|
||||
.interactive(|_| Ok(Box::new(BreakAtPointM::default()))),
|
||||
CommandSpec::new("breakatpoint", "Break At Point", run_breakat).menu(&["Modify", "Break At Point"]).params("{handle, at} → {handles: the object (kept, reshaped) then the new piece}"),
|
||||
CommandSpec::new("join", "Join", run_join)
|
||||
.menu(&["Modify", "Join"])
|
||||
.alias(&["j"])
|
||||
|
||||
@@ -4,6 +4,16 @@ use super::{
|
||||
Value, Vec2, arc, bad, json, lwpoly, norm_angle, point_param, point_req, targets,
|
||||
};
|
||||
|
||||
/// Gives a rebuilt arc piece its source centre Z, or a rebuilt polyline piece its source elevation.
|
||||
fn with_z(mut k: EntityKind, z: f64) -> EntityKind {
|
||||
match &mut k {
|
||||
EntityKind::Arc(a) => a.center.z = z,
|
||||
EntityKind::LwPolyline(p) => p.elevation = z,
|
||||
_ => {}
|
||||
}
|
||||
k
|
||||
}
|
||||
|
||||
/// Break `h` between two points (or at one point when p1 == p2).
|
||||
pub(crate) fn break_entity(s: &mut Session, h: Handle, p1: Vec2, p2: Vec2) -> Result<Vec<Handle>> {
|
||||
if crate::cmd::curves::is_locked(s, h) {
|
||||
@@ -29,12 +39,12 @@ pub(crate) fn break_entity(s: &mut Session, h: Handle, p1: Vec2, p2: Vec2) -> Re
|
||||
}
|
||||
EntityKind::Circle(c) => {
|
||||
if p1.near(p2, 1e-12) {
|
||||
return Err(EngineError::Other("Arc cannot be full 360 degrees".into()));
|
||||
return Err(EngineError::Other("Arc cannot be full 360 degrees.".into()));
|
||||
}
|
||||
let a1 = c.center.xy().angle_to(p1);
|
||||
let a2 = c.center.xy().angle_to(p2);
|
||||
// AutoCAD removes the CCW portion from the first to the second point.
|
||||
vec![arc(&Arc::new(c.center.xy(), c.radius, a2, a1))]
|
||||
vec![with_z(arc(&Arc::new(c.center.xy(), c.radius, a2, a1)), c.center.z)]
|
||||
}
|
||||
EntityKind::Arc(a) => {
|
||||
let ga = Arc::new(a.center.xy(), a.radius, a.start, a.end);
|
||||
@@ -45,10 +55,10 @@ pub(crate) fn break_entity(s: &mut Session, h: Handle, p1: Vec2, p2: Vec2) -> Re
|
||||
}
|
||||
let mut v = Vec::new();
|
||||
if t1 > 1e-12 {
|
||||
v.push(arc(&Arc::new(ga.center, ga.radius, ga.start, ga.start + t1)));
|
||||
v.push(with_z(arc(&Arc::new(ga.center, ga.radius, ga.start, ga.start + t1)), a.center.z));
|
||||
}
|
||||
if t2 < ga.sweep() - 1e-12 {
|
||||
v.push(arc(&Arc::new(ga.center, ga.radius, ga.start + t2, ga.end)));
|
||||
v.push(with_z(arc(&Arc::new(ga.center, ga.radius, ga.start + t2, ga.end)), a.center.z));
|
||||
}
|
||||
v
|
||||
}
|
||||
@@ -71,32 +81,24 @@ pub(crate) fn break_entity(s: &mut Session, h: Handle, p1: Vec2, p2: Vec2) -> Re
|
||||
};
|
||||
let (mut t1, mut t2) = (lp(p1), lp(p2));
|
||||
if p.closed {
|
||||
let (lo, hi) = if t1 <= t2 { (t1, t2) } else { (t2, t1) };
|
||||
let tol = 1e-9 * (1.0 + total);
|
||||
if hi - lo < tol {
|
||||
// One point: the outline opens at its start vertex and splits at the point;
|
||||
// at the start vertex itself it stays whole and closed.
|
||||
if lo < tol || lo > total - tol {
|
||||
return Ok(vec![h]);
|
||||
}
|
||||
vec![lwpoly(sub_polyline(&segs, 0.0, lo), false), lwpoly(sub_polyline(&segs, lo, total), false)]
|
||||
} else {
|
||||
// The stretch between the points that doesn't run through the start vertex
|
||||
// goes, whichever point came first; what is left runs from the later point
|
||||
// round through the start vertex to the earlier one.
|
||||
let doubled: Vec<Segment> = segs.iter().chain(segs.iter()).copied().collect();
|
||||
vec![lwpoly(sub_polyline(&doubled, hi, lo + total), false)]
|
||||
if (t1 - t2).abs() < 1e-9 {
|
||||
return Err(EngineError::Other("Cannot break a closed polyline at a single point.".into()));
|
||||
}
|
||||
// Like a circle: the stretch from the first point to the second, along the
|
||||
// vertices, goes; what is left runs from the second point round to the first.
|
||||
let doubled: Vec<Segment> = segs.iter().chain(segs.iter()).copied().collect();
|
||||
let end = if t1 > t2 { t1 } else { t1 + total };
|
||||
vec![with_z(lwpoly(sub_polyline(&doubled, t2, end), false), p.elevation)]
|
||||
} else {
|
||||
if t1 > t2 {
|
||||
std::mem::swap(&mut t1, &mut t2);
|
||||
}
|
||||
let mut v = Vec::new();
|
||||
if t1 > 1e-12 {
|
||||
v.push(lwpoly(sub_polyline(&segs, 0.0, t1), false));
|
||||
v.push(with_z(lwpoly(sub_polyline(&segs, 0.0, t1), false), p.elevation));
|
||||
}
|
||||
if t2 < total - 1e-12 {
|
||||
v.push(lwpoly(sub_polyline(&segs, t2, total), false));
|
||||
v.push(with_z(lwpoly(sub_polyline(&segs, t2, total), false), p.elevation));
|
||||
}
|
||||
v
|
||||
}
|
||||
@@ -213,41 +215,6 @@ pub(super) fn run_join(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
Ok(json!({ "handle": r.map(|h| h.hex()) }))
|
||||
}
|
||||
|
||||
/// The object picked at `p` for BREAK and BREAKATPOINT ("*Invalid selection*" when there is none).
|
||||
/// One on a locked layer is refused there, and the command asks for an object again, as AutoCAD
|
||||
/// 2024 does; the pick doesn't fall through to an object under it.
|
||||
fn pick_to_break(s: &mut Session, p: Vec2) -> Result<Option<Handle>> {
|
||||
let ap = s.pixel_size() * s.settings.pickbox.max(1.0) * 1.5;
|
||||
let space = s.space();
|
||||
match s.pick_object(&space, p, ap)? {
|
||||
Some(h) if crate::cmd::curves::is_locked(s, h) => {
|
||||
s.echo("The object is on a locked layer.");
|
||||
Ok(None)
|
||||
}
|
||||
Some(h) => {
|
||||
s.set_selection(vec![h]);
|
||||
Ok(Some(h))
|
||||
}
|
||||
None => {
|
||||
s.echo("*Invalid selection*");
|
||||
Ok(None)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Break `h` from `p1` to `p2` and end the command. As in AutoCAD 2024, a break that can't be made
|
||||
/// (a whole circle at one point: "Arc cannot be full 360 degrees") is reported and ends the
|
||||
/// command too, leaving the object as it was.
|
||||
fn break_and_end(s: &mut Session, h: Handle, p1: Vec2, p2: Vec2) -> Result<Step> {
|
||||
match break_entity(s, h, p1, p2) {
|
||||
Ok(_) => {}
|
||||
Err(EngineError::Other(m)) => s.echo(m),
|
||||
Err(e) => return Err(e),
|
||||
}
|
||||
s.set_selection(Vec::new());
|
||||
Ok(Step::Done)
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
pub(super) struct BreakM {
|
||||
obj: Option<(Handle, Vec2)>,
|
||||
@@ -269,8 +236,14 @@ impl Interactive for BreakM {
|
||||
fn input(&mut self, s: &mut Session, i: Input) -> Result<Step> {
|
||||
match (self.obj, i) {
|
||||
(None, Input::Point(p)) => {
|
||||
if let Some(h) = pick_to_break(s, p)? {
|
||||
self.obj = Some((h, p));
|
||||
let ap = s.pixel_size() * s.settings.pickbox.max(1.0) * 1.5;
|
||||
let space = s.space();
|
||||
match s.pick_object(&space, p, ap)? {
|
||||
Some(h) => {
|
||||
self.obj = Some((h, p));
|
||||
s.set_selection(vec![h]);
|
||||
}
|
||||
None => s.echo("*Invalid selection*"),
|
||||
}
|
||||
Ok(Step::Continue)
|
||||
}
|
||||
@@ -283,46 +256,12 @@ impl Interactive for BreakM {
|
||||
self.first_point = false;
|
||||
Ok(Step::Continue)
|
||||
}
|
||||
(Some((h, p1)), Input::Point(p2)) => break_and_end(s, h, p1, p2),
|
||||
(Some(_), Input::Enter) => {
|
||||
(Some((h, p1)), Input::Point(p2)) => {
|
||||
break_entity(s, h, p1, p2)?;
|
||||
s.set_selection(Vec::new());
|
||||
Ok(Step::Done)
|
||||
}
|
||||
(None, Input::Enter) => Ok(Step::Done),
|
||||
_ => Ok(Step::Continue),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// BREAKATPOINT at the command line, with AutoCAD 2024's prompts: "Select object:", then "Specify
|
||||
/// break point:"; the object is split there with no gap (the point projects onto it).
|
||||
#[derive(Default)]
|
||||
pub(super) struct BreakAtPointM {
|
||||
obj: Option<Handle>,
|
||||
}
|
||||
|
||||
impl Interactive for BreakAtPointM {
|
||||
fn name(&self) -> &'static str {
|
||||
"BREAKATPOINT"
|
||||
}
|
||||
fn prompt(&self, _s: &Session) -> Prompt {
|
||||
match self.obj {
|
||||
None => Prompt::new("Select object", Accept::POINT),
|
||||
Some(_) => Prompt::new("Specify break point", Accept::POINT),
|
||||
}
|
||||
}
|
||||
fn input(&mut self, s: &mut Session, i: Input) -> Result<Step> {
|
||||
match (self.obj, i) {
|
||||
(None, Input::Point(p)) => {
|
||||
self.obj = pick_to_break(s, p)?;
|
||||
Ok(Step::Continue)
|
||||
}
|
||||
(Some(h), Input::Point(p)) => break_and_end(s, h, p, p),
|
||||
(Some(_), Input::Enter) => {
|
||||
s.set_selection(Vec::new());
|
||||
Ok(Step::Done)
|
||||
}
|
||||
(None, Input::Enter) => Ok(Step::Done),
|
||||
(_, Input::Enter) => Ok(Step::Done),
|
||||
_ => Ok(Step::Continue),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
use cadcraft_geom::Bounds2;
|
||||
|
||||
use super::{
|
||||
Arc, EngineError, Entity, EntityKind, Handle, Line, PolyVertex, Polyline, Prim, Result, Segment, Session, TAU, Vec2, angle_in_sweep, arc,
|
||||
ccw_sweep, intersect_ext, line, lwpoly, norm_angle,
|
||||
@@ -93,62 +91,13 @@ fn prim_to_segments(p: &Prim) -> Vec<Segment> {
|
||||
}
|
||||
}
|
||||
|
||||
/// Explain the generic line failures for JSON handle+pick calls, and a line TRIM picked on its
|
||||
/// only cuts ([`ON_THE_CUT`]). Other curves retain their own diagnostics: their nearest-parameter
|
||||
/// rules do not prove that a pick is invalid.
|
||||
pub(crate) fn json_pick_error(s: &Session, h: Handle, pick: Vec2, edges: Edges, extending: bool, error: EngineError) -> EngineError {
|
||||
let generic = if extending { "Object does not intersect an edge." } else { "Object does not intersect a cutting edge." };
|
||||
if !matches!(&error, EngineError::Other(message) if message == generic || (!extending && message == ON_THE_CUT)) {
|
||||
return error;
|
||||
}
|
||||
let Ok(d) = s.doc() else { return error };
|
||||
let Some(e) = d.entity(h) else { return error };
|
||||
let EntityKind::Line(l) = &e.kind else { return error };
|
||||
let Ok(cut) = edge_segments(s, edges, h) else { return error };
|
||||
let ln = Line::new(l.a.xy(), l.b.xy());
|
||||
let message = if extending {
|
||||
// The selected end already failed. Check the opposite end with the same ray and
|
||||
// forward-intersection rules before attributing the failure to the pick's end choice.
|
||||
let (fixed, end) = if pick.dist(ln.b) < pick.dist(ln.a) { (ln.b, ln.a) } else { (ln.a, ln.b) };
|
||||
let dir = (end - fixed).normalized();
|
||||
let ray = Segment::Line(Line::new(end, end + dir * 1e8));
|
||||
let opposite_hit = cut.iter().flat_map(|c| intersect_ext(&ray, c, false)).any(|x| (x - end).dot(dir) > 1e-9);
|
||||
if opposite_hit {
|
||||
"The `pick` point selects an end with no boundary ahead; choose `pick` toward the boundary to extend to."
|
||||
} else {
|
||||
"No usable boundary intersection was found for either end of the object to extend."
|
||||
}
|
||||
} else {
|
||||
let pick_param = ln.param_of(pick).clamp(0.0, 1.0);
|
||||
let has_cut = cut.iter().flat_map(|c| intersect_ext(&Segment::Line(ln), c, false)).any(|x| {
|
||||
let t = ln.param_of(x);
|
||||
t > 1e-9 && t < 1.0 - 1e-9
|
||||
});
|
||||
if !has_cut {
|
||||
"No usable cutting-edge intersection in the interior of the object to trim."
|
||||
} else if pick_param.is_nan() {
|
||||
return error;
|
||||
} else if !ln.at(pick_param).near(pick, 1e-9_f64.max(64.0 * f64::EPSILON * (1.0 + pick.len().max(ln.a.len()).max(ln.b.len())))) {
|
||||
"The `pick` point is off the line and projects onto a cutting intersection; pick away from that intersection."
|
||||
} else {
|
||||
"The `pick` point is at a cutting intersection; pick a portion of the object away from that intersection."
|
||||
}
|
||||
};
|
||||
EngineError::Other(message.into())
|
||||
}
|
||||
|
||||
/// Trim `h` at the piece containing `pick`. Returns the handles that replace it.
|
||||
/// Trim `h` at the piece containing `pick`. Returns what it became: its pieces, `h` first
|
||||
/// ([`replace_with_pieces`]).
|
||||
pub(crate) fn trim(s: &mut Session, h: Handle, pick: Vec2, edges: Edges) -> Result<Vec<Handle>> {
|
||||
if crate::cmd::curves::is_locked(s, h) {
|
||||
return Err(EngineError::Other("The object is on a locked layer.".into()));
|
||||
}
|
||||
let e = s.doc()?.entity(h).map(|e| (**e).clone()).ok_or_else(|| EngineError::Other("no such object".into()))?;
|
||||
let cut = edge_segments(s, edges, h)?;
|
||||
// A polyline that is one of the edges (picked, or with every object in either mode) cuts
|
||||
// itself too.
|
||||
let itself = edges.only.is_none_or(|o| o.contains(&h));
|
||||
let pieces: Vec<EntityKind> = match &e.kind {
|
||||
EntityKind::Line(l) => {
|
||||
let ln = Line::new(l.a.xy(), l.b.xy());
|
||||
@@ -160,12 +109,10 @@ pub(crate) fn trim(s: &mut Session, h: Handle, pick: Vec2, edges: Edges) -> Resu
|
||||
.collect();
|
||||
ts.sort_by(f64::total_cmp);
|
||||
let tp = ln.param_of(pick).clamp(0.0, 1.0);
|
||||
let found = ts.len();
|
||||
ts.retain(|t| (t - tp).abs() * ln.len() > ON_CUT);
|
||||
let lo = ts.iter().copied().filter(|t| *t < tp).fold(0.0, f64::max);
|
||||
let hi = ts.iter().copied().filter(|t| *t > tp).fold(1.0, f64::min);
|
||||
if lo == 0.0 && hi == 1.0 {
|
||||
return Err(EngineError::Other(if ts.len() < found { ON_THE_CUT } else { "Object does not intersect a cutting edge." }.into()));
|
||||
return Err(EngineError::Other("Object does not intersect a cutting edge.".into()));
|
||||
}
|
||||
let mut v = Vec::new();
|
||||
if lo > 0.0 {
|
||||
@@ -184,14 +131,11 @@ pub(crate) fn trim(s: &mut Session, h: Handle, pick: Vec2, edges: Edges) -> Resu
|
||||
let mut ts: Vec<f64> =
|
||||
cut.iter().flat_map(|c| intersect_ext(&seg, c, false)).map(param).filter(|t| *t > 1e-9 && *t < sweep - 1e-9).collect();
|
||||
ts.sort_by(f64::total_cmp);
|
||||
// A pick off the arc is at the end it is nearer, round the circle.
|
||||
let tp = crate::cmd::curves::seg_param(&seg, pick) * sweep;
|
||||
let found = ts.len();
|
||||
ts.retain(|t| (t - tp).abs() * ga.radius > ON_CUT);
|
||||
let tp = param(pick).min(sweep);
|
||||
let lo = ts.iter().copied().filter(|t| *t < tp).fold(0.0, f64::max);
|
||||
let hi = ts.iter().copied().filter(|t| *t > tp).fold(sweep, f64::min);
|
||||
if lo == 0.0 && hi == sweep {
|
||||
return Err(EngineError::Other(if ts.len() < found { ON_THE_CUT } else { "Object does not intersect a cutting edge." }.into()));
|
||||
return Err(EngineError::Other("Object does not intersect a cutting edge.".into()));
|
||||
}
|
||||
let mut v = Vec::new();
|
||||
if lo > 0.0 {
|
||||
@@ -207,16 +151,10 @@ pub(crate) fn trim(s: &mut Session, h: Handle, pick: Vec2, edges: Edges) -> Resu
|
||||
let mut angs: Vec<f64> = cut.iter().flat_map(|x| intersect_ext(&full, x, false)).map(|p| c.center.xy().angle_to(p)).collect();
|
||||
angs.sort_by(f64::total_cmp);
|
||||
angs.dedup_by(|a, b| (*a - *b).abs() < 1e-9);
|
||||
let ap = c.center.xy().angle_to(pick);
|
||||
let found = angs.len();
|
||||
angs.retain(|a| {
|
||||
let d = norm_angle(a - ap);
|
||||
d.min(TAU - d) * c.radius > ON_CUT
|
||||
});
|
||||
if angs.len() < 2 {
|
||||
let why = if found >= 2 { ON_THE_CUT } else { "Circle must intersect cutting edges at two or more points." };
|
||||
return Err(EngineError::Other(why.into()));
|
||||
return Err(EngineError::Other("Circle must intersect cutting edges at two or more points.".into()));
|
||||
}
|
||||
let ap = c.center.xy().angle_to(pick);
|
||||
// The removed arc runs between the two intersections around the pick.
|
||||
let n = angs.len();
|
||||
let mut keep = None;
|
||||
@@ -229,10 +167,7 @@ pub(crate) fn trim(s: &mut Session, h: Handle, pick: Vec2, edges: Edges) -> Resu
|
||||
}
|
||||
keep.into_iter().collect()
|
||||
}
|
||||
EntityKind::LwPolyline(p) => match trim_polyline(p, &cut, pick, itself)? {
|
||||
Some(pieces) => pieces,
|
||||
None => return Ok(vec![h]),
|
||||
},
|
||||
EntityKind::LwPolyline(p) => trim_polyline(p, &cut, pick)?,
|
||||
k => crate::cmd::modify2::trim_other(k, &cut, pick)?,
|
||||
};
|
||||
replace_with_pieces(s, h, pieces)
|
||||
@@ -246,20 +181,19 @@ pub(crate) fn trim(s: &mut Session, h: Handle, pick: Vec2, edges: Edges) -> Resu
|
||||
/// in its middle keeps its handle on the piece from its start point, the piece to its end point is
|
||||
/// new; a circle broken or trimmed becomes an arc with the circle's handle.)
|
||||
///
|
||||
/// Each piece keeps what the object had beyond its outline ([`inherit`]). Dimensions attached to
|
||||
/// the object follow [`crate::assoc::follow_pieces`]. Its parametric constraints are removed: its
|
||||
/// new shape no longer meets them, and solving them again would move the objects they tie it to.
|
||||
/// Dimensions attached to the object follow [`crate::assoc::follow_pieces`]. Its parametric
|
||||
/// constraints are removed: its new shape no longer meets them, and solving them again would move
|
||||
/// the objects they tie it to.
|
||||
pub(super) fn replace_with_pieces(s: &mut Session, h: Handle, pieces: Vec<EntityKind>) -> Result<Vec<Handle>> {
|
||||
let d = s.doc_mut()?;
|
||||
if pieces.is_empty() {
|
||||
let mut pieces = pieces.into_iter();
|
||||
let Some(first) = pieces.next() else {
|
||||
d.remove_entity(h);
|
||||
return Ok(Vec::new());
|
||||
}
|
||||
};
|
||||
let (Some(space), Some(old)) = (d.space_of(h), d.entity(h).cloned()) else {
|
||||
return Err(EngineError::Other("no such object".into()));
|
||||
};
|
||||
let mut pieces = pieces.into_iter().map(|k| inherit(&old.kind, k));
|
||||
let Some(first) = pieces.next() else { return Ok(Vec::new()) };
|
||||
d.modify_entity(h, |e| e.kind = first)?;
|
||||
let mut out = vec![h];
|
||||
for kind in pieces {
|
||||
@@ -279,31 +213,6 @@ pub(super) fn replace_with_pieces(s: &mut Session, h: Handle, pieces: Vec<Entity
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
/// `piece`, cut from `source`, with what it keeps of it as AutoCAD 2024's BREAK and TRIM leave
|
||||
/// pieces: a line's Z along it, an arc's (or a circle's) centre Z, and a polyline's elevation,
|
||||
/// constant width and linetype generation.
|
||||
fn inherit(source: &EntityKind, mut piece: EntityKind) -> EntityKind {
|
||||
match (source, &mut piece) {
|
||||
(EntityKind::Line(s), EntityKind::Line(p)) => {
|
||||
let ln = Line::new(s.a.xy(), s.b.xy());
|
||||
if ln.len() > 0.0 {
|
||||
let z = |t: f64| s.a.z + (s.b.z - s.a.z) * t;
|
||||
p.a.z = z(ln.param_of(p.a.xy()));
|
||||
p.b.z = z(ln.param_of(p.b.xy()));
|
||||
}
|
||||
}
|
||||
(EntityKind::Arc(s), EntityKind::Arc(p)) => p.center.z = s.center.z,
|
||||
(EntityKind::Circle(s), EntityKind::Arc(p)) => p.center.z = s.center.z,
|
||||
(EntityKind::LwPolyline(s), EntityKind::LwPolyline(p)) => {
|
||||
p.elevation = s.elevation;
|
||||
p.const_width = s.const_width;
|
||||
p.plinegen = s.plinegen;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
piece
|
||||
}
|
||||
|
||||
/// Sub-polyline between length parameters `a` and `b` (open polylines).
|
||||
pub(super) fn sub_polyline(segs: &[Segment], a: f64, b: f64) -> Vec<PolyVertex> {
|
||||
let mut out: Vec<PolyVertex> = Vec::new();
|
||||
@@ -336,128 +245,15 @@ pub(super) fn sub_polyline(segs: &[Segment], a: f64, b: f64) -> Vec<PolyVertex>
|
||||
out
|
||||
}
|
||||
|
||||
/// Two line segments of a polyline within this sine of parallel run on as one, straight on or
|
||||
/// doubling back: the vertex between them doesn't cut it, and they don't cut each other. AutoCAD
|
||||
/// 2024 cuts at a bend of 1e-8 and not at one of 8e-9, whatever the lengths.
|
||||
const STRAIGHT: f64 = 1e-8;
|
||||
|
||||
/// Upper bounds on one trim's search for where a polyline crosses itself (hostile files): the pairs
|
||||
/// of segments searched (those the piece picked can reach, times those near them) and the
|
||||
/// crossings found. Past either the trim is refused, rather than made at some of its cuts.
|
||||
const MAX_SELF_PAIRS: usize = 1 << 24;
|
||||
const MAX_SELF_CROSSINGS: usize = 1 << 16;
|
||||
|
||||
/// How near a cut a pick is on it, along the object. AutoCAD 2024 trims nothing for a pick that
|
||||
/// near one of a polyline's own cuts, and passes over a cut by another edge, the trim running on
|
||||
/// across it, on lines, arcs and circles too. On open polylines from 1e-3 to 1e9 long it was within
|
||||
/// 5e-7, and 5.1e-7 away trimmed at the cut (around a closed rectangle it reached a little further,
|
||||
/// to 1e-6; on a line, further still, to 5e-4 on one 10 long).
|
||||
const ON_CUT: f64 = 5e-7;
|
||||
|
||||
/// The refusal when every cut was passed over ([`ON_CUT`]): the object meets an edge, at the pick,
|
||||
/// so Quick mode leaves it in place rather than erasing it as one no edge crosses.
|
||||
const ON_THE_CUT: &str = "The pick is on the cut: nothing to trim.";
|
||||
|
||||
/// AutoCAD 2024's refusal to trim a closed polyline cut at one point only.
|
||||
pub(crate) const CUT_ONCE: &str = "Curve must intersect cutting edges at least twice.";
|
||||
|
||||
/// Whether segments `a` and `b` of a polyline run on as one ([`STRAIGHT`]).
|
||||
fn runs_on(a: &Segment, b: &Segment) -> bool {
|
||||
let (Segment::Line(a), Segment::Line(b)) = (a, b) else { return false };
|
||||
let (u, v) = (a.b - a.a, b.b - b.a);
|
||||
u.cross(v).abs() < STRAIGHT * u.len() * v.len()
|
||||
}
|
||||
|
||||
/// Where a polyline that is one of the cutting edges cuts itself around segment `k`, the one
|
||||
/// picked, as lengths along it: at its vertices (every vertex of a closed one, its start included)
|
||||
/// but those it runs straight on through ([`runs_on`]), and, on `k` and the segments it runs
|
||||
/// straight on into, where another of its segments crosses them or a vertex of it (an end
|
||||
/// included) touches them. The piece picked lies within those segments, so crossings elsewhere
|
||||
/// don't bound it. AutoCAD 2024 trims a polyline that is one of the cutting edges at these.
|
||||
fn self_cuts(segs: &[Segment], closed: bool, k: usize) -> Result<Vec<f64>> {
|
||||
let n = segs.len();
|
||||
let mut starts = Vec::with_capacity(n);
|
||||
let mut acc = 0.0;
|
||||
for s in segs {
|
||||
starts.push(acc);
|
||||
acc += s.len();
|
||||
}
|
||||
let before = |i: usize| {
|
||||
if i > 0 {
|
||||
Some(i - 1)
|
||||
} else if closed {
|
||||
n.checked_sub(1)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
};
|
||||
let after = |i: usize| {
|
||||
if i + 1 < n {
|
||||
Some(i + 1)
|
||||
} else if closed {
|
||||
Some(0)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
};
|
||||
// Whether the polyline runs straight on through the vertex segment `i` starts at.
|
||||
let straight = |i: usize| matches!((before(i).and_then(|j| segs.get(j)), segs.get(i)), (Some(a), Some(b)) if runs_on(a, b));
|
||||
let mut ts: Vec<f64> = (usize::from(!closed)..n).filter(|i| !straight(*i)).filter_map(|i| starts.get(i).copied()).collect();
|
||||
let mut run = vec![k];
|
||||
let mut i = k;
|
||||
while let Some(j) = before(i).filter(|_| straight(i) && run.len() < n) {
|
||||
run.push(j);
|
||||
i = j;
|
||||
}
|
||||
let mut i = k;
|
||||
while let Some(j) = after(i).filter(|j| straight(*j) && run.len() < n) {
|
||||
run.push(j);
|
||||
i = j;
|
||||
}
|
||||
let boxes: Vec<_> = segs.iter().map(Segment::bounds).collect();
|
||||
let reach = run.iter().filter_map(|i| boxes.get(*i)).fold(Bounds2::EMPTY, |r, b| r.union(b));
|
||||
let near: Vec<usize> = (0..n).filter(|j| boxes.get(*j).is_some_and(|b| b.intersects(&reach))).collect();
|
||||
if run.len().saturating_mul(near.len()) > MAX_SELF_PAIRS {
|
||||
return Err(EngineError::Other("Too many segments to trim the polyline where it crosses itself.".into()));
|
||||
}
|
||||
// A crossing, or a vertex of another segment touching this one, cuts it; so does a crossing
|
||||
// where it runs straight on into the next. Two segments meeting at a vertex cut nothing more.
|
||||
let cuts = |t: f64, i: usize| (t > 1e-9 && t < 1.0 - 1e-9) || (t <= 1e-9 && straight(i)) || (t >= 1.0 - 1e-9 && after(i).is_some_and(straight));
|
||||
let vertices = ts.len();
|
||||
for &i in &run {
|
||||
let (Some(a), Some(box_a), Some(a0)) = (segs.get(i), boxes.get(i), starts.get(i)) else { continue };
|
||||
for &j in &near {
|
||||
let (Some(b), Some(box_b)) = (segs.get(j), boxes.get(j)) else { continue };
|
||||
if j == i || runs_on(a, b) || !box_a.intersects(box_b) {
|
||||
continue;
|
||||
}
|
||||
for x in intersect_ext(a, b, false) {
|
||||
let t = param_on(a, x);
|
||||
if cuts(t, i) {
|
||||
ts.push(a0 + t * a.len());
|
||||
if ts.len() - vertices > MAX_SELF_CROSSINGS {
|
||||
return Err(EngineError::Other("Too many crossings to trim the polyline where it crosses itself.".into()));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(ts)
|
||||
}
|
||||
|
||||
/// Trim a polyline at the piece containing `pick`, between the cuts by `cut` and, when it is one
|
||||
/// of the cutting edges (`itself`), by its own ([`self_cuts`]). `None`: the pick is on one of its
|
||||
/// own cuts ([`ON_CUT`]), which trims nothing.
|
||||
fn trim_polyline(p: &cadcraft_doc::LwPolyline, cut: &[Segment], pick: Vec2, itself: bool) -> Result<Option<Vec<EntityKind>>> {
|
||||
fn trim_polyline(p: &cadcraft_doc::LwPolyline, cut: &[Segment], pick: Vec2) -> Result<Vec<EntityKind>> {
|
||||
let pl = Polyline { vertices: p.vertices.clone(), closed: p.closed };
|
||||
let segs = pl.segments();
|
||||
let total: f64 = segs.iter().map(Segment::len).sum();
|
||||
let mut ts: Vec<f64> = Vec::new();
|
||||
let mut acc = 0.0;
|
||||
// The pick's length along the polyline and the segment it is on.
|
||||
let (mut tp, mut k) = (0.0, 0);
|
||||
let mut tp = 0.0;
|
||||
let mut best = f64::INFINITY;
|
||||
for (i, s) in segs.iter().enumerate() {
|
||||
for s in &segs {
|
||||
let len = s.len();
|
||||
for x in cut.iter().flat_map(|c| intersect_ext(s, c, false)) {
|
||||
ts.push(acc + param_on(s, x) * len);
|
||||
@@ -466,34 +262,13 @@ fn trim_polyline(p: &cadcraft_doc::LwPolyline, cut: &[Segment], pick: Vec2, itse
|
||||
if c.dist(pick) < best {
|
||||
best = c.dist(pick);
|
||||
tp = acc + param_on(s, c) * len;
|
||||
k = i;
|
||||
}
|
||||
acc += len;
|
||||
}
|
||||
let mut own = if itself { self_cuts(&segs, p.closed, k)? } else { Vec::new() };
|
||||
// An open polyline's ends cut nothing; a closed one's start vertex cuts it like any other (a
|
||||
// cut there is at 0 or at its length, which the pieces below take as one).
|
||||
if !p.closed {
|
||||
ts.retain(|t| *t > 1e-9 && *t < total - 1e-9);
|
||||
own.retain(|t| *t > 1e-9 && *t < total - 1e-9);
|
||||
}
|
||||
// How far apart two lengths along the polyline are, round its start too when it is closed.
|
||||
let apart = |s: f64, t: f64| if p.closed { (s - t).abs().min(total - (s - t).abs()) } else { (s - t).abs() };
|
||||
// A pick on one of its own cuts trims nothing; a cut by another edge there is passed over, and
|
||||
// the piece runs on across it.
|
||||
if own.iter().any(|t| apart(*t, tp) <= ON_CUT) {
|
||||
return Ok(None);
|
||||
}
|
||||
let found = ts.len();
|
||||
ts.retain(|t| apart(*t, tp) > ON_CUT);
|
||||
let passed = ts.len() < found;
|
||||
ts.extend(own);
|
||||
ts.retain(|t| *t > 1e-9 && *t < total - 1e-9);
|
||||
ts.sort_by(f64::total_cmp);
|
||||
if ts.is_empty() {
|
||||
return Err(EngineError::Other(if passed { ON_THE_CUT } else { "Object does not intersect a cutting edge." }.into()));
|
||||
}
|
||||
if p.closed && ts.first().is_some_and(|f| ts.iter().all(|t| apart(*f, *t) <= ON_CUT)) {
|
||||
return Err(EngineError::Other(CUT_ONCE.into()));
|
||||
return Err(EngineError::Other("Object does not intersect a cutting edge.".into()));
|
||||
}
|
||||
let lo = ts.iter().copied().filter(|t| *t < tp).fold(f64::NEG_INFINITY, f64::max);
|
||||
let hi = ts.iter().copied().filter(|t| *t > tp).fold(f64::INFINITY, f64::min);
|
||||
@@ -508,31 +283,33 @@ fn trim_polyline(p: &cadcraft_doc::LwPolyline, cut: &[Segment], pick: Vec2, itse
|
||||
if hi.is_finite() { hi } else { ts.first().copied().unwrap_or(total) + total },
|
||||
);
|
||||
let doubled: Vec<Segment> = segs.iter().chain(segs.iter()).copied().collect();
|
||||
let (a, b) = if hi > total { (hi - total, lo) } else { (hi, lo + total) };
|
||||
let (a, mut b) = if hi > total { (hi - total, lo) } else { (hi, lo + total) };
|
||||
// A single cut leaves the whole outline, opened there.
|
||||
if b <= a + 1e-9 {
|
||||
b += total;
|
||||
}
|
||||
out.push(mk(sub_polyline(&doubled, a, b)));
|
||||
} else {
|
||||
// A piece whose ends meet (the polyline touched itself there) is closed, without its
|
||||
// repeated vertex, as AutoCAD leaves it.
|
||||
let piece = |mut vs: Vec<PolyVertex>| {
|
||||
// Within rounding of the coordinates, however far from the origin, and no more.
|
||||
let meets = vs.len() >= 4
|
||||
&& matches!((vs.first(), vs.last()), (Some(a), Some(b)) if a.p.near(b.p, 64.0 * f64::EPSILON * (1.0 + a.p.len().max(b.p.len()))));
|
||||
if meets {
|
||||
vs.pop();
|
||||
}
|
||||
lwpoly(vs, meets)
|
||||
};
|
||||
if lo.is_finite() {
|
||||
out.push(piece(sub_polyline(&segs, 0.0, lo)));
|
||||
out.push(mk(sub_polyline(&segs, 0.0, lo)));
|
||||
}
|
||||
if hi.is_finite() {
|
||||
out.push(piece(sub_polyline(&segs, hi, total)));
|
||||
out.push(mk(sub_polyline(&segs, hi, total)));
|
||||
}
|
||||
}
|
||||
Ok(Some(out.into_iter().filter(|k| matches!(k, EntityKind::LwPolyline(l) if l.vertices.len() >= 2)).collect()))
|
||||
Ok(out.into_iter().filter(|k| matches!(k, EntityKind::LwPolyline(l) if l.vertices.len() >= 2)).collect())
|
||||
}
|
||||
|
||||
pub(super) use crate::cmd::curves::seg_param as param_on;
|
||||
pub(super) fn param_on(s: &Segment, p: Vec2) -> f64 {
|
||||
match s {
|
||||
Segment::Line(l) => l.param_of(p).clamp(0.0, 1.0),
|
||||
Segment::Arc { arc, ccw } => {
|
||||
let t = norm_angle(arc.center.angle_to(p) - arc.start) / arc.sweep().max(1e-15);
|
||||
let t = t.clamp(0.0, 1.0);
|
||||
if *ccw { t } else { 1.0 - t }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A polyline arc segment on `ga`'s circle that ends at `end` after turning through `sweep`
|
||||
/// (signed, positive counterclockwise), run on round the circle to the nearest boundary edge: the
|
||||
@@ -595,13 +372,7 @@ pub(crate) fn extend(s: &mut Session, h: Handle, pick: Vec2, edges: Edges) -> Re
|
||||
EntityKind::LwPolyline(p) if !p.closed && p.vertices.len() >= 2 => {
|
||||
let mut vs = p.vertices.clone();
|
||||
let n = vs.len();
|
||||
// The pick's parameter: the segment it is nearest, plus how far along it. AutoCAD 2024
|
||||
// extends the end on that side of the polyline's middle parameter, the last from the
|
||||
// middle on, not the end nearer the pick. A repeated vertex counts as a segment, so
|
||||
// these come from the vertices, not `Polyline::segments`, which skips it.
|
||||
let spans: Vec<_> = vs.windows(2).filter_map(|w| Some((w.first()?.p, w.get(1)?.p, w.first()?.bulge))).collect();
|
||||
let at = crate::cmd::curves::vertex_param_of(&spans, pick);
|
||||
let from_end = 2.0 * at >= (n - 1) as f64;
|
||||
let from_end = vs.last().is_some_and(|l| pick.dist(l.p) < vs.first().map(|f| pick.dist(f.p)).unwrap_or(f64::INFINITY));
|
||||
let (i_end, i_prev) = if from_end { (n - 1, n - 2) } else { (0, 1) };
|
||||
let end = vs.get(i_end).map(|v| v.p).unwrap_or_default();
|
||||
let prev = vs.get(i_prev).map(|v| v.p).unwrap_or_default();
|
||||
|
||||
@@ -8,9 +8,8 @@ use cadcraft_doc::{Drawing, EntityKind, Handle};
|
||||
use cadcraft_geom::{Bounds2, Line, Vec2, line_line};
|
||||
use serde_json::{Value, json};
|
||||
|
||||
use super::curves::KW;
|
||||
use super::helpers::{line, lwpoly, rect_vertices};
|
||||
use super::modify::{CUT_ONCE, Edges, extend, json_pick_error, trim};
|
||||
use super::modify::{Edges, extend, trim};
|
||||
use super::{bad, point_param, points_param};
|
||||
use crate::{Accept, EngineError, Input, Interactive, Prompt, Result, Session, Step};
|
||||
|
||||
@@ -32,10 +31,8 @@ fn proj_mode(s: &Session) -> i64 {
|
||||
}
|
||||
|
||||
/// Whether a trim error says the object meets no cutting edge (a Quick-mode trim then erases it).
|
||||
/// A closed polyline cut at one point meets one, and is left as it is.
|
||||
fn misses_edges(e: &EngineError) -> bool {
|
||||
let m = e.to_string();
|
||||
m.contains("intersect") && m != CUT_ONCE
|
||||
e.to_string().contains("intersect")
|
||||
}
|
||||
|
||||
/// Trim or extend `h` at `at`. A Quick-mode (`quick`) trim of an object no cutting edge crosses
|
||||
@@ -106,12 +103,7 @@ fn crossing(s: &mut Session, a: Vec2, b: Vec2, extending: bool, edges: Edges, qu
|
||||
for w in pl.windows(2) {
|
||||
let (Some(p), Some(q)) = (w.first(), w.get(1)) else { continue };
|
||||
let seg = Line::new(*p, *q);
|
||||
// Kept `tol` inside the segment: a vertex, where two segments meet, is a cut of a
|
||||
// polyline that is one of its own edges, and a pick on a cut trims nothing.
|
||||
let e = (tol / seg.len()).min(0.5);
|
||||
let cands = [seg.at(e), seg.at(1.0 - e), seg.at(seg.param_of(a).clamp(e, 1.0 - e))]
|
||||
.into_iter()
|
||||
.chain(sides.iter().filter_map(|sd| line_line(sd, &seg)));
|
||||
let cands = [*p, *q, seg.closest(a)].into_iter().chain(sides.iter().filter_map(|sd| line_line(sd, &seg)));
|
||||
for c in cands.filter(|c| inside(*c)) {
|
||||
if best.is_none_or(|b| c.dist(a) < b.dist(a)) {
|
||||
best = Some(c);
|
||||
@@ -181,6 +173,7 @@ fn run(s: &mut Session, p: &Value, extending: bool) -> Result<Value> {
|
||||
let cmd = if extending { "extend" } else { "trim" };
|
||||
let only: Option<Vec<Handle>> =
|
||||
p.get("edges").and_then(Value::as_array).map(|a| a.iter().filter_map(|v| v.as_str().and_then(Handle::parse_hex)).collect());
|
||||
let edges = Edges { only: only.as_deref(), implied: edge_mode_param(cmd, p)? };
|
||||
let quick = match p.get("mode") {
|
||||
None | Some(Value::Null) => false,
|
||||
Some(v) => match v.as_str().map(|m| m.trim().to_ascii_lowercase()).as_deref() {
|
||||
@@ -189,7 +182,6 @@ fn run(s: &mut Session, p: &Value, extending: bool) -> Result<Value> {
|
||||
_ => return Err(bad(cmd, "`mode` must be \"quick\" or \"standard\"")),
|
||||
},
|
||||
};
|
||||
let edges = Edges { only: only.as_deref(), implied: edge_mode_param(cmd, p)? };
|
||||
let key = if extending { "extended" } else { "trimmed" };
|
||||
if p.get("fence").is_some_and(|v| !v.is_null()) {
|
||||
let pts = points_param(p, "fence")
|
||||
@@ -205,19 +197,8 @@ fn run(s: &mut Session, p: &Value, extending: bool) -> Result<Value> {
|
||||
return Ok(json!({ key: n }));
|
||||
}
|
||||
let h = super::targets(s, p)?.first().copied().ok_or_else(|| bad(cmd, "`handle` is required"))?;
|
||||
let pick = point_param(p, "pick").ok_or_else(|| {
|
||||
bad(
|
||||
cmd,
|
||||
if extending {
|
||||
"`pick` ([x, y]) is required: point toward the boundary to extend to, selecting the nearer end"
|
||||
} else {
|
||||
"`pick` ([x, y]) is required: select the portion of the object to trim away"
|
||||
},
|
||||
)
|
||||
})?;
|
||||
// Diagnose only an existing single-pick JSON failure. Successful calls, Quick-mode
|
||||
// erasure, fence/crossing and the interactive command keep their existing behavior.
|
||||
let r = apply(s, h, pick, extending, edges, quick).map_err(|e| json_pick_error(s, h, pick, edges, extending, e))?;
|
||||
let pick = point_param(p, "pick").ok_or_else(|| bad(cmd, "`pick` ([x, y]) is required"))?;
|
||||
let r = apply(s, h, pick, extending, edges, quick)?;
|
||||
if extending { Ok(Value::Null) } else { Ok(json!({ "handles": r.iter().map(|h| h.hex()).collect::<Vec<_>>() })) }
|
||||
}
|
||||
|
||||
@@ -239,8 +220,6 @@ enum Stage {
|
||||
Edges(Vec<Handle>),
|
||||
/// Fence points so far.
|
||||
Fence(Vec<Vec2>),
|
||||
/// Quick mode's two-point fence, started by a pick in empty space: its first point.
|
||||
QuickFence(Vec2),
|
||||
/// A crossing window: its first corner once picked.
|
||||
Crossing(Option<Vec2>),
|
||||
Mode,
|
||||
@@ -377,12 +356,11 @@ impl Interactive for TrimM {
|
||||
None => Prompt::new("Specify first fence point", Accept::POINT),
|
||||
Some(l) => Prompt::new("Specify next fence point", Accept::POINT).kw(&["Undo"]).base(*l),
|
||||
},
|
||||
Stage::QuickFence(a) => Prompt::new("Specify next fence point", Accept::POINT).base(*a),
|
||||
Stage::Crossing(None) => Prompt::new("Specify first corner", Accept::POINT),
|
||||
Stage::Crossing(Some(_)) => Prompt::new("Specify opposite corner", Accept::POINT),
|
||||
Stage::Mode => {
|
||||
let msg = if self.extend { "Enter an extend mode option" } else { "Enter a trim mode option" };
|
||||
Prompt::new(msg, KW).kw(&["Quick", "Standard"]).default(if quick_mode(s) { "Quick" } else { "Standard" })
|
||||
Prompt::new(msg, Accept::TEXT).kw(&["Quick", "Standard"]).default(if quick_mode(s) { "Quick" } else { "Standard" })
|
||||
}
|
||||
Stage::Project => {
|
||||
let cur = match proj_mode(s) {
|
||||
@@ -390,9 +368,9 @@ impl Interactive for TrimM {
|
||||
2 => "View",
|
||||
_ => "Ucs",
|
||||
};
|
||||
Prompt::new("Enter a projection option", KW).kw(&["None", "Ucs", "View"]).default(cur)
|
||||
Prompt::new("Enter a projection option", Accept::TEXT).kw(&["None", "Ucs", "View"]).default(cur)
|
||||
}
|
||||
Stage::Edge => Prompt::new("Enter an implied edge extension mode", KW).kw(&["Extend", "No extend"]).default(if edge_mode(s) {
|
||||
Stage::Edge => Prompt::new("Enter an implied edge extension mode", Accept::TEXT).kw(&["Extend", "No extend"]).default(if edge_mode(s) {
|
||||
"Extend"
|
||||
} else {
|
||||
"No extend"
|
||||
@@ -477,16 +455,6 @@ impl Interactive for TrimM {
|
||||
}
|
||||
Ok(Step::Continue)
|
||||
}
|
||||
Stage::QuickFence(a) => {
|
||||
self.stage = Stage::Pick;
|
||||
if let Input::Point(b) = i {
|
||||
let r = self.step(s, |m, s| fence(s, &[a, b], extending, m.edges(quick, implied), quick).map(|_| ()));
|
||||
if let Err(e) = r {
|
||||
s.echo(e.to_string());
|
||||
}
|
||||
}
|
||||
Ok(Step::Continue)
|
||||
}
|
||||
Stage::Crossing(first) => {
|
||||
match (first, i) {
|
||||
(None, Input::Point(p)) => self.stage = Stage::Crossing(Some(p)),
|
||||
@@ -507,9 +475,8 @@ impl Interactive for TrimM {
|
||||
let ap = s.pixel_size() * s.settings.pickbox.max(1.0) * 1.5;
|
||||
let space = s.space();
|
||||
let Some(h) = s.pick_object(&space, p, ap)? else {
|
||||
// A pick in empty space starts a two-point fence in Quick mode (as in
|
||||
// AutoCAD, #1594) and a crossing window in Standard mode.
|
||||
self.stage = if quick { Stage::QuickFence(p) } else { Stage::Crossing(Some(p)) };
|
||||
// A pick in empty space opens a crossing window there.
|
||||
self.stage = Stage::Crossing(Some(p));
|
||||
return Ok(Step::Continue);
|
||||
};
|
||||
let r = self.step(s, |m, s| apply(s, h, p, extending, m.edges(quick, implied), quick).map(|_| ()));
|
||||
@@ -558,7 +525,6 @@ impl Interactive for TrimM {
|
||||
.windows(2)
|
||||
.filter_map(|w| Some(line(*w.first()?, *w.get(1)?)))
|
||||
.collect(),
|
||||
Stage::QuickFence(a) => vec![line(*a, c)],
|
||||
Stage::Crossing(Some(a)) => vec![lwpoly(rect_vertices(*a, c), true)],
|
||||
_ => Vec::new(),
|
||||
}
|
||||
|
||||
@@ -156,6 +156,10 @@ pub struct Session {
|
||||
lisp_last: Option<std::result::Result<lisp::value::Value, String>>,
|
||||
/// What the last HATCHPICK kept (the Hatch and Gradient dialog's picks).
|
||||
pub hatch_picks: Option<cmd::hatch::HatchPicks>,
|
||||
/// The window's menu bar and tool bar as the UI shows them (it reports them every frame).
|
||||
pub bars_shown: cmd::interface::InterfaceBars,
|
||||
/// The bars MENUBAR or TOOLBAR asked to change, for the UI to apply.
|
||||
pub bars_request: cmd::interface::BarsRequest,
|
||||
/// The object named with a point for the input a prompt picking one object is taking
|
||||
/// ([`Session::input_object`]): a pick at exactly that point picks that object
|
||||
/// ([`Session::pick_object`]).
|
||||
@@ -215,6 +219,8 @@ impl Session {
|
||||
lisp: lisp::LispState::default(),
|
||||
lisp_last: None,
|
||||
hatch_picks: None,
|
||||
bars_shown: Default::default(),
|
||||
bars_request: Default::default(),
|
||||
pick_hint: None,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
//! BREAK on a closed polyline removes the stretch between the two points that doesn't run
|
||||
//! through its start vertex, whichever point comes first, and leaves one open polyline from the
|
||||
//! later point round to the earlier one (#1173; AutoCAD 2024, accoreconsole).
|
||||
//! BREAK on a closed polyline removes the stretch from the first to the second point along the
|
||||
//! vertex direction and leaves one open polyline (#1173).
|
||||
|
||||
use cadcraft_doc::{EntityKind, LwPolyline};
|
||||
use cadcraft_engine::Session;
|
||||
@@ -39,15 +38,14 @@ fn break_opens_a_closed_polyline_at_the_command_line() {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn break_json_on_a_closed_polyline_ignores_the_order_of_the_points() {
|
||||
fn break_json_on_a_closed_polyline_follows_the_order_of_the_points() {
|
||||
let mut s = Session::new();
|
||||
let r = closed_rect(&mut s);
|
||||
// Second point before the first along the vertices: the same stretch goes as with the points
|
||||
// the other way round (measured with the first point after the second, and both ways on a
|
||||
// 100 x 10 rectangle broken at (10, 0) and (10, 10), where the long stretch went).
|
||||
// Second point before the first along the vertices: the long way round goes, the short
|
||||
// stretch between them stays.
|
||||
s.execute("break", &json!({ "handle": r["handle"], "p1": [100, 30], "p2": [50, 0] })).unwrap();
|
||||
let ps = polys(&s);
|
||||
assert_eq!(ps.len(), 1);
|
||||
assert!(!ps[0].closed);
|
||||
assert_eq!(pts(&ps[0]), vec![(100.0, 30.0), (100.0, 60.0), (0.0, 60.0), (0.0, 0.0), (50.0, 0.0)]);
|
||||
assert_eq!(pts(&ps[0]), vec![(50.0, 0.0), (100.0, 0.0), (100.0, 30.0)]);
|
||||
}
|
||||
|
||||
@@ -1,134 +0,0 @@
|
||||
//! BREAKATPOINT and BREAK where the result is easy to get wrong, as AutoCAD 2024 runs them
|
||||
//! (accoreconsole, `entget` of every object after the command, on these drawings):
|
||||
//!
|
||||
//! - BREAKATPOINT at either end of a line, or at the end vertex of an open polyline, leaves the
|
||||
//! object whole;
|
||||
//! - at an open polyline's middle vertex it splits it there, the original keeping the first part;
|
||||
//! - BREAK of a closed polyline at two points of one side, either way round and on the side that
|
||||
//! closes it too, opens it with its own handle;
|
||||
//! - a circle trimmed or broken becomes an arc with its own handle.
|
||||
|
||||
use cadcraft_engine::Session;
|
||||
use cadcraft_engine::doc::{EntityKind, Handle};
|
||||
use serde_json::{Value, json};
|
||||
|
||||
fn handle(v: &Value) -> Handle {
|
||||
Handle::parse_hex(v.get("handle").unwrap_or(&v["handles"][0]).as_str().unwrap()).unwrap()
|
||||
}
|
||||
|
||||
/// The model space objects in order: handle and kind.
|
||||
fn objects(s: &Session) -> Vec<(Handle, EntityKind)> {
|
||||
s.doc().unwrap().model.iter().map(|e| (e.handle, e.kind.clone())).collect()
|
||||
}
|
||||
|
||||
/// A polyline's closed flag and vertices (rounded to 1e-9).
|
||||
fn pts(k: &EntityKind) -> (bool, Vec<(f64, f64)>) {
|
||||
let EntityKind::LwPolyline(p) = k else { panic!("not a polyline: {k:?}") };
|
||||
let r = |v: f64| (v * 1e9).round() / 1e9;
|
||||
(p.closed, p.vertices.iter().map(|v| (r(v.p.x), r(v.p.y))).collect())
|
||||
}
|
||||
|
||||
fn line(s: &mut Session, a: [f64; 2], b: [f64; 2]) -> Handle {
|
||||
handle(&s.execute("line", &json!({ "points": [a, b] })).unwrap())
|
||||
}
|
||||
|
||||
fn pline(s: &mut Session, vertices: Value, closed: bool) -> Handle {
|
||||
handle(&s.execute("pline", &json!({ "vertices": vertices, "closed": closed })).unwrap())
|
||||
}
|
||||
|
||||
fn run(s: &mut Session, script: &str) {
|
||||
s.script(script).unwrap();
|
||||
assert!(s.running.is_none(), "{script}: {}", s.prompt_text());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn breakatpoint_at_an_end_leaves_the_object_whole() {
|
||||
for at in ["100,0", "0,0"] {
|
||||
let mut s = Session::new();
|
||||
let l = line(&mut s, [0.0, 0.0], [100.0, 0.0]);
|
||||
run(&mut s, &format!("BREAKATPOINT {at} {at}\n"));
|
||||
let objs = objects(&s);
|
||||
assert_eq!(objs.len(), 1, "{at}: {objs:?}");
|
||||
let EntityKind::Line(k) = &objs[0].1 else { panic!("{objs:?}") };
|
||||
assert!(objs[0].0 == l && (k.a.x, k.a.y, k.b.x, k.b.y) == (0.0, 0.0, 100.0, 0.0), "{at}: {objs:?}");
|
||||
}
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, json!([[0, 0], [50, 0], [50, 30]]), false);
|
||||
run(&mut s, "BREAKATPOINT 50,30 50,30\n");
|
||||
let objs = objects(&s);
|
||||
assert_eq!(objs.len(), 1, "{objs:?}");
|
||||
assert_eq!((objs[0].0, pts(&objs[0].1)), (p, (false, vec![(0.0, 0.0), (50.0, 0.0), (50.0, 30.0)])));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn breakatpoint_at_a_middle_vertex_splits_there_and_the_original_keeps_the_first_part() {
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, json!([[0, 0], [50, 0], [50, 30]]), false);
|
||||
run(&mut s, "BREAKATPOINT 50,0 50,0\n");
|
||||
let objs = objects(&s);
|
||||
assert_eq!(objs.len(), 2, "{objs:?}");
|
||||
let first = objs.iter().find(|o| o.0 == p).expect("the original stays");
|
||||
let other = objs.iter().find(|o| o.0 != p).unwrap();
|
||||
assert_eq!(pts(&first.1), (false, vec![(0.0, 0.0), (50.0, 0.0)]));
|
||||
assert_eq!(pts(&other.1), (false, vec![(50.0, 0.0), (50.0, 30.0)]));
|
||||
// One undo brings back the polyline as it was, under its handle, and nothing else.
|
||||
s.undo().unwrap();
|
||||
let objs = objects(&s);
|
||||
assert_eq!(objs.len(), 1, "{objs:?}");
|
||||
assert_eq!((objs[0].0, pts(&objs[0].1)), (p, (false, vec![(0.0, 0.0), (50.0, 0.0), (50.0, 30.0)])));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn break_at_two_points_of_one_side_opens_a_closed_polyline_with_its_handle() {
|
||||
let bottom = vec![(30.0, 0.0), (100.0, 0.0), (100.0, 10.0), (0.0, 10.0), (0.0, 0.0), (20.0, 0.0)];
|
||||
// The side from (0, 10) back to the start vertex closes the rectangle.
|
||||
let closing = vec![(0.0, 3.0), (0.0, 0.0), (100.0, 0.0), (100.0, 10.0), (0.0, 10.0), (0.0, 8.0)];
|
||||
for (script, want) in [("BREAK 20,0 30,0\n", &bottom), ("BREAK 30,0 20,0\n", &bottom), ("BREAK 0,8 0,3\n", &closing)] {
|
||||
let mut s = Session::new();
|
||||
let r = pline(&mut s, json!([[0, 0], [100, 0], [100, 10], [0, 10]]), true);
|
||||
run(&mut s, script);
|
||||
let objs = objects(&s);
|
||||
assert_eq!(objs.len(), 1, "{script}: {objs:?}");
|
||||
assert_eq!((objs[0].0, pts(&objs[0].1)), (r, (false, want.clone())), "{script}");
|
||||
// Undo closes it again.
|
||||
s.undo().unwrap();
|
||||
let objs = objects(&s);
|
||||
let rect = vec![(0.0, 0.0), (100.0, 0.0), (100.0, 10.0), (0.0, 10.0)];
|
||||
assert_eq!(objs.iter().map(|o| (o.0, pts(&o.1))).collect::<Vec<_>>(), vec![(r, (true, rect))], "{script}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_circle_trimmed_or_broken_becomes_an_arc_with_its_handle() {
|
||||
// Trimmed between the lines x = -5 and x = 5, picked at its top: the arc from 120 to 60
|
||||
// degrees, round the bottom.
|
||||
let mut s = Session::new();
|
||||
let c = handle(&s.execute("circle", &json!({ "center": [0, 0], "radius": 10 })).unwrap());
|
||||
let l = line(&mut s, [-5.0, -20.0], [-5.0, 20.0]);
|
||||
let m = line(&mut s, [5.0, -20.0], [5.0, 20.0]);
|
||||
s.execute("trim", &json!({ "handle": c.hex(), "pick": [0, 10], "edges": [l.hex(), m.hex()] })).unwrap();
|
||||
// The arc's handle, and whether it is AutoCAD's: radius 10 round (0, 0), from `start` to
|
||||
// `end` degrees (to 1e-9 radians, 0 and 360 alike).
|
||||
let arc_is = |s: &Session, start: f64, end: f64| {
|
||||
let objs = objects(s);
|
||||
let (h, k) = objs.iter().find(|o| matches!(o.1, EntityKind::Arc(_))).cloned().expect("an arc");
|
||||
let EntityKind::Arc(a) = k else { panic!("not an arc") };
|
||||
let same = |got: f64, want: f64| {
|
||||
let d = (got - want.to_radians()).rem_euclid(std::f64::consts::TAU);
|
||||
d < 1e-9 || std::f64::consts::TAU - d < 1e-9
|
||||
};
|
||||
let ok = (a.radius - 10.0).abs() < 1e-9 && a.center.x.abs() < 1e-9 && a.center.y.abs() < 1e-9 && same(a.start, start) && same(a.end, end);
|
||||
(h, ok)
|
||||
};
|
||||
assert_eq!(arc_is(&s, 120.0, 60.0), (c, true));
|
||||
// Broken from (10, 0) to (0, 10): the arc from 90 degrees round to 0.
|
||||
let mut s = Session::new();
|
||||
let c = handle(&s.execute("circle", &json!({ "center": [0, 0], "radius": 10 })).unwrap());
|
||||
run(&mut s, "BREAK 10,0 0,10\n");
|
||||
assert_eq!(objects(&s).len(), 1);
|
||||
assert_eq!(arc_is(&s, 90.0, 0.0), (c, true));
|
||||
// Undo gives the circle back under its handle.
|
||||
s.undo().unwrap();
|
||||
let objs = objects(&s);
|
||||
assert!(objs.len() == 1 && objs[0].0 == c && matches!(objs[0].1, EntityKind::Circle(_)), "{objs:?}");
|
||||
}
|
||||
@@ -1,647 +0,0 @@
|
||||
//! BREAK on a closed polyline and TRIM of a polyline that is one of its own cutting edges, as
|
||||
//! AutoCAD 2024 does them (measured with accoreconsole on these drawings):
|
||||
//!
|
||||
//! - BREAK between two points of a closed polyline removes the stretch between them that doesn't
|
||||
//! run through its start vertex, whichever point comes first; BREAK or BREAKATPOINT at one point
|
||||
//! splits it there into two open polylines, and at its start vertex leaves it closed.
|
||||
//! - A polyline that is one of the cutting edges (picked, or with every object, in Standard or
|
||||
//! Quick mode) is also cut at its own vertices, where it crosses itself and where a vertex of it
|
||||
//! touches another of its segments. A piece whose ends meet there is left closed. A vertex
|
||||
//! between two line segments in line (within 1e-8, straight on or doubling back) doesn't cut it.
|
||||
//! - A pick within 5e-7 of one of the polyline's own cuts, whatever its size, trims nothing; a cut
|
||||
//! by another edge that near the pick is passed over. An edge through a closed polyline's start
|
||||
//! vertex cuts it there.
|
||||
//!
|
||||
//! Quick mode was measured in AutoCAD 2024 itself, picking on screen: its scripted TRIM runs
|
||||
//! Standard mode only.
|
||||
|
||||
use cadcraft_engine::Session;
|
||||
use cadcraft_engine::doc::{EntityKind, Handle};
|
||||
use serde_json::{Value, json};
|
||||
|
||||
type Vertex = (f64, f64, f64);
|
||||
|
||||
fn handle(v: &Value) -> Handle {
|
||||
Handle::parse_hex(v.get("handle").unwrap_or(&v["handles"][0]).as_str().unwrap()).unwrap()
|
||||
}
|
||||
|
||||
fn pline(s: &mut Session, vertices: Value, closed: bool) -> Handle {
|
||||
handle(&s.execute("pline", &json!({ "vertices": vertices, "closed": closed })).unwrap())
|
||||
}
|
||||
|
||||
fn line(s: &mut Session, a: [f64; 2], b: [f64; 2]) -> Handle {
|
||||
handle(&s.execute("line", &json!({ "points": [a, b] })).unwrap())
|
||||
}
|
||||
|
||||
/// Every polyline in model space in order: its handle, closed flag and vertices with bulges.
|
||||
fn polys(s: &Session) -> Vec<(Handle, bool, Vec<Vertex>)> {
|
||||
s.doc()
|
||||
.unwrap()
|
||||
.model
|
||||
.iter()
|
||||
.filter_map(|e| match &e.kind {
|
||||
EntityKind::LwPolyline(p) => Some((e.handle, p.closed, p.vertices.iter().map(|v| (v.p.x, v.p.y, v.bulge)).collect())),
|
||||
_ => None,
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn same(got: &[Vertex], want: &[Vertex]) -> bool {
|
||||
got.len() == want.len() && got.iter().zip(want).all(|(g, w)| (g.0 - w.0).abs() < 1e-9 && (g.1 - w.1).abs() < 1e-9 && (g.2 - w.2).abs() < 1e-9)
|
||||
}
|
||||
|
||||
/// The polylines are `want` in order, (`kept`, closed, vertices): `kept` is whether it has the
|
||||
/// handle `h`.
|
||||
fn expect(s: &Session, h: Handle, want: &[(bool, bool, &[Vertex])]) {
|
||||
let got = polys(s);
|
||||
assert_eq!(got.len(), want.len(), "{got:?}");
|
||||
for ((gh, gc, gv), (kept, closed, wv)) in got.iter().zip(want) {
|
||||
assert_eq!((*gh == h, *gc), (*kept, *closed), "{got:?}");
|
||||
assert!(same(gv, wv), "{gv:?} != {wv:?}");
|
||||
}
|
||||
}
|
||||
|
||||
fn run(s: &mut Session, script: &str) {
|
||||
s.script(script).unwrap();
|
||||
assert!(s.running.is_none(), "{script}: {}", s.prompt_text());
|
||||
}
|
||||
|
||||
// ---------------- BREAK on a closed polyline ----------------
|
||||
|
||||
#[test]
|
||||
fn break_removes_the_stretch_between_the_points_that_misses_the_start_vertex() {
|
||||
// 100 x 10 rectangle broken at (10, 0) and (10, 10): the 190-unit stretch between them goes,
|
||||
// the 20 units across the start vertex stay, with the points either way round.
|
||||
for script in ["BREAK 10,0 10,10\n", "BREAK 10,10 10,0\n"] {
|
||||
let mut s = Session::new();
|
||||
let r = pline(&mut s, json!([[0, 0], [100, 0], [100, 10], [0, 10]]), true);
|
||||
run(&mut s, script);
|
||||
expect(&s, r, &[(true, false, &[(10.0, 10.0, 0.0), (0.0, 10.0, 0.0), (0.0, 0.0, 0.0), (10.0, 0.0, 0.0)])]);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn break_with_the_first_point_after_the_second_keeps_the_run_through_the_start() {
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, json!([[0, 0], { "p": [40, 0], "bulge": 0.5 }, [60, 0], [60, 30], [0, 30]]), true);
|
||||
run(&mut s, "BREAK 60,20 10,0\n");
|
||||
expect(&s, p, &[(true, false, &[(60.0, 20.0, 0.0), (60.0, 30.0, 0.0), (0.0, 30.0, 0.0), (0.0, 0.0, 0.0), (10.0, 0.0, 0.0)])]);
|
||||
}
|
||||
|
||||
const SQUARE: [[f64; 2]; 4] = [[250.0, 0.0], [270.0, 0.0], [270.0, 20.0], [250.0, 20.0]];
|
||||
|
||||
#[test]
|
||||
fn break_at_one_point_splits_a_closed_polyline_in_two() {
|
||||
let first: &[Vertex] = &[(250.0, 0.0, 0.0), (260.0, 0.0, 0.0)];
|
||||
let second: &[Vertex] = &[(260.0, 0.0, 0.0), (270.0, 0.0, 0.0), (270.0, 20.0, 0.0), (250.0, 20.0, 0.0), (250.0, 0.0, 0.0)];
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, json!(SQUARE), true);
|
||||
run(&mut s, "BREAK 260,0 260,0\n");
|
||||
expect(&s, p, &[(true, false, first), (false, false, second)]);
|
||||
// BREAKATPOINT does the same.
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, json!(SQUARE), true);
|
||||
let r = s.execute("breakatpoint", &json!({ "handle": p.hex(), "at": [260, 0] })).unwrap();
|
||||
assert_eq!(r["handles"].as_array().unwrap().len(), 2);
|
||||
expect(&s, p, &[(true, false, first), (false, false, second)]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn break_at_a_vertex_splits_there_and_at_the_start_vertex_changes_nothing() {
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, json!(SQUARE), true);
|
||||
run(&mut s, "BREAK 270,20 270,20\n");
|
||||
expect(
|
||||
&s,
|
||||
p,
|
||||
&[
|
||||
(true, false, &[(250.0, 0.0, 0.0), (270.0, 0.0, 0.0), (270.0, 20.0, 0.0)]),
|
||||
(false, false, &[(270.0, 20.0, 0.0), (250.0, 20.0, 0.0), (250.0, 0.0, 0.0)]),
|
||||
],
|
||||
);
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, json!(SQUARE), true);
|
||||
run(&mut s, "BREAK 250,0 250,0\n");
|
||||
expect(&s, p, &[(true, true, &[(250.0, 0.0, 0.0), (270.0, 0.0, 0.0), (270.0, 20.0, 0.0), (250.0, 20.0, 0.0)])]);
|
||||
}
|
||||
|
||||
// ---------------- TRIM of a polyline that cuts itself ----------------
|
||||
|
||||
/// A polyline with an arc, and vertical lines at x = 20 and x = 60 crossing it.
|
||||
fn arc_polyline(s: &mut Session) -> (Handle, Handle, Handle) {
|
||||
let p = pline(s, json!([[0, 0], { "p": [40, 0], "bulge": 0.4 }, [70, 0], [90, 30]]), false);
|
||||
let b = line(s, [20.0, -10.0], [20.0, 40.0]);
|
||||
let c = line(s, [60.0, -20.0], [60.0, 40.0]);
|
||||
(p, b, c)
|
||||
}
|
||||
|
||||
/// The piece from the x = 60 cut on the arc to the end, as measured.
|
||||
const FROM_C: [Vertex; 3] = [(60.0, -5.417486860749438, 0.1330399827453447), (70.0, 0.0, 0.0), (90.0, 30.0, 0.0)];
|
||||
|
||||
fn trim(s: &mut Session, h: Handle, pick: [f64; 2], edges: Option<&[Handle]>) {
|
||||
let mut p = json!({ "handle": h.hex(), "pick": pick });
|
||||
if let Some(es) = edges {
|
||||
p["edges"] = json!(es.iter().map(|e| e.hex()).collect::<Vec<_>>());
|
||||
}
|
||||
s.execute("trim", &p).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn with_every_object_cutting_a_polyline_trims_to_its_own_vertex() {
|
||||
let mut s = Session::new();
|
||||
let (p, ..) = arc_polyline(&mut s);
|
||||
trim(&mut s, p, [55.0, -6.0], None);
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, 0.0), (40.0, 0.0, 0.0)]), (false, false, &FROM_C)]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn edges_that_leave_the_polyline_out_cut_only_where_they_cross_it() {
|
||||
let mut s = Session::new();
|
||||
let (p, b, c) = arc_polyline(&mut s);
|
||||
trim(&mut s, p, [55.0, -6.0], Some(&[b, c]));
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, 0.0), (20.0, 0.0, 0.0)]), (false, false, &FROM_C)]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_polyline_that_is_its_only_edge_loses_the_whole_segment_picked() {
|
||||
let mut s = Session::new();
|
||||
let (p, ..) = arc_polyline(&mut s);
|
||||
trim(&mut s, p, [55.0, -6.0], Some(&[p]));
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, 0.0), (40.0, 0.0, 0.0)]), (false, false, &[(70.0, 0.0, 0.0), (90.0, 30.0, 0.0)])]);
|
||||
// The first segment: one piece left, the polyline itself.
|
||||
let mut s = Session::new();
|
||||
let (p, ..) = arc_polyline(&mut s);
|
||||
trim(&mut s, p, [10.0, 0.0], Some(&[p]));
|
||||
expect(&s, p, &[(true, false, &[(40.0, 0.0, 0.4), (70.0, 0.0, 0.0), (90.0, 30.0, 0.0)])]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_closed_polyline_that_is_its_only_edge_opens_without_the_segment_picked() {
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, json!([[0, 0], [40, 0], [40, 30], [0, 30]]), true);
|
||||
trim(&mut s, p, [20.0, 0.0], Some(&[p]));
|
||||
expect(&s, p, &[(true, false, &[(40.0, 0.0, 0.0), (40.0, 30.0, 0.0), (0.0, 30.0, 0.0), (0.0, 0.0, 0.0)])]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_polyline_crossing_itself_is_cut_at_the_crossing() {
|
||||
let x = json!([[0, 0], [40, 20], [40, 0], [0, 20]]);
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, x.clone(), false);
|
||||
trim(&mut s, p, [10.0, 5.0], Some(&[p]));
|
||||
expect(&s, p, &[(true, false, &[(20.0, 10.0, 0.0), (40.0, 20.0, 0.0), (40.0, 0.0, 0.0), (0.0, 20.0, 0.0)])]);
|
||||
// Every object (the polyline alone): cut between the crossing and the next vertex.
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, x, false);
|
||||
trim(&mut s, p, [30.0, 15.0], None);
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, 0.0), (20.0, 10.0, 0.0)]), (false, false, &[(40.0, 20.0, 0.0), (40.0, 0.0, 0.0), (0.0, 20.0, 0.0)])]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_closed_polyline_at_survey_coordinates_trims_to_its_own_vertex() {
|
||||
let mut s = Session::new();
|
||||
let p = pline(
|
||||
&mut s,
|
||||
json!([[612345.678, 2398765.432], { "p": [612385.678, 2398765.432], "bulge": 0.4 }, [612415.678, 2398765.432], [612415.678, 2398795.432], [612345.678, 2398795.432]]),
|
||||
true,
|
||||
);
|
||||
let b = line(&mut s, [612365.678, 2398755.432], [612365.678, 2398805.432]);
|
||||
let c = line(&mut s, [612405.678, 2398745.432], [612405.678, 2398805.432]);
|
||||
trim(&mut s, p, [612400.678, 2398759.432], Some(&[p, b, c]));
|
||||
let got = polys(&s);
|
||||
assert_eq!(got.len(), 1);
|
||||
let (h, closed, vs) = &got[0];
|
||||
assert!(*h == p && !closed);
|
||||
let want: [Vertex; 6] = [
|
||||
(612405.678, 2398760.014513139, 0.1330399827461127),
|
||||
(612415.678, 2398765.432, 0.0),
|
||||
(612415.678, 2398795.432, 0.0),
|
||||
(612345.678, 2398795.432, 0.0),
|
||||
(612345.678, 2398765.432, 0.0),
|
||||
(612385.678, 2398765.432, 0.0),
|
||||
];
|
||||
// Survey coordinates: a micrometre on the points, the bulge to 1e-9.
|
||||
assert_eq!(vs.len(), want.len());
|
||||
for (g, w) in vs.iter().zip(&want) {
|
||||
assert!((g.0 - w.0).abs() < 1e-6 && (g.1 - w.1).abs() < 1e-6 && (g.2 - w.2).abs() < 1e-9, "{g:?} != {w:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn standard_mode_at_the_command_line_with_every_object_cuts_at_the_polyline_vertex() {
|
||||
let mut s = Session::new();
|
||||
let (p, ..) = arc_polyline(&mut s);
|
||||
// Mode Standard, Enter: every object is a cutting edge.
|
||||
run(&mut s, "TRIM O S\n\n55,-6\n\n");
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, 0.0), (40.0, 0.0, 0.0)]), (false, false, &FROM_C)]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_polyline_picked_as_an_edge_in_quick_mode_cuts_itself_too() {
|
||||
// Quick mode with the edges given (its cuTting edges option): picked is picked.
|
||||
let mut s = Session::new();
|
||||
let (p, _, c) = arc_polyline(&mut s);
|
||||
s.execute("trim", &json!({ "handle": p.hex(), "pick": [55, -6], "mode": "quick", "edges": [p.hex(), c.hex()] })).unwrap();
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, 0.0), (40.0, 0.0, 0.0)]), (false, false, &FROM_C)]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn quick_mode_with_every_object_cuts_a_polyline_at_its_own_vertex_too() {
|
||||
// As Standard mode with every object: from the vertex at (40, 0), not from the line at x = 20.
|
||||
let mut s = Session::new();
|
||||
let (p, ..) = arc_polyline(&mut s);
|
||||
s.execute("trim", &json!({ "handle": p.hex(), "pick": [55, -6], "mode": "quick" })).unwrap();
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, 0.0), (40.0, 0.0, 0.0)]), (false, false, &FROM_C)]);
|
||||
}
|
||||
|
||||
/// A rectangle, then an open polyline whose last vertex (6.9, 6.2) touches its second segment
|
||||
/// inside the rectangle (reversed: whose first vertex does). The polyline's handle.
|
||||
fn touching(s: &mut Session, reversed: bool) -> Handle {
|
||||
pline(s, json!([[3.9, 3.8], [8.3, 3.8], [8.3, 6.9], [3.9, 6.9]]), true);
|
||||
let mut v = vec![[2.3, 3.3], [5.3, 8.0], [8.5, 4.4], [8.8, 7.8], [6.9, 6.2]];
|
||||
if reversed {
|
||||
v.reverse();
|
||||
}
|
||||
pline(s, json!(v), false)
|
||||
}
|
||||
|
||||
const RECT: [Vertex; 4] = [(3.9, 3.8, 0.0), (8.3, 3.8, 0.0), (8.3, 6.9, 0.0), (3.9, 6.9, 0.0)];
|
||||
/// Where the second segment crosses the rectangle's top and right sides.
|
||||
const TOP: Vertex = (6.277777777777777, 6.9, 0.0);
|
||||
const RIGHT: Vertex = (8.3, 4.625, 0.0);
|
||||
|
||||
#[test]
|
||||
fn a_polyline_is_cut_where_its_end_touches_it() {
|
||||
let start: [Vertex; 3] = [(2.3, 3.3, 0.0), (5.3, 8.0, 0.0), TOP];
|
||||
let looped: [Vertex; 3] = [(6.9, 6.2, 0.0), (8.5, 4.4, 0.0), (8.8, 7.8, 0.0)];
|
||||
// Picked above the touch, in the rectangle: cut from the top side to the touch. What is left
|
||||
// after it ends where it starts, so it is closed. Quick mode as picked on screen, and Standard
|
||||
// mode with every object at the command line.
|
||||
let mut s = Session::new();
|
||||
let p = touching(&mut s, false);
|
||||
s.execute("trim", &json!({ "handle": p.hex(), "pick": [6.58, 6.56], "mode": "quick" })).unwrap();
|
||||
expect(&s, p, &[(false, true, &RECT), (true, false, &start), (false, true, &looped)]);
|
||||
let mut s = Session::new();
|
||||
let p = touching(&mut s, false);
|
||||
run(&mut s, "TRIM O S\n\n6.58,6.56\n\n");
|
||||
expect(&s, p, &[(false, true, &RECT), (true, false, &start), (false, true, &looped)]);
|
||||
// Below the touch: cut from the touch to the right side.
|
||||
let mut s = Session::new();
|
||||
let p = touching(&mut s, false);
|
||||
trim(&mut s, p, [7.604, 5.408], None);
|
||||
let end: [Vertex; 4] = [RIGHT, (8.5, 4.4, 0.0), (8.8, 7.8, 0.0), (6.9, 6.2, 0.0)];
|
||||
expect(&s, p, &[(false, true, &RECT), (true, false, &[(2.3, 3.3, 0.0), (5.3, 8.0, 0.0), (6.9, 6.2, 0.0)]), (false, false, &end)]);
|
||||
// The first vertex touching: the closed loop is the piece that keeps the handle.
|
||||
let mut s = Session::new();
|
||||
let p = touching(&mut s, true);
|
||||
trim(&mut s, p, [6.58, 6.56], None);
|
||||
expect(
|
||||
&s,
|
||||
p,
|
||||
&[
|
||||
(false, true, &RECT),
|
||||
(true, true, &[(6.9, 6.2, 0.0), (8.8, 7.8, 0.0), (8.5, 4.4, 0.0)]),
|
||||
(false, false, &[TOP, (5.3, 8.0, 0.0), (2.3, 3.3, 0.0)]),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_closed_piece_keeps_its_arcs() {
|
||||
let mut s = Session::new();
|
||||
pline(&mut s, json!([[3.9, 3.8], [8.3, 3.8], [8.3, 6.9], [3.9, 6.9]]), true);
|
||||
let p = pline(&mut s, json!([[2.3, 3.3], [5.3, 8.0], { "p": [8.5, 4.4], "bulge": 0.3 }, [8.8, 7.8], [6.9, 6.2]]), false);
|
||||
trim(&mut s, p, [6.58, 6.56], None);
|
||||
let looped: [Vertex; 3] = [(6.9, 6.2, 0.0), (8.5, 4.4, 0.3), (8.8, 7.8, 0.0)];
|
||||
expect(&s, p, &[(false, true, &RECT), (true, false, &[(2.3, 3.3, 0.0), (5.3, 8.0, 0.0), TOP]), (false, true, &looped)]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_pick_half_a_unit_from_a_vertex_1e9_out_trims_the_segment_it_is_on() {
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, json!([[0, 0], [1e9, 0], [1e9, 10]]), false);
|
||||
trim(&mut s, p, [1e9, 0.5], None);
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, 0.0), (1e9, 0.0, 0.0)])]);
|
||||
}
|
||||
|
||||
// ---------------- a pick on a cut ----------------
|
||||
|
||||
type Edge = ([f64; 2], [f64; 2]);
|
||||
|
||||
/// The polyline `v`, with lines `edges`, trimmed at `pick` with every object as an edge, or only
|
||||
/// the lines when `only_lines`; the polyline's handle and whether the trim was made.
|
||||
fn attempt(v: Value, closed: bool, edges: &[Edge], only_lines: bool, pick: [f64; 2]) -> (Session, Handle, bool) {
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, v, closed);
|
||||
let ls: Vec<String> = edges.iter().map(|(a, b)| line(&mut s, *a, *b).hex()).collect();
|
||||
let mut params = json!({ "handle": p.hex(), "pick": pick });
|
||||
if only_lines {
|
||||
params["edges"] = json!(ls);
|
||||
}
|
||||
let made = s.execute("trim", ¶ms).is_ok();
|
||||
(s, p, made)
|
||||
}
|
||||
|
||||
/// [`attempt`] with at most one line, which must trim.
|
||||
fn trimmed(v: Value, closed: bool, edge: Option<Edge>, only_line: bool, pick: [f64; 2]) -> (Session, Handle) {
|
||||
let (s, p, made) = attempt(v, closed, edge.as_slice(), only_line, pick);
|
||||
assert!(made, "{pick:?}");
|
||||
(s, p)
|
||||
}
|
||||
|
||||
/// A vertical line through x = `x`.
|
||||
fn at(x: f64) -> Edge {
|
||||
([x, -5.0], [x, 5.0])
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_pick_on_a_cut_trims_nothing() {
|
||||
// The vertex (10, 0) is the only cut. A pick whose nearest point is within 5e-7 of it, on it
|
||||
// or off to the side, leaves the polyline as it was; one 6e-7 from it trims the segment it is
|
||||
// on.
|
||||
let v = || json!([[0, 0], [10, 0], [10, 10]]);
|
||||
let whole: [Vertex; 3] = [(0.0, 0.0, 0.0), (10.0, 0.0, 0.0), (10.0, 10.0, 0.0)];
|
||||
for pick in [[10.0, 0.0], [10.0, 4e-7], [10.5, 4e-7], [9.99999999, 0.0]] {
|
||||
let (s, p) = trimmed(v(), false, None, false, pick);
|
||||
expect(&s, p, &[(true, false, &whole)]);
|
||||
}
|
||||
let (s, p) = trimmed(v(), false, None, false, [10.0, 6e-7]);
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, 0.0), (10.0, 0.0, 0.0)])]);
|
||||
let (s, p) = trimmed(v(), false, None, false, [9.9999994, 0.0]);
|
||||
expect(&s, p, &[(true, false, &[(10.0, 0.0, 0.0), (10.0, 10.0, 0.0)])]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_pick_on_a_cut_is_within_the_same_distance_at_any_size() {
|
||||
// A polyline a thousandth across, and one 1e9 long with a line through its vertex: 1e-7 from
|
||||
// the vertex is on the cut, 1e-6 off it.
|
||||
let small = || json!([[0, 0], [0.001, 0], [0.001, 0.001]]);
|
||||
let (s, p) = trimmed(small(), false, None, false, [0.001, 1e-7]);
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, 0.0), (0.001, 0.0, 0.0), (0.001, 0.001, 0.0)])]);
|
||||
let (s, p) = trimmed(small(), false, None, false, [0.001, 1e-6]);
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, 0.0), (0.001, 0.0, 0.0)])]);
|
||||
let long = || json!([[0, 0], [10, 0], [10, 1e9]]);
|
||||
let through = Some(([0.0, -10.0], [20.0, 10.0]));
|
||||
let (s, p) = trimmed(long(), false, through, false, [10.0, 1e-7]);
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, 0.0), (10.0, 0.0, 0.0), (10.0, 1e9, 0.0)])]);
|
||||
let (s, p) = trimmed(long(), false, through, false, [10.0, 1e-6]);
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, 0.0), (10.0, 0.0, 0.0)])]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_cut_by_another_edge_at_the_pick_is_passed_over() {
|
||||
// A pick within 5e-7 of a cut by another edge runs the piece on across it, to the next cut
|
||||
// either side; 6e-7 away the cut holds.
|
||||
let flat = || json!([[0, 0], [10, 0]]);
|
||||
let piece = |a: f64, b: f64| [(a, 0.0, 0.0), (b, 0.0, 0.0)];
|
||||
for pick in [[3.0, 0.0], [3.0000004, 0.0]] {
|
||||
let (s, p, _) = attempt(flat(), false, &[at(3.0), at(7.0)], true, pick);
|
||||
expect(&s, p, &[(true, false, &piece(7.0, 10.0))]);
|
||||
}
|
||||
let (s, p, _) = attempt(flat(), false, &[at(3.0), at(7.0)], true, [3.0000006, 0.0]);
|
||||
expect(&s, p, &[(true, false, &piece(0.0, 3.0)), (false, false, &piece(7.0, 10.0))]);
|
||||
// Lines at 3, 5 and 7: picked on 5, 3 to 7 goes; picked on 7, 5 to the end.
|
||||
let (s, p, _) = attempt(flat(), false, &[at(3.0), at(5.0), at(7.0)], true, [5.0, 0.0]);
|
||||
expect(&s, p, &[(true, false, &piece(0.0, 3.0)), (false, false, &piece(7.0, 10.0))]);
|
||||
let (s, p, _) = attempt(flat(), false, &[at(3.0), at(5.0), at(7.0)], true, [7.0, 0.0]);
|
||||
expect(&s, p, &[(true, false, &piece(0.0, 5.0))]);
|
||||
// Every object an edge: on to the polyline's own vertex (10, 0).
|
||||
let (s, p, _) = attempt(json!([[0, 0], [10, 0], [10, 10]]), false, &[at(5.0)], false, [5.0, 0.0]);
|
||||
expect(&s, p, &[(true, false, &[(10.0, 0.0, 0.0), (10.0, 10.0, 0.0)])]);
|
||||
// A closed rectangle cut at x = 30 and 70 top and bottom, picked on the bottom at 30: round
|
||||
// its start vertex, from 30 on the top to 70 on the bottom.
|
||||
let tall = |x: f64| ([x, -5.0], [x, 15.0]);
|
||||
let (s, p, _) = attempt(json!([[0, 0], [100, 0], [100, 10], [0, 10]]), true, &[tall(30.0), tall(70.0)], true, [30.0, 0.0]);
|
||||
expect(&s, p, &[(true, false, &[(70.0, 0.0, 0.0), (100.0, 0.0, 0.0), (100.0, 10.0, 0.0), (30.0, 10.0, 0.0)])]);
|
||||
// One line only, picked on its cut or 4e-7 past it: no cut is left, and nothing is trimmed.
|
||||
for pick in [[5.0, 0.0], [5.0000004, 0.0]] {
|
||||
let (s, p, made) = attempt(json!([[0, 0], [10, 0], [10, 10]]), false, &[at(5.0)], true, pick);
|
||||
assert!(!made);
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, 0.0), (10.0, 0.0, 0.0), (10.0, 10.0, 0.0)])]);
|
||||
}
|
||||
// In Quick mode too: the polyline meets the line, so it isn't erased as one no edge crosses.
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, json!([[0, 0], [10, 0]]), false);
|
||||
line(&mut s, [5.0, -5.0], [5.0, 5.0]);
|
||||
assert!(s.execute("trim", &json!({ "handle": p.hex(), "pick": [5, 0], "mode": "quick" })).is_err());
|
||||
expect(&s, p, &[(true, false, &piece(0.0, 10.0))]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_pick_on_a_vertex_an_edge_runs_through_trims_nothing() {
|
||||
// The line's cut is found on the segments either side of the vertex, a rounding apart. Both
|
||||
// are passed over, so no cut is left and the polyline stays as it was, not split there.
|
||||
let cases = [
|
||||
([[5.5, 1.1], [23.3, 7.7], [30.1, 29.9]], ([23.3, 7.7], [45.7, 2.3])),
|
||||
([[5.5, 1.1], [23.3, 7.7], [30.1, 29.9]], ([2.0 * 23.3 - 45.7, 2.0 * 7.7 - 2.3], [45.7, 2.3])),
|
||||
([[1.3, 2.7], [37.9, 11.3], [55.1, 48.7]], ([4.5, 43.5], [71.3, -20.9])),
|
||||
];
|
||||
for (v, edge) in cases {
|
||||
let (s, p, made) = attempt(json!(v), false, &[edge], true, v[1]);
|
||||
let whole: Vec<Vertex> = v.iter().map(|q| (q[0], q[1], 0.0)).collect();
|
||||
assert!(!made);
|
||||
expect(&s, p, &[(true, false, &whole)]);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn an_edge_through_a_closed_polylines_start_vertex_cuts_it_there() {
|
||||
// The line cuts the rectangle at (0, 0) and at (10, 10) on its top. The pick takes the piece
|
||||
// it is on, whichever vertex the rectangle starts at. 4e-7 from (0, 0) that cut is passed
|
||||
// over, which leaves one, and the trim is refused.
|
||||
let rect = || json!([[0, 0], [100, 0], [100, 10], [0, 10]]);
|
||||
let edge = Some(([-5.0, -5.0], [15.0, 15.0]));
|
||||
let left: [Vertex; 3] = [(10.0, 10.0, 0.0), (0.0, 10.0, 0.0), (0.0, 0.0, 0.0)];
|
||||
let (s, p) = trimmed(rect(), true, edge, true, [50.0, 0.0]);
|
||||
expect(&s, p, &[(true, false, &left)]);
|
||||
let (s, p) = trimmed(json!([[50, 0], [100, 0], [100, 10], [0, 10], [0, 0]]), true, edge, true, [50.0, 10.0]);
|
||||
expect(&s, p, &[(true, false, &left)]);
|
||||
let (s, p) = trimmed(rect(), true, edge, true, [0.0, 5.0]);
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, 0.0), (100.0, 0.0, 0.0), (100.0, 10.0, 0.0), (10.0, 10.0, 0.0)])]);
|
||||
let whole: [Vertex; 4] = [(0.0, 0.0, 0.0), (100.0, 0.0, 0.0), (100.0, 10.0, 0.0), (0.0, 10.0, 0.0)];
|
||||
let (s, p, made) = attempt(rect(), true, edge.as_slice(), true, [0.0, 4e-7]);
|
||||
assert!(!made);
|
||||
expect(&s, p, &[(true, true, &whole)]);
|
||||
// The rectangle alone, picked on its start vertex, and 4e-7 from it on its last segment.
|
||||
for pick in [[0.0, 0.0], [0.0, 4e-7]] {
|
||||
let (s, p) = trimmed(rect(), true, None, false, pick);
|
||||
expect(&s, p, &[(true, true, &whole)]);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_closed_polyline_cut_at_one_point_is_left_as_it_was() {
|
||||
// A line touching the rectangle only at its start vertex, and one crossing its bottom once and
|
||||
// ending inside: AutoCAD refuses either trim, and Quick mode doesn't erase the rectangle.
|
||||
for (a, b, pick) in [([-5.0, 5.0], [5.0, -5.0], [50.0, 0.0]), ([50.0, -5.0], [50.0, 5.0], [20.0, 0.0])] {
|
||||
for mode in ["standard", "quick"] {
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, json!([[0, 0], [100, 0], [100, 10], [0, 10]]), true);
|
||||
let l = line(&mut s, a, b);
|
||||
let before = polys(&s);
|
||||
let r = s.execute("trim", &json!({ "handle": p.hex(), "pick": pick, "edges": [l.hex()], "mode": mode }));
|
||||
assert!(r.is_err_and(|e| e.to_string() == "Curve must intersect cutting edges at least twice."), "{a:?} {mode}");
|
||||
assert_eq!(polys(&s), before, "{a:?} {mode}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------- where a polyline runs straight on ----------------
|
||||
|
||||
#[test]
|
||||
fn a_vertex_the_polyline_runs_straight_on_through_doesnt_cut_it() {
|
||||
// (5, 0) lies between two segments in line: the pick takes everything back to the cut before
|
||||
// it, the start of the polyline or the closed polyline's start vertex.
|
||||
let v = || json!([[0, 0], [5, 0], [10, 0], [10, 10]]);
|
||||
let (s, p) = trimmed(v(), false, None, false, [7.0, 0.0]);
|
||||
expect(&s, p, &[(true, false, &[(10.0, 0.0, 0.0), (10.0, 10.0, 0.0)])]);
|
||||
let (s, p) = trimmed(v(), true, None, false, [7.0, 0.0]);
|
||||
expect(&s, p, &[(true, false, &[(10.0, 0.0, 0.0), (10.0, 10.0, 0.0), (0.0, 0.0, 0.0)])]);
|
||||
// A crossing on the segment in line before the one picked bounds the piece, as does one on the
|
||||
// segment in line after it, and one right at the vertex in line.
|
||||
let (s, p) = trimmed(json!([[0, 0], [5, 0], [10, 0], [10, 10], [2, 10], [2, -5]]), false, None, false, [7.0, 0.0]);
|
||||
expect(
|
||||
&s,
|
||||
p,
|
||||
&[
|
||||
(true, false, &[(0.0, 0.0, 0.0), (2.0, 0.0, 0.0)]),
|
||||
(false, false, &[(10.0, 0.0, 0.0), (10.0, 10.0, 0.0), (2.0, 10.0, 0.0), (2.0, -5.0, 0.0)]),
|
||||
],
|
||||
);
|
||||
let (s, p) = trimmed(json!([[0, 0], [5, 0], [10, 0], [10, 10], [8, 10], [8, -5]]), false, None, false, [3.5, 0.0]);
|
||||
expect(&s, p, &[(true, false, &[(8.0, 0.0, 0.0), (10.0, 0.0, 0.0), (10.0, 10.0, 0.0), (8.0, 10.0, 0.0), (8.0, -5.0, 0.0)])]);
|
||||
let at_vertex = || json!([[0, 0], [5, 0], [10, 0], [10, 10], [5, 10], [5, -5]]);
|
||||
let rest: [Vertex; 4] = [(10.0, 0.0, 0.0), (10.0, 10.0, 0.0), (5.0, 10.0, 0.0), (5.0, -5.0, 0.0)];
|
||||
let (s, p) = trimmed(at_vertex(), false, None, false, [7.0, 0.0]);
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, 0.0), (5.0, 0.0, 0.0)]), (false, false, &rest)]);
|
||||
let (s, p) = trimmed(at_vertex(), false, None, false, [3.0, 0.0]);
|
||||
expect(&s, p, &[(true, false, &[(5.0, 0.0, 0.0), (10.0, 0.0, 0.0), (10.0, 10.0, 0.0), (5.0, 10.0, 0.0), (5.0, -5.0, 0.0)])]);
|
||||
// Straight on, or doubling back over itself: no cut at all.
|
||||
for (v, pick) in [(json!([[0, 0], [5, 0], [10, 0]]), [7.0, 0.0]), (json!([[0, 0], [10, 0], [5, 0]]), [2.0, 0.0])] {
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, v, false);
|
||||
let before = polys(&s);
|
||||
assert!(s.execute("trim", &json!({ "handle": p.hex(), "pick": pick })).is_err());
|
||||
assert_eq!(polys(&s), before);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_bend_of_1e_8_cuts_a_polyline_and_a_smaller_one_doesnt() {
|
||||
// The bend at (5, 0), as the sine of its angle, whatever the segments' lengths.
|
||||
for (end, pick, cuts) in [
|
||||
([10.0, 4e-8], [7.0, 0.0], false),
|
||||
([10.0, 6e-8], [7.0, 0.0], true),
|
||||
([5005.0, 1e-6], [700.0, 0.0], false),
|
||||
([5005.0, 0.01], [700.0, 0.0], true),
|
||||
] {
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, json!([[0, 0], [5, 0], end]), false);
|
||||
let r = s.execute("trim", &json!({ "handle": p.hex(), "pick": pick }));
|
||||
assert_eq!((r.is_ok(), polys(&s)[0].2.len()), if cuts { (true, 2) } else { (false, 3) }, "{end:?}");
|
||||
}
|
||||
// Two arcs of one circle, or a line and an arc on from it, cut where they meet.
|
||||
let q = 0.41421356237309503;
|
||||
let (s, p) = trimmed(json!([{ "p": [0, 0], "bulge": -q }, { "p": [5, 5], "bulge": -q }, [10, 0]]), false, None, false, [8.5355339, 3.5355339]);
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, -q), (5.0, 5.0, 0.0)])]);
|
||||
let (s, p) = trimmed(json!([[0, 0], { "p": [5, 0], "bulge": q }, [10, 5]]), false, None, false, [8.5355339, 1.4644661]);
|
||||
expect(&s, p, &[(true, false, &[(0.0, 0.0, 0.0), (5.0, 0.0, 0.0)])]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_polyline_of_thousands_of_segments_is_cut_where_it_crosses_itself() {
|
||||
// 3,003 segments, the last crossing the first at (50, 0): the pick on the first takes it from
|
||||
// there to the vertex (100, 0), as with a few segments.
|
||||
let mut v = vec![json!([0, 0]), json!([100, 0]), json!([100, 20])];
|
||||
v.extend((1..=3000).map(|i| json!([100.0 - f64::from(i) / 60.0, 20.0 + f64::from(i % 2)])));
|
||||
v.push(json!([50, -10]));
|
||||
let (s, p) = trimmed(json!(v), false, None, false, [75.0, 0.0]);
|
||||
let got = polys(&s);
|
||||
assert_eq!(got.len(), 2, "{:?}", got.iter().map(|g| g.2.len()).collect::<Vec<_>>());
|
||||
assert!(got[0].0 == p && same(&got[0].2, &[(0.0, 0.0, 0.0), (50.0, 0.0, 0.0)]), "{:?}", got[0]);
|
||||
assert_eq!((got[1].2.len(), got[1].2.first().copied()), (3003, Some((100.0, 0.0, 0.0))));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_polyline_too_long_to_search_for_its_own_crossings_is_left_as_it_was() {
|
||||
// 4,100 segments in line: the run picked times those near it is past the bound searched. 300
|
||||
// segments in line over the same stretch, back and forth, crossed by 300 more: 90,000
|
||||
// crossings, past the bound kept. The trim is refused, and Quick mode doesn't erase the
|
||||
// polyline as one no edge crosses.
|
||||
let mut back_and_forth: Vec<[f64; 2]> = (0..=300).map(|i| [if i % 2 == 0 { 0.0 } else { 10.0 }, 0.0]).collect();
|
||||
back_and_forth.extend((0..300).map(|i| [0.5 + f64::from(i) * 0.03, if i % 2 == 0 { 5.0 } else { -5.0 }]));
|
||||
for (v, why) in [(json!((0..=4100).map(|i| [i, 0]).collect::<Vec<_>>()), "Too many segments"), (json!(back_and_forth), "Too many crossings")] {
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, v, false);
|
||||
let before = polys(&s);
|
||||
let r = s.execute("trim", &json!({ "handle": p.hex(), "pick": [0.2, 0], "mode": "quick" }));
|
||||
assert!(r.is_err_and(|e| e.to_string().contains(why)), "{why}");
|
||||
assert_eq!(polys(&s), before);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_piece_whose_ends_only_come_near_stays_open_far_from_the_origin() {
|
||||
// 1e9 out, as survey coordinates in millimetres are: the piece left runs from the line's cut
|
||||
// to the polyline's end, 0.58 away, and stays open.
|
||||
let o = 1e9;
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, json!([[o + 2.3, 3.3], [o + 5.3, 8.0], [o + 8.5, 4.4], [o + 8.8, 7.8], [o + 7.4, 6.5]]), false);
|
||||
line(&mut s, [o + 6.9, 5.0], [o + 6.9, 7.0]);
|
||||
trim(&mut s, p, [o + 6.1, 7.1], None);
|
||||
let got = polys(&s);
|
||||
assert_eq!(got.len(), 2, "{got:?}");
|
||||
let (h, closed, vs) = &got[1];
|
||||
assert!(*h != p && !closed && vs.len() == 4, "{got:?}");
|
||||
let last = vs[3];
|
||||
assert!((last.0 - (o + 7.4)).abs() < 1e-6 && (last.1 - 6.5).abs() < 1e-6, "{last:?}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_polyline_is_cut_where_a_vertex_of_it_touches_it() {
|
||||
// The vertex (6, 6) lies on the first segment, which is cut there.
|
||||
let v = json!([[0, 0], [10, 10], [12, 4], [6, 6], [4, 12]]);
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, v.clone(), false);
|
||||
trim(&mut s, p, [3.0, 3.0], None);
|
||||
expect(&s, p, &[(true, false, &[(6.0, 6.0, 0.0), (10.0, 10.0, 0.0), (12.0, 4.0, 0.0), (6.0, 6.0, 0.0), (4.0, 12.0, 0.0)])]);
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, v, false);
|
||||
trim(&mut s, p, [8.0, 8.0], None);
|
||||
expect(
|
||||
&s,
|
||||
p,
|
||||
&[
|
||||
(true, false, &[(0.0, 0.0, 0.0), (6.0, 6.0, 0.0)]),
|
||||
(false, false, &[(10.0, 10.0, 0.0), (12.0, 4.0, 0.0), (6.0, 6.0, 0.0), (4.0, 12.0, 0.0)]),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_long_run_in_line_on_a_large_polyline_is_cut_where_it_is_crossed() {
|
||||
// 1,000 segments in line along y = 0, then 20,002 more, the last crossing the run at x = 500.25:
|
||||
// only the few segments near the run are searched, and the pick takes it from the crossing to
|
||||
// the corner (1000, 0).
|
||||
let mut v: Vec<Value> = (0..=1000).map(|i| json!([i, 0])).collect();
|
||||
v.push(json!([1000, 200]));
|
||||
v.extend((1..=20000).map(|i| json!([1000.0 - f64::from(i) * 499.75 / 20000.0, 200.0 + f64::from(i % 2)])));
|
||||
v.push(json!([500.25, -10]));
|
||||
let (s, p) = trimmed(json!(v), false, None, false, [999.5, 0.0]);
|
||||
let got = polys(&s);
|
||||
assert_eq!(got.len(), 2, "{:?}", got.iter().map(|g| g.2.len()).collect::<Vec<_>>());
|
||||
assert!(got[0].0 == p && got[0].2.len() == 502 && got[0].2.last() == Some(&(500.25, 0.0, 0.0)), "{:?}", got[0].2.last());
|
||||
assert_eq!((got[1].2.first().copied(), got[1].2.last().copied()), (Some((1000.0, 0.0, 0.0)), Some((500.25, -10.0, 0.0))));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_crossing_window_whose_nearest_point_is_a_vertex_trims_the_segment_it_ends() {
|
||||
// The window's first corner is nearest the vertex (10, 0), a cut of the polyline: the segment
|
||||
// before it goes, either way round the window, as in AutoCAD.
|
||||
for (a, b) in [([10.5, -0.5], [8.0, 2.0]), ([8.0, 2.0], [10.5, -0.5])] {
|
||||
let mut s = Session::new();
|
||||
let p = pline(&mut s, json!([[0, 0], [10, 0], [10, 10]]), false);
|
||||
s.execute("trim", &json!({ "crossing": [a, b], "mode": "standard" })).unwrap();
|
||||
expect(&s, p, &[(true, false, &[(10.0, 0.0, 0.0), (10.0, 10.0, 0.0)])]);
|
||||
}
|
||||
}
|
||||
@@ -1,128 +0,0 @@
|
||||
//! BREAKATPOINT at the command line and from a script, with AutoCAD 2024's prompts ("Select
|
||||
//! object:", then "Specify break point:"); BREAK and BREAKATPOINT end the command when a circle
|
||||
//! can't be broken at one point, and refuse an object on a locked layer when it is picked. Measured
|
||||
//! in AutoCAD 2024 (accoreconsole) on these drawings.
|
||||
|
||||
use cadcraft_engine::Session;
|
||||
use cadcraft_engine::doc::{EntityKind, Handle};
|
||||
use serde_json::{Value, json};
|
||||
|
||||
fn handle(v: &Value) -> Handle {
|
||||
Handle::parse_hex(v.get("handle").unwrap_or(&v["handles"][0]).as_str().unwrap()).unwrap()
|
||||
}
|
||||
|
||||
/// The model space objects in order: handle and kind.
|
||||
fn objects(s: &Session) -> Vec<(Handle, EntityKind)> {
|
||||
s.doc().unwrap().model.iter().map(|e| (e.handle, e.kind.clone())).collect()
|
||||
}
|
||||
|
||||
fn line_ends(k: &EntityKind) -> ((f64, f64), (f64, f64)) {
|
||||
let EntityKind::Line(l) = k else { panic!("not a line: {k:?}") };
|
||||
((l.a.x, l.a.y), (l.b.x, l.b.y))
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn breakatpoint_asks_for_the_object_then_the_point_and_splits_the_line_there() {
|
||||
let mut s = Session::new();
|
||||
let l = handle(&s.execute("line", &json!({ "points": [[1000, 0], [1010, 0]] })).unwrap());
|
||||
s.cmdline("BREAKATPOINT").unwrap();
|
||||
assert!(s.prompt_text().ends_with("Select object:"), "{}", s.prompt_text());
|
||||
s.cmdline("1002,0").unwrap();
|
||||
assert!(s.prompt_text().ends_with("Specify break point:"), "{}", s.prompt_text());
|
||||
// Off the line: the point projects onto it.
|
||||
s.cmdline("1005,3").unwrap();
|
||||
assert!(s.running.is_none(), "{}", s.prompt_text());
|
||||
let objs = objects(&s);
|
||||
assert_eq!(objs.len(), 2);
|
||||
assert_eq!(objs[0].0, l);
|
||||
assert_eq!(line_ends(&objs[0].1), ((1000.0, 0.0), (1005.0, 0.0)));
|
||||
assert_eq!(line_ends(&objs[1].1), ((1005.0, 0.0), (1010.0, 0.0)));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn breakatpoint_from_a_script_splits_an_arc_and_a_closed_polyline() {
|
||||
let mut s = Session::new();
|
||||
let a = handle(&s.execute("arc", &json!({ "center": [700, 0], "radius": 10, "start": 0, "end": 90 })).unwrap());
|
||||
let p = handle(&s.execute("pline", &json!({ "vertices": [[250, 0], [270, 0], [270, 20], [250, 20]], "closed": true })).unwrap());
|
||||
s.script("BREAKATPOINT 707.0710678,7.0710678 707.0710678,7.0710678\nBREAKATPOINT 260,0 260,0\n").unwrap();
|
||||
assert!(s.running.is_none(), "{}", s.prompt_text());
|
||||
let objs = objects(&s);
|
||||
assert_eq!(objs.iter().map(|o| o.0).take(2).collect::<Vec<_>>(), [a, p]);
|
||||
let EntityKind::Arc(arc) = &objs[0].1 else { panic!("not an arc") };
|
||||
assert!((arc.start - 0.0).abs() < 1e-9 && (arc.end.to_degrees() - 45.0).abs() < 1e-6, "{arc:?}");
|
||||
let EntityKind::Arc(rest) = &objs[2].1 else { panic!("not an arc") };
|
||||
assert!((rest.start.to_degrees() - 45.0).abs() < 1e-6 && (rest.end.to_degrees() - 90.0).abs() < 1e-9, "{rest:?}");
|
||||
let pts = |k: &EntityKind| match k {
|
||||
EntityKind::LwPolyline(l) => (l.closed, l.vertices.iter().map(|v| (v.p.x, v.p.y)).collect::<Vec<_>>()),
|
||||
k => panic!("not a polyline: {k:?}"),
|
||||
};
|
||||
assert_eq!(pts(&objs[1].1), (false, vec![(250.0, 0.0), (260.0, 0.0)]));
|
||||
assert_eq!(pts(&objs[3].1), (false, vec![(260.0, 0.0), (270.0, 0.0), (270.0, 20.0), (250.0, 20.0), (250.0, 0.0)]));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn breakatpoint_and_break_at_one_point_of_a_circle_report_it_and_end() {
|
||||
for script in ["BREAKATPOINT 1300,10 1300,10\n", "BREAK 1300,10 1300,10\n"] {
|
||||
let mut s = Session::new();
|
||||
let c = handle(&s.execute("circle", &json!({ "center": [1300, 0], "radius": 10 })).unwrap());
|
||||
s.script(script).unwrap();
|
||||
assert!(s.running.is_none(), "{script}: {}", s.prompt_text());
|
||||
assert!(s.log.iter().any(|l| l == "Arc cannot be full 360 degrees"), "{script}: {:?}", s.log);
|
||||
let objs = objects(&s);
|
||||
assert_eq!(objs.len(), 1);
|
||||
assert!(objs[0].0 == c && matches!(objs[0].1, EntityKind::Circle(_)), "{objs:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn enter_ends_breakatpoint_and_leaves_nothing_selected() {
|
||||
let mut s = Session::new();
|
||||
s.execute("line", &json!({ "points": [[0, 0], [10, 0]] })).unwrap();
|
||||
s.script("BREAKATPOINT\n\n").unwrap();
|
||||
assert!(s.running.is_none(), "{}", s.prompt_text());
|
||||
// Enter at the break point after picking: the line is not left selected.
|
||||
s.script("BREAKATPOINT 5,0\n\n").unwrap();
|
||||
assert!(s.running.is_none(), "{}", s.prompt_text());
|
||||
assert!(s.selection().is_empty());
|
||||
assert_eq!(objects(&s).len(), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn an_object_on_a_locked_layer_is_refused_when_picked() {
|
||||
let mut s = Session::new();
|
||||
s.execute("line", &json!({ "points": [[0, 0], [10, 0]] })).unwrap();
|
||||
s.execute("layer.set", &json!({ "name": "0", "locked": true })).unwrap();
|
||||
for cmd in ["BREAKATPOINT", "BREAK"] {
|
||||
s.cmdline(cmd).unwrap();
|
||||
s.cmdline("5,0").unwrap();
|
||||
assert!(s.prompt_text().ends_with("Select object:"), "{cmd}: {}", s.prompt_text());
|
||||
assert!(s.log.iter().any(|l| l == "The object is on a locked layer."), "{cmd}: {:?}", s.log);
|
||||
s.cmdline("").unwrap();
|
||||
assert!(s.running.is_none(), "{cmd}: {}", s.prompt_text());
|
||||
}
|
||||
assert_eq!(objects(&s).len(), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn breakatpoint_from_lisp_with_a_bare_entity_name() {
|
||||
let mut s = Session::new();
|
||||
let l = handle(&s.execute("line", &json!({ "points": [[1000, 0], [1010, 0]] })).unwrap());
|
||||
s.cmdline("(command \"_.BREAKATPOINT\" (entlast) '(1004.0 0.0))").unwrap();
|
||||
assert!(s.running.is_none(), "{}", s.prompt_text());
|
||||
let objs = objects(&s);
|
||||
assert_eq!(objs.len(), 2);
|
||||
assert_eq!(objs[0].0, l);
|
||||
assert_eq!(line_ends(&objs[0].1), ((1000.0, 0.0), (1004.0, 0.0)));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn breakatpoint_from_lisp_with_an_entity_and_point() {
|
||||
let mut s = Session::new();
|
||||
let l = handle(&s.execute("line", &json!({ "points": [[1000, 0], [1010, 0]] })).unwrap());
|
||||
s.cmdline("(command \"_.BREAKATPOINT\" (list (entlast) '(1005.0 0.0)) '(1005.0 0.0))").unwrap();
|
||||
assert!(s.running.is_none(), "{}", s.prompt_text());
|
||||
let objs = objects(&s);
|
||||
assert_eq!(objs.len(), 2);
|
||||
assert_eq!(objs[0].0, l);
|
||||
assert_eq!(line_ends(&objs[0].1), ((1000.0, 0.0), (1005.0, 0.0)));
|
||||
}
|
||||
@@ -1,187 +0,0 @@
|
||||
//! Which end of an open polyline EXTEND runs on, as AutoCAD 2024 chooses it (measured with
|
||||
//! accoreconsole on these drawings): the end on the pick's side of the polyline's middle parameter.
|
||||
//! The pick's parameter is the segment it is nearest, counted from 0, plus how far along that
|
||||
//! segment it is; from half the number of segments on, the last end extends, below it the first.
|
||||
//! Neither the end vertex nearer the pick nor the length along the polyline decides.
|
||||
|
||||
use cadcraft_engine::Session;
|
||||
use cadcraft_engine::doc::{EntityKind, Handle};
|
||||
use serde_json::{Value, json};
|
||||
|
||||
type Vertex = (f64, f64, f64);
|
||||
|
||||
fn handle(v: &Value) -> String {
|
||||
v.get("handle").unwrap_or(&v["handles"][0]).as_str().unwrap().to_owned()
|
||||
}
|
||||
|
||||
/// The open polyline `vertices` with lines `edges`, extended at `pick` to the lines; its vertices
|
||||
/// with their bulges.
|
||||
fn extended(vertices: &[Vertex], edges: &[([f64; 2], [f64; 2])], pick: [f64; 2]) -> Vec<Vertex> {
|
||||
let mut s = Session::new();
|
||||
let vs: Vec<Value> = vertices.iter().map(|(x, y, b)| json!({ "p": [x, y], "bulge": b })).collect();
|
||||
let p = handle(&s.execute("pline", &json!({ "vertices": vs, "closed": false })).unwrap());
|
||||
let es: Vec<String> = edges.iter().map(|(a, b)| handle(&s.execute("line", &json!({ "points": [a, b] })).unwrap())).collect();
|
||||
s.execute("extend", &json!({ "handle": p, "pick": pick, "edges": es })).unwrap();
|
||||
match &s.doc().unwrap().entity(Handle::parse_hex(&p).unwrap()).unwrap().kind {
|
||||
EntityKind::LwPolyline(l) => l.vertices.iter().map(|v| (v.p.x, v.p.y, v.bulge)).collect(),
|
||||
k => panic!("{k:?}"),
|
||||
}
|
||||
}
|
||||
|
||||
fn same(got: &[Vertex], want: &[Vertex]) -> bool {
|
||||
got.len() == want.len() && got.iter().zip(want).all(|(g, w)| (g.0 - w.0).abs() < 1e-6 && (g.1 - w.1).abs() < 1e-6 && (g.2 - w.2).abs() < 1e-6)
|
||||
}
|
||||
|
||||
/// Vertical lines through x = `xs`, from `y0` to `y1`.
|
||||
fn at(xs: &[f64], y0: f64, y1: f64) -> Vec<([f64; 2], [f64; 2])> {
|
||||
xs.iter().map(|x| ([*x, y0], [*x, y1])).collect()
|
||||
}
|
||||
|
||||
fn flat(pts: &[(f64, f64)]) -> Vec<Vertex> {
|
||||
pts.iter().map(|(x, y)| (*x, *y, 0.0)).collect()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_end_on_the_picks_side_of_the_middle_parameter_extends() {
|
||||
// (name, vertices, edges, pick, the vertices AutoCAD leaves). Lines at both ends, so either
|
||||
// end could extend.
|
||||
let cases: Vec<(&str, Vec<Vertex>, Vec<([f64; 2], [f64; 2])>, [f64; 2], Vec<(f64, f64)>)> = vec![
|
||||
// 1.2 of 3 segments: the first end, though the pick is on a vertex of the middle one.
|
||||
(
|
||||
"1.2 of 3",
|
||||
flat(&[(0.0, 160.0), (10.0, 160.0), (10.0, 165.0), (20.0, 165.0)]),
|
||||
at(&[-5.0, 25.0], 155.0, 170.0),
|
||||
[10.0, 161.0],
|
||||
vec![(-5.0, 160.0), (10.0, 160.0), (10.0, 165.0), (20.0, 165.0)],
|
||||
),
|
||||
// 0.8: the first end, though the last vertex is nearer the pick.
|
||||
(
|
||||
"0.8, last vertex nearer",
|
||||
flat(&[(0.0, 220.0), (20.0, 220.0), (20.0, 230.0), (15.0, 221.0)]),
|
||||
vec![([-5.0, 215.0], [-5.0, 235.0]), ([0.0, 210.0], [30.0, 210.0])],
|
||||
[16.0, 220.0],
|
||||
vec![(-5.0, 220.0), (20.0, 220.0), (20.0, 230.0), (15.0, 221.0)],
|
||||
),
|
||||
(
|
||||
"0.2",
|
||||
flat(&[(0.0, 240.0), (20.0, 240.0), (20.0, 250.0), (5.0, 241.0)]),
|
||||
vec![([-5.0, 235.0], [-5.0, 255.0]), ([-10.0, 230.0], [30.0, 230.0])],
|
||||
[4.0, 240.0],
|
||||
vec![(-5.0, 240.0), (20.0, 240.0), (20.0, 250.0), (5.0, 241.0)],
|
||||
),
|
||||
(
|
||||
"1.9",
|
||||
flat(&[(0.0, 260.0), (2.0, 260.0), (2.0, 280.0), (4.0, 280.0)]),
|
||||
at(&[-5.0, 10.0], 255.0, 285.0),
|
||||
[2.0, 278.0],
|
||||
vec![(0.0, 260.0), (2.0, 260.0), (2.0, 280.0), (10.0, 280.0)],
|
||||
),
|
||||
// 0.9: the first end, though 18 of the 22 units along is nearer the last.
|
||||
(
|
||||
"0.9, length nearer the last",
|
||||
flat(&[(0.0, 300.0), (20.0, 300.0), (20.0, 301.0), (21.0, 301.0)]),
|
||||
at(&[-5.0, 25.0], 295.0, 305.0),
|
||||
[18.0, 300.0],
|
||||
vec![(-5.0, 300.0), (20.0, 300.0), (20.0, 301.0), (21.0, 301.0)],
|
||||
),
|
||||
(
|
||||
"1.1",
|
||||
flat(&[(0.0, 320.0), (2.0, 320.0), (2.0, 340.0), (4.0, 340.0)]),
|
||||
at(&[-5.0, 10.0], 315.0, 345.0),
|
||||
[2.0, 322.0],
|
||||
vec![(-5.0, 320.0), (2.0, 320.0), (2.0, 340.0), (4.0, 340.0)],
|
||||
),
|
||||
(
|
||||
"1.25",
|
||||
flat(&[(0.0, 400.0), (30.0, 400.0), (30.0, 420.0), (31.0, 420.0)]),
|
||||
at(&[-5.0, 40.0], 395.0, 425.0),
|
||||
[30.0, 405.0],
|
||||
vec![(-5.0, 400.0), (30.0, 400.0), (30.0, 420.0), (31.0, 420.0)],
|
||||
),
|
||||
(
|
||||
"1.75",
|
||||
flat(&[(0.0, 440.0), (1.0, 440.0), (1.0, 460.0), (31.0, 460.0)]),
|
||||
at(&[-5.0, 40.0], 435.0, 465.0),
|
||||
[1.0, 455.0],
|
||||
vec![(0.0, 440.0), (1.0, 440.0), (1.0, 460.0), (40.0, 460.0)],
|
||||
),
|
||||
("0.6 of 1", flat(&[(0.0, 480.0), (20.0, 480.0)]), at(&[-5.0, 25.0], 475.0, 485.0), [12.0, 480.0], vec![(0.0, 480.0), (25.0, 480.0)]),
|
||||
// 1.8 of 4, the end of the segment picked: the first end.
|
||||
(
|
||||
"1.8 of 4",
|
||||
flat(&[(0.0, 500.0), (10.0, 500.0), (10.0, 510.0), (20.0, 510.0), (20.0, 520.0)]),
|
||||
vec![([-5.0, 495.0], [-5.0, 525.0]), ([15.0, 530.0], [25.0, 530.0])],
|
||||
[10.0, 508.0],
|
||||
vec![(-5.0, 500.0), (10.0, 500.0), (10.0, 510.0), (20.0, 510.0), (20.0, 520.0)],
|
||||
),
|
||||
(
|
||||
"2.8 of 4",
|
||||
flat(&[(0.0, 540.0), (10.0, 540.0), (10.0, 550.0), (20.0, 550.0), (20.0, 560.0)]),
|
||||
vec![([-5.0, 535.0], [-5.0, 565.0]), ([15.0, 570.0], [25.0, 570.0])],
|
||||
[18.0, 550.0],
|
||||
vec![(0.0, 540.0), (10.0, 540.0), (10.0, 550.0), (20.0, 550.0), (20.0, 570.0)],
|
||||
),
|
||||
// Right on the middle parameter, 1.5 of 3: the last end.
|
||||
(
|
||||
"1.5 of 3",
|
||||
flat(&[(0.0, 600.0), (10.0, 600.0), (10.0, 610.0), (20.0, 610.0)]),
|
||||
at(&[-5.0, 25.0], 595.0, 615.0),
|
||||
[10.0, 605.0],
|
||||
vec![(0.0, 600.0), (10.0, 600.0), (10.0, 610.0), (25.0, 610.0)],
|
||||
),
|
||||
];
|
||||
for (name, vertices, edges, pick, want) in cases {
|
||||
let got = extended(&vertices, &edges, pick);
|
||||
assert!(same(&got, &flat(&want)), "{name}: {got:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_parameter_runs_along_an_arc_segment_too() {
|
||||
// The middle segment an arc of bulge -18, swinging round to within 2 of the first vertex:
|
||||
// picked 60% along it (1.6 of 3), 3.6 from the first vertex and 18.3 from the last, the last
|
||||
// end extends.
|
||||
let got = extended(
|
||||
&[(0.0, 0.0, 0.0), (10.0, 0.0, -18.0), (10.0, 1.0, 0.0), (20.0, 1.0, 0.0)],
|
||||
&at(&[-5.0, 25.0], -10.0, 10.0),
|
||||
[1.804081304825758, 3.0714821777453793],
|
||||
);
|
||||
assert!(same(&got, &[(0.0, 0.0, 0.0), (10.0, 0.0, -18.0), (10.0, 1.0, 0.0), (25.0, 1.0, 0.0)]), "{got:?}");
|
||||
// The end segment an arc of bulge -0.5: picked on it (1.6 of 2) the last end runs on round
|
||||
// its circle to x = 14.3; the same polyline turned round, picked on its first segment (0.4),
|
||||
// the first end does.
|
||||
let got = extended(&[(0.0, 40.0, 0.0), (10.0, 40.0, -0.5), (14.0, 40.0, 0.0)], &at(&[14.3], 30.0, 50.0), [12.0, 41.0]);
|
||||
assert!(same(&got, &[(0.0, 40.0, 0.0), (10.0, 40.0, -0.5776771824075506), (14.3, 39.47979589711327, 0.0)]), "{got:?}");
|
||||
let got = extended(&[(0.0, 60.0, -0.5), (4.0, 60.0, 0.0), (14.0, 60.0, 0.0)], &at(&[-0.3], 50.0, 70.0), [2.0, 61.0]);
|
||||
assert!(same(&got, &[(-0.3, 59.47979589711327, -0.5776771824075504), (4.0, 60.0, 0.0), (14.0, 60.0, 0.0)]), "{got:?}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_repeated_vertex_counts_as_a_segment() {
|
||||
// (10, 0) twice: three segments, the middle one of no length. Picked on (10, 0), the end of
|
||||
// the first, 1.0 of 3: the first end extends (counting two segments it would be the last).
|
||||
// Picked 1 up the last segment, 2.1 of 3: the last end.
|
||||
let vs = flat(&[(0.0, 0.0), (10.0, 0.0), (10.0, 0.0), (10.0, 10.0)]);
|
||||
let edges = vec![([-5.0, -10.0], [-5.0, 10.0]), ([-10.0, 15.0], [20.0, 15.0])];
|
||||
let got = extended(&vs, &edges, [10.0, 0.0]);
|
||||
assert!(same(&got, &flat(&[(-5.0, 0.0), (10.0, 0.0), (10.0, 0.0), (10.0, 10.0)])), "{got:?}");
|
||||
let got = extended(&vs, &edges, [10.0, 1.0]);
|
||||
assert!(same(&got, &flat(&[(0.0, 0.0), (10.0, 0.0), (10.0, 0.0), (10.0, 15.0)])), "{got:?}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_pick_a_hair_outside_an_arc_end_counts_as_that_end() {
|
||||
// A single semicircle from (1, 0) to (-1, 0). Picked 1e-13 outside its sweep at the first
|
||||
// vertex, the pick is on the arc's start, not round the circle at its end: the first end runs
|
||||
// on to x = 0, three quarters of the way round.
|
||||
let b = 1.0 + 2f64.sqrt();
|
||||
let got = extended(&[(1.0, 0.0, 1.0), (-1.0, 0.0, 0.0)], &at(&[0.0], -2.0, -0.5), [1.0, -1e-13]);
|
||||
assert!(same(&got, &[(0.0, -1.0, b), (-1.0, 0.0, 0.0)]), "{got:?}");
|
||||
// A hair past its end is the last end.
|
||||
let got = extended(&[(1.0, 0.0, 1.0), (-1.0, 0.0, 0.0)], &at(&[0.0], -2.0, -0.5), [-1.0, -1e-13]);
|
||||
assert!(same(&got, &[(1.0, 0.0, b), (0.0, -1.0, 0.0)]), "{got:?}");
|
||||
// Turning clockwise, the arc's start angle is the polyline's last vertex: a hair outside it is
|
||||
// the last end.
|
||||
let got = extended(&[(1.0, 0.0, -1.0), (-1.0, 0.0, 0.0)], &at(&[0.0], 0.5, 2.0), [-1.0, 1e-13]);
|
||||
assert!(same(&got, &[(1.0, 0.0, -b), (0.0, 1.0, 0.0)]), "{got:?}");
|
||||
}
|
||||
@@ -17,12 +17,9 @@ mod block_keep;
|
||||
mod block_redefine;
|
||||
mod blockreplace;
|
||||
mod break_closed_polyline;
|
||||
mod break_ends_and_closing_side;
|
||||
mod break_join_locked_layers;
|
||||
mod break_keeps_z;
|
||||
mod break_trim_keep_handle;
|
||||
mod break_trim_polyline_rules;
|
||||
mod breakatpoint_command_line;
|
||||
mod burst;
|
||||
mod change_command;
|
||||
mod chprop_command;
|
||||
@@ -55,7 +52,6 @@ mod dynamic_block_data;
|
||||
mod dynamic_grips;
|
||||
mod explode_stretched;
|
||||
mod extend_polyline_arc_end;
|
||||
mod extend_polyline_end_choice;
|
||||
mod fillet_chamfer;
|
||||
mod fix_holds_grips;
|
||||
mod followups_626;
|
||||
@@ -174,11 +170,7 @@ mod text_left_justify;
|
||||
mod tolerance;
|
||||
mod transparent;
|
||||
mod trim_closed_polyline;
|
||||
mod trim_cut_at_the_pick;
|
||||
mod trim_cut_where_an_arc_span_starts;
|
||||
mod trim_extend_json_pick;
|
||||
mod trim_extend_options;
|
||||
mod trim_keeps_z_and_width;
|
||||
mod undo_count;
|
||||
mod undo_layout_tab;
|
||||
mod viewport_clip;
|
||||
|
||||
@@ -123,13 +123,11 @@ fn undo_restores_the_closed_polyline() {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_single_cut_leaves_the_outline_as_it_was() {
|
||||
// As AutoCAD 2024 does (measured with accoreconsole on a 100 x 10 rectangle cut once on its
|
||||
// bottom): it refuses, "Curve must intersect cutting edges at least twice."
|
||||
fn a_single_cut_still_opens_the_outline_there() {
|
||||
let mut s = Session::new();
|
||||
let p = handle(s.execute("pline", &json!({ "vertices": square(), "closed": true })).unwrap());
|
||||
let cutter = handle(s.execute("line", &json!({ "points": [[2, -1], [2, 1]] })).unwrap());
|
||||
let r = s.execute("trim", &json!({ "handle": p, "pick": [0, 2], "edges": [cutter] }));
|
||||
assert!(r.is_err_and(|e| e.to_string() == "Curve must intersect cutting edges at least twice."));
|
||||
assert_eq!(polys(&s), vec![(true, vec![(0.0, 0.0, 0.0), (4.0, 0.0, 0.0), (4.0, 4.0, 0.0), (0.0, 4.0, 0.0)])]);
|
||||
s.execute("trim", &json!({ "handle": p, "pick": [0, 2], "edges": [cutter] })).unwrap();
|
||||
let all = [(2.0, 0.0, 0.0), (4.0, 0.0, 0.0), (4.0, 4.0, 0.0), (0.0, 4.0, 0.0), (0.0, 0.0, 0.0), (2.0, 0.0, 0.0)];
|
||||
assert_eq!(polys(&s), vec![(false, all.to_vec())]);
|
||||
}
|
||||
|
||||
@@ -1,171 +0,0 @@
|
||||
//! TRIM of a line, an arc or a circle picked on a cut, as AutoCAD 2024 does it (measured with
|
||||
//! accoreconsole on these drawings): a cut within 5e-7 of the pick, along the object, is passed
|
||||
//! over, and the piece runs on across it to the next cut either side. With no cut left, nothing is
|
||||
//! trimmed.
|
||||
|
||||
use cadcraft_engine::Session;
|
||||
use cadcraft_engine::doc::{EntityKind, Handle};
|
||||
use serde_json::{Value, json};
|
||||
|
||||
fn handle(v: &Value) -> Handle {
|
||||
Handle::parse_hex(v.get("handle").unwrap_or(&v["handles"][0]).as_str().unwrap()).unwrap()
|
||||
}
|
||||
|
||||
/// Vertical lines through x = `xs`, from y = -15 to 15; their handles.
|
||||
fn edges(s: &mut Session, xs: &[f64]) -> Vec<String> {
|
||||
xs.iter().map(|x| handle(&s.execute("line", &json!({ "points": [[x, -15], [x, 15]] })).unwrap()).hex()).collect()
|
||||
}
|
||||
|
||||
/// Every object but the edges: lines as their ends, arcs and circles as their angles in degrees.
|
||||
fn shapes(s: &Session, edges: &[String]) -> Vec<(Handle, Vec<f64>)> {
|
||||
let r = |v: f64| (v * 1e9).round() / 1e9;
|
||||
s.doc()
|
||||
.unwrap()
|
||||
.model
|
||||
.iter()
|
||||
.filter(|e| !edges.contains(&e.handle.hex()))
|
||||
.map(|e| {
|
||||
let v = match &e.kind {
|
||||
EntityKind::Line(l) => vec![l.a.x, l.a.y, l.b.x, l.b.y],
|
||||
EntityKind::Arc(a) => vec![a.start.to_degrees(), a.end.to_degrees()],
|
||||
EntityKind::Circle(_) => Vec::new(),
|
||||
k => panic!("{k:?}"),
|
||||
};
|
||||
(e.handle, v.into_iter().map(r).collect())
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// Trim `h` at `pick` with `edges`: whether the trim was made.
|
||||
fn trim(s: &mut Session, h: Handle, pick: [f64; 2], edges: &[String]) -> bool {
|
||||
s.execute("trim", &json!({ "handle": h.hex(), "pick": pick, "edges": edges })).is_ok()
|
||||
}
|
||||
|
||||
/// A line from (0, 0) to (10, 0) with vertical lines through `xs`, trimmed at `pick`.
|
||||
fn line_trimmed(xs: &[f64], pick: [f64; 2]) -> (bool, Vec<(Handle, Vec<f64>)>, Handle) {
|
||||
let mut s = Session::new();
|
||||
let h = handle(&s.execute("line", &json!({ "points": [[0, 0], [10, 0]] })).unwrap());
|
||||
let es = edges(&mut s, xs);
|
||||
let made = trim(&mut s, h, pick, &es);
|
||||
(made, shapes(&s, &es), h)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_line_picked_on_its_only_cut_is_left_as_it_was() {
|
||||
for pick in [[5.0, 0.0], [5.0000004, 0.0], [4.9999996, 0.0]] {
|
||||
let (made, got, h) = line_trimmed(&[5.0], pick);
|
||||
assert!(!made, "{pick:?}");
|
||||
assert_eq!(got, vec![(h, vec![0.0, 0.0, 10.0, 0.0])], "{pick:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_line_picked_on_one_of_two_cuts_loses_the_pieces_both_sides() {
|
||||
// Cuts at x = 3 and 7: on 3, 0 to 7 goes; 4e-7 past 7, 3 to the end; between them, 3 to 7.
|
||||
let (_, got, h) = line_trimmed(&[3.0, 7.0], [3.0, 0.0]);
|
||||
assert_eq!(got, vec![(h, vec![7.0, 0.0, 10.0, 0.0])]);
|
||||
let (_, got, h) = line_trimmed(&[3.0, 7.0], [7.0000004, 0.0]);
|
||||
assert_eq!(got, vec![(h, vec![0.0, 0.0, 3.0, 0.0])]);
|
||||
let (_, got, h) = line_trimmed(&[3.0, 7.0], [5.0, 0.0]);
|
||||
assert_eq!(got.len(), 2);
|
||||
assert_eq!(got[0], (h, vec![0.0, 0.0, 3.0, 0.0]));
|
||||
assert_eq!(got[1].1, vec![7.0, 0.0, 10.0, 0.0]);
|
||||
}
|
||||
|
||||
/// An arc of radius 10 about the origin from 0 to 180 degrees, with vertical lines through `xs`,
|
||||
/// trimmed at `pick`.
|
||||
fn arc_trimmed(xs: &[f64], pick: [f64; 2]) -> (bool, Vec<(Handle, Vec<f64>)>, Handle) {
|
||||
let mut s = Session::new();
|
||||
let h = handle(&s.execute("arc", &json!({ "center": [0, 0], "radius": 10, "start": 0, "end": 180 })).unwrap());
|
||||
let es = edges(&mut s, xs);
|
||||
let made = trim(&mut s, h, pick, &es);
|
||||
(made, shapes(&s, &es), h)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn an_arc_picked_on_its_only_cut_is_left_as_it_was() {
|
||||
// The line x = 0 cuts it at 90 degrees: on the cut and 4e-7 along from it nothing is trimmed,
|
||||
// 6e-7 along the arc from 90 to 180 goes.
|
||||
for pick in [[0.0, 10.0], [-4e-7, 10.0]] {
|
||||
let (made, got, h) = arc_trimmed(&[0.0], pick);
|
||||
assert!(!made, "{pick:?}");
|
||||
assert_eq!(got, vec![(h, vec![0.0, 180.0])], "{pick:?}");
|
||||
}
|
||||
let (_, got, h) = arc_trimmed(&[0.0], [-6e-7, 10.0]);
|
||||
assert_eq!(got, vec![(h, vec![0.0, 90.0])]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn an_arc_picked_on_its_last_cut_loses_the_rest() {
|
||||
// Cuts at 60 and 120 degrees, picked on 120: from 60 to the end goes.
|
||||
let (_, got, h) = arc_trimmed(&[5.0, -5.0], [-5.0, 75f64.sqrt()]);
|
||||
assert_eq!(got, vec![(h, vec![0.0, 60.0])]);
|
||||
}
|
||||
|
||||
/// A circle of radius 10 about the origin, with vertical lines through `xs`, trimmed at `pick`.
|
||||
fn circle_trimmed(xs: &[f64], pick: [f64; 2]) -> (bool, Vec<(Handle, Vec<f64>)>, Handle) {
|
||||
let mut s = Session::new();
|
||||
let h = handle(&s.execute("circle", &json!({ "center": [0, 0], "radius": 10 })).unwrap());
|
||||
let es = edges(&mut s, xs);
|
||||
let made = trim(&mut s, h, pick, &es);
|
||||
(made, shapes(&s, &es), h)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_circle_picked_on_a_cut_loses_the_arcs_both_sides() {
|
||||
// Lines at x = 5 and -5 cut it at 60, 120, 240 and 300 degrees. Picked on 60, and 4e-7 along
|
||||
// from it, the arc from 300 round to 120 goes; picked at 90, the arc from 60 to 120.
|
||||
let y = 75f64.sqrt();
|
||||
for pick in [[5.0, y], [4.9999998, y + 2e-7 * 5.0 / y]] {
|
||||
let (_, got, h) = circle_trimmed(&[5.0, -5.0], pick);
|
||||
assert_eq!(got, vec![(h, vec![120.0, 300.0])], "{pick:?}");
|
||||
}
|
||||
let (_, got, h) = circle_trimmed(&[5.0, -5.0], [0.0, 10.0]);
|
||||
assert_eq!(got, vec![(h, vec![120.0, 60.0])]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_circle_picked_on_one_of_two_cuts_is_left_as_it_was() {
|
||||
// One line, cutting it at 60 and 300 degrees: picked on 60, one cut is left and the trim is
|
||||
// refused.
|
||||
let (made, got, h) = circle_trimmed(&[5.0], [5.0, 75f64.sqrt()]);
|
||||
assert!(!made);
|
||||
assert_eq!(got, vec![(h, Vec::new())]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn quick_mode_leaves_an_object_picked_on_its_only_cut() {
|
||||
// The line, the arc and the circle each meet the edges, at the pick, so Quick mode doesn't
|
||||
// erase them as objects no edge crosses.
|
||||
let y = 75f64.sqrt();
|
||||
let cases = [
|
||||
("line", json!({ "points": [[0, 0], [10, 0]] }), 5.0, [5.0, 0.0]),
|
||||
("arc", json!({ "center": [0, 0], "radius": 10, "start": 0, "end": 180 }), 0.0, [0.0, 10.0]),
|
||||
("circle", json!({ "center": [0, 0], "radius": 10 }), 5.0, [5.0, y]),
|
||||
];
|
||||
for (cmd, shape, x, pick) in cases {
|
||||
let mut s = Session::new();
|
||||
let h = handle(&s.execute(cmd, &shape).unwrap());
|
||||
let es = edges(&mut s, &[x]);
|
||||
let r = s.execute("trim", &json!({ "handle": h.hex(), "pick": pick, "mode": "quick" }));
|
||||
assert!(r.is_err(), "{cmd}");
|
||||
assert!(s.doc().unwrap().entity(h).is_some(), "{cmd} was erased");
|
||||
assert_eq!(shapes(&s, &es).len(), 1, "{cmd}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn an_arc_picked_just_off_one_end_loses_the_piece_at_that_end() {
|
||||
// From 0 to 90 degrees, cut at 45: picked just before its start the piece from 0 goes, just
|
||||
// past its end the piece to 90.
|
||||
let x = 10.0 * std::f64::consts::FRAC_PI_4.cos();
|
||||
let trimmed = |pick: [f64; 2]| {
|
||||
let mut s = Session::new();
|
||||
let h = handle(&s.execute("arc", &json!({ "center": [0, 0], "radius": 10, "start": 0, "end": 90 })).unwrap());
|
||||
let es = edges(&mut s, &[x]);
|
||||
assert!(trim(&mut s, h, pick, &es));
|
||||
shapes(&s, &es)
|
||||
};
|
||||
assert_eq!(trimmed([10.0, -0.01])[0].1, vec![45.0, 90.0]);
|
||||
assert_eq!(trimmed([-0.01, 10.0])[0].1, vec![0.0, 45.0]);
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
//! TRIM on a polyline cut through the vertex where an arc span starts: the cut is at that vertex
|
||||
//! only. Where the crossing came out a hair before the arc's start angle it was also put at the
|
||||
//! arc's far end, round the circle, and TRIM took out the arc alone.
|
||||
|
||||
use cadcraft_engine::Session;
|
||||
use cadcraft_engine::doc::EntityKind;
|
||||
use serde_json::json;
|
||||
|
||||
fn handle(v: serde_json::Value) -> String {
|
||||
v.get("handle").unwrap_or(&v["handles"][0]).as_str().unwrap().to_owned()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_cut_is_at_the_arc_spans_start_vertex_only() {
|
||||
// (0, 0) to (10, 0), a semicircle round (15, 5) to (10, 10), then on to (0, 10). A line
|
||||
// through (10, 0) running up to the left crosses the top span at x = 10 + 10 cot(angle);
|
||||
// picked on the arc, the polyline goes from (10, 0) to there.
|
||||
for k in 0..172 {
|
||||
let th = (91.0 + f64::from(k) * 0.25).to_radians();
|
||||
let d = [th.cos() * 30.0, th.sin() * 30.0];
|
||||
let mut s = Session::new();
|
||||
let p = handle(s.execute("pline", &json!({ "vertices": [[0, 0], { "p": [10, 0], "bulge": 1 }, [10, 10], [0, 10]] })).unwrap());
|
||||
let e = handle(s.execute("line", &json!({ "points": [[10.0 - d[0], -d[1]], [10.0 + d[0], d[1]]] })).unwrap());
|
||||
s.execute("trim", &json!({ "handle": p, "pick": [15, 5], "edges": [e] })).unwrap();
|
||||
let pieces: Vec<Vec<(f64, f64)>> = s
|
||||
.doc()
|
||||
.unwrap()
|
||||
.model
|
||||
.iter()
|
||||
.filter_map(|e| match &e.kind {
|
||||
EntityKind::LwPolyline(l) => Some(l.vertices.iter().map(|v| (v.p.x, v.p.y)).collect()),
|
||||
_ => None,
|
||||
})
|
||||
.collect();
|
||||
let x = 10.0 + 10.0 / th.tan();
|
||||
let near = |a: (f64, f64), b: (f64, f64)| (a.0 - b.0).abs() < 1e-6 && (a.1 - b.1).abs() < 1e-6;
|
||||
let ok = pieces.len() == 2
|
||||
&& pieces.iter().any(|v| v.len() == 2 && near(v[0], (0.0, 0.0)) && near(v[1], (10.0, 0.0)))
|
||||
&& pieces.iter().any(|v| v.len() == 2 && near(v[0], (x, 10.0)) && near(v[1], (0.0, 10.0)));
|
||||
assert!(ok, "{:.2} degrees: {pieces:?}", th.to_degrees());
|
||||
}
|
||||
}
|
||||
@@ -1,177 +0,0 @@
|
||||
//! JSON execute pick roles and diagnostic-only refusals (#2750).
|
||||
|
||||
use cadcraft_doc::{Common, EntityKind, Handle, Line, Space};
|
||||
use cadcraft_engine::{Session, find_command};
|
||||
use cadcraft_geom::Vec3;
|
||||
use serde_json::{Value, json};
|
||||
|
||||
type TestResult<T = ()> = Result<T, Box<dyn std::error::Error>>;
|
||||
|
||||
fn fixture(end: f64, edge_x: f64) -> TestResult<(Session, Handle, Handle)> {
|
||||
let mut s = Session::new();
|
||||
let a = s.doc_mut()?.add(&Space::Model, Common::default(), EntityKind::Line(Line { a: Vec3::ZERO, b: Vec3::new(end, 0.0, 0.0) }))?;
|
||||
let b = s.doc_mut()?.add(
|
||||
&Space::Model,
|
||||
Common::default(),
|
||||
EntityKind::Line(Line { a: Vec3::new(edge_x, -20.0, 0.0), b: Vec3::new(edge_x, 20.0, 0.0) }),
|
||||
)?;
|
||||
Ok((s, a, b))
|
||||
}
|
||||
|
||||
fn assert_line(s: &Session, h: Handle, start: f64, end: f64) -> TestResult {
|
||||
let e = s.doc()?.entity(h).ok_or("line missing")?;
|
||||
let EntityKind::Line(l) = &e.kind else { return Err("expected line".into()) };
|
||||
assert_eq!((l.a, l.b), (Vec3::new(start, 0.0, 0.0), Vec3::new(end, 0.0, 0.0)));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn failure(s: &mut Session, cmd: &str, params: Value, message: &str) -> TestResult {
|
||||
let before = s.doc()?.clone();
|
||||
let selection = s.state()?.selection.clone();
|
||||
let error = s.execute(cmd, ¶ms).err().ok_or("expected refusal")?;
|
||||
assert_eq!(error.to_string(), message);
|
||||
assert_eq!(s.doc()?, &before, "a failed JSON call must leave the whole drawing unchanged");
|
||||
assert_eq!(s.state()?.selection, selection);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn trim_execute_pick_selects_the_portion_to_remove() -> TestResult {
|
||||
// Off-object picks that already succeed by projection remain accepted.
|
||||
for (pick, start, end) in [([5, 0], 25.0, 50.0), ([40, 0], 0.0, 25.0), ([5, 3], 25.0, 50.0)] {
|
||||
let (mut s, a, b) = fixture(50.0, 25.0)?;
|
||||
let boundary = s.doc()?.entity(b).cloned().ok_or("boundary missing")?;
|
||||
let result = s.execute("trim", &json!({"handle": a.hex(), "edges": [b.hex()], "pick": pick}))?;
|
||||
let handles = result["handles"].as_array().ok_or("expected handles")?;
|
||||
assert_eq!(handles.len(), 1);
|
||||
let h = handles.first().and_then(Value::as_str).and_then(Handle::parse_hex).ok_or("expected trimmed handle")?;
|
||||
assert_eq!(h, a, "TRIM keeps the original handle on the surviving piece");
|
||||
assert_line(&s, h, start, end)?;
|
||||
assert_eq!(s.doc()?.entity(b), Some(&boundary));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn extend_execute_pick_selects_the_end_toward_the_boundary() -> TestResult {
|
||||
for pick in [[25, 10], [25, -15], [19, 0], [40, 0]] {
|
||||
let (mut s, a, b) = fixture(20.0, 25.0)?;
|
||||
let boundary = s.doc()?.entity(b).cloned().ok_or("boundary missing")?;
|
||||
let result = s.execute("extend", &json!({"handle": a.hex(), "edges": [b.hex()], "pick": pick}))?;
|
||||
assert_eq!(result, Value::Null);
|
||||
assert_line(&s, a, 0.0, 25.0)?;
|
||||
assert_eq!(s.doc()?.entity(b), Some(&boundary));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn trim_execute_distinguishes_picks_at_or_projecting_onto_a_cut_from_no_cut() -> TestResult {
|
||||
let (mut s, a, b) = fixture(50.0, 25.0)?;
|
||||
for (pick, message) in [
|
||||
([25, 10], "The `pick` point is off the line and projects onto a cutting intersection; pick away from that intersection."),
|
||||
([25, 0], "The `pick` point is at a cutting intersection; pick a portion of the object away from that intersection."),
|
||||
] {
|
||||
failure(&mut s, "trim", json!({"handle": a.hex(), "edges": [b.hex()], "pick": pick, "mode": "standard"}), message)?;
|
||||
}
|
||||
let (mut s, a, b) = fixture(50.0, 75.0)?;
|
||||
failure(
|
||||
&mut s,
|
||||
"trim",
|
||||
json!({"handle": a.hex(), "edges": [b.hex()], "pick": [5, 0]}),
|
||||
"No usable cutting-edge intersection in the interior of the object to trim.",
|
||||
)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn extend_execute_distinguishes_the_wrong_end_from_no_boundary_hit() -> TestResult {
|
||||
let (mut s, a, b) = fixture(20.0, 25.0)?;
|
||||
failure(
|
||||
&mut s,
|
||||
"extend",
|
||||
json!({"handle": a.hex(), "edges": [b.hex()], "pick": [10, 0]}),
|
||||
"The `pick` point selects an end with no boundary ahead; choose `pick` toward the boundary to extend to.",
|
||||
)?;
|
||||
s.doc_mut()?.modify_entity(b, |e| {
|
||||
e.kind = EntityKind::Line(Line { a: Vec3::new(0.0, 20.0, 0.0), b: Vec3::new(25.0, 20.0, 0.0) });
|
||||
})?;
|
||||
failure(
|
||||
&mut s,
|
||||
"extend",
|
||||
json!({"handle": a.hex(), "edges": [b.hex()], "pick": [25, 20]}),
|
||||
"No usable boundary intersection was found for either end of the object to extend.",
|
||||
)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn quick_erasure_and_unrelated_errors_keep_their_behavior() -> TestResult {
|
||||
let (mut s, a, b) = fixture(50.0, 25.0)?;
|
||||
// Quick mode leaves a line picked on its only cut in place (#2648), and the JSON form explains
|
||||
// the refusal as Standard mode does.
|
||||
failure(
|
||||
&mut s,
|
||||
"trim",
|
||||
json!({"handle": a.hex(), "edges": [b.hex()], "pick": [25, 0], "mode": "quick"}),
|
||||
"The `pick` point is at a cutting intersection; pick a portion of the object away from that intersection.",
|
||||
)?;
|
||||
assert!(s.doc()?.entity(a).is_some());
|
||||
assert!(s.doc()?.entity(b).is_some());
|
||||
failure(&mut s, "trim", json!({"handle": "DEAD", "pick": [5, 0]}), "no such object")
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn command_contracts_and_missing_pick_errors_explain_the_roles() -> TestResult {
|
||||
let trim = find_command("trim").ok_or("trim not registered")?;
|
||||
assert!(trim.params.contains("pick selects the portion of that object to remove"));
|
||||
assert!(trim.params.contains("edges are the cutting edges"));
|
||||
let extend = find_command("extend").ok_or("extend not registered")?;
|
||||
assert!(extend.params.contains("pick points toward the boundary to extend to"));
|
||||
assert!(extend.params.contains("selecting the nearer end"));
|
||||
assert!(extend.params.contains("edges are the boundary edges"));
|
||||
let (mut s, a, b) = fixture(20.0, 25.0)?;
|
||||
failure(
|
||||
&mut s,
|
||||
"trim",
|
||||
json!({"handle": a.hex(), "edges": [b.hex()]}),
|
||||
"invalid parameters for `trim`: `pick` ([x, y]) is required: select the portion of the object to trim away",
|
||||
)?;
|
||||
failure(
|
||||
&mut s,
|
||||
"extend",
|
||||
json!({"handle": a.hex(), "edges": [b.hex()]}),
|
||||
"invalid parameters for `extend`: `pick` ([x, y]) is required: point toward the boundary to extend to, selecting the nearer end",
|
||||
)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_pick_on_the_line_far_from_the_origin_is_not_called_off_the_line() -> TestResult {
|
||||
// Survey coordinates: rounding there is far above 1e-9 (the pick below is 3.7e-9 off the line
|
||||
// after rounding), so a pick on the line still reads as on it.
|
||||
let (x0, y0, k) = (123_456_789.1, 9_876_543.3, 33.3333);
|
||||
let mut s = Session::new();
|
||||
let a = s.doc_mut()?.add(
|
||||
&Space::Model,
|
||||
Common::default(),
|
||||
EntityKind::Line(Line { a: Vec3::new(x0, y0, 0.0), b: Vec3::new(x0 + 50.0, y0 + 30.0, 0.0) }),
|
||||
)?;
|
||||
let b = s.doc_mut()?.add(
|
||||
&Space::Model,
|
||||
Common::default(),
|
||||
EntityKind::Line(Line { a: Vec3::new(x0 + k, y0 - 20.0, 0.0), b: Vec3::new(x0 + k, y0 + 50.0, 0.0) }),
|
||||
)?;
|
||||
failure(
|
||||
&mut s,
|
||||
"trim",
|
||||
json!({"handle": a.hex(), "edges": [b.hex()], "pick": [x0 + k, y0 + k * 0.6]}),
|
||||
"The `pick` point is at a cutting intersection; pick a portion of the object away from that intersection.",
|
||||
)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_extend_contract_names_the_polyline_end_rule() -> TestResult {
|
||||
// An open polyline extends the end on the pick's side of its middle parameter (#2693), not
|
||||
// the nearer end.
|
||||
let extend = find_command("extend").ok_or("extend not registered")?;
|
||||
assert!(extend.params.contains("middle"), "{}", extend.params);
|
||||
Ok(())
|
||||
}
|
||||
@@ -112,33 +112,10 @@ fn crossing_window_trims_what_it_touches() {
|
||||
s.script("TRIM C 4,-1 6,1\n\n").unwrap();
|
||||
assert!(s.running.is_none(), "{}", s.prompt_text());
|
||||
assert_eq!(lines(&s), with_edges(&[((-5.0, 0.0), (0.0, 0.0)), ((-5.0, 2.0), (15.0, 2.0)), ((10.0, 0.0), (15.0, 0.0))]));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_pick_in_empty_space_starts_a_fence_in_quick_mode_and_a_window_in_standard_mode() {
|
||||
// #1594: Quick mode's two-point fence trims what it crosses and returns to the first prompt.
|
||||
for cmd in ["TRIM", "EXTEND"] {
|
||||
let mut s = ladder();
|
||||
s.cmdline(cmd).unwrap();
|
||||
s.cmdline("4,-4").unwrap();
|
||||
assert!(s.prompt_text().contains("Specify next fence point"), "{cmd}: {}", s.prompt_text());
|
||||
}
|
||||
// A pick in empty space opens a crossing window too.
|
||||
let mut s = ladder();
|
||||
s.script("TRIM 4,-4 6,1\n").unwrap();
|
||||
assert!(s.prompt_text().contains("Select object to trim"), "{}", s.prompt_text());
|
||||
s.cmdline("").unwrap();
|
||||
s.script("TRIM 4,-4 6,1\n\n").unwrap();
|
||||
assert_eq!(lines(&s), with_edges(&[((-5.0, 0.0), (0.0, 0.0)), ((-5.0, 2.0), (15.0, 2.0)), ((10.0, 0.0), (15.0, 0.0))]));
|
||||
// EXTEND's fence extends both lines it crosses to the boundary at x = 10.
|
||||
let mut s = session(&["10,-5 10,5", "0,0 4,0", "0,2 4,2"]);
|
||||
s.script("EXTEND 3,-1 3,3\n").unwrap();
|
||||
assert!(s.prompt_text().contains("Select object to extend"), "{}", s.prompt_text());
|
||||
s.cmdline("").unwrap();
|
||||
assert!(s.running.is_none(), "{}", s.prompt_text());
|
||||
assert_eq!(lines(&s), vec![((0.0, 0.0), (10.0, 0.0)), ((0.0, 2.0), (10.0, 2.0)), ((10.0, -5.0), (10.0, 5.0))]);
|
||||
// Standard mode keeps the crossing window.
|
||||
let mut s = ladder();
|
||||
s.script("TRIM O S\n\n4,-4\n").unwrap();
|
||||
assert!(s.prompt_text().contains("Specify opposite corner"), "{}", s.prompt_text());
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -1,102 +0,0 @@
|
||||
//! TRIM keeps what the object has beyond its outline, as BREAK does: a line's Z, an arc's centre
|
||||
//! Z (a circle trimmed into an arc), a polyline's elevation, and a polyline's constant width on
|
||||
//! every piece. The Z cases and the width on BREAK were measured in AutoCAD 2024 (accoreconsole)
|
||||
//! on these drawings.
|
||||
|
||||
use cadcraft_engine::Session;
|
||||
use cadcraft_engine::doc::{Circle, Common, Entity, EntityKind, Handle, Line, LwPolyline};
|
||||
use cadcraft_engine::geom::{PolyVertex, Vec2, Vec3};
|
||||
use serde_json::json;
|
||||
|
||||
fn add(s: &mut Session, kind: EntityKind, thickness: f64) -> Handle {
|
||||
let space = s.space();
|
||||
let d = s.doc_mut().unwrap();
|
||||
let handle = d.new_handle();
|
||||
d.space_mut(&space).unwrap().push(Entity { handle, common: Common { thickness, ..Common::default() }, kind });
|
||||
handle
|
||||
}
|
||||
|
||||
fn line(s: &mut Session, a: [f64; 2], b: [f64; 2]) -> Handle {
|
||||
let v = s.execute("line", &json!({ "points": [a, b] })).unwrap();
|
||||
Handle::parse_hex(v["handles"][0].as_str().unwrap()).unwrap()
|
||||
}
|
||||
|
||||
fn trim(s: &mut Session, h: Handle, pick: [f64; 2], edge: Handle) {
|
||||
s.execute("trim", &json!({ "handle": h.hex(), "pick": pick, "edges": [edge.hex()] })).unwrap();
|
||||
}
|
||||
|
||||
fn kind(s: &Session, h: Handle) -> EntityKind {
|
||||
s.doc().unwrap().entity(h).unwrap().kind.clone()
|
||||
}
|
||||
|
||||
fn polyline(vertices: &[(f64, f64, f64)], const_width: f64, elevation: f64, plinegen: bool) -> EntityKind {
|
||||
let vertices = vertices.iter().map(|&(x, y, bulge)| PolyVertex { bulge, ..PolyVertex::new(Vec2::new(x, y)) }).collect();
|
||||
EntityKind::LwPolyline(LwPolyline { vertices, closed: false, const_width, elevation, plinegen })
|
||||
}
|
||||
|
||||
fn near(a: Vec3, b: Vec3, tol: f64) -> bool {
|
||||
(a.x - b.x).abs() < tol && (a.y - b.y).abs() < tol && (a.z - b.z).abs() < tol
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn trim_keeps_a_lines_z() {
|
||||
let mut s = Session::new();
|
||||
let a = add(&mut s, EntityKind::Line(Line { a: Vec3::new(0.5, 0.25, 0.007), b: Vec3::new(0.54, 0.25, 0.007) }), 0.0);
|
||||
let b = line(&mut s, [0.52, 0.24], [0.52, 0.26]);
|
||||
trim(&mut s, a, [0.53, 0.25], b);
|
||||
let EntityKind::Line(l) = kind(&s, a) else { panic!("not a line") };
|
||||
assert!(near(l.a, Vec3::new(0.5, 0.25, 0.007), 1e-12) && near(l.b, Vec3::new(0.52, 0.25, 0.007), 1e-12), "{l:?}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn trim_keeps_the_centre_z_of_a_circle_made_an_arc() {
|
||||
// At survey coordinates, with a thickness of 2.
|
||||
let mut s = Session::new();
|
||||
let c = add(&mut s, EntityKind::Circle(Circle { center: Vec3::new(612345.678, 2398765.432, 5.0), radius: 10.0 }), 2.0);
|
||||
let b = line(&mut s, [612350.678, 2398745.432], [612350.678, 2398785.432]);
|
||||
trim(&mut s, c, [612335.678, 2398765.432], b);
|
||||
let e = s.doc().unwrap().entity(c).unwrap().clone();
|
||||
let EntityKind::Arc(a) = &e.kind else { panic!("not an arc: {:?}", e.kind) };
|
||||
assert!(near(a.center, Vec3::new(612345.678, 2398765.432, 5.0), 1e-9), "{a:?}");
|
||||
assert!((a.start - 5.235987755978257).abs() < 1e-9 && (a.end - 1.047197551201328).abs() < 1e-9, "{a:?}");
|
||||
assert_eq!(e.common.thickness, 2.0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn trim_keeps_a_polylines_elevation() {
|
||||
let mut s = Session::new();
|
||||
let p = add(&mut s, polyline(&[(0.0, 0.0, 0.0), (20.0, 0.0, 0.4), (30.0, 15.0, 0.0), (5.0, 20.0, 0.0)], 0.0, 12.5, false), 1.0);
|
||||
let b = line(&mut s, [10.0, -10.0], [10.0, 30.0]);
|
||||
trim(&mut s, p, [5.0, 0.0], b);
|
||||
let EntityKind::LwPolyline(l) = kind(&s, p) else { panic!("not a polyline") };
|
||||
assert_eq!(l.elevation, 12.5);
|
||||
let want = [(10.0, 0.0, 0.0), (20.0, 0.0, 0.4), (30.0, 15.0, 0.0), (5.0, 20.0, 0.0)];
|
||||
assert_eq!(l.vertices.len(), want.len());
|
||||
for (v, w) in l.vertices.iter().zip(want) {
|
||||
assert!(near(Vec3::new(v.p.x, v.p.y, v.bulge), Vec3::new(w.0, w.1, w.2), 1e-12), "{v:?} != {w:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn break_and_trim_keep_a_polylines_constant_width_on_every_piece() {
|
||||
// Measured for BREAK: a width-2 polyline broken from (705, 0) to (735, 0) leaves two width-2
|
||||
// pieces. TRIM leaves its pieces the same way. Linetype generation is the polyline's setting
|
||||
// too, so the pieces keep it (not measured).
|
||||
let shape = [(700.0, 0.0, 0.0), (720.0, 0.0, 0.0), (740.0, 0.0, 0.0)];
|
||||
let mut s = Session::new();
|
||||
let p = add(&mut s, polyline(&shape, 2.0, 0.0, true), 0.0);
|
||||
let r = s.execute("break", &json!({ "handle": p.hex(), "p1": [705, 0], "p2": [735, 0] })).unwrap();
|
||||
let mut s2 = Session::new();
|
||||
let q = add(&mut s2, polyline(&shape, 2.0, 0.0, true), 0.0);
|
||||
let k1 = line(&mut s2, [705.0, -5.0], [705.0, 5.0]);
|
||||
let k2 = line(&mut s2, [735.0, -5.0], [735.0, 5.0]);
|
||||
let t = s2.execute("trim", &json!({ "handle": q.hex(), "pick": [720, 0], "edges": [k1.hex(), k2.hex()] })).unwrap();
|
||||
for (s, r) in [(&s, &r), (&s2, &t)] {
|
||||
let hs = r["handles"].as_array().unwrap();
|
||||
assert_eq!(hs.len(), 2);
|
||||
for h in hs {
|
||||
let EntityKind::LwPolyline(l) = kind(s, Handle::parse_hex(h.as_str().unwrap()).unwrap()) else { panic!("not a polyline") };
|
||||
assert_eq!((l.const_width, l.plinegen), (2.0, true));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -308,6 +308,14 @@ fn key_from(name: &str) -> Option<egui::Key> {
|
||||
}
|
||||
|
||||
pub fn handle(app: &mut CadApp, ctx: &egui::Context, req: &ControlRequest) -> Outcome {
|
||||
let out = handle_request(app, ctx, req);
|
||||
// A command the request ran may have asked for a bar (MENUBAR, TOOLBAR): apply it before
|
||||
// the next request, so a later query or `ui.set` sees the bars as they are now.
|
||||
app.sync_bars();
|
||||
out
|
||||
}
|
||||
|
||||
fn handle_request(app: &mut CadApp, ctx: &egui::Context, req: &ControlRequest) -> Outcome {
|
||||
let p = &req.params;
|
||||
let s = |k: &str| p.get(k).and_then(Value::as_str);
|
||||
let f = |k: &str| p.get(k).and_then(Value::as_f64);
|
||||
|
||||
@@ -316,6 +316,10 @@ pub fn command(app: &mut crate::CadApp, reset: bool, params: &Value) -> Result<V
|
||||
}
|
||||
|
||||
/// Validate and repair the stored workspace, sync it with the app, and render the dock panels; a failed restore falls back to the default layout with a status message.
|
||||
/// Draw the docked workspace: restore or fall back from the persisted layout, render every
|
||||
/// panel body plus the header close buttons, and apply the resulting actions through
|
||||
/// [`command`]. Bodies may dispatch commands, so the canonical workspace is published before
|
||||
/// rendering while the layout snapshot stays immutable.
|
||||
pub fn show(app: &mut crate::CadApp, ui: &mut egui::Ui) {
|
||||
let t = crate::theme::Tokens::get();
|
||||
let mut workspace = app.ui.docking.clone();
|
||||
@@ -348,7 +352,33 @@ pub fn show(app: &mut crate::CadApp, ui: &mut egui::Ui) {
|
||||
if let Some(panel) = app.raise_panel.take() {
|
||||
area = area.raise_panel(panel);
|
||||
}
|
||||
let mut output = area.show_content(ui, &workspace.layout, &style, &mut Panels { app });
|
||||
let (mut output, header_close) = {
|
||||
let mut panels = Panels { app, close: None };
|
||||
let output = area.show_content(ui, &workspace.layout, &style, &mut panels);
|
||||
(output, panels.close)
|
||||
};
|
||||
// Accordion title bars are rendered by the shared surface without a header callback, so
|
||||
// place the same close button over their title bar, left of the stock collapse control.
|
||||
let mut close = header_close;
|
||||
for panel in stack_panels(&workspace.layout) {
|
||||
if !permissions(&panel).closable {
|
||||
continue;
|
||||
}
|
||||
let Some(title) = ui.ctx().read_response(egui::Id::unique("cadcraft-docking").with(("tab", panel))) else { continue };
|
||||
if !title.rect.is_positive() {
|
||||
continue;
|
||||
}
|
||||
let rect = egui::Rect::from_center_size(
|
||||
egui::pos2(title.rect.right() - 18.0 - CLOSE_BUTTON * 0.5 - 4.0, title.rect.center().y),
|
||||
egui::vec2(CLOSE_BUTTON, CLOSE_BUTTON),
|
||||
);
|
||||
if close_button(ui, panel, rect) {
|
||||
close = Some(panel);
|
||||
}
|
||||
}
|
||||
if let Some(panel) = close {
|
||||
output.actions.push(Action::Close { panel });
|
||||
}
|
||||
// Keys typed in a floating panel's own OS window run the main window's shortcuts and
|
||||
// command line; files dropped on one open like files dropped on the main window.
|
||||
app.forward_native_input(ui.ctx(), std::mem::take(&mut output.forwarded_events), output.forwarded_modifiers);
|
||||
@@ -393,9 +423,55 @@ pub fn native_input_blocked(app: &crate::CadApp, ctx: &egui::Context) -> bool {
|
||||
/// The panels' contents, names, size limits and icons for the dock area.
|
||||
pub struct Panels<'a> {
|
||||
pub app: &'a mut crate::CadApp,
|
||||
/// The panel whose header close button was clicked this frame.
|
||||
pub close: Option<Panel>,
|
||||
}
|
||||
|
||||
/// Size of a panel header's close button, in points.
|
||||
const CLOSE_BUTTON: f32 = 16.0;
|
||||
|
||||
/// The accessible name of a header's close button. One translated template carries both the
|
||||
/// verb and the panel name, so a catalog translates the whole name instead of leaving an
|
||||
/// English verb in front of a translated panel label.
|
||||
fn close_label(panel: Panel) -> String {
|
||||
crate::tf!("Close {panel}", panel = crate::i18n::t(panel.label()))
|
||||
}
|
||||
|
||||
/// A visible close button for a panel header. It runs the same action as the tab context
|
||||
/// menu's "Close panel"; the accessible name includes the panel so the headers stay distinct.
|
||||
fn close_button(ui: &mut egui::Ui, panel: Panel, rect: egui::Rect) -> bool {
|
||||
let t = crate::theme::Tokens::get();
|
||||
let response = ui.interact(rect, egui::Id::unique("cadcraft-docking").with(("close", panel.id())), egui::Sense::click());
|
||||
let label = close_label(panel);
|
||||
crate::icons::describe_control(ui, &response, &label, None, false);
|
||||
if response.hovered() {
|
||||
ui.painter().rect_filled(rect.expand(2.0), 2.0, t.control_hover.gamma_multiply(0.6));
|
||||
}
|
||||
crate::icons::paint(ui.painter(), rect, crate::icons::Icon::Close, false);
|
||||
response.on_hover_text(crate::tl!("Close panel")).clicked()
|
||||
}
|
||||
|
||||
/// Panels whose title bar is an accordion entry rather than a tab group header.
|
||||
fn stack_panels(layout: &Layout<Panel>) -> Vec<Panel> {
|
||||
let mut panels = Vec::new();
|
||||
let mut nodes: Vec<&Node<Panel>> = layout.root.iter().collect();
|
||||
while let Some(node) = nodes.pop() {
|
||||
match node {
|
||||
Node::Split { first, second, .. } => {
|
||||
nodes.push(first);
|
||||
nodes.push(second);
|
||||
}
|
||||
Node::Stack { entries } => panels.extend(entries.iter().map(|entry| entry.panel)),
|
||||
// Tab groups draw their own header; nothing else stacks an accordion entry.
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
panels
|
||||
}
|
||||
|
||||
impl DockContent<Panel> for Panels<'_> {
|
||||
/// Render `panel`'s existing view; Layers, Properties and External References scroll
|
||||
/// independently, and the drawing canvas paints its own background before the view.
|
||||
fn body(&mut self, ui: &mut egui::Ui, panel: &Panel) {
|
||||
let app = &mut *self.app;
|
||||
match panel {
|
||||
@@ -445,6 +521,23 @@ impl DockContent<Panel> for Panels<'_> {
|
||||
crate::icons::paint(painter, rect, icon, false);
|
||||
true
|
||||
}
|
||||
/// Reserve header space for the close button only when `active` may be closed, so the
|
||||
/// drawing view's title gets no empty gap.
|
||||
fn group_header_width(&self, _panels: &[Panel], active: &Panel, _floating: bool, _strip_width: f32) -> f32 {
|
||||
if permissions(active).closable { CLOSE_BUTTON + 8.0 } else { 0.0 }
|
||||
}
|
||||
/// Draw the close button at the right edge of a tab-group header and remember the panel
|
||||
/// to close once the docking surface has returned, so layout changes stay outside rendering.
|
||||
fn group_header(&mut self, ui: &mut egui::Ui, _panels: &[Panel], active: &Panel, _floating: bool) {
|
||||
let header = ui.max_rect();
|
||||
let rect = egui::Rect::from_center_size(
|
||||
egui::pos2(header.right() - CLOSE_BUTTON * 0.5 - 4.0, header.center().y),
|
||||
egui::vec2(CLOSE_BUTTON, CLOSE_BUTTON),
|
||||
);
|
||||
if close_button(ui, *active, rect) {
|
||||
self.close = Some(*active);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn panel_limits(panel: &Panel) -> PanelLimits {
|
||||
|
||||
@@ -139,11 +139,13 @@
|
||||
Clip Viewport Delimitar ventana gráfica
|
||||
Clipboard Portapapeles
|
||||
Close Cerrar
|
||||
Close {panel} Cerrar {panel}
|
||||
Close All Cerrar todo
|
||||
Close All Other Drawings Cerrar todos los demás dibujos
|
||||
Close Array Editing Cerrar la edición de matriz
|
||||
Close Comparison Cerrar comparación
|
||||
Export Comparison Exportar comparación
|
||||
Close panel Cerrar panel
|
||||
Closed Cerrada
|
||||
Coincident Coincidente
|
||||
Collapse Palettes Contraer paletas
|
||||
@@ -542,6 +544,7 @@
|
||||
Measure Medir
|
||||
Measure Distance Medir distancia
|
||||
Measure Geometry Medir geometría
|
||||
Menu Bar Barra de menús
|
||||
Merge Cells Combinar celdas
|
||||
Merged PRs PR integradas
|
||||
Mid Between 2 Points Punto medio entre 2 puntos
|
||||
|
||||
|
@@ -146,6 +146,7 @@ fn missing_marked_ui_literals(language: &str) -> BTreeSet<String> {
|
||||
"chrome",
|
||||
"cmdline",
|
||||
"credits",
|
||||
"docking",
|
||||
"dialogs",
|
||||
"hatchdlg",
|
||||
"aliasdlg",
|
||||
|
||||
@@ -143,11 +143,13 @@
|
||||
Xref Clip Frame Рамка обрізки зовнішнього посилання
|
||||
Clipboard Буфер обміну
|
||||
Close Закрити
|
||||
Close {panel} Закрити {panel}
|
||||
Close All Закрити всі
|
||||
Close All Other Drawings Закрити всі інші креслення
|
||||
Closed Замкнений
|
||||
Close Comparison Закрити порівняння
|
||||
Export Comparison Експортувати порівняння
|
||||
Close panel Закрити панель
|
||||
Coincident Збіг
|
||||
Collapse Palettes Згорнути палітри
|
||||
Collapse Tool Sets Згорнути набори інструментів
|
||||
@@ -534,6 +536,7 @@
|
||||
Measure Розмітити
|
||||
Measure Distance Виміряти відстань
|
||||
Measure Geometry Виміряти геометрію
|
||||
Menu Bar Рядок меню
|
||||
Merge Cells Об'єднати комірки
|
||||
Merged PRs Об'єднані PR
|
||||
Mid Between 2 Points Середина між 2 точками
|
||||
|
||||
|
@@ -928,6 +928,7 @@
|
||||
Time 时间
|
||||
To get started, create or open a drawing. 若要开始,请创建或打开一个图形。
|
||||
Tool Bar 工具栏
|
||||
Menu Bar 菜单栏
|
||||
Tool Sets 工具集
|
||||
Tools 工具
|
||||
Torus 圆环体
|
||||
|
||||
|
@@ -283,6 +283,9 @@ pub struct CadApp {
|
||||
pub system_animations: Option<bool>,
|
||||
/// What `ui.system_cursor` goes back to when the interface is reset ([`Self::set_system_cursor_default`]).
|
||||
pub system_cursor_default: bool,
|
||||
/// Whether the host has a native menu bar: off where the menus stay in the window
|
||||
/// ([`Self::set_native_menus`]).
|
||||
pub native_menus: bool,
|
||||
pub session: Session,
|
||||
pub ui: UiState,
|
||||
/// The interface's own preferences from the Options dialog ([`options`]).
|
||||
@@ -381,6 +384,7 @@ impl CadApp {
|
||||
system_languages: Vec::new(),
|
||||
system_animations: None,
|
||||
system_cursor_default: false,
|
||||
native_menus: cfg!(target_os = "macos"),
|
||||
session,
|
||||
ui: UiState::default(),
|
||||
options: options::UiOptions::default(),
|
||||
@@ -588,7 +592,11 @@ impl CadApp {
|
||||
if let Some(r) = menus::run_ui_command(self, id, ¶ms) {
|
||||
return r;
|
||||
}
|
||||
// The bars as the interface shows them now (a `ui.set` may have just changed one), and any
|
||||
// MENUBAR or TOOLBAR request applied at once.
|
||||
self.sync_bars();
|
||||
let r = self.session.execute(id, ¶ms).map_err(|e| e.to_string());
|
||||
self.sync_bars();
|
||||
if let Ok(v) = &r
|
||||
&& let Some(m) = v.get("message").and_then(Value::as_str)
|
||||
{
|
||||
@@ -607,6 +615,7 @@ impl CadApp {
|
||||
if menus::run_ui_command(self, name, &Value::Null).is_some() {
|
||||
return;
|
||||
}
|
||||
self.sync_bars();
|
||||
if let Err(e) = self.session.start(name) {
|
||||
self.session.echo(e.to_string());
|
||||
}
|
||||
@@ -622,6 +631,7 @@ impl CadApp {
|
||||
/// command or system variable) runs `fallback` instead: Enter on a partly typed name accepts
|
||||
/// the highlighted AutoComplete suggestion.
|
||||
pub fn cmdline_or(&mut self, text: &str, fallback: Option<&str>) -> Option<String> {
|
||||
self.sync_bars();
|
||||
if !self.session.prompting() {
|
||||
let first = text.split_whitespace().next().unwrap_or("");
|
||||
// `cmd {json}` is a programmatic call: the engine runs it with those parameters.
|
||||
@@ -636,7 +646,9 @@ impl CadApp {
|
||||
return None;
|
||||
}
|
||||
}
|
||||
let e = match (self.session.cmdline(text), fallback) {
|
||||
let r = self.session.cmdline(text);
|
||||
self.sync_bars();
|
||||
let e = match (r, fallback) {
|
||||
(Ok(()), _) => return None,
|
||||
(Err(cadcraft_engine::EngineError::UnknownCommand(_)), Some(f)) => return self.cmdline(f),
|
||||
(Err(e), _) => e.to_string(),
|
||||
@@ -645,6 +657,18 @@ impl CadApp {
|
||||
Some(e)
|
||||
}
|
||||
|
||||
/// Apply a menu bar / tool bar change MENUBAR or TOOLBAR asked for, and report the bars shown.
|
||||
fn sync_bars(&mut self) {
|
||||
let b = std::mem::take(&mut self.session.bars_request);
|
||||
if let Some(on) = b.menubar {
|
||||
self.ui.in_window_menu = on;
|
||||
}
|
||||
if let Some(show) = b.toolbar {
|
||||
self.ui.show_toolbar = show;
|
||||
}
|
||||
self.session.bars_shown = cadcraft_engine::cmd::interface::InterfaceBars { menubar: self.ui.in_window_menu, toolbar: self.ui.show_toolbar };
|
||||
}
|
||||
|
||||
/// The theme the interface shows now (the choice resolved against the OS appearance).
|
||||
pub fn shown_theme(&self) -> egui::Theme {
|
||||
self.shown_theme.unwrap_or_else(|| self.ui.theme.resolve(None))
|
||||
@@ -731,6 +755,15 @@ impl CadApp {
|
||||
}
|
||||
}
|
||||
|
||||
/// Tell the interface whether the host has a native menu bar. Where it has none, the
|
||||
/// in-window menu is the only menu, so it is shown and a reset keeps it.
|
||||
pub fn set_native_menus(&mut self, on: bool) {
|
||||
self.native_menus = on;
|
||||
if !on {
|
||||
self.ui.in_window_menu = true;
|
||||
}
|
||||
}
|
||||
|
||||
pub fn set_status(&mut self, s: impl Into<String>) {
|
||||
self.status = Some((s.into(), now_ms()));
|
||||
}
|
||||
@@ -1087,6 +1120,7 @@ impl CadApp {
|
||||
/// Draw one UI pass: title/toolbar, optional menu/status bar/file tabs, the standalone tool-set strip when a drawing is shown but Tool Sets is not docked, docking or the start page, and the floating overlays; record `frame_ms`. Runs on every pass, including one egui later discards.
|
||||
fn draw(&mut self, ui: &mut egui::Ui) {
|
||||
let t0 = now_ms();
|
||||
self.sync_bars();
|
||||
control::begin_frame(ui.ctx());
|
||||
let t = theme::Tokens::get();
|
||||
chrome::title_and_toolbar(self, ui);
|
||||
@@ -1408,4 +1442,54 @@ mod tests {
|
||||
let ui: UiState = serde_json::from_value(json!({ "saveFormat": "dwg" })).unwrap_or_default();
|
||||
assert_eq!(ui.save_format, SaveFormat::Dwg);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn options_reset_brings_the_interface_back() {
|
||||
// Hiding the interface (View/Window toggles) can leave no way back — on Windows the
|
||||
// in-window menu bar is the only menu there is. Options > Reset must restore it (#1240).
|
||||
let mut a = app();
|
||||
a.run("ui.toggle.toolbar", json!({ "on": false })).unwrap();
|
||||
a.run("ui.toggle.menubar", json!({ "on": cfg!(target_os = "macos") })).unwrap();
|
||||
a.start("ui.hidepalettes");
|
||||
assert!(!a.ui.show_toolbar && !a.ui.show_palettes && !a.ui.show_toolsets);
|
||||
assert_eq!(a.ui.in_window_menu, cfg!(target_os = "macos"), "the test did not hide the menu bar");
|
||||
a.run("options", json!({ "reset": true })).unwrap();
|
||||
assert!(a.ui.show_toolbar, "the tool bar is still hidden");
|
||||
assert!(a.ui.show_palettes, "the palettes are still hidden");
|
||||
assert!(a.ui.show_toolsets);
|
||||
assert_eq!(a.ui.in_window_menu, !cfg!(target_os = "macos"), "the menu bar did not come back");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn options_reset_keeps_the_menu_where_the_host_has_no_native_one() {
|
||||
// With CADCRAFT_NO_NATIVE_MENU=1 the menus stay in the window: the host reports no native
|
||||
// menu bar, so the in-window one is the only menu and the reset must leave it (#1240).
|
||||
let mut a = app();
|
||||
a.set_native_menus(false);
|
||||
assert!(a.ui.in_window_menu, "the host's setting did not show the in-window menu");
|
||||
a.run("ui.toggle.menubar", json!({ "on": false })).unwrap();
|
||||
a.run("options", json!({ "reset": true })).unwrap();
|
||||
assert!(a.ui.in_window_menu, "the only menu bar did not come back");
|
||||
// Beside a native menu bar, the reset returns to the platform default.
|
||||
a.set_native_menus(true);
|
||||
a.run("ui.toggle.menubar", json!({ "on": true })).unwrap();
|
||||
a.run("options", json!({ "reset": true })).unwrap();
|
||||
assert!(!a.ui.in_window_menu, "the in-window menu is not the default beside a native one");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn options_reset_keeps_the_users_shortcuts_and_folders() {
|
||||
// The reset brings hidden bars back (#1240); it must not also lose the user's own
|
||||
// keyboard shortcuts or the folders the file pickers remember.
|
||||
let mut a = app();
|
||||
a.ui.shortcuts.insert("line".into(), "Ctrl+Shift+L".into());
|
||||
a.ui.last_lisp_dir = Some("lisp-folder".into());
|
||||
a.ui.last_pgp_dir = Some("pgp-folder".into());
|
||||
a.run("ui.toggle.toolbar", json!({ "on": false })).unwrap();
|
||||
a.run("options", json!({ "reset": true })).unwrap();
|
||||
assert!(a.ui.show_toolbar, "the tool bar is still hidden");
|
||||
assert_eq!(a.ui.shortcuts.get("line").map(String::as_str), Some("Ctrl+Shift+L"), "the reset lost a user shortcut");
|
||||
assert_eq!(a.ui.last_lisp_dir.as_deref(), Some("lisp-folder"));
|
||||
assert_eq!(a.ui.last_pgp_dir.as_deref(), Some("pgp-folder"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -797,13 +797,20 @@ fn switch_on_hover(ctx: &egui::Context, titles: &[egui::Response]) {
|
||||
}
|
||||
}
|
||||
|
||||
/// Activate a menu command. QuickCalc toggles transparently; other items clear pending
|
||||
/// command-line text and start their command interactively.
|
||||
/// Activate a menu command. QuickCalc toggles transparently, and Reference Manager closes its
|
||||
/// palette when it is open (typed XREF only opens it); other items clear pending command-line
|
||||
/// text and start their command interactively.
|
||||
pub fn activate(app: &mut CadApp, id: &str) {
|
||||
if id == "ui.toggle.quickcalc" {
|
||||
run_transparent(app, id);
|
||||
return;
|
||||
}
|
||||
if id == "xref" && app.ui.docking.layout.contains(&crate::docking::Panel::ExternalRefs) {
|
||||
if let Err(e) = crate::xrefs::close_palette(app) {
|
||||
app.set_status(e);
|
||||
}
|
||||
return;
|
||||
}
|
||||
app.cmd.buffer.clear();
|
||||
app.start(id);
|
||||
}
|
||||
|
||||
@@ -434,13 +434,30 @@ fn apply_right_click(o: &mut UiOptions, c: &UiChanges) {
|
||||
|
||||
/// The interface preferences back to their defaults (the interface language stays).
|
||||
fn reset_ui(app: &mut CadApp) {
|
||||
let d = crate::UiState::default();
|
||||
app.ui.theme = d.theme;
|
||||
app.ui.animations = d.animations;
|
||||
app.ui.save_format = d.save_format;
|
||||
app.ui.save_version = d.save_version;
|
||||
// Everything interface, back to its defaults: a hidden menu bar, tool bar, palettes or
|
||||
// panels and a rearranged panel layout come back — once the menu bar is hidden there may be
|
||||
// no other way to reach the toggles (#1240). The interface language stays; the open dialog,
|
||||
// the start tab, the recent files and the remembered folders are state, not preferences, and
|
||||
// stay too. The user's keyboard shortcuts are their own customisation, which Window > Reset
|
||||
// Palettes keeps as well: a reset meant to bring a bar back must not lose them.
|
||||
let (language, dialog, start_tab) = (app.ui.interface_language, app.ui.dialog.take(), app.ui.start_tab);
|
||||
let recent_files = std::mem::take(&mut app.ui.recent_files);
|
||||
let shortcuts = std::mem::take(&mut app.ui.shortcuts);
|
||||
let (last_lisp_dir, last_pgp_dir) = (app.ui.last_lisp_dir.take(), app.ui.last_pgp_dir.take());
|
||||
app.ui = crate::UiState {
|
||||
interface_language: language,
|
||||
dialog,
|
||||
start_tab,
|
||||
recent_files,
|
||||
shortcuts,
|
||||
last_lisp_dir,
|
||||
last_pgp_dir,
|
||||
..Default::default()
|
||||
};
|
||||
// Where the host has no native menu bar the in-window one is the only menu: the reset must
|
||||
// leave it in place (#1240).
|
||||
app.ui.in_window_menu = !app.native_menus;
|
||||
app.ui.system_cursor = app.system_cursor_default;
|
||||
app.ui.history_lines = d.history_lines;
|
||||
app.options = UiOptions::default();
|
||||
}
|
||||
|
||||
|
||||
@@ -42,6 +42,12 @@ fn open_palette(app: &mut CadApp) -> Result<Value, String> {
|
||||
crate::docking::command(app, false, &json!({ "operation": "open", "panel": Panel::ExternalRefs.id() }))
|
||||
}
|
||||
|
||||
/// Close the palette: Window ▸ Reference Manager while it is open, as Window ▸ QuickCalc closes
|
||||
/// QuickCalc (#2273).
|
||||
pub(crate) fn close_palette(app: &mut CadApp) -> Result<Value, String> {
|
||||
crate::docking::command(app, false, &json!({ "operation": "close", "panel": Panel::ExternalRefs.id() }))
|
||||
}
|
||||
|
||||
/// A picked file inside the host drawing's folder is attached by its relative path, so the
|
||||
/// project folder can move.
|
||||
fn relative_to_host(app: &CadApp, picked: &str) -> String {
|
||||
|
||||
@@ -123,7 +123,7 @@ fn palette_icons_are_painted_in_code_and_shown_in_an_iconic_column() {
|
||||
let ctx = egui::Context::default();
|
||||
let mut paint = |panel: Panel| {
|
||||
let mut painted = false;
|
||||
let mut content = Panels { app: &mut app };
|
||||
let mut content = Panels { app: &mut app, close: None };
|
||||
let mut output = ctx.run_ui(egui::RawInput::default(), |ui| {
|
||||
let painter = ui.ctx().layer_painter(egui::LayerId::background());
|
||||
let rect = egui::Rect::from_min_size(egui::Pos2::ZERO, vec2(20.0, 20.0));
|
||||
@@ -593,3 +593,62 @@ fn group_drag_bar_moves_the_whole_group_into_the_other_dock() {
|
||||
assert_eq!(frames(layout), [[Panel::Canvas]]);
|
||||
assert_eq!(h.state().session.doc().unwrap(), &document);
|
||||
}
|
||||
|
||||
/// Guard that every closable panel header offers a visible close button: a docked tab group,
|
||||
/// the default accordion stack, and a floating group. Each click must remove the panel, the
|
||||
/// button must not cover the title, and the tab context menu must still close the same panel.
|
||||
#[test]
|
||||
fn every_panel_header_has_a_close_button_that_closes_like_the_context_menu() {
|
||||
let mut h = harness(None, 1280.0, 1.0);
|
||||
assert!(h.query_by_label("Close Tool Sets").is_some(), "docked tab headers show a close button");
|
||||
assert!(h.query_by_label("Close Drawing").is_none(), "the drawing view is not a closable panel");
|
||||
// External References opens as a tabbed pane; its button sits beside the title, not over it.
|
||||
h.state_mut().run("ui.dock", json!({"operation":"open","panel":"externalReferences"})).unwrap();
|
||||
h.run_steps(4);
|
||||
assert!(h.state().ui.docking.layout.contains(&Panel::ExternalRefs));
|
||||
let close = h.get_by_label("Close External References").rect();
|
||||
let title = h.get_by_role_and_label(egui::accesskit::Role::Tab, "External References").rect();
|
||||
assert!(!close.intersects(title), "the close button does not cover the panel title");
|
||||
h.get_by_label("Close External References").click();
|
||||
h.run_steps(4);
|
||||
assert!(!h.state().ui.docking.layout.contains(&Panel::ExternalRefs));
|
||||
|
||||
// Accordion headers (the default Layers/Properties stack) get one too.
|
||||
assert!(h.state().ui.docking.layout.contains(&Panel::Layers));
|
||||
h.get_by_label("Close Layers").click();
|
||||
h.run_steps(4);
|
||||
assert!(!h.state().ui.docking.layout.contains(&Panel::Layers));
|
||||
|
||||
// The context menu still closes the same panel after it is reopened.
|
||||
h.state_mut().run("ui.dock", json!({"operation":"open","panel":"layers"})).unwrap();
|
||||
h.run_steps(4);
|
||||
assert!(h.state().ui.docking.layout.contains(&Panel::Layers));
|
||||
h.get_by_role_and_label(egui::accesskit::Role::Tab, "Layers").click_button(PointerButton::Secondary);
|
||||
h.run_steps(3);
|
||||
// The docking surface's stock tab menu item ("Close Panel"), not our tooltip.
|
||||
h.get_by_label("Close Panel").click();
|
||||
h.run_steps(4);
|
||||
assert!(!h.state().ui.docking.layout.contains(&Panel::Layers));
|
||||
|
||||
// Floating panels get the same button in their group header.
|
||||
h.state_mut().run("ui.dock", json!({"operation":"float","panel":"properties","rect":[400,250,300,350]})).unwrap();
|
||||
h.run_steps(4);
|
||||
h.get_by_label("Close Properties").click();
|
||||
h.run_steps(4);
|
||||
assert!(!h.state().ui.docking.layout.contains(&Panel::Properties));
|
||||
}
|
||||
|
||||
/// The accessible name is one translated string, not an English verb glued to a translated
|
||||
/// panel label: Spanish readers must hear "Cerrar Capas", never "Close Capas".
|
||||
#[test]
|
||||
fn spanish_close_button_accessible_name_is_localized_as_a_whole() {
|
||||
let mut h = harness(None, 1280.0, 1.0);
|
||||
h.state_mut().run("ui.language", json!({"lang": "es"})).unwrap();
|
||||
h.run_steps(4);
|
||||
assert!(h.query_by_label("Cerrar Capas").is_some(), "the accordion close button is named in Spanish");
|
||||
assert!(h.query_by_label("Cerrar Propiedades").is_some(), "every panel's close button follows the language");
|
||||
assert!(h.query_by_label("Close Capas").is_none(), "no English verb survives the translation");
|
||||
h.get_by_label("Cerrar Capas").click();
|
||||
h.run_steps(4);
|
||||
assert!(!h.state().ui.docking.layout.contains(&Panel::Layers), "the localized name still closes its panel");
|
||||
}
|
||||
|
||||
@@ -36,7 +36,6 @@ mod selection_cycling;
|
||||
mod shared_controls;
|
||||
mod shortcut_menus;
|
||||
mod shortcuts_checked;
|
||||
mod space_at_options;
|
||||
mod status_bar_toggles;
|
||||
mod style_dialogs;
|
||||
mod system_cursor;
|
||||
|
||||
@@ -252,3 +252,22 @@ fn selection_highlight_settings_set_save_and_show_in_the_selection_tab() {
|
||||
assert!(text.contains(label), "{label} missing from:\n{text}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn reset_brings_back_hidden_menu_bar_toolbar_and_status_bar() {
|
||||
// #1240: with the in-window menu bar, the toolbar and the status bar hidden, OPTIONS ▸ Reset
|
||||
// to Defaults (typed, or from the right-click menu) is the way back.
|
||||
let mut a = app();
|
||||
let d = cadcraft_ui_egui::UiState::default();
|
||||
a.ui.in_window_menu = !d.in_window_menu;
|
||||
a.ui.show_toolbar = false;
|
||||
a.ui.show_status_bar = false;
|
||||
a.ui.show_command_line = false;
|
||||
a.ui.show_palettes = false;
|
||||
a.run("options", json!({"reset": true})).unwrap();
|
||||
assert_eq!(a.ui.in_window_menu, d.in_window_menu);
|
||||
assert_eq!(a.ui.show_toolbar, d.show_toolbar);
|
||||
assert_eq!(a.ui.show_status_bar, d.show_status_bar);
|
||||
assert_eq!(a.ui.show_command_line, d.show_command_line);
|
||||
assert_eq!(a.ui.show_palettes, d.show_palettes);
|
||||
}
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
//! Space is Enter at TRIM's and EXTEND's option prompts, as at AutoCAD's (#3092): typing `O`,
|
||||
//! Space, `S`, Space switches to Standard mode instead of typing a space into the command line.
|
||||
|
||||
use cadcraft_engine::Session;
|
||||
use cadcraft_ui_egui::{CadApp, Services};
|
||||
use egui::{Key, Modifiers, vec2};
|
||||
use egui_kittest::Harness;
|
||||
|
||||
fn harness() -> Harness<'static, CadApp> {
|
||||
let app = CadApp::new(Session::new(), Services::default());
|
||||
let mut h = Harness::builder().with_size(vec2(1600.0, 1000.0)).build_ui_state(
|
||||
|ui, app: &mut CadApp| {
|
||||
app.logic(ui.ctx());
|
||||
app.ui(ui);
|
||||
},
|
||||
app,
|
||||
);
|
||||
h.run_steps(3);
|
||||
h
|
||||
}
|
||||
|
||||
/// Type `text` at the keyboard: a space arrives as the Space key and as text, like a real press.
|
||||
fn type_keys(h: &mut Harness<'static, CadApp>, text: &str) {
|
||||
for c in text.chars() {
|
||||
if c == ' ' {
|
||||
h.event(egui::Event::Key { key: Key::Space, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE });
|
||||
}
|
||||
h.event(egui::Event::Text(c.to_string()));
|
||||
h.run_steps(1);
|
||||
}
|
||||
h.run_steps(1);
|
||||
}
|
||||
|
||||
fn header(h: &Harness<'static, CadApp>, name: &str) -> i64 {
|
||||
h.state().session.doc().unwrap().header.i64(name, -1)
|
||||
}
|
||||
|
||||
fn prompt(h: &Harness<'static, CadApp>) -> String {
|
||||
h.state().session.current_prompt().map(|p| p.message).unwrap_or_default()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn space_answers_trim_and_extend_option_prompts() {
|
||||
let mut h = harness();
|
||||
type_keys(&mut h, "trim o s ");
|
||||
assert_eq!(h.state().cmd.buffer, "", "Space typed a space instead of entering the option");
|
||||
assert_eq!(header(&h, "TRIMEXTENDMODE"), 0, "S chose Standard mode");
|
||||
// Standard mode asks for cutting edges; Enter selects all, then Project and Edge.
|
||||
type_keys(&mut h, " p n e e ");
|
||||
assert_eq!(h.state().cmd.buffer, "");
|
||||
assert_eq!(header(&h, "PROJMODE"), 0, "N chose no projection");
|
||||
assert_eq!(header(&h, "EDGEMODE"), 1, "E chose Extend");
|
||||
assert!(prompt(&h).starts_with("Select object to trim"), "back at the trim prompt: {}", prompt(&h));
|
||||
h.key_press(Key::Escape);
|
||||
h.run_steps(2);
|
||||
type_keys(&mut h, "extend o q ");
|
||||
assert_eq!(h.state().cmd.buffer, "");
|
||||
assert_eq!(header(&h, "TRIMEXTENDMODE"), 1, "Q chose Quick mode in EXTEND");
|
||||
}
|
||||
@@ -0,0 +1,107 @@
|
||||
//! MENUBAR and TOOLBAR at the command line bring a hidden menu bar and tool bar back (#1341):
|
||||
//! on Windows and Linux the in-window menu bar is the only menu, so with it hidden typing these
|
||||
//! is the way back, as in AutoCAD.
|
||||
|
||||
use cadcraft_engine::Session;
|
||||
use cadcraft_ui_egui::{CadApp, Services};
|
||||
use serde_json::json;
|
||||
|
||||
fn app() -> CadApp {
|
||||
CadApp::new(Session::new(), Services::default())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn typed_menubar_shows_and_hides_the_menu_bar() {
|
||||
let mut app = app();
|
||||
app.ui.in_window_menu = false;
|
||||
app.cmdline("MENUBAR");
|
||||
assert_eq!(app.session.prompt_text(), "MENUBAR Enter new value for MENUBAR <0>:");
|
||||
app.cmdline("1");
|
||||
assert!(app.session.running.is_none());
|
||||
assert!(app.ui.in_window_menu);
|
||||
// 0 hides it again; anything else is refused and asked again.
|
||||
app.cmdline("MENUBAR");
|
||||
app.cmdline("2");
|
||||
assert!(app.session.running.is_some(), "still asking");
|
||||
app.cmdline("0");
|
||||
assert!(!app.ui.in_window_menu);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn typed_toolbar_shows_the_tool_bar_by_default() {
|
||||
let mut app = app();
|
||||
app.ui.show_toolbar = false;
|
||||
app.cmdline("TOOLBAR");
|
||||
assert_eq!(app.session.prompt_text(), "TOOLBAR Enter tool bar option or [Show/Hide] <Show>:");
|
||||
app.cmdline("");
|
||||
assert!(app.ui.show_toolbar);
|
||||
app.cmdline("TOOLBAR");
|
||||
app.cmdline("H");
|
||||
assert!(!app.ui.show_toolbar);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_json_forms_report_and_set_the_bars() {
|
||||
let mut app = app();
|
||||
app.ui.in_window_menu = true;
|
||||
app.ui.show_toolbar = false;
|
||||
app.cmdline("MENUBAR");
|
||||
app.cmdline("");
|
||||
assert_eq!(app.session.execute("menubar", &json!({})).unwrap(), json!({ "value": 1 }));
|
||||
assert_eq!(app.session.execute("toolbar", &json!({})).unwrap(), json!({ "show": false }));
|
||||
app.session.execute("toolbar", &json!({ "show": true })).unwrap();
|
||||
app.cmdline("MENUBAR");
|
||||
app.cmdline("");
|
||||
assert!(app.ui.show_toolbar && app.ui.in_window_menu);
|
||||
assert!(app.session.execute("menubar", &json!({ "value": 3 })).is_err());
|
||||
}
|
||||
|
||||
/// MENUBAR changes only the menu bar: a tool bar change made before the request is applied
|
||||
/// stays (a control-API `ui.set` can come between them).
|
||||
#[test]
|
||||
fn menubar_leaves_a_later_tool_bar_change() {
|
||||
let mut app = app();
|
||||
app.ui.in_window_menu = true;
|
||||
app.ui.show_toolbar = true;
|
||||
app.session.execute("menubar", &json!({ "value": 0 })).unwrap();
|
||||
app.ui.show_toolbar = false;
|
||||
app.cmdline("'REDRAW");
|
||||
assert!(!app.ui.in_window_menu, "MENUBAR applied");
|
||||
assert!(!app.ui.show_toolbar, "the tool bar keeps its later change");
|
||||
}
|
||||
|
||||
/// A bar query through `CadApp::run` reports the bars as the interface shows them now, even when
|
||||
/// a UI change came just before it with no frame drawn in between.
|
||||
#[test]
|
||||
fn a_bar_query_sees_a_ui_change_just_made() {
|
||||
let mut app = app();
|
||||
app.ui.show_toolbar = true;
|
||||
assert_eq!(app.run("toolbar", json!({})).unwrap(), json!({ "show": true }));
|
||||
app.ui.show_toolbar = false;
|
||||
assert_eq!(app.run("toolbar", json!({})).unwrap(), json!({ "show": false }));
|
||||
app.run("toolbar", json!({ "show": true })).unwrap();
|
||||
assert!(app.ui.show_toolbar, "the request is applied at once");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn menubar_started_from_the_ui_offers_the_bar_as_shown_now() {
|
||||
let mut app = app();
|
||||
app.ui.in_window_menu = true;
|
||||
app.cmdline("");
|
||||
app.ui.in_window_menu = false;
|
||||
app.start("menubar");
|
||||
let prompt = app.session.prompt_text();
|
||||
assert!(prompt.contains("<0>"), "{prompt}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn enter_through_the_control_api_applies_the_bar_before_the_next_request() {
|
||||
let mut app = app();
|
||||
let ctx = egui::Context::default();
|
||||
app.ui.show_toolbar = false;
|
||||
app.start("toolbar");
|
||||
let (req, _pending) = cadcraft_ui_egui::control::ControlRequest::new("cmdline.key", serde_json::json!({ "key": "enter" }));
|
||||
cadcraft_ui_egui::control::handle(&mut app, &ctx, &req);
|
||||
assert!(app.session.running.is_none());
|
||||
assert!(app.ui.show_toolbar, "TOOLBAR's default Show is applied before the next request");
|
||||
}
|
||||
@@ -5,7 +5,7 @@ use cadcraft_engine::Session;
|
||||
use cadcraft_engine::cmd::file::{IoHooks, set_io};
|
||||
use cadcraft_engine::doc::geom::Vec3;
|
||||
use cadcraft_engine::doc::{Drawing, Entity, EntityKind, Handle, Layer, Line, XrefStatus};
|
||||
use cadcraft_ui_egui::{CadApp, Services, docking::Panel};
|
||||
use cadcraft_ui_egui::{CadApp, Services, docking::Panel, menus};
|
||||
use egui::vec2;
|
||||
use egui_kittest::Harness;
|
||||
use egui_kittest::kittest::Queryable;
|
||||
@@ -71,6 +71,23 @@ fn xref_opens_the_palette_and_its_buttons_manage_the_xref() {
|
||||
h.get_by_label("site");
|
||||
}
|
||||
|
||||
/// Window ▸ Reference Manager closes the palette when it is open, like Window ▸ QuickCalc; typed,
|
||||
/// XREF only ever opens it (#2273).
|
||||
#[test]
|
||||
fn the_window_menu_item_closes_an_open_palette() {
|
||||
let mut app = CadApp::new(Session::default(), Services::default());
|
||||
let open = |app: &CadApp| app.ui.docking.layout.contains(&Panel::ExternalRefs);
|
||||
menus::activate(&mut app, "xref");
|
||||
assert!(open(&app), "the menu item opens the palette");
|
||||
menus::activate(&mut app, "xref");
|
||||
assert!(!open(&app), "the menu item closes the open palette");
|
||||
menus::activate(&mut app, "xref");
|
||||
assert!(open(&app), "and opens it again");
|
||||
assert!(app.cmdline("XREF").is_none());
|
||||
assert!(app.cmdline("XR").is_none());
|
||||
assert!(open(&app), "typed XREF keeps it open");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn json_xref_lists_and_never_opens_the_palette() {
|
||||
let mut app = CadApp::new(Session::default(), Services::default());
|
||||
|
||||
@@ -144,6 +144,12 @@ The shortcut also works with text-field focus. Toggling preserves the running dr
|
||||
and pending command-line input. The expression, history and calculator variables survive
|
||||
closing/reopening within the same session; they are not saved across application restarts.
|
||||
|
||||
The External References palette (`externalReferences`) is not part of the default arrangement
|
||||
either. Typed `XREF`/`XR` opens and activates it. **Window > Reference Manager** (also
|
||||
`ui.menu.invoke` with `xref`) opens it too, but closes it when it is present, as Window >
|
||||
QuickCalc does; closing leaves the running command and command-line input alone. `xref` with
|
||||
JSON parameters lists the references and never opens or closes the palette.
|
||||
|
||||
Invoke these UI commands through `engine.execute`, for example `{"command":"ui.dock","params":{"operation":"float","panel":"layers","rect":[100,100,320,440]}}`.
|
||||
|
||||
Advanced `ui.dock` operations use the same validated transaction as pointer gestures:
|
||||
|
||||
Reference in New Issue
Block a user