Skip to content
This repository was archived by the owner on Nov 27, 2024. It is now read-only.

Commit 6bceed8

Browse files
saddam213saddam213
committed
Tidy up feature links
1 parent 2623d32 commit 6bceed8

File tree

8 files changed

+76
-31
lines changed

8 files changed

+76
-31
lines changed

‎OnnxStack.Console/OnnxStack.Console.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net7.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
7+
<Nullable>disable</Nullable>
88
<PlatformTarget>x64</PlatformTarget>
99
</PropertyGroup>
1010

‎OnnxStack.WebUI/Pages/Shared/_SharedTemplates.cshtml

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,14 @@
5757
</div>
5858
<div class="d-flex flex-row gap-2 pt-2">
5959
<button type="button" class="btn btn-sm btn-success w-100" disabled>Download</button>
60-
<button type="button" class="btn btn-sm btn-info w-100" disabled>Image To Image</button>
60+
<div class="d-flex gap-2 w-100">
61+
<button type="button" class="btn btn-sm btn-info w-100" disabled>
62+
<i class="fa fa-images"></i>
63+
</button>
64+
<button type="button" class="btn btn-sm btn-info w-100" disabled>
65+
<i class="fa fa-paintbrush"></i>
66+
</button>
67+
</div>
6168
</div>
6269
</div>
6370
</script>
@@ -70,19 +77,19 @@
7077
<div class="d-flex flex-row flex-wrap-reverse text-wrap justify-content-around pt-2" style="max-width:240px">
7178
<div class="d-flex flex-row align-items-center">
7279
<small class="result-info">Scheduler:</small>
73-
<span>{{blueprint.prompt.schedulerType}}</span>
80+
<span>{{blueprint.schedulerType}}</span>
7481
</div>
7582
<div class="d-flex flex-row align-items-center">
7683
<small class="result-info">Steps:</small>
77-
<span>{{blueprint.options.inferenceSteps}}</span>
84+
<span>{{blueprint.schedulerOptions.inferenceSteps}}</span>
7885
</div>
7986
<div class="d-flex flex-row align-items-center">
8087
<small class="result-info">Guidance:</small>
81-
<span>{{blueprint.options.guidanceScale}}</span>
88+
<span>{{blueprint.schedulerOptions.guidanceScale}}</span>
8289
</div>
8390
<div class="d-flex flex-row align-items-center">
8491
<small class="result-info">Seed:</small>
85-
<span class="seed-host">{{blueprint.options.seed}}</span>
92+
<span class="seed-host">{{blueprint.schedulerOptions.seed}}</span>
8693
</div>
8794
<div class="d-flex flex-row align-items-center">
8895
<small class="result-info">Elapsed:</small>
@@ -99,7 +106,14 @@
99106
<li><a class="dropdown-item" href="{{blueprintUrl}}" download="{{blueprintName}}">Download JSON</a></li>
100107
</ul>
101108
</div>
102-
<button type="button" class="btn btn-sm btn-info w-100" disabled>Image To Image</button>
109+
<div class="d-flex gap-2 w-100">
110+
<a class="btn btn-sm btn-info w-100" href="/StableDiffusion/ImageToImage?img={{imageName}}&width={{actualWidth}}&height={{actualHeight}}" target="_blank" title="Image To Image" disabled>
111+
<i class="fa fa-images"></i>
112+
</a>
113+
<a class="btn btn-sm btn-info w-100" href="/StableDiffusion/ImageInpaint?img={{imageName}}&width={{actualWidth}}&height={{actualHeight}}" target="_blank" title="Image Inpaint" disabled>
114+
<i class="fa fa-paintbrush"></i>
115+
</a>
116+
</div>
103117
</div>
104118
</div>
105119
</script>

