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

Remove base config, since deprecated

Browse Source
This commit is contained in:
Miodrag Milanovic 2019-06-14 13:02:15 +02:00
parent 0d8c80ad5d
commit 903391a9e4
2 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gui/ecp5/mainwindow.cc
View File

@ -60,12 +60,6 @@ void MainWindow::createMenu()
actionLoadLPF->setEnabled(false); actionLoadLPF->setEnabled(false);
connect(actionLoadLPF, &QAction::triggered, this, &MainWindow::open_lpf); connect(actionLoadLPF, &QAction::triggered, this, &MainWindow::open_lpf);
actionLoadBase = new QAction("Open Base Config", this);
actionLoadBase->setIcon(QIcon(":/icons/resources/open_base.png"));
actionLoadBase->setStatusTip("Open Base Config file");
actionLoadBase->setEnabled(false);
connect(actionLoadBase, &QAction::triggered, this, &MainWindow::open_base);
actionSaveConfig = new QAction("Save Bitstream", this); actionSaveConfig = new QAction("Save Bitstream", this);
actionSaveConfig->setIcon(QIcon(":/icons/resources/save_config.png")); actionSaveConfig->setIcon(QIcon(":/icons/resources/save_config.png"));
actionSaveConfig->setStatusTip("Save Bitstream config file"); actionSaveConfig->setStatusTip("Save Bitstream config file");
@ -75,12 +69,10 @@ void MainWindow::createMenu()
// Add actions in menus // Add actions in menus
mainActionBar->addSeparator(); mainActionBar->addSeparator();
mainActionBar->addAction(actionLoadLPF); mainActionBar->addAction(actionLoadLPF);
mainActionBar->addAction(actionLoadBase);
mainActionBar->addAction(actionSaveConfig); mainActionBar->addAction(actionSaveConfig);
menuDesign->addSeparator(); menuDesign->addSeparator();
menuDesign->addAction(actionLoadLPF); menuDesign->addAction(actionLoadLPF);
menuDesign->addAction(actionLoadBase);
menuDesign->addAction(actionSaveConfig); menuDesign->addAction(actionSaveConfig);
} }
@ -139,13 +131,6 @@ void MainWindow::new_proj()
} }
} }
void MainWindow::load_base_config(std::string filename)
{
disableActions();
currentBaseConfig = filename;
actionSaveConfig->setEnabled(true);
}
void MainWindow::open_lpf() void MainWindow::open_lpf()
{ {
QString fileName = QFileDialog::getOpenFileName(this, QString("Open LPF"), QString(), QString("*.lpf")); QString fileName = QFileDialog::getOpenFileName(this, QString("Open LPF"), QString(), QString("*.lpf"));
@ -162,21 +147,13 @@ void MainWindow::open_lpf()
} }
} }
void MainWindow::open_base()
{
QString fileName = QFileDialog::getOpenFileName(this, QString("Open Base Config"), QString(), QString("*.config"));
if (!fileName.isEmpty()) {
load_base_config(fileName.toStdString());
}
}
void MainWindow::save_config() void MainWindow::save_config()
{ {
QString fileName = QFileDialog::getSaveFileName(this, QString("Save Bitstream"), QString(), QString("*.config")); QString fileName = QFileDialog::getSaveFileName(this, QString("Save Bitstream"), QString(), QString("*.config"));
if (!fileName.isEmpty()) { if (!fileName.isEmpty()) {
std::string fn = fileName.toStdString(); std::string fn = fileName.toStdString();
disableActions(); disableActions();
write_bitstream(ctx.get(), currentBaseConfig, fileName.toStdString()); write_bitstream(ctx.get(), "", fileName.toStdString());
log("Saving Bitstream successful.\n"); log("Saving Bitstream successful.\n");
} }
} }
@ -184,15 +161,12 @@ void MainWindow::save_config()
void MainWindow::onDisableActions() void MainWindow::onDisableActions()
{ {
actionLoadLPF->setEnabled(false); actionLoadLPF->setEnabled(false);
actionLoadBase->setEnabled(false);
actionSaveConfig->setEnabled(false); actionSaveConfig->setEnabled(false);
} }
void MainWindow::onUpdateActions() { void MainWindow::onUpdateActions() {
if (ctx->settings.find(ctx->id("pack"))==ctx->settings.end()) if (ctx->settings.find(ctx->id("pack"))==ctx->settings.end())
actionLoadLPF->setEnabled(true); actionLoadLPF->setEnabled(true);
if (ctx->settings.find(ctx->id("pack"))==ctx->settings.end())
actionLoadBase->setEnabled(true);
if (ctx->settings.find(ctx->id("route"))!=ctx->settings.end()) if (ctx->settings.find(ctx->id("route"))!=ctx->settings.end())
actionSaveConfig->setEnabled(true); actionSaveConfig->setEnabled(true);
} }

5
gui/ecp5/mainwindow.h
View File

@ -34,7 +34,6 @@ class MainWindow : public BaseMainWindow
public: public:
void createMenu(); void createMenu();
void load_base_config(std::string filename);
protected: protected:
void onDisableActions() override; void onDisableActions() override;
@ -44,17 +43,13 @@ class MainWindow : public BaseMainWindow
void new_proj() override; void new_proj() override;
void newContext(Context *ctx); void newContext(Context *ctx);
void open_lpf(); void open_lpf();
void open_base();
void save_config(); void save_config();
private: private:
QAction *actionLoadLPF; QAction *actionLoadLPF;
QAction *actionLoadBase;
QAction *actionSaveConfig; QAction *actionSaveConfig;
ArchArgs chipArgs; ArchArgs chipArgs;
std::string currentBaseConfig;
}; };
NEXTPNR_NAMESPACE_END NEXTPNR_NAMESPACE_END