mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-01 21:57:12 -06:00
bflatastic
79f7b393e9
Path Precision Tools gains the Shared Edge Merge Tool, kept out of the toolbars (All Tools drawer and Object › Plug-ins › Path Precision Tools, no shortcut), and Keep Shared Points Together: - Shared Edge Merge Tool (sharedEdge): over two paths touching at two coincident anchors (tolerance 0 to 3 pt) hovering shows the two stretches and the merged edge; a click replaces both with it, half way between them, or following the upper (Shift) or lower (Alt) path. Both paths stay closed or open, anchors either stretch has inside are matched on the other, one undo step. - Making ends: near anchors meet on a click and an anchor one path lacks is added to match; Shift+Alt asks for this inside a stretch. - Keep Shared Points Together: an option that makes Slide Anchor Along Path, Extend Path and Set Anchor take coincident anchors along. Nothing else in the app changes. - Shared Edges section in the Anchor Inspector: brush diameter, coincidence and the option. - Commands addon.pathtools.mergeEdge and movePointsTogether, params validated and covered by the command sweep. - Cursor stand-in, catalog rows in every language, docs and tests.
77 lines
3.8 KiB
Rust
77 lines
3.8 KiB
Rust
//! The tools of VectorCraft's built-in add-ons. They aren't in the toolbars as they ship: the All
|
|
//! Tools drawer lists them (under their add-on's heading) so they can be added, and each add-on's
|
|
//! submenu selects them. Like every tool they only emit commands (`addon.<name>.*`).
|
|
|
|
pub mod anchor_eraser;
|
|
pub mod corner_tool;
|
|
pub mod extend_path;
|
|
pub mod measure_inspect;
|
|
pub mod parametric_shape;
|
|
pub mod shared_edge;
|
|
pub mod slide_anchor;
|
|
pub mod smart_pen;
|
|
|
|
use crate::{Tool, ToolInfo};
|
|
|
|
/// Path Precision Tools' tools, one flyout group.
|
|
pub const PATH_TOOLS: &[ToolInfo] = &[
|
|
ToolInfo { id: anchor_eraser::ID, label: "Anchor Eraser Brush", shortcut: None, icon: "dc-remove-brush" },
|
|
ToolInfo { id: extend_path::ID, label: "Extend Path Tool", shortcut: None, icon: "dc-arrow-extend" },
|
|
ToolInfo { id: measure_inspect::ID, label: "Measure & Inspect Tool", shortcut: None, icon: "ruler" },
|
|
ToolInfo { id: parametric_shape::ID, label: "Parametric Shape Tool", shortcut: None, icon: "hexagon" },
|
|
ToolInfo { id: corner_tool::ID, label: "Corner Tool", shortcut: None, icon: "dc-rounded-rect" },
|
|
ToolInfo { id: slide_anchor::ID, label: "Slide Anchor Along Path", shortcut: None, icon: "dc-anchor" },
|
|
ToolInfo { id: shared_edge::ID, label: "Shared Edge Merge Tool", shortcut: None, icon: "dc-join" },
|
|
];
|
|
|
|
/// Smart Pen's tool, a flyout group of its own.
|
|
pub const SMART_PEN: &[ToolInfo] = &[ToolInfo { id: smart_pen::ID, label: "Smart Pen Tool", shortcut: None, icon: "spline-pointer" }];
|
|
|
|
/// The add-ons' tool groups, after the toolbar's own ([`crate::TOOL_GROUPS`]), each with the
|
|
/// heading the All Tools drawer lists it under (its add-on's name).
|
|
const HEADED: &[(&[ToolInfo], &str)] = &[(PATH_TOOLS, "Path Precision Tools"), (SMART_PEN, "Smart Pen")];
|
|
|
|
/// The add-ons' tool groups, after the toolbar's own ([`crate::TOOL_GROUPS`]).
|
|
pub const GROUPS: &[&[ToolInfo]] = &[PATH_TOOLS, SMART_PEN];
|
|
|
|
/// The heading the All Tools drawer lists tool `id` under: its add-on's name.
|
|
pub fn heading(id: &str) -> Option<&'static str> {
|
|
HEADED.iter().find(|(g, _)| g.iter().any(|t| t.id == id)).map(|(_, h)| *h)
|
|
}
|
|
|
|
/// Create an add-on tool by id (None = not one of them).
|
|
pub fn create(id: &str) -> Option<Box<dyn Tool>> {
|
|
Some(match id {
|
|
anchor_eraser::ID => Box::new(anchor_eraser::AnchorEraserTool::default()),
|
|
corner_tool::ID => Box::new(corner_tool::CornerTool::default()),
|
|
extend_path::ID => Box::new(extend_path::ExtendPathTool::default()),
|
|
measure_inspect::ID => Box::new(measure_inspect::MeasureInspectTool::default()),
|
|
parametric_shape::ID => Box::new(parametric_shape::ParametricShapeTool::default()),
|
|
shared_edge::ID => Box::new(shared_edge::SharedEdgeTool::default()),
|
|
slide_anchor::ID => Box::new(slide_anchor::SlideAnchorTool::default()),
|
|
smart_pen::ID => Box::new(smart_pen::SmartPenTool::default()),
|
|
_ => return None,
|
|
})
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn every_addon_tool_is_made_and_catalogued_but_not_in_the_toolbar() {
|
|
for t in GROUPS.iter().flat_map(|g| g.iter()) {
|
|
assert_eq!(create(t.id).map(|tool| tool.id()), Some(t.id));
|
|
assert_eq!(crate::tool_info(t.id).map(|i| i.label), Some(t.label));
|
|
assert!(crate::create(t.id).id() == t.id);
|
|
assert!(t.shortcut.is_none(), "no default shortcut");
|
|
assert!(!crate::TOOL_GROUPS.iter().any(|g| g.iter().any(|x| x.id == t.id)), "{} is not in the toolbar's groups", t.id);
|
|
}
|
|
assert!(PATH_TOOLS.iter().all(|t| heading(t.id) == Some("Path Precision Tools")));
|
|
assert_eq!(heading(smart_pen::ID), Some("Smart Pen"));
|
|
assert_eq!(GROUPS.len(), HEADED.len());
|
|
assert!(crate::catalog::all_tools().any(|t| t.id == extend_path::ID));
|
|
assert!(create("pen").is_none() && heading("pen").is_none());
|
|
}
|
|
}
|