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 support for marking progress as completed - Useful when breaking out early and presenting errors during progress

Browse Source
This commit is contained in:
Pranav Srinivas Kumar
2019-12-04 11:32:57 -06:00
parent e5c312f688
commit 92d9ce2e1f
2 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/progress/bar.hpp
View File

@@ -59,6 +59,8 @@ public:
void show_percentage(bool flag) { _show_percentage = flag; } void show_percentage(bool flag) { _show_percentage = flag; }
void hide_percentage() { _show_percentage = false; }
void set_progress(float value) { void set_progress(float value) {
{ {
std::unique_lock<std::mutex> lock{_mutex}; std::unique_lock<std::mutex> lock{_mutex};
@@ -82,6 +84,11 @@ public:
bool is_completed() const { return _completed; } bool is_completed() const { return _completed; }
void mark_as_completed() {
_completed = true;
_print_progress();
}
private: private:
float _progress{0.0}; float _progress{0.0};
size_t _bar_width{100}; size_t _bar_width{100};

42
samples/multiple_bars.cpp
View File

@@ -94,7 +94,7 @@ int main() {
p3.fill_bar_remainder_with(""); p3.fill_bar_remainder_with("");
p3.end_bar_with(""); p3.end_bar_with("");
p3.set_foreground_color(ProgressBar::Color::WHITE); p3.set_foreground_color(ProgressBar::Color::WHITE);
p3.show_percentage(false); p3.hide_percentage();
auto job3 = [&p3]() { auto job3 = [&p3]() {
while (true) { while (true) {
p3.set_prefix_text("Reading package list... " + std::to_string(p3.current()) + p3.set_prefix_text("Reading package list... " + std::to_string(p3.current()) +
@@ -143,30 +143,6 @@ int main() {
std::thread thread2(job2); std::thread thread2(job2);
thread2.join(); thread2.join();
//
// PROGRESS BAR 5
//
ProgressBar p5;
p5.set_bar_width(100);
p5.start_bar_with("🌏");
p5.fill_bar_progress_with("-");
p5.lead_bar_progress_with("🛸");
p5.fill_bar_remainder_with(" ");
p5.end_bar_with("🌑");
p5.show_percentage(true);
p5.set_foreground_color(ProgressBar::Color::WHITE);
auto job5 = [&p5]() {
while (true) {
p5.tick();
if (p5.is_completed()) {
break;
}
std::this_thread::sleep_for(std::chrono::milliseconds(75));
}
};
std::thread thread5(job5);
thread5.join();
// //
// PROGRESS BAR 4 // PROGRESS BAR 4
// //
@@ -179,20 +155,24 @@ int main() {
p4.lead_bar_progress_with(""); p4.lead_bar_progress_with("");
p4.fill_bar_remainder_with(" "); p4.fill_bar_remainder_with(" ");
p4.end_bar_with(" ]"); p4.end_bar_with(" ]");
p4.set_foreground_color(ProgressBar::Color::CYAN); p4.set_foreground_color(ProgressBar::Color::BLUE);
p4.set_postfix_text("Restoring system state"); p4.set_postfix_text("Restoring system state");
p4.hide_percentage();
std::atomic<size_t> index4{0}; std::atomic<size_t> index4{0};
auto job4 = [&p4, &index4, &lead_spinner]() { auto job4 = [&p4, &index4, &lead_spinner]() {
while (true) { while (true) {
p4.set_prefix_text("{ " + std::to_string(p4.current()) + "% } ");
p4.lead_bar_progress_with(lead_spinner[index4 % lead_spinner.size()]); p4.lead_bar_progress_with(lead_spinner[index4 % lead_spinner.size()]);
index4 += 1; index4 += 1;
if (p4.current() + 2 >= 100) if (p4.current() + 2 >= 100) {
p4.set_postfix_text("State restored to Restore_Point_1241531"); p4.set_foreground_color(ProgressBar::Color::RED);
p4.tick(); p4.set_prefix_text("{ FAILURE } ");
if (p4.is_completed()) { p4.set_postfix_text("Failed to restore from Restore_Point_1241531");
p4.mark_as_completed();
break; break;
} }
std::this_thread::sleep_for(std::chrono::milliseconds(50)); p4.tick();
std::this_thread::sleep_for(std::chrono::milliseconds(80));
} }
}; };
std::thread thread4(job4); std::thread thread4(job4);