Merge branch 'q3k/gl' into 'master'

Modern OpenGL renderer

See merge request SymbioticEDA/nextpnr!1

1 files changed, 7 insertions, 7 deletions

diff --git a/gui/designwidget.cc b/gui/designwidget.cc
index cc161c9e..0f87f06c 100644
--- a/gui/designwidget.cc
+++ b/gui/designwidget.cc
@@ -117,7 +117,7 @@ DesignWidget::DesignWidget(Context *_ctx, QWidget *parent)
     for (auto bel : ctx->getBels()) {

         auto name = ctx->getBelName(bel);

         bel_items.append(

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

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

     }

     bel_root->addChildren(bel_items);

 

@@ -129,7 +129,7 @@ DesignWidget::DesignWidget(Context *_ctx, QWidget *parent)
     for (auto wire : ctx->getWires()) {

         auto name = ctx->getWireName(wire);

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

-                                           QString(name.c_str())));

+                                           QString(name.c_str(ctx))));

     }

     wire_root->addChildren(wire_items);

 

@@ -141,7 +141,7 @@ DesignWidget::DesignWidget(Context *_ctx, QWidget *parent)
     for (auto pip : ctx->getPips()) {

         auto name = ctx->getPipName(pip);

         pip_items.append(

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

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

     }

     pip_root->addChildren(pip_items);

 

@@ -184,7 +184,7 @@ void DesignWidget::addProperty(QtVariantProperty *property, const QString &id)
 {

     propertyToId[property] = id;

     idToProperty[id] = property;

-    QtBrowserItem *item = propertyEditor->addProperty(property);

+    propertyEditor->addProperty(property);

 }

 

 void DesignWidget::clearProperties()

@@ -213,14 +213,14 @@ void DesignWidget::onItemClicked(QTreeWidgetItem *item, int pos)
 

         QtVariantProperty *topItem =

                 variantManager->addProperty(QVariant::String, QString("Name"));

-        topItem->setValue(QString(c.c_str()));

+        topItem->setValue(QString(c.c_str(ctx)));

         addProperty(topItem, QString("Name"));

     } else if (type == ElementType::WIRE) {

         IdString c = static_cast<WireTreeItem *>(item)->getData();

 

         QtVariantProperty *topItem =

                 variantManager->addProperty(QVariant::String, QString("Name"));

-        topItem->setValue(QString(c.c_str()));

+        topItem->setValue(QString(c.c_str(ctx)));

         addProperty(topItem, QString("Name"));

 

     } else if (type == ElementType::PIP) {

@@ -228,7 +228,7 @@ void DesignWidget::onItemClicked(QTreeWidgetItem *item, int pos)
 

         QtVariantProperty *topItem =

                 variantManager->addProperty(QVariant::String, QString("Name"));

-        topItem->setValue(QString(c.c_str()));

+        topItem->setValue(QString(c.c_str(ctx)));

         addProperty(topItem, QString("Name"));

     }

 }