‎OnnxStack.WebUI/Pages/StableDiffusion/ImageInpaint.cshtml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@
8282
</div>
8383
<div class="d-flex flex-row gap-2 pt-2">
8484
<button type="button" class="btn btn-sm btn-success w-100" disabled>Download</button>
85-
<button type="button" class="btn btn-sm btn-info w-100" disabled>Image To Image</button>
85+
<div class="d-flex gap-2 w-100">
86+
<button type="button" class="btn btn-sm btn-info w-100" disabled>Image To Image</button>
87+
<button type="button" class="btn btn-sm btn-info w-100" disabled>Image Inpaint</button>
88+
</div>
8689
</div>
8790
</div>
8891
</script>
@@ -96,19 +99,19 @@
9699
<div class="d-flex flex-row flex-wrap-reverse text-wrap justify-content-around pt-2">
97100
<div class="d-flex flex-row align-items-center">
98101
<small class="result-info">Scheduler:</small>
99-
<span>{{blueprint.prompt.schedulerType}}</span>
102+
<span>{{blueprint.schedulerType}}</span>
100103
</div>
101104
<div class="d-flex flex-row align-items-center">
102105
<small class="result-info">Steps:</small>
103-
<span>{{blueprint.options.inferenceSteps}}</span>
106+
<span>{{blueprint.schedulerOptions.inferenceSteps}}</span>
104107
</div>
105108
<div class="d-flex flex-row align-items-center">
106109
<small class="result-info">Guidance:</small>
107-
<span>{{blueprint.options.guidanceScale}}</span>
110+
<span>{{blueprint.schedulerOptions.guidanceScale}}</span>
108111
</div>
109112
<div class="d-flex flex-row align-items-center">
110113
<small class="result-info">Seed:</small>
111-
<div class="seed-host">{{blueprint.options.seed}}</div>
114+
<div class="seed-host">{{blueprint.schedulerOptions.seed}}</div>
112115
</div>
113116
<div class="d-flex flex-row align-items-center">
114117
<small class="result-info">Elapsed:</small>
@@ -125,7 +128,10 @@
125128
<li><a class="dropdown-item" href="{{blueprintUrl}}" download="{{blueprintName}}">Download JSON</a></li>
126129
</ul>
127130
</div>
128-
<button id="button-img2img" type="button" class="btn btn-sm btn-info w-100">Image To Image</button>
131+
<div class="d-flex gap-2 w-100">
132+
<button id="button-transfer" type="button" class="btn btn-sm btn-info w-100">Image Inpaint</button>
133+
<a class="btn btn-sm btn-info w-100" href="/StableDiffusion/ImageToImage?img={{imageName}}&width={{actualWidth}}&height={{actualHeight}}" target="_blank" disabled>Image To Image</a>
134+
</div>
129135
</div>
130136
</div>
131137
</script>

‎OnnxStack.WebUI/Pages/StableDiffusion/ImageToImage.cshtml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@
8282
</div>
8383
<div class="d-flex flex-row gap-2 pt-2">
8484
<button type="button" class="btn btn-sm btn-success w-100" disabled>Download</button>
85-
<button type="button" class="btn btn-sm btn-info w-100" disabled>Image To Image</button>
85+
<div class="d-flex gap-2 w-100">
86+
<button type="button" class="btn btn-sm btn-info w-100" disabled>Image To Image</button>
87+
<button type="button" class="btn btn-sm btn-info w-100" disabled>Image Inpaint</button>
88+
</div>
8689
</div>
8790
</div>
8891
</script>
@@ -96,19 +99,19 @@
9699
<div class="d-flex flex-row flex-wrap-reverse text-wrap justify-content-around pt-2">
97100
<div class="d-flex flex-row align-items-center">
98101
<small class="result-info">Scheduler:</small>
99-
<span>{{blueprint.prompt.schedulerType}}</span>
102+
<span>{{blueprint.schedulerType}}</span>
100103
</div>
101104
<div class="d-flex flex-row align-items-center">
102105
<small class="result-info">Steps:</small>
103-
<span>{{blueprint.options.inferenceSteps}}</span>
106+
<span>{{blueprint.schedulerOptions.inferenceSteps}}</span>
104107
</div>
105108
<div class="d-flex flex-row align-items-center">
106109
<small class="result-info">Guidance:</small>
107-
<span>{{blueprint.options.guidanceScale}}</span>
110+
<span>{{blueprint.schedulerOptions.guidanceScale}}</span>
108111
</div>
109112
<div class="d-flex flex-row align-items-center">
110113
<small class="result-info">Seed:</small>
111-
<div class="seed-host">{{blueprint.options.seed}}</div>
114+
<div class="seed-host">{{blueprint.schedulerOptions.seed}}</div>
112115
</div>
113116
<div class="d-flex flex-row align-items-center">
114117
<small class="result-info">Elapsed:</small>
@@ -125,7 +128,10 @@
125128
<li><a class="dropdown-item" href="{{blueprintUrl}}" download="{{blueprintName}}">Download JSON</a></li>
126129
</ul>
127130
</div>
128-
<button id="button-img2img" type="button" class="btn btn-sm btn-info w-100">Image To Image</button>
131+
<div class="d-flex gap-2 w-100">
132+
<button id="button-transfer" type="button" class="btn btn-sm btn-info w-100">Image To Image</button>
133+
<a class="btn btn-sm btn-info w-100" href="/StableDiffusion/ImageInpaint?img={{imageName}}&width={{actualWidth}}&height={{actualHeight}}" target="_blank" disabled>Image Inpaint</a>
134+
</div>
129135
</div>
130136
</div>
131137
</script>

