Unverified Commit 2913b9f0 authored by AUTOMATIC1111's avatar AUTOMATIC1111 Committed by GitHub
Browse files

Merge pull request #4178 from HeyImKyu/PreviewOnBatchCompletion

Added option to preview Created images on batch completion.
parents 17f9e556 f1b6ac64
Loading
Loading
Loading
Loading
+16 −9
Original line number Diff line number Diff line
@@ -147,6 +147,9 @@ class State:
        self.interrupted = True

    def nextjob(self):
        if opts.show_progress_every_n_steps == -1: 
            self.do_set_current_image()
            
        self.job_no += 1
        self.sampling_step = 0
        self.current_image_sampling_step = 0
@@ -187,10 +190,15 @@ class State:

    """sets self.current_image from self.current_latent if enough sampling steps have been made after the last call to this"""
    def set_current_image(self):
        if self.sampling_step - self.current_image_sampling_step >= opts.show_progress_every_n_steps and opts.show_progress_every_n_steps > 0:
            self.do_set_current_image()

    def do_set_current_image(self):
        if not parallel_processing_allowed:
            return
        if self.current_latent is None:
            return
            
        if self.sampling_step - self.current_image_sampling_step >= opts.show_progress_every_n_steps and self.current_latent is not None:
        if opts.show_progress_grid:
            self.current_image = sd_samplers.samples_to_image_grid(self.current_latent)
        else:
@@ -198,7 +206,6 @@ class State:

        self.current_image_sampling_step = self.sampling_step


state = State()

artist_db = modules.artists.ArtistsDatabase(os.path.join(script_path, 'artists.csv'))
@@ -352,7 +359,7 @@ options_templates.update(options_section(('interrogate', "Interrogate Options"),

options_templates.update(options_section(('ui', "User interface"), {
    "show_progressbar": OptionInfo(True, "Show progressbar"),
    "show_progress_every_n_steps": OptionInfo(0, "Show image creation progress every N sampling steps. Set 0 to disable.", gr.Slider, {"minimum": 0, "maximum": 32, "step": 1}),
    "show_progress_every_n_steps": OptionInfo(0, "Show image creation progress every N sampling steps. Set to 0 to disable. Set to -1 to show after completion of batch.", gr.Slider, {"minimum": -1, "maximum": 32, "step": 1}),
    "show_progress_grid": OptionInfo(True, "Show previews of all images generated in a batch as a grid"),
    "return_grid": OptionInfo(True, "Show grid in results for web"),
    "do_not_show_images": OptionInfo(False, "Do not show any images in results for web"),
+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ def check_progress_call(id_part):
    image = gr_show(False)
    preview_visibility = gr_show(False)

    if opts.show_progress_every_n_steps > 0:
    if opts.show_progress_every_n_steps != 0:
        shared.state.set_current_image()
        image = shared.state.current_image