Show progress in stdout

Fluorescence-Tools · May 7, 2020 · 4f10840 · 4f10840
1 parent a22b13b
commit 4f10840
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
@@ -23,7 +23,7 @@ int main(int argc, char *argv[])
 	/*std::cout<<"std::thread::hardware_concurrency()="<<
 		   std::thread::hardware_concurrency()<<std::endl;*/
 	pteros::Log::instance().logger->set_level(
-		spdlog::level::level_enum::warn);
+		spdlog::level::level_enum::err);
 	QApplication a(argc, argv);
 	a.setApplicationVersion(APP_VERSION);
 	QCommandLineParser parser;

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -91,14 +91,21 @@ MainWindow::MainWindow(const QString json, const QString csvOut,
 				  : 0;
 		tasksPendindOld = tasksPending;
 
+		const int tasksReady = trajectoriesModel.resultsCount();
+		int readyPct =
+			tasksReady * 100 / (tasksPending + tasksReady + 1);
 		QString message =
-			QString("v. #%1 | Tasks pending/ready/running: %2/%3/%4; ETA: %5")
+			QString("v. #%1 | Tasks pending/ready/running: %2/%3/%4; ETA: %5 %6%")
 				.arg(verHash)
 				.arg(tasksPending)
-				.arg(trajectoriesModel.resultsCount())
+				.arg(tasksReady)
 				.arg(trajectoriesModel.tasksRunningCount())
-				.arg(timespan(ETA));
+				.arg(timespan(ETA))
+				.arg(readyPct);
 		tasksStatus.setText(message);
+		message = message.leftJustified(74, ' ');
+		printf("\r%s", message.toStdString().c_str());
+		fflush(stdout);
 		ui->mainTreeView->viewport()->update();
 	});
 	timer->start(timerInterval);