From 9c03909ebaec8157824a9cb13eeea774d29b35e1 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 21 Jun 2018 13:41:16 +0200 Subject: Make arch specific main window --- CMakeLists.txt | 4 +- common/emb.cc | 138 +++++++++++++++++++++++++++++++++++++++++++++ common/emb.h | 20 +++++++ gui/CMakeLists.txt | 3 +- gui/basewindow.cc | 138 +++++++++++++++++++++++++++++++++++++++++++++ gui/basewindow.h | 45 +++++++++++++++ gui/dummy/mainwindow.cc | 19 +++++++ gui/dummy/mainwindow.h | 21 +++++++ gui/emb.cc | 138 --------------------------------------------- gui/emb.h | 20 ------- gui/fpgaviewwidget.cc | 4 +- gui/ice40/mainwindow.cc | 29 ++++++++++ gui/ice40/mainwindow.h | 21 +++++++ gui/mainwindow.cc | 145 ------------------------------------------------ gui/mainwindow.h | 36 ------------ 15 files changed, 437 insertions(+), 344 deletions(-) create mode 100644 common/emb.cc create mode 100644 common/emb.h create mode 100644 gui/basewindow.cc create mode 100644 gui/basewindow.h create mode 100644 gui/dummy/mainwindow.cc create mode 100644 gui/dummy/mainwindow.h delete mode 100644 gui/emb.cc delete mode 100644 gui/emb.h create mode 100644 gui/ice40/mainwindow.cc create mode 100644 gui/ice40/mainwindow.h delete mode 100644 gui/mainwindow.cc delete mode 100644 gui/mainwindow.h diff --git a/CMakeLists.txt b/CMakeLists.txt index ac58f169..8a64369f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,7 @@ if (NOT Boost_PYTHON_FOUND ) message( FATAL_ERROR "No version of Boost::Python 3.x could be found.") endif () -include_directories(common/ gui/ frontend/json ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} 3rdparty/QtPropertyBrowser/src) +include_directories(common/ frontend/json ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}) aux_source_directory(common/ COMMON_SRC_FILES) aux_source_directory(frontend/json/ JSON_PARSER_FILES) set(COMMON_FILES ${COMMON_SRC_FILES} ${JSON_PARSER_FILES}) @@ -115,7 +115,7 @@ foreach (family ${FAMILIES}) include(${family}/family.cmake) foreach (target ${family_targets}) # Include family-specific source files to all family targets and set defines appropriately - target_include_directories(${target} PRIVATE ${family}/ generated/) + target_include_directories(${target} PRIVATE ${family}/ generated/ gui/${family}/) target_compile_definitions(${target} PRIVATE NEXTPNR_NAMESPACE=nextpnr_${family} ARCH_${ufamily} ARCHNAME=${family} QT_NO_KEYWORDS) target_link_libraries(${target} LINK_PUBLIC gui_${family} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${GUI_LIBRARY_FILES_${ufamily}}) endforeach (target) diff --git a/common/emb.cc b/common/emb.cc new file mode 100644 index 00000000..2e3379d5 --- /dev/null +++ b/common/emb.cc @@ -0,0 +1,138 @@ +// +// Copyright (C) 2011 Mateusz Loskot +// Distributed under the Boost Software License, Version 1.0. +// (See accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) +// +// Blog article: http://mateusz.loskot.net/?p=2819 + +#include "emb.h" +#include +#include +#include +#include + +namespace emb { +struct Stdout +{ + PyObject_HEAD stdout_write_type write; +}; + +PyObject *Stdout_write(PyObject *self, PyObject *args) +{ + std::size_t written(0); + Stdout *selfimpl = reinterpret_cast(self); + if (selfimpl->write) { + char *data; + if (!PyArg_ParseTuple(args, "s", &data)) + return 0; + + std::string str(data); + selfimpl->write(str); + written = str.size(); + } + return PyLong_FromSize_t(written); +} + +PyObject *Stdout_flush(PyObject *self, PyObject *args) +{ + // no-op + return Py_BuildValue(""); +} + +PyMethodDef Stdout_methods[] = { + {"write", Stdout_write, METH_VARARGS, "sys.stdout.write"}, + {"flush", Stdout_flush, METH_VARARGS, "sys.stdout.write"}, + {0, 0, 0, 0} // sentinel +}; + +PyTypeObject StdoutType = { + PyVarObject_HEAD_INIT(0, 0) "emb.StdoutType", /* tp_name */ + sizeof(Stdout), /* tp_basicsize */ + 0, /* tp_itemsize */ + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_reserved */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT, /* tp_flags */ + "emb.Stdout objects", /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + Stdout_methods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ +}; + +PyModuleDef embmodule = { + PyModuleDef_HEAD_INIT, "emb", 0, -1, 0, +}; + +// Internal state +PyObject *g_stdout; +PyObject *g_stdout_saved; + +PyMODINIT_FUNC PyInit_emb(void) +{ + g_stdout = 0; + g_stdout_saved = 0; + + StdoutType.tp_new = PyType_GenericNew; + if (PyType_Ready(&StdoutType) < 0) + return 0; + + PyObject *m = PyModule_Create(&embmodule); + if (m) { + Py_INCREF(&StdoutType); + PyModule_AddObject(m, "Stdout", + reinterpret_cast(&StdoutType)); + } + return m; +} + +void set_stdout(stdout_write_type write) +{ + if (!g_stdout) { + g_stdout_saved = PySys_GetObject("stdout"); // borrowed + g_stdout = StdoutType.tp_new(&StdoutType, 0, 0); + } + + Stdout *impl = reinterpret_cast(g_stdout); + impl->write = write; + PySys_SetObject("stdout", g_stdout); +} + +void reset_stdout() +{ + if (g_stdout_saved) + PySys_SetObject("stdout", g_stdout_saved); + + Py_XDECREF(g_stdout); + g_stdout = 0; +} + +void append_inittab() { PyImport_AppendInittab("emb", emb::PyInit_emb); } + +} // namespace emb diff --git a/common/emb.h b/common/emb.h new file mode 100644 index 00000000..3daa7ca3 --- /dev/null +++ b/common/emb.h @@ -0,0 +1,20 @@ +// +// Copyright (C) 2011 Mateusz Loskot +// Distributed under the Boost Software License, Version 1.0. +// (See accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) +// +// Blog article: http://mateusz.loskot.net/?p=2819 + +#include +#include +#include + +namespace emb { +typedef std::function stdout_write_type; + +void set_stdout(stdout_write_type write); +void reset_stdout(); + +void append_inittab(); +} // namespace emb diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 5db86a9b..b4dcde11 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -2,6 +2,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) aux_source_directory(. GUI_SOURCE_FILES) +aux_source_directory(${family}/ GUI_SOURCE_FILES) set(_RESOURCES nextpnr.qrc) qt5_add_resources(GUI_RESOURCE_FILES ${_RESOURCES}) @@ -10,6 +11,6 @@ set(GUI_LIBRARY_FILES_${ufamily} Qt5::Widgets Qt5::OpenGL ${OPENGL_LIBRARIES} Qt add_library(gui_${family} STATIC ${GUI_SOURCE_FILES} ${GUI_RESOURCE_FILES}) -target_include_directories(gui_${family} PRIVATE ../${family}/) +target_include_directories(gui_${family} PRIVATE ../${family} ${family} ../3rdparty/QtPropertyBrowser/src) target_compile_definitions(gui_${family} PRIVATE NEXTPNR_NAMESPACE=nextpnr_${family} ARCH_${ufamily} ARCHNAME=${family} QT_NO_KEYWORDS) target_link_libraries(gui_${family} Qt5::Widgets) diff --git a/gui/basewindow.cc b/gui/basewindow.cc new file mode 100644 index 00000000..cbf0faae --- /dev/null +++ b/gui/basewindow.cc @@ -0,0 +1,138 @@ +#include "mainwindow.h" +#include +#include +#include +#include +#include +#include +#include "designwidget.h" +#include "fpgaviewwidget.h" +#include "jsonparse.h" +#include "log.h" +#include "pythontab.h" +//#include "pack.h" +//#include "pcf.h" +#include "place_sa.h" +#include "route.h" +//#include "bitstream.h" +#include "design_utils.h" + +BaseMainWindow::BaseMainWindow(Context *_ctx, QWidget *parent) + : QMainWindow(parent), ctx(_ctx) +{ + Q_INIT_RESOURCE(nextpnr); + + log_files.clear(); + log_streams.clear(); + log_write_function = [this](std::string text) { info->info(text); }; + + setObjectName(QStringLiteral("BaseMainWindow")); + resize(1024, 768); + + createMenusAndBars(); + + QWidget *centralWidget = new QWidget(this); + + QGridLayout *gridLayout = new QGridLayout(centralWidget); + gridLayout->setSpacing(6); + gridLayout->setContentsMargins(11, 11, 11, 11); + + QSplitter *splitter_h = new QSplitter(Qt::Horizontal, centralWidget); + QSplitter *splitter_v = new QSplitter(Qt::Vertical, splitter_h); + splitter_h->addWidget(splitter_v); + + gridLayout->addWidget(splitter_h, 0, 0, 1, 1); + + setCentralWidget(centralWidget); + + DesignWidget *designview = new DesignWidget(ctx); + designview->setMinimumWidth(300); + designview->setMaximumWidth(300); + splitter_h->addWidget(designview); + + connect(designview, SIGNAL(info(std::string)), this, + SLOT(writeInfo(std::string))); + + tabWidget = new QTabWidget(); + tabWidget->addTab(new PythonTab(), "Python"); + info = new InfoTab(); + tabWidget->addTab(info, "Info"); + splitter_v->addWidget(new FPGAViewWidget()); + splitter_v->addWidget(tabWidget); +} + +BaseMainWindow::~BaseMainWindow() {} + +void BaseMainWindow::writeInfo(std::string text) { info->info(text); } + +void BaseMainWindow::createMenusAndBars() +{ + QAction *actionOpen = new QAction("Open", this); + QIcon icon1; + icon1.addFile(QStringLiteral(":/icons/resources/open.png")); + actionOpen->setIcon(icon1); + actionOpen->setShortcuts(QKeySequence::Open); + actionOpen->setStatusTip("Open an existing JSON file"); + connect(actionOpen, SIGNAL(triggered()), this, SLOT(open())); + + QAction *actionSave = new QAction("Save", this); + QIcon icon2; + icon2.addFile(QStringLiteral(":/icons/resources/save.png")); + actionSave->setIcon(icon2); + actionSave->setShortcuts(QKeySequence::Save); + actionSave->setStatusTip("Save the ASC to disk"); + connect(actionSave, SIGNAL(triggered()), this, SLOT(save())); + actionSave->setEnabled(false); + + QAction *actionExit = new QAction("Exit", this); + QIcon icon3; + icon3.addFile(QStringLiteral(":/icons/resources/exit.png")); + actionExit->setIcon(icon3); + actionExit->setShortcuts(QKeySequence::Quit); + actionExit->setStatusTip("Exit the application"); + connect(actionExit, SIGNAL(triggered()), this, SLOT(close())); + + QAction *actionAbout = new QAction("About", this); + + menuBar = new QMenuBar(); + menuBar->setGeometry(QRect(0, 0, 1024, 27)); + QMenu *menu_File = new QMenu("&File", menuBar); + QMenu *menu_Help = new QMenu("&Help", menuBar); + menuBar->addAction(menu_File->menuAction()); + menuBar->addAction(menu_Help->menuAction()); + setMenuBar(menuBar); + + mainToolBar = new QToolBar(); + addToolBar(Qt::TopToolBarArea, mainToolBar); + + statusBar = new QStatusBar(); + setStatusBar(statusBar); + + menu_File->addAction(actionOpen); + menu_File->addAction(actionSave); + menu_File->addSeparator(); + menu_File->addAction(actionExit); + menu_Help->addAction(actionAbout); + + mainToolBar->addAction(actionOpen); + mainToolBar->addAction(actionSave); +} + +void BaseMainWindow::open() +{ + QString fileName = QFileDialog::getOpenFileName(this, QString(), QString(), + QString("*.json")); + if (!fileName.isEmpty()) { + tabWidget->setCurrentWidget(info); + + std::string fn = fileName.toStdString(); + std::istream *f = new std::ifstream(fn); + + parse_json_file(f, fn, ctx); + + // pack_design(ctx); + print_utilisation(ctx); + } +} + +bool BaseMainWindow::save() { return false; } diff --git a/gui/basewindow.h b/gui/basewindow.h new file mode 100644 index 00000000..52efd6b1 --- /dev/null +++ b/gui/basewindow.h @@ -0,0 +1,45 @@ +#ifndef BASEMAINWINDOW_H +#define BASEMAINWINDOW_H + +#include "infotab.h" +#include "nextpnr.h" + +#include +#include +#include +#include +#include +#include + + +// FIXME +USING_NEXTPNR_NAMESPACE + +class BaseMainWindow : public QMainWindow +{ + Q_OBJECT + + public: + explicit BaseMainWindow(Context *ctx, QWidget *parent = 0); + ~BaseMainWindow(); + Context *getContext() { return ctx; } + + protected: + void createMenusAndBars(); + + protected Q_SLOTS: + void writeInfo(std::string text); + void open(); + bool save(); + + protected: + Context *ctx; + QTabWidget *tabWidget; + InfoTab *info; + + QMenuBar *menuBar; + QToolBar *mainToolBar; + QStatusBar *statusBar; +}; + +#endif // BASEMAINWINDOW_H diff --git a/gui/dummy/mainwindow.cc b/gui/dummy/mainwindow.cc new file mode 100644 index 00000000..dad73d7e --- /dev/null +++ b/gui/dummy/mainwindow.cc @@ -0,0 +1,19 @@ +#include "mainwindow.h" + +MainWindow::MainWindow(Context *_ctx, QWidget *parent) + : BaseMainWindow(_ctx, parent) +{ + std::string title = "nextpnr-dummy - " + ctx->getChipName(); + setWindowTitle(title.c_str()); + + createMenu(); +} + +MainWindow::~MainWindow() {} + +void MainWindow::createMenu() +{ + QMenu *menu_Custom = new QMenu("&Dummy", menuBar); + menuBar->addAction(menu_Custom->menuAction()); + +} diff --git a/gui/dummy/mainwindow.h b/gui/dummy/mainwindow.h new file mode 100644 index 00000000..e9c8ff77 --- /dev/null +++ b/gui/dummy/mainwindow.h @@ -0,0 +1,21 @@ +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include "../basewindow.h" + +// FIXME +USING_NEXTPNR_NAMESPACE + +class MainWindow : public BaseMainWindow +{ + Q_OBJECT + + public: + explicit MainWindow(Context *ctx, QWidget *parent = 0); + ~MainWindow(); + + public: + void createMenu(); +}; + +#endif // MAINWINDOW_H diff --git a/gui/emb.cc b/gui/emb.cc deleted file mode 100644 index 2e3379d5..00000000 --- a/gui/emb.cc +++ /dev/null @@ -1,138 +0,0 @@ -// -// Copyright (C) 2011 Mateusz Loskot -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) -// -// Blog article: http://mateusz.loskot.net/?p=2819 - -#include "emb.h" -#include -#include -#include -#include - -namespace emb { -struct Stdout -{ - PyObject_HEAD stdout_write_type write; -}; - -PyObject *Stdout_write(PyObject *self, PyObject *args) -{ - std::size_t written(0); - Stdout *selfimpl = reinterpret_cast(self); - if (selfimpl->write) { - char *data; - if (!PyArg_ParseTuple(args, "s", &data)) - return 0; - - std::string str(data); - selfimpl->write(str); - written = str.size(); - } - return PyLong_FromSize_t(written); -} - -PyObject *Stdout_flush(PyObject *self, PyObject *args) -{ - // no-op - return Py_BuildValue(""); -} - -PyMethodDef Stdout_methods[] = { - {"write", Stdout_write, METH_VARARGS, "sys.stdout.write"}, - {"flush", Stdout_flush, METH_VARARGS, "sys.stdout.write"}, - {0, 0, 0, 0} // sentinel -}; - -PyTypeObject StdoutType = { - PyVarObject_HEAD_INIT(0, 0) "emb.StdoutType", /* tp_name */ - sizeof(Stdout), /* tp_basicsize */ - 0, /* tp_itemsize */ - 0, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT, /* tp_flags */ - "emb.Stdout objects", /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - Stdout_methods, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - 0, /* tp_init */ - 0, /* tp_alloc */ - 0, /* tp_new */ -}; - -PyModuleDef embmodule = { - PyModuleDef_HEAD_INIT, "emb", 0, -1, 0, -}; - -// Internal state -PyObject *g_stdout; -PyObject *g_stdout_saved; - -PyMODINIT_FUNC PyInit_emb(void) -{ - g_stdout = 0; - g_stdout_saved = 0; - - StdoutType.tp_new = PyType_GenericNew; - if (PyType_Ready(&StdoutType) < 0) - return 0; - - PyObject *m = PyModule_Create(&embmodule); - if (m) { - Py_INCREF(&StdoutType); - PyModule_AddObject(m, "Stdout", - reinterpret_cast(&StdoutType)); - } - return m; -} - -void set_stdout(stdout_write_type write) -{ - if (!g_stdout) { - g_stdout_saved = PySys_GetObject("stdout"); // borrowed - g_stdout = StdoutType.tp_new(&StdoutType, 0, 0); - } - - Stdout *impl = reinterpret_cast(g_stdout); - impl->write = write; - PySys_SetObject("stdout", g_stdout); -} - -void reset_stdout() -{ - if (g_stdout_saved) - PySys_SetObject("stdout", g_stdout_saved); - - Py_XDECREF(g_stdout); - g_stdout = 0; -} - -void append_inittab() { PyImport_AppendInittab("emb", emb::PyInit_emb); } - -} // namespace emb diff --git a/gui/emb.h b/gui/emb.h deleted file mode 100644 index 3daa7ca3..00000000 --- a/gui/emb.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// Copyright (C) 2011 Mateusz Loskot -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) -// -// Blog article: http://mateusz.loskot.net/?p=2819 - -#include -#include -#include - -namespace emb { -typedef std::function stdout_write_type; - -void set_stdout(stdout_write_type write); -void reset_stdout(); - -void append_inittab(); -} // namespace emb diff --git a/gui/fpgaviewwidget.cc b/gui/fpgaviewwidget.cc index 000b4cf0..6b7e7787 100644 --- a/gui/fpgaviewwidget.cc +++ b/gui/fpgaviewwidget.cc @@ -9,14 +9,14 @@ FPGAViewWidget::FPGAViewWidget(QWidget *parent) : QOpenGLWidget(parent), m_xMove(0), m_yMove(0), m_zDistance(1.0) { - ctx = qobject_cast(getMainWindow())->getContext(); + ctx = qobject_cast(getMainWindow())->getContext(); } QMainWindow *FPGAViewWidget::getMainWindow() { QWidgetList widgets = qApp->topLevelWidgets(); for (QWidgetList::iterator i = widgets.begin(); i != widgets.end(); ++i) - if ((*i)->objectName() == "MainWindow") + if ((*i)->objectName() == "BaseMainWindow") return (QMainWindow *)(*i); return NULL; } diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc new file mode 100644 index 00000000..4f53c551 --- /dev/null +++ b/gui/ice40/mainwindow.cc @@ -0,0 +1,29 @@ +#include "mainwindow.h" +#include +#include +#include "jsonparse.h" +#include "log.h" +#include "pack.h" +#include "pcf.h" +#include "place_sa.h" +#include "route.h" +#include "bitstream.h" +#include "design_utils.h" + +MainWindow::MainWindow(Context *_ctx, QWidget *parent) + : BaseMainWindow(_ctx, parent) +{ + std::string title = "nextpnr-ice40 - " + ctx->getChipName(); + setWindowTitle(title.c_str()); + + createMenu(); +} + +MainWindow::~MainWindow() {} + +void MainWindow::createMenu() +{ + QMenu *menu_Custom = new QMenu("&ICE 40", menuBar); + menuBar->addAction(menu_Custom->menuAction()); + +} diff --git a/gui/ice40/mainwindow.h b/gui/ice40/mainwindow.h new file mode 100644 index 00000000..e9c8ff77 --- /dev/null +++ b/gui/ice40/mainwindow.h @@ -0,0 +1,21 @@ +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include "../basewindow.h" + +// FIXME +USING_NEXTPNR_NAMESPACE + +class MainWindow : public BaseMainWindow +{ + Q_OBJECT + + public: + explicit MainWindow(Context *ctx, QWidget *parent = 0); + ~MainWindow(); + + public: + void createMenu(); +}; + +#endif // MAINWINDOW_H diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc deleted file mode 100644 index 91232390..00000000 --- a/gui/mainwindow.cc +++ /dev/null @@ -1,145 +0,0 @@ -#include "mainwindow.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "designwidget.h" -#include "fpgaviewwidget.h" -#include "jsonparse.h" -#include "log.h" -#include "pythontab.h" -//#include "pack.h" -//#include "pcf.h" -#include "place_sa.h" -#include "pybindings.h" -#include "route.h" -//#include "bitstream.h" -#include "design_utils.h" - -MainWindow::MainWindow(Context *_ctx, QWidget *parent) - : QMainWindow(parent), ctx(_ctx) -{ - Q_INIT_RESOURCE(nextpnr); - - log_files.clear(); - log_streams.clear(); - log_write_function = [this](std::string text) { info->info(text); }; - - std::string title = "nextpnr-ice40 - " + ctx->getChipName(); - setWindowTitle(title.c_str()); - setObjectName(QStringLiteral("MainWindow")); - resize(1024, 768); - - createMenusAndBars(); - - QWidget *centralWidget = new QWidget(this); - - QGridLayout *gridLayout = new QGridLayout(centralWidget); - gridLayout->setSpacing(6); - gridLayout->setContentsMargins(11, 11, 11, 11); - - QSplitter *splitter_h = new QSplitter(Qt::Horizontal, centralWidget); - QSplitter *splitter_v = new QSplitter(Qt::Vertical, splitter_h); - splitter_h->addWidget(splitter_v); - - gridLayout->addWidget(splitter_h, 0, 0, 1, 1); - - setCentralWidget(centralWidget); - - DesignWidget *designview = new DesignWidget(ctx); - designview->setMinimumWidth(300); - designview->setMaximumWidth(300); - splitter_h->addWidget(designview); - - connect(designview, SIGNAL(info(std::string)), this, - SLOT(writeInfo(std::string))); - - tabWidget = new QTabWidget(); - tabWidget->addTab(new PythonTab(), "Python"); - info = new InfoTab(); - tabWidget->addTab(info, "Info"); - splitter_v->addWidget(new FPGAViewWidget()); - splitter_v->addWidget(tabWidget); -} - -MainWindow::~MainWindow() {} - -void MainWindow::writeInfo(std::string text) { info->info(text); } - -void MainWindow::createMenusAndBars() -{ - QAction *actionOpen = new QAction("Open", this); - QIcon icon1; - icon1.addFile(QStringLiteral(":/icons/resources/open.png")); - actionOpen->setIcon(icon1); - actionOpen->setShortcuts(QKeySequence::Open); - actionOpen->setStatusTip("Open an existing JSON file"); - connect(actionOpen, SIGNAL(triggered()), this, SLOT(open())); - - QAction *actionSave = new QAction("Save", this); - QIcon icon2; - icon2.addFile(QStringLiteral(":/icons/resources/save.png")); - actionSave->setIcon(icon2); - actionSave->setShortcuts(QKeySequence::Save); - actionSave->setStatusTip("Save the ASC to disk"); - connect(actionSave, SIGNAL(triggered()), this, SLOT(save())); - actionSave->setEnabled(false); - - QAction *actionExit = new QAction("Exit", this); - QIcon icon3; - icon3.addFile(QStringLiteral(":/icons/resources/exit.png")); - actionExit->setIcon(icon3); - actionExit->setShortcuts(QKeySequence::Quit); - actionExit->setStatusTip("Exit the application"); - connect(actionExit, SIGNAL(triggered()), this, SLOT(close())); - - QAction *actionAbout = new QAction("About", this); - - QMenuBar *menuBar = new QMenuBar(); - menuBar->setGeometry(QRect(0, 0, 1024, 27)); - QMenu *menu_File = new QMenu("&File", menuBar); - QMenu *menu_Help = new QMenu("&Help", menuBar); - menuBar->addAction(menu_File->menuAction()); - menuBar->addAction(menu_Help->menuAction()); - setMenuBar(menuBar); - - QToolBar *mainToolBar = new QToolBar(); - addToolBar(Qt::TopToolBarArea, mainToolBar); - - QStatusBar *statusBar = new QStatusBar(); - setStatusBar(statusBar); - - menu_File->addAction(actionOpen); - menu_File->addAction(actionSave); - menu_File->addSeparator(); - menu_File->addAction(actionExit); - menu_Help->addAction(actionAbout); - - mainToolBar->addAction(actionOpen); - mainToolBar->addAction(actionSave); -} - -void MainWindow::open() -{ - QString fileName = QFileDialog::getOpenFileName(this, QString(), QString(), - QString("*.json")); - if (!fileName.isEmpty()) { - tabWidget->setCurrentWidget(info); - - std::string fn = fileName.toStdString(); - std::istream *f = new std::ifstream(fn); - - parse_json_file(f, fn, ctx); - - // pack_design(ctx); - print_utilisation(ctx); - } -} - -bool MainWindow::save() { return false; } diff --git a/gui/mainwindow.h b/gui/mainwindow.h deleted file mode 100644 index 35d917d9..00000000 --- a/gui/mainwindow.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include "infotab.h" -#include "nextpnr.h" - -#include -#include - -// FIXME -USING_NEXTPNR_NAMESPACE - -class MainWindow : public QMainWindow -{ - Q_OBJECT - - public: - explicit MainWindow(Context *ctx, QWidget *parent = 0); - ~MainWindow(); - Context *getContext() { return ctx; } - - private: - void createMenusAndBars(); - - private Q_SLOTS: - void writeInfo(std::string text); - void open(); - bool save(); - - private: - Context *ctx; - QTabWidget *tabWidget; - InfoTab *info; -}; - -#endif // MAINWINDOW_H -- cgit v1.2.3 From 0ed455096a9dd3b291c6b4a46b59c1ce6a506902 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 21 Jun 2018 13:52:58 +0200 Subject: make dummy target work as well --- dummy/main.cc | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 81 insertions(+), 4 deletions(-) diff --git a/dummy/main.cc b/dummy/main.cc index 6375eef9..7a961760 100644 --- a/dummy/main.cc +++ b/dummy/main.cc @@ -20,20 +20,97 @@ #ifdef MAIN_EXECUTABLE #include +#include +#include +#include "log.h" #include "mainwindow.h" #include "nextpnr.h" +#include "pybindings.h" +#include "version.h" USING_NEXTPNR_NAMESPACE int main(int argc, char *argv[]) { + namespace po = boost::program_options; + int rc = 0; + + log_files.push_back(stdout); + + po::options_description options("Allowed options"); + options.add_options()("help,h", "show help"); + options.add_options()("verbose,v", "verbose output"); + options.add_options()("force,f", "keep running after errors"); + options.add_options()("gui", "start gui"); + options.add_options()("version,V", "show version"); + po::positional_options_description pos; + pos.add("run", -1); + + po::variables_map vm; + try { + po::parsed_options parsed = po::command_line_parser(argc, argv) + .options(options) + .positional(pos) + .run(); + + po::store(parsed, vm); + + po::notify(vm); + } + + catch (std::exception &e) { + std::cout << e.what() << "\n"; + return 1; + } + + if (vm.count("help") || argc == 1) { + std::cout << boost::filesystem::basename(argv[0]) + << " -- Next Generation Place and Route (git " + "sha1 " GIT_COMMIT_HASH_STR ")\n"; + std::cout << "\n"; + std::cout << options << "\n"; + return argc != 1; + } + + if (vm.count("version")) { + std::cout << boost::filesystem::basename(argv[0]) + << " -- Next Generation Place and Route (git " + "sha1 " GIT_COMMIT_HASH_STR ")\n"; + return 1; + } + Context ctx(ArchArgs{}); + init_python(argv[0]); + python_export_global("ctx", ctx); + + if (vm.count("verbose")) { + ctx.verbose = true; + } + + if (vm.count("force")) { + ctx.force = true; + } + + if (vm.count("seed")) { + ctx.rngseed(vm["seed"].as()); + } + + if (vm.count("run")) { + std::vector files = + vm["run"].as>(); + for (auto filename : files) + execute_python_file(filename.c_str()); + } - QApplication a(argc, argv); - MainWindow w(&ctx); - w.show(); + if (vm.count("gui")) { + QApplication a(argc, argv); + MainWindow w(&ctx); + w.show(); - return a.exec(); + rc = a.exec(); + } + deinit_python(); + return rc; } #endif -- cgit v1.2.3 From 23fe31da44a2e2596335c09ae983217ffbc8f6b1 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 21 Jun 2018 13:55:36 +0200 Subject: cleanup --- dummy/main.cc | 2 ++ gui/basewindow.cc | 2 +- gui/basewindow.h | 7 +++---- gui/dummy/mainwindow.cc | 1 - gui/ice40/mainwindow.cc | 5 ++--- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dummy/main.cc b/dummy/main.cc index 7a961760..cef70235 100644 --- a/dummy/main.cc +++ b/dummy/main.cc @@ -42,6 +42,8 @@ int main(int argc, char *argv[]) options.add_options()("verbose,v", "verbose output"); options.add_options()("force,f", "keep running after errors"); options.add_options()("gui", "start gui"); + options.add_options()("run", po::value>(), + "python file to execute"); options.add_options()("version,V", "show version"); po::positional_options_description pos; pos.add("run", -1); diff --git a/gui/basewindow.cc b/gui/basewindow.cc index cbf0faae..fa9528fc 100644 --- a/gui/basewindow.cc +++ b/gui/basewindow.cc @@ -1,4 +1,3 @@ -#include "mainwindow.h" #include #include #include @@ -9,6 +8,7 @@ #include "fpgaviewwidget.h" #include "jsonparse.h" #include "log.h" +#include "mainwindow.h" #include "pythontab.h" //#include "pack.h" //#include "pcf.h" diff --git a/gui/basewindow.h b/gui/basewindow.h index 52efd6b1..630e0f84 100644 --- a/gui/basewindow.h +++ b/gui/basewindow.h @@ -5,12 +5,11 @@ #include "nextpnr.h" #include -#include #include #include -#include #include - +#include +#include // FIXME USING_NEXTPNR_NAMESPACE @@ -36,7 +35,7 @@ class BaseMainWindow : public QMainWindow Context *ctx; QTabWidget *tabWidget; InfoTab *info; - + QMenuBar *menuBar; QToolBar *mainToolBar; QStatusBar *statusBar; diff --git a/gui/dummy/mainwindow.cc b/gui/dummy/mainwindow.cc index dad73d7e..a9420524 100644 --- a/gui/dummy/mainwindow.cc +++ b/gui/dummy/mainwindow.cc @@ -15,5 +15,4 @@ void MainWindow::createMenu() { QMenu *menu_Custom = new QMenu("&Dummy", menuBar); menuBar->addAction(menu_Custom->menuAction()); - } diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc index 4f53c551..3744cdc7 100644 --- a/gui/ice40/mainwindow.cc +++ b/gui/ice40/mainwindow.cc @@ -1,14 +1,14 @@ #include "mainwindow.h" #include #include +#include "bitstream.h" +#include "design_utils.h" #include "jsonparse.h" #include "log.h" #include "pack.h" #include "pcf.h" #include "place_sa.h" #include "route.h" -#include "bitstream.h" -#include "design_utils.h" MainWindow::MainWindow(Context *_ctx, QWidget *parent) : BaseMainWindow(_ctx, parent) @@ -25,5 +25,4 @@ void MainWindow::createMenu() { QMenu *menu_Custom = new QMenu("&ICE 40", menuBar); menuBar->addAction(menu_Custom->menuAction()); - } -- cgit v1.2.3