From 8e12ae2cfed728ee1ecab4e5f60f0435bf2d58b8 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sun, 15 Jul 2018 20:31:42 +0200
Subject: [PATCH] Added splash screen info while loading

---
 gui/base.qrc             |   1 +
 gui/basewindow.cc        |  30 ++++++++++++++++++++++++------
 gui/basewindow.h         |   6 ++++++
 gui/designwidget.cc      |   5 +++++
 gui/designwidget.h       |   2 ++
 gui/ice40/mainwindow.cc  |   1 +
 gui/resources/splash.png | Bin 0 -> 4651 bytes
 7 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 gui/resources/splash.png

diff --git a/gui/base.qrc b/gui/base.qrc
index 8f07aabe..bf21986b 100644
--- a/gui/base.qrc
+++ b/gui/base.qrc
@@ -9,5 +9,6 @@
         <file>resources/resultset_previous.png</file>
         <file>resources/resultset_next.png</file>
         <file>resources/resultset_last.png</file>
+        <file>resources/splash.png</file>
     </qresource>
 </RCC>
diff --git a/gui/basewindow.cc b/gui/basewindow.cc
index 22e47295..07b71105 100644
--- a/gui/basewindow.cc
+++ b/gui/basewindow.cc
@@ -18,6 +18,7 @@
  */
 
 #include <QAction>
+#include <QCoreApplication>
 #include <QFileDialog>
 #include <QGridLayout>
 #include <QIcon>
