alphard/Comfyui-LayerForge
1
0
Fork 0
mirror of https://github.com/Azornes/Comfyui-LayerForge.git synced 2026-03-26 06:45:44 -03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor JS code for consistent formatting and style

Browse Source 
Standardized spacing and object literal formatting across multiple JS files for improved readability and consistency. No functional changes were made. Minor Python formatting adjustment for line length in canvas_node.py.
This commit is contained in:
Dariusz L
2025-06-25 05:51:47 +02:00
parent acdd12b65e
commit 6b44bd9239
5 changed files with 283 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
canvas_node.py
View File

@@ -251,7 +251,8 @@ class CanvasNode:
try: try:
# Wczytaj obraz bez maski # Wczytaj obraz bez maski
path_image_without_mask = folder_paths.get_annotated_filepath(canvas_image.replace('.png', '_without_mask.png')) path_image_without_mask = folder_paths.get_annotated_filepath(
canvas_image.replace('.png', '_without_mask.png'))
i = Image.open(path_image_without_mask) i = Image.open(path_image_without_mask)
i = ImageOps.exif_transpose(i) i = ImageOps.exif_transpose(i)
if i.mode not in ['RGB', 'RGBA']: if i.mode not in ['RGB', 'RGBA']:

18
js/Canvas.js
View File

