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

Add saveState calls after layer modifications

Browse Source 
Added calls to saveState() after scaling, rotating, and removing layers to ensure changes are properly recorded in the undo/redo history. Also refactored the matting button UI for better layout and ensured saveState is called after matting results are applied.
This commit is contained in:
Dariusz L
2025-06-24 17:30:32 +02:00
parent 3922572315
commit 64550609b8
2 changed files with 76 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/Canvas.js
View File

@@ -1111,6 +1111,7 @@ export class Canvas {
layer.height *= scale; layer.height *= scale;
}); });
this.render(); this.render();
this.saveState();
} }
rotateLayer(angle) { rotateLayer(angle) {
@@ -1118,6 +1119,7 @@ export class Canvas {
layer.rotation += angle; layer.rotation += angle;
}); });
this.render(); this.render();
this.saveState();
} }
updateCanvasSize(width, height, saveHistory = true) { updateCanvasSize(width, height, saveHistory = true) {

137
js/Canvas_view.js
View File

@@ -487,9 +487,11 @@ async function createCanvasWidget(node, widget, app) {
textContent: "Remove Layer", textContent: "Remove Layer",
onclick: () => { onclick: () => {
if (canvas.selectedLayers.length > 0) { if (canvas.selectedLayers.length > 0) {
canvas.saveState();
canvas.layers = canvas.layers.filter(l => !canvas.selectedLayers.includes(l)); canvas.layers = canvas.layers.filter(l => !canvas.selectedLayers.includes(l));
canvas.updateSelection([]); canvas.updateSelection([]);
canvas.render(); canvas.render();
canvas.saveState();
} }
} }
}), }),
@@ -548,70 +550,79 @@ async function createCanvasWidget(node, widget, app) {
disabled: true, disabled: true,
onclick: () => canvas.redo() onclick: () => canvas.redo()
}), }),
$el("button.painter-button.requires-selection.matting-button", { $el("div", {
textContent: "Matting", style: {
onclick: async () => { display: "flex",
const statusIndicator = MattingStatusIndicator.getInstance(controlPanel.querySelector('.controls')); alignItems: "center",
gap: "8px"
try {
if (canvas.selectedLayers.length !== 1) {
throw new Error("Please select exactly one image layer for matting.");
}
statusIndicator.setStatus('processing');
const selectedLayer = canvas.selectedLayers[0];
const imageData = await canvas.getLayerImageData(selectedLayer);
console.log("Sending image to server for matting...");
const response = await fetch("/matting", {
method: "POST",
headers: {"Content-Type": "application/json"},
body: JSON.stringify({image: imageData})
});
if (!response.ok) {
throw new Error(`Server error: ${response.status} - ${response.statusText}`);
}
const result = await response.json();
console.log("Creating new layer with matting result...");
const mattedImage = new Image();
mattedImage.onload = async () => {
const newImage = new Image();
newImage.onload = async () => {
const newLayer = {
image: newImage,
x: selectedLayer.x,
y: selectedLayer.y,
width: selectedLayer.width,
height: selectedLayer.height,
rotation: selectedLayer.rotation,
zIndex: canvas.layers.length + 1
};
canvas.layers.push(newLayer);
canvas.updateSelection([newLayer]);
canvas.render();
await canvas.saveToServer(widget.value);
app.graph.runStep();
statusIndicator.setStatus('completed');
};
newImage.src = result.matted_image;
};
mattedImage.onerror = () => {
throw new Error("Failed to load the matted image from server response.");
};
mattedImage.src = result.matted_image;
} catch (error) {
console.error("Matting error:", error);
alert(`Error during matting process: ${error.message}`);
statusIndicator.setStatus('error');
}
} }
}), }, [
$el("button.painter-button.requires-selection.matting-button", {
textContent: "Matting",
onclick: async (e) => {
const statusIndicator = MattingStatusIndicator.getInstance(e.target.parentElement);
try {
if (canvas.selectedLayers.length !== 1) {
throw new Error("Please select exactly one image layer for matting.");
}
statusIndicator.setStatus('processing');
const selectedLayer = canvas.selectedLayers[0];
const imageData = await canvas.getLayerImageData(selectedLayer);
console.log("Sending image to server for matting...");
const response = await fetch("/matting", {
method: "POST",
headers: {"Content-Type": "application/json"},
body: JSON.stringify({image: imageData})
});
if (!response.ok) {
throw new Error(`Server error: ${response.status} - ${response.statusText}`);
}
const result = await response.json();
console.log("Creating new layer with matting result...");
const mattedImage = new Image();
mattedImage.onload = async () => {
const newImage = new Image();
newImage.onload = async () => {
const newLayer = {
image: newImage,
x: selectedLayer.x,
y: selectedLayer.y,
width: selectedLayer.width,
height: selectedLayer.height,
rotation: selectedLayer.rotation,
zIndex: canvas.layers.length + 1
};
canvas.layers.push(newLayer);
canvas.updateSelection([newLayer]);
canvas.render();
canvas.saveState();
await canvas.saveToServer(widget.value);
app.graph.runStep();
statusIndicator.setStatus('completed');
};
newImage.src = result.matted_image;
};
mattedImage.onerror = () => {
throw new Error("Failed to load the matted image from server response.");
};
mattedImage.src = result.matted_image;
} catch (error) {
console.error("Matting error:", error);
alert(`Error during matting process: ${error.message}`);
statusIndicator.setStatus('error');
}
}
})
]),
$el("button.painter-button", { $el("button.painter-button", {
textContent: "Clear Cache", textContent: "Clear Cache",
style: { style: {