Commit Graph
208 Commits
Author SHA1 Message Date
dotCooCoo a04159b287 Graphic Styles: Redefine Graphic Style keeps the own style of a path inside a series group linked to the target
graphicStyle.redefine passed the redefined style to every path directly in a
graph series group linked to it, and to every line and label of a linked Axes
or Legend group, so a member linked to another style (the `from` style or a
third one) was restyled and relinked to the target. Such a member now keeps
its look and its link, in the `from` and the object forms; unlinked members
and members still linked to the target follow as before. The group is still
cleared and unlinked, and one undo takes it all back.
2026-11-20 14:39:10 -08:00
dotCooCoo 2b29011f11 Graphs: library designs redraw symbol graphs with kept designs, scatter point markers use the plotted range
A graph design brought in from another document now draws the graphs in the
art of the symbols that came with it with the designs the document kept under
the same names. A scatter graph's point markers are limited to the designs of
its plotted pairs of series, as the legend markers are, so naming a design for
a slot the graph never draws no longer redraws the graph when that design
comes in.
2026-11-19 13:24:09 -08:00
dotCooCoo 42d22b6cc6 Merge main into feat/graph-designs-from-other-document
# Conflicts:
#	crates/engine/src/cmd/clipboard/resources.rs
2026-11-19 06:48:38 -08:00
dotCooCoo 9d2bbbc6b4 Graphs: redraw graphs a paste or library adds a design for, reuse redrawn symbols
- A paste that adds a design the document lacked draws the document's
  graphs that name it again, in the same undo step; the pasted graphs keep
  their art.
- A library design brings along the designs its art uses, and the graphs
  that name any of them are drawn again. A design the document keeps
  brings none of the library design's resources.
- Only a series that draws a design is redrawn for it: a marker counts
  while Mark Data Points is on or the legend has an entry for the series,
  and a column design counts for a column or bar series.
- A symbol pasted a second time is the one the first paste added and drew
  again with the document's designs.
- Renaming a design renames it in the graphs of symbols and opacity masks,
  and Select Unused counts those graphs.
- swatch.library.load reads a file no further than the 256 MB limit.
2026-11-19 06:18:09 -08:00
dotCooCoo 4137b8e50a Graphs: keep pasted graph edits, redraw graphs in pasted symbols and masks
- A paste redraws a graph with the document's design of the same name only
  when that design's art differs or uses a resource the paste renamed or
  merged, so an unrelated rename no longer redraws every pasted graph.
- Graphs in the art of symbols the paste added, and graphs in opacity-mask
  art, are drawn again with the document's design as well.
- Adding or deleting a graph design also redraws the graphs in symbols'
  art and in opacity-mask art that use it. A dynamic symbol's instances
  drop their changes to graph parts that the redraw replaced.
- Applying a library design to a graph that was moved or resized keeps its
  new place in Graph Column and Graph Marker.
- swatch.library.load refuses inline data and dataBase64 larger than
  256 MB before copying or decoding them.
- A document with graph designs and no swatches of its own loads as a
  library with no swatches. Its designs keep the document's swatches and
  graphic styles that share a name with a new document's defaults.
- graph.column, graph.marker and graph.design match a library's name in
  any case, as the swatch library commands do.
2026-11-18 18:02:13 -08:00
dotCooCoo 877ecb27f1 Merge main into feat/graph-designs-from-other-document 2026-11-18 13:11:26 -08:00
dotCooCoo a43606c8a3 Merge main into perf/appearance-written-set 2026-11-18 07:31:59 -08:00
BFlat dd3a1886a6 Merge pull request #7764 from dotCooCoo/feat/dataset-import-graph-columns
Variables: Import Data Sets reads % columns of graph data files
2026-11-18 10:15:07 +07:00
dotCooCoo 0ee110abfe Appearance: row edits look up written objects in a set
appearance.setItem, appearance.duplicateItem and fill and stroke edits
aimed at a row (`item`) keep, for graph labels and lines, the objects
whose shown row the edit wrote. Each object was looked up in a list of
the written objects, so that step took time that grows with the square
of the number of objects. The written objects are now collected into a
set first. The objects kept, their order and the rows a graph keeps are
the same.

