From 4a81e549a236f3847c65cf1f1146906aa98c3680 Mon Sep 17 00:00:00 2001 From: bflatastic Date: Fri, 9 Oct 2026 09:51:49 +0700 Subject: [PATCH] Part of #641: Image Trace: Palette (Limited, Full Tone, Automatic, Document Library) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Color mode's colours now come from a Palette (`palette` in imageTrace.make's params), shown in the Image Trace panel under Mode: - Limited: the `colors` best colours (what Color did before; the default). - Full Tone: median cut until no colour box spans more than 96 (Less) … 8 (More) levels per channel, up to 256 colours, set by `colorDetail` 0-100 (the panel's Colors slider for this palette). - Automatic: flat art (90% of the pixels in a few tight colours) traces with exactly its colours, anything else as Full Tone. - Document Library: the most used (at most `colors`) colours of the document's swatches or of a swatch library (`library`: "document" or a library id or name, chosen in the panel's Library list), used as they are; traced shapes fill with the swatch's own colour, its colour model kept. The library's colours are looked up at every trace, not saved. Co-Authored-By: Claude Opus 5.5 --- ROADMAP.md | 6 +- crates/engine/src/cmd/buildcmds.rs | 33 +++++- crates/engine/src/cmd/swatchlib.rs | 11 +- crates/engine/src/tests_build.rs | 43 +++++++ crates/mcp/src/prompts.rs | 4 +- crates/trace/src/lib.rs | 49 +++++++- crates/trace/src/quantize.rs | 130 ++++++++++++++++++--- crates/trace/src/tests.rs | 90 +++++++++++++++ crates/ui-egui/src/i18n/es.tsv | 5 + crates/ui-egui/src/i18n/fr.tsv | 5 + crates/ui-egui/src/i18n/it.tsv | 5 + crates/ui-egui/src/i18n/ja.tsv | 5 + crates/ui-egui/src/i18n/ru.tsv | 5 + crates/ui-egui/src/i18n/zh-hans.tsv | 5 + crates/ui-egui/src/i18n/zh-hant.tsv | 5 + crates/ui-egui/src/panels/image_trace.rs | 132 ++++++++++++++++++++-- crates/ui-egui/src/tests_removeanchors.rs | 2 +- 17 files changed, 496 insertions(+), 39 deletions(-) diff --git a/ROADMAP.md b/ROADMAP.md index 5827ed8e..4e399fa5 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -4,7 +4,7 @@ VectorCraft is a clean-room, open-source, pure-Rust reimplementation of the Adob This file tracks **how far we are and what's left**. Time estimates are wall-clock hours of continuous Claude Opus 5.5 agent work (including builds and the CI gate), given both for **one agent** and for **4–6 parallel agents** on disjoint crates. They are counted from the remaining work (see [Parity estimate](#parity-estimate)), calibrated against measured throughput, and updated as work lands. -_Last updated: 2026-10-09 (after placed documents (File › Place of a `.vectorcraft` file, linked), M4.14–M4.98, M8.1–M8.20, M14.4–M14.7, the MCP prompts, resource templates, completions and logging, the 2026-10-07 issue fixes, the Layers panel rework and the 2026-10-08 community contributions: Pen and shape-tool modifiers, path editing, Layers, Artboards, Swatches/Brushes and dialogs, Japanese composition and PDF text, Hebrew/Arabic type, interface languages (Spanish among them), the font menu, saved selections, MCP and EPS, the missing-font export warning (#319), open paths in the Shape Builder (#374), PDF/`.ai` import keeping strokes live and hidden and nested layers (#372), per-corner Live Corners (#381), SVG type opening at the size it draws at (#396), the Wayland clipboard with copied-file paste (#398), ruler guides that can be selected, moved and deleted (#414), two batches of Preferences options that were stored but unused (#394), skeleton reads with `document.find` for large documents over MCP (#416) and anchors dragged with Direct Selection snapping to points, segments and smart guides, clipped SVG layers opening as clipping layers (#420), PDF/`.ai` layers read on pages of tens of millions of operators (#419), Document Color Mode putting RGB greys on the black plate on request and converting pattern tiles (#421) and movable dialogs with Offset Path's Joins dropdown (#423) and numeric fields scrubbed by dragging their label (#400), stroke weight presets in the stroke unit (#426), the Appearance panel's Opacity popup (#430), type on a path brackets, flip and Type on a Path Options that keep the type in place (#429), Layers rows dragged with a ghost and dropped on the trash or New Layer (#435), tool flyouts opening on a right or corner press (#436), tool flyouts torn off into floating toolbars (#437), the Shape Builder's erase mode deleting edges too (#439), installed fonts registered outside the font folders and fonts installed while the app runs listed in the font menus (#443), alike circular corners on rectangles that aren't square (#442), tool cursors as OS cursors so the pointer no longer trails over the canvas (#444), artboards copied and pasted with their art (#446), guides dragged out of the rulers snapping to the art's side midpoints and the artboards, artboard guides (#451), the toolbar's double arrow and Window › Toolbars › Double Column switching between one and two columns in any window height (#455), the Smart Guides display options and Snapping Tolerance (#394), Font Size and Leading combo boxes with preset lists in the Character and Properties panels and the Control bar (#458), screenshots pasted from the clipboard on macOS, Windows and the web (#457), the Properties panel's Fill and Stroke matching the Control bar's, Illustrator's Window menu panel keys (Shift+F7 for Align…) and Alt-wheel zoom whatever the wheel preference (Discord feedback), the point/area type widget (Discord feedback), groups in legacy Illustrator .ai files (Discord feedback), a rotating desktop log file (#465), image controls in the Control bar and Properties panel: Image Trace with its presets, Mask, Crop Image, Embed/Unembed, and an Image Trace object's preset, Expand and Release (Discord feedback), the Pen working as the Anchor Point tool with Alt held over a selected path's handles and anchors, and anchor buttons that convert, connect and cut paths at the selected anchors (Discord feedback), Japanese hanging punctuation (burasagari, #463), Escape leaving Presentation Mode with no screen mode saved across restarts, documents dropped on the desktop app opening as tabs of their own and a note that an `.ai` file's art off its artboards isn't in the part read (#472), Add/Delete Anchor Point tool icons drawn from the Pen tool's (#479), EPS import running more of PostScript Level 3 (patterns, Type 3 fonts, mesh shadings, masked images, VM and resource probes), and a preview that stands in saying why (Discord feedback, #466, #469, #474), chords with modifiers recorded in Edit › Keyboard Shortcuts (#487), Type Object Selection by Path Only (#394), Anti-aliased Artwork (#394), Show Pixel Grid (#394), pen and touch taps pressed and lifted within one frame clicking where they tapped and the Linux/Wayland pen-tablet workaround (#491), bounding-box resizes landing on the other objects' anchors and centres with labels, and the Rotate, Scale, Shear and Reflect tools snapping their drags (#482), Shift-drag marquees that toggle the objects or anchors they reach and a Lasso whose Alt subtraction keeps the rest of the selection (#483), the mouse wheel stepping the focused numeric field, the dialogs' and preferences' drag values made such fields (#485), Show The Home Screen When No Documents Are Open (#394), Numbers Without Units Are Points (#394), Auto-Collapse Iconic Panels (#394), the Contextual Task Bar moved by its handle and its More Options menu pinning and resetting its position, a designed macOS DMG window (#493), panels, panel groups and the Tools panel undocking into floating panels that move, stack and dock again (#495), the 0.5.0 startup crash on dual-GPU Linux desktops under Wayland fixed: the desktop's own GPU by default and a restart on the next GPU when one can't show the window (#502), path editing while drawing: Cmd/Ctrl with the Pen borrowing Direct Selection and drawing on afterwards, Pen+Alt reshaping segments, handles of a whole selected path dragging, and handle drags no longer re-gathering snap targets every move (#494), the Control bar's and Properties panel's Convert buttons for a path selected as a whole with Direct Selection, the Pen and the anchor tools (#504), the Pen closing a path dragged out of its first anchor every time, without flicker (#501), the Paste menu checking the system clipboard on a background thread on Linux so an X11 clipboard owner that never answers no longer freezes the window (#510), PDF/`.ai` import keeping a type object's outline stroke on the type, wrapped lines as area type, barcode digits in place and layers in the file's stacking order (#508), the Italian interface (#514), EPS images with several data sources read in turn (#498), `restore` undoing dictionary changes in EPS import (part of #505), the macOS menu bar laid out as a Mac app's (the VectorCraft menu with Settings, Language and Appearance, the system's Hide, Services and Window items; owner's request), Object › Image Trace › Make tracing with the Default preset instead of asking for a preset's name (#543), the rulers' unit menu (#528), Live Corners on stars, polygons and pen paths (#511), the drawing tools snapping to Smart Guides as the Selection tool does, with Construction Guides (#506), the in-window menus' Select All, Cut, Copy and Paste acting on the text field they were opened from (#516), Windows rendering through DX12 before Vulkan (#545), Image Trace tracing colour layers in parallel and refusing traces too large for memory, with the canvas outlining huge selections by their bounds (#525), SVGs of chosen artboards holding only the art over each artboard (#550), the font menu scrolling only its list, under a search field and filters that stay put (#555), a click on an object of a selection making it the key object that Align aligns to and Distribute Spacing spaces from, drawn with a thicker outline (#541), Shape Builder merges taken from the planar map itself, so merged regions leave no inner edge, hairline gap or spur in their outline (#569), `.ai` written by the exports and the CLI (`--export`, `convert`) as Save As writes it (#526), SVG round trips keeping hidden objects and `data-*` attributes (#522), the gradient stop popover staying open after the click that opens it from the Gradient panel (#577), standard ligatures kept under small tracking and dropped only past about −8% / +22% of a word space or when the character asks for them (#583), the Color panel keeping its height as warnings come and go so a drag on its spectrum no longer flickers near white (#578), fonts that font services such as Adobe Fonts load on Windows, listed through DirectWrite (#579), `.ai` files writing their layers and sublayers as PDF layers, hidden ones with their art, and PDF layers nested in layers importing as sublayers (#372), file dialogs on Linux shown off the UI thread so the compositor no longer finds the window not responding, and parented to the window on Linux and Windows (#592), anchors and handle ends picked from 2 px past their drawn size before the segments through them (#593), an image copied in a browser pasting as the picture, not its address (#597), the Free Transform widget with Constrain, Free Transform, Perspective Distort and Free Distort (#598), touch gestures: a two-finger tap undoes and a three-finger tap redoes (#585), the font menus' live preview staying on the text instead of flickering on and off every frame (#563), Edit Artboards showing the active artboard in the Properties panel with New Artboard, Delete Artboard and Exit (#530), the same DirectWrite fonts in `vectorcraft-cli` and its MCP server (#579), SVG layers keeping their names when wrapped and sublayers round-tripping through SVG (#372), a Layers panel that lays out only the rows in view and keeps a document's open rows in its file (#638), a panel dropped on the dock lights up the icon column it goes back to and pops out of its icon (#649); see [Honest assessment](#honest-assessment-2026-10-05))._ +_Last updated: 2026-10-09 (after placed documents (File › Place of a `.vectorcraft` file, linked), M4.14–M4.98, M8.1–M8.20, M14.4–M14.7, the MCP prompts, resource templates, completions and logging, the 2026-10-07 issue fixes, the Layers panel rework and the 2026-10-08 community contributions: Pen and shape-tool modifiers, path editing, Layers, Artboards, Swatches/Brushes and dialogs, Japanese composition and PDF text, Hebrew/Arabic type, interface languages (Spanish among them), the font menu, saved selections, MCP and EPS, the missing-font export warning (#319), open paths in the Shape Builder (#374), PDF/`.ai` import keeping strokes live and hidden and nested layers (#372), per-corner Live Corners (#381), SVG type opening at the size it draws at (#396), the Wayland clipboard with copied-file paste (#398), ruler guides that can be selected, moved and deleted (#414), two batches of Preferences options that were stored but unused (#394), skeleton reads with `document.find` for large documents over MCP (#416) and anchors dragged with Direct Selection snapping to points, segments and smart guides, clipped SVG layers opening as clipping layers (#420), PDF/`.ai` layers read on pages of tens of millions of operators (#419), Document Color Mode putting RGB greys on the black plate on request and converting pattern tiles (#421) and movable dialogs with Offset Path's Joins dropdown (#423) and numeric fields scrubbed by dragging their label (#400), stroke weight presets in the stroke unit (#426), the Appearance panel's Opacity popup (#430), type on a path brackets, flip and Type on a Path Options that keep the type in place (#429), Layers rows dragged with a ghost and dropped on the trash or New Layer (#435), tool flyouts opening on a right or corner press (#436), tool flyouts torn off into floating toolbars (#437), the Shape Builder's erase mode deleting edges too (#439), installed fonts registered outside the font folders and fonts installed while the app runs listed in the font menus (#443), alike circular corners on rectangles that aren't square (#442), tool cursors as OS cursors so the pointer no longer trails over the canvas (#444), artboards copied and pasted with their art (#446), guides dragged out of the rulers snapping to the art's side midpoints and the artboards, artboard guides (#451), the toolbar's double arrow and Window › Toolbars › Double Column switching between one and two columns in any window height (#455), the Smart Guides display options and Snapping Tolerance (#394), Font Size and Leading combo boxes with preset lists in the Character and Properties panels and the Control bar (#458), screenshots pasted from the clipboard on macOS, Windows and the web (#457), the Properties panel's Fill and Stroke matching the Control bar's, Illustrator's Window menu panel keys (Shift+F7 for Align…) and Alt-wheel zoom whatever the wheel preference (Discord feedback), the point/area type widget (Discord feedback), groups in legacy Illustrator .ai files (Discord feedback), a rotating desktop log file (#465), image controls in the Control bar and Properties panel: Image Trace with its presets, Mask, Crop Image, Embed/Unembed, and an Image Trace object's preset, Expand and Release (Discord feedback), the Pen working as the Anchor Point tool with Alt held over a selected path's handles and anchors, and anchor buttons that convert, connect and cut paths at the selected anchors (Discord feedback), Japanese hanging punctuation (burasagari, #463), Escape leaving Presentation Mode with no screen mode saved across restarts, documents dropped on the desktop app opening as tabs of their own and a note that an `.ai` file's art off its artboards isn't in the part read (#472), Add/Delete Anchor Point tool icons drawn from the Pen tool's (#479), EPS import running more of PostScript Level 3 (patterns, Type 3 fonts, mesh shadings, masked images, VM and resource probes), and a preview that stands in saying why (Discord feedback, #466, #469, #474), chords with modifiers recorded in Edit › Keyboard Shortcuts (#487), Type Object Selection by Path Only (#394), Anti-aliased Artwork (#394), Show Pixel Grid (#394), pen and touch taps pressed and lifted within one frame clicking where they tapped and the Linux/Wayland pen-tablet workaround (#491), bounding-box resizes landing on the other objects' anchors and centres with labels, and the Rotate, Scale, Shear and Reflect tools snapping their drags (#482), Shift-drag marquees that toggle the objects or anchors they reach and a Lasso whose Alt subtraction keeps the rest of the selection (#483), the mouse wheel stepping the focused numeric field, the dialogs' and preferences' drag values made such fields (#485), Show The Home Screen When No Documents Are Open (#394), Numbers Without Units Are Points (#394), Auto-Collapse Iconic Panels (#394), the Contextual Task Bar moved by its handle and its More Options menu pinning and resetting its position, a designed macOS DMG window (#493), panels, panel groups and the Tools panel undocking into floating panels that move, stack and dock again (#495), the 0.5.0 startup crash on dual-GPU Linux desktops under Wayland fixed: the desktop's own GPU by default and a restart on the next GPU when one can't show the window (#502), path editing while drawing: Cmd/Ctrl with the Pen borrowing Direct Selection and drawing on afterwards, Pen+Alt reshaping segments, handles of a whole selected path dragging, and handle drags no longer re-gathering snap targets every move (#494), the Control bar's and Properties panel's Convert buttons for a path selected as a whole with Direct Selection, the Pen and the anchor tools (#504), the Pen closing a path dragged out of its first anchor every time, without flicker (#501), the Paste menu checking the system clipboard on a background thread on Linux so an X11 clipboard owner that never answers no longer freezes the window (#510), PDF/`.ai` import keeping a type object's outline stroke on the type, wrapped lines as area type, barcode digits in place and layers in the file's stacking order (#508), the Italian interface (#514), EPS images with several data sources read in turn (#498), `restore` undoing dictionary changes in EPS import (part of #505), the macOS menu bar laid out as a Mac app's (the VectorCraft menu with Settings, Language and Appearance, the system's Hide, Services and Window items; owner's request), Object › Image Trace › Make tracing with the Default preset instead of asking for a preset's name (#543), the rulers' unit menu (#528), Live Corners on stars, polygons and pen paths (#511), the drawing tools snapping to Smart Guides as the Selection tool does, with Construction Guides (#506), the in-window menus' Select All, Cut, Copy and Paste acting on the text field they were opened from (#516), Windows rendering through DX12 before Vulkan (#545), Image Trace tracing colour layers in parallel and refusing traces too large for memory, with the canvas outlining huge selections by their bounds (#525), SVGs of chosen artboards holding only the art over each artboard (#550), the font menu scrolling only its list, under a search field and filters that stay put (#555), a click on an object of a selection making it the key object that Align aligns to and Distribute Spacing spaces from, drawn with a thicker outline (#541), Shape Builder merges taken from the planar map itself, so merged regions leave no inner edge, hairline gap or spur in their outline (#569), `.ai` written by the exports and the CLI (`--export`, `convert`) as Save As writes it (#526), SVG round trips keeping hidden objects and `data-*` attributes (#522), the gradient stop popover staying open after the click that opens it from the Gradient panel (#577), standard ligatures kept under small tracking and dropped only past about −8% / +22% of a word space or when the character asks for them (#583), the Color panel keeping its height as warnings come and go so a drag on its spectrum no longer flickers near white (#578), fonts that font services such as Adobe Fonts load on Windows, listed through DirectWrite (#579), `.ai` files writing their layers and sublayers as PDF layers, hidden ones with their art, and PDF layers nested in layers importing as sublayers (#372), file dialogs on Linux shown off the UI thread so the compositor no longer finds the window not responding, and parented to the window on Linux and Windows (#592), anchors and handle ends picked from 2 px past their drawn size before the segments through them (#593), an image copied in a browser pasting as the picture, not its address (#597), the Free Transform widget with Constrain, Free Transform, Perspective Distort and Free Distort (#598), touch gestures: a two-finger tap undoes and a three-finger tap redoes (#585), the font menus' live preview staying on the text instead of flickering on and off every frame (#563), Edit Artboards showing the active artboard in the Properties panel with New Artboard, Delete Artboard and Exit (#530), the same DirectWrite fonts in `vectorcraft-cli` and its MCP server (#579), SVG layers keeping their names when wrapped and sublayers round-tripping through SVG (#372), a Layers panel that lays out only the rows in view and keeps a document's open rows in its file (#638), a panel dropped on the dock lights up the icon column it goes back to and pops out of its icon (#649), Image Trace's Palette: Limited, Full Tone, Automatic and Document Library (part of #641); see [Honest assessment](#honest-assessment-2026-10-05))._ ## Where we are @@ -143,7 +143,7 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist - **Type:** Text Wrap, Type on a Path effects (Rainbow/Skew/3D Ribbon/Stair Step/Gravity) and Options (Flip, Align to Path, Spacing; OK keeps the type where it is), type on a path's start, centre and end brackets (Selection and Direct Selection drag them to set where the type runs, slide it along its path and, across the path, flip it: #429), Character and Paragraph Styles (override-preserving redefine), paragraph attributes per paragraph (alignment, indents, spacing, hyphenation, hanging punctuation, tab stops, paragraph style, direction, mojikumi and leading model; the Paragraph, Tabs and Paragraph Styles panels act on the paragraphs the Type tool's selection or caret touches, Return continues the paragraph's style, threads and SVG keep them), Area Type Options (rows/columns/inset/first baseline, vertical Align Top/Center/Bottom/Justify per row/column, reflowing non-rectangular frames and text wrap), threaded text across any closed shapes, Fit Headline, the Every-line Composer for justified and ragged text (paragraph-wide breaks for an even rag, Single-line per object from the Paragraph panel menu or `text.setFormat {composer}`). Area type resizes like Illustrator's type areas: a bounding-box handle drag (Selection tool) or Area Type Options Width/Height size the frame and the text reflows at its size (threads too); Direct Selection drags a frame corner or edge (`text.reshapeArea`). Point type still scales. Auto Size: the frame height follows the text after every edit, in the same undo step (rectangular frames of horizontal type in one row; columns get the least height that holds them; a height set by hand or threading turns it off), and the "Auto Size New Area Type" preference gives it to new area type. Shrink Text to Fit (beyond Illustrator): overflowing area type scales its sizes, leading and baseline shifts down by the largest factor (in 0.1 pt steps of the first run, down to a minimum percentage) that fits, at layout time so every export sees it. `text.areaOptions` and `document.inspect` report overflow and the shrink factor. The Selection tool shows the type widget beside selected type's bounding box (hollow on point type, filled on area type); double-clicking it converts between them (Type › Convert To Area Type / Convert To Point Type), keeping the text and its styles in place. Variable fonts list every named instance as a style of their family (Figtree Light to Black and their italics, Bahnschrift, Segoe UI Variable), and the instance chosen is shaped, drawn, outlined and measured at its axis settings; PDF and SVG embed it as that instance. Variation axis sliders are not done. Beyond Illustrator: inline graphics (`text.insertInline`, Type ▸ Insert Inline Symbol) set a document symbol in a run of type as one character that flows, wraps and justifies like a glyph (InDesign-style inline objects, e.g. mana symbols in card rules text): sized to a multiple of the font size, centred on the cap height, opening up tall lines, following Redefine Symbol; a character of its run's size for Character Alignment and Top-to-Top leading, placed by the bidi reordering in right-to-left text (a neutral U+FFFC); drawn on the canvas, kept as live text plus a `` in SVG and as vector art in PDF; Backspace removes it whole. Hebrew and Arabic are laid out right to left with the Unicode bidirectional algorithm (embedded Latin and numbers keep their direction, lines put in visual order after wrapping) in point, area and path type, with caret, selection and arrow keys in visual order; each paragraph's direction comes from its first strong character unless Paragraph Direction sets it (Paragraph panel with Show Indic Options, `text.setFormat {direction}`), and new type aligns to the start of its direction. SVG export outlines right-to-left text. Font Size and Leading are combo boxes in the Character and Properties panels (Font Size in the Control bar too, beside the Character link, font family and style): type, step with ↑/↓ or the spinner, scrub the label, or pick a preset (6–72 pt, shown in the type unit; Leading also Auto), each pick one undo step; Kerning and Tracking list -100…200; a size, leading, kerning or tracking the selected text doesn't share shows blank (#458). - **Interface languages, vertical type:** VectorCraft ▸ Language (or Preferences ▸ User Interface) picks Automatic (the system locale) or a registered language, persisted as `interfaceLanguage`. Translations come from per-language catalogs (`i18n/*.tsv`): Traditional and Simplified Chinese, Japanese, Spanish (neutral international Spanish, for every `es-*` locale), French (every `fr-*` locale), Italian (every `it-*` locale) and Russian (every `ru-*` locale) cover the whole interface, Czech and Brazilian Portuguese every menu label, Brazilian Portuguese the shell's `tl!` literals too (tested); Spanish, French, Italian and Russian also translate status-bar and error messages as they are shown (`@msg` templates, every message literal tested; the messages themselves stay English for agents); untranslated text stays English. Japanese and Chinese glyphs come from the craft-fonts build input (release builds) or the installed fonts, Czech, Spanish, French, Italian and Russian ones from the bundled UI fonts. The web app follows the browser's languages (or `?lang=`). The Basic toolbar's Type button holds Vertical Type in its flyout. Vertical Type, Vertical Area Type and Vertical Type on a Path create vertical text (columns right to left, upright CJK glyphs and marks with `vert` alternates, Latin and longer numbers on their side, two- and three-digit numbers set as tate-chu-yoko in one em of the column (kept whole when justified), upright glyphs centred on the column (tracked or justified too), point type's anchor on the first column's centre line); kinsoku (the strict set) applies to horizontal and vertical Japanese, and justified Japanese lines spread their room between characters (not inside Latin words); Paragraph panel › Mojikumi Set (shown with Preferences › Type › Show East Asian Options, `text.setFormat {mojikumi}`): None or Line-end Punctuation Half Width (new type's default, as in Illustrator; older documents and imported text keep None) shares one half-em space between consecutive punctuation, sets a closing mark ending a line half width and an opening bracket starting a wrapped line flush with its start, and puts a quarter em between Japanese and Latin letters or digits; Paragraph panel menu › Top-to-Top / Bottom-to-Bottom Leading measures leading from em box top to top (area type's first line touches the frame) or from baseline to baseline (new type in a Japanese interface starts top to top, with em box centre character alignment, #432); Paragraph panel menu › Burasagari None / Regular / Force (`text.setFormat {burasagari: "none"|"standard"|"forced"}`) hangs an East Asian comma or full stop (、。，．､｡) ending an area type line outside it, Regular (new type's default) when it doesn't fit and Force always (the rest of the line then fills the measure; closing brackets and Latin punctuation don't hang); Character panel menu › Character Alignment (with the East Asian options; `text.setFormat` or `text.setRangeStyle {charAlign}`) lines characters smaller than the largest on their line up on the Roman baseline, the em box top/right, centre or bottom/left, or the ICF (ideographic character face) top/right or bottom/left, from the font's BASE table or, without one, the average ink box of some ideographs and kana; Type ▸ Type Orientation switches existing text; caret, selection, hit testing and arrow keys follow the writing direction. Vertical text exports to PDF as real text and to SVG as outlines. - **Transparency:** opacity masks (clip/invert/disable/link), exported as SVG `` and PDF soft masks. -- **Advanced art:** live Blends (steps/distance/smooth colour, editable spine, anchor-targeted Blend tool, faithful interpolation, knockout), Envelope Distort (warp/mesh/top object, Reset, full Envelope Options, mesh handles, Edit Contents; type, images, symbols, gradients, patterns and appearance distorted everywhere), Liquify tools with options and pen pressure, Puppet Warp with rotating pins, Perspective Grid with presets, movable planes and projected type (choosing a perspective tool shows the grid; Hide Grid hides it with the tool still chosen), Gradient Mesh, Shape Builder (stroke-only open paths and lines cut the regions they cross and enclose regions of their own; filled open paths count as closed; erase mode while Alt/Option is held: a minus pointer, red highlights of what will go, a click or drag deletes the regions touched, the pieces of open lines and the edges (outline pieces between the points where paths meet, opening their paths there) it passes over, one undo step, `shapeBuilder.merge {erase}` and `shapeBuilder.regions` edges over MCP), Live Paint (every path an edge, open lines included), Image Trace (12 presets, colour layers traced in parallel; a trace past two million anchor points or an image over 64 megapixels is refused with advice rather than running out of memory, and a selection too large to outline shows its bounds (#525); Object › Image Trace › Make and Make and Expand trace at once with the Default preset, #543; with an image selected the Control bar and the Properties panel show Image Trace, whose arrow traces with any preset, Mask (`object.maskImage`: a clipping path on the image's outline, selected so its handles crop), Crop Image and Embed or Unembed in place of Fill and Stroke; with an Image Trace object selected, its Preset (choosing another traces again), the Image Trace panel and Expand, plus Release in Properties; the View modes are not done), pattern swatches with pattern editing mode, live Repeat (radial/grid/mirror). +- **Advanced art:** live Blends (steps/distance/smooth colour, editable spine, anchor-targeted Blend tool, faithful interpolation, knockout), Envelope Distort (warp/mesh/top object, Reset, full Envelope Options, mesh handles, Edit Contents; type, images, symbols, gradients, patterns and appearance distorted everywhere), Liquify tools with options and pen pressure, Puppet Warp with rotating pins, Perspective Grid with presets, movable planes and projected type (choosing a perspective tool shows the grid; Hide Grid hides it with the tool still chosen), Gradient Mesh, Shape Builder (stroke-only open paths and lines cut the regions they cross and enclose regions of their own; filled open paths count as closed; erase mode while Alt/Option is held: a minus pointer, red highlights of what will go, a click or drag deletes the regions touched, the pieces of open lines and the edges (outline pieces between the points where paths meet, opening their paths there) it passes over, one undo step, `shapeBuilder.merge {erase}` and `shapeBuilder.regions` edges over MCP), Live Paint (every path an edge, open lines included), Image Trace (12 presets, colour layers traced in parallel; a trace past two million anchor points or an image over 64 megapixels is refused with advice rather than running out of memory, and a selection too large to outline shows its bounds (#525); Object › Image Trace › Make and Make and Expand trace at once with the Default preset, #543; with an image selected the Control bar and the Properties panel show Image Trace, whose arrow traces with any preset, Mask (`object.maskImage`: a clipping path on the image's outline, selected so its handles crop), Crop Image and Embed or Unembed in place of Fill and Stroke; with an Image Trace object selected, its Preset (choosing another traces again), the Image Trace panel and Expand, plus Release in Properties; Color mode's Palette: Limited, Full Tone (as many colours as the tones need, Less … More), Automatic (flat art with its own colours, else Full Tone; a heuristic) and Document Library (the most used colours of the document's swatches or a swatch library, filled with the swatch colours as they are), part of #641; the View modes and Create Strokes are not done), pattern swatches with pattern editing mode, live Repeat (radial/grid/mirror). - **Paint and appearance (M3):** - **Swatches:** names follow the colour model and are unique; Swatch Options (process/spot, Global, Gray/RGB/HSB/CMYK/Web, live preview); editing a global or spot swatch recolours every linked fill, stroke and text run in one undo step; multi-select and delete with confirmation; New Swatch and New Color Group dialogs (a group from the selected artwork's colours); swatches in colour groups convert, separate and count like any other. The Swatches panel selects ranges and whole groups, has a find field, and drags swatches to reorder, regroup or paint art; Add Used Colors, Select All Unused, Merge, Ungroup and Sort by Kind; a CMYK document keeps applied colours in CMYK. Swatch libraries: nine generated colour libraries and five gradient libraries in a library panel, saved as `.vcswatches`, `.gpl` or CSS, and loaded from `.vcswatches`, `.gpl` and swatch exchange (`.ase`) files (RGB, CMYK, Lab and Gray; global, spot and process; groups). Tints of global and spot colours ("Name 40%") stay linked and separate as a percentage of their plate. Spot colours can be defined in Lab (Spot Colors options). A built-in [Registration] swatch prints on every plate. - **Colour:** a Color Picker (colour field, H/S/B/R/G/B channel slider, HSB/RGB/Lab/CMYK fields, hex, web-only snapping, out-of-gamut correction); the Color panel follows each colour's own model and Alt-click paints the other proxy; proxies look through groups and show "?" for mixed paint; Invert, Complement, Apply Last Color (`,`) and Apply Last Gradient (`.`) keep the colour model; every paint command feeds the recent colours. The Color Guide has 21 harmony rules, Steps and Variation options and Limit to Library. Adjust Color Balance (its Global mode shifts tints) and Saturate preview live; Edit Colors and Recolor also reach meshes, images and patterns. Recolor Artwork has colour reduction, five recolour methods, presets, Limit to Library, a colour-wheel Edit tab and Edit Color Group; a local Color Themes panel saves five-colour themes. Fill/Stroke chips open swatch and mixer popovers (the Properties panel has the Control bar's Fill and Stroke chips, Stroke link and weight spinner, with nothing selected too), panels have Illustrator's Window menu keys (Align Shift+F7, Transform Shift+F8, Pathfinder Cmd+Shift+F9, Layers F7, Character Cmd+T…; every panel can be given one in Edit › Keyboard Shortcuts), and Eyedropper Options pick up and apply chosen attributes (Alt and Shift+Alt, image pixels). Fills and strokes can overprint (Attributes panel, Overprint Black options), and CMYK documents blend in inks on screen, in PDF and when flattening. Document Color Mode converts the art, symbols, pattern tiles and swatches through the colour settings: Gray stays Gray, RGB greys separate into four-colour greys and a rich black as Illustrator does, or go on the black plate only with `grays: "black"` (also for `document.open {colorMode}`). @@ -215,7 +215,7 @@ about 1–1.5 agent-hours each, so the other rows (estimated on the older scale) | Type core | 9 | 80% | Middle Eastern features beyond bidi layout and Paragraph Direction (Character Direction, digit types, kashidas, the Middle Eastern composers, editable bidirectional SVG text, a split caret where directions meet); Hyphenation… and Justification… options (Every-line Composer for justified and ragged text, per object, is done; it is tuned by eye, not yet compared side by side with Illustrator; mixed type sizes in a paragraph still break single-line), Optical Margin Alignment, paragraph spacing limit for vertically justified area type, hidden characters, paragraph attributes in the Type tool's copy and paste (the characters keep their styles, the paragraphs take the destination's), mixed-value display in the Paragraph panel for a selection across differing paragraphs, Transform Again after a type-area resize (it scales the type), partial selection of type-area anchors by marquee | 14–19 | | Type advanced | 4 | 50% | CJK composition for vertical type (ruby, mojikumi beyond Line-end Punctuation Half Width — the other sets (and their paragraph-start bracket and indent rules), kinsoku sets and the Mojikumi Settings dialog —, proportional vertical metrics, manual tate-chu-yoko), variable font axis sliders (named instances are styles), tab leaders, spell check (open dictionary), Touch Type, Retype; vertical point/area/path type and Type Orientation have initial support (beyond parity, not scored: inline symbols in text) | 20–28 | | Symbols, blends, envelopes, Repeat, perspective | 5 | 88% | symbol libraries (original), dynamic symbols, envelope Anti-Alias/Preserve Shape output and warp point editing, brush interpolation in blends (M8 fidelity pass done) | 5–8 | -| Image Trace, graphs, image tools | 3 | 70% | graph Design/Column/Marker, Create Object Mosaic, Crop Image polish (an on-canvas crop box), Image Trace View modes (Outlines, Source Image) (Vector Halftone is done) | 6–10 | +| Image Trace, graphs, image tools | 3 | 70% | graph Design/Column/Marker, Create Object Mosaic, Crop Image polish (an on-canvas crop box), Image Trace View modes (Outlines, Source Image) and Create Strokes (Vector Halftone and the Image Trace Palette are done) | 6–10 | | Layers, artboards, document setup | 5 | 82% | Layers panel: a confirmation before deleting layers that hold art, Collect for Export, row context menus, the Layer Options dialog for several rows with mixed values, Paste Remembers Layers for sublayers, drag-scrolling a long panel while dragging rows; artboard presets/rearrange polish (Document Setup, New Document and the rest of the Layers panel are done) | 4–7 | | View & navigation | 3 | 70% | New View/Edit Views, multiple windows/arrange, Snap to Pixel/Glyph (print tiling is done) | 9–14 | | Guides, grids, smart guides, snapping, rulers | 3 | 84% | global/video rulers, Spacing Guides, Smart Guides' angle and distance readouts while drawing, Alt swapping a ruler guide's orientation, ruler guides selected together with art (marquee, Shift-click), ruler guides as Layers rows with their own lock and hide (#451: Lock Guides locks them all; Make Guides paths are Layers rows already) (dragging existing guides is done, #414; new guides snapping to side midpoints and artboards, and artboard guides, #451; the drawing tools snapping, with Construction Guides, #506) | 2–4 | diff --git a/crates/engine/src/cmd/buildcmds.rs b/crates/engine/src/cmd/buildcmds.rs index 921d1e84..3091e95f 100644 --- a/crates/engine/src/cmd/buildcmds.rs +++ b/crates/engine/src/cmd/buildcmds.rs @@ -120,7 +120,7 @@ pub fn specs() -> Vec { "Make", ["Object", "Image Trace"], None, - "{id?: image or Image Trace group (default: selection), preset?: name (imageTrace.presets), params?: {mode: \"blackAndWhite\"|\"grayscale\"|\"color\", threshold: 0-255, colors: 2-256, paths: 0-100, corners: 0-100, noise: px, method: \"abutting\"|\"overlapping\", ignoreWhite, snapCurvesToLines}} → {id, paths, anchors, colors}", + "{id?: image or Image Trace group (default: selection), preset?: name (imageTrace.presets), params?: {mode: \"blackAndWhite\"|\"grayscale\"|\"color\", threshold: 0-255, palette: \"limited\"|\"fullTone\"|\"automatic\"|\"documentLibrary\" (color mode; limited: the `colors` best colours, fullTone: as many as the tones need, more with colorDetail, automatic: flat art with its own colours, else fullTone, documentLibrary: at most `colors` of the library's colours, as they are), colors: 2-256, colorDetail: 0-100 (fullTone, automatic), library: \"document\" (the document's swatches) or a swatch library id or name (swatch.library.list; documentLibrary), paths: 0-100, corners: 0-100, noise: px, method: \"abutting\"|\"overlapping\", ignoreWhite, snapCurvesToLines}} → {id, paths, anchors, colors}", has_selection_or_ids, |s, p| trace_make(s, p, false) ), @@ -651,6 +651,30 @@ fn trace_params(p: &Value) -> Result { serde_json::from_value(v).map_err(|e| bad("imageTrace.make", e.to_string())) } +/// Document Library in Color mode: look the library's colours up into `params.swatches` → each +/// one as traced (sRGB) with the colour to fill with. +fn trace_library(s: &Session, params: &mut tr::TraceParams) -> Result> { + const C: &str = "imageTrace.make"; + if params.mode != tr::Mode::Color || params.palette != tr::Palette::DocumentLibrary { + return Ok(vec![]); + } + let key = params.library.as_str(); + let colors = super::swatchlib::library_colors(s, key) + .ok_or_else(|| bad(C, format!("no swatch library `{key}` (see swatch.library.list; \"document\": the document's swatches)")))?; + if colors.is_empty() { + return Err(bad(C, format!("`{key}` has no colours"))); + } + let library: Vec<([u8; 3], Color)> = colors + .into_iter() + .map(|c| { + let [r, g, b, _] = c.to_rgba8(1.0); + ([r, g, b], c) + }) + .collect(); + params.swatches = library.iter().map(|l| l.0).collect(); + Ok(library) +} + /// The most anchor points an Image Trace may make: a photo traced at high fidelity can make /// millions, more than the canvas draws smoothly or a laptop has memory for, so the trace is /// refused with advice instead (#525). @@ -658,7 +682,7 @@ pub const MAX_TRACE_ANCHORS: usize = 2_000_000; fn trace_make(s: &mut Session, p: &Value, expand: bool) -> Result { const C: &str = "imageTrace.make"; - let params = trace_params(p)?; + let mut params = trace_params(p)?; let params_json = serde_json::to_value(¶ms).map_err(|e| EngineError::Other(e.to_string()))?; // The preset's name if the parameters are exactly that preset's, else "Custom". let named = str_param(p, "preset").unwrap_or("Default"); @@ -687,6 +711,7 @@ fn trace_make(s: &mut Session, p: &Value, expand: bool) -> Result { }; let blob = s.doc()?.doc.images.get(&img.key).ok_or_else(|| EngineError::Other(format!("image data `{}` is missing", img.key)))?; let raster = tr::Raster::decode(&blob.bytes).map_err(|e| EngineError::Other(e.to_string()))?; + let library = trace_library(s, &mut params)?; let res = tr::trace_within(&raster, ¶ms, MAX_TRACE_ANCHORS).map_err(|e| EngineError::Other(e.to_string()))?; // Pixel space of the decoded raster → the image object's pixel space → document. let sx = img.width.max(1) as f64 / raster.width.max(1) as f64; @@ -714,7 +739,9 @@ fn trace_make(s: &mut Session, p: &Value, expand: bool) -> Result { for tp in res.paths { let path = tp.path.transformed(xf); let mut n = shape_node(d, path, None); - n.appearance = fill_only(Paint::solid(Color::rgb8(tp.color[0], tp.color[1], tp.color[2]))); + // A library colour fills with the swatch's own colour (its model kept). + let color = library.iter().find(|(rgb, _)| *rgb == tp.color).map_or_else(|| Color::rgb8(tp.color[0], tp.color[1], tp.color[2]), |l| l.1); + n.appearance = fill_only(Paint::solid(color)); children.push(Arc::new(n)); } let gid = d.alloc_id(); diff --git a/crates/engine/src/cmd/swatchlib.rs b/crates/engine/src/cmd/swatchlib.rs index 35d39516..00462b8e 100644 --- a/crates/engine/src/cmd/swatchlib.rs +++ b/crates/engine/src/cmd/swatchlib.rs @@ -276,11 +276,18 @@ pub const DOCUMENT_SWATCHES: &str = "document"; /// [`DOCUMENT_SWATCHES`], of the active document's swatches and colour groups. `None` when there is /// no such library (or document). pub fn limit_palette(s: &Session, key: &str) -> Option { + Some(Palette::new(library_colors(s, key)?)) +} + +/// The solid colours of library `key` (an id or name) or, for [`DOCUMENT_SWATCHES`], of the +/// active document's swatches and colour groups. `None` when there is no such library (or +/// document). +pub fn library_colors(s: &Session, key: &str) -> Option> { let colors = |sw: &Swatch| sw.paint.color(); if key == DOCUMENT_SWATCHES { - return Some(Palette::new(s.active()?.doc.swatches_iter().filter_map(colors))); + return Some(s.active()?.doc.swatches_iter().filter_map(colors).collect()); } - Some(Palette::new(library(s, key)?.1.iter().filter_map(colors))) + Some(library(s, key)?.1.iter().filter_map(colors).collect()) } /// The `limitTo` parameter's palette ([`limit_palette`]); `None` without one (or for ""). diff --git a/crates/engine/src/tests_build.rs b/crates/engine/src/tests_build.rs index e077ff02..af34cc5e 100644 --- a/crates/engine/src/tests_build.rs +++ b/crates/engine/src/tests_build.rs @@ -669,6 +669,49 @@ fn image_trace_make_and_expand_and_color_presets() { assert!(s.execute("imageTrace.make", &json!({"params": {"mode": "rainbow"}})).is_err()); } +#[test] +fn image_trace_palettes_and_swatch_libraries() { + let mut s = session(); + let quads = vectorcraft_trace::Raster::from_fn(60, 60, |x, y| match (x < 30, y < 30) { + (true, true) => [230, 20, 20, 255], + (false, true) => [20, 200, 30, 255], + (true, false) => [20, 30, 220, 255], + (false, false) => [250, 230, 10, 255], + }); + add_image(&mut s, &quads, Affine::IDENTITY); + let fills = |s: &Session, id: &Value| -> Vec { + traced_paths(&node(s, NodeId(id.as_u64().unwrap()))).iter().filter_map(|n| n.appearance.fill_paint().color()).collect() + }; + // Document Library: every fill is one of the document's swatch colours, as it is. + let r = s.execute("imageTrace.make", &json!({"preset": "6 Colors", "params": {"palette": "documentLibrary"}})).unwrap(); + let doc = crate::cmd::swatchlib::library_colors(&s, "document").unwrap(); + let got = fills(&s, &r["id"]); + assert!(!got.is_empty() && got.iter().all(|c| doc.contains(c)), "{got:?}"); + let t = node(&s, NodeId(r["id"].as_u64().unwrap())).trace.unwrap(); + assert_eq!((t["params"]["palette"].as_str(), t["params"]["library"].as_str()), (Some("documentLibrary"), Some("document"))); + assert!(t["params"].get("swatches").is_none(), "looked up again at every trace"); + // A swatch library by id: the web-safe colours. + let r = s + .execute( + "imageTrace.make", + &json!({"id": r["id"], "preset": "6 Colors", "params": {"palette": "documentLibrary", "library": "web-safe-216", "colors": 3}}), + ) + .unwrap(); + let got = fills(&s, &r["id"]); + assert!((1..=3).contains(&got.len()), "{got:?}"); + assert!(got.iter().all(|c| c.to_rgba8(1.0)[..3].iter().all(|v| v % 51 == 0)), "{got:?}"); + // Full Tone and Automatic keep the four flat colours. + let mut id = r["id"].clone(); + for palette in ["fullTone", "automatic"] { + let r = s.execute("imageTrace.make", &json!({"id": id, "preset": "6 Colors", "params": {"palette": palette, "colorDetail": 50}})).unwrap(); + assert_eq!(r["colors"], 4, "{palette}"); + id = r["id"].clone(); + } + let mut bad = |p: Value| s.execute("imageTrace.make", &json!({"preset": "6 Colors", "params": p})).is_err(); + assert!(bad(json!({"palette": "documentLibrary", "library": "No Such Library"}))); + assert!(bad(json!({"palette": "rainbow"}))); +} + #[test] fn image_trace_presets_query_and_errors() { let mut s = session(); diff --git a/crates/mcp/src/prompts.rs b/crates/mcp/src/prompts.rs index 737fc144..2b0a9a77 100644 --- a/crates/mcp/src/prompts.rs +++ b/crates/mcp/src/prompts.rs @@ -295,7 +295,9 @@ with the {effect} effect. Method: 1. open_file the image: it becomes a document of its own pixel size. 2. imageTrace.make with the preset name, adjusting `params` — mode blackAndWhite, grayscale or - color, then threshold, colors, paths, corners, noise, method abutting or overlapping, + color (palette limited, fullTone for photos, automatic, or documentLibrary to trace with + the document's swatches or a swatch `library`), then threshold, colors (colorDetail for + fullTone and automatic), paths, corners, noise, method abutting or overlapping, ignoreWhite, snapCurvesToLines. Run imageTrace.presets to see every preset with its numbers. Lower paths and higher corners give the clean, logo-like result; high fidelity needs paths near 90. diff --git a/crates/trace/src/lib.rs b/crates/trace/src/lib.rs index 03495b25..8c36535a 100644 --- a/crates/trace/src/lib.rs +++ b/crates/trace/src/lib.rs @@ -4,8 +4,11 @@ //! and classic colour quantisation), not from any existing implementation: //! //! 1. **Quantise** the image into a small palette: a luminance threshold (Black and White), 1-D -//! k-means over the luminance histogram (Grayscale), or median cut followed by weighted -//! k-means over a 15-bit colour histogram (Color). Transparent pixels are left out. +//! k-means over the luminance histogram (Grayscale), or, in Color, over a 15-bit colour +//! histogram as the [`Palette`] asks: median cut to a colour count followed by weighted k-means +//! (Limited), median cut until every colour box is tight (Full Tone), one of those two by +//! whether the image is flat art (Automatic), or the most used colours of a swatch library +//! (Document Library). Transparent pixels are left out. //! 2. **Remove noise**: 4-connected same-colour components smaller than `noise` pixels are merged //! into their most common neighbouring colour. //! 3. **Follow boundaries**: for each colour layer, the pixel-crack edges between inside and @@ -34,7 +37,7 @@ use vectorcraft_geom::PathData; pub use contour::{Component, Loop, trace_mask}; pub use mosaic::mosaic; -pub use quantize::{Quantized, TRANSPARENT, denoise, quantize}; +pub use quantize::{FULL_TONE_MAX, Quantized, TRANSPARENT, denoise, quantize}; /// Errors decoding a raster. #[derive(Debug, thiserror::Error)] @@ -132,6 +135,28 @@ pub enum Method { Overlapping, } +/// Where Color mode's colours come from (the Palette popup). +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub enum Palette { + /// The `colors` colours that best represent the image. + #[default] + #[serde(alias = "Limited")] + Limited, + /// As many colours as the image's tones need, up to [`FULL_TONE_MAX`] (photos, gradients): + /// `color_detail` sets how close two colours may be and stay apart. + #[serde(alias = "Full Tone")] + FullTone, + /// Flat art (a few colours cover nearly all of it) traces with exactly those colours, anything + /// else as Full Tone. + #[serde(alias = "Automatic")] + Automatic, + /// The most used colours of a swatch library ([`TraceParams::swatches`]), at most `colors` of + /// them, exactly as they are. + #[serde(alias = "library", alias = "Document Library")] + DocumentLibrary, +} + /// Image Trace parameters (the Image Trace panel). #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(default, rename_all = "camelCase")] @@ -139,8 +164,20 @@ pub struct TraceParams { pub mode: Mode, /// Black and White: pixels darker than this (luminance 0–255) are black. pub threshold: u8, - /// Palette size for Color, number of grays for Grayscale (2–256). + /// Color: where the colours come from. + pub palette: Palette, + /// Palette size for Color (Limited; at most this many for Document Library), number of grays + /// for Grayscale (2–256). pub colors: u32, + /// Full Tone and Automatic: how many colours, 0 (few) – 100 (many). + pub color_detail: f64, + /// Document Library: the swatch library, `"document"` (the document's swatches) or a library id + /// or name. The caller looks its colours up into `swatches`. + pub library: String, + /// Document Library: the library's colours (sRGB). Not saved: they are looked up from + /// `library` at every trace. + #[serde(skip)] + pub swatches: Vec<[u8; 3]>, /// Paths (fidelity) 0–100: higher follows the pixels more tightly. pub paths: f64, /// Corners 0–100: higher keeps more corners. @@ -160,7 +197,11 @@ impl Default for TraceParams { Self { mode: Mode::BlackAndWhite, threshold: 128, + palette: Palette::Limited, colors: 6, + color_detail: 50.0, + library: "document".into(), + swatches: vec![], paths: 50.0, corners: 75.0, noise: 25, diff --git a/crates/trace/src/quantize.rs b/crates/trace/src/quantize.rs index 6b596cc8..96de7897 100644 --- a/crates/trace/src/quantize.rs +++ b/crates/trace/src/quantize.rs @@ -1,6 +1,6 @@ //! Colour reduction and noise removal. -use crate::{Mode, Raster, TraceParams}; +use crate::{Mode, Palette, Raster, TraceParams}; /// Label of a transparent (untraced) pixel. pub const TRANSPARENT: u16 = u16::MAX; @@ -67,10 +67,8 @@ pub fn quantize(img: &Raster, params: &TraceParams) -> Quantized { b.sum[2] += p[2] as u64; } } - let used: Vec<(usize, [f64; 3], f64)> = - bins.iter().enumerate().filter(|(_, b)| b.n > 0).map(|(i, b)| (i, b.mean(), b.n as f64)).collect(); - let k = params.colors.clamp(2, 256) as usize; - let centers = kmeans_rgb(&used, k); + let used: Vec = bins.iter().enumerate().filter(|(_, b)| b.n > 0).map(|(i, b)| (i, b.mean(), b.n as f64)).collect(); + let centers = color_palette(&used, params); let mut lut = vec![0u16; 1 << 15]; for (i, c, _) in &used { lut[*i] = nearest_rgb(¢ers, *c) as u16; @@ -187,12 +185,108 @@ fn nearest_rgb(centers: &[[f64; 3]], c: [f64; 3]) -> usize { best.1 } -/// Median cut for the initial palette, then weighted k-means refinement over histogram bins. -fn kmeans_rgb(used: &[(usize, [f64; 3], f64)], k: usize) -> Vec<[f64; 3]> { - if used.is_empty() { - return vec![[255.0; 3]]; +/// The most colours Full Tone (and Automatic on continuous-tone images) makes. +pub const FULL_TONE_MAX: usize = 256; + +/// A histogram bin in use: its index, mean colour and pixel count. +type Used = (usize, [f64; 3], f64); + +/// Color mode's palette for the histogram bins `used`, as `params.palette` asks. +fn color_palette(used: &[Used], params: &TraceParams) -> Vec<[f64; 3]> { + let k = params.colors.clamp(2, 256) as usize; + let detail = (params.color_detail / 100.0).clamp(0.0, 1.0); + // Full Tone: split until no colour box is wider than 96 (few colours) … 8 (many) levels per + // channel, which is one histogram bin. + let full_tone = || refine(used, centers(&median_cut(used, FULL_TONE_MAX, 96.0 - 88.0 * detail))); + match params.palette { + Palette::Limited => kmeans_rgb(used, k), + Palette::FullTone => full_tone(), + Palette::Automatic => match flat_colors(used, detail) { + Some(n) => kmeans_rgb(used, n), + None => full_tone(), + }, + Palette::DocumentLibrary if !params.swatches.is_empty() => library_colors(used, ¶ms.swatches, k), + // No library colours to use: as Limited. + Palette::DocumentLibrary => kmeans_rgb(used, k), + } +} + +/// Automatic: how many colours flat art is made of, or `None` for continuous tone (photos, +/// gradients). Flat art has most of its pixels in a few tight colours (anti-aliased edges and +/// noise aside): the bins holding 90% of the pixels are few, and each colour's pixels sit mostly +/// in one bin. `detail` (0–1) lets smaller colour areas count as colours of their own. +fn flat_colors(used: &[Used], detail: f64) -> Option { + let total: f64 = used.iter().map(|u| u.2).sum(); + if total <= 0.0 { + return Some(2); + } + let mut by_count: Vec<&Used> = used.iter().collect(); + by_count.sort_by(|a, b| b.2.total_cmp(&a.2)); + let mut covered = 0.0; + let main = by_count + .iter() + .take_while(|u| { + let before = covered; + covered += u.2; + before < 0.9 * total + }) + .count(); + if main > FLAT_BINS { + return None; + } + let boxes = median_cut(used, 64, 24.0); + let min_share = (0.04 - 0.035 * detail) * total; + let colours: Vec<&ColorBox> = boxes.iter().filter(|b| b.weight >= min_share).collect(); + let weight: f64 = colours.iter().map(|b| b.weight).sum(); + let peaks: f64 = colours.iter().map(|b| b.peak).sum(); + (weight >= 0.9 * total && peaks >= 0.5 * weight && colours.len() <= 32).then_some(colours.len().max(2)) +} + +/// The most histogram bins flat art's main colours spread over (a few bins per colour). +const FLAT_BINS: usize = 96; + +/// Document Library: the `k` swatches (at most) that the most pixels are nearest to. +fn library_colors(used: &[Used], swatches: &[[u8; 3]], k: usize) -> Vec<[f64; 3]> { + let mut all: Vec<[f64; 3]> = vec![]; + for s in swatches { + let c = s.map(f64::from); + if !all.contains(&c) { + all.push(c); + } + } + let mut weight = vec![0.0; all.len()]; + for (_, c, n) in used { + if let Some(w) = weight.get_mut(nearest_rgb(&all, *c)) { + *w += n; + } + } + let mut order: Vec = (0..all.len()).collect(); + order.sort_by(|a, b| weight[*b].total_cmp(&weight[*a]).then(a.cmp(b))); + order.into_iter().take(k.max(1)).filter_map(|i| all.get(i).copied()).collect() +} + +/// A median-cut box: its weighted mean colour, pixel count and the pixel count of its heaviest bin. +struct ColorBox { + mean: [f64; 3], + weight: f64, + peak: f64, +} + +fn centers(boxes: &[ColorBox]) -> Vec<[f64; 3]> { + boxes.iter().map(|b| b.mean).collect() +} + +/// Median cut to `k` colours, then weighted k-means refinement over histogram bins. +fn kmeans_rgb(used: &[Used], k: usize) -> Vec<[f64; 3]> { + refine(used, centers(&median_cut(used, k, 0.0))) +} + +/// Median cut: repeatedly split the box with the largest weighted extent, while there are fewer +/// than `k` boxes and some box spans more than `spread` levels of a channel. +fn median_cut(used: &[Used], k: usize, spread: f64) -> Vec { + if used.is_empty() { + return vec![ColorBox { mean: [255.0; 3], weight: 0.0, peak: 0.0 }]; } - // Median cut: repeatedly split the box with the largest weighted extent. let mut boxes: Vec> = vec![(0..used.len()).collect()]; while boxes.len() < k { let mut best: Option<(f64, usize, usize)> = None; @@ -210,7 +304,7 @@ fn kmeans_rgb(used: &[(usize, [f64; 3], f64)], k: usize) -> Vec<[f64; 3]> { wsum += used[i].2; } let (ch, range) = (0..3).map(|c| (c, hi[c] - lo[c])).fold((0, -1.0), |a, b| if b.1 > a.1 { b } else { a }); - if range <= 0.0 { + if range <= spread.max(0.0) { continue; } let score = range * wsum.sqrt(); @@ -235,21 +329,25 @@ fn kmeans_rgb(used: &[(usize, [f64; 3], f64)], k: usize) -> Vec<[f64; 3]> { boxes.push(b); boxes.push(tail); } - let mut centers: Vec<[f64; 3]> = boxes + boxes .iter() .map(|b| { let mut s = [0.0; 3]; - let mut w = 0.0; + let (mut w, mut peak) = (0.0, 0.0f64); for &i in b { for (acc, v) in s.iter_mut().zip(used[i].1) { *acc += v * used[i].2; } w += used[i].2; + peak = peak.max(used[i].2); } - [s[0] / w, s[1] / w, s[2] / w] + ColorBox { mean: [s[0] / w, s[1] / w, s[2] / w], weight: w, peak } }) - .collect(); - // Lloyd refinement. + .collect() +} + +/// Lloyd refinement of `centers` over the bins `used`. +fn refine(used: &[Used], mut centers: Vec<[f64; 3]>) -> Vec<[f64; 3]> { for _ in 0..12 { let mut sum = vec![[0.0; 3]; centers.len()]; let mut cnt = vec![0.0; centers.len()]; diff --git a/crates/trace/src/tests.rs b/crates/trace/src/tests.rs index 7d51ad68..4f09a137 100644 --- a/crates/trace/src/tests.rs +++ b/crates/trace/src/tests.rs @@ -348,3 +348,93 @@ fn an_image_too_large_to_trace_is_refused_before_decoding() { assert!(matches!(err, TraceError::TooLarge { width: 30_000, height: 30_000, .. }), "{err}"); assert!(matches!(Raster::decode(&png_header(64, 64)), Err(TraceError::Decode(_))), "a small header goes on to decoding"); } + +/// Four flat colours with anti-aliased (blended) edges between the quadrants. +fn flat_quads() -> Raster { + const C: [[u8; 3]; 4] = [[220, 30, 30], [30, 200, 40], [30, 40, 210], [240, 220, 20]]; + Raster::from_fn(100, 100, |x, y| { + let at = |x: u32, y: u32| C[usize::from(x >= 50) + 2 * usize::from(y >= 50)]; + let (a, b) = (at(x, y), at(x.saturating_sub(1), y.saturating_sub(1))); + // Blend the pixels along the quadrant edges, as an anti-aliased picture has them. + let c: Vec = a.iter().zip(b).map(|(p, q)| ((u16::from(*p) + u16::from(q)) / 2) as u8).collect(); + [c[0], c[1], c[2], 255] + }) +} + +/// A smooth two-dimensional colour gradient (continuous tone). +fn gradient() -> Raster { + Raster::from_fn(128, 128, |x, y| [(x * 2) as u8, (y * 2) as u8, (255 - x - y / 2) as u8, 255]) +} + +fn palette(img: &Raster, palette: Palette, colors: u32, color_detail: f64) -> Vec<[u8; 3]> { + let p = TraceParams { mode: Mode::Color, palette, colors, color_detail, noise: 4, ..TraceParams::default() }; + trace(img, &p).palette +} + +#[test] +fn palettes_parse_from_their_ids_and_names() { + for (id, want) in [ + ("limited", Palette::Limited), + ("fullTone", Palette::FullTone), + ("Automatic", Palette::Automatic), + ("documentLibrary", Palette::DocumentLibrary), + ("library", Palette::DocumentLibrary), + ] { + let p: TraceParams = serde_json::from_value(serde_json::json!({ "palette": id })).unwrap(); + assert_eq!(p.palette, want, "{id}"); + } + assert_eq!(TraceParams::default().palette, Palette::Limited); + // The library's colours are looked up at every trace, not saved with the settings. + let v = serde_json::to_value(TraceParams { swatches: vec![[1, 2, 3]], ..TraceParams::default() }).unwrap(); + assert!(v.get("swatches").is_none() && v["library"] == "document" && v["colorDetail"] == 50.0, "{v}"); +} + +#[test] +fn full_tone_follows_the_tones_the_image_has() { + // Flat art keeps its few colours (and the tones of its blended edges); a gradient gets many, + // more with more detail. + let flat = palette(&flat_quads(), Palette::FullTone, 6, 50.0); + assert!((4..=10).contains(&flat.len()), "flat art: {flat:?}"); + let few = palette(&gradient(), Palette::FullTone, 6, 10.0).len(); + let many = palette(&gradient(), Palette::FullTone, 6, 90.0).len(); + assert!(few > 6 && many > few && many <= FULL_TONE_MAX, "{few} then {many} colours"); +} + +#[test] +fn automatic_traces_flat_art_with_its_colours_and_photos_in_full_tone() { + let flat = palette(&flat_quads(), Palette::Automatic, 2, 50.0); + assert_eq!(flat.len(), 4, "the four flat colours, whatever `colors` says: {flat:?}"); + assert!(flat.iter().any(|c| c[0] > 200 && c[1] < 60 && c[2] < 60), "red is one of them: {flat:?}"); + let tone = palette(&gradient(), Palette::Automatic, 2, 50.0); + assert_eq!(tone.len(), palette(&gradient(), Palette::FullTone, 2, 50.0).len(), "continuous tone: as Full Tone"); +} + +#[test] +fn document_library_uses_the_most_used_swatches_exactly() { + let swatches = vec![[255, 0, 0], [0, 255, 0], [0, 0, 255], [255, 255, 0], [0, 0, 0], [255, 255, 255]]; + let p = |colors| TraceParams { + mode: Mode::Color, + palette: Palette::DocumentLibrary, + colors, + swatches: swatches.clone(), + noise: 4, + ..TraceParams::default() + }; + let hard = Raster::from_fn(100, 100, |x, y| match (x < 50, y < 50) { + (true, true) => [220, 30, 30, 255], + (false, true) => [30, 200, 40, 255], + (true, false) => [30, 40, 210, 255], + (false, false) => [240, 220, 20, 255], + }); + let res = trace(&hard, &p(6)); + let mut got = res.palette.clone(); + got.sort_unstable(); + assert_eq!(got, [[0, 0, 255], [0, 255, 0], [255, 0, 0], [255, 255, 0]], "the nearest swatch of each colour, as it is"); + assert!(res.paths.iter().all(|t| swatches.contains(&t.color))); + // At most `colors` of them: the ones the most pixels are nearest to. + let two = trace(&hard, &p(2)).palette; + assert!(two.len() <= 2 && two.iter().all(|c| swatches.contains(c)), "{two:?}"); + // Without library colours, it traces as Limited. + let none = TraceParams { swatches: vec![], ..p(4) }; + assert_eq!(trace(&hard, &none).palette.len(), 4); +} diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index d6ee0e1c..606c5951 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -1152,6 +1152,11 @@ Ignore Ignorar Ignore Artboards (all the art as one page) Ignorar mesas de trabajo (toda la ilustración como una página) Ignore White Ignorar blanco + Palette: Paleta: + Limited Limitada + Full Tone Tono completo + Document Library Biblioteca del documento + Library: Biblioteca: Image Imagen Image Info Información de imagen Image Map: Mapa de imagen: diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index 135d3eec..57ce3814 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -1151,6 +1151,11 @@ Ignore Ignorer Ignore Artboards (all the art as one page) Ignorer les plans de travail (toute l’illustration sur une page) Ignore White Ignorer le blanc + Palette: Palette : + Limited Limitée + Full Tone Tons continus + Document Library Bibliothèque du document + Library: Bibliothèque : Image Image Image Info Informations sur l’image Image Map: Image cliquable : diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 39f0e052..07b421d8 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -1151,6 +1151,11 @@ Ignore Ignora Ignore Artboards (all the art as one page) Ignora tavole da disegno (tutta la grafica come una sola pagina) Ignore White Ignora bianco + Palette: Palette: + Limited Limitata + Full Tone Tono continuo + Document Library Libreria del documento + Library: Libreria: Image Immagine Image Info Informazioni immagine Image Map: Mappa immagine: diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index 29667b31..613809b4 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -1410,6 +1410,11 @@ Ignore 無視 Ignore Artboards (all the art as one page) アートボードを無視 (すべてのアートを 1 ページとして扱う) Ignore White 白を無視 + Palette: パレット: + Limited 限定 + Full Tone フルトーン + Document Library ドキュメントライブラリ + Library: ライブラリ: Image Info 画像情報 Image Map: イメージマップ: Image Size イメージサイズ diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index 607911a1..38d8dd9f 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -1149,6 +1149,11 @@ Ignore Игнорировать Ignore Artboards (all the art as one page) Игнорировать монтажные области (весь рисунок как одна страница) Ignore White Игнорировать белый + Palette: Палитра: + Limited Ограниченная + Full Tone Полутоновая + Document Library Библиотека документа + Library: Библиотека: Image Изображение Image Info Сведения об изображении Image Map: Карта изображения: diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index a2fe75d6..bccbcde5 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -1140,6 +1140,11 @@ Ignore 忽略 Ignore Artboards (all the art as one page) 忽略画板 (所有图稿作为一页) Ignore White 忽略白色 + Palette: 调板： + Limited 有限 + Full Tone 全色调 + Document Library 文档库 + Library: 库： Image 图像 Image Info 图像信息 Image Map: 图像映射： diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index b23c0fd5..b1ca20cf 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -1169,6 +1169,11 @@ Ignore 略過 Ignore Artboards (all the art as one page) 忽略工作區域 (所有圖稿視為單一頁面) Ignore White 忽略白色 + Palette: 調色盤： + Limited 有限 + Full Tone 全色調 + Document Library 文件資料庫 + Library: 資料庫： Image 影像 Image Info 影像資訊 Image Map: 影像地圖： diff --git a/crates/ui-egui/src/panels/image_trace.rs b/crates/ui-egui/src/panels/image_trace.rs index bda45ab0..dece1e5c 100644 --- a/crates/ui-egui/src/panels/image_trace.rs +++ b/crates/ui-egui/src/panels/image_trace.rs @@ -1,17 +1,50 @@ -//! Image Trace panel: preset, mode, threshold or colour count, and the advanced fidelity options. +//! Image Trace panel: preset, mode, palette (Color), threshold or colour count, and the advanced +//! fidelity options. //! With an Image Trace object selected, changing a setting re-traces it (one undo step per change; //! sliders apply when released). With an image selected, Trace makes a new Image Trace object. use egui::Ui; use serde_json::{Value, json}; use vectorcraft_doc::{Node, NodeKind}; +use vectorcraft_engine::cmd::swatchlib::DOCUMENT_SWATCHES; -use super::{first_selected, pstate, set_pstate}; +use super::{first_selected, library_panel, pstate, set_pstate, swatches}; use crate::VectorcraftApp; use crate::widgets::{self, menu_item}; const MODES: [(&str, &str); 3] = [("blackAndWhite", "Black and White"), ("grayscale", "Grayscale"), ("color", "Color")]; +/// Color mode's palettes (`palette` param ids), in panel order. +const PALETTES: [&str; 4] = ["limited", "fullTone", "automatic", "documentLibrary"]; + +/// Palette `id`, in the UI language. +fn palette_label(id: &str) -> &'static str { + match id { + "fullTone" => tl!("Full Tone"), + "automatic" => tl!("Automatic"), + "documentLibrary" => tl!("Document Library"), + _ => tl!("Limited"), + } +} + +/// The name of Document Library's library `key` (the document's swatches or a swatch library); a +/// library that is gone shows its key. +fn library_label(app: &VectorcraftApp, key: &str) -> String { + match swatches::limit_name(app, key) { + Some(_) if key == DOCUMENT_SWATCHES => tl!(swatches::DOCUMENT_SWATCHES).to_string(), + Some(name) => library_panel::library_name(key, &name).to_string(), + None => key.to_string(), + } +} + +/// Document Library's choices: the document's swatches, then the colour libraries (`current` +/// checked) → the key chosen. +fn library_list(app: &VectorcraftApp, ui: &mut Ui, current: &str) -> Option { + let document = menu_item(ui, swatches::DOCUMENT_SWATCHES, true, current == DOCUMENT_SWATCHES).then(|| DOCUMENT_SWATCHES.to_string()); + ui.separator(); + library_panel::library_items(ui, &swatches::colour_libraries(app), Some(current)).or(document) +} + /// Panel state: the preset name, the current parameters and the last result's counts. #[derive(Clone, Default)] struct TraceUi { @@ -167,16 +200,41 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { retrace = true; } }); - let bw = st.params["mode"].as_str() == Some("blackAndWhite"); - let (key, label, range) = if bw { - ("threshold", tl!("Threshold"), 0.0..=255.0) - } else { - ("colors", if st.params["mode"] == "grayscale" { tl!("Grays") } else { tl!("Colors") }, 2.0..=256.0) + let mode = st.params["mode"].as_str().unwrap_or("blackAndWhite").to_string(); + let palette = st.params["palette"].as_str().unwrap_or("limited").to_string(); + if mode == "color" { + ui.horizontal(|ui| { + widgets::dim_label(ui, tl!("Palette:")); + let labels = PALETTES.map(palette_label); + if let Some(p) = widgets::dropdown_names(ui, "it-palette", palette_label(&palette), &labels, 170.0).and_then(|i| PALETTES.get(i)) { + st.params["palette"] = json!(p); + st.preset = "Custom".into(); + retrace = true; + } + }); + if palette == "documentLibrary" { + ui.horizontal(|ui| { + widgets::dim_label(ui, tl!("Library:")); + let key = st.params["library"].as_str().unwrap_or(DOCUMENT_SWATCHES).to_string(); + if let Some(k) = widgets::combo(ui, "it-library", &library_label(app, &key), 170.0, false, |ui| library_list(app, ui, &key)) { + st.params["library"] = json!(k); + st.preset = "Custom".into(); + retrace = true; + } + }); + } + } + // Full Tone and Automatic: how many colours (Less … More); else a count or the threshold. + let (key, label, range, suffix) = match mode.as_str() { + "blackAndWhite" => ("threshold", tl!("Threshold"), 0.0..=255.0, ""), + "grayscale" => ("colors", tl!("Grays"), 2.0..=256.0, ""), + _ if matches!(palette.as_str(), "fullTone" | "automatic") => ("colorDetail", tl!("Colors"), 0.0..=100.0, "%"), + _ => ("colors", tl!("Colors"), 2.0..=256.0, ""), }; let mut v = st.params[key].as_f64().unwrap_or(0.0); - let (changed, release) = slider(ui, label, &mut v, range, ""); + let (changed, release) = slider(ui, label, &mut v, range, suffix); if changed { - st.params[key] = json!(v.round() as u64); + st.params[key] = if key == "colorDetail" { json!(v.round()) } else { json!(v.round() as u64) }; st.preset = "Custom".into(); } retrace |= release; @@ -258,6 +316,61 @@ pub fn menu(app: &mut VectorcraftApp, ui: &mut Ui) { #[cfg(test)] mod tests { use super::*; + use egui::{Event, PointerButton, Pos2, Rect, vec2}; + + /// One headless frame of the panel (and its menu) with `events`: the texts drawn, with where. + fn frame(app: &mut VectorcraftApp, ctx: &egui::Context, events: Vec) -> Vec<(String, Rect)> { + let screen = Rect::from_min_size(Pos2::ZERO, vec2(280.0, 700.0)); + let mut out = ctx.run_ui(egui::RawInput { screen_rect: Some(screen), events, ..Default::default() }, |ui| show(app, ui)); + out.textures_delta.clear(); + crate::tests_removeanchors::shapes_text(&out.shapes.iter().map(|c| c.shape.clone()).collect::>()) + } + + /// Click the panel's `label` (the first one drawn). + fn click(app: &mut VectorcraftApp, ctx: &egui::Context, label: &str) { + let texts = frame(app, ctx, vec![]); + let at = texts.iter().find(|(t, _)| t == label).map(|(_, r)| r.center()).unwrap_or_else(|| panic!("no `{label}` in {texts:?}")); + let press = |pressed| Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() }; + frame(app, ctx, vec![Event::PointerMoved(at), press(true)]); + frame(app, ctx, vec![press(false)]); + } + + fn traced_app() -> VectorcraftApp { + let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default()); + app.session.execute("file.new", &json!({"width": 100, "height": 100})).unwrap(); + let img = image::RgbaImage::from_fn(20, 20, |x, _| image::Rgba(if x < 10 { [0, 0, 0, 255] } else { [255, 255, 255, 255] })); + let mut png = vec![]; + img.write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap(); + let data = vectorcraft_format::base64_encode(&png); + app.run("file.place", json!({"name": "half.png", "dataBase64": data, "link": false})).unwrap(); + app.run("imageTrace.make", json!({"preset": "Default"})).unwrap(); + app + } + + #[test] + fn the_palette_shows_in_color_mode_and_traces_again() { + let mut app = traced_app(); + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + let has = |texts: &[(String, Rect)], s: &str| texts.iter().any(|(t, _)| t == s); + let palette = |app: &VectorcraftApp| target(app).2.map(|t| t["params"]["palette"].clone()); + assert!(!has(&frame(&mut app, &ctx, vec![]), "Palette:"), "Black and White has no palette"); + app.run("imageTrace.make", json!({"preset": "6 Colors"})).unwrap(); + let texts = frame(&mut app, &ctx, vec![]); + assert!(has(&texts, "Palette:") && has(&texts, "Limited") && !has(&texts, "Library:"), "{texts:?}"); + // Document Library traces again with the document's swatches, and names them. + click(&mut app, &ctx, "Limited"); + click(&mut app, &ctx, "Document Library"); + assert_eq!(palette(&app), Some(json!("documentLibrary"))); + let texts = frame(&mut app, &ctx, vec![]); + assert!(has(&texts, "Library:") && has(&texts, "Document Swatches"), "{texts:?}"); + // Full Tone's Colors is how many, Less (0%) … More (100%). + click(&mut app, &ctx, "Document Library"); + click(&mut app, &ctx, "Full Tone"); + assert_eq!(palette(&app), Some(json!("fullTone"))); + let texts = frame(&mut app, &ctx, vec![]); + assert!(has(&texts, "50") && !has(&texts, "Library:"), "{texts:?}"); + } #[test] fn panel_and_menu_draw_headless() { @@ -266,6 +379,7 @@ mod tests { app.session.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap(); for _ in 0..2 { let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); let mut out = ctx.run_ui(egui::RawInput::default(), |ui| { show(&mut app, ui); menu(&mut app, ui); diff --git a/crates/ui-egui/src/tests_removeanchors.rs b/crates/ui-egui/src/tests_removeanchors.rs index 0baee6c3..80a7dcc3 100644 --- a/crates/ui-egui/src/tests_removeanchors.rs +++ b/crates/ui-egui/src/tests_removeanchors.rs @@ -37,7 +37,7 @@ fn labels(items: &[Item]) -> Vec<&'static str> { .collect() } -fn shapes_text(shapes: &[Shape]) -> Vec<(String, Rect)> { +pub(crate) fn shapes_text(shapes: &[Shape]) -> Vec<(String, Rect)> { fn walk(s: &Shape, v: &mut Vec<(String, Rect)>) { match s { Shape::Text(t) => v.push((t.galley.text().to_string(), Rect::from_min_size(t.pos, t.galley.size()))),