@@ -1,5 +1,5 @@
import { getCanvasState, setCanvasState, removeCanvasState } from "./db.js"; import {getCanvasState, setCanvasState, removeCanvasState} from "./db.js";
import { MaskTool } from "./Mask_tool.js"; import {MaskTool} from "./Mask_tool.js";
export class Canvas { export class Canvas {
constructor(node, widget) { constructor(node, widget) {
@@ -103,7 +103,7 @@ export class Canvas {
this.width = savedState.width || 512; this.width = savedState.width || 512;
this.height = savedState.height || 512; this.height = savedState.height || 512;
this.viewport = savedState.viewport || { x: -(this.width / 4), y: -(this.height / 4), zoom: 0.8 }; this.viewport = savedState.viewport || {x: -(this.width / 4), y: -(this.height / 4), zoom: 0.8};
this.updateCanvasSize(this.width, this.height, false); this.updateCanvasSize(this.width, this.height, false);
console.log(`Canvas resized to ${this.width}x${this.height} and viewport set.`); console.log(`Canvas resized to ${this.width}x${this.height} and viewport set.`);
@@ -115,7 +115,7 @@ export class Canvas {
const img = new Image(); const img = new Image();
img.onload = () => { img.onload = () => {
console.log(`Layer ${index}: Image loaded successfully.`); console.log(`Layer ${index}: Image loaded successfully.`);
const newLayer = { ...layerData, image: img }; const newLayer = {...layerData, image: img};
delete newLayer.imageSrc; delete newLayer.imageSrc;
resolve(newLayer); resolve(newLayer);
}; };
@@ -126,7 +126,7 @@ export class Canvas {
img.src = layerData.imageSrc; img.src = layerData.imageSrc;
} else { } else {
console.log(`Layer ${index}: No imageSrc found, resolving layer data.`); console.log(`Layer ${index}: No imageSrc found, resolving layer data.`);
resolve({ ...layerData }); resolve({...layerData});
} }
}); });
}); });
@@ -156,7 +156,7 @@ export class Canvas {
try { try {
const state = { const state = {
layers: this.layers.map((layer, index) => { layers: this.layers.map((layer, index) => {
const newLayer = { ...layer }; const newLayer = {...layer};
if (layer.image instanceof HTMLImageElement) { if (layer.image instanceof HTMLImageElement) {
console.log(`Layer ${index}: Serializing image to data:URL.`); console.log(`Layer ${index}: Serializing image to data:URL.`);
newLayer.imageSrc = layer.image.src; newLayer.imageSrc = layer.image.src;
@@ -189,7 +189,7 @@ export class Canvas {
cloneLayers(layers) { cloneLayers(layers) {
return layers.map(layer => { return layers.map(layer => {
const newLayer = { ...layer }; const newLayer = {...layer};
// Obiekty Image nie są klonowane, aby oszczędzać pamięć. // Obiekty Image nie są klonowane, aby oszczędzać pamięć.
// Zakładamy, że same dane obrazu się nie zmieniają. // Zakładamy, że same dane obrazu się nie zmieniają.
return newLayer; return newLayer;
@@ -198,7 +198,7 @@ export class Canvas {
getStateSignature(layers) { getStateSignature(layers) {
return JSON.stringify(layers.map(layer => { return JSON.stringify(layers.map(layer => {
const sig = { ...layer }; const sig = {...layer};
if (sig.image instanceof HTMLImageElement) { if (sig.image instanceof HTMLImageElement) {
sig.imageSrc = sig.image.src; sig.imageSrc = sig.image.src;
} }
@@ -257,7 +257,7 @@ export class Canvas {
if (this.selectedLayers) { if (this.selectedLayers) {
this.selectedLayers.forEach(sl => { this.selectedLayers.forEach(sl => {
const found = this.layers.find(l => l.id === sl.id); const found = this.layers.find(l => l.id === sl.id);
if(found) newSelectedLayers.push(found); if (found) newSelectedLayers.push(found);
}); });
} }
this.updateSelection(newSelectedLayers); this.updateSelection(newSelectedLayers);

85
js/Canvas_view.js
View File

@@ -2,7 +2,7 @@ import {app} from "../../scripts/app.js";
import {api} from "../../scripts/api.js"; import {api} from "../../scripts/api.js";
import {$el} from "../../scripts/ui.js"; import {$el} from "../../scripts/ui.js";
import {Canvas} from "./Canvas.js"; import {Canvas} from "./Canvas.js";
import { clearAllCanvasStates } from "./db.js"; import {clearAllCanvasStates} from "./db.js";
async function createCanvasWidget(node, widget, app) { async function createCanvasWidget(node, widget, app) {
const canvas = new Canvas(node, widget); const canvas = new Canvas(node, widget);
@@ -337,7 +337,7 @@ async function createCanvasWidget(node, widget, app) {
id: `open-editor-btn-${node.id}`, id: `open-editor-btn-${node.id}`,
textContent: "⛶", textContent: "⛶",
title: "Open in Editor", title: "Open in Editor",
style: { minWidth: "40px", maxWidth: "40px", fontWeight: "bold" }, style: {minWidth: "40px", maxWidth: "40px", fontWeight: "bold"},
}), }),
$el("button.painter-button", { $el("button.painter-button", {
textContent: "?", textContent: "?",
@@ -514,11 +514,26 @@ async function createCanvasWidget(node, widget, app) {
// --- Group: Transform --- // --- Group: Transform ---
$el("div.painter-button-group", {}, [ $el("div.painter-button-group", {}, [
$el("button.painter-button.requires-selection", { textContent: "Rotate +90°", onclick: () => canvas.rotateLayer(90) }), $el("button.painter-button.requires-selection", {
$el("button.painter-button.requires-selection", { textContent: "Scale +5%", onclick: () => canvas.resizeLayer(1.05) }), textContent: "Rotate +90°",
$el("button.painter-button.requires-selection", { textContent: "Scale -5%", onclick: () => canvas.resizeLayer(0.95) }), onclick: () => canvas.rotateLayer(90)
$el("button.painter-button.requires-selection", { textContent: "Mirror H", onclick: () => canvas.mirrorHorizontal() }), }),
$el("button.painter-button.requires-selection", { textContent: "Mirror V", onclick: () => canvas.mirrorVertical() }), $el("button.painter-button.requires-selection", {
textContent: "Scale +5%",
onclick: () => canvas.resizeLayer(1.05)
}),
$el("button.painter-button.requires-selection", {
textContent: "Scale -5%",
onclick: () => canvas.resizeLayer(0.95)
}),
$el("button.painter-button.requires-selection", {
textContent: "Mirror H",
onclick: () => canvas.mirrorHorizontal()
}),
$el("button.painter-button.requires-selection", {
textContent: "Mirror V",
onclick: () => canvas.mirrorVertical()
}),
]), ]),
$el("div.painter-separator"), $el("div.painter-separator"),
@@ -553,7 +568,7 @@ async function createCanvasWidget(node, widget, app) {
mattedImage.src = result.matted_image; mattedImage.src = result.matted_image;
await mattedImage.decode(); await mattedImage.decode();
const newLayer = { ...selectedLayer, image: mattedImage, zIndex: canvas.layers.length }; const newLayer = {...selectedLayer, image: mattedImage, zIndex: canvas.layers.length};
canvas.layers.push(newLayer); canvas.layers.push(newLayer);
canvas.updateSelection([newLayer]); canvas.updateSelection([newLayer]);
canvas.render(); canvas.render();
@@ -569,8 +584,18 @@ async function createCanvasWidget(node, widget, app) {
} }
} }
}), }),
$el("button.painter-button", { id: `undo-button-${node.id}`, textContent: "Undo", disabled: true, onclick: () => canvas.undo() }), $el("button.painter-button", {
$el("button.painter-button", { id: `redo-button-${node.id}`, textContent: "Redo", disabled: true, onclick: () => canvas.redo() }), id: `undo-button-${node.id}`,
textContent: "Undo",
disabled: true,
onclick: () => canvas.undo()
}),
$el("button.painter-button", {
id: `redo-button-${node.id}`,
textContent: "Redo",
disabled: true,
onclick: () => canvas.redo()
}),
]), ]),
$el("div.painter-separator"), $el("div.painter-separator"),
@@ -602,7 +627,7 @@ async function createCanvasWidget(node, widget, app) {
const mattedImage = new Image(); const mattedImage = new Image();
mattedImage.src = result.matted_image; mattedImage.src = result.matted_image;
await mattedImage.decode(); await mattedImage.decode();
const newLayer = { ...selectedLayer, image: mattedImage, zIndex: canvas.layers.length }; const newLayer = {...selectedLayer, image: mattedImage, zIndex: canvas.layers.length};
canvas.layers.push(newLayer); canvas.layers.push(newLayer);
canvas.updateSelection([newLayer]); canvas.updateSelection([newLayer]);
canvas.render(); canvas.render();
@@ -618,14 +643,24 @@ async function createCanvasWidget(node, widget, app) {
} }
} }
}), }),
$el("button.painter-button", { id: `undo-button-${node.id}`, textContent: "Undo", disabled: true, onclick: () => canvas.undo() }), $el("button.painter-button", {
$el("button.painter-button", { id: `redo-button-${node.id}`, textContent: "Redo", disabled: true, onclick: () => canvas.redo() }), id: `undo-button-${node.id}`,
textContent: "Undo",
disabled: true,
onclick: () => canvas.undo()
}),
$el("button.painter-button", {
id: `redo-button-${node.id}`,
textContent: "Redo",
disabled: true,
onclick: () => canvas.redo()
}),
]), ]),
$el("div.painter-separator"), $el("div.painter-separator"),
// --- Group: Masking --- // --- Group: Masking ---
$el("div.painter-button-group", { id: "mask-controls" }, [ $el("div.painter-button-group", {id: "mask-controls"}, [
$el("button.painter-button", { $el("button.painter-button", {
id: "mask-mode-btn", id: "mask-mode-btn",
textContent: "Draw Mask", textContent: "Draw Mask",
@@ -644,8 +679,8 @@ async function createCanvasWidget(node, widget, app) {
} }
} }
}), }),
$el("div.painter-slider-container.mask-control", { style: { display: 'none' } }, [ $el("div.painter-slider-container.mask-control", {style: {display: 'none'}}, [
$el("label", { for: "brush-size-slider", textContent: "Size:" }), $el("label", {for: "brush-size-slider", textContent: "Size:"}),
$el("input", { $el("input", {
id: "brush-size-slider", id: "brush-size-slider",
type: "range", type: "range",
@@ -655,8 +690,8 @@ async function createCanvasWidget(node, widget, app) {
oninput: (e) => canvas.maskTool.setBrushSize(parseInt(e.target.value)) oninput: (e) => canvas.maskTool.setBrushSize(parseInt(e.target.value))
}) })
]), ]),
$el("div.painter-slider-container.mask-control", { style: { display: 'none' } }, [ $el("div.painter-slider-container.mask-control", {style: {display: 'none'}}, [
$el("label", { for: "brush-strength-slider", textContent: "Strength:" }), $el("label", {for: "brush-strength-slider", textContent: "Strength:"}),
$el("input", { $el("input", {
id: "brush-strength-slider", id: "brush-strength-slider",
type: "range", type: "range",
@@ -667,8 +702,8 @@ async function createCanvasWidget(node, widget, app) {
oninput: (e) => canvas.maskTool.setBrushStrength(parseFloat(e.target.value)) oninput: (e) => canvas.maskTool.setBrushStrength(parseFloat(e.target.value))
}) })
]), ]),
$el("div.painter-slider-container.mask-control", { style: { display: 'none' } }, [ $el("div.painter-slider-container.mask-control", {style: {display: 'none'}}, [
$el("label", { for: "brush-softness-slider", textContent: "Softness:" }), $el("label", {for: "brush-softness-slider", textContent: "Softness:"}),
$el("input", { $el("input", {
id: "brush-softness-slider", id: "brush-softness-slider",
type: "range", type: "range",
@@ -681,7 +716,7 @@ async function createCanvasWidget(node, widget, app) {
]), ]),
$el("button.painter-button.mask-control", { $el("button.painter-button.mask-control", {
textContent: "Clear Mask", textContent: "Clear Mask",
style: { display: 'none' }, style: {display: 'none'},
onclick: () => { onclick: () => {
if (confirm("Are you sure you want to clear the mask?")) { if (confirm("Are you sure you want to clear the mask?")) {
canvas.maskTool.clear(); canvas.maskTool.clear();
@@ -697,7 +732,7 @@ async function createCanvasWidget(node, widget, app) {
$el("div.painter-button-group", {}, [ $el("div.painter-button-group", {}, [
$el("button.painter-button", { $el("button.painter-button", {
textContent: "Clear Cache", textContent: "Clear Cache",
style: { backgroundColor: "#c54747", borderColor: "#a53737" }, style: {backgroundColor: "#c54747", borderColor: "#a53737"},
onclick: async () => { onclick: async () => {
if (confirm("Are you sure you want to clear all saved canvas states? This action cannot be undone.")) { if (confirm("Are you sure you want to clear all saved canvas states? This action cannot be undone.")) {
try { try {
@@ -733,9 +768,9 @@ async function createCanvasWidget(node, widget, app) {
const undoButton = controlPanel.querySelector(`#undo-button-${node.id}`); const undoButton = controlPanel.querySelector(`#undo-button-${node.id}`);
const redoButton = controlPanel.querySelector(`#redo-button-${node.id}`); const redoButton = controlPanel.querySelector(`#redo-button-${node.id}`);
canvas.onHistoryChange = ({ canUndo, canRedo }) => { canvas.onHistoryChange = ({canUndo, canRedo}) => {
if(undoButton) undoButton.disabled = !canUndo; if (undoButton) undoButton.disabled = !canUndo;
if(redoButton) redoButton.disabled = !canRedo; if (redoButton) redoButton.disabled = !canRedo;
}; };
updateButtonStates(); updateButtonStates();

2
js/Mask_tool.js
View File

@@ -131,7 +131,7 @@ export class MaskTool {
return maskImage; return maskImage;
} }
resize(width, height){ resize(width, height) {
const oldMask = this.maskCanvas; const oldMask = this.maskCanvas;
this.maskCanvas = document.createElement('canvas'); this.maskCanvas = document.createElement('canvas');
this.maskCanvas.width = width; this.maskCanvas.width = width;

4
js/db.js
View File

@@ -29,7 +29,7 @@ function openDB() {
console.log("Upgrading IndexedDB..."); console.log("Upgrading IndexedDB...");
const db = event.target.result; const db = event.target.result;
if (!db.objectStoreNames.contains(STORE_NAME)) { if (!db.objectStoreNames.contains(STORE_NAME)) {
db.createObjectStore(STORE_NAME, { keyPath: 'id' }); db.createObjectStore(STORE_NAME, {keyPath: 'id'});
console.log("Object store created:", STORE_NAME); console.log("Object store created:", STORE_NAME);
} }
}; };
@@ -62,7 +62,7 @@ export async function setCanvasState(id, state) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const transaction = db.transaction([STORE_NAME], 'readwrite'); const transaction = db.transaction([STORE_NAME], 'readwrite');
const store = transaction.objectStore(STORE_NAME); const store = transaction.objectStore(STORE_NAME);
const request = store.put({ id, state }); const request = store.put({id, state});
request.onerror = (event) => { request.onerror = (event) => {
console.error("DB: Error setting canvas state:", event.target.error); console.error("DB: Error setting canvas state:", event.target.error);