Foreign-Mirrors/Fooocus
1
0
Fork 0
mirror of https://github.com/lllyasviel/Fooocus.git synced 2026-08-16 13:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: use fixed width for status text, remove ordinals

Browse Source
This commit is contained in:
Manuel Schmid
2024-05-19 20:13:29 +02:00
parent d2255a940c
commit 888de56290
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/style.css
+5
View File
@@ -70,6 +70,11 @@ progress::after {
height: 30px !important; height: 30px !important;
} }
.progress-bar span {
text-align: right;
width: 200px;
}
.type_row{ .type_row{
height: 80px !important; height: 80px !important;
} }
modules/async_worker.py
+5 -4
View File
@@ -49,7 +49,7 @@ def worker():
from modules.private_logger import log from modules.private_logger import log
from extras.expansion import safe_str from extras.expansion import safe_str
from modules.util import (remove_empty_str, HWC3, resize_image, get_image_shape_ceil, set_image_shape_ceil, from modules.util import (remove_empty_str, HWC3, resize_image, get_image_shape_ceil, set_image_shape_ceil,
get_shape_ceil, resample_image, erode_or_dilate, ordinal_suffix, get_enabled_loras, get_shape_ceil, resample_image, erode_or_dilate, get_enabled_loras,
parse_lora_references_from_prompt, apply_wildcards) parse_lora_references_from_prompt, apply_wildcards)
from modules.upscaler import perform_upscale from modules.upscaler import perform_upscale
from modules.flags import Performance from modules.flags import Performance
@@ -838,10 +838,11 @@ def worker():
done_steps = current_task_id * steps + step done_steps = current_task_id * steps + step
async_task.yields.append(['preview', ( async_task.yields.append(['preview', (
int(15.0 + 85.0 * float(done_steps) / float(all_steps)), int(15.0 + 85.0 * float(done_steps) / float(all_steps)),
f'Step {step}/{total_steps} in the {current_task_id + 1}{ordinal_suffix(current_task_id + 1)} Sampling', f'Sampling step {step + 1}/{total_steps}, image {current_task_id + 1}/{image_number} ...', y)])
y)])
for current_task_id, task in enumerate(tasks): for current_task_id, task in enumerate(tasks):
current_progress = int(15.0 + 85.0 * float(current_task_id * steps) / float(all_steps))
progressbar(async_task, current_progress, f'Preparing task {current_task_id + 1}/{image_number} ...')
execution_start_time = time.perf_counter() execution_start_time = time.perf_counter()
try: try:
@@ -889,7 +890,7 @@ def worker():
progressbar(async_task, current_progress, 'Checking for NSFW content ...') progressbar(async_task, current_progress, 'Checking for NSFW content ...')
imgs = default_censor(imgs) imgs = default_censor(imgs)
progressbar(async_task, current_progress, 'Saving image to system ...') progressbar(async_task, current_progress, f'Saving image {current_task_id + 1}/{image_number} to system ...')
for x in imgs: for x in imgs:
d = [('Prompt', 'prompt', task['log_positive_prompt']), d = [('Prompt', 'prompt', task['log_positive_prompt']),
('Negative Prompt', 'negative_prompt', task['log_negative_prompt']), ('Negative Prompt', 'negative_prompt', task['log_negative_prompt']),
modules/util.py
-4
View File
@@ -372,10 +372,6 @@ def get_file_from_folder_list(name, folders):
return os.path.abspath(os.path.realpath(os.path.join(folders[0], name))) return os.path.abspath(os.path.realpath(os.path.join(folders[0], name)))
def ordinal_suffix(number: int) -> str:
return 'th' if 10 <= number % 100 <= 20 else {1: 'st', 2: 'nd', 3: 'rd'}.get(number % 10, 'th')
def makedirs_with_log(path): def makedirs_with_log(path):
try: try:
os.makedirs(path, exist_ok=True) os.makedirs(path, exist_ok=True)