Compare commits

...
2 Commits
Author SHA1 Message Date
ketle-manandClaude Sonnet 5 f9dbf3f399 release: v0.6.2 — Image Editタブにペンタブレット筆圧対応とFillツール(バケツ塗りつぶし)を追加
Draw/MaskツールをPointer Events化し、ペン筆圧でブラシサイズ/不透明度が
変化するように対応(マウス操作の挙動は変更なし)。Comic CreatorのImageタブ
から移植したFillツール(バケツ塗りつぶし、Solid/Gradient対応)を新規追加。
実機フィードバックを受け、Fillのグラデーションランプ/方向ダイヤルが
ペンタブレットで操作できない不具合も追加修正。

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-09-09 09:25:36 +09:00
ketle-manandClaude Sonnet 5 a99bfc19a1 release: v0.6.1 — Galleryタブ検索の停止不具合・パフォーマンス問題を修正
検索欄のdebounce/AbortController追加、メタデータストアのロック保持時間短縮、
ponyxlWildcardsVaultフォールバック探索でのVaultフォルダ誤検出によるglob多発を解消。
53枚フォルダへの検索が3327ms→74msに改善。

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-09-07 16:57:19 +09:00
13 changed files with 831 additions and 148 deletions
+2
View File
@@ -2,6 +2,8 @@
Condensed version-by-version index of DEVLOG.md (each line: version + one-line summary of what changed and why). Full rationale, code details, and "How to apply" lessons live in the excluded DEVLOG.md itself; this index exists so graphify can extract a queryable semantic node per release without feeding the full log to the local Ollama model. Regenerate with `python tools/generate_doc_index.py devlog` whenever DEVLOG.md changes.
- **v0.6.2** — Image Editタブにペンタブレット筆圧対応とFillツール(バケツ塗りつぶし)を追加
- **v0.6.1** — Galleryタブの検索が「読み込み中」のまま止まりクリアでも中断できない不具合、および50枚程度のフォルダでも数秒〜十数秒かかる不具合を修正
- **v0.6.0** — Gallery/Image Edit両タブにPSD(Photoshop)対応を追加 — 複数画像の一括PSD書き出し、レイヤー保存/読み込み、Gallery表示、Image Editのレイヤーパネル改善
- **v0.5.8** — Tagger DBタブに一括削除機能を追加(外部コントリビューターPRのレビュー・検証・修正・マージ)
- **v0.5.7** — 設定エクスポート/フルバックアップのドキュメント修正: v0.5.5のVideo Plan機能追加分の言及漏れ
+38
View File
@@ -2,6 +2,44 @@
---
## v0.6.2
### Image Editタブにペンタブレット筆圧対応とFillツール(バケツ塗りつぶし)を追加
ユーザーから「Comic CreatorのImageタブ同様にこちらのImage Editタブをペンタブレット対応させたい」という依頼を起点に、Draw/Maskツールの筆圧対応、Fillツール(バケツ塗りつぶし)の移植、そして実機フィードバックを受けた追加のペンタブレット不具合修正まで一連の作業を行った。
**Draw/Maskツールの筆圧対応**: `image-edit-tab.js`のキャンバスイベントを`mousedown/mousemove/mouseup/mouseleave`から`pointerdown/pointermove/pointerup/pointerleave`に変更し、両canvasに`touch-action: none`を設定。`PointerEvent.pressure`(ペン=実際の筆圧、マウス=ボタン押下中は常に0.5)を`DrawTool`/`MaskTool`の`onMouseDown`/`onMouseMove`に伝播させ、両ツールに`pressureEnabled`(既定ON)を追加——筆圧に応じてブラシサイズ(0.3〜1.7倍)とDraw側は不透明度(0.4〜1.6倍)を可変化する。pressure=0.5(マウス)では従来と同じ1.0倍になるため、マウス操作の挙動は変わらない。実装はComic Creator(`eagle_comic_creator_spa`)のImageタブで先行実装済みだった筆圧対応パターンをそのまま移植した。
**Fillツール(バケツ塗りつぶし)を新規追加**: Comic CreatorのImageタブにあった`FillTool.js`(スキャンライン方式のフラッドフィル、Solid/Gradient(線形・放射状)両対応、particle_engine.js由来のグラデーション評価ロジック)をそのまま移植し、`image-edit-tab.js`にツール切り替え・アクティブ化・クリック処理・プロパティパネル(Mode/Color/Ramp/Direction dial/Tolerance/Opacity)を追加、ショートカット`G`を割り当てた。ツールバーのボタンは`templates/index.html`に静的HTMLとして定義されていたため個別追加が必要だった(`TOOL_DEFS`配列だけでは表示されない)。
**追加のペンタブレット不具合修正(ユーザー実機フィードバック)**: Fillツールのグラデーション設定UI——色ストップを並べた「Ramp」(ドラッグでストップ位置を変更)と方向・強度を指定する「Direction」ミニダイヤル——がペンタブレットでスライド操作できないという報告を受けた。原因はこの2つのミニウィジェットのドラッグ処理だけが`mousedown/mousemove/mouseup`のまま残っていたこと(`touch-action`未指定でブラウザのパン/スクロールジェスチャに奪われやすく、`document`に張った`mousemove`はポインタキャプチャが無いため速いペンの動きを取りこぼしやすい)。`_setupFillGradientRamp()`/`_setupFillGradientDir()`を`pointerdown/pointermove/pointerup/pointercancel`に変更し、`canvas.style.touchAction = "none"`と`canvas.setPointerCapture(e.pointerId)`を追加、ドラッグ中のリスナーも`document`ではなく`canvas`自身に張るよう変更した。
**Comic Creator側も同じ不具合を横展開で修正**: Fillツールの移植元であるComic Creator(`image-tab.js`)にも同一パターンの`_setupFillGradientRamp()`/`_setupFillGradientDir()`に加え、Shapeツールの塗りグラデーションランプ`_setupShapeGradRamp()`(同一コードパターンの複製)が存在し、同じ理由でペンタブレット操作ができない状態だった。3箇所とも同じPointer Events化を適用して修正した。
**検証**: Kaptureで実ブラウザ(ComfyUI_5上のWorkflow Studio `/wfm`、Comic Creator `/ccc`)を操作し、Draw/Mask/Fillそれぞれで新規キャンバス作成→クリック描画/塗りつぶし→コンソールエラーなし・レイヤーサムネイル即時更新を確認。Ramp/Directionダイヤルもクリックでのストップ選択・ハイライト表示が正しく動作することを確認した(ペン特有の筆圧・ドラッグ挙動そのものは自動化ツールでは検証できないため、筆圧の効き具合とドラッグ操作は実機ユーザー確認による)。Comic Creator側は開発フォルダがComfyUI custom_nodes配下にシンボリックリンクされているため、コピー不要で編集がそのまま反映される構成だった(Workflow Studio側は開発リポジトリと実行時custom_nodesが別実体のため、変更のたびに手動コピーが必要)。
**How to apply**: キャンバスベースの描画・ドラッグ操作を実装する際は、最初から`mousedown/mousemove/mouseup`ではなく`pointerdown/pointermove/pointerup/pointercancel`(Pointer Events)を使い、`touch-action: none`を設定する——マウス専用に見えるミニウィジェット(カラーランプ、方向ダイヤル等)であっても、後からペンタブレットで使われた際に同じ不具合が起きる。ドラッグ中の`move`/`up`リスナーは`document`ではなく対象の`canvas`自身に張り、`setPointerCapture()`を使うと要素境界を越えた高速な動きでも取りこぼさない。同一パターンのコードが複数箇所(ファイル間・同一ファイル内)に複製されている場合、1箇所の不具合報告を機に全箇所を横展開で確認する。
関連: [[project_v062_fill_tool_pentablet]], [[feedback_realtime_debug_logs_and_kapture]], [[project_comic_creator_deploy_symlink]]
## v0.6.1
### Galleryタブの検索が「読み込み中」のまま止まりクリアでも中断できない不具合、および50枚程度のフォルダでも数秒〜十数秒かかる不具合を修正
ユーザーから「ギャラリータブで検索を行うと読み込み中のままでクリアを行っても中断できない。50枚程度のフォルダで検索をかけても時間がかかっている」という報告を受け、原因調査から修正まで対応した。
**フロントエンドの2つの不具合**(`gallery-tab.js`): 検索欄はキー入力のたびに即座に(debounceなしで)`loadImages()`を呼んでおり、しかも直前のfetchをキャンセルする仕組み(AbortController)が無かった。そのため「クリア」を押した直後でも、その前に打っていた検索文字列の(まだ処理中の)リクエストが後から返ってきて、クリア後の空検索の結果を上書きしてしまい、「読み込み中のまま/検索結果のまま」に見えていた。検索入力に300msのdebounceを追加し、`loadImages()`にAbortController管理を追加(新しいリクエスト発行時に前回の未完了リクエストを中断)、「クリア」「Clear filters」ボタンはdebounceタイマーもクリアして即座に反映するようにした。
**バックエンドのロック競合**(`gallery_metadata.py`, `gallery_service.py`): フォルダを開くたびに起動するバックグラウンドインデックス処理が、`gallery_metadata.json`(画像数が多い環境では1MBを超える)全体を`threading.RLock`保持したままJSONシリアライズ+ディスク書き込みしており、その間ずっと検索リクエストの`get()`呼び出しがロック待ちでブロックされていた。さらに10枚処理するごとに1件ずつ`save()`を呼んでいたため、実質10回分の全体書き込みが発生していた。`_save_to_disk()`をロック内ではデータのdeepcopyのみに留め、実際のファイルI/Oは別の書き込み専用ロック(`_write_lock`)でロック外に出すよう変更し、バックグラウンドインデックス側もまとめて1回で保存する`save_batch()`を新設して使うようにした。また検索時は(該当時に全メタデータのJSON全体書き込みを伴う)`cleanup_stale_images()`をスキップするようにした(通常の検索なしロード時に実行されれば十分なため)。
**根本原因: ponyxlWildcardsVaultフォールバック探索でのVaultフォルダ誤検出**(`gallery_service.py`): 上記2件を直しても実機で53枚のフォルダへの検索が約3秒かかっており、一時的な計測ログを実機に仕込んで原因を特定した。出力ルート直下にComfyUI/StabilityMatrixが作る空の`thumbnails`フォルダがたまたま存在しており、これが検索対象画像の`.txt`サイドカーが無い場合のフォールバックである`_find_vault_category_root()`(ponyxlWildcardsVault形式——「直下にthumbnails(_option2)フォルダを持つ祖先ディレクトリ」というゆるい条件で判定)によって誤ってVaultのcategory_rootと認識されていた。誤検出されたcategory_root(1万枚超のファイルを含む出力ルート)に対し、`_load_vault_leaves()`がキャッシュの妥当性確認のため画像1枚ごとに`glob("*.yaml")`+`glob("*.yml")`を実行しており、1回あたり約53msかかるglobを53回(検索対象の画像数分)実行して合計2.8秒——実測ベンチマークで再現・確認した数値と実機ログの数値がほぼ一致した。`_load_vault_leaves()`をTTL(60秒)ベースのキャッシュに変更し、TTL内はglobを省略するようにして解消した。
**検証**: Kaptureで実ブラウザ(ComfyUI_5上のWorkflow Studio)を操作し、ネットワークリクエストのタイミングを実測しながら段階的に検証した。Python変更後の再起動が確実に反映されているかはプロセス起動時刻とファイル更新時刻を比較して都度確認した。最終的に53枚のフォルダへの検索は3327ms→74msまで短縮し、検索・クリアとも実機で即座に反映されることを確認した。デバッグ用の計測ログは検証完了後に削除済み。
**How to apply**: サブフォルダを持つ画像出力ルートで「Vault風フォルダ名(thumbnails等)の存在だけで判定するフォールバック検出」を書くと、無関係な巨大フォルダを誤検出してglob/scandir系の操作が本来の対象より何桁も遅くなることがある——検出ロジック自体だけでなく、誤検出時に何度も高コストな操作(特に大量ファイルを含むディレクトリへのglob)が繰り返し呼ばれないか、呼び出し頻度とキャッシュの妥当性も含めて確認する。原因不明のパフォーマンス低下は仮説で止めず、実機に一時的な計測ログ(`perf_counter`で区間ごとの時間を`logger.warning`に出力)を仕込んで実測すると、コードレビューだけでは気づけない誤検出のような盲点が見つかることがある。
関連: [[feedback_asyncio_blocking_in_aiohttp_routes]], [[feedback_realtime_debug_logs_and_kapture]], [[feedback_verify_restart_via_process_creation_time]]
## v0.6.0
### Gallery/Image Edit両タブにPSD(Photoshop)対応を追加 — 複数画像の一括PSD書き出し、レイヤー保存/読み込み、Gallery表示、Image Editのレイヤーパネル改善
+1 -1
View File
@@ -26,7 +26,7 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
- Built-in AI tools (translation and more)
![Workflow Studio](https://img.shields.io/badge/ComfyUI-Custom_Node-blue)
![Version](https://img.shields.io/badge/version-0.6.0-green)
![Version](https://img.shields.io/badge/version-0.6.2-green)
## Features (tab -> feature names)
+6 -5
View File
@@ -22,7 +22,7 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
- Built-in AI tools (translation and more)
![Workflow Studio](https://img.shields.io/badge/ComfyUI-Custom_Node-blue)
![Version](https://img.shields.io/badge/version-0.6.0-green)
![Version](https://img.shields.io/badge/version-0.6.2-green)
## Screenshots
@@ -387,12 +387,13 @@ An experimental batch generator: runs the workflow currently loaded in GenerateU
- **Open PSD button** (v0.6.0, next to File Open) — loads a layered PSD file from disk and decomposes it into individual layers, restoring each layer's position, size, visibility, opacity, and blend mode; groups and non-raster layers (adjustment layers, etc.) are flattened into their rendered appearance
- **Close button** (v0.6.0, next to Open PSD) — closes the current document after a confirmation prompt, discarding all layers and unsaved edits and returning to the empty placeholder view
- **New button** — create a blank canvas with custom dimensions (WxH prompt); clears all existing layers and automatically adds an empty Layer 1 (v0.3.70)
- **Tools** — Select (V), Draw (B), Text (T), Shape (S), Mask (🎭), Blur (≈), BG Remove (⬚), Filter (★), Inpaint (🩹); tool options bar updates per active tool
- **Tools** — Select (V), Draw (B), Text (T), Shape (S), Fill (G), Mask (🎭), Blur (≈), BG Remove (⬚), Filter (★), Inpaint (🩹); tool options bar updates per active tool
- **Select** — click to select; drag to move; drag corner handles to resize; drag circle handle to rotate; Flip H / Flip V / Rotate angle in the options bar; double-click a text layer to re-edit its content
- **Draw** — freehand brush; options: color, brush size, blend mode; paints directly onto the active draw layer while all other layers remain visible; brush cursor shown as a size-accurate circle; strokes can start from outside the canvas margin and continue past the edge
- **Draw** — freehand brush; options: color, brush size, blend mode; paints directly onto the active draw layer while all other layers remain visible; brush cursor shown as a size-accurate circle; strokes can start from outside the canvas margin and continue past the edge; **pen tablet support** (v0.6.2) — brush size and opacity respond to pen pressure (mouse behaves exactly as before); the canvas listens for Pointer Events so pen, touch, and mouse all work through the same code path
- **Text** — click to place; configure font, size, bold/italic, align, and color; placed as an exact-size text layer sized to the measured bounding box; double-click to re-edit
- **Shape** — drag to draw geometric shapes (Rect / Ellipse / Line / FreeLine); options: shape type, Rounded toggle (Rect/Ellipse), Fill color, Stroke color + width, Opacity; each committed shape becomes an independent draw layer; Stroke None hidden for Line/FreeLine (stroke always active)
- **Mask** — 7 sub-tools for painting masks onto a dedicated mask layer; click **Mask** on the second row of the Layers header (renamed from "M" and moved to its own row in v0.6.0) to add a mask layer (Mask tool activates automatically); clicking a mask layer in the list also switches to the Mask tool; **Tool Options bar**: sub-tool buttons (Paint / Color / Alpha / Text / Vector / Shape / SAM3), Invert checkbox, Overlay color picker (default red), Blur slider (0–50 px); the overlay is only shown for the currently active mask layer, other mask layers stay hidden until selected (v0.3.70); SAM3 requires Mask Editor One (disabled when not installed); Color / Alpha / Text / Vector / Shape work without Mask Editor One; **Properties pane — Paint**: Mode (Add / Erase), Size (1–200 px), Hardness (0–100%); **MASK EDITOR ONE section** (Paint sub-tool, visible when installed): Select opens the ABR stamp-brush library; ✕ clears back to Circle; when an image brush is active, Hardness is disabled and Spacing (5–100%), Angle (0–359°), Sz Jitter (0–100%), Rot. Jitter (on/off) appear; **Edit in Mask Editor One →** (v0.4.0) — sends the current canvas composite (plus the active mask layer's content, if one is selected) to a MaskEditorOne node on the ComfyUI canvas — the currently selected node if it is one, otherwise the first MaskEditorOne node found in the graph (same selection logic as **Send to LI node**) — and opens its full interactive editor (paint, SAM3, BiRefNet, shapes, etc.) in the ComfyUI browser tab; clicking Apply there imports the result back here as a new mask layer; requires Workflow Studio to have been launched from ComfyUI's top-menu button and at least one MaskEditorOne node to exist on the ComfyUI canvas; **Properties pane — Color**: click canvas to flood-select pixels by color similarity; Mode (Add / Subtract), Tolerance (0–255), Feather % (0–100); **Properties pane — Alpha**: extract the active layer's transparency as a mask; Threshold, Invert checkbox, Extract Alpha button; **Properties pane — Text**: click canvas to open a stamp overlay — enter text, set Font / Size / Bold / Italic / Align / Mode (Add / Erase), Stamp or Ctrl+Enter to apply; multi-line supported; **Properties pane — Vector**: click to add Catmull-Rom spline points; Enter (or click first point) closes and fills the polygon; Backspace removes the last point; Esc resets; Mode (Add / Erase); **Properties pane — Shape**: drag to draw Rect or Ellipse; hold Shift for square/circle; blue dashed outline preview while dragging; Mode (Add / Erase); **Properties pane — SAM3**: enter a text prompt, set Max candidates (3/6/9/12), click Segment; select candidate thumbnails (multi-select), Apply Selected (N) applies with current Mode; **Mask layer A/S operation**: A/S toggle — Add (green) composites normally, Subtract (red) cuts the mask from below; **✂ clipping mask button** clips the layer below to the painted area; brush cursor shown as size-accurate circle; strokes can start from outside the canvas margin and continue past the edge
- **Fill** (v0.6.2) — bucket fill; click a contiguous same-color region on the active layer to flood-fill it (scanline-based, ported from the Comic Creator plugin's Image tab); **Properties pane**: Mode (Solid / Gradient) — Solid: Color picker; Gradient: Shape (Linear / Radial), a draggable color-stop Ramp (click a stop to select it, drag to reposition, +/- to add/remove stops, color swatch to edit the selected stop's color), and a Direction dial (drag to set angle/radius); both Tolerance (0–255, color-match threshold) and Opacity apply to either mode; Ramp and Direction dial are pointer-event based with pointer capture, so pen tablets work the same as mouse
- **Mask** — 7 sub-tools for painting masks onto a dedicated mask layer; click **Mask** on the second row of the Layers header (renamed from "M" and moved to its own row in v0.6.0) to add a mask layer (Mask tool activates automatically); clicking a mask layer in the list also switches to the Mask tool; **Tool Options bar**: sub-tool buttons (Paint / Color / Alpha / Text / Vector / Shape / SAM3), Invert checkbox, Overlay color picker (default red), Blur slider (0–50 px); the overlay is only shown for the currently active mask layer, other mask layers stay hidden until selected (v0.3.70); SAM3 requires Mask Editor One (disabled when not installed); Color / Alpha / Text / Vector / Shape work without Mask Editor One; **Properties pane — Paint**: Mode (Add / Erase), Size (1–200 px), Hardness (0–100%); brush size responds to pen pressure on a tablet (v0.6.2, same as the Draw tool); **MASK EDITOR ONE section** (Paint sub-tool, visible when installed): Select opens the ABR stamp-brush library; ✕ clears back to Circle; when an image brush is active, Hardness is disabled and Spacing (5–100%), Angle (0–359°), Sz Jitter (0–100%), Rot. Jitter (on/off) appear; **Edit in Mask Editor One →** (v0.4.0) — sends the current canvas composite (plus the active mask layer's content, if one is selected) to a MaskEditorOne node on the ComfyUI canvas — the currently selected node if it is one, otherwise the first MaskEditorOne node found in the graph (same selection logic as **Send to LI node**) — and opens its full interactive editor (paint, SAM3, BiRefNet, shapes, etc.) in the ComfyUI browser tab; clicking Apply there imports the result back here as a new mask layer; requires Workflow Studio to have been launched from ComfyUI's top-menu button and at least one MaskEditorOne node to exist on the ComfyUI canvas; **Properties pane — Color**: click canvas to flood-select pixels by color similarity; Mode (Add / Subtract), Tolerance (0–255), Feather % (0–100); **Properties pane — Alpha**: extract the active layer's transparency as a mask; Threshold, Invert checkbox, Extract Alpha button; **Properties pane — Text**: click canvas to open a stamp overlay — enter text, set Font / Size / Bold / Italic / Align / Mode (Add / Erase), Stamp or Ctrl+Enter to apply; multi-line supported; **Properties pane — Vector**: click to add Catmull-Rom spline points; Enter (or click first point) closes and fills the polygon; Backspace removes the last point; Esc resets; Mode (Add / Erase); **Properties pane — Shape**: drag to draw Rect or Ellipse; hold Shift for square/circle; blue dashed outline preview while dragging; Mode (Add / Erase); **Properties pane — SAM3**: enter a text prompt, set Max candidates (3/6/9/12), click Segment; select candidate thumbnails (multi-select), Apply Selected (N) applies with current Mode; **Mask layer A/S operation**: A/S toggle — Add (green) composites normally, Subtract (red) cuts the mask from below; **✂ clipping mask button** clips the layer below to the painted area; brush cursor shown as size-accurate circle; strokes can start from outside the canvas margin and continue past the edge
- **Blur** — **Whole Blur**: Gaussian blur to the entire active layer with intensity slider (1–50 px); **Whole Mosaic**: pixelation mosaic with block-size slider (5–100 px); **Rect Blur / Rect Mosaic**: enable the toggle then drag a rectangle on the canvas to apply blur or mosaic to that region only (blue preview for blur, orange for mosaic); Rect Blur and Rect Mosaic are mutually exclusive; all operations support Undo
- **BG Remove** — remove the background from the active layer; **Lightweight (@imgly)**: runs entirely in the browser via CDN (no server required; ~40 MB model downloaded on first use); **BiRefNet**: high-quality removal via Mask Editor One's Python backend (requires Mask Editor One installed and `birefnet.safetensors` in `ComfyUI/models/background_removal/`); **New Layer** option (default on) adds the result as a new layer above the original; when off, replaces the active layer in-place
- **Filter (G'MIC)** — apply G'MIC-Qt filter effects to the active image layer; click **Edit with G'MIC** to launch G'MIC-Qt GUI; select a filter and click OK — a "G'MIC-Qt filter output" window appears; close it to save the result back as the active layer; requires G'MIC-Qt Standalone installed and path configured in Settings → G'MIC-Qt Executable Path
@@ -403,7 +404,7 @@ An experimental batch generator: runs the workflow currently loaded in GenerateU
- **Text quality** — text layers are rendered at their measured bounding-box size; resizing with the Select tool regenerates the canvas at the new display resolution so text stays sharp
- **Export** — Save PNG (download composite locally); **Save to Gallery** (saves to Gallery root folder with a timestamped default name `wfs-image-YYYYMMDDHHmmss`); **Save PSD** (v0.6.0, downloads a layered PSD file with every layer preserved separately — position, rotation, flip, and scale are baked into each layer's pixels since PSD layers cannot store a rotation angle, while opacity, blend mode, and visibility are kept as real, editable PSD layer attributes; clipping masks are merged into their target layer since PSD's native layer-mask mechanism isn't used); **Send to LI node** (renamed from "Send to Workflow" in v0.5.2) — uploads to ComfyUI's input folder via `/upload/image`, then writes the resulting filename directly into the `image` widget of the node currently selected on the ComfyUI canvas (falls back to the first LoadImage-type node found); requires Workflow Studio to have been launched from ComfyUI's top-menu button so the ComfyUI tab is reachable; the Gallery tab's toolbar has the same button (v0.5.2, see Gallery Tab below) so a selected Gallery image can be sent the same way without going through Image Edit first
- **Canvas navigation** — scroll-wheel zoom, Space + drag to pan; zoom indicator in the bottom bar
- **Undo / Redo** — Ctrl+Z / Ctrl+Y (or toolbar buttons); keyboard shortcuts: V (Select), B (Draw), T (Text), S (Shape), Delete (remove selected layer when 2+ exist)
- **Undo / Redo** — Ctrl+Z / Ctrl+Y (or toolbar buttons); keyboard shortcuts: V (Select), B (Draw), T (Text), S (Shape), G (Fill), Delete (remove selected layer when 2+ exist)
</details>
+55 -16
View File
@@ -1,6 +1,7 @@
"""
Gallery Metadata Store - ギャラリー画像のメタデータ永続化
"""
import copy
import json
import logging
import threading
@@ -38,6 +39,9 @@ class GalleryMetadataStore:
def __init__(self, file_path: Path):
self.file_path = file_path
self._lock = threading.RLock()
# ディスクへの実書き込み(JSONシリアライズ+ファイルI/O)を直列化するための
# 別ロック。_save_to_disk() を参照。
self._write_lock = threading.Lock()
self._data: dict = {"images": {}, "groups": []}
self._load()
@@ -70,22 +74,39 @@ class GalleryMetadataStore:
def _save_to_disk(self):
# 呼び出し元(save/create_group等)が既にself._lockを保持している前提の内部メソッド。
# 一時ファイルに書き出してから置き換える(os.replace相当のPath.replace)ことで書き込みを
# アトミックにする。素朴な open(path, "w") での直接上書きだと、書き込み完了前に他プロセス
# が読むと不完全なJSONを掴む(torn read)うえ、書き込み中にComfyUIプロセスが終了すると
# ファイルが壊れたまま残る — 大量画像フォルダのBGインデックス処理(10枚ごとに保存)で
# 書き込み頻度が高い環境ほど発生しやすく、次回起動時のロード失敗→空データでの
# 全上書きという形でユーザーの登録済みグループ/タグ/メモが消失する原因になっていた。
try:
self.file_path.parent.mkdir(parents=True, exist_ok=True)
tmp_path = self.file_path.with_name(self.file_path.name + ".tmp")
with open(tmp_path, "w", encoding="utf-8") as f:
json.dump(self._data, f, ensure_ascii=False, indent=2)
tmp_path.replace(self.file_path)
return True
except Exception as e:
logger.error("GalleryMetadataStore: save error: %s", e)
return False
# ここではself._lock配下でスナップショット(deepcopy)を取るだけに留め、実際のJSON
# シリアライズ+ファイルI/Oはロックの外、別途self._write_lockで直列化して行う。
# 理由: gallery_metadata.jsonは画像数が多い環境では1MBを超えることがあり、
# self._lockを保持したままjson.dump+ファイル書き込みまで行うと、その間
# 他スレッドのget()(検索リクエストなど)が丸ごとブロックされてしまう
# (実際に発生した不具合: バックグラウンドインデックス処理が10枚ごとに保存する際、
# 検索リクエストのget()呼び出しがロック待ちになり、50枚程度のフォルダに対する
# 検索でも数秒〜十数秒かかっていた)。deepcopy自体はメモリ内操作でファイルI/Oより
# 大幅に軽いため、ロック内に残しても実用上のブロック時間は無視できるレベルになる。
snapshot = copy.deepcopy(self._data)
return self._write_snapshot(snapshot)
def _write_snapshot(self, snapshot: dict) -> bool:
"""self._lockの外から呼ばれる。一時ファイルに書き出してから置き換える
(os.replace相当のPath.replace)ことで書き込みをアトミックにする。素朴な
open(path, "w") での直接上書きだと、書き込み完了前に他プロセスが読むと
不完全なJSONを掴む(torn read)うえ、書き込み中にComfyUIプロセスが終了すると
ファイルが壊れたまま残る — 大量画像フォルダのBGインデックス処理で書き込み
頻度が高い環境ほど発生しやすく、次回起動時のロード失敗→空データでの全上書き
という形でユーザーの登録済みグループ/タグ/メモが消失する原因になっていた。
self._write_lockで直列化し、複数スレッドの書き込みが競合して古いスナップショット
が新しいものを上書きしないようにする。"""
with self._write_lock:
try:
self.file_path.parent.mkdir(parents=True, exist_ok=True)
tmp_path = self.file_path.with_name(self.file_path.name + ".tmp")
with open(tmp_path, "w", encoding="utf-8") as f:
json.dump(snapshot, f, ensure_ascii=False, indent=2)
tmp_path.replace(self.file_path)
return True
except Exception as e:
logger.error("GalleryMetadataStore: save error: %s", e)
return False
def _normalize_path(self, image_path: str) -> str:
return str(Path(image_path)).replace("\\", "/")
@@ -105,6 +126,24 @@ class GalleryMetadataStore:
self._data["images"][key] = existing
return self._save_to_disk()
def save_batch(self, entries: dict[str, dict]) -> bool:
"""複数画像のメタデータを1回のディスク書き込みでまとめて保存する。
バックグラウンドインデックス処理のように多数の画像を連続して保存する場合、
1件ずつsave()を呼ぶと画像の数だけJSONシリアライズ+ファイルI/Oが発生してしまう
(実際に発生した不具合: gallery_metadata.jsonが1MBを超える環境で10枚ごとに
個別save()していたため、検索リクエストが完了するまで数秒〜十数秒かかっていた)。"""
if not entries:
return True
allowed = {"favorite", "tags", "memo", "groups", "workflow"}
with self._lock:
for image_path, data in entries.items():
key = self._normalize_path(image_path)
existing = self._data["images"].get(key, {})
existing.update(data)
existing = {k: v for k, v in existing.items() if k in allowed}
self._data["images"][key] = existing
return self._save_to_disk()
# ── グループ管理 ──────────────────────────────────────────────
def list_groups(self) -> list[dict]:
+44 -20
View File
@@ -186,8 +186,14 @@ class GalleryService:
self._folder_cache = _FolderCache()
self._bg_cancel = threading.Event()
self._bg_cancel.set() # 初期状態: キャンセル済み
# ponyxlWildcardsVault形式フォールバック用キャッシュ: category_root文字列 -> (yamlシグネチャ, {leaf: tags})
self._vault_leaf_cache: dict[str, tuple[tuple, dict]] = {}
# ponyxlWildcardsVault形式フォールバック用キャッシュ: category_root文字列 -> (キャッシュ時刻, {leaf: tags})
self._vault_leaf_cache: dict[str, tuple[float, dict]] = {}
# 画像の親フォルダ文字列 -> (キャッシュ時刻, category_root or None)。
# _find_vault_category_root は祖先ディレクトリを最大8階層×2回stat()するため、
# 検索フィルタで全画像に対して毎回呼ぶと(特にVaultでない通常フォルダでも
# 無駄に)遅くなる。同一フォルダ内の画像は結果が同じなのでフォルダ単位で
# キャッシュする。
self._vault_root_cache: dict[str, tuple[float, Path | None]] = {}
def update_output_root(self, root_path: str) -> None:
"""許可するルートパスを更新する(Settings変更時に呼ぶ)"""
@@ -251,13 +257,14 @@ class GalleryService:
batch[abs_path] = {"prompt_cache": prompt_cache}
processed += 1
if len(batch) >= 10:
for p, d in batch.items():
self.metadata_store.save(p, d)
# 1件ずつsave()を呼ぶとバッチ内の枚数分だけJSONシリアライズ+
# ファイルI/Oが発生してしまう(大量画像フォルダのメタデータでは
# 1回あたり数百ms〜になりうる)ため、まとめて1回で保存する。
self.metadata_store.save_batch(batch)
batch = {}
time.sleep(0.05) # 50ms 他の処理に譲る
if batch and not cancel.is_set():
for p, d in batch.items():
self.metadata_store.save(p, d)
self.metadata_store.save_batch(batch)
if processed:
logger.debug("BG index done: %s (%d indexed)", folder_path, processed)
except Exception as e:
@@ -437,8 +444,12 @@ class GalleryService:
# recursive=False(非再帰スキャン)の場合、existing_pathsにはfolder直下の
# ファイルしか含まれないため、cleanup側にもrecursive=Falseを伝えて対象範囲を
# 直下のみに限定する(でないとサブフォルダ内ファイルのメタデータを誤削除する)。
existing_paths = {abs_path for _, abs_path, _, _ in raw_entries}
self.metadata_store.cleanup_stale_images(str(folder), existing_paths, recursive=recursive)
# 検索文字列入力中はキー入力のたびに呼ばれるため、ここではスキップする
# (全メタデータ走査+該当時はJSON全体のディスク書き込みを伴い重く、検索の
# 度に繰り返す必要はない。通常の検索なしロード時に実行されれば十分)。
if not search:
existing_paths = {abs_path for _, abs_path, _, _ in raw_entries}
self.metadata_store.cleanup_stale_images(str(folder), existing_paths, recursive=recursive)
results = []
for name, abs_path, size, mtime in raw_entries:
@@ -562,32 +573,45 @@ class GalleryService:
def _find_vault_category_root(self, image_path: Path) -> Path | None:
"""image_path の祖先を辿り、直下に thumbnails(_option2) を持つフォルダ
(=ponyxlWildcardsVaultのカテゴリルート) を探す"""
(=ponyxlWildcardsVaultのカテゴリルート) を探す。
同一フォルダ内の画像は結果が同じなので、フォルダ単位でTTLキャッシュする。"""
parent_key = str(image_path.parent)
cached = self._vault_root_cache.get(parent_key)
if cached is not None and time.monotonic() - cached[0] <= _CACHE_TTL:
return cached[1]
cur = image_path.parent
result: Path | None = None
for _ in range(_VAULT_ROOT_SEARCH_DEPTH):
if any((cur / name).is_dir() for name in _VAULT_THUMB_DIR_NAMES):
return cur
result = cur
break
if cur.parent == cur:
break
cur = cur.parent
return None
self._vault_root_cache[parent_key] = (time.monotonic(), result)
return result
def _load_vault_leaves(self, category_root: Path) -> dict[str, str]:
yaml_files = sorted(category_root.glob("*.yaml")) + sorted(category_root.glob("*.yml"))
if not yaml_files:
return {}
try:
signature = tuple(sorted((str(f), f.stat().st_mtime) for f in yaml_files))
except OSError:
signature = ()
"""category_root直下のyamlをパースしたleaf辞書をTTLキャッシュする。
以前はキャッシュの妥当性確認のため毎回 category_root.glob("*.yaml") を実行して
いたが、category_root は「thumbnails(_option2)という名前のフォルダを直下に持つ
祖先」というゆるい条件で決まるため、Vaultとは無関係な通常の画像出力フォルダ
(例: 直下にComfyUIが作る空のthumbnailsキャッシュフォルダがあるだけ)が誤検出
されることがある。そのフォルダに数千〜数万枚のファイルがあると、glob自体が
1回数十ms〜になり、検索フィルタで画像ごとに呼ばれると数秒単位まで積み上がって
いた(実際に発生した不具合: 1万枚超のルート直下に誤検出されたフォルダがあり、
53枚のサブフォルダを検索するだけで約3秒かかっていた)。TTL内はglobを省略する。"""
cache_key = str(category_root)
cached = self._vault_leaf_cache.get(cache_key)
if cached is not None and cached[0] == signature:
if cached is not None and time.monotonic() - cached[0] <= _CACHE_TTL:
return cached[1]
yaml_files = sorted(category_root.glob("*.yaml")) + sorted(category_root.glob("*.yml"))
leaves: dict[str, str] = {}
for yf in yaml_files:
leaves.update(_parse_vault_yaml_leaves(yf))
self._vault_leaf_cache[cache_key] = (signature, leaves)
self._vault_leaf_cache[cache_key] = (time.monotonic(), leaves)
return leaves
def _read_vault_prompt(self, image_path: Path) -> str | None:
+1 -1
View File
@@ -1,7 +1,7 @@
[project]
name = "comfyui-workflow-studio"
description = "A comprehensive workflow, asset management, and generation UI plugin for ComfyUI. Manage workflows, models, images, and prompts; batch generation and Image Feeder in the GenerateUI tab; library side panel with canvas drag & drop and AI tools."
version = "0.6.0"
version = "0.6.2"
license = { file = "LICENSE" }
requires-python = ">= 3.10"
dependencies = ["jinja2"]
+25 -3
View File
@@ -233,6 +233,9 @@ window._wfmReceiveGenerateRequest = async (prompt, width, height, negative, work
const PAGE_SIZE = 50;
let _renderedCount = 0;
let _scrollObserver = null;
let _loadImagesAbortController = null;
let _searchDebounceTimer = null;
const SEARCH_DEBOUNCE_MS = 300;
// ── 状態 ─────────────────────────────────────────────────────
@@ -523,6 +526,16 @@ function renderTreeNode(node, container, depth, isRoot) {
async function loadImages() {
if (!state.currentFolder) return;
// 前回のリクエストがまだ処理中なら中断する。中断せず並行させると、後から
// 返ってきた古いレスポンス(例: クリア直前に打っていた検索文字列の結果)が
// 最新の表示を上書きしてしまい、「クリアしても検索結果のまま/読み込み中の
// まま」に見える不具合の原因になっていた。
if (_loadImagesAbortController) {
_loadImagesAbortController.abort();
}
const controller = new AbortController();
_loadImagesAbortController = controller;
const grid = document.getElementById("wfm-gallery-grid");
grid.innerHTML = `<p class="wfm-placeholder">${t("loading")}</p>`;
@@ -544,14 +557,19 @@ async function loadImages() {
}
try {
const images = (await apiFetch(API.images(params))).images || [];
const images = (await apiFetch(API.images(params), { signal: controller.signal })).images || [];
state.images = images;
state.lastSelectionIndex = -1;
document.getElementById("wfm-gallery-count").textContent = `${state.images.length} images`;
renderImages();
updateTagFilter(state.images);
} catch (e) {
if (e.name === "AbortError") return;
grid.innerHTML = `<p class="wfm-placeholder">Error: ${escapeHtml(e.message)}</p>`;
} finally {
if (_loadImagesAbortController === controller) {
_loadImagesAbortController = null;
}
}
}
@@ -2012,12 +2030,15 @@ function bindEvents() {
});
}
// 検索
// 検索(連続キー入力のたびにリクエストを飛ばすと、50枚程度のフォルダでも
// ファイルI/Oの重いサーバー処理が積み重なって読み込みが遅延するためdebounceする)
document.getElementById("wfm-gallery-search")?.addEventListener("input", (e) => {
state.search = e.target.value;
loadImages();
clearTimeout(_searchDebounceTimer);
_searchDebounceTimer = setTimeout(loadImages, SEARCH_DEBOUNCE_MS);
});
setupSearchClearBtn("wfm-gallery-search", "wfm-gallery-search-clear-btn", () => {
clearTimeout(_searchDebounceTimer);
state.search = "";
loadImages();
});
@@ -2295,6 +2316,7 @@ function bindEvents() {
if (galleryClearBtn) {
galleryClearBtn.textContent = t("clearFilters");
galleryClearBtn.addEventListener("click", () => {
clearTimeout(_searchDebounceTimer);
state.search = "";
state.favoriteOnly = false;
state.tagFilter = "";
+320 -21
View File
@@ -9,6 +9,7 @@ import { DrawTool } from "./image-edit/DrawTool.js";
import { TextTool, TEXT_FONTS } from "./image-edit/TextTool.js";
import { SelectTool } from "./image-edit/SelectTool.js";
import { ShapeTool } from "./image-edit/ShapeTool.js";
import { FillTool } from "./image-edit/FillTool.js";
import { MaskTool } from "./image-edit/MaskTool.js";
import { MaskColorTool, MaskAlphaTool, MaskTextTool, MaskVectorTool, MaskShapeTool, MASK_TEXT_FONTS } from "./image-edit/MaskEditorOneTools.js";
import { GmicIntegration } from "./image-edit/GmicIntegration.js";
@@ -28,6 +29,7 @@ const TOOL_DEFS = [
{ id: "draw", icon: "✏", label: "Draw", ready: true },
{ id: "text", icon: "T", label: "Text", ready: true },
{ id: "shape", icon: "□", label: "Shape", ready: true },
{ id: "fill", icon: "🪣", label: "Fill", ready: true },
{ id: "mask", icon: "🎭", label: "Mask", ready: true },
{ id: "blur", icon: "≈", label: "Blur", ready: true },
{ id: "filter", icon: "★", label: "Filter", ready: true },
@@ -63,6 +65,7 @@ class ImageEditTab {
this._editingTextLayer = null;
this._initialized = false;
this._shapeTool = new ShapeTool();
this._fillTool = new FillTool();
// Blur ツール
this._blurTool = new BlurTool({
getLayerManager: () => this._layerMgr,
@@ -241,6 +244,11 @@ class ImageEditTab {
if (this._activeTool === "text") this._textTool?.deactivate();
if (this._activeTool === "select") this._selectTool?.deactivate();
if (this._activeTool === "shape") this._shapeTool?.deactivate();
if (this._activeTool === "fill") {
this._fillTool?.deactivate();
const overlay = document.getElementById("ie-canvas-overlay");
if (overlay) overlay.style.cursor = "";
}
if (this._activeTool === "mask") this._deactivateMaskSubtool();
if (this._activeTool === "filter") {
this._gmic.abort();
@@ -248,8 +256,8 @@ class ImageEditTab {
if (this._activeTool === "blur") {
this._blurTool.deactivate();
}
// Draw/Mask/Inpaint以外に切り替えたらプロパティペインを非表示
if (toolId !== "mask" && toolId !== "draw" && toolId !== "inpaint") {
// Draw/Mask/Fill/Inpaint以外に切り替えたらプロパティペインを非表示
if (toolId !== "mask" && toolId !== "draw" && toolId !== "fill" && toolId !== "inpaint") {
const pane = document.getElementById("ie-props-pane");
if (pane) pane.style.display = "none";
}
@@ -282,6 +290,11 @@ class ImageEditTab {
this._shapeTool.setCanvas(overlayCanvas);
this._shapeTool.activate();
if (overlayCanvas) overlayCanvas.style.cursor = "crosshair";
} else if (this._activeTool === "fill" && this._fillTool) {
const activeLayer = this._layerMgr?.activeLayer;
if (activeLayer) this._fillTool.setCanvas(activeLayer.canvas);
this._fillTool.activate();
if (overlayCanvas) overlayCanvas.style.cursor = "crosshair";
} else if (this._activeTool === "mask") {
this._initMaskEditorOneTools();
this._activateMaskSubtool();
@@ -344,6 +357,10 @@ class ImageEditTab {
el.innerHTML = "";
this._renderDrawProps();
} else if (toolId === "fill" && this._fillTool) {
el.innerHTML = "";
this._renderFillProps();
} else if (toolId === "text" && this._textTool) {
el.innerHTML = `
<div class="ie-opt-group">
@@ -968,6 +985,271 @@ class ImageEditTab {
});
}
// ── Fill Tool (bucket fill) props ─────────────────────────────────────
_renderFillProps() {
const pane = document.getElementById("ie-props-pane");
const body = document.getElementById("ie-props-body");
const title = document.getElementById("ie-props-title");
if (!pane || !body) return;
pane.style.display = "flex";
if (title) title.textContent = "Fill";
const t = this._fillTool;
const isGradient = t.fillMode === "gradient";
body.innerHTML = `
<div class="ie-props-row">
<label>Mode</label>
<div style="display:flex;gap:4px;">
<button class="wfm-btn wfm-btn-sm${!isGradient ? " ie-opt-active" : ""}" id="ie-fill-mode-solid" style="flex:1;">Solid</button>
<button class="wfm-btn wfm-btn-sm${isGradient ? " ie-opt-active" : ""}" id="ie-fill-mode-gradient" style="flex:1;">Gradient</button>
</div>
</div>
${!isGradient ? `
<div class="ie-props-row">
<label>Color</label>
<input type="color" id="ie-fill-color" value="${t.color}"
style="width:36px;height:24px;padding:0;border:1px solid var(--wfm-border);cursor:pointer;border-radius:3px;flex-shrink:0;">
</div>` : `
<div class="ie-props-row">
<label>Shape</label>
<div style="display:flex;gap:4px;">
<button class="wfm-btn wfm-btn-sm${t.gradientShape === "linear" ? " ie-opt-active" : ""}" id="ie-fill-shape-linear" style="flex:1;">Linear</button>
<button class="wfm-btn wfm-btn-sm${t.gradientShape === "radial" ? " ie-opt-active" : ""}" id="ie-fill-shape-radial" style="flex:1;">Radial</button>
</div>
</div>
<div class="ie-props-row" style="align-items:flex-start;">
<label>Ramp</label>
<div style="display:flex;flex-direction:column;gap:10px;flex:1;min-width:0;">
<canvas id="ie-fill-ramp" width="130" height="24" style="display:block;width:130px;height:24px;border:1px solid var(--wfm-border);border-radius:3px;cursor:pointer;"></canvas>
<div style="display:flex;align-items:center;gap:4px;">
<input type="color" id="ie-fill-stop-color" value="${t.gradientStops[t.selectedStopIdx]?.color ?? "#ffffff"}"
style="width:28px;height:22px;padding:0;border:1px solid var(--wfm-border);cursor:pointer;border-radius:3px;">
<button class="wfm-btn wfm-btn-sm" id="ie-fill-stop-add" title="Add stop">+</button>
<button class="wfm-btn wfm-btn-sm" id="ie-fill-stop-remove" title="Remove stop">-</button>
</div>
</div>
</div>
<div class="ie-props-row" style="align-items:flex-start;">
<label>Direction</label>
<div style="display:flex;align-items:center;gap:6px;">
<canvas id="ie-fill-dir" width="70" height="70" style="width:70px;height:70px;border:1px solid var(--wfm-border);border-radius:3px;cursor:crosshair;"></canvas>
<span id="ie-fill-strength-lbl" style="font-size:11px;color:var(--wfm-text-secondary);">${t.gradientStrength.toFixed(1)}</span>
</div>
</div>`}
<div class="ie-props-row">
<label>Tolerance</label>
<input type="range" id="ie-fill-tolerance" min="0" max="255" value="${t.tolerance}">
<span id="ie-fill-tolerance-lbl">${t.tolerance}</span>
</div>
<div class="ie-props-row">
<label>Opacity</label>
<input type="range" id="ie-fill-opacity" min="1" max="100" value="${Math.round(t.opacity * 100)}">
<span id="ie-fill-opacity-lbl">${Math.round(t.opacity * 100)}%</span>
</div>
`;
document.getElementById("ie-fill-mode-solid")?.addEventListener("click", () => {
t.fillMode = "solid";
this._renderFillProps();
});
document.getElementById("ie-fill-mode-gradient")?.addEventListener("click", () => {
t.fillMode = "gradient";
this._renderFillProps();
});
document.getElementById("ie-fill-color")?.addEventListener("input", e => { t.color = e.target.value; });
document.getElementById("ie-fill-tolerance")?.addEventListener("input", e => {
t.tolerance = parseInt(e.target.value);
document.getElementById("ie-fill-tolerance-lbl").textContent = e.target.value;
});
document.getElementById("ie-fill-opacity")?.addEventListener("input", e => {
t.opacity = parseInt(e.target.value) / 100;
document.getElementById("ie-fill-opacity-lbl").textContent = e.target.value + "%";
});
if (isGradient) {
document.getElementById("ie-fill-shape-linear")?.addEventListener("click", () => {
t.gradientShape = "linear";
this._renderFillProps();
});
document.getElementById("ie-fill-shape-radial")?.addEventListener("click", () => {
t.gradientShape = "radial";
this._renderFillProps();
});
document.getElementById("ie-fill-stop-color")?.addEventListener("input", e => {
t.gradientStops[t.selectedStopIdx].color = e.target.value;
this._drawFillGradientRamp();
});
document.getElementById("ie-fill-stop-add")?.addEventListener("click", () => {
t.addStop();
this._renderFillProps();
});
document.getElementById("ie-fill-stop-remove")?.addEventListener("click", () => {
t.removeStop();
this._renderFillProps();
});
this._setupFillGradientRamp();
this._setupFillGradientDir();
}
}
/** カラーランプ(複数ストップの線形プレビュー)の描画とドラッグ操作。particle_widget.jsのカラーランプUIを移植。 */
_drawFillGradientRamp() {
const canvas = document.getElementById("ie-fill-ramp");
if (!canvas) return;
const ctx = canvas.getContext("2d");
const w = canvas.width, h = canvas.height;
const t = this._fillTool;
ctx.clearRect(0, 0, w, h);
const barH = h - 10; // 下部にハンドル用の余白を確保
const grad = ctx.createLinearGradient(0, 0, w, 0);
[...t.gradientStops].sort((a, b) => a.pos - b.pos).forEach(s => grad.addColorStop(s.pos, s.color));
ctx.fillStyle = grad;
ctx.fillRect(0, 0, w, barH);
ctx.strokeStyle = "#666";
ctx.strokeRect(0.5, 0.5, w - 1, barH - 1);
t.gradientStops.forEach((s, i) => {
// ハンドル(三角形)がcanvas端で切れて見えなくならないようクランプする
const x = Math.max(5, Math.min(w - 5, s.pos * w));
ctx.beginPath();
ctx.moveTo(x, h);
ctx.lineTo(x - 5, barH);
ctx.lineTo(x + 5, barH);
ctx.closePath();
ctx.fillStyle = i === t.selectedStopIdx ? "#0077ff" : "#999";
ctx.fill();
});
}
_setupFillGradientRamp() {
const canvas = document.getElementById("ie-fill-ramp");
if (!canvas) return;
this._drawFillGradientRamp();
canvas.style.touchAction = "none";
const t = this._fillTool;
const hitTestStop = mx => {
let best = -1, bestDist = 9;
t.gradientStops.forEach((s, i) => {
const d = Math.abs(s.pos * canvas.width - mx);
if (d < bestDist) { bestDist = d; best = i; }
});
return best;
};
canvas.addEventListener("pointerdown", e => {
const rect = canvas.getBoundingClientRect();
const mx = (e.clientX - rect.left) * (canvas.width / rect.width);
const idx = hitTestStop(mx);
if (idx < 0) return;
canvas.setPointerCapture(e.pointerId);
t.selectStop(idx);
// ドラッグ中onMove/onUpが参照し続けるcanvas要素が入れ替わらないよう、
// DOM全体を再構築する_renderFillProps()は使わず、選択状態の見た目だけを部分更新する
this._drawFillGradientRamp();
const colorInput = document.getElementById("ie-fill-stop-color");
if (colorInput) colorInput.value = t.gradientStops[idx].color;
const onMove = ev => {
const r = canvas.getBoundingClientRect();
const x = (ev.clientX - r.left) * (canvas.width / r.width);
t.gradientStops[t.selectedStopIdx].pos = Math.max(0, Math.min(1, x / canvas.width));
this._drawFillGradientRamp();
};
const onUp = () => {
canvas.removeEventListener("pointermove", onMove);
canvas.removeEventListener("pointerup", onUp);
canvas.removeEventListener("pointercancel", onUp);
};
canvas.addEventListener("pointermove", onMove);
canvas.addEventListener("pointerup", onUp);
canvas.addEventListener("pointercancel", onUp);
});
}
/** グラデーション方向(linear)/半径(radial)を指定するミニコンパスUI。particle_widget.jsの矢印方向ハンドルを移植。 */
_drawFillGradientDir() {
const canvas = document.getElementById("ie-fill-dir");
if (!canvas) return;
const ctx = canvas.getContext("2d");
const w = canvas.width, h = canvas.height, cx = w / 2, cy = h / 2;
const maxR = Math.min(w, h) / 2 - 6;
const t = this._fillTool;
const distFrac = (Math.max(0.2, Math.min(3.0, t.gradientStrength)) - 0.2) / 2.8;
const dist = 6 + distFrac * (maxR - 6);
ctx.clearRect(0, 0, w, h);
ctx.strokeStyle = "#888";
ctx.lineWidth = 1;
ctx.beginPath();
ctx.moveTo(cx - 4, cy); ctx.lineTo(cx + 4, cy);
ctx.moveTo(cx, cy - 4); ctx.lineTo(cx, cy + 4);
ctx.stroke();
ctx.setLineDash([3, 3]);
ctx.strokeStyle = "#0077ff";
if (t.gradientShape === "radial") {
ctx.beginPath();
ctx.arc(cx, cy, dist, 0, Math.PI * 2);
ctx.stroke();
ctx.setLineDash([]);
this._fillDirHandlePos = { x: cx + dist, y: cy };
} else {
const rad = t.gradientAngleDeg * Math.PI / 180;
const ex = cx + Math.cos(rad) * dist, ey = cy + Math.sin(rad) * dist;
ctx.beginPath();
ctx.moveTo(cx, cy); ctx.lineTo(ex, ey);
ctx.stroke();
ctx.setLineDash([]);
this._fillDirHandlePos = { x: ex, y: ey };
}
ctx.beginPath();
ctx.arc(this._fillDirHandlePos.x, this._fillDirHandlePos.y, 4, 0, Math.PI * 2);
ctx.fillStyle = "#ffcc00";
ctx.fill();
}
_setupFillGradientDir() {
const canvas = document.getElementById("ie-fill-dir");
if (!canvas) return;
this._drawFillGradientDir();
canvas.style.touchAction = "none";
const t = this._fillTool;
const w = canvas.width, h = canvas.height, cx = w / 2, cy = h / 2;
const maxR = Math.min(w, h) / 2 - 6;
const applyDrag = (mx, my) => {
const dx = mx - cx, dy = my - cy;
const dist = Math.max(6, Math.min(maxR, Math.hypot(dx, dy)));
t.gradientStrength = 0.2 + ((dist - 6) / (maxR - 6)) * 2.8;
if (t.gradientShape === "linear") t.gradientAngleDeg = Math.atan2(dy, dx) * 180 / Math.PI;
this._drawFillGradientDir();
const lbl = document.getElementById("ie-fill-strength-lbl");
if (lbl) lbl.textContent = t.gradientStrength.toFixed(1);
};
canvas.addEventListener("pointerdown", e => {
canvas.setPointerCapture(e.pointerId);
const rect = canvas.getBoundingClientRect();
applyDrag((e.clientX - rect.left) * (w / rect.width), (e.clientY - rect.top) * (h / rect.height));
const onMove = ev => {
const r = canvas.getBoundingClientRect();
applyDrag((ev.clientX - r.left) * (w / r.width), (ev.clientY - r.top) * (h / r.height));
};
const onUp = () => {
canvas.removeEventListener("pointermove", onMove);
canvas.removeEventListener("pointerup", onUp);
canvas.removeEventListener("pointercancel", onUp);
};
canvas.addEventListener("pointermove", onMove);
canvas.addEventListener("pointerup", onUp);
canvas.addEventListener("pointercancel", onUp);
});
}
// ── Mask Editor One 追加ツール: 初期化・切り替え ──────────────────────────
_initMaskEditorOneTools() {
@@ -1148,7 +1430,7 @@ class ImageEditTab {
this._setZoom(this._zoom * (e.deltaY > 0 ? 0.9 : 1.1));
}, { passive: false });
wrap.addEventListener("mousedown", e => {
wrap.addEventListener("pointerdown", e => {
if (e.button === 1 || (e.button === 0 && this._spaceDown)) {
e.preventDefault();
this._panning = true;
@@ -1167,7 +1449,7 @@ class ImageEditTab {
if (!this._layerMgr || !drawCanvas) return;
this._onToolMouseDown(e, drawCanvas);
});
window.addEventListener("mousemove", e => {
window.addEventListener("pointermove", e => {
if (this._panning) {
this._panOffset.x = e.clientX - this._panStart.x;
this._panOffset.y = e.clientY - this._panStart.y;
@@ -1186,7 +1468,7 @@ class ImageEditTab {
}
}
});
window.addEventListener("mouseup", e => {
window.addEventListener("pointerup", e => {
if (this._panning && (e.button === 1 || e.button === 0)) {
this._panning = false;
wrap.style.cursor = this._spaceDown ? "grab" : "";
@@ -1199,22 +1481,24 @@ class ImageEditTab {
}
});
// draw / text 用 mousedown
// draw / text 用 pointerdown(ペンタブレット筆圧対応のため Pointer Events を使用)
const drawCanvas = document.getElementById("ie-canvas-draw");
if (drawCanvas) {
drawCanvas.addEventListener("mousedown", e => this._onToolMouseDown(e, drawCanvas));
drawCanvas.addEventListener("mousemove", e => this._onToolMouseMove(e, drawCanvas));
drawCanvas.addEventListener("mouseup", e => this._onToolMouseUp(e));
drawCanvas.addEventListener("mouseleave", () => this._onToolMouseLeave());
drawCanvas.style.touchAction = "none";
drawCanvas.addEventListener("pointerdown", e => this._onToolMouseDown(e, drawCanvas));
drawCanvas.addEventListener("pointermove", e => this._onToolMouseMove(e, drawCanvas));
drawCanvas.addEventListener("pointerup", e => this._onToolMouseUp(e));
drawCanvas.addEventListener("pointerleave", () => this._onToolMouseLeave());
}
// select 用 mousedown(overlayCanvas)
// select 用 pointerdown(overlayCanvas)
const overlay = document.getElementById("ie-canvas-overlay");
if (overlay) {
overlay.addEventListener("mousedown", e => this._onToolMouseDown(e, overlay));
overlay.addEventListener("mousemove", e => this._onToolMouseMove(e, overlay));
overlay.addEventListener("mouseup", e => this._onToolMouseUp(e));
overlay.addEventListener("mouseleave", () => this._onToolMouseLeave());
overlay.style.touchAction = "none";
overlay.addEventListener("pointerdown", e => this._onToolMouseDown(e, overlay));
overlay.addEventListener("pointermove", e => this._onToolMouseMove(e, overlay));
overlay.addEventListener("pointerup", e => this._onToolMouseUp(e));
overlay.addEventListener("pointerleave", () => this._onToolMouseLeave());
// テキストオブジェクトのダブルクリックで再編集
overlay.addEventListener("dblclick", e => this._onOverlayDblClick(e, overlay));
}
@@ -1222,16 +1506,27 @@ class ImageEditTab {
_onToolMouseDown(e, refCanvas) {
if (!this._layerMgr || e.button !== 0 || this._spaceDown) return;
const pos = DrawTool.getCanvasPos(refCanvas, e);
const pos = DrawTool.getCanvasPos(refCanvas, e);
// PointerEvent.pressure: pen -> actual pressure, mouse -> 0.5 while a button is held.
const pressure = e.pressure || 0.5;
if (this._activeTool === "draw" && this._drawTool) {
const activeLayer = this._layerMgr.activeLayer;
if (!activeLayer) return;
this._saveUndo();
this._drawTool.setCanvas(activeLayer.canvas);
this._drawTool.onMouseDown(pos.x, pos.y);
this._drawTool.onMouseDown(pos.x, pos.y, pressure);
this._updateCompositeView();
} else if (this._activeTool === "fill" && this._fillTool) {
const activeLayer = this._layerMgr.activeLayer;
if (!activeLayer) return;
this._saveUndo();
this._fillTool.setCanvas(activeLayer.canvas);
this._fillTool.onMouseDown(pos.x, pos.y);
this._updateCompositeView();
this._refreshLayerList();
} else if (this._activeTool === "mask") {
const activeLayer = this._layerMgr.activeLayer;
if (!activeLayer || activeLayer.type !== "mask") {
@@ -1242,7 +1537,7 @@ class ImageEditTab {
if (sub === "paint" && this._maskTool) {
this._saveUndo();
this._maskTool.setCanvas(activeLayer.canvas);
this._maskTool.onMouseDown(pos.x, pos.y);
this._maskTool.onMouseDown(pos.x, pos.y, pressure);
this._updateCompositeView();
} else if (sub === "color" && this._maskColorTool) {
this._saveUndo();
@@ -1287,15 +1582,16 @@ class ImageEditTab {
_onToolMouseMove(e, refCanvas) {
if (!this._layerMgr) return;
const pos = DrawTool.getCanvasPos(refCanvas, e);
const pos = DrawTool.getCanvasPos(refCanvas, e);
const pressure = e.pressure || 0.5;
if (this._activeTool === "draw") {
this._drawTool?.onMouseMove(pos.x, pos.y);
this._drawTool?.onMouseMove(pos.x, pos.y, pressure);
if (this._drawTool?._drawing) this._updateCompositeView();
}
if (this._activeTool === "mask") {
const sub = this._maskSubtool;
if (sub === "paint") {
this._maskTool?.onMouseMove(pos.x, pos.y);
this._maskTool?.onMouseMove(pos.x, pos.y, pressure);
if (this._maskTool?._drawing) this._updateCompositeView();
} else if (sub === "vector") {
this._maskVectorTool?.onMouseMove(pos.x, pos.y);
@@ -1643,6 +1939,8 @@ class ImageEditTab {
this._refreshLayerList();
});
this._fillTool = new FillTool();
this._compositeMode = false;
}
@@ -2166,6 +2464,7 @@ class ImageEditTab {
if (e.key === "b") this._setActiveTool("draw");
if (e.key === "t") this._setActiveTool("text");
if (e.key === "s") this._setActiveTool("shape");
if (e.key === "g") this._setActiveTool("fill");
// Delete/Backspaceで選択オブジェクト削除
if ((e.key === "Delete" || e.key === "Backspace") && this._activeTool === "select") {
const layer = this._selectTool?.getSelectedLayer();
+57 -41
View File
@@ -20,6 +20,11 @@ export class DrawTool {
this.sizeJitterAmount = 0.5;
this.rotationJitter = false;
// Pen pressure (0–1, from PointerEvent.pressure; mouse reports 0.5).
// pressure=0.5 maps to a 1.0x multiplier so mouse behavior is unchanged.
this.pressureEnabled = true;
this._lastPressure = 0.5;
// Image brush from ABR library (null = default circle brush)
this.brushImage = null;
this.brushName = "Circle";
@@ -80,29 +85,31 @@ export class DrawTool {
if (this.canvas) this.canvas.style.cursor = "";
}
onMouseDown(x, y) {
this._drawing = true;
this._lastX = x;
this._lastY = y;
onMouseDown(x, y, pressure = 0.5) {
this._drawing = true;
this._lastX = x;
this._lastY = y;
this._lastPressure = pressure;
if (this.brushImage) {
this._initStrokeBuffer();
this._paintToStroke(x, y);
this._paintToStroke(x, y, pressure);
this._mergeStroke();
} else {
this._paint(x, y);
this._paint(x, y, pressure);
}
}
onMouseMove(x, y) {
onMouseMove(x, y, pressure = 0.5) {
if (!this._drawing) return;
if (this.brushImage) {
this._paintLineToStroke(this._lastX, this._lastY, x, y);
this._paintLineToStroke(this._lastX, this._lastY, x, y, this._lastPressure, pressure);
this._mergeStroke();
} else {
this._paintLine(this._lastX, this._lastY, x, y);
this._paintLine(this._lastX, this._lastY, x, y, this._lastPressure, pressure);
}
this._lastX = x;
this._lastY = y;
this._lastX = x;
this._lastY = y;
this._lastPressure = pressure;
}
onMouseUp() {
@@ -117,6 +124,20 @@ export class DrawTool {
if (this._drawing) this.onMouseUp();
}
// ── Pressure response ──────────────────────────────────────────────
_effectiveSize(pressure) {
if (!this.pressureEnabled) return this.brushSize;
const p = Math.max(0, Math.min(1, pressure ?? 0.5));
return Math.max(1, this.brushSize * (0.3 + p * 1.4)); // p=0.5 -> 1.0x
}
_effectiveOpacity(pressure) {
if (!this.pressureEnabled) return this.opacity;
const p = Math.max(0, Math.min(1, pressure ?? 0.5));
return Math.max(0, Math.min(1, this.opacity * (0.4 + p * 1.2))); // p=0.5 -> 1.0x
}
// ── Stroke buffer (image brush only) ─────────────────────────────
_initStrokeBuffer() {
@@ -155,54 +176,48 @@ export class DrawTool {
ctx.restore();
}
_paintToStroke(x, y) {
_paintToStroke(x, y, pressure = 0.5) {
const saved = this.ctx;
this.ctx = this._strokeCtx;
if (this.sizeJitter || this.rotationJitter) {
const savedSize = this.brushSize;
const savedAngle = this.angle;
const savedStamp = this._imgStamp;
const savedStampSize = this._imgStampSize;
if (this.sizeJitter) {
this.brushSize = Math.max(1, savedSize * (1 - Math.random() * this.sizeJitterAmount));
}
if (this.rotationJitter) {
this.angle = Math.random() * 360;
}
this._paintImageBrush(x, y);
this.brushSize = savedSize;
this.angle = savedAngle;
this._imgStamp = savedStamp;
this._imgStampSize = savedStampSize;
let size = this._effectiveSize(pressure);
if (this.sizeJitter) {
size = Math.max(1, size * (1 - Math.random() * this.sizeJitterAmount));
}
if (this.rotationJitter) {
const savedAngle = this.angle;
this.angle = Math.random() * 360;
this._paintImageBrush(x, y, size);
this.angle = savedAngle;
} else {
this._paintImageBrush(x, y);
this._paintImageBrush(x, y, size);
}
this.ctx = saved;
}
_paintLineToStroke(x0, y0, x1, y1) {
_paintLineToStroke(x0, y0, x1, y1, p0 = 0.5, p1 = 0.5) {
const dist = Math.hypot(x1 - x0, y1 - y0);
const step = Math.max(1, this.brushSize * this.spacing);
const steps = Math.ceil(dist / step);
for (let i = 1; i <= steps; i++) {
const t = i / steps;
this._paintToStroke(x0 + (x1 - x0) * t, y0 + (y1 - y0) * t);
this._paintToStroke(x0 + (x1 - x0) * t, y0 + (y1 - y0) * t, p0 + (p1 - p0) * t);
}
}
// ── Circle brush ─────────────────────────────────────────────────
_getStamp() {
_getStamp(size) {
size = Math.max(1, Math.round(size));
if (
this._stamp &&
this._stampSize === this.brushSize &&
this._stampSize === size &&
this._stampHard === this.hardness &&
this._stampColor === this.color
) return this._stamp;
const size = Math.max(1, Math.round(this.brushSize));
const sc = document.createElement("canvas");
sc.width = size;
sc.height = size;
@@ -225,11 +240,12 @@ export class DrawTool {
return sc;
}
_paint(x, y) {
const stamp = this._getStamp();
_paint(x, y, pressure = 0.5) {
const size = this._effectiveSize(pressure);
const stamp = this._getStamp(size);
const s = stamp.width;
this.ctx.save();
this.ctx.globalAlpha = this.opacity;
this.ctx.globalAlpha = this._effectiveOpacity(pressure);
if (this.mode === "erase") {
this.ctx.globalCompositeOperation = "destination-out";
}
@@ -237,13 +253,13 @@ export class DrawTool {
this.ctx.restore();
}
_paintLine(x0, y0, x1, y1) {
_paintLine(x0, y0, x1, y1, p0 = 0.5, p1 = 0.5) {
const dist = Math.hypot(x1 - x0, y1 - y0);
const spacing = Math.max(1, this.brushSize * 0.2);
const steps = Math.max(1, Math.ceil(dist / spacing));
for (let i = 1; i <= steps; i++) {
const t = i / steps;
this._paint(x0 + (x1 - x0) * t, y0 + (y1 - y0) * t);
this._paint(x0 + (x1 - x0) * t, y0 + (y1 - y0) * t, p0 + (p1 - p0) * t);
}
}
@@ -319,8 +335,8 @@ export class DrawTool {
return sc;
}
_paintImageBrush(x, y) {
const stamp = this._getImageStamp(Math.round(this.brushSize));
_paintImageBrush(x, y, size = this.brushSize) {
const stamp = this._getImageStamp(Math.round(size));
this.ctx.globalCompositeOperation = "source-over";
if (this.angle) {
this.ctx.save();
+228
View File
@@ -0,0 +1,228 @@
/**
* Image Edit Tab - Fill Tool (bucket fill)
* Flood-fills a contiguous same-color region on the active layer canvas,
* either with a solid color or a linear/radial gradient.
* Gradient ramp math (evalGradient / hex<->rgb) is ported from
* comfyUI-particle-pixijs's particle_engine.js.
*/
function _hexToRgb01(hex) {
const m = /^#?([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i.exec(hex || "#000000");
if (!m) return { r: 0, g: 0, b: 0 };
return { r: parseInt(m[1], 16) / 255, g: parseInt(m[2], 16) / 255, b: parseInt(m[3], 16) / 255 };
}
function _rgb01ToHex({ r, g, b }) {
const h = v => Math.round(Math.max(0, Math.min(1, v)) * 255).toString(16).padStart(2, "0");
return `#${h(r)}${h(g)}${h(b)}`;
}
function _lerp(a, b, t) { return a + (b - a) * t; }
export class FillTool {
constructor() {
// fill settings
this.tolerance = 32; // 0-255
this.fillMode = "solid"; // "solid" | "gradient"
this.color = "#ff0000"; // solid fill color
this.opacity = 1.0;
// gradient settings
this.gradientShape = "linear"; // "linear" | "radial"
this.gradientAngleDeg = 0; // linear direction
this.gradientStrength = 1.0; // 0.2-3.0, length/radius multiplier
this.gradientStops = [
{ pos: 0.0, color: "#ffffff" },
{ pos: 1.0, color: "#888888" },
];
this.selectedStopIdx = 0;
// internal state
this._active = false;
this._canvas = null;
this._ctx = null;
this._onChange = null;
}
setCanvas(canvas) {
this._canvas = canvas;
this._ctx = canvas ? canvas.getContext("2d") : null;
}
onChange(cb) { this._onChange = cb; }
activate() { this._active = true; }
deactivate() { this._active = false; }
// ── color ramp evaluation (ported from particle_engine.js evalGradient) ──
static evalGradient(stops, t) {
if (!stops || stops.length === 0) return { r: 0, g: 0, b: 0 };
const sorted = [...stops].sort((a, b) => a.pos - b.pos);
if (t <= sorted[0].pos) return _hexToRgb01(sorted[0].color);
const last = sorted[sorted.length - 1];
if (t >= last.pos) return _hexToRgb01(last.color);
for (let i = 0; i < sorted.length - 1; i++) {
const a = sorted[i], b = sorted[i + 1];
if (t >= a.pos && t <= b.pos) {
const span = b.pos - a.pos;
const localT = span > 0 ? (t - a.pos) / span : 0;
const ca = _hexToRgb01(a.color), cb = _hexToRgb01(b.color);
return {
r: _lerp(ca.r, cb.r, localT),
g: _lerp(ca.g, cb.g, localT),
b: _lerp(ca.b, cb.b, localT),
};
}
}
return _hexToRgb01(last.color);
}
/** Preview swatch color (hex) of the ramp at position t. */
evalGradientHex(t) {
return _rgb01ToHex(FillTool.evalGradient(this.gradientStops, t));
}
// ── stop editing helpers (ported from particle_widget.js addStop/removeStop/selectStop) ──
addStop() {
const sorted = [...this.gradientStops].sort((a, b) => a.pos - b.pos);
let bestGapStart = 0, bestGapSize = 0;
for (let i = 0; i < sorted.length - 1; i++) {
const gap = sorted[i + 1].pos - sorted[i].pos;
if (gap > bestGapSize) { bestGapSize = gap; bestGapStart = sorted[i].pos; }
}
const pos = sorted.length < 2 ? 0.5 : bestGapStart + bestGapSize / 2;
const color = _rgb01ToHex(FillTool.evalGradient(this.gradientStops, pos));
this.gradientStops.push({ pos, color });
this.selectedStopIdx = this.gradientStops.length - 1;
}
removeStop(idx = this.selectedStopIdx) {
if (this.gradientStops.length <= 1) return;
this.gradientStops.splice(idx, 1);
this.selectedStopIdx = Math.max(0, Math.min(this.selectedStopIdx, this.gradientStops.length - 1));
}
selectStop(idx) {
this.selectedStopIdx = idx;
}
// ── flood fill ────────────────────────────────────────
/**
* Flood-fills the contiguous region matching the pixel at (x, y).
* (x, y) are canvas-pixel coordinates (already converted via DrawTool.getCanvasPos).
*/
onMouseDown(x, y) {
if (!this._active || !this._ctx) return;
const w = this._canvas.width, h = this._canvas.height;
const px = Math.floor(x), py = Math.floor(y);
if (px < 0 || py < 0 || px >= w || py >= h) return;
const imgData = this._ctx.getImageData(0, 0, w, h);
const data = imgData.data;
const mask = this._buildFloodMask(data, w, h, px, py, this.tolerance);
if (!mask) return;
if (this.fillMode === "gradient") {
this._fillMaskWithGradient(data, w, h, mask.pixels, mask.bbox);
} else {
this._fillMaskWithSolid(data, mask.pixels, this.color, this.opacity);
}
this._ctx.putImageData(imgData, 0, 0);
}
/** Scanline stack-based flood fill. Returns { pixels: Uint8Array(w*h), bbox } or null. */
_buildFloodMask(data, w, h, startX, startY, tolerance) {
const idx0 = (startY * w + startX) * 4;
const tr = data[idx0], tg = data[idx0 + 1], tb = data[idx0 + 2], ta = data[idx0 + 3];
const tol2 = tolerance * tolerance;
const matches = (i) => {
const dr = data[i] - tr, dg = data[i + 1] - tg, db = data[i + 2] - tb, da = data[i + 3] - ta;
return (dr * dr + dg * dg + db * db + da * da) <= tol2 * 4;
};
const pixels = new Uint8Array(w * h);
const stack = [[startX, startY]];
let minX = startX, maxX = startX, minY = startY, maxY = startY;
while (stack.length) {
let [x, y] = stack.pop();
while (x >= 0 && matches((y * w + x) * 4)) x--;
x++;
let spanUp = false, spanDown = false;
while (x < w && matches((y * w + x) * 4) && !pixels[y * w + x]) {
pixels[y * w + x] = 1;
if (x < minX) minX = x; if (x > maxX) maxX = x;
if (y < minY) minY = y; if (y > maxY) maxY = y;
if (y > 0) {
const above = matches((( y - 1) * w + x) * 4) && !pixels[(y - 1) * w + x];
if (above && !spanUp) { stack.push([x, y - 1]); spanUp = true; }
else if (!above) spanUp = false;
}
if (y < h - 1) {
const below = matches(((y + 1) * w + x) * 4) && !pixels[(y + 1) * w + x];
if (below && !spanDown) { stack.push([x, y + 1]); spanDown = true; }
else if (!below) spanDown = false;
}
x++;
}
}
return { pixels, bbox: { minX, minY, maxX, maxY } };
}
_fillMaskWithSolid(data, pixels, colorHex, opacity) {
const { r, g, b } = _hexToRgb01(colorHex);
const cr = r * 255, cg = g * 255, cb = b * 255;
const alpha = Math.max(0, Math.min(1, opacity));
for (let i = 0; i < pixels.length; i++) {
if (!pixels[i]) continue;
const di = i * 4;
data[di] = _lerp(data[di], cr, alpha);
data[di + 1] = _lerp(data[di + 1], cg, alpha);
data[di + 2] = _lerp(data[di + 2], cb, alpha);
data[di + 3] = Math.max(data[di + 3], alpha * 255);
}
}
/** Reusable with any {pixels, bbox} mask (flood fill today; rect/ellipse selections in the future). */
_fillMaskWithGradient(data, w, h, pixels, bbox) {
const cx = (bbox.minX + bbox.maxX) / 2, cy = (bbox.minY + bbox.maxY) / 2;
const diagW = bbox.maxX - bbox.minX, diagH = bbox.maxY - bbox.minY;
const diag = Math.max(1, Math.hypot(diagW, diagH));
const strength = Math.max(0.2, Math.min(3.0, this.gradientStrength));
const alpha = Math.max(0, Math.min(1, this.opacity));
const angleRad = this.gradientAngleDeg * Math.PI / 180;
const dirX = Math.cos(angleRad), dirY = Math.sin(angleRad);
const halfLen = (diag / 2) * strength;
const radius = (diag / 2) * strength;
for (let y = bbox.minY; y <= bbox.maxY; y++) {
for (let x = bbox.minX; x <= bbox.maxX; x++) {
const i = y * w + x;
if (!pixels[i]) continue;
const dx = x - cx, dy = y - cy;
let t;
if (this.gradientShape === "radial") {
t = Math.hypot(dx, dy) / radius;
} else {
t = (dx * dirX + dy * dirY) / (halfLen * 2) + 0.5;
}
t = Math.max(0, Math.min(1, t));
const c = FillTool.evalGradient(this.gradientStops, t);
const di = i * 4;
data[di] = _lerp(data[di], c.r * 255, alpha);
data[di + 1] = _lerp(data[di + 1], c.g * 255, alpha);
data[di + 2] = _lerp(data[di + 2], c.b * 255, alpha);
data[di + 3] = Math.max(data[di + 3], alpha * 255);
}
}
}
}
+50 -40
View File
@@ -25,6 +25,11 @@ export class MaskTool {
this.sizeJitterAmount = 0.5; // 0–1: fraction of brushSize that can be removed
this.rotationJitter = false;
// Pen pressure (0–1, from PointerEvent.pressure; mouse reports 0.5).
// pressure=0.5 maps to a 1.0x multiplier so mouse behavior is unchanged.
this.pressureEnabled = true;
this._lastPressure = 0.5;
this._drawing = false;
this._lastX = 0;
this._lastY = 0;
@@ -80,29 +85,31 @@ export class MaskTool {
if (this.canvas) this.canvas.style.cursor = "";
}
onMouseDown(x, y) {
this._drawing = true;
this._lastX = x;
this._lastY = y;
onMouseDown(x, y, pressure = 0.5) {
this._drawing = true;
this._lastX = x;
this._lastY = y;
this._lastPressure = pressure;
if (this.brushImage) {
this._initStrokeBuffer();
this._paintToStroke(x, y);
this._paintToStroke(x, y, pressure);
this._mergeStroke();
} else {
this._paint(x, y);
this._paint(x, y, pressure);
}
}
onMouseMove(x, y) {
onMouseMove(x, y, pressure = 0.5) {
if (!this._drawing) return;
if (this.brushImage) {
this._paintLineToStroke(this._lastX, this._lastY, x, y);
this._paintLineToStroke(this._lastX, this._lastY, x, y, this._lastPressure, pressure);
this._mergeStroke();
} else {
this._paintLine(this._lastX, this._lastY, x, y);
this._paintLine(this._lastX, this._lastY, x, y, this._lastPressure, pressure);
}
this._lastX = x;
this._lastY = y;
this._lastX = x;
this._lastY = y;
this._lastPressure = pressure;
}
onMouseUp() {
@@ -117,6 +124,14 @@ export class MaskTool {
if (this._drawing) this.onMouseUp();
}
// ── Pressure response ──────────────────────────────────────────────
_effectiveSize(pressure) {
if (!this.pressureEnabled) return this.brushSize;
const p = Math.max(0, Math.min(1, pressure ?? 0.5));
return Math.max(1, this.brushSize * (0.3 + p * 1.4)); // p=0.5 -> 1.0x
}
// ── Stroke buffer (image brush only) ─────────────────────────────
_initStrokeBuffer() {
@@ -149,54 +164,48 @@ export class MaskTool {
ctx.globalCompositeOperation = "source-over";
}
_paintToStroke(x, y) {
_paintToStroke(x, y, pressure = 0.5) {
const saved = this.ctx;
this.ctx = this._strokeCtx;
if (this.sizeJitter || this.rotationJitter) {
const savedSize = this.brushSize;
const savedAngle = this.angle;
const savedStamp = this._imgStamp;
const savedStampSize = this._imgStampSize;
if (this.sizeJitter) {
this.brushSize = Math.max(1, savedSize * (1 - Math.random() * this.sizeJitterAmount));
}
if (this.rotationJitter) {
this.angle = Math.random() * 360;
}
this._paintImageBrush(x, y);
this.brushSize = savedSize;
this.angle = savedAngle;
this._imgStamp = savedStamp;
this._imgStampSize = savedStampSize;
let size = this._effectiveSize(pressure);
if (this.sizeJitter) {
size = Math.max(1, size * (1 - Math.random() * this.sizeJitterAmount));
}
if (this.rotationJitter) {
const savedAngle = this.angle;
this.angle = Math.random() * 360;
this._paintImageBrush(x, y, size);
this.angle = savedAngle;
} else {
this._paintImageBrush(x, y);
this._paintImageBrush(x, y, size);
}
this.ctx = saved;
}
_paintLineToStroke(x0, y0, x1, y1) {
_paintLineToStroke(x0, y0, x1, y1, p0 = 0.5, p1 = 0.5) {
const dist = Math.hypot(x1 - x0, y1 - y0);
const step = Math.max(1, this.brushSize * this.spacing);
const steps = Math.ceil(dist / step);
for (let i = 1; i <= steps; i++) {
const t = i / steps;
this._paintToStroke(x0 + (x1 - x0) * t, y0 + (y1 - y0) * t);
this._paintToStroke(x0 + (x1 - x0) * t, y0 + (y1 - y0) * t, p0 + (p1 - p0) * t);
}
}
// ── Circle brush ─────────────────────────────────────────────────
_getStamp() {
_getStamp(size) {
size = Math.max(1, Math.round(size));
if (
this._stamp &&
this._stampSize === this.brushSize &&
this._stampSize === size &&
this._stampHard === this.hardness &&
this._stampMode === this.mode
) return this._stamp;
const size = Math.max(1, Math.round(this.brushSize));
const sc = document.createElement("canvas");
sc.width = size;
sc.height = size;
@@ -222,8 +231,9 @@ export class MaskTool {
return sc;
}
_paint(x, y) {
const stamp = this._getStamp();
_paint(x, y, pressure = 0.5) {
const size = this._effectiveSize(pressure);
const stamp = this._getStamp(size);
const s = stamp.width;
this.ctx.save();
if (this.mode === "erase") {
@@ -233,13 +243,13 @@ export class MaskTool {
this.ctx.restore();
}
_paintLine(x0, y0, x1, y1) {
_paintLine(x0, y0, x1, y1, p0 = 0.5, p1 = 0.5) {
const dist = Math.hypot(x1 - x0, y1 - y0);
const spacing = Math.max(1, this.brushSize * 0.2);
const steps = Math.max(1, Math.ceil(dist / spacing));
for (let i = 1; i <= steps; i++) {
const t = i / steps;
this._paint(x0 + (x1 - x0) * t, y0 + (y1 - y0) * t);
this._paint(x0 + (x1 - x0) * t, y0 + (y1 - y0) * t, p0 + (p1 - p0) * t);
}
}
@@ -307,8 +317,8 @@ export class MaskTool {
return sc;
}
_paintImageBrush(x, y) {
const stamp = this._getImageStamp(Math.round(this.brushSize));
_paintImageBrush(x, y, size = this.brushSize) {
const stamp = this._getImageStamp(Math.round(size));
this.ctx.globalCompositeOperation = "source-over";
if (this.angle) {
this.ctx.save();
+4
View File
@@ -1984,6 +1984,7 @@
<li id="wfm-help-imageedit-5">Draw (B): freehand brush drawing onto the active draw layer; Tool Options: color, brush size, blend mode; Properties pane includes a MASK EDITOR ONE (COLOR) section for ABR image brushes — always visible, header text is green when brushes are available, gray when none are imported yet; Select is disabled until at least one brush exists</li>
<li id="wfm-help-imageedit-6">Text (T): click on the canvas to place a text input overlay; configure font family, size, bold/italic, align, color in the Tool Options bar; click OK to place the text as an exact-size Text layer; double-click an existing text layer with the Select tool to re-edit</li>
<li id="wfm-help-imageedit-7">Shape (S): draw geometric shapes onto the canvas; each committed shape becomes an independent draw layer; Tool Options: Shape type (Rect / Ellipse / Line / FreeLine), Rounded checkbox (Rect / Ellipse only), Fill color + None toggle (hidden for Line / FreeLine), Stroke color + width + None toggle (None hidden for Line / FreeLine where stroke is always active), Opacity slider, ↩ Undo button; drag to draw — a blue dashed outline previews the shape; release to commit</li>
<li id="wfm-help-imageedit-7a2">Fill (G): bucket fill — click a contiguous same-color region on the active layer to flood-fill it with a solid color or a linear/radial gradient; Tool Options: Mode (Solid / Gradient), Color (solid) or Shape + Ramp (drag stops to reposition, click a stop then use the color swatch, +/- to add/remove) + Direction dial (drag to set angle/radius, gradient), Tolerance (color-match threshold), Opacity</li>
<li id="wfm-help-imageedit-7b">Blur (≈): apply Gaussian blur or mosaic to the active layer — whole-layer or region-based (drag a rectangle); see the Blur Tool card below for details</li>
<li id="wfm-help-imageedit-7c">BG Remove (⬚): remove the background from the active layer using Lightweight (@imgly, runs in browser) or BiRefNet (requires Mask Editor One + birefnet.safetensors in ComfyUI/models/background_removal/); see the BG Remove Tool card below for details</li>
<li id="wfm-help-imageedit-7d">Mask (🎭): paint masks on a mask layer using 6 sub-tools — Paint (freehand), Color (flood-select by similar color), Alpha (extract from image transparency), Text (stamp text), Vector (Catmull-Rom spline polygon), Shape (rect / ellipse); SAM3 text-prompt segmentation is also available when Mask Editor One is installed; click "Mask" (second row of the Layers header) to add a mask layer; see the Mask Tool card below for details</li>
@@ -2086,6 +2087,7 @@
<li id="wfm-help-imageedit-23">B: Draw tool</li>
<li id="wfm-help-imageedit-24">T: Text tool</li>
<li id="wfm-help-imageedit-25">S: Shape tool</li>
<li id="wfm-help-imageedit-25b">G: Fill tool</li>
<li id="wfm-help-imageedit-26">Delete: Delete selected layer (requires 2+ layers)</li>
<li id="wfm-help-imageedit-27">Ctrl+Z / Ctrl+Y: Undo / Redo</li>
<li id="wfm-help-imageedit-28">Space + drag: Pan canvas</li>
@@ -2135,6 +2137,7 @@
<li id="wfm-help-imageedit-tabkbd-2">B: Draw tool</li>
<li id="wfm-help-imageedit-tabkbd-3">T: Text tool</li>
<li id="wfm-help-imageedit-tabkbd-4">S: Shape tool</li>
<li id="wfm-help-imageedit-tabkbd-4b">G: Fill tool</li>
<li id="wfm-help-imageedit-tabkbd-5">Delete: Delete selected layer (requires 2+ layers)</li>
<li id="wfm-help-imageedit-tabkbd-6">Ctrl+Z / Ctrl+Y: Undo / Redo</li>
<li id="wfm-help-imageedit-tabkbd-7">Space + drag: Pan canvas</li>
@@ -2618,6 +2621,7 @@
<button class="ie-tool-btn" data-tool="draw" title="Draw (B)">✏</button>
<button class="ie-tool-btn" data-tool="text" title="Text (T)">T</button>
<button class="ie-tool-btn" data-tool="shape" title="Shape (S)">□</button>
<button class="ie-tool-btn" data-tool="fill" title="Fill (G)">🪣</button>
<button class="ie-tool-btn" data-tool="mask" title="Mask">🎭</button>
<button class="ie-tool-btn" data-tool="blur" title="Blur">≈</button>
<button class="ie-tool-btn" data-tool="filter" title="Filter">★</button>