From 446cbf59b3a59c845d6c423b38e06d0aa3f1ee63 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 17 Apr 2017 09:33:52 -0700
Subject: [PATCH] add domain bake progress to results table

---
 tools/oven/src/DomainBaker.cpp         |  7 +++++++
 tools/oven/src/DomainBaker.h           |  3 +++
 tools/oven/src/ui/DomainBakeWidget.cpp | 23 +++++++++++++++++++++++
 tools/oven/src/ui/DomainBakeWidget.h   |  1 +
 4 files changed, 34 insertions(+)

diff --git a/tools/oven/src/DomainBaker.cpp b/tools/oven/src/DomainBaker.cpp
index 6bee07986c..5589df1645 100644
--- a/tools/oven/src/DomainBaker.cpp
+++ b/tools/oven/src/DomainBaker.cpp
@@ -212,10 +212,14 @@ void DomainBaker::enumerateEntities() {
                     // add this QJsonValueRef to our multi hash so that we can easily re-write
                     // the model URL to the baked version once the baker is complete
                     _entitiesNeedingRewrite.insert(modelURL, *it);
+                    ++_totalNumberOfEntities;
                 }
             }
         }
     }
+
+    // emit progress now to say we're just starting
+    emit bakeProgress(0, _totalNumberOfEntities);
 }
 
 void DomainBaker::handleFinishedBaker() {
@@ -260,6 +264,9 @@ void DomainBaker::handleFinishedBaker() {
         // drop our shared pointer to this baker so that it gets cleaned up
         _bakers.remove(baker->getFBXUrl());
 
+        // emit progress to tell listeners how many models we have baked
+        emit bakeProgress(_totalNumberOfEntities - _entitiesNeedingRewrite.keys().size(), _totalNumberOfEntities);
+
         if (_entitiesNeedingRewrite.isEmpty()) {
             emit allModelsFinished();
         }
diff --git a/tools/oven/src/DomainBaker.h b/tools/oven/src/DomainBaker.h
index 6c8555cc62..23c332abab 100644
--- a/tools/oven/src/DomainBaker.h
+++ b/tools/oven/src/DomainBaker.h
@@ -31,6 +31,7 @@ public:
 
 signals:
     void allModelsFinished();
+    void bakeProgress(int modelsBaked, int modelsTotal);
 
 private slots:
     void handleFinishedBaker();
@@ -54,6 +55,8 @@ private:
     std::unique_ptr<QThread> _fbxBakerThread;
     QHash<QUrl, QSharedPointer<FBXBaker>> _bakers;
     QMultiHash<QUrl, QJsonValueRef> _entitiesNeedingRewrite;
+
+    int _totalNumberOfEntities;
 };
 
 #endif // hifi_DomainBaker_h
diff --git a/tools/oven/src/ui/DomainBakeWidget.cpp b/tools/oven/src/ui/DomainBakeWidget.cpp
index c0b9c85910..e9b59f005a 100644
--- a/tools/oven/src/ui/DomainBakeWidget.cpp
+++ b/tools/oven/src/ui/DomainBakeWidget.cpp
@@ -213,6 +213,9 @@ void DomainBakeWidget::bakeButtonClicked() {
         // make sure we hear from the baker when it is done
         connect(domainBaker.get(), &DomainBaker::finished, this, &DomainBakeWidget::handleFinishedBaker);
 
+        // watch the baker's progress so that we can put its progress in the results table
+        connect(domainBaker.get(), &DomainBaker::bakeProgress, this, &DomainBakeWidget::handleBakerProgress);
+
         // run the baker in our thread pool
         QtConcurrent::run(domainBaker.get(), &DomainBaker::bake);
 
@@ -226,6 +229,26 @@ void DomainBakeWidget::bakeButtonClicked() {
     }
 }
 
+void DomainBakeWidget::handleBakerProgress(int modelsBaked, int modelsTotal) {
+    if (auto baker = qobject_cast<DomainBaker*>(sender())) {
+        // add the results of this bake to the results window
+        auto it = std::remove_if(_bakers.begin(), _bakers.end(), [baker](const BakerRowPair& value) {
+            return value.first.get() == baker;
+        });
+
+        if (it != _bakers.end()) {
+            auto resultRow = it->second;
+            auto resultsWindow = qApp->getMainWindow()->showResultsWindow();
+
+            int percentage = roundf(float(modelsBaked) / float(modelsTotal) * 100.0f);
+            qDebug() << percentage;
+
+            auto statusString = QString("Baking - %1 of %2 models baked - %3%").arg(modelsBaked).arg(modelsTotal).arg(percentage);
+            resultsWindow->changeStatusForRow(resultRow, statusString);
+        }
+    }
+}
+
 void DomainBakeWidget::handleFinishedBaker() {
     if (auto baker = qobject_cast<DomainBaker*>(sender())) {
         // add the results of this bake to the results window
diff --git a/tools/oven/src/ui/DomainBakeWidget.h b/tools/oven/src/ui/DomainBakeWidget.h
index 606f550203..ea9e6f7049 100644
--- a/tools/oven/src/ui/DomainBakeWidget.h
+++ b/tools/oven/src/ui/DomainBakeWidget.h
@@ -34,6 +34,7 @@ private slots:
 
     void outputDirectoryChanged(const QString& newDirectory);
 
+    void handleBakerProgress(int modelsBaked, int modelsTotal);
     void handleFinishedBaker();
 
 private: