Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 21:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show ETA for large operations

Browse Source
This commit is contained in:
d0k3 2017-01-27 13:49:17 +01:00
parent 120f5c88a5
commit 0abc6e88ff
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/common/ui.c
View File

@ -9,6 +9,7 @@
#include "font.h" #include "font.h"
#include "ui.h" #include "ui.h"
#include "timer.h"
#include "hid.h" #include "hid.h"
#define STRBUF_SIZE 512 // maximum size of the string buffer #define STRBUF_SIZE 512 // maximum size of the string buffer
@ -529,6 +530,17 @@ bool ShowProgress(u64 current, u64 total, const char* opstr)
char tempstr[64]; char tempstr[64];
char progstr[64]; char progstr[64];
static u64 last_sec_remain = 0;
if (!current) {
timer_start();
last_sec_remain = 0;
}
u64 sec_elapsed = (total > 0) ? timer_sec() : 0;
u64 sec_total = (current > 0) ? (sec_elapsed * total) / current : 0;
u64 sec_remain = ((2 * last_sec_remain) + (sec_total - sec_elapsed)) / 3;
if (sec_remain >= 60 * 60) sec_remain = 60 * 60 - 1;
last_sec_remain = sec_remain;
if (!current || last_prog_width > prog_width) { if (!current || last_prog_width > prog_width) {
ClearScreenF(true, false, COLOR_STD_BG); ClearScreenF(true, false, COLOR_STD_BG);
DrawRectangle(TOP_SCREEN, bar_pos_x, bar_pos_y, bar_width, bar_height, COLOR_STD_FONT); DrawRectangle(TOP_SCREEN, bar_pos_x, bar_pos_y, bar_width, bar_height, COLOR_STD_FONT);
@ -540,6 +552,12 @@ bool ShowProgress(u64 current, u64 total, const char* opstr)
snprintf(tempstr, 64, "%s (%lu%%)", progstr, prog_percent); snprintf(tempstr, 64, "%s (%lu%%)", progstr, prog_percent);
ResizeString(progstr, tempstr, bar_width / FONT_WIDTH_EXT, 8, false); ResizeString(progstr, tempstr, bar_width / FONT_WIDTH_EXT, 8, false);
DrawString(TOP_SCREEN, progstr, bar_pos_x, text_pos_y, COLOR_STD_FONT, COLOR_STD_BG); DrawString(TOP_SCREEN, progstr, bar_pos_x, text_pos_y, COLOR_STD_FONT, COLOR_STD_BG);
if (sec_elapsed >= 1) {
snprintf(tempstr, 16, "ETA %02llum%02llus", sec_remain / 60, sec_remain % 60);
ResizeString(progstr, tempstr, 16, 8, true);
DrawString(TOP_SCREEN, progstr, bar_pos_x + bar_width - 1 - (FONT_WIDTH_EXT * 16),
bar_pos_y - 10 - 1, COLOR_STD_FONT, COLOR_STD_BG);
}
DrawString(TOP_SCREEN, "(hold B to cancel)", bar_pos_x + 2, text_pos_y + 14, COLOR_STD_FONT, COLOR_STD_BG); DrawString(TOP_SCREEN, "(hold B to cancel)", bar_pos_x + 2, text_pos_y + 14, COLOR_STD_FONT, COLOR_STD_BG);
last_prog_width = prog_width; last_prog_width = prog_width;