mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-10-27 11:17:01 -06:00
M3.76: Attributes panel with overprint, centre point, path direction, fill rule, image map, URL and note
Window > Attributes (Cmd+F11) shows Overprint Fill/Stroke, Show/Don't Show Center, Reverse Path Direction Off/On, the non-zero / even-odd fill rule, Image Map, a URL field with recent URLs and a Browser button, and a note. New commands attributes.set and path.setFillRule; path.reverse takes ids and reversed; attributes.info reports every value. Objects keep the attributes in Node.attrs. SVG export wraps linked objects in <a>, and import reads links back. The canvas draws the centre point of selected objects that show it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
bflatastic
co-authored by
Claude Opus 5.5
Claude Opus 5.5
parent
9fcefde3f9
commit
4591c85845
@@ -0,0 +1,185 @@
|
||||
//! Window → Attributes: overprint, centre point display, image map, URL and note
|
||||
//! (`attributes.set`), the fill rule (`path.setFillRule`) and, through `path.reverse`, the path
|
||||
//! direction. The panel reads everything back with `attributes.info` ([`super::overprint`]).
|
||||
|
||||
use std::collections::BTreeSet;
|
||||
|
||||
use serde_json::{Value, json};
|
||||
use vectorcraft_doc::{Document, ImageMap, Node, NodeKind, ObjectAttributes};
|
||||
use vectorcraft_geom::FillRule;
|
||||
|
||||
use super::overprint::{AttributesInfo, apply_overprint, edit_counted, overprint_jobs};
|
||||
use super::path::paths_in;
|
||||
use super::*;
|
||||
|
||||
/// How many URLs the Attributes panel's recent list keeps.
|
||||
const RECENT_URLS: usize = 10;
|
||||
|
||||
pub fn specs() -> Vec<CommandSpec> {
|
||||
vec![
|
||||
cmd!(
|
||||
"attributes.set",
|
||||
"Attributes",
|
||||
[],
|
||||
None,
|
||||
"{overprintFill?: bool, overprintStroke?: bool (aimed as object.setOverprint's fill and stroke, item? too), showCenter?: bool (the canvas shows the selected object's centre point), imageMap?: \"none\"|\"rectangle\"|\"polygon\", url?: string (\"\" removes it; SVG export links the object), note?: string, ids?} set the Attributes panel's values on ids or the selection, as one undo step; a URL given joins the recent URLs (attributes.info) → {changed: objects}",
|
||||
has_doc,
|
||||
set
|
||||
),
|
||||
cmd!(
|
||||
"path.setFillRule",
|
||||
"Fill Rule",
|
||||
[],
|
||||
None,
|
||||
"{rule: \"nonZero\"|\"evenOdd\", ids?} the fill rule of the paths and compound paths in ids or the selection (groups: those inside), as one undo step → {changed}",
|
||||
has_doc,
|
||||
set_fill_rule
|
||||
),
|
||||
]
|
||||
}
|
||||
|
||||
/// A fill rule as the commands name it.
|
||||
pub(super) fn rule_name(r: FillRule) -> &'static str {
|
||||
match r {
|
||||
FillRule::NonZero => "nonZero",
|
||||
FillRule::EvenOdd => "evenOdd",
|
||||
}
|
||||
}
|
||||
|
||||
fn parse_rule(s: &str) -> Option<FillRule> {
|
||||
match s.to_ascii_lowercase().replace(['-', ' ', '_'], "").as_str() {
|
||||
"nonzero" | "nonzerowinding" => Some(FillRule::NonZero),
|
||||
"evenodd" => Some(FillRule::EvenOdd),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
/// The one value every item of `it` shares, if any.
|
||||
fn same<T: PartialEq>(mut it: impl Iterator<Item = T>) -> Option<T> {
|
||||
let first = it.next()?;
|
||||
it.all(|v| v == first).then_some(first)
|
||||
}
|
||||
|
||||
/// The paths and compound paths in `n`'s subtree that have a fill rule of their own with it (not a
|
||||
/// compound path's members, which fill with its rule).
|
||||
fn ruled<'a>(n: &'a Node, out: &mut Vec<(&'a Node, FillRule)>) {
|
||||
match &n.kind {
|
||||
NodeKind::Path { rule, guide: false, .. } | NodeKind::Compound { rule, .. } => out.push((n, *rule)),
|
||||
_ => n.children().into_iter().flatten().for_each(|c| ruled(c, out)),
|
||||
}
|
||||
}
|
||||
|
||||
/// The Attributes panel's values of `info.ids` beyond overprinting.
|
||||
pub(super) fn fill_info(d: &Document, info: &mut AttributesInfo) {
|
||||
let nodes: Vec<&Node> = info.ids.iter().filter_map(|id| d.node(*id)).collect();
|
||||
let attrs = || nodes.iter().map(|n| n.attrs.as_deref().cloned().unwrap_or_default());
|
||||
info.show_center = same(nodes.iter().map(|n| n.shows_center()));
|
||||
info.image_map = same(attrs().map(|a| a.image_map));
|
||||
info.url = same(attrs().map(|a| a.url));
|
||||
info.note = same(attrs().map(|a| a.note));
|
||||
let mut all = vec![];
|
||||
nodes.iter().for_each(|n| ruled(n, &mut all));
|
||||
info.fill_rule = same(all.into_iter().map(|(_, r)| r));
|
||||
let paths = paths_in(d, &info.ids);
|
||||
let subpaths = paths.iter().filter_map(|id| d.node(*id)?.path_data()).flat_map(|p| &p.subpaths);
|
||||
info.reversed = same(subpaths.map(|sp| sp.signed_area() < 0.0));
|
||||
}
|
||||
|
||||
/// The attribute edits `p` asks for, applied to `a`.
|
||||
#[derive(Default)]
|
||||
struct Edits {
|
||||
show_center: Option<bool>,
|
||||
image_map: Option<ImageMap>,
|
||||
url: Option<String>,
|
||||
note: Option<String>,
|
||||
}
|
||||
|
||||
impl Edits {
|
||||
fn parse(p: &Value) -> Result<Self> {
|
||||
const C: &str = "attributes.set";
|
||||
let text = |k: &str| -> Result<Option<String>> {
|
||||
p.get(k).map(|v| v.as_str().map(|s| s.trim().to_string()).ok_or_else(|| bad(C, format!("`{k}` must be a string")))).transpose()
|
||||
};
|
||||
Ok(Self {
|
||||
show_center: p.get("showCenter").map(|v| v.as_bool().ok_or_else(|| bad(C, "`showCenter` must be true or false"))).transpose()?,
|
||||
image_map: text("imageMap")?
|
||||
.map(|s| ImageMap::parse(&s).ok_or_else(|| bad(C, "`imageMap` must be none, rectangle or polygon")))
|
||||
.transpose()?,
|
||||
url: text("url")?,
|
||||
note: text("note")?,
|
||||
})
|
||||
}
|
||||
|
||||
fn is_empty(&self) -> bool {
|
||||
self.show_center.is_none() && self.image_map.is_none() && self.url.is_none() && self.note.is_none()
|
||||
}
|
||||
|
||||
/// `n`'s attributes with the edits applied (Show Center kept only where it isn't the default).
|
||||
fn apply(&self, n: &Node) -> ObjectAttributes {
|
||||
let mut a = n.attrs.as_deref().cloned().unwrap_or_default();
|
||||
if let Some(v) = self.show_center {
|
||||
a.show_center = (v != n.shows_center_by_default()).then_some(v);
|
||||
}
|
||||
if let Some(v) = self.image_map {
|
||||
a.image_map = v;
|
||||
}
|
||||
if let Some(v) = &self.url {
|
||||
a.url.clone_from(v);
|
||||
}
|
||||
if let Some(v) = &self.note {
|
||||
a.note.clone_from(v);
|
||||
}
|
||||
a
|
||||
}
|
||||
}
|
||||
|
||||
fn set(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
const C: &str = "attributes.set";
|
||||
let jobs = overprint_jobs(s, p, C, ["overprintFill", "overprintStroke"])?;
|
||||
let edits = Edits::parse(p)?;
|
||||
if jobs.is_empty() && edits.is_empty() {
|
||||
return Err(bad(C, "give overprintFill, overprintStroke, showCenter, imageMap, url or note"));
|
||||
}
|
||||
let ids = targets(s, p)?;
|
||||
let changed = edit_counted(s, "Attributes", |d| {
|
||||
let mut changed = BTreeSet::new();
|
||||
apply_overprint(d, &jobs, C, &mut changed)?;
|
||||
if !edits.is_empty() {
|
||||
for id in &ids {
|
||||
let Some(n) = d.node(*id) else { continue };
|
||||
let new = edits.apply(n);
|
||||
if new != n.attrs.as_deref().cloned().unwrap_or_default()
|
||||
&& let Some(n) = d.node_mut(*id)
|
||||
{
|
||||
n.edit_attrs(|a| *a = new);
|
||||
changed.insert(*id);
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(changed.len())
|
||||
})?;
|
||||
if let Some(url) = edits.url.filter(|u| !u.is_empty() && !ids.is_empty()) {
|
||||
s.recent_urls.retain(|u| *u != url);
|
||||
s.recent_urls.insert(0, url);
|
||||
s.recent_urls.truncate(RECENT_URLS);
|
||||
}
|
||||
Ok(json!({ "changed": changed }))
|
||||
}
|
||||
|
||||
fn set_fill_rule(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
const C: &str = "path.setFillRule";
|
||||
let rule = str_param(p, "rule").and_then(parse_rule).ok_or_else(|| bad(C, "`rule` must be nonZero or evenOdd"))?;
|
||||
let ids = targets(s, p)?;
|
||||
let changed = edit_counted(s, "Fill Rule", |d| {
|
||||
let mut all = vec![];
|
||||
ids.iter().filter_map(|id| d.node(*id)).for_each(|n| ruled(n, &mut all));
|
||||
let todo: BTreeSet<_> = all.into_iter().filter(|(_, r)| *r != rule).map(|(n, _)| n.id).collect();
|
||||
for id in &todo {
|
||||
if let Some(NodeKind::Path { rule: r, .. } | NodeKind::Compound { rule: r, .. }) = d.node_mut(*id).map(|n| &mut n.kind) {
|
||||
*r = rule;
|
||||
}
|
||||
}
|
||||
Ok(todo.len())
|
||||
})?;
|
||||
Ok(json!({ "changed": changed }))
|
||||
}
|
||||
Reference in New Issue
Block a user