zhangyiss/indicators
1
0
Fork 0
mirror of https://github.com/p-ranav/indicators.git synced 2025-12-16 04:18:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added sample showing MultiProgress with BlockProgressBar

Browse Source
This commit is contained in:
Pranav Srinivas Kumar
2019-12-17 20:21:33 -06:00
parent 03000c8493
commit 8e41f2712e
6 changed files with 92 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/indicators/block_progress_bar.hpp
View File

@@ -131,7 +131,10 @@ private:
std::atomic<bool> _saved_start_time{false};
std::chrono::time_point<std::chrono::high_resolution_clock> _start_time_point;
std::mutex _mutex;
Color _foreground_color;
Color _foreground_color{indicators::Color::WHITE};
template <typename Indicator, size_t count> friend class MultiProgress;
std::atomic<bool> _multi_progress_mode{false};
std::ostream &_print_duration(std::ostream &os, std::chrono::nanoseconds ns) {
using namespace std;
@@ -162,7 +165,13 @@ private:
}
}
void _print_progress() {
void _print_progress(bool from_multi_progress = false) {
if (_multi_progress_mode && !from_multi_progress) {
if (_progress > 100.0) {
_completed = true;
}
return;
}
std::unique_lock<std::mutex> lock{_mutex};
auto now = std::chrono::high_resolution_clock::now();
auto elapsed = std::chrono::duration_cast<std::chrono::nanoseconds>(now - _start_time_point);
@@ -243,7 +252,7 @@ private:
if (_progress > 100.0) {
_completed = true;
}
if (_completed)
if (_completed && !from_multi_progress) // Don't std::endl if calling from MultiProgress
std::cout << termcolor::reset << std::endl;
}
};

2
include/indicators/multi_progress.hpp
View File

@@ -31,7 +31,7 @@ SOFTWARE.
namespace indicators {
template <typename Indicator, size_t count> class MultiProgress {
template <typename Indicator, size_t count> class MultiProgress {
public:
void add_progress_bar(Indicator &bar) {
_bars.push_back(bar);

6
include/indicators/progress_bar.hpp
View File

@@ -179,8 +179,8 @@ private:
}
}
void _print_progress(bool force = false) {
if (_multi_progress_mode && !force) {
void _print_progress(bool from_multi_progress = false) {
if (_multi_progress_mode && !from_multi_progress) {
if (_progress > 100.0) {
_completed = true;
}
@@ -260,7 +260,7 @@ private:
if (_progress > 100.0) {
_completed = true;
}
if (_completed && !force)
if (_completed && !from_multi_progress) // Don't std::endl if calling from MultiProgress
std::cout << termcolor::reset << std::endl;
}
};