Update receiving status in viewer remote connection mode

Task-number: QT3DS-1878
Change-Id: I2fe86c7cc127819cad0c5ea9e169ce886f2cdaa5
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

4 files changed, 12 insertions, 0 deletions

diff --git a/tools/q3dsviewer/q3dsremotedeploymentmanager.cpp b/tools/q3dsviewer/q3dsremotedeploymentmanager.cpp
index 7126f14..83eb017 100644
--- a/tools/q3dsviewer/q3dsremotedeploymentmanager.cpp
+++ b/tools/q3dsviewer/q3dsremotedeploymentmanager.cpp
@@ -59,6 +59,8 @@ Q3DSRemoteDeploymentManager::Q3DSRemoteDeploymentManager(Q3DSEngine *engine, int
         m_isRemoteProjectLoaded = true;
         loadRemoteProject();
     });
+    connect(m_server, &Q3DSRemoteDeploymentServer::updateProgress,
+            this, &Q3DSRemoteDeploymentManager::setProgress);
 
     m_connectionInfoTimer.setInterval(1000);
     m_connectionInfoTimer.setSingleShot(true);
@@ -210,4 +212,9 @@ void Q3DSRemoteDeploymentManager::setErrorMessage(const QString &errorString)
     m_engine->setDataInputValue(c_connectionErrorDataInput(), errorString);
 }
 
+void Q3DSRemoteDeploymentManager::setProgress(int progress)
+{
+    setErrorMessage(tr("Receiving (%1%)").arg(progress));
+}
+
 QT_END_NAMESPACE
diff --git a/tools/q3dsviewer/q3dsremotedeploymentmanager.h b/tools/q3dsviewer/q3dsremotedeploymentmanager.h
index b178206..e65aacc 100644
--- a/tools/q3dsviewer/q3dsremotedeploymentmanager.h
+++ b/tools/q3dsviewer/q3dsremotedeploymentmanager.h
@@ -77,6 +77,7 @@ private:
     void setupConnectionScene();
     QString generateConnectionInfo();
     void setErrorMessage(const QString &errorString);
+    void setProgress(int progress) ;
 
     Q3DSEngine *m_engine = nullptr;
     Q3DSRemoteDeploymentServer *m_server = nullptr;
diff --git a/tools/q3dsviewer/q3dsremotedeploymentserver.cpp b/tools/q3dsviewer/q3dsremotedeploymentserver.cpp
index f107d48..b4c9b26 100644
--- a/tools/q3dsviewer/q3dsremotedeploymentserver.cpp
+++ b/tools/q3dsviewer/q3dsremotedeploymentserver.cpp
@@ -132,6 +132,9 @@ void Q3DSRemoteDeploymentServer::readProject()
     int totalBytes = 0;
     m_incoming >> totalBytes;
 
+    if (totalBytes != 0)
+        emit updateProgress(100 * ((double)m_connection->bytesAvailable() / (double)totalBytes));
+
     if (m_connection->bytesAvailable() < totalBytes) {
         m_incoming.rollbackTransaction();
         return;
diff --git a/tools/q3dsviewer/q3dsremotedeploymentserver.h b/tools/q3dsviewer/q3dsremotedeploymentserver.h
index 3a79db0..6d9191d 100644
--- a/tools/q3dsviewer/q3dsremotedeploymentserver.h
+++ b/tools/q3dsviewer/q3dsremotedeploymentserver.h
@@ -61,6 +61,7 @@ Q_SIGNALS:
     void projectChanging();
     void remoteConnected();
     void remoteDisconnected();
+    void updateProgress(int progress);
 
 private Q_SLOTS:
     void acceptRemoteConnection();