pauljd/vectorcraft
1
0
Fork 0
mirror of https://github.com/storytold/vectorcraft.git synced 2026-11-14 08:56:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Graphs: a paint command that leaves a series' stored paint as it was records no undo step

Browse Source 
The graph compares the paints a command leaves on it with the paints it
stored before the command, not with the value before each mark's
capture. Apply Fill to Stroke on two marks whose strokes already had
their fills stored the back mark's stroke and then the front mark's
again, and recorded an undo step with nothing changed. The same
comparison applies to the opacity and blend mode a series keeps.

docs/mcp.md states that only the topmost visible row's paint is stored,
and the Graphs line of docs/target-app-parity.md states that a series
that draws Filled Lines bands keeps no stroke paint or weight.
This commit is contained in:
dotCooCoo
2026-11-13 09:37:35 -08:00
parent c44392a4d0
commit c1ba246bb3
4 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/engine/src/cmd/graph/series.rs
+30 -14
View File
@@ -209,13 +209,32 @@ fn series_draws_bands(g: &GraphSpec, i: usize) -> bool {
}
}
/// Store each capture (graph, series index, fill or stroke, paint, stroke weight) in its series. Returns whether a
/// series' captured fill or stroke changed.
fn store_series_paints(doc: &mut Document, captures: Vec<(NodeId, usize, bool, Paint, Option<f64>)>) -> bool {
/// Each graph's stored series paints before an edit's first capture into it. A later capture can put back what an earlier
/// one changed, so an edit compares what it leaves with these ([`settle_series_paints`]).
type SeriesPaintsBefore = HashMap<NodeId, Vec<vectorcraft_doc::SeriesPaint>>;
/// Does any graph in `before` now store other series paints than it did before the edit's first capture? Slots the
/// captures added past the old end and left empty are removed again, so they do not count as a change.
fn settle_series_paints(doc: &mut Document, before: SeriesPaintsBefore) -> bool {
let mut changed = false;
for (graph, was) in before {
let Some(spec) = doc.node_mut(graph).and_then(|n| n.extras_if_any().and_then(|e| e.graph.as_deref_mut())) else { continue };
let empty = vectorcraft_doc::SeriesPaint::default();
if spec.series_paints.get(was.len()..).is_some_and(|added| added.iter().all(|slot| *slot == empty)) {
spec.series_paints.truncate(was.len());
}
changed |= spec.series_paints != was;
}
changed
}
/// Store each capture (graph, series index, fill or stroke, paint, stroke weight) in its series. Returns whether a
/// series' captured fill or stroke differs from what the graph stored before the first capture.
fn store_series_paints(doc: &mut Document, captures: Vec<(NodeId, usize, bool, Paint, Option<f64>)>) -> bool {
let mut before = SeriesPaintsBefore::new();
for (graph, index, fill, paint, width) in captures {
let Some(spec) = doc.node_mut(graph).and_then(|n| n.extras_if_any().and_then(|e| e.graph.as_deref_mut())) else { continue };
let was = spec.series_paints.clone();
before.entry(graph).or_insert_with(|| spec.series_paints.clone());
// `index` is below the graph's series count (`series_members`).
if spec.series_paints.len() <= index {
spec.series_paints.resize(index + 1, vectorcraft_doc::SeriesPaint::default());
@@ -227,9 +246,8 @@ fn store_series_paints(doc: &mut Document, captures: Vec<(NodeId, usize, bool, P
slot.stroke = Some(paint);
slot.stroke_width = width;
}
changed |= spec.series_paints != was;
}
changed
settle_series_paints(doc, before)
}
/// Copy the opacity and blend mode of the topmost visible fill (`true`) or stroke (`false`) of generated series art just
@@ -256,14 +274,14 @@ pub(crate) fn capture_series_opacity(doc: &mut Document, edited: &[(NodeId, bool
Some((r.graph, r.index, *fill, (opacity < 1.0).then_some(opacity), (blend != BlendMode::Normal).then_some(blend)))
})
.collect();
let mut changed = false;
let mut before = SeriesPaintsBefore::new();
for (graph, index, fill, kept, blend) in captures {
let Some(spec) = doc.node_mut(graph).and_then(|n| n.extras_if_any().and_then(|e| e.graph.as_deref_mut())) else { continue };
// A fully opaque Normal row on a series the graph keeps nothing for leaves the graph as it is.
if kept.is_none() && blend.is_none() && spec.series_paints.len() <= index {
continue;
}
let was = spec.series_paints.clone();
before.entry(graph).or_insert_with(|| spec.series_paints.clone());
// `index` is below the graph's series count (`series_members`).
if spec.series_paints.len() <= index {
spec.series_paints.resize(index + 1, vectorcraft_doc::SeriesPaint::default());
@@ -274,32 +292,30 @@ pub(crate) fn capture_series_opacity(doc: &mut Document, edited: &[(NodeId, bool
} else {
(slot.stroke_opacity, slot.stroke_blend) = (kept, blend);
}
changed |= spec.series_paints != was;
}
changed
settle_series_paints(doc, before)
}
/// Copy the object opacity and blend mode of generated series art just edited (`edited`) into that series' object opacity
/// and blend mode. Called inside the same document edit, so both undo together. Returns whether a series' kept object
/// opacity or blend mode changed.
pub(crate) fn capture_series_object_opacity(doc: &mut Document, edited: &[NodeId]) -> bool {
let mut changed = false;
let mut before = SeriesPaintsBefore::new();
for (graph, index, opacity, blend) in object_opacity_captures(doc, edited) {
let Some(spec) = doc.node_mut(graph).and_then(|n| n.extras_if_any().and_then(|e| e.graph.as_deref_mut())) else { continue };
// A fully opaque Normal object on a series the graph keeps nothing for leaves the graph as it is.
if opacity.is_none() && blend.is_none() && spec.series_paints.len() <= index {
continue;
}
let was = spec.series_paints.clone();
before.entry(graph).or_insert_with(|| spec.series_paints.clone());
// `index` is below the graph's series count (`series_members`).
if spec.series_paints.len() <= index {
spec.series_paints.resize(index + 1, vectorcraft_doc::SeriesPaint::default());
}
let Some(slot) = spec.series_paints.get_mut(index) else { continue };
(slot.opacity, slot.blend) = (opacity, blend);
changed |= spec.series_paints != was;
}
changed
settle_series_paints(doc, before)
}
/// Would [`capture_series_object_opacity`] change what the graph stores for `edited`? Reads the document without copying
crates/engine/src/cmd/graph/tests.rs
+21
View File
@@ -2043,6 +2043,27 @@ fn a_paint_command_on_several_marks_of_a_series_stores_the_frontmost_ones_paint(
assert_eq!(spec(&s, id).series_paints[0].stroke, Some(Paint::None));
}
/// Apply Fill to Stroke on two marks whose strokes already have their fills, while the series stores the front mark's
/// stroke: the back mark's stroke is taken first and the front mark's after it, so the graph ends up storing what it
/// stored before. The document and its undo history stay as they are.
#[test]
fn a_paint_command_that_leaves_a_series_stored_paint_as_it_was_records_no_undo_step() {
let (mut s, id, _, marks) = column_marks();
for (mark, hex, weight) in [(marks[0], "#ff0000", 3), (marks[1], "#0000ff", 2)] {
s.execute("appearance.setItem", &json!({"ids": [mark.0], "index": top_row(&s, mark, true), "color": hex})).unwrap();
s.execute("appearance.setItem", &json!({"ids": [mark.0], "index": top_row(&s, mark, false), "color": hex, "weight": weight})).unwrap();
}
let drawn: Vec<NodeId> = series_parts(&s, id, 0).iter().map(|m| m.id).filter(|m| marks[..2].contains(m)).collect();
assert_eq!(drawn, [marks[0], marks[1]], "the second mark is in front");
let was = s.doc().unwrap().doc.clone();
let blue = fill_of(&s, marks[1]);
assert_eq!(spec(&s, id).series_paints[0].stroke, Some(blue));
let undo = s.doc().unwrap().history.undo.len();
s.execute("addon.color.fillToStroke", &json!({"ids": [marks[1].0, marks[0].0]})).unwrap();
assert_eq!(s.doc().unwrap().doc, was);
assert_eq!(s.doc().unwrap().history.undo.len(), undo);
}
/// A stroke set on a Filled Lines band with `paint.setStroke` or Apply Fill to Stroke is not stored: the band keeps its
/// color and its thin black outline when the graph is drawn again. A fill set with `paint.setFill` is stored.
#[test]