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

Minor bug fixes and updates:

Browse Source 
* Removed progress bar sample that progresses in reverse direction - This needs a class of its own
* Fixed a casting error in progress_bar class when dealing with max_progress variable
* Minor update to the cursor movement functions in linux
* Updated single include to include these changes
This commit is contained in:
Pranav Srinivas Kumar
2020-05-08 15:14:52 -05:00
parent 66af25ab62
commit 296bde6088
10 changed files with 17 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
demo/demo.cpp
View File

@@ -158,38 +158,6 @@ int main() {
thread4.join();
std::this_thread::sleep_for(std::chrono::milliseconds(100));
{
//
// GOING BACKWARDS
//
indicators::ProgressBar p{option::BarWidth{50},
option::Start{"["},
option::Fill{"■"},
option::Lead{"■"},
option::Remainder{"-"},
option::End{"]"},
option::ForegroundColor{indicators::Color::white},
option::PostfixText{"Reverting system restore"},
option::FontStyles{
std::vector<indicators::FontStyle>{indicators::FontStyle::bold}}};
p.set_progress(100); // TODO backwards as an option?
std::atomic<size_t> progress{100};
auto job = [&p, &progress]() {
while (true) {
progress -= 1;
p.set_progress(progress);
if (progress == 0) {
p.set_option(option::PostfixText{"Revert complete!"});
p.mark_as_completed();
break;
}
std::this_thread::sleep_for(std::chrono::milliseconds(60));
}
};
std::thread thread(job);
thread.join();
}
}
{

1
include/indicators/block_progress_bar.hpp
View File

@@ -183,6 +183,7 @@ private:
}
}
public:
void print_progress(bool from_multi_progress = false) {
const auto max_progress = get_value<details::ProgressBarOption::max_progress>();
if (multi_progress_mode_ && !from_multi_progress) {

8
include/indicators/cursor_movement.hpp
View File

@@ -36,10 +36,10 @@ void move_left(int cols) { move(-cols, 0); }
#else
void move_up(int lines) { std::cout << "x1b[" << lines << "A"; }
void move_down(int lines) { std::cout << "x1b[" << lines << "B"; }
void move_right(int cols) { std::cout << "x1b[" << cols << "C"; }
void move_left(int cols) { std::cout << "x1b[" << cols << "D"; }
void move_up(int lines) { std::cout << "\033[" << lines << "A"; }
void move_down(int lines) { std::cout << "\033[" << lines << "B"; }
void move_right(int cols) { std::cout << "\033[" << cols << "C"; }
void move_left(int cols) { std::cout << "\033[" << cols << "D"; }
#endif

2
include/indicators/details/stream_helper.hpp
View File

@@ -134,7 +134,7 @@ public:
const std::string &lead, const std::string &remainder)
: os(os), bar_width(bar_width), fill(fill), lead(lead), remainder(remainder) {}
std::ostream &write(size_t progress) {
std::ostream &write(float progress) {
auto pos = static_cast<size_t>(progress * bar_width / 100.0);
for (size_t i = 0; i < bar_width; ++i) {
if (i < pos)

1
include/indicators/dynamic_progress.hpp
View File

@@ -98,6 +98,7 @@ private:
return details::get_value<id>(settings_).value;
}
public:
void print_progress() {
std::lock_guard<std::mutex> lock{mutex_};
auto &hide_bar_when_complete = get_value<details::ProgressBarOption::hide_bar_when_complete>();

1
include/indicators/multi_progress.hpp
View File

@@ -85,6 +85,7 @@ private:
return result;
}
public:
void print_progress() {
std::lock_guard<std::mutex> lock{mutex_};
if (started_)

3
include/indicators/progress_bar.hpp
View File

@@ -193,6 +193,7 @@ private:
}
}
public:
void print_progress(bool from_multi_progress = false) {
std::lock_guard<std::mutex> lock{mutex_};
const auto max_progress = get_value<details::ProgressBarOption::max_progress>();
@@ -221,7 +222,7 @@ private:
get_value<details::ProgressBarOption::fill>(),
get_value<details::ProgressBarOption::lead>(),
get_value<details::ProgressBarOption::remainder>()};
writer.write(progress_ / max_progress * 100);
writer.write(double(progress_) / double(max_progress) * 100.0f);
std::cout << get_value<details::ProgressBarOption::end>();

1
include/indicators/progress_spinner.hpp
View File

@@ -182,6 +182,7 @@ private:
}
}
public:
void print_progress() {
std::lock_guard<std::mutex> lock{mutex_};
const auto max_progress = get_value<details::ProgressBarOption::max_progress>();

2
samples/progress_bar_set_progress.cpp
View File

@@ -45,8 +45,6 @@ int main() {
bar.set_progress(100); // all done
bar.mark_as_completed();
// Show cursor
indicators::show_console_cursor(true);

7
single_include/indicators/indicators.hpp
View File

@@ -626,7 +626,7 @@ public:
const std::string &lead, const std::string &remainder)
: os(os), bar_width(bar_width), fill(fill), lead(lead), remainder(remainder) {}
std::ostream &write(size_t progress) {
std::ostream &write(float progress) {
auto pos = static_cast<size_t>(progress * bar_width / 100.0);
for (size_t i = 0; i < bar_width; ++i) {
if (i < pos)
@@ -980,6 +980,7 @@ private:
}
}
public:
void print_progress(bool from_multi_progress = false) {
std::lock_guard<std::mutex> lock{mutex_};
if (multi_progress_mode_ && !from_multi_progress) {
@@ -1195,6 +1196,7 @@ private:
}
}
public:
void print_progress(bool from_multi_progress = false) {
if (multi_progress_mode_ && !from_multi_progress) {
if (progress_ > 100.0) {
@@ -1402,6 +1404,7 @@ private:
}
}
public:
void print_progress() {
std::lock_guard<std::mutex> lock{mutex_};
auto now = std::chrono::high_resolution_clock::now();
@@ -1513,6 +1516,7 @@ private:
return result;
}
public:
void print_progress() {
std::lock_guard<std::mutex> lock{mutex_};
if (started_)
@@ -1599,6 +1603,7 @@ private:
return details::get_value<id>(settings_).value;
}
public:
void print_progress() {
std::lock_guard<std::mutex> lock{mutex_};
auto &hide_bar_when_complete = get_value<details::ProgressBarOption::hide_bar_when_complete>();