caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Miodrag Milanovic 2018-06-21 13:55:36 +02:00
parent 0ed455096a
commit 23fe31da44
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dummy/main.cc
View File

@ -42,6 +42,8 @@ int main(int argc, char *argv[])
options.add_options()("verbose,v", "verbose output"); options.add_options()("verbose,v", "verbose output");
options.add_options()("force,f", "keep running after errors"); options.add_options()("force,f", "keep running after errors");
options.add_options()("gui", "start gui"); options.add_options()("gui", "start gui");
options.add_options()("run", po::value<std::vector<std::string>>(),
"python file to execute");
options.add_options()("version,V", "show version"); options.add_options()("version,V", "show version");
po::positional_options_description pos; po::positional_options_description pos;
pos.add("run", -1); pos.add("run", -1);

2
gui/basewindow.cc
View File

@ -1,4 +1,3 @@
#include "mainwindow.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileDialog>
#include <QGridLayout> #include <QGridLayout>
@ -9,6 +8,7 @@
#include "fpgaviewwidget.h" #include "fpgaviewwidget.h"
#include "jsonparse.h" #include "jsonparse.h"
#include "log.h" #include "log.h"
#include "mainwindow.h"
#include "pythontab.h" #include "pythontab.h"
//#include "pack.h" //#include "pack.h"
//#include "pcf.h" //#include "pcf.h"

7
gui/basewindow.h
View File

@ -5,12 +5,11 @@
#include "nextpnr.h" #include "nextpnr.h"
#include <QMainWindow> #include <QMainWindow>
#include <QTabWidget>
#include <QMenu> #include <QMenu>
#include <QMenuBar> #include <QMenuBar>
#include <QToolBar>
#include <QStatusBar> #include <QStatusBar>
#include <QTabWidget>
#include <QToolBar>
// FIXME // FIXME
USING_NEXTPNR_NAMESPACE USING_NEXTPNR_NAMESPACE
@ -36,7 +35,7 @@ class BaseMainWindow : public QMainWindow
Context *ctx; Context *ctx;
QTabWidget *tabWidget; QTabWidget *tabWidget;
InfoTab *info; InfoTab *info;
QMenuBar *menuBar; QMenuBar *menuBar;
QToolBar *mainToolBar; QToolBar *mainToolBar;
QStatusBar *statusBar; QStatusBar *statusBar;

1
gui/dummy/mainwindow.cc
View File

@ -15,5 +15,4 @@ void MainWindow::createMenu()
{ {
QMenu *menu_Custom = new QMenu("&Dummy", menuBar); QMenu *menu_Custom = new QMenu("&Dummy", menuBar);
menuBar->addAction(menu_Custom->menuAction()); menuBar->addAction(menu_Custom->menuAction());
} }

5
gui/ice40/mainwindow.cc
View File

@ -1,14 +1,14 @@
#include "mainwindow.h" #include "mainwindow.h"
#include <QAction> #include <QAction>
#include <QIcon> #include <QIcon>
#include "bitstream.h"
#include "design_utils.h"
#include "jsonparse.h" #include "jsonparse.h"
#include "log.h" #include "log.h"
#include "pack.h" #include "pack.h"
#include "pcf.h" #include "pcf.h"
#include "place_sa.h" #include "place_sa.h"
#include "route.h" #include "route.h"
#include "bitstream.h"
#include "design_utils.h"
MainWindow::MainWindow(Context *_ctx, QWidget *parent) MainWindow::MainWindow(Context *_ctx, QWidget *parent)
: BaseMainWindow(_ctx, parent) : BaseMainWindow(_ctx, parent)
@ -25,5 +25,4 @@ void MainWindow::createMenu()
{ {
QMenu *menu_Custom = new QMenu("&ICE 40", menuBar); QMenu *menu_Custom = new QMenu("&ICE 40", menuBar);
menuBar->addAction(menu_Custom->menuAction()); menuBar->addAction(menu_Custom->menuAction());
} }