X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=progress_bar.cc;h=50a4d164debc8c123c3e130e56f18a8c67a44bdf;hb=b8222ae1fb874f0783803f55e0bc4c4b9ffca8b2;hp=b7800eba29e8e7727c999f8f33491dcf7b2c3898;hpb=d922ad61d35e9a6996730bec24b16f8bf7bc426c;p=folded-ctf.git
diff --git a/progress_bar.cc b/progress_bar.cc
index b7800eb..50a4d16 100644
--- a/progress_bar.cc
+++ b/progress_bar.cc
@@ -12,15 +12,15 @@
// You should have received a copy of the GNU General Public License //
// along with this program. If not, see . //
// //
-// Written by Francois Fleuret, (C) IDIAP //
+// Written by Francois Fleuret //
+// (C) Idiap Research Institute //
+// //
// Contact for comments & bug reports //
///////////////////////////////////////////////////////////////////////////
#include
#include "progress_bar.h"
-const int ProgressBar::_width = 80;
-
ProgressBar::ProgressBar() : _visible(false), _value_max(-1) { }
void ProgressBar::set_visible(bool visible) {
@@ -39,7 +39,7 @@ void ProgressBar::refresh(ostream *out, scalar_t value) {
int step = int((value * 40) / _value_max);
if(1 || step > _last_step) {
- char buffer[_width + 1], date_buffer[buffer_size];
+ char buffer[width + 1], date_buffer[buffer_size];
int i, j;
j = sprintf(buffer, "Timer: ");
@@ -56,19 +56,19 @@ void ProgressBar::refresh(ostream *out, scalar_t value) {
time(¤t);
current += rt;
strftime(date_buffer, buffer_size, "%a %b %e %H:%M", localtime(¤t));
- j += snprintf(buffer + j, _width - j - 1, " (end ~ %s)", date_buffer);
+ j += snprintf(buffer + j, width - j - 1, " (end ~ %s)", date_buffer);
} else {
int hours = rt/3600, min = (rt%3600)/60, sec = rt%60;
if(hours > 0)
- j += snprintf(buffer + j, _width - j - 1, " (~%dh%dmin left)", hours, min);
+ j += snprintf(buffer + j, width - j - 1, " (~%dh%dmin left)", hours, min);
else if(min > 0)
- j += snprintf(buffer + j, _width - j - 1, " (~%dmin%ds left)", min, sec);
+ j += snprintf(buffer + j, width - j - 1, " (~%dmin%ds left)", min, sec);
else
- j += snprintf(buffer + j, _width - j - 1, " (~%ds left)", sec);
+ j += snprintf(buffer + j, width - j - 1, " (~%ds left)", sec);
}
}
- for(; j < _width; j++) buffer[j] = ' ';
+ for(; j < width; j++) buffer[j] = ' ';
buffer[j] = '\0';
(*out) << buffer << "\r";
out->flush();
@@ -79,13 +79,13 @@ void ProgressBar::refresh(ostream *out, scalar_t value) {
void ProgressBar::finish(ostream *out) {
if(_visible) {
- char buffer[_width + 1];
+ char buffer[width + 1];
int j;
time_t current_time; time(¤t_time);
int rt = int(current_time - _initial_time);
int min = rt/60, sec = rt%60;
j = sprintf(buffer, "Timer: Total %dmin%ds", min, sec);
- for(; j < _width; j++) buffer[j] = ' ';
+ for(; j < width; j++) buffer[j] = ' ';
buffer[j] = '\0';
(*out) << buffer << endl;
out->flush();