‎OnnxStack.WebUI/Pages/StableDiffusion/TextToImage.cshtml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,10 @@
7575
</div>
7676
<div class="d-flex flex-row gap-2 pt-2">
7777
<button type="button" class="btn btn-sm btn-success w-100" disabled>Download</button>
78-
<button type="button" class="btn btn-sm btn-info w-100" disabled>Image To Image</button>
78+
<div class="d-flex gap-2 w-100">
79+
<button type="button" class="btn btn-sm btn-info w-100" disabled>Image To Image</button>
80+
<button type="button" class="btn btn-sm btn-info w-100" disabled>Image Inpaint</button>
81+
</div>
7982
</div>
8083
</div>
8184
</script>
@@ -88,19 +91,19 @@
8891
<div class="d-flex flex-row flex-wrap-reverse text-wrap justify-content-around pt-2">
8992
<div class="d-flex flex-row align-items-center">
9093
<small class="result-info">Scheduler:</small>
91-
<span>{{blueprint.prompt.schedulerType}}</span>
94+
<span>{{blueprint.schedulerType}}</span>
9295
</div>
9396
<div class="d-flex flex-row align-items-center">
9497
<small class="result-info">Steps:</small>
95-
<span>{{blueprint.options.inferenceSteps}}</span>
98+
<span>{{blueprint.schedulerOptions.inferenceSteps}}</span>
9699
</div>
97100
<div class="d-flex flex-row align-items-center">
98101
<small class="result-info">Guidance:</small>
99-
<span>{{blueprint.options.guidanceScale}}</span>
102+
<span>{{blueprint.schedulerOptions.guidanceScale}}</span>
100103
</div>
101104
<div class="d-flex flex-row align-items-center">
102105
<small class="result-info">Seed:</small>
103-
<div class="seed-host">{{blueprint.options.seed}}</div>
106+
<div class="seed-host">{{blueprint.schedulerOptions.seed}}</div>
104107
</div>
105108
<div class="d-flex flex-row align-items-center">
106109
<small class="result-info">Elapsed:</small>
@@ -117,7 +120,10 @@
117120
<li><a class="dropdown-item" href="{{blueprintUrl}}" download="{{blueprintName}}">Download JSON</a></li>
118121
</ul>
119122
</div>
120-
<a class="btn btn-sm btn-info w-100" href="/StableDiffusion/ImageToImage?img={{imageName}}&width={{actualWidth}}&height={{actualHeight}}" target="_blank" disabled>Image To Image</a>
123+
<div class="d-flex gap-2 w-100">
124+
<a class="btn btn-sm btn-info w-100" href="/StableDiffusion/ImageToImage?img={{imageName}}&width={{actualWidth}}&height={{actualHeight}}" target="_blank" disabled>Image To Image</a>
125+
<a class="btn btn-sm btn-info w-100" href="/StableDiffusion/ImageInpaint?img={{imageName}}&width={{actualWidth}}&height={{actualHeight}}" target="_blank" disabled>Image Inpaint</a>
126+
</div>
121127
</div>
122128
</div>
123129
</script>