@@ -61,15 +62,10 @@ BaseMainWindow::BaseMainWindow(std::unique_ptr<Context> context, QWidget *parent
 
     setCentralWidget(centralWidget);
 
-    DesignWidget *designview = new DesignWidget();
+    designview = new DesignWidget();
     designview->setMinimumWidth(300);
     splitter_h->addWidget(designview);
 
-    connect(this, SIGNAL(contextChanged(Context *)), designview, SLOT(newContext(Context *)));
-    connect(this, SIGNAL(updateTreeView()), designview, SLOT(updateTree()));
-
-    connect(designview, SIGNAL(info(std::string)), this, SLOT(writeInfo(std::string)));
-
     tabWidget = new QTabWidget();
 
     console = new PythonTab();
@@ -87,12 +83,34 @@ BaseMainWindow::BaseMainWindow(std::unique_ptr<Context> context, QWidget *parent
     connect(designview, SIGNAL(highlight(std::vector<DecalXY>, int)), fpgaView,
             SLOT(onHighlightGroupChanged(std::vector<DecalXY>, int)));
 
+    connect(this, SIGNAL(contextChanged(Context *)), designview, SLOT(newContext(Context *)));
+    connect(this, SIGNAL(updateTreeView()), designview, SLOT(updateTree()));
+
+    connect(designview, SIGNAL(info(std::string)), this, SLOT(writeInfo(std::string)));
+
     splitter_v->addWidget(centralTabWidget);
     splitter_v->addWidget(tabWidget);
+    displaySplash();
 }
 
 BaseMainWindow::~BaseMainWindow() {}
 
+void BaseMainWindow::displaySplash()
+{
+    splash = new QSplashScreen();
+    splash->setPixmap(QPixmap(":/icons/resources/splash.png"));
+    splash->show();
+    connect(designview, SIGNAL(finishContextLoad()), splash, SLOT(close()));
+    connect(designview, SIGNAL(contextLoadStatus(std::string)), this, SLOT(displaySplashMessage(std::string)));
+    QCoreApplication::instance()->processEvents();
+}
+
+void BaseMainWindow::displaySplashMessage(std::string msg)
+{
+    splash->showMessage(msg.c_str(), Qt::AlignCenter | Qt::AlignBottom, Qt::white);
+    QCoreApplication::instance()->processEvents();
+}
+
 void BaseMainWindow::writeInfo(std::string text) { console->info(text); }
 
 void BaseMainWindow::createMenusAndBars()
diff --git a/gui/basewindow.h b/gui/basewindow.h
index 4d3d80a1..18b5339e 100644
--- a/gui/basewindow.h
+++ b/gui/basewindow.h
@@ -26,6 +26,7 @@
 #include <QMenu>
 #include <QMenuBar>
 #include <QProgressBar>
+#include <QSplashScreen>
 #include <QStatusBar>
 #include <QTabWidget>
 #include <QToolBar>
@@ -36,6 +37,7 @@ Q_DECLARE_METATYPE(NEXTPNR_NAMESPACE_PREFIX DecalXY)
 NEXTPNR_NAMESPACE_BEGIN
 
 class PythonTab;
+class DesignWidget;
 
 class BaseMainWindow : public QMainWindow
 {
@@ -48,9 +50,11 @@ class BaseMainWindow : public QMainWindow
 
   protected:
     void createMenusAndBars();
+    void displaySplash();
 
   protected Q_SLOTS:
     void writeInfo(std::string text);
+    void displaySplashMessage(std::string msg);
 
     virtual void new_proj() = 0;
     virtual void open_proj() = 0;
@@ -72,6 +76,8 @@ class BaseMainWindow : public QMainWindow
     QAction *actionNew;
     QAction *actionOpen;
     QProgressBar *progressBar;
+    QSplashScreen *splash;
+    DesignWidget *designview;
 };
 
 NEXTPNR_NAMESPACE_END
diff --git a/gui/designwidget.cc b/gui/designwidget.cc
index 1f039c60..8b9e9d22 100644
--- a/gui/designwidget.cc
+++ b/gui/designwidget.cc
@@ -230,6 +230,7 @@ void DesignWidget::newContext(Context *ctx)
     bel_root->setText(0, "Bels");
     treeWidget->insertTopLevelItem(0, bel_root);
     if (ctx) {
+        Q_EMIT contextLoadStatus("Configuring bels...");
         for (auto bel : ctx->getBels()) {
             auto id = ctx->getBelName(bel);
             QStringList items = QString(id.c_str(ctx)).split("/");
@@ -262,6 +263,7 @@ void DesignWidget::newContext(Context *ctx)
     wire_root->setText(0, "Wires");
     treeWidget->insertTopLevelItem(0, wire_root);
     if (ctx) {
+        Q_EMIT contextLoadStatus("Configuring wires...");
         for (auto wire : ctx->getWires()) {
             auto id = ctx->getWireName(wire);
             QStringList items = QString(id.c_str(ctx)).split("/");
@@ -293,6 +295,7 @@ void DesignWidget::newContext(Context *ctx)
     pip_root->setText(0, "Pips");
     treeWidget->insertTopLevelItem(0, pip_root);
     if (ctx) {
+        Q_EMIT contextLoadStatus("Configuring pips...");
         for (auto pip : ctx->getPips()) {
             auto id = ctx->getPipName(pip);
             QStringList items = QString(id.c_str(ctx)).split("/");
@@ -328,6 +331,8 @@ void DesignWidget::newContext(Context *ctx)
     cells_root = new QTreeWidgetItem(treeWidget);
     cells_root->setText(0, "Cells");
     treeWidget->insertTopLevelItem(0, cells_root);
+
+    Q_EMIT finishContextLoad();
 }
 
 void DesignWidget::updateTree()
diff --git a/gui/designwidget.h b/gui/designwidget.h
index 269e32fa..1afe817d 100644
--- a/gui/designwidget.h
+++ b/gui/designwidget.h
@@ -65,6 +65,8 @@ class DesignWidget : public QWidget
     void info(std::string text);
     void selected(std::vector<DecalXY> decal);
     void highlight(std::vector<DecalXY> decal, int group);
+    void finishContextLoad();
+    void contextLoadStatus(std::string text);
 
   private Q_SLOTS:
     void prepareMenuProperty(const QPoint &pos);
diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc
index 28792ed3..4b1f2c57 100644
--- a/gui/ice40/mainwindow.cc
+++ b/gui/ice40/mainwindow.cc
@@ -226,6 +226,7 @@ void MainWindow::new_proj()
             ctx = std::unique_ptr<Context>(new Context(chipArgs));
             actionLoadJSON->setEnabled(true);
 
+            Q_EMIT displaySplash();
             Q_EMIT contextChanged(ctx.get());
         }
     }
diff --git a/gui/resources/splash.png b/gui/resources/splash.png
new file mode 100644
index 0000000000000000000000000000000000000000..14d2842b95f853cf0947a5edb2fd398625d3c552
GIT binary patch
literal 4651
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

literal 0
HcmV?d00001