aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt4
-rw-r--r--common/emb.cc (renamed from gui/emb.cc)0
-rw-r--r--common/emb.h (renamed from gui/emb.h)0
-rw-r--r--gui/CMakeLists.txt3
-rw-r--r--gui/basewindow.cc (renamed from gui/mainwindow.cc)27
-rw-r--r--gui/basewindow.h45
-rw-r--r--gui/dummy/mainwindow.cc19
-rw-r--r--gui/dummy/mainwindow.h21
-rw-r--r--gui/fpgaviewwidget.cc4
-rw-r--r--gui/ice40/mainwindow.cc29
-rw-r--r--gui/ice40/mainwindow.h21
-rw-r--r--gui/mainwindow.h36
12 files changed, 151 insertions, 58 deletions
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/gui/emb.cc b/common/emb.cc
index 2e3379d5..2e3379d5 100644
--- a/gui/emb.cc
+++ b/common/emb.cc
diff --git a/gui/emb.h b/common/emb.h
index 3daa7ca3..3daa7ca3 100644
--- a/gui/emb.h
+++ b/common/emb.h
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/mainwindow.cc b/gui/basewindow.cc
index 91232390..cbf0faae 100644
--- a/gui/mainwindow.cc
+++ b/gui/basewindow.cc
@@ -3,11 +3,7 @@
#include <QFileDialog>
#include <QGridLayout>
#include <QIcon>
-#include <QMenu>
-#include <QMenuBar>
#include <QSplitter>
-#include <QStatusBar>
-#include <QToolBar>
#include <fstream>
#include "designwidget.h"
#include "fpgaviewwidget.h"
@@ -17,12 +13,11 @@
//#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)
+BaseMainWindow::BaseMainWindow(Context *_ctx, QWidget *parent)
: QMainWindow(parent), ctx(_ctx)
{
Q_INIT_RESOURCE(nextpnr);
@@ -31,9 +26,7 @@ MainWindow::MainWindow(Context *_ctx, QWidget *parent)
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"));
+ setObjectName(QStringLiteral("BaseMainWindow"));
resize(1024, 768);
createMenusAndBars();
@@ -68,11 +61,11 @@ MainWindow::MainWindow(Context *_ctx, QWidget *parent)
splitter_v->addWidget(tabWidget);
}
-MainWindow::~MainWindow() {}
+BaseMainWindow::~BaseMainWindow() {}
-void MainWindow::writeInfo(std::string text) { info->info(text); }
+void BaseMainWindow::writeInfo(std::string text) { info->info(text); }
-void MainWindow::createMenusAndBars()
+void BaseMainWindow::createMenusAndBars()
{
QAction *actionOpen = new QAction("Open", this);
QIcon icon1;
@@ -101,7 +94,7 @@ void MainWindow::createMenusAndBars()
QAction *actionAbout = new QAction("About", this);
- QMenuBar *menuBar = new 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);
@@ -109,10 +102,10 @@ void MainWindow::createMenusAndBars()
menuBar->addAction(menu_Help->menuAction());
setMenuBar(menuBar);
- QToolBar *mainToolBar = new QToolBar();
+ mainToolBar = new QToolBar();
addToolBar(Qt::TopToolBarArea, mainToolBar);
- QStatusBar *statusBar = new QStatusBar();
+ statusBar = new QStatusBar();
setStatusBar(statusBar);
menu_File->addAction(actionOpen);
@@ -125,7 +118,7 @@ void MainWindow::createMenusAndBars()
mainToolBar->addAction(actionSave);
}
-void MainWindow::open()
+void BaseMainWindow::open()
{
QString fileName = QFileDialog::getOpenFileName(this, QString(), QString(),
QString("*.json"));
@@ -142,4 +135,4 @@ void MainWindow::open()
}
}
-bool MainWindow::save() { return false; }
+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 <QMainWindow>
+#include <QTabWidget>
+#include <QMenu>
+#include <QMenuBar>
+#include <QToolBar>
+#include <QStatusBar>
+
+
+// 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/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<MainWindow *>(getMainWindow())->getContext();
+ ctx = qobject_cast<BaseMainWindow *>(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 <QAction>
+#include <QIcon>
+#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.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 <QMainWindow>
-#include <QTabWidget>
-
-// 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 21:16:27 +0000