diff options
| author | Eddie Hung <eddieh@ece.ubc.ca> | 2018-07-31 18:26:39 -0700 |
|---|---|---|
| committer | Eddie Hung <eddieh@ece.ubc.ca> | 2018-07-31 18:26:39 -0700 |
| commit | 5d58d6ad1b473ed7e3eb59a393a685b7ef219621 (patch) | |
| tree | 7ea550e34111502879c803f2107bd8a4ecb211bc /gui | |
| parent | 87438542e51c91fd6bf838d4f2aceb3c79303a72 (diff) | |
| parent | 8131921e998eda144c85984710ec421f67f18658 (diff) | |
| download | nextpnr-5d58d6ad1b473ed7e3eb59a393a685b7ef219621.tar.gz nextpnr-5d58d6ad1b473ed7e3eb59a393a685b7ef219621.tar.bz2 nextpnr-5d58d6ad1b473ed7e3eb59a393a685b7ef219621.zip | |
Merge branch 'redist_slack' of gitlab.com:SymbioticEDA/nextpnr into redist_slack
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/ecp5/mainwindow.cc | 2 | ||||
| -rw-r--r-- | gui/generic/mainwindow.cc | 2 | ||||
| -rw-r--r-- | gui/treemodel.cc | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/gui/ecp5/mainwindow.cc b/gui/ecp5/mainwindow.cc index 1168a55c..4b1c7e3b 100644 --- a/gui/ecp5/mainwindow.cc +++ b/gui/ecp5/mainwindow.cc @@ -40,6 +40,8 @@ void MainWindow::createMenu() {
QMenu *menu_Custom = new QMenu("&Generic", menuBar);
menuBar->addAction(menu_Custom->menuAction());
+
+ createGraphicsBar();
}
void MainWindow::new_proj() {}
diff --git a/gui/generic/mainwindow.cc b/gui/generic/mainwindow.cc index 88e291e6..1efc73bb 100644 --- a/gui/generic/mainwindow.cc +++ b/gui/generic/mainwindow.cc @@ -40,6 +40,8 @@ void MainWindow::createMenu() {
QMenu *menu_Custom = new QMenu("&Generic", menuBar);
menuBar->addAction(menu_Custom->menuAction());
+
+ createGraphicsBar();
}
void MainWindow::new_proj() {}
diff --git a/gui/treemodel.cc b/gui/treemodel.cc index d79e38de..d42dc401 100644 --- a/gui/treemodel.cc +++ b/gui/treemodel.cc @@ -141,6 +141,7 @@ void ContextTreeModel::loadData(Context *ctx) QMap<QString, ContextTreeItem *> pip_items; // Add pips to tree +#ifndef ARCH_ECP5 for (auto pip : ctx->getPips()) { auto id = ctx->getPipName(pip); QStringList items = QString(id.c_str(ctx)).split("/"); @@ -164,6 +165,7 @@ void ContextTreeModel::loadData(Context *ctx) parent = pip_items[name]; } } +#endif pip_root->sort(); nets_root = new ContextTreeItem("Nets"); @@ -341,4 +343,4 @@ QList<QModelIndex> ContextTreeModel::search(QString text) } return list; } -NEXTPNR_NAMESPACE_END
\ No newline at end of file +NEXTPNR_NAMESPACE_END |