Merge pull request #344 from YosysHQ/mmicko/ecp5_gui

ECP5 display improvement

1 files changed, 44 insertions, 0 deletions

diff --git a/gui/basewindow.cc b/gui/basewindow.cc
index a470335d..c3dbc131 100644
--- a/gui/basewindow.cc
+++ b/gui/basewindow.cc
@@ -224,6 +224,38 @@ void BaseMainWindow::createMenusAndBars()
     actionZoomOutbound->setIcon(QIcon(":/icons/resources/shape_square.png"));

     connect(actionZoomOutbound, &QAction::triggered, fpgaView, &FPGAViewWidget::zoomOutbound);

 

+    actionDisplayBel = new QAction("Enable/Disable Bels", this);

+    actionDisplayBel->setIcon(QIcon(":/icons/resources/bel.png"));

+    actionDisplayBel->setCheckable(true);

+    actionDisplayBel->setChecked(true);

+    connect(actionDisplayBel, &QAction::triggered, this, &BaseMainWindow::enableDisableDecals);

+

+    actionDisplayWire = new QAction("Enable/Disable Wires", this);

+    actionDisplayWire->setIcon(QIcon(":/icons/resources/wire.png"));

+    actionDisplayWire->setCheckable(true);

+    actionDisplayWire->setChecked(true);

+    connect(actionDisplayWire, &QAction::triggered, this, &BaseMainWindow::enableDisableDecals);

+

+    actionDisplayPip = new QAction("Enable/Disable Pips", this);

+    actionDisplayPip->setIcon(QIcon(":/icons/resources/pip.png"));

+    actionDisplayPip->setCheckable(true);

+#ifdef ARCH_ECP5

+    actionDisplayPip->setChecked(false);

+#else

+    actionDisplayPip->setChecked(true);

+#endif

+    connect(actionDisplayPip, &QAction::triggered, this, &BaseMainWindow::enableDisableDecals);

+

+    actionDisplayGroups = new QAction("Enable/Disable Groups", this);

+    actionDisplayGroups->setIcon(QIcon(":/icons/resources/group.png"));

+    actionDisplayGroups->setCheckable(true);

+    actionDisplayGroups->setChecked(true);

+    connect(actionDisplayGroups, &QAction::triggered, this, &BaseMainWindow::enableDisableDecals);

+

+    // set initial state

+    fpgaView->enableDisableDecals(actionDisplayBel->isChecked(), actionDisplayWire->isChecked(),

+                                  actionDisplayPip->isChecked(), actionDisplayGroups->isChecked());

+

     // Add main menu

     menuBar = new QMenuBar();

     menuBar->setGeometry(QRect(0, 0, 1024, 27));

@@ -280,6 +312,11 @@ void BaseMainWindow::createMenusAndBars()
     deviceViewToolBar->addAction(actionZoomOut);

     deviceViewToolBar->addAction(actionZoomSelected);

     deviceViewToolBar->addAction(actionZoomOutbound);

+    deviceViewToolBar->addSeparator();

+    deviceViewToolBar->addAction(actionDisplayBel);

+    deviceViewToolBar->addAction(actionDisplayWire);

+    deviceViewToolBar->addAction(actionDisplayPip);

+    deviceViewToolBar->addAction(actionDisplayGroups);

 

     // Add status bar with progress bar

     statusBar = new QStatusBar();

@@ -292,6 +329,13 @@ void BaseMainWindow::createMenusAndBars()
     setStatusBar(statusBar);

 }

 

+void BaseMainWindow::enableDisableDecals()

+{

+    fpgaView->enableDisableDecals(actionDisplayBel->isChecked(), actionDisplayWire->isChecked(),

+                                  actionDisplayPip->isChecked(), actionDisplayGroups->isChecked());

+    ctx->refreshUi();

+}

+

 void BaseMainWindow::open_json()

 {

     QString fileName = QFileDialog::getOpenFileName(this, QString("Open JSON"), QString(), QString("*.json"));