change: change code style to Linux style except indent.
This commit is contained in:
@@ -22,85 +22,87 @@
|
||||
|
||||
#include <iostream>
|
||||
|
||||
namespace olive {
|
||||
|
||||
CLIProgressDialog::CLIProgressDialog(const QString& title, QObject *parent) :
|
||||
QObject(parent),
|
||||
title_(title),
|
||||
progress_(-1),
|
||||
drawn_(false)
|
||||
namespace olive
|
||||
{
|
||||
SetProgress(0);
|
||||
|
||||
CLIProgressDialog::CLIProgressDialog(const QString &title, QObject *parent)
|
||||
: QObject(parent)
|
||||
, title_(title)
|
||||
, progress_(-1)
|
||||
, drawn_(false)
|
||||
{
|
||||
SetProgress(0);
|
||||
}
|
||||
|
||||
void CLIProgressDialog::Update()
|
||||
{
|
||||
if (drawn_) {
|
||||
// We've been here before, do a carriage return back to the start of the terminal line
|
||||
std::cout << "\r";
|
||||
} else {
|
||||
drawn_ = true;
|
||||
}
|
||||
if (drawn_) {
|
||||
// We've been here before, do a carriage return back to the start of the terminal line
|
||||
std::cout << "\r";
|
||||
} else {
|
||||
drawn_ = true;
|
||||
}
|
||||
|
||||
// FIXME: Get real column count
|
||||
int columns = 80;
|
||||
// FIXME: Get real column count
|
||||
int columns = 80;
|
||||
|
||||
int title_columns = columns / 2 - 1;
|
||||
int title_columns = columns / 2 - 1;
|
||||
|
||||
// Print "title" text
|
||||
QString sized_title = title_;
|
||||
// Print "title" text
|
||||
QString sized_title = title_;
|
||||
|
||||
if (title_.size() > title_columns) {
|
||||
sized_title = title_.left(title_columns - 3).append(QStringLiteral("..."));
|
||||
} else {
|
||||
sized_title = title_;
|
||||
}
|
||||
if (title_.size() > title_columns) {
|
||||
sized_title =
|
||||
title_.left(title_columns - 3).append(QStringLiteral("..."));
|
||||
} else {
|
||||
sized_title = title_;
|
||||
}
|
||||
|
||||
std::cout << sized_title.toUtf8().constData();
|
||||
std::cout << sized_title.toUtf8().constData();
|
||||
|
||||
// Pad out the rest of the title area if necessary
|
||||
for (int i=sized_title.size(); i<title_columns; i++) {
|
||||
std::cout << " ";
|
||||
}
|
||||
// Pad out the rest of the title area if necessary
|
||||
for (int i = sized_title.size(); i < title_columns; i++) {
|
||||
std::cout << " ";
|
||||
}
|
||||
|
||||
// Percentage counter " 100% " is 5 characters + the enclosing brackets [] are 2 characters
|
||||
int progress_bar_columns = columns / 2 - 7;
|
||||
// Percentage counter " 100% " is 5 characters + the enclosing brackets [] are 2 characters
|
||||
int progress_bar_columns = columns / 2 - 7;
|
||||
|
||||
std::cout << "[";
|
||||
std::cout << "[";
|
||||
|
||||
// Get UI bar progress
|
||||
int bar_prog = qRound(progress_ * progress_bar_columns);
|
||||
// Get UI bar progress
|
||||
int bar_prog = qRound(progress_ * progress_bar_columns);
|
||||
|
||||
// Draw filled in bar
|
||||
for (int i=0;i<bar_prog;i++) {
|
||||
std::cout << "=";
|
||||
}
|
||||
// Draw filled in bar
|
||||
for (int i = 0; i < bar_prog; i++) {
|
||||
std::cout << "=";
|
||||
}
|
||||
|
||||
// Draw empty space
|
||||
for (int i=bar_prog;i<progress_bar_columns;i++) {
|
||||
std::cout << " ";
|
||||
}
|
||||
// Draw empty space
|
||||
for (int i = bar_prog; i < progress_bar_columns; i++) {
|
||||
std::cout << " ";
|
||||
}
|
||||
|
||||
std::cout << "] ";
|
||||
std::cout << "] ";
|
||||
|
||||
if (progress_ < 100) {
|
||||
std::cout << " ";
|
||||
}
|
||||
if (progress_ < 100) {
|
||||
std::cout << " ";
|
||||
}
|
||||
|
||||
if (progress_ < 10) {
|
||||
std::cout << " ";
|
||||
}
|
||||
if (progress_ < 10) {
|
||||
std::cout << " ";
|
||||
}
|
||||
|
||||
std::cout << qRound(progress_ * 100.0) << "% " << std::endl << std::flush;
|
||||
std::cout << qRound(progress_ * 100.0) << "% " << std::endl << std::flush;
|
||||
}
|
||||
|
||||
void CLIProgressDialog::SetProgress(double p)
|
||||
{
|
||||
if (progress_ != p) {
|
||||
progress_ = p;
|
||||
if (progress_ != p) {
|
||||
progress_ = p;
|
||||
|
||||
Update();
|
||||
}
|
||||
Update();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -26,25 +26,24 @@
|
||||
|
||||
#include "common/define.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
class CLIProgressDialog : public QObject
|
||||
namespace olive
|
||||
{
|
||||
|
||||
class CLIProgressDialog : public QObject {
|
||||
public:
|
||||
CLIProgressDialog(const QString &title, QObject* parent = nullptr);
|
||||
CLIProgressDialog(const QString &title, QObject *parent = nullptr);
|
||||
|
||||
public slots:
|
||||
void SetProgress(double p);
|
||||
void SetProgress(double p);
|
||||
|
||||
private:
|
||||
void Update();
|
||||
void Update();
|
||||
|
||||
QString title_;
|
||||
QString title_;
|
||||
|
||||
double progress_;
|
||||
|
||||
bool drawn_;
|
||||
double progress_;
|
||||
|
||||
bool drawn_;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user