Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
S
stable-diffusion-webui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
stable-diffusion-webui
Commits
cf413d1f
Unverified
Commit
cf413d1f
authored
Jan 04, 2023
by
AUTOMATIC1111
Committed by
GitHub
Jan 04, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3176 from asimard1/master
Show PB texts at same time and earlier
parents
a8eb9e3b
37aafdb0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
ui.py
modules/ui.py
+7
-4
No files found.
modules/ui.py
View file @
cf413d1f
...
...
@@ -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
:
return
""
else
:
time_since_start
=
time
.
time
()
-
shared
.
state
.
time_start
eta
=
(
time_since_start
/
progress
)
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
:
return
label
+
time
.
strftime
(
'
%
H:
%
M:
%
S'
,
time
.
gmtime
(
eta_relative
))
elif
eta_relative
>
60
:
...
...
@@ -193,7 +193,10 @@ def check_progress_call(id_part):
if
shared
.
state
.
sampling_steps
>
0
:
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
!=
""
:
shared
.
state
.
time_left_force_display
=
True
...
...
@@ -201,7 +204,7 @@ def check_progress_call(id_part):
progressbar
=
""
if
opts
.
show_progressbar
:
progressbar
=
f
"""<div class='progressDiv'><div class='progress' style="overflow:visible;width:{progress * 100}
%
;white-space:nowrap;">{" " * 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;">{" " * 2 + str(int(progress*100))+"
%
" + time_left if
showPBText
else ""}</div></div>"""
image
=
gr_show
(
False
)
preview_visibility
=
gr_show
(
False
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment