mirror of
https://github.com/lllyasviel/Fooocus.git
synced 2026-08-16 13:13:16 +02:00
feat: extract attribute overwrite_width
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
overwrite_width, overwrite_height, \
|
overwrite_height, \
|
||||||
overwrite_vary_strength, overwrite_upscale_strength, \
|
overwrite_vary_strength, overwrite_upscale_strength, \
|
||||||
mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \
|
mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \
|
||||||
debugging_cn_preprocessor, skipping_cn_preprocessor, controlnet_softness, canny_low_threshold, canny_high_threshold, \
|
debugging_cn_preprocessor, skipping_cn_preprocessor, controlnet_softness, canny_low_threshold, canny_high_threshold, \
|
||||||
@@ -9,7 +9,7 @@ overwrite_width, overwrite_height, \
|
|||||||
|
|
||||||
|
|
||||||
def set_all_advanced_parameters(*args):
|
def set_all_advanced_parameters(*args):
|
||||||
global overwrite_width, overwrite_height, \
|
global overwrite_height, \
|
||||||
overwrite_vary_strength, overwrite_upscale_strength, \
|
overwrite_vary_strength, overwrite_upscale_strength, \
|
||||||
mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \
|
mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \
|
||||||
debugging_cn_preprocessor, skipping_cn_preprocessor, controlnet_softness, canny_low_threshold, canny_high_threshold, \
|
debugging_cn_preprocessor, skipping_cn_preprocessor, controlnet_softness, canny_low_threshold, canny_high_threshold, \
|
||||||
@@ -18,7 +18,7 @@ def set_all_advanced_parameters(*args):
|
|||||||
debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine, inpaint_strength, inpaint_respective_field, \
|
debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine, inpaint_strength, inpaint_respective_field, \
|
||||||
inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate
|
inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate
|
||||||
|
|
||||||
overwrite_width, overwrite_height, \
|
overwrite_height, \
|
||||||
overwrite_vary_strength, overwrite_upscale_strength, \
|
overwrite_vary_strength, overwrite_upscale_strength, \
|
||||||
mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \
|
mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \
|
||||||
debugging_cn_preprocessor, skipping_cn_preprocessor, controlnet_softness, canny_low_threshold, canny_high_threshold, \
|
debugging_cn_preprocessor, skipping_cn_preprocessor, controlnet_softness, canny_low_threshold, canny_high_threshold, \
|
||||||
|
|||||||
@@ -146,6 +146,7 @@ def worker():
|
|||||||
scheduler_name = args.pop()
|
scheduler_name = args.pop()
|
||||||
overwrite_step = args.pop()
|
overwrite_step = args.pop()
|
||||||
overwrite_switch = args.pop()
|
overwrite_switch = args.pop()
|
||||||
|
overwrite_width = args.pop()
|
||||||
|
|
||||||
cn_tasks = {x: [] for x in flags.ip_list}
|
cn_tasks = {x: [] for x in flags.ip_list}
|
||||||
for _ in range(4):
|
for _ in range(4):
|
||||||
@@ -346,8 +347,8 @@ def worker():
|
|||||||
if overwrite_switch > 0:
|
if overwrite_switch > 0:
|
||||||
switch = overwrite_switch
|
switch = overwrite_switch
|
||||||
|
|
||||||
if advanced_parameters.overwrite_width > 0:
|
if overwrite_width > 0:
|
||||||
width = advanced_parameters.overwrite_width
|
width = overwrite_width
|
||||||
|
|
||||||
if advanced_parameters.overwrite_height > 0:
|
if advanced_parameters.overwrite_height > 0:
|
||||||
height = advanced_parameters.overwrite_height
|
height = advanced_parameters.overwrite_height
|
||||||
|
|||||||
@@ -446,7 +446,7 @@ with shared.gradio_root:
|
|||||||
freeu_s2 = gr.Slider(label='S2', minimum=0, maximum=4, step=0.01, value=0.95)
|
freeu_s2 = gr.Slider(label='S2', minimum=0, maximum=4, step=0.01, value=0.95)
|
||||||
freeu_ctrls = [freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2]
|
freeu_ctrls = [freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2]
|
||||||
|
|
||||||
adps = [overwrite_width, overwrite_height,
|
adps = [overwrite_height,
|
||||||
overwrite_vary_strength, overwrite_upscale_strength,
|
overwrite_vary_strength, overwrite_upscale_strength,
|
||||||
mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint,
|
mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint,
|
||||||
debugging_cn_preprocessor, skipping_cn_preprocessor, controlnet_softness,
|
debugging_cn_preprocessor, skipping_cn_preprocessor, controlnet_softness,
|
||||||
@@ -528,7 +528,7 @@ with shared.gradio_root:
|
|||||||
ctrls += [input_image_checkbox, current_tab]
|
ctrls += [input_image_checkbox, current_tab]
|
||||||
ctrls += [uov_method, uov_input_image]
|
ctrls += [uov_method, uov_input_image]
|
||||||
ctrls += [outpaint_selections, inpaint_input_image, inpaint_additional_prompt, inpaint_mask_image]
|
ctrls += [outpaint_selections, inpaint_input_image, inpaint_additional_prompt, inpaint_mask_image]
|
||||||
ctrls += [disable_preview, adm_scaler_positive, adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name, scheduler_name, overwrite_step, overwrite_switch]
|
ctrls += [disable_preview, adm_scaler_positive, adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name, scheduler_name, overwrite_step, overwrite_switch, overwrite_width]
|
||||||
ctrls += ip_ctrls
|
ctrls += ip_ctrls
|
||||||
|
|
||||||
state_is_generating = gr.State(False)
|
state_is_generating = gr.State(False)
|
||||||
|
|||||||
Reference in New Issue
Block a user