Foreign-Mirrors/Fooocus
1
0
Fork 0
mirror of https://github.com/lllyasviel/Fooocus.git synced 2026-08-16 13:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename checkbox "enable mask upload" to "enable advanced masking features"

Browse Source
This commit is contained in:
Manuel Schmid
2024-06-26 21:20:40 +02:00
parent 96306616bb
commit 49275c0ba1
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
language/en.json
+1
View File
@@ -11,6 +11,7 @@
"Image Prompt": "Image Prompt", "Image Prompt": "Image Prompt",
"Inpaint or Outpaint": "Inpaint or Outpaint", "Inpaint or Outpaint": "Inpaint or Outpaint",
"Outpaint Direction": "Outpaint Direction", "Outpaint Direction": "Outpaint Direction",
"Enable Advanced Masking Features": "Enable Advanced Masking Features",
"Method": "Method", "Method": "Method",
"Describe": "Describe", "Describe": "Describe",
"Content Type": "Content Type", "Content Type": "Content Type",
modules/async_worker.py
+2 -2
View File
@@ -93,7 +93,7 @@ class AsyncTask:
self.inpaint_engine = args.pop() self.inpaint_engine = args.pop()
self.inpaint_strength = args.pop() self.inpaint_strength = args.pop()
self.inpaint_respective_field = args.pop() self.inpaint_respective_field = args.pop()
self.inpaint_mask_upload_checkbox = args.pop() self.inpaint_advanced_masking_checkbox = args.pop()
self.invert_mask_checkbox = args.pop() self.invert_mask_checkbox = args.pop()
self.inpaint_erode_or_dilate = args.pop() self.inpaint_erode_or_dilate = args.pop()
self.save_metadata_to_images = args.pop() if not args_manager.args.disable_metadata else False self.save_metadata_to_images = args.pop() if not args_manager.args.disable_metadata else False
@@ -858,7 +858,7 @@ def worker():
inpaint_image = async_task.inpaint_input_image['image'] inpaint_image = async_task.inpaint_input_image['image']
inpaint_mask = async_task.inpaint_input_image['mask'][:, :, 0] inpaint_mask = async_task.inpaint_input_image['mask'][:, :, 0]
if async_task.inpaint_mask_upload_checkbox: if async_task.inpaint_advanced_masking_checkbox:
if isinstance(async_task.inpaint_mask_image_upload, dict): if isinstance(async_task.inpaint_mask_image_upload, dict):
if (isinstance(async_task.inpaint_mask_image_upload['image'], np.ndarray) if (isinstance(async_task.inpaint_mask_image_upload['image'], np.ndarray)
and isinstance(async_task.inpaint_mask_image_upload['mask'], np.ndarray) and isinstance(async_task.inpaint_mask_image_upload['mask'], np.ndarray)
webui.py
+6 -6
View File
@@ -234,7 +234,7 @@ with shared.gradio_root:
with gr.Row(): with gr.Row():
with gr.Column(): with gr.Column():
inpaint_input_image = grh.Image(label='Image', source='upload', type='numpy', tool='sketch', height=500, brush_color="#FFFFFF", elem_id='inpaint_canvas', show_label=False) inpaint_input_image = grh.Image(label='Image', source='upload', type='numpy', tool='sketch', height=500, brush_color="#FFFFFF", elem_id='inpaint_canvas', show_label=False)
inpaint_mask_upload_checkbox = gr.Checkbox(label='Enable Mask Upload', value=False) inpaint_advanced_masking_checkbox = gr.Checkbox(label='Enable Advanced Masking Features', value=False)
inpaint_mode = gr.Dropdown(choices=modules.flags.inpaint_options, value=modules.flags.inpaint_option_default, label='Method') inpaint_mode = gr.Dropdown(choices=modules.flags.inpaint_options, value=modules.flags.inpaint_option_default, label='Method')
inpaint_additional_prompt = gr.Textbox(placeholder="Describe what you want to inpaint.", elem_id='inpaint_additional_prompt', label='Inpaint Additional Prompt', visible=False) inpaint_additional_prompt = gr.Textbox(placeholder="Describe what you want to inpaint.", elem_id='inpaint_additional_prompt', label='Inpaint Additional Prompt', visible=False)
outpaint_selections = gr.CheckboxGroup(choices=['Left', 'Right', 'Top', 'Bottom'], value=[], label='Outpaint Direction') outpaint_selections = gr.CheckboxGroup(choices=['Left', 'Right', 'Top', 'Bottom'], value=[], label='Outpaint Direction')
@@ -806,12 +806,12 @@ with shared.gradio_root:
inpaint_ctrls = [debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine, inpaint_ctrls = [debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine,
inpaint_strength, inpaint_respective_field, inpaint_strength, inpaint_respective_field,
inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate] inpaint_advanced_masking_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate]
inpaint_mask_upload_checkbox.change(lambda x: [gr.update(visible=x)] * 2, inpaint_advanced_masking_checkbox.change(lambda x: [gr.update(visible=x)] * 2,
inputs=inpaint_mask_upload_checkbox, inputs=inpaint_advanced_masking_checkbox,
outputs=[inpaint_mask_image, inpaint_mask_generation_col], outputs=[inpaint_mask_image, inpaint_mask_generation_col],
queue=False, show_progress=False) queue=False, show_progress=False)
inpaint_mask_color.change(lambda x: gr.update(brush_color=x), inputs=inpaint_mask_color, inpaint_mask_color.change(lambda x: gr.update(brush_color=x), inputs=inpaint_mask_color,
outputs=inpaint_input_image, outputs=inpaint_input_image,