‎OnnxStack.WebUI/wwwroot/js/stableDiffusionImageInpaint.js

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ const stableDiffusionImageInpaint = () => {
122122
inputContainer.html(Mustache.render(template, {
123123
width: size.width,
124124
height: size.height,
125+
actualWidth: width,
126+
actualHeight: height,
125127
...data
126128
}));
127129
}
@@ -131,6 +133,8 @@ const stableDiffusionImageInpaint = () => {
131133
outputContainer.html(Mustache.render(template, {
132134
width: size.width,
133135
height: size.height,
136+
actualWidth: width,
137+
actualHeight: height,
134138
...data
135139
}));
136140
}
@@ -140,6 +144,8 @@ const stableDiffusionImageInpaint = () => {
140144
outputHistoryContainer.prepend(Mustache.render(template, {
141145
width: size.width,
142146
height: size.height,
147+
actualWidth: width,
148+
actualHeight: height,
143149
...data
144150
}));
145151
}
@@ -188,11 +194,11 @@ const stableDiffusionImageInpaint = () => {
188194
const getInputBase64 = () => {
189195
const image = document.getElementById("img-input")
190196
const canvas = document.createElement("canvas");
191-
canvas.width = image.width;
192-
canvas.height = image.height;
197+
canvas.width = getWidth();
198+
canvas.height = getHeight();
193199
const ctx = canvas.getContext("2d");
194-
ctx.drawImage(image, 0, 0);
195-
return canvas.toDataURL();
200+
ctx.drawImage(image, 0, 0, canvas.width, canvas.height);
201+
return canvas.toDataURL(); button - imgInpaint
196202
};
197203

198204
$(document).on("click", "#button-upload", async function () {
@@ -206,7 +212,7 @@ const stableDiffusionImageInpaint = () => {
206212
}
207213
});
208214

209-
$(document).on("click", "#button-img2img", async function () {
215+
$(document).on("click", "#button-transfer", async function () {
210216
const outputImageUrl = $("#img-result").attr("src");
211217
if (outputImageUrl) {
212218
addInputResult(getWidth(), getHeight(), inputResultTemplate, { imageUrl: outputImageUrl });
@@ -224,6 +230,7 @@ const stableDiffusionImageInpaint = () => {
224230
textBoxWidth.val(imageWidth);
225231
textBoxHeight.val(imageHeight);
226232
addInputResult(getWidth(), getHeight(), inputResultTemplate, { imageUrl: imageUrl });
233+
mask_init();
227234
buttonExecute.removeAttr("disabled");
228235
history.pushState(null, "", location.href.split("?")[0]);
229236
}

‎OnnxStack.WebUI/wwwroot/js/stableDiffusionImageToImage.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ const stableDiffusionImageToImage = () => {
116116
outputContainer.html(Mustache.render(template, {
117117
width: size.width,
118118
height: size.height,
119+
actualWidth: width,
120+
actualHeight: height,
119121
...data
120122
}));
121123
}
@@ -125,6 +127,8 @@ const stableDiffusionImageToImage = () => {
125127
outputHistoryContainer.prepend(Mustache.render(template, {
126128
width: size.width,
127129
height: size.height,
130+
actualWidth: width,
131+
actualHeight: height,
128132
...data
129133
}));
130134
}
@@ -190,7 +194,7 @@ const stableDiffusionImageToImage = () => {
190194
}
191195
});
192196

193-
$(document).on("click", "#button-img2img", async function () {
197+
$(document).on("click", "#button-transfer", async function () {
194198
const outputImageUrl = $("#img-result").attr("src");
195199
if (outputImageUrl) {
196200
addInputResult(getWidth(), getHeight(), inputResultTemplate, { imageUrl: outputImageUrl });

‎OnnxStack.WebUI/wwwroot/js/stableDiffusionTextToImage.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ const stableDiffusionTextToImage = () => {
110110
outputHistoryContainer.prepend(Mustache.render(template, {
111111
width: size.width,
112112
height: size.height,
113+
actualWidth: width,
114+
actualHeight: height,
113115
...data
114116
}));
115117
}

0 commit comments

Comments
 (0)