Merge branch 'refactor'

6 files changed, 23 insertions, 23 deletions

diff --git a/gui/designwidget.cc b/gui/designwidget.cc
index ac367e4e..9bb25992 100644
--- a/gui/designwidget.cc
+++ b/gui/designwidget.cc
@@ -77,8 +77,8 @@ class PipTreeItem : public ElementTreeItem
     IdString data;

 };

 

-DesignWidget::DesignWidget(Design *_design, QWidget *parent)

-        : QWidget(parent), design(_design)

+DesignWidget::DesignWidget(Context *_ctx, QWidget *parent)

+        : QWidget(parent), ctx(_ctx)

 {

 

     treeWidget = new QTreeWidget();

@@ -93,8 +93,8 @@ DesignWidget::DesignWidget(Design *_design, QWidget *parent)
     bel_root->setText(0, QString("Bels"));

     treeWidget->insertTopLevelItem(0, bel_root);

     QList<QTreeWidgetItem *> bel_items;

-    for (auto bel : design->chip.getBels()) {

-        auto name = design->chip.getBelName(bel);

+    for (auto bel : ctx->getBels()) {

+        auto name = ctx->getBelName(bel);

         bel_items.append(

                 new BelTreeItem(name, ElementType::BEL, QString(name.c_str())));

     }

@@ -105,8 +105,8 @@ DesignWidget::DesignWidget(Design *_design, QWidget *parent)
     QList<QTreeWidgetItem *> wire_items;

     wire_root->setText(0, QString("Wires"));

     treeWidget->insertTopLevelItem(0, wire_root);

-    for (auto wire : design->chip.getWires()) {

-        auto name = design->chip.getWireName(wire);

+    for (auto wire : ctx->getWires()) {

+        auto name = ctx->getWireName(wire);

         wire_items.append(new WireTreeItem(name, ElementType::WIRE,

                                            QString(name.c_str())));

     }

@@ -117,8 +117,8 @@ DesignWidget::DesignWidget(Design *_design, QWidget *parent)
     QList<QTreeWidgetItem *> pip_items;

     pip_root->setText(0, QString("Pips"));

     treeWidget->insertTopLevelItem(0, pip_root);

-    for (auto pip : design->chip.getPips()) {

-        auto name = design->chip.getPipName(pip);

+    for (auto pip : ctx->getPips()) {

+        auto name = ctx->getPipName(pip);

         pip_items.append(

                 new PipTreeItem(name, ElementType::PIP, QString(name.c_str())));

     }

diff --git a/gui/designwidget.h b/gui/designwidget.h
index e3f7e622..9682726c 100644
--- a/gui/designwidget.h
+++ b/gui/designwidget.h
@@ -15,9 +15,9 @@ class DesignWidget : public QWidget
     Q_OBJECT

 

   public:

-    explicit DesignWidget(Design *design, QWidget *parent = 0);

+    explicit DesignWidget(Context *ctx, QWidget *parent = 0);

     ~DesignWidget();

-    Design *getDesign() { return design; }

+    Context *getContext() { return ctx; }

 

   private:

     void addProperty(QtVariantProperty *property, const QString &id);

@@ -32,7 +32,7 @@ class DesignWidget : public QWidget
     void selectObject();

 

   private:

-    Design *design;

+    Context *ctx;

 

     QTreeWidget *treeWidget;

 

diff --git a/gui/fpgaviewwidget.cc b/gui/fpgaviewwidget.cc
index 58df0586..000b4cf0 100644
--- a/gui/fpgaviewwidget.cc
+++ b/gui/fpgaviewwidget.cc
@@ -9,7 +9,7 @@
 FPGAViewWidget::FPGAViewWidget(QWidget *parent)
         : QOpenGLWidget(parent), m_xMove(0), m_yMove(0), m_zDistance(1.0)
 {
-    design = qobject_cast<MainWindow *>(getMainWindow())->getDesign();
+    ctx = qobject_cast<MainWindow *>(getMainWindow())->getContext();
 }
 
 QMainWindow *FPGAViewWidget::getMainWindow()
@@ -118,12 +118,12 @@ void FPGAViewWidget::paintGL()
     glColor3f(0.1, 0.1, 0.1);
     glLineWidth(0.1);
     // Draw Bels
-    for (auto bel : design->chip.getBels()) {
-        for (auto &el : design->chip.getBelGraphics(bel))
+    for (auto bel : ctx->getBels()) {
+        for (auto &el : ctx->getBelGraphics(bel))
             drawElement(el);
     }
     // Draw Frame Graphics
-    for (auto &el : design->chip.getFrameGraphics())
+    for (auto &el : ctx->getFrameGraphics())
         drawElement(el);
 }
 
diff --git a/gui/fpgaviewwidget.h b/gui/fpgaviewwidget.h
index 1d05afb7..2407f757 100644
--- a/gui/fpgaviewwidget.h
+++ b/gui/fpgaviewwidget.h
@@ -46,7 +46,7 @@ class FPGAViewWidget : public QOpenGLWidget, protected QOpenGLFunctions
     float m_yMove;
     float m_zDistance;
     QPoint m_lastPos;
-    Design *design;
+    Context *ctx;
 };
 
 #endif
diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc
index 76addbba..b9b86663 100644
--- a/gui/mainwindow.cc
+++ b/gui/mainwindow.cc
@@ -11,10 +11,10 @@
 #include "fpgaviewwidget.h"

 #include "pythontab.h"

 

-MainWindow::MainWindow(Design *_design, QWidget *parent)

-        : QMainWindow(parent), design(_design)

+MainWindow::MainWindow(Context *_ctx, QWidget *parent)

+        : QMainWindow(parent), ctx(_ctx)

 {

-    std::string title = "nextpnr-ice40 - " + design->chip.getChipName();

+    std::string title = "nextpnr-ice40 - " + ctx->getChipName();

     setWindowTitle(title.c_str());

     setObjectName(QStringLiteral("MainWindow"));

     resize(1024, 768);

@@ -35,7 +35,7 @@ MainWindow::MainWindow(Design *_design, QWidget *parent)
 

     setCentralWidget(centralWidget);

 

-    DesignWidget *designview = new DesignWidget(design);

+    DesignWidget *designview = new DesignWidget(ctx);

     designview->setMinimumWidth(300);

     designview->setMaximumWidth(300);

     splitter_h->addWidget(designview);

diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 6516a986..149c4aa5 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -15,9 +15,9 @@ class MainWindow : public QMainWindow
     Q_OBJECT

 

   public:

-    explicit MainWindow(Design *design, QWidget *parent = 0);

+    explicit MainWindow(Context *ctx, QWidget *parent = 0);

     ~MainWindow();

-    Design *getDesign() { return design; }

+    Context *getContext() { return ctx; }

 

   private:

     void createMenusAndBars();

@@ -26,7 +26,7 @@ class MainWindow : public QMainWindow
     void writeInfo(std::string text);

 

   private:

-    Design *design;

+    Context *ctx;

     InfoTab *info;

 };