matthias/clang-uml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed clang-tidy warnings

Browse Source
This commit is contained in:
Bartek Kryza
2023-06-15 21:41:22 +02:00
parent 930ffb3468
commit 8c4e48d511
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/generators/generators.h
View File

@@ -225,7 +225,7 @@ public:
const DiagramConfig &config, std::function<void()> progress) const DiagramConfig &config, std::function<void()> progress)
: diagram_{diagram} : diagram_{diagram}
, config_{config} , config_{config}
, progress_{progress} , progress_{std::move(progress)}
{ {
} }

15
src/common/generators/progress_indicator.cc
View File

@@ -32,14 +32,17 @@ void progress_indicator::add_progress_bar(
{ {
auto postfix_text = max > 0 ? fmt::format("{}/{}", 0, max) : std::string{}; auto postfix_text = max > 0 ? fmt::format("{}/{}", 0, max) : std::string{};
const auto kBarWidth = 35U;
const auto kPrefixTextWidth = 25U;
auto bar = std::make_shared<indicators::ProgressBar>( auto bar = std::make_shared<indicators::ProgressBar>(
indicators::option::BarWidth{34}, indicators::option::BarWidth{kBarWidth},
indicators::option::ForegroundColor{color}, indicators::option::ForegroundColor{color},
indicators::option::ShowElapsedTime{true}, indicators::option::ShowElapsedTime{true},
indicators::option::Fill{"█"}, indicators::option::Lead{"█"}, indicators::option::Fill{"█"}, indicators::option::Lead{"█"},
indicators::option::Remainder{"-"}, indicators::option::Remainder{"-"},
indicators::option::PrefixText{ indicators::option::PrefixText{
fmt::format("{:<25}", util::abbreviate(name, 25))}, fmt::format("{:<25}", util::abbreviate(name, kPrefixTextWidth))},
indicators::option::PostfixText{postfix_text}); indicators::option::PostfixText{postfix_text});
progress_bars_mutex_.lock(); progress_bars_mutex_.lock();
@@ -55,6 +58,8 @@ void progress_indicator::add_progress_bar(
void progress_indicator::increment(const std::string &name) void progress_indicator::increment(const std::string &name)
{ {
const auto kASTTraverseProgressPercent = 95U;
progress_bars_mutex_.lock(); progress_bars_mutex_.lock();
if (progress_bar_index_.count(name) == 0) { if (progress_bar_index_.count(name) == 0) {
@@ -67,7 +72,7 @@ void progress_indicator::increment(const std::string &name)
progress_bars_mutex_.unlock(); progress_bars_mutex_.unlock();
p.progress++; p.progress++;
bar.set_progress((p.progress * 95) / p.max); bar.set_progress((p.progress * kASTTraverseProgressPercent) / p.max);
bar.set_option(indicators::option::PostfixText{ bar.set_option(indicators::option::PostfixText{
fmt::format("{}/{}", p.progress, p.max)}); fmt::format("{}/{}", p.progress, p.max)});
} }
@@ -85,6 +90,8 @@ void progress_indicator::stop()
void progress_indicator::complete(const std::string &name) void progress_indicator::complete(const std::string &name)
{ {
const auto kCompleteProgressPercent = 100U;
progress_bars_mutex_.lock(); progress_bars_mutex_.lock();
if (progress_bar_index_.count(name) == 0) { if (progress_bar_index_.count(name) == 0) {
@@ -96,7 +103,7 @@ void progress_indicator::complete(const std::string &name)
auto &bar = progress_bars_[p.index]; auto &bar = progress_bars_[p.index];
progress_bars_mutex_.unlock(); progress_bars_mutex_.unlock();
bar.set_progress(100); bar.set_progress(kCompleteProgressPercent);
bar.set_option(indicators::option::PostfixText{ bar.set_option(indicators::option::PostfixText{
fmt::format("{}/{} ✔", p.progress, p.max)}); fmt::format("{}/{} ✔", p.progress, p.max)});