version bump for webUI 1.8.0, remove soft inpainting from dream tool, prettier infighting forever

This commit is contained in:
tim h 2024-03-02 07:19:42 -06:00
parent 9040f37849
commit e720f4dd8f
2 changed files with 23 additions and 26 deletions

View file

@ -1,4 +1,4 @@
<!doctype html> <!DOCTYPE html>
<html lang="en-US"> <html lang="en-US">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
@ -337,7 +337,7 @@
<br /> <br />
<span id="version"> <span id="version">
<a href="https://github.com/zero01101/openOutpaint" target="_blank"> <a href="https://github.com/zero01101/openOutpaint" target="_blank">
v202402-03xx.00x TODO CHANGEME v20240302.001
</a> </a>
<br /> <br />
<a <a
@ -574,7 +574,7 @@
src="js/ui/tool/generic.js?v=3e678e0" src="js/ui/tool/generic.js?v=3e678e0"
type="text/javascript"></script> type="text/javascript"></script>
<script src="js/ui/tool/dream.js?v=73b256b" type="text/javascript"></script> <script src="js/ui/tool/dream.js?v=cbc151c" type="text/javascript"></script>
<script <script
src="js/ui/tool/maskbrush.js?v=e9bd0eb" src="js/ui/tool/maskbrush.js?v=e9bd0eb"
type="text/javascript"></script> type="text/javascript"></script>

View file

@ -62,12 +62,9 @@ const _monitorProgress = (bb, oncheck = null) => {
} }
const timeSpent = performance.now() - init; const timeSpent = performance.now() - init;
setTimeout( setTimeout(() => {
() => { if (running) _checkProgress();
if (running) _checkProgress(); }, Math.max(0, minDelay - timeSpent));
},
Math.max(0, minDelay - timeSpent)
);
}; };
_checkProgress(); _checkProgress();
@ -1854,8 +1851,8 @@ const dreamTool = () =>
state.cursorSize > stableDiffusionData.width state.cursorSize > stableDiffusionData.width
? "#FBB5" ? "#FBB5"
: state.cursorSize < stableDiffusionData.width : state.cursorSize < stableDiffusionData.width
? "#BFB5" ? "#BFB5"
: "#FFF5"; : "#FFF5";
state.erasePrevReticle = _tool._reticle_draw( state.erasePrevReticle = _tool._reticle_draw(
bb, bb,
@ -1882,8 +1879,8 @@ const dreamTool = () =>
state.cursorSize > stableDiffusionData.width state.cursorSize > stableDiffusionData.width
? "#FBB5" ? "#FBB5"
: state.cursorSize < stableDiffusionData.width : state.cursorSize < stableDiffusionData.width
? "#BFB5" ? "#BFB5"
: "#FFF5"; : "#FFF5";
state.erasePrevReticle = _tool._reticle_draw( state.erasePrevReticle = _tool._reticle_draw(
getBoundingBox( getBoundingBox(
evn.x, evn.x,
@ -2330,7 +2327,7 @@ const dreamTool = () =>
//menu.appendChild(document.createElement("br")); //menu.appendChild(document.createElement("br"));
array.appendChild(state.ctxmenu.keepUnmaskedLabel); array.appendChild(state.ctxmenu.keepUnmaskedLabel);
array.appendChild(state.ctxmenu.removeBackgroundLabel); array.appendChild(state.ctxmenu.removeBackgroundLabel);
array.appendChild(state.ctxmenu.softInpaintLabel); // array.appendChild(state.ctxmenu.softInpaintLabel);
//TODO: if (global.controlnetAPI) { //but figure out how to update the UI after doing so //TODO: if (global.controlnetAPI) { //but figure out how to update the UI after doing so
// never mind i think i'm using an extension menu instead // never mind i think i'm using an extension menu instead
// array.appendChild(state.ctxmenu.controlNetLabel); // array.appendChild(state.ctxmenu.controlNetLabel);
@ -2339,14 +2336,14 @@ const dreamTool = () =>
menu.appendChild(state.ctxmenu.keepUnmaskedBlurSlider); menu.appendChild(state.ctxmenu.keepUnmaskedBlurSlider);
menu.appendChild(state.ctxmenu.carveBlurSlider); menu.appendChild(state.ctxmenu.carveBlurSlider);
menu.appendChild(state.ctxmenu.carveThresholdSlider); menu.appendChild(state.ctxmenu.carveThresholdSlider);
menu.appendChild(state.ctxmenu.softInpaintScheduleBiasSlider); // menu.appendChild(state.ctxmenu.softInpaintScheduleBiasSlider);
menu.appendChild(state.ctxmenu.softInpaintPreservationStrengthSlider); // menu.appendChild(state.ctxmenu.softInpaintPreservationStrengthSlider);
menu.appendChild( // menu.appendChild(
state.ctxmenu.softInpaintTransitionContrastBoostSlider // state.ctxmenu.softInpaintTransitionContrastBoostSlider
); // );
menu.appendChild(state.ctxmenu.softInpaintMaskInfluenceSlider); // menu.appendChild(state.ctxmenu.softInpaintMaskInfluenceSlider);
menu.appendChild(state.ctxmenu.softInpaintDifferenceThresholdSlider); // menu.appendChild(state.ctxmenu.softInpaintDifferenceThresholdSlider);
menu.appendChild(state.ctxmenu.softInpaintDifferenceContrastSlider); // menu.appendChild(state.ctxmenu.softInpaintDifferenceContrastSlider);
// menu.appendChild(state.ctxmenu.keepUnmaskedBlurSliderLinebreak); // menu.appendChild(state.ctxmenu.keepUnmaskedBlurSliderLinebreak);
// menu.appendChild(state.ctxmenu.preserveMasksLabel); // menu.appendChild(state.ctxmenu.preserveMasksLabel);
// menu.appendChild(document.createElement("br")); // menu.appendChild(document.createElement("br"));
@ -2596,8 +2593,8 @@ const img2imgTool = () =>
state.cursorSize > stableDiffusionData.width state.cursorSize > stableDiffusionData.width
? "#FBB5" ? "#FBB5"
: state.cursorSize < stableDiffusionData.width : state.cursorSize < stableDiffusionData.width
? "#BFB5" ? "#BFB5"
: "#FFF5"; : "#FFF5";
state.erasePrevReticle = _tool._reticle_draw( state.erasePrevReticle = _tool._reticle_draw(
bb, bb,
"Img2Img", "Img2Img",
@ -2634,8 +2631,8 @@ const img2imgTool = () =>
state.cursorSize > stableDiffusionData.width state.cursorSize > stableDiffusionData.width
? "#FBB5" ? "#FBB5"
: state.cursorSize < stableDiffusionData.width : state.cursorSize < stableDiffusionData.width
? "#BFB5" ? "#BFB5"
: "#FFF5"; : "#FFF5";
state.erasePrevReticle = _tool._reticle_draw( state.erasePrevReticle = _tool._reticle_draw(
bb, bb,
"Img2Img", "Img2Img",