diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-02-19 07:55:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-19 07:55:39 +0000 |
| commit | fd4ac5187a1ae42be3f131770ea21e2158f75dcd (patch) | |
| tree | a88d9720514409a59e3f51a28189a38279161dba /modules | |
| parent | b20f28eea9a2f71bb001064f51f1982382bdf568 (diff) | |
| download | stable-diffusion-webui-gfx803-fd4ac5187a1ae42be3f131770ea21e2158f75dcd.tar.gz stable-diffusion-webui-gfx803-fd4ac5187a1ae42be3f131770ea21e2158f75dcd.tar.bz2 stable-diffusion-webui-gfx803-fd4ac5187a1ae42be3f131770ea21e2158f75dcd.zip | |
Revert "Aspect ratio sliders"
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/shared.py | 21 | ||||
| -rw-r--r-- | modules/ui.py | 12 |
2 files changed, 2 insertions, 31 deletions
diff --git a/modules/shared.py b/modules/shared.py index 2983ee44..e324a48a 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -139,24 +139,6 @@ ui_reorder_categories = [ "scripts",
]
-aspect_ratio_defaults = [
- "🔓",
- "1:1",
- "3:2",
- "4:3",
- "5:4",
- "16:9",
- "9:16",
- "1.85:1",
- "2.35:1",
- "2.39:1",
- "2.40:1",
- "21:9",
- "1.375:1",
- "1.66:1",
- "1.75:1"
-]
-
cmd_opts.disable_extension_access = (cmd_opts.share or cmd_opts.listen or cmd_opts.server_name) and not cmd_opts.enable_insecure_extension_access
devices.device, devices.device_interrogate, devices.device_gfpgan, devices.device_esrgan, devices.device_codeformer = \
@@ -477,9 +459,6 @@ options_templates.update(options_section(('ui', "User interface"), { "keyedit_precision_extra": OptionInfo(0.05, "Ctrl+up/down precision when editing <extra networks:0.9>", gr.Slider, {"minimum": 0.01, "maximum": 0.2, "step": 0.001}),
"quicksettings": OptionInfo("sd_model_checkpoint", "Quicksettings list"),
"ui_reorder": OptionInfo(", ".join(ui_reorder_categories), "txt2img/img2img UI item order"),
- "aspect_ratios_rounding": OptionInfo(True, "Round aspect ratios for more flexibility?", gr.Checkbox),
- "aspect_ratios_rounding_method": OptionInfo("Ceiling", "Aspect ratios rounding method", gr.Radio,{"choices": ["Round", "Ceiling", "Floor"]}),
- "aspect_ratios": OptionInfo(", ".join(aspect_ratio_defaults), "txt2img/img2img aspect ratios"),
"ui_extra_networks_tab_reorder": OptionInfo("", "Extra networks tab order"),
"localization": OptionInfo("None", "Localization (requires restart)", gr.Dropdown, lambda: {"choices": ["None"] + list(localization.localizations.keys())}, refresh=lambda: localization.list_localizations(cmd_opts.localizations_dir)),
}))
diff --git a/modules/ui.py b/modules/ui.py index 2fc1fee5..2fdbda42 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -424,10 +424,6 @@ def ordered_ui_categories(): yield category
-def aspect_ratio_list():
- return [ratio.strip() for ratio in shared.opts.aspect_ratios.split(",")]
-
-
def get_value_for_setting(key):
value = getattr(opts, key)
@@ -483,9 +479,7 @@ def create_ui(): width = gr.Slider(minimum=64, maximum=2048, step=8, label="Width", value=512, elem_id="txt2img_width")
height = gr.Slider(minimum=64, maximum=2048, step=8, label="Height", value=512, elem_id="txt2img_height")
- with gr.Column(elem_id="txt2img_size_toolbox", scale=0):
- aspect_ratio_dropdown = gr.Dropdown(value="🔓", choices=aspect_ratio_list(), interactive=True, type="value", elem_id="txt2img_ratio", show_label=False, label="Aspect Ratio")
- res_switch_btn = ToolButton(value=switch_values_symbol, elem_id="txt2img_res_switch_btn")
+ res_switch_btn = ToolButton(value=switch_values_symbol, elem_id="txt2img_res_switch_btn")
if opts.dimensions_and_batch_together:
with gr.Column(elem_id="txt2img_column_batch"):
batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1, elem_id="txt2img_batch_count")
@@ -763,9 +757,7 @@ def create_ui(): width = gr.Slider(minimum=64, maximum=2048, step=8, label="Width", value=512, elem_id="img2img_width")
height = gr.Slider(minimum=64, maximum=2048, step=8, label="Height", value=512, elem_id="img2img_height")
- with gr.Column(elem_id="img2img_size_toolbox", scale=0):
- aspect_ratio_dropdown = gr.Dropdown(value="🔓", choices=aspect_ratio_list(), interactive=True, type="value", elem_id="img2img_ratio", show_label=False, label="Aspect Ratio")
- res_switch_btn = ToolButton(value=switch_values_symbol, elem_id="img2img_res_switch_btn")
+ res_switch_btn = ToolButton(value=switch_values_symbol, elem_id="img2img_res_switch_btn")
if opts.dimensions_and_batch_together:
with gr.Column(elem_id="img2img_column_batch"):
batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1, elem_id="img2img_batch_count")
|