diff --git a/gui/NeuroUI/netlearner.cpp b/gui/NeuroUI/netlearner.cpp index 1dd73c8..c4a760d 100644 --- a/gui/NeuroUI/netlearner.cpp +++ b/gui/NeuroUI/netlearner.cpp @@ -54,6 +54,8 @@ void NetLearner::run() } myNet.backProp(targetValues); + + emit progress((double)iteration / (double)numIterations); } } catch (std::exception &ex) diff --git a/gui/NeuroUI/netlearner.h b/gui/NeuroUI/netlearner.h index 78e0131..a21f6b1 100644 --- a/gui/NeuroUI/netlearner.h +++ b/gui/NeuroUI/netlearner.h @@ -12,6 +12,7 @@ private: signals: void logMessage(const QString &logMessage); + void progress(double progress); }; #endif // NETLEARNER_H diff --git a/gui/NeuroUI/neuroui.cpp b/gui/NeuroUI/neuroui.cpp index 800baf9..84b658a 100644 --- a/gui/NeuroUI/neuroui.cpp +++ b/gui/NeuroUI/neuroui.cpp @@ -23,6 +23,7 @@ void NeuroUI::on_runButton_clicked() } connect(m_netLearner.get(), &NetLearner::logMessage, this, &NeuroUI::logMessage); + connect(m_netLearner.get(), &NetLearner::progress, this, &NeuroUI::progress); connect(m_netLearner.get(), &NetLearner::started, this, &NeuroUI::netLearnerStarted); connect(m_netLearner.get(), &NetLearner::finished, this, &NeuroUI::netLearnerFinished); @@ -39,9 +40,19 @@ void NeuroUI::logMessage(const QString &logMessage) void NeuroUI::netLearnerStarted() { ui->runButton->setEnabled(false); + ui->progressBar->setValue(0); } void NeuroUI::netLearnerFinished() { ui->runButton->setEnabled(true); + ui->progressBar->setValue(0); +} + +void NeuroUI::progress(double progress) +{ + double range = ui->progressBar->maximum() - ui->progressBar->minimum(); + int value = ui->progressBar->minimum() + (int)(progress * range); + + ui->progressBar->setValue(value); } diff --git a/gui/NeuroUI/neuroui.h b/gui/NeuroUI/neuroui.h index af2481f..f988686 100644 --- a/gui/NeuroUI/neuroui.h +++ b/gui/NeuroUI/neuroui.h @@ -27,6 +27,7 @@ private slots: void logMessage(const QString &logMessage); void netLearnerStarted(); void netLearnerFinished(); + void progress(double progress); private: Ui::NeuroUI *ui; diff --git a/gui/NeuroUI/neuroui.ui b/gui/NeuroUI/neuroui.ui index 325da06..e7fc813 100644 --- a/gui/NeuroUI/neuroui.ui +++ b/gui/NeuroUI/neuroui.ui @@ -22,6 +22,9 @@ + + 1000 + 0