crates/engine/examples/appearance_rows_bench.rs times both lookups on
the same ids in one process and the whole commands. With 20,000
squares, each command given every square's id, the lookup takes 0.4 ms
of thread CPU time on Linux against 57 ms, and appearance.setItem takes
96 ms against 158 ms. At 2,000 objects the difference is about 2 ms.
2026-11-17 10:24:55 -08:00
dotCooCoo 386b2e9d30 Merge main into feat/graph-designs-from-other-document 2026-11-17 08:41:51 -08:00
dotCooCoo 4e8ff28cb4 .ai graphs: a filled-line series keeps no stroke, so turning Draw Filled Lines off draws its thin line
A series read from bands with unstroked markers, or bands alone, kept an
explicit no-stroke paint. With Draw Filled Lines turned off, the thin line
took that paint and was not drawn. Such a series now keeps no stroke, as a
graph drawn here does, and its thin line is drawn in the series color at
1 pt. A series whose markers carry a stroke keeps it.
2026-11-16 04:36:43 -08:00
dotCooCoo f8fe5f06e1 .ai graphs: Draw Filled Lines and its Line Width open live and save through the Gy record
A line graph whose style record draws its lines as shapes now opens as a
live graph with Draw Filled Lines on, and its lineShapeWidth becomes the
Line Width (3 pt reads as the default). The flag is ignored when the
points are not connected, as the published file format specification
says (printed pp. 147-148). Saving writes both values in the Gy record.

- Widths from 0.01 to 100 pt are kept. A wider Line Width, a width under
  0.01 pt with filled lines, and filled lines without connected points
  are saved as the graph's art with the existing warning.
- In a filled-line series, a filled path with the thin black band
  outline is read as a band and does not set the series stroke. A
  filled path with another outline must be a square marker or legend
  swatch; otherwise the graph keeps its art as plain objects.
- The reader in crates/eps/src/import/ai/read/graph.rs reads each value
  the writer in crates/eps/src/ai_graph.rs writes; the save-then-open
  tests cover the default, 8 pt and 150 pt widths in both .ai forms.
2026-11-16 03:32:59 -08:00
BFlat 2babc877e7 Merge pull request #7375 from dotCooCoo/fix/graph-axis-paint-kept
Graphs: axis lines, tick marks and radar rings keep the paint set on them
2026-11-16 12:54:58 +07:00
dotCooCoo c71a1eb540 Merge main into fix/graph-axis-paint-kept
Main now stores a line's or label's added rows by kind (Keep::Kinds),
rewritten paint and row attributes (capture_line_row_writes) and no-op
reorders the way this branch did, so its versions are kept. The branch
adds on top: a stroke painted on a line after its kind lost its stroke
keeps that line's weight, a pasted graph's axis and ring line rows follow
a renamed swatch, and the paint.swap params text says only what the swap
changes is stored.
2026-11-15 19:56:47 -08:00
dotCooCoo bbefef0d65 Merge main into feat/graph-filled-line-width 2026-11-15 18:36:02 -08:00
BFlat 4512fab69b Merge pull request #7412 from dotCooCoo/fix/graph-axes-group-edits-kept
Graphs: Appearance edits given the Axes or Legend group are kept
2026-11-16 09:32:35 +07:00
dotCooCoo 2eb1dc44d1 Merge main into fix/graph-stacked-column-legend-stroke 2026-11-15 13:43:18 -08:00
dotCooCoo 886c7bef8c Merge main into fix/graph-axes-group-edits-kept 2026-11-15 13:41:56 -08:00
dotCooCoo cbee54549b Merge main into fix/graph-axis-paint-kept 2026-11-15 13:41:36 -08:00
BFlat aeeb4e8b1c Merge pull request #7895 from dotCooCoo/fix/pasted-pie-labels-follow-merged-swatch
Paste: legend labels in a pie's wedges follow wedges that take the document's swatch
2026-11-16 04:31:18 +07:00
BFlat 910b79119b Merge pull request #7368 from dotCooCoo/fix/graph-design-art-paint
Graphs: paint, stroke and transparency commands leave a design's art in a series out
2026-11-16 04:30:58 +07:00
dotCooCoo 5412c911cf Graph Type: Draw Filled Lines takes a Line Width
Graph Type has a Line Width field next to Draw Filled Lines, and
`graph.setType` takes `lineWidth` in points (0.01 to 1000; 3 when the
graph sets none). Filled lines are drawn at that width, and the width is
kept through save and open. A graph stores a width only when it is not
3 pt, and a graph with a width of its own is written to .ai as its art.
`graph.setType` with options that leave the graph as it is records no
undo step.
2026-11-15 12:39:45 -08:00
dotCooCoo 92b3b10e7b Graphs: legend swatches have the stroke of their series' marks
A default legend swatch of a stacked column, stacked bar, area or pie
series now has the thin white stroke the series' marks have, beside the
plot or across the top. Before, the swatch had no stroke, so the series
group painted with two strokes and a drawn stacked column or area graph
was saved to .ai as plain art with a warning. Both now open again as live
graphs. Stacked bar graphs are still written as art: the .ai reader has
no type for them.
2026-11-15 12:27:19 -08:00
dotCooCoo 1bdc03d2ad Graphs: a stroke painted after an axis line lost its stroke keeps a weight
When one line of a kind had its stroke set to None, the kind kept a zero
stroke weight. Painting the stroke of another line of that kind kept only
the new paint, so the next redraw drew every line of the kind with no
weight. The kind now takes the painted line's weight when it kept no
stroke paint before the edit. A zero weight set together with a stroke
color, or kept with a painted stroke, stays as set.
2026-11-15 11:53:45 -08:00
dotCooCoo f60d329363 Graphs: rewritten axis line paint and no-op reorders keep what a kind keeps
paint.setFill, paint.setStroke, addon.color.fillToStroke and
addon.color.strokeToFill on an axis line, tick mark or radar ring that
already showed the paint they write stored nothing, so a paint its kind
kept from another line came back when the graph was drawn again. The
paint written to the line's topmost visible fill or stroke row is now
stored for its kind; its other attributes stay as the kind keeps them.
That capture runs after the change-based one, so the frontmost written
line sets the paint its kind keeps.

