-
Notifications
You must be signed in to change notification settings - Fork 2.7k
ui: controlnet tweaks #3508
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
ui: controlnet tweaks #3508
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- when the controlnet model is changed, if there is a default processor for the model set, the processor is changed. - once a control image is selected (and processed), changing the model does not change the processor - must be manually changed
Add uploading to IAIDndImage - add `postUploadAction` arg to `imageUploaded` thunk, with several current valid options (set control image, set init, set nodes image, set canvas, or toast) - updated IAIDndImage to optionally allow click to upload
77b5606
to
899e20e
Compare
The upload capability currently only supports click - not drag from filesystem. Will get to that ASAP. For now, dragging an image from FS has not changed, the files just go to the assets tab of gallery. |
Could see having drag from FS going to "assets" be better overall, as it kinda defaults for it to being available for historical use |
blessedcoolant
approved these changes
Jun 6, 2023
A couple of things I noted in this PR:
|
- delay of 250ms - prevent gallery images from accidentally activating native drag and drop
css is terrible
If there is no control image, and the model does not have a default processor, set the processor to `none`.
- also change the placeholder text
The processor is automatically selected when model is changed. But if the user manually changes the processor, processor settings, or disables the new `Auto configure processor` switch, auto processing is disabled. The user can enable auto configure by turning the switch back on. When auto configure is enabled, a small dot is overlaid on the expand button to remind the user that the system is not auto configuring the processor for them. If auto configure is enabled, the processor settings are reset to the default for the selected model.
blessedcoolant
approved these changes
Jun 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Various ControlNet improvements
feat(ui): auto-select controlnet processor
once a control image is selected (and processed), changing the model does not change the processor - must be manually changedsee final change for updated autoprocessingfix(ui): fix control image not used if processor type is none
fix(ui): only show loading indicator on processing control images
feat(ui): add upload to IAIDndImage
Add uploading to IAIDndImage
postUploadAction
arg toimageUploaded
thunk, with several current valid options (set control image, set init, set nodes image, set canvas, or toast)fix(ui): improve dragging activation
feat(ui): add reset button for control image
feat(ui): make prompt not required
feat(ui): enhance autoprocessing
The processor is automatically selected when model is changed.
But if the user manually changes the processor, processor settings, or disables the new
Auto configure processor
switch, auto processing is disabled.The user can enable auto configure by turning the switch back on.
When auto configure is enabled, a small dot is overlaid on the expand button to remind the user that the system is not auto configuring the processor for them.
If auto configure is enabled, the processor settings are reset to the default for the selected model.