mirror of
https://github.com/p-ranav/indicators.git
synced 2025-12-16 04:18:51 +08:00
Compare commits
26 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
74674154f5 | ||
|
|
c42ae6862e | ||
|
|
1e45ef3530 | ||
|
|
d5a1c9a440 | ||
|
|
8c37f2f1dc | ||
|
|
aa5dffa4e2 | ||
|
|
78b7abcfbd | ||
|
|
fdad265e99 | ||
|
|
f28ab68c60 | ||
|
|
6224a46371 | ||
|
|
8198d8a802 | ||
|
|
5360fec641 | ||
|
|
c770704697 | ||
|
|
97c89284a9 | ||
|
|
24d92beaca | ||
|
|
fe38859715 | ||
|
|
ab63e2c45b | ||
|
|
9d951f5e82 | ||
|
|
36ec8bb4d2 | ||
|
|
094f25e012 | ||
|
|
e9feed8aa1 | ||
|
|
2b67c02ba6 | ||
|
|
4c9ed35080 | ||
|
|
5f35000071 | ||
|
|
fb2d9bddbe | ||
|
|
e7d0135316 |
@@ -1,6 +1,8 @@
|
|||||||
cmake_minimum_required(VERSION 3.8)
|
cmake_minimum_required(VERSION 3.8)
|
||||||
project(indica VERSION 1.0.0 LANGUAGES CXX)
|
project(indica VERSION 1.0.0 LANGUAGES CXX)
|
||||||
option(INDICA_BUILD_TESTS OFF)
|
option(INDICA_BUILD_TESTS OFF)
|
||||||
|
option(SAMPLES "Build Samples" OFF)
|
||||||
|
option(DEMO "Build Demo" OFF)
|
||||||
|
|
||||||
include(CMakePackageConfigHelpers)
|
include(CMakePackageConfigHelpers)
|
||||||
include(GNUInstallDirs)
|
include(GNUInstallDirs)
|
||||||
@@ -16,6 +18,15 @@ target_include_directories(indica INTERFACE
|
|||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>)
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>)
|
||||||
target_link_libraries(indica INTERFACE Threads::Threads)
|
target_link_libraries(indica INTERFACE Threads::Threads)
|
||||||
|
|
||||||
|
|
||||||
|
if( DEMO )
|
||||||
|
add_subdirectory(demo)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if( SAMPLES )
|
||||||
|
add_subdirectory(samples)
|
||||||
|
endif()
|
||||||
|
|
||||||
configure_package_config_file(indicaConfig.cmake.in
|
configure_package_config_file(indicaConfig.cmake.in
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/indicaConfig.cmake
|
${CMAKE_CURRENT_BINARY_DIR}/indicaConfig.cmake
|
||||||
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/indica)
|
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/indica)
|
||||||
|
|||||||
103
README.md
103
README.md
@@ -6,7 +6,7 @@
|
|||||||
<a href="https://github.com/p-ranav/indicators/blob/master/LICENSE">
|
<a href="https://github.com/p-ranav/indicators/blob/master/LICENSE">
|
||||||
<img src="https://img.shields.io/badge/License-MIT-yellow.svg" alt="license"/>
|
<img src="https://img.shields.io/badge/License-MIT-yellow.svg" alt="license"/>
|
||||||
</a>
|
</a>
|
||||||
<img src="https://img.shields.io/badge/version-1.0-blue.svg?cacheSeconds=2592000" alt="version"/>
|
<img src="https://img.shields.io/badge/version-1.1-blue.svg?cacheSeconds=2592000" alt="version"/>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
# Highlights
|
# Highlights
|
||||||
|
|
||||||
* Thread-safe `ProgressBar` and `ProgressSpinner` classes
|
* Thread-safe progress bars and spinners
|
||||||
* Header-only library. Grab a copy of `include/indicators`
|
* Header-only library. Grab a copy of `include/indicators`
|
||||||
* Source for the above GIF can be found [here](demo/demo.cpp)
|
* Source for the above GIF can be found [here](demo/demo.cpp)
|
||||||
* MIT License
|
* MIT License
|
||||||
@@ -27,24 +27,6 @@ To introduce a progress bar in your application, include `indicators/progress_ba
|
|||||||
```cpp
|
```cpp
|
||||||
#include <indicators/progress_bar.hpp>
|
#include <indicators/progress_bar.hpp>
|
||||||
|
|
||||||
int main() {
|
|
||||||
indicators::ProgressBar bar;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Here's the general structure of a progress bar:
|
|
||||||
|
|
||||||
```
|
|
||||||
<prefix_text> <bar_start> <fill> <lead> <remaining> <bar_end> <progress_percentage>? <postfix_text>
|
|
||||||
^^^^^^^^^^^^^^^^^^ Bar Width ^^^^^^^^^^^^^^^^^^ ^^^^^ Show/Hide ^^^^^
|
|
||||||
```
|
|
||||||
|
|
||||||
Each of these elements (and more) can be configured using the ProgressBar API. Here's an example configuration:
|
|
||||||
|
|
||||||
```cpp
|
|
||||||
#include <indicators/progress_bar.hpp>
|
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
indicators::ProgressBar bar;
|
indicators::ProgressBar bar;
|
||||||
|
|
||||||
@@ -64,7 +46,14 @@ int main() {
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
Now that the bar is configured, let's update the state of the bar. The amount of progress in ProgressBar is maintained as a float in range `[0, 100]`. When progress reaches 100, the progression is complete.
|
Here's the general structure of a progress bar:
|
||||||
|
|
||||||
|
```
|
||||||
|
{prefix} {start} {fill} {lead} {remaining} {end} {percentage} [{elapsed}<{remaining}?] {postfix}
|
||||||
|
^^^^^^^^^^^^^ Bar Width ^^^^^^^^^^^^^^^
|
||||||
|
```
|
||||||
|
|
||||||
|
The amount of progress in ProgressBar is maintained as a float in range `[0, 100]`. When progress reaches 100, the progression is complete.
|
||||||
|
|
||||||
From application-level code, there are two ways in which you can update this progress:
|
From application-level code, there are two ways in which you can update this progress:
|
||||||
|
|
||||||
@@ -217,12 +206,57 @@ int main() {
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
# Smooth Block Progress Bar
|
## Showing Time Elapsed/Remaining
|
||||||
|
|
||||||
|
All progress bars and spinners in `indicators` support showing time elapsed and time remaining. Inspired by python's [tqdm](https://github.com/tqdm/tqdm) module, the format of this meter is `[{elapsed}<{remaining}]`:
|
||||||
|
|
||||||
|
<p align="center">
|
||||||
|
<img src="img/time_meter.gif"/>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
```cpp
|
||||||
|
#include <chrono>
|
||||||
|
#include <indicators/progress_bar.hpp>
|
||||||
|
#include <thread>
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
indicators::ProgressBar bar;
|
||||||
|
|
||||||
|
// Configure the bar
|
||||||
|
bar.set_bar_width(50);
|
||||||
|
bar.start_bar_with(" [");
|
||||||
|
bar.fill_bar_progress_with("█");
|
||||||
|
bar.lead_bar_progress_with("█");
|
||||||
|
bar.fill_bar_remainder_with("-");
|
||||||
|
bar.end_bar_with("]");
|
||||||
|
bar.set_prefix_text("Training Gaze Network 👀");
|
||||||
|
bar.set_foreground_color(indicators::Color::YELLOW);
|
||||||
|
|
||||||
|
// Show time elapsed and remaining
|
||||||
|
bar.show_elapsed_time();
|
||||||
|
bar.show_remaining_time();
|
||||||
|
|
||||||
|
// Update bar state
|
||||||
|
while (true) {
|
||||||
|
bar.tick();
|
||||||
|
if (bar.is_completed())
|
||||||
|
break;
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(1000));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show cursor
|
||||||
|
std::cout << "\e[?25h";
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
# Block Progress Bar
|
||||||
|
|
||||||
Are you in need of a smooth block progress bar using [unicode block elements](https://en.wikipedia.org/wiki/Block_Elements)? Use `BlockProgressBar` instead of `ProgressBar`. Thanks to [this blog post](https://mike42.me/blog/2018-06-make-better-cli-progress-bars-with-unicode-block-characters) for making `BlockProgressBar` an easy addition to the library.
|
Are you in need of a smooth block progress bar using [unicode block elements](https://en.wikipedia.org/wiki/Block_Elements)? Use `BlockProgressBar` instead of `ProgressBar`. Thanks to [this blog post](https://mike42.me/blog/2018-06-make-better-cli-progress-bars-with-unicode-block-characters) for making `BlockProgressBar` an easy addition to the library.
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<img height="70" src="img/block_progress_bar.gif"/>
|
<img src="img/block_progress_bar.gif"/>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
```cpp
|
```cpp
|
||||||
@@ -267,23 +301,6 @@ To introduce a progress spinner in your application, include `indicators/progres
|
|||||||
```cpp
|
```cpp
|
||||||
#include <indicators/progress_spinner.hpp>
|
#include <indicators/progress_spinner.hpp>
|
||||||
|
|
||||||
int main() {
|
|
||||||
indicators::ProgressSpinner spinner;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Here's the general structure of a progress spinner:
|
|
||||||
|
|
||||||
```
|
|
||||||
<prefix_text> <spinner> <progress_percentage>? <postfix_text>
|
|
||||||
```
|
|
||||||
|
|
||||||
Each of these elements (and more) can be configured using the ProgressSpinner API. Here's an example configuration:
|
|
||||||
|
|
||||||
```cpp
|
|
||||||
#include <indicators/progress_spinner.hpp>
|
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
indicators::ProgressSpinner spinner;
|
indicators::ProgressSpinner spinner;
|
||||||
|
|
||||||
@@ -299,6 +316,12 @@ int main() {
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Here's the general structure of a progress spinner:
|
||||||
|
|
||||||
|
```
|
||||||
|
{prefix} {spinner} {percentage} [{elapsed}<{remaining}] {postfix}
|
||||||
|
```
|
||||||
|
|
||||||
ProgressSpinner has a vector of strings: `spinner_states`. At each update, the spinner will pick the next string from this sequence to print to the console. The spinner state can be updated similarly to ProgressBars: Using either `tick()` or `set_progress(value)`.
|
ProgressSpinner has a vector of strings: `spinner_states`. At each update, the spinner will pick the next string from this sequence to print to the console. The spinner state can be updated similarly to ProgressBars: Using either `tick()` or `set_progress(value)`.
|
||||||
|
|
||||||
```cpp
|
```cpp
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
find ./include ./demo/ -type f \( -iname \*.cpp -o -iname \*.hpp \) | xargs clang-format -style="{ColumnLimit : 100}" -i
|
find ./include ./demo/ ./samples/ -type f \( -iname \*.cpp -o -iname \*.hpp \) | xargs clang-format -style="{ColumnLimit : 100}" -i
|
||||||
|
|||||||
2
demo/CMakeLists.txt
Normal file
2
demo/CMakeLists.txt
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
add_executable(demo demo.cpp)
|
||||||
|
target_link_libraries(demo PRIVATE indica::indica)
|
||||||
BIN
img/progress_spinner.gif
Normal file
BIN
img/progress_spinner.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 66 KiB |
BIN
img/time_meter.gif
Normal file
BIN
img/time_meter.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
@@ -27,13 +27,15 @@ SOFTWARE.
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
|
#include <chrono>
|
||||||
|
#include <cmath>
|
||||||
#include <indicators/color.hpp>
|
#include <indicators/color.hpp>
|
||||||
|
#include <iomanip>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <cmath>
|
|
||||||
|
|
||||||
namespace indicators {
|
namespace indicators {
|
||||||
|
|
||||||
@@ -75,11 +77,20 @@ public:
|
|||||||
|
|
||||||
void hide_percentage() { _show_percentage = false; }
|
void hide_percentage() { _show_percentage = false; }
|
||||||
|
|
||||||
|
void show_elapsed_time() { _show_elapsed_time = true; }
|
||||||
|
|
||||||
|
void hide_elapsed_time() { _show_elapsed_time = false; }
|
||||||
|
|
||||||
|
void show_remaining_time() { _show_remaining_time = true; }
|
||||||
|
|
||||||
|
void hide_remaining_time() { _show_remaining_time = 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};
|
||||||
_progress = value;
|
_progress = value;
|
||||||
}
|
}
|
||||||
|
_save_start_time();
|
||||||
_print_progress();
|
_print_progress();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -88,12 +99,11 @@ public:
|
|||||||
std::unique_lock<std::mutex> lock{_mutex};
|
std::unique_lock<std::mutex> lock{_mutex};
|
||||||
_progress += 1;
|
_progress += 1;
|
||||||
}
|
}
|
||||||
|
_save_start_time();
|
||||||
_print_progress();
|
_print_progress();
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t current() {
|
size_t current() { return std::min(static_cast<size_t>(_progress), size_t(100)); }
|
||||||
return std::min(static_cast<size_t>(_progress), size_t(100));
|
|
||||||
}
|
|
||||||
|
|
||||||
bool is_completed() const { return _completed; }
|
bool is_completed() const { return _completed; }
|
||||||
|
|
||||||
@@ -115,11 +125,47 @@ private:
|
|||||||
std::atomic<size_t> _max_postfix_text_length{0};
|
std::atomic<size_t> _max_postfix_text_length{0};
|
||||||
std::atomic<bool> _completed{false};
|
std::atomic<bool> _completed{false};
|
||||||
std::atomic<bool> _show_percentage{true};
|
std::atomic<bool> _show_percentage{true};
|
||||||
|
std::atomic<bool> _show_elapsed_time{false};
|
||||||
|
std::atomic<bool> _show_remaining_time{false};
|
||||||
|
std::atomic<bool> _saved_start_time{false};
|
||||||
|
std::chrono::time_point<std::chrono::high_resolution_clock> _start_time_point;
|
||||||
std::mutex _mutex;
|
std::mutex _mutex;
|
||||||
Color _foreground_color;
|
Color _foreground_color;
|
||||||
|
|
||||||
|
std::ostream &_print_duration(std::ostream &os, std::chrono::nanoseconds ns) {
|
||||||
|
using namespace std;
|
||||||
|
using namespace std::chrono;
|
||||||
|
typedef duration<int, ratio<86400>> days;
|
||||||
|
char fill = os.fill();
|
||||||
|
os.fill('0');
|
||||||
|
auto d = duration_cast<days>(ns);
|
||||||
|
ns -= d;
|
||||||
|
auto h = duration_cast<hours>(ns);
|
||||||
|
ns -= h;
|
||||||
|
auto m = duration_cast<minutes>(ns);
|
||||||
|
ns -= m;
|
||||||
|
auto s = duration_cast<seconds>(ns);
|
||||||
|
if (d.count() > 0)
|
||||||
|
os << setw(2) << d.count() << "d:";
|
||||||
|
if (h.count() > 0)
|
||||||
|
os << setw(2) << h.count() << "h:";
|
||||||
|
os << setw(2) << m.count() << "m:" << setw(2) << s.count() << 's';
|
||||||
|
os.fill(fill);
|
||||||
|
return os;
|
||||||
|
};
|
||||||
|
|
||||||
|
void _save_start_time() {
|
||||||
|
if ((_show_elapsed_time || _show_remaining_time) && !_saved_start_time) {
|
||||||
|
_start_time_point = std::chrono::high_resolution_clock::now();
|
||||||
|
_saved_start_time = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void _print_progress() {
|
void _print_progress() {
|
||||||
std::unique_lock<std::mutex> lock{_mutex};
|
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);
|
||||||
|
|
||||||
std::cout << termcolor::bold;
|
std::cout << termcolor::bold;
|
||||||
switch (_foreground_color) {
|
switch (_foreground_color) {
|
||||||
case Color::GREY:
|
case Color::GREY:
|
||||||
@@ -168,6 +214,24 @@ private:
|
|||||||
if (_show_percentage) {
|
if (_show_percentage) {
|
||||||
std::cout << " " << std::min(static_cast<size_t>(_progress), size_t(100)) << "%";
|
std::cout << " " << std::min(static_cast<size_t>(_progress), size_t(100)) << "%";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_show_elapsed_time) {
|
||||||
|
std::cout << " [";
|
||||||
|
_print_duration(std::cout, elapsed);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_show_remaining_time) {
|
||||||
|
if (_show_elapsed_time)
|
||||||
|
std::cout << "<";
|
||||||
|
else
|
||||||
|
std::cout << " [";
|
||||||
|
auto eta = std::chrono::nanoseconds(
|
||||||
|
_progress > 0 ? static_cast<long long>(elapsed.count() * 100 / _progress) : 0);
|
||||||
|
auto remaining = eta > elapsed ? (eta - elapsed) : (elapsed - eta);
|
||||||
|
_print_duration(std::cout, remaining);
|
||||||
|
std::cout << "]";
|
||||||
|
}
|
||||||
|
|
||||||
if (_max_postfix_text_length == 0)
|
if (_max_postfix_text_length == 0)
|
||||||
_max_postfix_text_length = 10;
|
_max_postfix_text_length = 10;
|
||||||
std::cout << " " << _postfix_text << std::string(_max_postfix_text_length, ' ') << "\r";
|
std::cout << " " << _postfix_text << std::string(_max_postfix_text_length, ' ') << "\r";
|
||||||
|
|||||||
@@ -27,7 +27,10 @@ SOFTWARE.
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
|
#include <chrono>
|
||||||
|
#include <cmath>
|
||||||
#include <indicators/color.hpp>
|
#include <indicators/color.hpp>
|
||||||
|
#include <iomanip>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <string>
|
#include <string>
|
||||||
@@ -88,11 +91,20 @@ public:
|
|||||||
|
|
||||||
void hide_percentage() { _show_percentage = false; }
|
void hide_percentage() { _show_percentage = false; }
|
||||||
|
|
||||||
|
void show_elapsed_time() { _show_elapsed_time = true; }
|
||||||
|
|
||||||
|
void hide_elapsed_time() { _show_elapsed_time = false; }
|
||||||
|
|
||||||
|
void show_remaining_time() { _show_remaining_time = true; }
|
||||||
|
|
||||||
|
void hide_remaining_time() { _show_remaining_time = 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};
|
||||||
_progress = value;
|
_progress = value;
|
||||||
}
|
}
|
||||||
|
_save_start_time();
|
||||||
_print_progress();
|
_print_progress();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -101,12 +113,11 @@ public:
|
|||||||
std::unique_lock<std::mutex> lock{_mutex};
|
std::unique_lock<std::mutex> lock{_mutex};
|
||||||
_progress += 1;
|
_progress += 1;
|
||||||
}
|
}
|
||||||
|
_save_start_time();
|
||||||
_print_progress();
|
_print_progress();
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t current() {
|
size_t current() { return std::min(static_cast<size_t>(_progress), size_t(100)); }
|
||||||
return std::min(static_cast<size_t>(_progress), size_t(100));
|
|
||||||
}
|
|
||||||
|
|
||||||
bool is_completed() const { return _completed; }
|
bool is_completed() const { return _completed; }
|
||||||
|
|
||||||
@@ -128,11 +139,47 @@ private:
|
|||||||
std::atomic<size_t> _max_postfix_text_length{0};
|
std::atomic<size_t> _max_postfix_text_length{0};
|
||||||
std::atomic<bool> _completed{false};
|
std::atomic<bool> _completed{false};
|
||||||
std::atomic<bool> _show_percentage{true};
|
std::atomic<bool> _show_percentage{true};
|
||||||
|
std::atomic<bool> _show_elapsed_time{false};
|
||||||
|
std::atomic<bool> _show_remaining_time{false};
|
||||||
|
std::atomic<bool> _saved_start_time{false};
|
||||||
|
std::chrono::time_point<std::chrono::high_resolution_clock> _start_time_point;
|
||||||
std::mutex _mutex;
|
std::mutex _mutex;
|
||||||
Color _foreground_color;
|
Color _foreground_color;
|
||||||
|
|
||||||
|
std::ostream &_print_duration(std::ostream &os, std::chrono::nanoseconds ns) {
|
||||||
|
using namespace std;
|
||||||
|
using namespace std::chrono;
|
||||||
|
typedef duration<int, ratio<86400>> days;
|
||||||
|
char fill = os.fill();
|
||||||
|
os.fill('0');
|
||||||
|
auto d = duration_cast<days>(ns);
|
||||||
|
ns -= d;
|
||||||
|
auto h = duration_cast<hours>(ns);
|
||||||
|
ns -= h;
|
||||||
|
auto m = duration_cast<minutes>(ns);
|
||||||
|
ns -= m;
|
||||||
|
auto s = duration_cast<seconds>(ns);
|
||||||
|
if (d.count() > 0)
|
||||||
|
os << setw(2) << d.count() << "d:";
|
||||||
|
if (h.count() > 0)
|
||||||
|
os << setw(2) << h.count() << "h:";
|
||||||
|
os << setw(2) << m.count() << "m:" << setw(2) << s.count() << 's';
|
||||||
|
os.fill(fill);
|
||||||
|
return os;
|
||||||
|
};
|
||||||
|
|
||||||
|
void _save_start_time() {
|
||||||
|
if ((_show_elapsed_time || _show_remaining_time) && !_saved_start_time) {
|
||||||
|
_start_time_point = std::chrono::high_resolution_clock::now();
|
||||||
|
_saved_start_time = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void _print_progress() {
|
void _print_progress() {
|
||||||
std::unique_lock<std::mutex> lock{_mutex};
|
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);
|
||||||
|
|
||||||
std::cout << termcolor::bold;
|
std::cout << termcolor::bold;
|
||||||
switch (_foreground_color) {
|
switch (_foreground_color) {
|
||||||
case Color::GREY:
|
case Color::GREY:
|
||||||
@@ -175,6 +222,24 @@ private:
|
|||||||
if (_show_percentage) {
|
if (_show_percentage) {
|
||||||
std::cout << " " << std::min(static_cast<size_t>(_progress), size_t(100)) << "%";
|
std::cout << " " << std::min(static_cast<size_t>(_progress), size_t(100)) << "%";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_show_elapsed_time) {
|
||||||
|
std::cout << " [";
|
||||||
|
_print_duration(std::cout, elapsed);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_show_remaining_time) {
|
||||||
|
if (_show_elapsed_time)
|
||||||
|
std::cout << "<";
|
||||||
|
else
|
||||||
|
std::cout << " [";
|
||||||
|
auto eta = std::chrono::nanoseconds(
|
||||||
|
_progress > 0 ? static_cast<long long>(elapsed.count() * 100 / _progress) : 0);
|
||||||
|
auto remaining = eta > elapsed ? (eta - elapsed) : (elapsed - eta);
|
||||||
|
_print_duration(std::cout, remaining);
|
||||||
|
std::cout << "]";
|
||||||
|
}
|
||||||
|
|
||||||
if (_max_postfix_text_length == 0)
|
if (_max_postfix_text_length == 0)
|
||||||
_max_postfix_text_length = 10;
|
_max_postfix_text_length = 10;
|
||||||
std::cout << " " << _postfix_text << std::string(_max_postfix_text_length, ' ') << "\r";
|
std::cout << " " << _postfix_text << std::string(_max_postfix_text_length, ' ') << "\r";
|
||||||
|
|||||||
@@ -27,7 +27,10 @@ SOFTWARE.
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
|
#include <chrono>
|
||||||
|
#include <cmath>
|
||||||
#include <indicators/color.hpp>
|
#include <indicators/color.hpp>
|
||||||
|
#include <iomanip>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <string>
|
#include <string>
|
||||||
@@ -59,6 +62,14 @@ public:
|
|||||||
|
|
||||||
void hide_percentage() { _show_percentage = false; }
|
void hide_percentage() { _show_percentage = false; }
|
||||||
|
|
||||||
|
void show_elapsed_time() { _show_elapsed_time = true; }
|
||||||
|
|
||||||
|
void hide_elapsed_time() { _show_elapsed_time = false; }
|
||||||
|
|
||||||
|
void show_remaining_time() { _show_remaining_time = true; }
|
||||||
|
|
||||||
|
void hide_remaining_time() { _show_remaining_time = false; }
|
||||||
|
|
||||||
void show_spinner() { _show_spinner = true; }
|
void show_spinner() { _show_spinner = true; }
|
||||||
|
|
||||||
void hide_spinner() { _show_spinner = false; }
|
void hide_spinner() { _show_spinner = false; }
|
||||||
@@ -68,6 +79,7 @@ public:
|
|||||||
std::unique_lock<std::mutex> lock{_mutex};
|
std::unique_lock<std::mutex> lock{_mutex};
|
||||||
_progress = value;
|
_progress = value;
|
||||||
}
|
}
|
||||||
|
_save_start_time();
|
||||||
_print_progress();
|
_print_progress();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,12 +88,11 @@ public:
|
|||||||
std::unique_lock<std::mutex> lock{_mutex};
|
std::unique_lock<std::mutex> lock{_mutex};
|
||||||
_progress += 1;
|
_progress += 1;
|
||||||
}
|
}
|
||||||
|
_save_start_time();
|
||||||
_print_progress();
|
_print_progress();
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t current() {
|
size_t current() { return std::min(static_cast<size_t>(_progress), size_t(100)); }
|
||||||
return std::min(static_cast<size_t>(_progress), size_t(100));
|
|
||||||
}
|
|
||||||
|
|
||||||
bool is_completed() const { return _completed; }
|
bool is_completed() const { return _completed; }
|
||||||
|
|
||||||
@@ -104,12 +115,48 @@ private:
|
|||||||
std::atomic<size_t> _max_postfix_text_length{0};
|
std::atomic<size_t> _max_postfix_text_length{0};
|
||||||
std::atomic<bool> _completed{false};
|
std::atomic<bool> _completed{false};
|
||||||
std::atomic<bool> _show_percentage{true};
|
std::atomic<bool> _show_percentage{true};
|
||||||
|
std::atomic<bool> _show_elapsed_time{false};
|
||||||
|
std::atomic<bool> _show_remaining_time{false};
|
||||||
|
std::atomic<bool> _saved_start_time{false};
|
||||||
|
std::chrono::time_point<std::chrono::high_resolution_clock> _start_time_point;
|
||||||
std::atomic<bool> _show_spinner{true};
|
std::atomic<bool> _show_spinner{true};
|
||||||
std::mutex _mutex;
|
std::mutex _mutex;
|
||||||
Color _foreground_color;
|
Color _foreground_color;
|
||||||
|
|
||||||
|
std::ostream &_print_duration(std::ostream &os, std::chrono::nanoseconds ns) {
|
||||||
|
using namespace std;
|
||||||
|
using namespace std::chrono;
|
||||||
|
typedef duration<int, ratio<86400>> days;
|
||||||
|
char fill = os.fill();
|
||||||
|
os.fill('0');
|
||||||
|
auto d = duration_cast<days>(ns);
|
||||||
|
ns -= d;
|
||||||
|
auto h = duration_cast<hours>(ns);
|
||||||
|
ns -= h;
|
||||||
|
auto m = duration_cast<minutes>(ns);
|
||||||
|
ns -= m;
|
||||||
|
auto s = duration_cast<seconds>(ns);
|
||||||
|
if (d.count() > 0)
|
||||||
|
os << setw(2) << d.count() << "d:";
|
||||||
|
if (h.count() > 0)
|
||||||
|
os << setw(2) << h.count() << "h:";
|
||||||
|
os << setw(2) << m.count() << "m:" << setw(2) << s.count() << 's';
|
||||||
|
os.fill(fill);
|
||||||
|
return os;
|
||||||
|
};
|
||||||
|
|
||||||
|
void _save_start_time() {
|
||||||
|
if ((_show_elapsed_time || _show_remaining_time) && !_saved_start_time) {
|
||||||
|
_start_time_point = std::chrono::high_resolution_clock::now();
|
||||||
|
_saved_start_time = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void _print_progress() {
|
void _print_progress() {
|
||||||
std::unique_lock<std::mutex> lock{_mutex};
|
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);
|
||||||
|
|
||||||
std::cout << termcolor::bold;
|
std::cout << termcolor::bold;
|
||||||
switch (_foreground_color) {
|
switch (_foreground_color) {
|
||||||
case Color::GREY:
|
case Color::GREY:
|
||||||
@@ -143,6 +190,24 @@ private:
|
|||||||
if (_show_percentage) {
|
if (_show_percentage) {
|
||||||
std::cout << " " << std::min(static_cast<size_t>(_progress), size_t(100)) << "%";
|
std::cout << " " << std::min(static_cast<size_t>(_progress), size_t(100)) << "%";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_show_elapsed_time) {
|
||||||
|
std::cout << " [";
|
||||||
|
_print_duration(std::cout, elapsed);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_show_remaining_time) {
|
||||||
|
if (_show_elapsed_time)
|
||||||
|
std::cout << "<";
|
||||||
|
else
|
||||||
|
std::cout << " [";
|
||||||
|
auto eta = std::chrono::nanoseconds(
|
||||||
|
_progress > 0 ? static_cast<long long>(elapsed.count() * 100 / _progress) : 0);
|
||||||
|
auto remaining = eta > elapsed ? (eta - elapsed) : (elapsed - eta);
|
||||||
|
_print_duration(std::cout, remaining);
|
||||||
|
std::cout << "]";
|
||||||
|
}
|
||||||
|
|
||||||
if (_max_postfix_text_length == 0)
|
if (_max_postfix_text_length == 0)
|
||||||
_max_postfix_text_length = 10;
|
_max_postfix_text_length = 10;
|
||||||
std::cout << " " << _postfix_text << std::string(_max_postfix_text_length, ' ') << "\r";
|
std::cout << " " << _postfix_text << std::string(_max_postfix_text_length, ' ') << "\r";
|
||||||
|
|||||||
18
samples/CMakeLists.txt
Normal file
18
samples/CMakeLists.txt
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
|
||||||
|
add_executable(block_progress_bar block_progress_bar.cpp)
|
||||||
|
target_link_libraries(block_progress_bar PRIVATE indica::indica)
|
||||||
|
|
||||||
|
add_executable(multi_threaded_bar multi_threaded_bar.cpp)
|
||||||
|
target_link_libraries(multi_threaded_bar PRIVATE indica::indica)
|
||||||
|
|
||||||
|
add_executable(progress_bar_set_progress progress_bar_set_progress.cpp)
|
||||||
|
target_link_libraries(progress_bar_set_progress PRIVATE indica::indica)
|
||||||
|
|
||||||
|
add_executable(progress_bar_tick progress_bar_tick.cpp)
|
||||||
|
target_link_libraries(progress_bar_tick PRIVATE indica::indica)
|
||||||
|
|
||||||
|
add_executable(progress_spinner progress_spinner.cpp)
|
||||||
|
target_link_libraries(progress_spinner PRIVATE indica::indica)
|
||||||
|
|
||||||
|
add_executable(time_meter time_meter.cpp)
|
||||||
|
target_link_libraries(time_meter PRIVATE indica::indica)
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
|
#include <chrono>
|
||||||
#include <indicators/block_progress_bar.hpp>
|
#include <indicators/block_progress_bar.hpp>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
#include <chrono>
|
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
|
|
||||||
|
|||||||
60
samples/multi_threaded_bar.cpp
Normal file
60
samples/multi_threaded_bar.cpp
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
#include <indicators/progress_bar.hpp>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
|
||||||
|
indicators::ProgressBar bar;
|
||||||
|
bar.set_bar_width(50);
|
||||||
|
bar.start_bar_with("[");
|
||||||
|
bar.fill_bar_progress_with("■");
|
||||||
|
bar.lead_bar_progress_with("■");
|
||||||
|
bar.fill_bar_remainder_with("-");
|
||||||
|
bar.end_bar_with("]");
|
||||||
|
bar.set_foreground_color(indicators::Color::YELLOW);
|
||||||
|
|
||||||
|
// As configured, the bar will look like this:
|
||||||
|
//
|
||||||
|
// [■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■-------------] 70%
|
||||||
|
//
|
||||||
|
//
|
||||||
|
|
||||||
|
std::atomic<size_t> index{0};
|
||||||
|
std::vector<std::string> status_text = {"Rocket.exe is not responding",
|
||||||
|
"Finding a replacement engineer",
|
||||||
|
"Buying more snacks",
|
||||||
|
"Assimilating the modding community",
|
||||||
|
"Crossing fingers",
|
||||||
|
"Porting KSP to a Nokia 3310"};
|
||||||
|
|
||||||
|
// Let's say you want to append some status text to the right of the progress bar
|
||||||
|
// You can use bar.set_postfix_text(...) to append text to the right
|
||||||
|
//
|
||||||
|
// [■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■-------------] 70% Finding a replacement engineer
|
||||||
|
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
//
|
||||||
|
//
|
||||||
|
|
||||||
|
auto job = [&bar, &index, &status_text]() {
|
||||||
|
while (true) {
|
||||||
|
if (bar.is_completed()) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
bar.set_postfix_text(status_text[index % status_text.size()]);
|
||||||
|
bar.tick();
|
||||||
|
index += 1;
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(200));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
std::thread first_job(job);
|
||||||
|
std::thread second_job(job);
|
||||||
|
std::thread third_job(job);
|
||||||
|
std::thread last_job(job);
|
||||||
|
|
||||||
|
first_job.join();
|
||||||
|
second_job.join();
|
||||||
|
third_job.join();
|
||||||
|
last_job.join();
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
38
samples/progress_bar_set_progress.cpp
Normal file
38
samples/progress_bar_set_progress.cpp
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
#include <chrono>
|
||||||
|
#include <indicators/progress_bar.hpp>
|
||||||
|
#include <thread>
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
indicators::ProgressBar bar;
|
||||||
|
|
||||||
|
// Configure the bar
|
||||||
|
bar.set_bar_width(50);
|
||||||
|
bar.start_bar_with("[");
|
||||||
|
bar.fill_bar_progress_with("=");
|
||||||
|
bar.lead_bar_progress_with(">");
|
||||||
|
bar.fill_bar_remainder_with(" ");
|
||||||
|
bar.end_bar_with("]");
|
||||||
|
bar.set_postfix_text("Getting started");
|
||||||
|
bar.set_foreground_color(indicators::Color::GREEN);
|
||||||
|
|
||||||
|
// Update bar state
|
||||||
|
|
||||||
|
bar.set_progress(10); // 10% done
|
||||||
|
|
||||||
|
// do some work
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(100));
|
||||||
|
|
||||||
|
bar.set_progress(30); // 30% done
|
||||||
|
|
||||||
|
// do some more work
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(600));
|
||||||
|
|
||||||
|
bar.set_progress(65); // 65% done
|
||||||
|
|
||||||
|
// do final bit of work
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(300));
|
||||||
|
|
||||||
|
bar.set_progress(100); // all done
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
27
samples/progress_bar_tick.cpp
Normal file
27
samples/progress_bar_tick.cpp
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
#include <chrono>
|
||||||
|
#include <indicators/progress_bar.hpp>
|
||||||
|
#include <thread>
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
indicators::ProgressBar bar;
|
||||||
|
|
||||||
|
// Configure the bar
|
||||||
|
bar.set_bar_width(50);
|
||||||
|
bar.start_bar_with("[");
|
||||||
|
bar.fill_bar_progress_with("=");
|
||||||
|
bar.lead_bar_progress_with(">");
|
||||||
|
bar.fill_bar_remainder_with(" ");
|
||||||
|
bar.end_bar_with("]");
|
||||||
|
bar.set_postfix_text("Getting started");
|
||||||
|
bar.set_foreground_color(indicators::Color::GREEN);
|
||||||
|
|
||||||
|
// Update bar state
|
||||||
|
while (true) {
|
||||||
|
bar.tick();
|
||||||
|
if (bar.is_completed())
|
||||||
|
break;
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(100));
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
38
samples/progress_spinner.cpp
Normal file
38
samples/progress_spinner.cpp
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
#include <indicators/progress_spinner.hpp>
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
|
||||||
|
// Hide cursor
|
||||||
|
std::cout << "\e[?25l";
|
||||||
|
|
||||||
|
indicators::ProgressSpinner spinner;
|
||||||
|
|
||||||
|
// Configure the spinner
|
||||||
|
spinner.set_postfix_text("Checking credentials");
|
||||||
|
spinner.set_foreground_color(indicators::Color::YELLOW);
|
||||||
|
spinner.set_spinner_states({"⠈", "⠐", "⠠", "⢀", "⡀", "⠄", "⠂", "⠁"});
|
||||||
|
|
||||||
|
// Update spinner state
|
||||||
|
auto job = [&spinner]() {
|
||||||
|
while (true) {
|
||||||
|
if (spinner.is_completed()) {
|
||||||
|
spinner.set_foreground_color(indicators::Color::GREEN);
|
||||||
|
spinner.set_prefix_text("✔");
|
||||||
|
spinner.hide_spinner();
|
||||||
|
spinner.hide_percentage();
|
||||||
|
spinner.set_postfix_text("Authenticated!");
|
||||||
|
spinner.mark_as_completed();
|
||||||
|
break;
|
||||||
|
} else
|
||||||
|
spinner.tick();
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(40));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
std::thread thread(job);
|
||||||
|
thread.join();
|
||||||
|
|
||||||
|
// Show cursor
|
||||||
|
std::cout << "\e[?25h";
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
34
samples/time_meter.cpp
Normal file
34
samples/time_meter.cpp
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
#include <chrono>
|
||||||
|
#include <indicators/progress_bar.hpp>
|
||||||
|
#include <thread>
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
indicators::ProgressBar bar;
|
||||||
|
|
||||||
|
// Configure the bar
|
||||||
|
bar.set_bar_width(50);
|
||||||
|
bar.start_bar_with(" [");
|
||||||
|
bar.fill_bar_progress_with("█");
|
||||||
|
bar.lead_bar_progress_with("█");
|
||||||
|
bar.fill_bar_remainder_with("-");
|
||||||
|
bar.end_bar_with("]");
|
||||||
|
bar.set_prefix_text("Training Gaze Network 👀");
|
||||||
|
bar.set_foreground_color(indicators::Color::YELLOW);
|
||||||
|
|
||||||
|
// Show time elapsed and remaining
|
||||||
|
bar.show_elapsed_time();
|
||||||
|
bar.show_remaining_time();
|
||||||
|
|
||||||
|
// Update bar state
|
||||||
|
while (true) {
|
||||||
|
bar.tick();
|
||||||
|
if (bar.is_completed())
|
||||||
|
break;
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(1000));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show cursor
|
||||||
|
std::cout << "\e[?25h";
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user