From 04624f028d10b12ca7d33eba7f55c83740933222 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Wed, 20 Nov 2019 07:51:37 +0100 Subject: [PATCH] progressBar: use color --- progressBar.cpp | 16 +++++++++++++--- progressBar.hpp | 1 + 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/progressBar.cpp b/progressBar.cpp index b8d0bc3..62478ac 100644 --- a/progressBar.cpp +++ b/progressBar.cpp @@ -18,6 +18,7 @@ #include #include #include "progressBar.hpp" +#include "display.hpp" ProgressBar::ProgressBar(std::string mess, int maxValue, int progressLen): _mess(mess), _maxValue(maxValue), _progressLen(progressLen) @@ -29,15 +30,24 @@ void ProgressBar::display(int value) float percent = ((float)value * 100.0f)/(float)_maxValue; float nbEq = (percent * (float) _progressLen)/100.0f; - fprintf(stderr, "\r%s: [", _mess.c_str()); + //fprintf(stderr, "\r%s: [", _mess.c_str()); + printInfo("\r" + _mess + ": [", false); for (int z=0; z < nbEq; z++) { fputc('=', stderr); } fprintf(stderr, "%*s", (int)(_progressLen-nbEq), ""); - fprintf(stderr, "] %3.2f%%", percent); + //fprintf(stderr, "] %3.2f%%", percent); + printInfo("] " + std::to_string(percent) + "%", false); } void ProgressBar::done() { display(_maxValue); - fprintf(stderr, "\nDone\n"); + //fprintf(stderr, "\nDone\n"); + printSuccess("\nDone"); +} +void ProgressBar::fail() +{ + display(_maxValue); + //fprintf(stderr, "\nDone\n"); + printSuccess("\nFail"); } diff --git a/progressBar.hpp b/progressBar.hpp index f525d9f..7a7a7d7 100644 --- a/progressBar.hpp +++ b/progressBar.hpp @@ -25,6 +25,7 @@ class ProgressBar { ProgressBar(std::string mess, int maxValue, int progressLen); void display(int value); void done(); + void fail(); private: std::string _mess; int _maxValue;