An appearance.moveItem that left a graph label's rows or Contents row
where they were stored that label's rows for its kind, replacing the
rows the kind kept from another label, and recorded an undo step. A
reorder now keeps rows only for the labels and lines whose stack it
changed.
2026-11-15 10:39:30 -08:00
dotCooCoo 1a78011eae Merge main into fix/graph-design-art-paint 2026-11-15 10:13:04 -08:00
dotCooCoo f73280731a Paint: invert and complement of a group remember the fill its proxy shows
paint.invert and paint.complement given a group with a fill or stroke of
its own remembered the new paint of the first object inside it, while the
Fill and Stroke proxies show the group's own paint. The remembered paint
now follows the proxy: for each object given, in order, a group whose own
fill or stroke changed gives that paint, otherwise the first object inside
it that is not graph design art does.
2026-11-15 10:07:33 -08:00
dotCooCoo 3e2a2ad9ac Paint: invert and complement of a group of design art remember its new fill
paint.invert and paint.complement given a group whose own fill or stroke
changed, with only graph design art inside it, left the last color and
the recent colors as they were, because the remembered paint was taken
only from the objects inside the group. It now comes from the first
group whose own fill or stroke changed. A recolor that changes no
group's paint, such as the complement of a gray fill, remembers nothing.
2026-11-15 09:41:04 -08:00
dotCooCoo 24867f7827 Paste: legend labels in a pie's wedges follow wedges that take the document's swatch
When a pasted pie's wedge links a global swatch that the document gives
another color (swatchConflict "merge", the default), the wedge takes the
document's color. Its legend label kept the contrast it had in the copy,
so a wedge that turned dark could show a black label, and one that
turned light a white label, until the pie was drawn again.

