From fd4636b4503b298701bad1c91e702625cf8e0430 Mon Sep 17 00:00:00 2001 From: QuantumSoul Date: Sat, 30 Mar 2024 15:36:16 +0100 Subject: [PATCH 1/2] Elemids masking.py --- modules/masking.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/masking.py b/modules/masking.py index 6eb1abf354d..8a6c11a908d 100644 --- a/modules/masking.py +++ b/modules/masking.py @@ -520,26 +520,26 @@ def update_opts(*args): with gr.Accordion(open=False, label="Mask", elem_id="control_mask", elem_classes=["small-accordion"]): controls.clear() with gr.Row(): - controls.append(gr.Checkbox(label="Live update", value=True)) - btn_mask = ui_components.ToolButton(value=ui_symbols.refresh, visible=True) - btn_lama = ui_components.ToolButton(value=ui_symbols.image, visible=True) + controls.append(gr.Checkbox(label="Live update", value=True, elem_id="control_mask_live_update")) + btn_mask = ui_components.ToolButton(value=ui_symbols.refresh, visible=True, elem_id="control_mask_refresh", ) + btn_lama = ui_components.ToolButton(value=ui_symbols.image, visible=True, elem_id="control_mask_lama") with gr.Row(): - controls.append(gr.Checkbox(label="Inpaint masked only", value=False)) - controls.append(gr.Checkbox(label="Invert mask", value=False)) + controls.append(gr.Checkbox(label="Inpaint masked only", value=False, elem_id="control_mask_only", )) + controls.append(gr.Checkbox(label="Invert mask", value=False, elem_id="control_mask_invert")) with gr.Row(): controls.append(gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='Blur', value=0.01, elem_id="control_mask_blur")) controls.append(gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='Erode', value=0.01, elem_id="control_mask_erode")) controls.append(gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='Dilate', value=0.01, elem_id="control_mask_dilate")) with gr.Row(): - controls.append(gr.Dropdown(label="Auto-mask", choices=['None', 'Threshold', 'Edge', 'Grayscale'], value='None')) - selected_model = gr.Dropdown(label="Auto-segment", choices=MODELS.keys(), value='None') + controls.append(gr.Dropdown(label="Auto-mask", choices=['None', 'Threshold', 'Edge', 'Grayscale'], value='None', elem_id="control_mask_auto")) + selected_model = gr.Dropdown(label="Auto-segment", choices=MODELS.keys(), value='None', elem_id="control_mask_segment") with gr.Row(): - controls.append(gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='Score', value=0.5, visible=False)) - controls.append(gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='IOU', value=0.5, visible=False)) - controls.append(gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='NMS', value=0.5, visible=False)) + controls.append(gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='Score', value=0.5, visible=False, elem_id="control_mask_score")) + controls.append(gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='IOU', value=0.5, visible=False, elem_id="control_mask_iou")) + controls.append(gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='NMS', value=0.5, visible=False, elem_id="control_mask_nms")) with gr.Row(): - controls.append(gr.Dropdown(label="Preview", choices=['None', 'Masked', 'Binary', 'Grayscale', 'Color', 'Composite'], value='Composite')) - controls.append(gr.Dropdown(label="Colormap", choices=COLORMAP, value='pink')) + controls.append(gr.Dropdown(label="Preview", choices=['None', 'Masked', 'Binary', 'Grayscale', 'Color', 'Composite'], value='Composite', elem_id="control_mask_preview")) + controls.append(gr.Dropdown(label="Colormap", choices=COLORMAP, value='pink', elem_id="control_mask_colormap")) selected_model.change(fn=init_model, inputs=[selected_model], outputs=[selected_model]) for control in controls: From 1432b24bab092d1ee5e88f9fc7d8b7189ff59a8d Mon Sep 17 00:00:00 2001 From: QuantumSoul Date: Sat, 30 Mar 2024 15:39:40 +0100 Subject: [PATCH 2/2] Elemids ui_control.py --- modules/ui_control.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/ui_control.py b/modules/ui_control.py index 4abbd559d47..558f3e51c7d 100644 --- a/modules/ui_control.py +++ b/modules/ui_control.py @@ -118,12 +118,12 @@ def create_ui(_blocks: gr.Blocks=None): with gr.Row(): video_skip_frames = gr.Slider(minimum=0, maximum=100, step=1, label='Skip input frames', value=0, elem_id="control_video_skip_frames") with gr.Row(): - video_type = gr.Dropdown(label='Video file', choices=['None', 'GIF', 'PNG', 'MP4'], value='None') - video_duration = gr.Slider(label='Duration', minimum=0.25, maximum=300, step=0.25, value=2, visible=False) + video_type = gr.Dropdown(label='Video file', choices=['None', 'GIF', 'PNG', 'MP4'], value='None', elem_id="control_video_type") + video_duration = gr.Slider(label='Duration', minimum=0.25, maximum=300, step=0.25, value=2, visible=False, elem_id="control_video_duration") with gr.Row(): - video_loop = gr.Checkbox(label='Loop', value=True, visible=False) - video_pad = gr.Slider(label='Pad frames', minimum=0, maximum=24, step=1, value=1, visible=False) - video_interpolate = gr.Slider(label='Interpolate frames', minimum=0, maximum=24, step=1, value=0, visible=False) + video_loop = gr.Checkbox(label='Loop', value=True, visible=False, elem_id="control_video_loop") + video_pad = gr.Slider(label='Pad frames', minimum=0, maximum=24, step=1, value=1, visible=False, elem_id="control_video_pad") + video_interpolate = gr.Slider(label='Interpolate frames', minimum=0, maximum=24, step=1, value=0, visible=False, elem_id="control_video_interpolate") video_type.change(fn=helpers.video_type_change, inputs=[video_type], outputs=[video_duration, video_loop, video_pad, video_interpolate]) enable_hr, hr_sampler_index, hr_denoising_strength, hr_upscaler, hr_force, hr_second_pass_steps, hr_scale, hr_resize_x, hr_resize_y, refiner_steps, refiner_start, refiner_prompt, refiner_negative = ui_sections.create_hires_inputs('txt2img')