Spaces:
Runtime error
Runtime error
sort images
Browse files
frontend/src/lib/App.svelte
CHANGED
|
@@ -61,7 +61,6 @@
|
|
| 61 |
ctxCrop.save();
|
| 62 |
ctxCrop.clearRect(0, 0, 512, 512);
|
| 63 |
|
| 64 |
-
|
| 65 |
ctxCrop.globalCompositeOperation = 'source-over';
|
| 66 |
ctxCrop.drawImage(canvasEl, cursor.x, cursor.y, 512, 512, 0, 0, 512, 512);
|
| 67 |
ctxCrop.restore();
|
|
@@ -93,13 +92,13 @@
|
|
| 93 |
tempCanvasCtx.drawImage(canvasCrop, 0, 0, 512, 512);
|
| 94 |
//convert canvas to base64
|
| 95 |
const base64Crop = tempCanvas.toDataURL('image/png');
|
| 96 |
-
|
| 97 |
tempCanvasCtx.fillStyle = 'white';
|
| 98 |
tempCanvasCtx.fillRect(0, 0, 512, 512);
|
| 99 |
tempCanvasCtx.drawImage(mask, 0, 0, 512, 512);
|
| 100 |
//convert canvas to base64
|
| 101 |
const base64Mask = tempCanvas.toDataURL('image/png');
|
| 102 |
-
|
| 103 |
return { image: base64Crop, mask: base64Mask };
|
| 104 |
}
|
| 105 |
|
|
@@ -164,7 +163,8 @@
|
|
| 164 |
$imagesList.push({
|
| 165 |
prompt: _prompt,
|
| 166 |
imgURL: imgURL,
|
| 167 |
-
position: $clickedPosition
|
|
|
|
| 168 |
});
|
| 169 |
console.log(imgURL);
|
| 170 |
$loadingState = data.success ? 'Complete' : 'Error';
|
|
|
|
| 61 |
ctxCrop.save();
|
| 62 |
ctxCrop.clearRect(0, 0, 512, 512);
|
| 63 |
|
|
|
|
| 64 |
ctxCrop.globalCompositeOperation = 'source-over';
|
| 65 |
ctxCrop.drawImage(canvasEl, cursor.x, cursor.y, 512, 512, 0, 0, 512, 512);
|
| 66 |
ctxCrop.restore();
|
|
|
|
| 92 |
tempCanvasCtx.drawImage(canvasCrop, 0, 0, 512, 512);
|
| 93 |
//convert canvas to base64
|
| 94 |
const base64Crop = tempCanvas.toDataURL('image/png');
|
| 95 |
+
|
| 96 |
tempCanvasCtx.fillStyle = 'white';
|
| 97 |
tempCanvasCtx.fillRect(0, 0, 512, 512);
|
| 98 |
tempCanvasCtx.drawImage(mask, 0, 0, 512, 512);
|
| 99 |
//convert canvas to base64
|
| 100 |
const base64Mask = tempCanvas.toDataURL('image/png');
|
| 101 |
+
|
| 102 |
return { image: base64Crop, mask: base64Mask };
|
| 103 |
}
|
| 104 |
|
|
|
|
| 163 |
$imagesList.push({
|
| 164 |
prompt: _prompt,
|
| 165 |
imgURL: imgURL,
|
| 166 |
+
position: $clickedPosition,
|
| 167 |
+
date: new Date().getTime()
|
| 168 |
});
|
| 169 |
console.log(imgURL);
|
| 170 |
$loadingState = data.success ? 'Complete' : 'Error';
|
frontend/src/lib/Canvas.svelte
CHANGED
|
@@ -65,15 +65,18 @@
|
|
| 65 |
});
|
| 66 |
|
| 67 |
function renderImages(imagesList) {
|
| 68 |
-
imagesList.
|
| 69 |
-
|
| 70 |
-
|
| 71 |
-
|
| 72 |
-
|
| 73 |
-
|
| 74 |
-
|
| 75 |
-
|
| 76 |
-
|
|
|
|
|
|
|
|
|
|
| 77 |
}
|
| 78 |
|
| 79 |
function zoomed(e: Event) {
|
|
|
|
| 65 |
});
|
| 66 |
|
| 67 |
function renderImages(imagesList) {
|
| 68 |
+
const images = [...imagesList.toImmutable()].sort((a, b) => a.date - b.date)
|
| 69 |
+
images
|
| 70 |
+
.forEach(({ imgURL, position }) => {
|
| 71 |
+
console.log(imgURL, position);
|
| 72 |
+
const img = new Image();
|
| 73 |
+
img.onload = () => {
|
| 74 |
+
canvasCtx.drawImage(img, position.x, position.y, img.width, img.height);
|
| 75 |
+
};
|
| 76 |
+
const base = dev ? 'uploads/' : '';
|
| 77 |
+
const url = imgURL.split('/');
|
| 78 |
+
img.src = dev ? `uploads/${url.slice(3).join('/')}` : imgURL;
|
| 79 |
+
});
|
| 80 |
}
|
| 81 |
|
| 82 |
function zoomed(e: Event) {
|