Merge branch 'main' of github.com:lstein/stable-diffusion into main

This fixes issue with grid generation.
This commit is contained in:
Lincoln Stein 2022-08-29 13:39:59 -04:00
commit 0abfc3cac6
4 changed files with 294 additions and 291 deletions

View File

@ -90,10 +90,11 @@ class PngWriter:
height = image_list[0].height
grid_img = Image.new('RGB', (width * cols, height * rows))
i = 0
for r in range(0, rows):
for c in range(0, cols):
i = r * rows + c
grid_img.paste(image_list[i], (c * width, r * height))
i = i + 1
return grid_img

View File

@ -61,7 +61,7 @@
<input type="file" id="initimg" name="initimg" accept=".jpg, .jpeg, .png">
<label title="Set to -1 for random seed" for="seed">Seed:</label>
<input value="-1" type="number" id="seed" name="seed">
<button type="button" id="reset">&olarr;</button>
<button type="button" id="reset-seed">&olarr;</button>
<span>&bull;</span>
<button type="button" id="reset-all">Reset to Defaults</button>
<br>

View File

@ -47,8 +47,10 @@ function loadFields(form) {
}
function clearFields(form) {
localStorage.clear()
location.reload()
localStorage.clear();
let prompt = form.prompt.value;
form.reset();
form.prompt.value = prompt;
}
async function generateSubmit(form) {
@ -116,7 +118,7 @@ window.onload = () => {
document.querySelector("#generate-form").addEventListener('change', (e) => {
saveFields(e.target.form);
});
document.querySelector("#reset").addEventListener('click', (e) => {
document.querySelector("#reset-seed").addEventListener('click', (e) => {
document.querySelector("#seed").value = -1;
saveFields(e.target.form);
});