diff --git a/src/progressBar.cpp b/src/progressBar.cpp index 982e59c..22c337f 100644 --- a/src/progressBar.cpp +++ b/src/progressBar.cpp @@ -17,6 +17,8 @@ #include #include +#include +#include #include "progressBar.hpp" #include "display.hpp" @@ -24,7 +26,7 @@ ProgressBar::ProgressBar(std::string mess, int maxValue, int progressLen, bool quiet): _mess(mess), _maxValue(maxValue), _progressLen(progressLen), _quiet(quiet), _first(true) { - last_time = clock(); + last_time = std::chrono::system_clock::now(); } void ProgressBar::display(int value, char force) { @@ -36,8 +38,11 @@ void ProgressBar::display(int value, char force) return; } - clock_t this_time = clock(); - if (!force && ((((float)(this_time - last_time))/CLOCKS_PER_SEC) < 0.2)) + std::chrono::time_point this_time; + this_time = std::chrono::system_clock::now(); + std::chrono::duration diff = this_time - last_time; + + if (!force && diff.count() < 1) { return; } @@ -64,7 +69,7 @@ void ProgressBar::done() void ProgressBar::fail() { if (_quiet) { - printError("\nFail"); + printError("Fail"); } else { display(_maxValue, true); printError("\nFail"); diff --git a/src/progressBar.hpp b/src/progressBar.hpp index 8ca4e10..c39b94c 100644 --- a/src/progressBar.hpp +++ b/src/progressBar.hpp @@ -17,8 +17,8 @@ #ifndef PROGRESSBARE_HPP #define PROGRESSBARE_HPP -#include #include +#include class ProgressBar { public: @@ -31,7 +31,8 @@ class ProgressBar { std::string _mess; int _maxValue; int _progressLen; - clock_t last_time; //records the time of last progress bar update + //records the time of last progress bar update + std::chrono::time_point last_time; bool _quiet; bool _first; };