Pasting now reads which wedges show a dark fill before the copy is
linked to the document's swatches. A pie whose wedges change darkness
gets the legend label contrast a redraw sets: white on a dark wedge,
black on a light one. Pies whose legend labels have a fill of their own
keep it. This applies to every paste command, Paste without Formatting
included, and to pies inside opacity masks.
2026-11-15 08:53:31 -08:00
dotCooCoo 0cf2aa3f79 Effects: removing or duplicating several aligned effects of a design's art refuses one that no object has
With the art of a graph design in a series given first and aligned: true,
effect.remove and effect.duplicate with `indices` skipped an effect of the
art that no other object has, and edited the others. With art [shadow,
roughen], a mark [shadow] and indices [0, 1], effect.remove took the
mark's shadow off and succeeded. Such an edit is now an error that leaves
the document and its undo history as they are, as the same index given
alone already was. An object that lacks one of the effects while another
object has it is still left out for that effect.
2026-11-15 08:36:31 -08:00
dotCooCoo 94c815d971 Paint: invert and complement of design art alone still reject a bad target
paint.invert and paint.complement given only the art of a graph design,
with no item, returned success for a target other than "object" or
"contents", because the topmost-fill path read the target only after the
early return for design art. The target is now read before that return.
2026-11-15 08:36:20 -08:00
dotCooCoo 3c0d32c1c3 Graphs: CSV graph data keeps the series labels given, as Graph Data does
Graph data applied as CSV kept a blank series label for each column after
the last label given, because to_csv writes one for every series without a
label. A graph data file named in an Import Data Sets % column therefore
gave the graph ["A", ""] where Graph Data's Import Data and Apply give it
["A"]. The CSV branch of apply_data now drops trailing blank labels, as
graph_data_from_grid does; blank labels between given ones stay.
2026-11-15 08:28:07 -08:00
dotCooCoo d39334a751 Graphs: a row written to an axis line is kept for its kind
appearance.addFill and appearance.addStroke on an axis line, tick mark
or radar ring stored only the attributes the new row changed on the
line, so a stroke the kind kept from another line came back when the
graph was drawn again, although the line showed the new black stroke.
They now store the row they add for the line's kind when it becomes the
line's topmost visible row of its kind.

An appearance.copyFrom of some attributes, appearance.setItem and
stroke.set stored only what they changed, so a paint, stroke weight,
row opacity or blend mode that the line already showed did not replace
what its kind kept. What they write to the line's topmost visible rows
is now stored for the kind, as paint.setStroke stores the paint it
writes. Row opacity and blend mode are stored apart, so an edit of one
leaves the other as the kind keeps it, and a null weight or opacity
writes nothing.
2026-11-15 08:25:21 -08:00
dotCooCoo 94d2625c60 Graphs: an appended pick or a swap on a label or axis line keeps only what it changes
appearance.copyFrom with append stored every fill and stroke row a graph
label or line showed for its kind. A fill-only pick appended to one line
or label copied its old stroke over the stroke another one had set, and
the next redraw lost it. The kind now keeps only the kinds of row the
pick adds that are visible in the source, as graphicStyle.apply with add
does, and the object opacity and blend mode only when the pick applies
the object's transparency.

paint.swap on an axis line stored the line's whole fill and stroke rows,
so a fill opacity its kind kept from another line went back to 100%. It
now keeps only the paints the swap changed.
2026-11-15 06:57:45 -08:00
dotCooCoo ef3a632869 Merge main into feat/dataset-import-graph-columns 2026-11-15 06:16:34 -08:00
dotCooCoo 6f009131fb Merge main into feat/graph-designs-from-other-document 2026-11-15 06:12:51 -08:00
dotCooCoo 3d85f7d617 Merge main into fix/graph-axes-group-edits-kept 2026-11-15 06:09:38 -08:00
dotCooCoo a83c7a8bb3 Merge main into fix/graph-axis-paint-kept 2026-11-15 06:08:10 -08:00
dotCooCoo cb368c29e4 Merge main into fix/paste-plain-graph-labels 2026-11-14 23:52:57 -08:00
dotCooCoo f3a4c0ac1a Paste: Paste without Formatting also drops a pie's own legend fill mark
Paste without Formatting dropped the label formats a pasted graph keeps
but left the mark that its legend labels' fill is their own. After a later
change to a legend label (its size, for example), the next redraw read the
default black fill as the labels' own and drew them black on dark wedges
again. The mark now stays behind with the other formats.

A pie's legend label whose series name holds line breaks of its own (from
a quoted CSV cell) is now located by all of its lines, as a redraw centers
it. Before, only `|` counted as a line break, so a tall label on stacked
pies could take the contrast of the wrong ring.

