diff --git a/language/en.json b/language/en.json index da8f2271..1dac55e7 100644 --- a/language/en.json +++ b/language/en.json @@ -462,7 +462,7 @@ "The area to inpaint. Value 0 is same as \"Only Masked\" in A1111. Value 1 is same as \"Whole Image\" in A1111. Only used in inpaint, not used in outpaint. (Outpaint always use 1.0)": "The area to inpaint. Value 0 is same as \"Only Masked\" in A1111. Value 1 is same as \"Whole Image\" in A1111. Only used in inpaint, not used in outpaint. (Outpaint always use 1.0)", "Mask Erode or Dilate": "Mask Erode or Dilate", "Positive value will make white area in the mask larger, negative value will make white area smaller. (default is 0, always processed before any mask invert)": "Positive value will make white area in the mask larger, negative value will make white area smaller. (default is 0, always processed before any mask invert)", - "Invert Mask": "Invert Mask", + "Invert Mask When Generating": "Invert Mask When Generating", "Debug Enhance Masks": "Debug Enhance Masks", "Show enhance masks in preview and final results": "Show enhance masks in preview and final results", "Use GroundingDINO boxes instead of more detailed SAM masks": "Use GroundingDINO boxes instead of more detailed SAM masks" diff --git a/update_log.md b/update_log.md index 4c029b5c..cad12157 100644 --- a/update_log.md +++ b/update_log.md @@ -5,6 +5,7 @@ * Improve GroundingDINO and SAM image masking * Rename `--enable-describe-uov-image` to `--enable-auto-describe-image`, now also works for enhance image upload * Update python dependencies, remove diffusers, add segment_anything +* Move checkboxes Enable Mask Upload and Invert Mask When Generating from Developer Debug Mode to Inpaint Or Outpaint # [2.4.3](https://github.com/lllyasviel/Fooocus/releases/tag/v2.4.3) diff --git a/webui.py b/webui.py index fa468352..434ec60f 100644 --- a/webui.py +++ b/webui.py @@ -234,6 +234,7 @@ with shared.gradio_root: with gr.Row(): 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_mask_upload_checkbox = gr.Checkbox(label='Enable Mask Upload', value=False) 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) outpaint_selections = gr.CheckboxGroup(choices=['Left', 'Right', 'Top', 'Bottom'], value=[], label='Outpaint Direction') @@ -246,6 +247,7 @@ with shared.gradio_root: with gr.Column(visible=False) as inpaint_mask_generation_col: inpaint_mask_image = grh.Image(label='Mask Upload', source='upload', type='numpy', tool='sketch', height=500, brush_color="#FFFFFF", mask_opacity=1) + invert_mask_checkbox = gr.Checkbox(label='Invert Mask When Generating', value=False) inpaint_mask_model = gr.Dropdown(label='Mask generation model', choices=flags.inpaint_mask_models, value=modules.config.default_inpaint_mask_model) @@ -799,8 +801,6 @@ with shared.gradio_root: info='Positive value will make white area in the mask larger, ' 'negative value will make white area smaller. ' '(default is 0, processed before SAM)') - inpaint_mask_upload_checkbox = gr.Checkbox(label='Enable Mask Upload', value=False) - invert_mask_checkbox = gr.Checkbox(label='Invert Mask', value=False) inpaint_mask_color = gr.ColorPicker(label='Inpaint brush color', value='#FFFFFF', elem_id='inpaint_brush_color')