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 explicit constructor for MultiProgress to remove insert API

Browse Source
This commit is contained in:
Pranav Srinivas Kumar
2019-12-18 11:51:58 -06:00
parent 2694badc93
commit 222a8ae4f9
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/indicators/multi_progress.hpp
View File

@@ -36,29 +36,36 @@ namespace indicators {
template <typename Indicator, size_t count> class MultiProgress { template <typename Indicator, size_t count> class MultiProgress {
public: public:
MultiProgress() { _bars.reserve(count); }
template <size_t index> template <typename... Indicators,
typename std::enable_if<(index < count), void>::type insert(Indicator &bar) { typename = typename std::enable_if<(sizeof...(Indicators) == count)>::type
_bars.insert(_bars.begin() + index, 1, bar); >
bar._multi_progress_mode = true; explicit MultiProgress(Indicators&... bars) {
_bars = {bars...};
} }
template <size_t index> template <size_t index>
typename std::enable_if<(index < count), void>::type set_progress(float value) { typename std::enable_if<(index >=0 && index < count), void>::type set_progress(float value) {
{
std::unique_lock<std::mutex> lock{_mutex};
if (!_bars[index].get().is_completed()) if (!_bars[index].get().is_completed())
_bars[index].get().set_progress(value); _bars[index].get().set_progress(value);
}
_print_progress(); _print_progress();
} }
template <size_t index> typename std::enable_if<(index < count), void>::type tick() { template <size_t index> typename std::enable_if<(index >=0 && index < count), void>::type tick() {
{
std::unique_lock<std::mutex> lock{_mutex};
if (!_bars[index].get().is_completed()) if (!_bars[index].get().is_completed())
_bars[index].get().tick(); _bars[index].get().tick();
}
_print_progress(); _print_progress();
} }
template <size_t index> template <size_t index>
typename std::enable_if<(index < count), bool>::type is_completed() const { typename std::enable_if<(index >=0 && index < count), bool>::type is_completed() {
std::unique_lock<std::mutex> lock{_mutex};
return _bars[index].get().is_completed(); return _bars[index].get().is_completed();
} }

5
samples/multi_block_progress_bar.cpp
View File

@@ -24,10 +24,7 @@ int main() {
bar3.show_remaining_time(); bar3.show_remaining_time();
bar3.set_prefix_text("Progress Bar #3 "); bar3.set_prefix_text("Progress Bar #3 ");
indicators::MultiProgress<indicators::BlockProgressBar, 3> bars; indicators::MultiProgress<indicators::BlockProgressBar, 3> bars(bar1, bar2, bar3);
bars.insert<0>(bar1);
bars.insert<1>(bar2);
bars.insert<2>(bar3);
std::cout << "Multiple Progress Bars:\n"; std::cout << "Multiple Progress Bars:\n";

5
samples/multi_progress_bar.cpp
View File

@@ -39,10 +39,7 @@ int main() {
bar3.show_remaining_time(); bar3.show_remaining_time();
bar3.set_prefix_text("Progress Bar #3 "); bar3.set_prefix_text("Progress Bar #3 ");
indicators::MultiProgress<indicators::ProgressBar, 3> bars; indicators::MultiProgress<indicators::ProgressBar, 3> bars(bar1, bar2, bar3);
bars.insert<0>(bar1);
bars.insert<1>(bar2);
bars.insert<2>(bar3);
std::cout << "Multiple Progress Bars:\n"; std::cout << "Multiple Progress Bars:\n";