Paste no longer recolors the legend labels of a pie whose wedges a merged
or changed swatch recolors. That is a separate change to Paste and goes in
its own pull request. Paste without Formatting sets the legend labels by
the wedge colors as copied.
2026-11-14 23:51:27 -08:00
BFlat 04b91c748e Merge pull request #7648 from dotCooCoo/feat/graph-type-dialog
Graphs: Graph Type is a dialog of its own with type buttons and a page per axis
2026-11-15 14:42:05 +07:00
dotCooCoo 277fdb15c7 Paste: Paste without Formatting keeps a pasted graph's labels plain when it is drawn again
A graph keeps its labels' character and paragraph formats for each redraw.
Paste without Formatting reset the labels' text but left those formats in
the graph, so the next redraw (Graph Data, Graph Type) gave the labels their
source formatting back.

Paste without Formatting now drops the formats the graph keeps and sets the
pasted labels as a new graph's labels are set: 9 pt black, unscaled (a
rotated graph's labels keep their rotation), default paragraph attributes,
each keeping its alignment, and white on a dark pie wedge. Before, they took
12 pt and lost their alignment. The rest of the graph's art is pasted as it
was copied. A swatch-linked character fill the graph kept for its labels
stays behind with the other formats.

When the document's swatches give a pasted pie's wedges another color (a
swatch merged into the document's swatch of that name, or a swatch changed
in the document the pie was copied from), Paste and Paste without Formatting
set the legend labels in those wedges white on a dark wedge and black on a
light one, as a redraw does. Before, they kept the color chosen for the
copied wedge, which could leave white text on a light wedge. A label whose
characters are not all white or all black keeps its colors.
2026-11-14 22:09:08 -08:00
dotCooCoo 8f5aed7ea4 Variables: Import Data Sets reads % columns of graph data files
dataset.import refused every header cell that starts with % unless it was
a variable's exact name, so the five-column example on the data source
set-up page did not import. A %Name header now defines the graph variable
Name, or names it when the document has it, and each cell of the column is
the path of a graph data file. The file is read as the Graph Data window's
Import Data reads one, and the data becomes the data set's graph value,
which applies as graph.setData applies it.

A relative path is taken from the new base parameter, else from the folder
of the CSV file at path. A file that is missing, can't be read or is larger
than 1 MB, a file that gives a graph value longer than 256 KB, and %
columns that hold more than 256 MB in all refuse the import with the line
and the column, and the document is left as it was. Each file is read once
per import.

Import Data's text decoding, cell splitting and sheet-to-data steps move
from the Graph Data dialog to the engine (graph/data.rs), so both imports
read a file the same way. dataset.export's warning now lists a % header
over values as refused and a %-prefixed variable of another kind as read
back with another kind.
2026-11-14 22:07:06 -08:00
dotCooCoo 554369eae0 Merge main into fix/graph-axis-paint-kept 2026-11-14 21:49:46 -08:00
dotCooCoo 7c82381f5b Merge main into fix/graph-axes-group-edits-kept 2026-11-14 21:46:50 -08:00
dotCooCoo 93789dd3e3 Merge main into fix/graph-design-art-paint 2026-11-14 21:45:07 -08:00
dotCooCoo 45c7d04308 Merge main into feat/graph-designs-from-other-document 2026-11-14 21:43:39 -08:00
dotCooCoo 021e4dc4ca Graphs: a style added to a label or axis line keeps only the rows it shows
graphicStyle.apply with add stored both the fill and stroke rows a graph
label or line showed for its kind. A fill-only style added to one line
copied that line's old stroke over the stroke another line had set, and
the next redraw lost it. The kind now keeps only the kinds of row visible
in the style, with the other kind of row kept in its place relative to
the characters.
2026-11-14 21:38:42 -08:00
dotCooCoo ffd959680f Graphs: copies of design art made by a series group's Transform effect keep their effects on Expand Appearance
Expand Appearance leaves the art of a graph design in a series as it is. A Transform effect of a
series group that makes copies gave each copy new ids, so the copies were expanded and their own
effects, such as a drop shadow, became embedded images. The new ids of those copies are now left out
too; the series group's own effect still bakes into them.
2026-11-14 20:46:27 -08:00
dotCooCoo 7c0611ac6d Merge main into feat/graph-designs-from-other-document 2026-11-14 20:30:22 -08:00