holm/easydiffusion
1
0
Fork 0
forked from extern/easydiffusion
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving attention weighting to InvokeAI syntax (#1055)

Browse Source 
* Moving attention weighting to InvokeAI syntax

() and [] were actually ignored by the legacy parser, so moving the Ctrl+Wheel shortcut to the InvokeAI syntax of '+' and '-'.

* Moving attention weighting to InvokeAI syntax

() and [] were actually ignored by the legacy parser, so moving the Ctrl+Wheel shortcut to the InvokeAI syntax of '+' and '-'.

* Properly cleanup parenthesis

'(image tag)++' need to be trimmed to 'image tag'

* Add parenthesis as needed when adjusting weights

In the InvokeAI syntax, 'image modifier' must become '(image modifier)++' when adjusting weight.

* Code cleanup
This commit is contained in:
patriceac 2023-03-28 03:05:51 -07:00 committed by GitHub
parent d81be64711
commit a10dfd0386
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/media/js/image-modifiers.js
View File

@ -129,7 +129,10 @@ function createModifierGroup(modifierGroup, initiallyExpanded, removeBy) {
} }
function trimModifiers(tag) { function trimModifiers(tag) {
return tag.replace(/^\(+|\)+$/g, '').replace(/^\[+|\]+$/g, '') // Remove trailing '-' and/or '+'
tag = tag.replace(/[-+]+$/, '');
// Remove parentheses at beginning and end
return tag.replace(/^[(]+|[\s)]+$/g, '');
} }
async function loadModifiers() { async function loadModifiers() {

38
ui/plugins/ui/Modifiers-wheel.plugin.js
View File

@ -1,4 +1,8 @@
(function () { "use strict" (function () {
"use strict"
const MAX_WEIGHT = 5
if (typeof editorModifierTagsList !== 'object') { if (typeof editorModifierTagsList !== 'object') {
console.error('editorModifierTagsList missing...') console.error('editorModifierTagsList missing...')
return return
@ -34,34 +38,42 @@
break break
} }
} }
if (s.charAt(0) !== '(' && s.charAt(s.length - 1) !== ')' && s.trim().includes(' ')) {
s = '(' + s + ')'
t = '(' + t + ')'
}
if (delta < 0) { if (delta < 0) {
// wheel scrolling up // wheel scrolling up
if (s.substring(0, 1) == '[' && s.substring(s.length-1) == ']') { if (s.substring(s.length - 1) == '-') {
s = s.substring(1, s.length - 1) s = s.substring(0, s.length - 1)
t = t.substring(1, t.length - 1) t = t.substring(0, t.length - 1)
} }
else else
{ {
if (s.substring(0, 10) !== '('.repeat(10) && s.substring(s.length-10) !== ')'.repeat(10)) { if (s.substring(s.length - MAX_WEIGHT) !== '+'.repeat(MAX_WEIGHT)) {
s = '(' + s + ')' s = s + '+'
t = '(' + t + ')' t = t + '+'
} }
} }
} }
else{ else{
// wheel scrolling down // wheel scrolling down
if (s.substring(0, 1) == '(' && s.substring(s.length-1) == ')') { if (s.substring(s.length - 1) == '+') {
s = s.substring(1, s.length - 1) s = s.substring(0, s.length - 1)
t = t.substring(1, t.length - 1) t = t.substring(0, t.length - 1)
} }
else else
{ {
if (s.substring(0, 10) !== '['.repeat(10) && s.substring(s.length-10) !== ']'.repeat(10)) { if (s.substring(s.length - MAX_WEIGHT) !== '-'.repeat(MAX_WEIGHT)) {
s = '[' + s + ']' s = s + '-'
t = '[' + t + ']' t = t + '-'
} }
} }
} }
if (s.charAt(0) === '(' && s.charAt(s.length - 1) === ')') {
s = s.substring(1, s.length - 1)
t = t.substring(1, t.length - 1)
}
i.parentElement.getElementsByClassName('modifier-card-label')[0].getElementsByTagName("p")[0].innerText = s i.parentElement.getElementsByClassName('modifier-card-label')[0].getElementsByTagName("p")[0].innerText = s
// update activeTags // update activeTags
for (let it = 0; it < overlays.length; it++) { for (let it = 0; it < overlays.length; it++) {