remove scale latent and no-crop options from hires fix

support copy-pasting new parameters for hires fix

1 files changed, 5 insertions, 14 deletions

diff --git a/modules/ui.py b/modules/ui.py
index f2d81f68..d66ddc14 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -540,16 +540,9 @@ def create_ui(wrap_gradio_gpu_call):
                     enable_hr = gr.Checkbox(label='Highres. fix', value=False)

 

                 with gr.Row(visible=False) as hr_options:

-                    with gr.Column(scale=1.0):

-                        firstphase_width = gr.Slider(minimum=64, maximum=1024, step=64, label="First pass width", value=512)

-                        firstphase_height = gr.Slider(minimum=64, maximum=1024, step=64, label="First pass height", value=512)

-                        

-                    with gr.Column(scale=1.0):

-                        with gr.Row():

-                            crop_scale = gr.Checkbox(label='Crop when scaling', value=False)

-                            scale_latent = gr.Checkbox(label='Scale latent', value=False)

-                        with gr.Row():

-                            denoising_strength = gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='Denoising strength', value=0.7)

+                    firstphase_width = gr.Slider(minimum=64, maximum=1024, step=64, label="First pass width", value=512)

+                    firstphase_height = gr.Slider(minimum=64, maximum=1024, step=64, label="First pass height", value=512)

+                    denoising_strength = gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='Denoising strength', value=0.7)

 

                 with gr.Row(equal_height=True):

                     batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1)

@@ -610,11 +603,9 @@ def create_ui(wrap_gradio_gpu_call):
                     height,

                     width,

                     enable_hr,

-                    scale_latent,

                     denoising_strength,

                     firstphase_width,

                     firstphase_height,

-                    crop_scale,

                 ] + custom_inputs,

                 outputs=[

                     txt2img_gallery,

@@ -679,8 +670,8 @@ def create_ui(wrap_gradio_gpu_call):
                 (denoising_strength, "Denoising strength"),

                 (enable_hr, lambda d: "Denoising strength" in d),

                 (hr_options, lambda d: gr.Row.update(visible="Denoising strength" in d)),

-                (firstphase_width, "First pass width"),

-                (firstphase_height, "First pass height"),

+                (firstphase_width, "First pass size-1"),

+                (firstphase_height, "First pass size-2"),

             ]

             modules.generation_parameters_copypaste.connect_paste(paste, txt2img_paste_fields, txt2img_prompt)

             token_button.click(fn=update_token_counter, inputs=[txt2img_prompt, steps], outputs=[token_counter])