Mirror/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2024-06-07 21:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3176 from asimard1/master

Browse Source 
Show PB texts at same time and earlier
This commit is contained in:
AUTOMATIC1111 2023-01-04 18:40:14 +03:00 committed by GitHub
commit cf413d1fbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/ui.py
View File

@ -164,14 +164,14 @@ def save_files(js_data, images, do_make_zip, index):
def calc_time_left(progress, threshold, label, force_display): def calc_time_left(progress, threshold, label, force_display, showTime):
if progress == 0: if progress == 0:
return "" return ""
else: else:
time_since_start = time.time() - shared.state.time_start time_since_start = time.time() - shared.state.time_start
eta = (time_since_start/progress) eta = (time_since_start/progress)
eta_relative = eta-time_since_start eta_relative = eta-time_since_start
if (eta_relative > threshold and progress > 0.02) or force_display: if (eta_relative > threshold and showTime) or force_display:
if eta_relative > 3600: if eta_relative > 3600:
return label + time.strftime('%H:%M:%S', time.gmtime(eta_relative)) return label + time.strftime('%H:%M:%S', time.gmtime(eta_relative))
elif eta_relative > 60: elif eta_relative > 60:
@ -193,7 +193,10 @@ def check_progress_call(id_part):
if shared.state.sampling_steps > 0: if shared.state.sampling_steps > 0:
progress += 1 / shared.state.job_count * shared.state.sampling_step / shared.state.sampling_steps progress += 1 / shared.state.job_count * shared.state.sampling_step / shared.state.sampling_steps
time_left = calc_time_left( progress, 1, " ETA: ", shared.state.time_left_force_display ) # Show progress percentage and time left at the same moment, and base it also on steps done
showPBText = progress >= 0.01 or shared.state.sampling_step >= 10
time_left = calc_time_left( progress, 1, " ETA: ", shared.state.time_left_force_display, showPBText )
if time_left != "": if time_left != "":
shared.state.time_left_force_display = True shared.state.time_left_force_display = True
@ -201,7 +204,7 @@ def check_progress_call(id_part):
progressbar = "" progressbar = ""
if opts.show_progressbar: if opts.show_progressbar:
progressbar = f"""<div class='progressDiv'><div class='progress' style="overflow:visible;width:{progress * 100}%;white-space:nowrap;">{"&nbsp;" * 2 + str(int(progress*100))+"%" + time_left if progress > 0.01 else ""}</div></div>""" progressbar = f"""<div class='progressDiv'><div class='progress' style="overflow:visible;width:{progress * 100}%;white-space:nowrap;">{"&nbsp;" * 2 + str(int(progress*100))+"%" + time_left if showPBText else ""}</div></div>"""
image = gr_show(False) image = gr_show(False)
preview_visibility = gr_show(False) preview_visibility = gr_show(False)