diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-08-08 19:36:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 19:36:05 +0200 |
| commit | b326b03a5261a824f428fe0811a5376c8758b929 (patch) | |
| tree | a13673a636ddbea3b5fd5585e3bb109b56b69435 /gui | |
| parent | cd4e761bb799ca99f02d3aa177961af28a93f2d8 (diff) | |
| parent | f6189e4677c7bdaeaa5b9b796a67d750e6c7d49d (diff) | |
| download | nextpnr-b326b03a5261a824f428fe0811a5376c8758b929.tar.gz nextpnr-b326b03a5261a824f428fe0811a5376c8758b929.tar.bz2 nextpnr-b326b03a5261a824f428fe0811a5376c8758b929.zip | |
Merge pull request #45 from YosysHQ/constids
Get rid of PortPin and BelType
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/designwidget.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gui/designwidget.cc b/gui/designwidget.cc index ce205a81..896ef071 100644 --- a/gui/designwidget.cc +++ b/gui/designwidget.cc @@ -405,7 +405,7 @@ void DesignWidget::onSelectionChanged(const QItemSelection &, const QItemSelecti QtProperty *topItem = addTopLevelProperty("Bel");
addProperty(topItem, QVariant::String, "Name", c.c_str(ctx));
- addProperty(topItem, QVariant::String, "Type", ctx->belTypeToId(ctx->getBelType(bel)).c_str(ctx));
+ addProperty(topItem, QVariant::String, "Type", ctx->getBelType(bel).c_str(ctx));
addProperty(topItem, QVariant::Bool, "Available", ctx->checkBelAvail(bel));
addProperty(topItem, QVariant::String, "Bound Cell", ctx->nameOf(ctx->getBoundBelCell(bel)), ElementType::CELL);
addProperty(topItem, QVariant::String, "Conflicting Cell", ctx->nameOf(ctx->getConflictingBelCell(bel)),
@@ -413,8 +413,8 @@ void DesignWidget::onSelectionChanged(const QItemSelection &, const QItemSelecti QtProperty *belpinsItem = addSubGroup(topItem, "Ports");
for (const auto &item : ctx->getBelPins(bel)) {
- QtProperty *portInfoItem = addSubGroup(belpinsItem, ctx->portPinToId(item).c_str(ctx));
- addProperty(portInfoItem, QVariant::String, "Name", ctx->portPinToId(item).c_str(ctx));
+ QtProperty *portInfoItem = addSubGroup(belpinsItem, item.c_str(ctx));
+ addProperty(portInfoItem, QVariant::String, "Name", item.c_str(ctx));
addProperty(portInfoItem, QVariant::Int, "Type", int(ctx->getBelPinType(bel, item)));
WireId wire = ctx->getBelPinWire(bel, item);
addProperty(portInfoItem, QVariant::String, "Wire", ctx->getWireName(wire).c_str(ctx), ElementType::WIRE);
@@ -446,7 +446,7 @@ void DesignWidget::onSelectionChanged(const QItemSelection &, const QItemSelecti QString belname = "";
if (item.bel != BelId())
belname = ctx->getBelName(item.bel).c_str(ctx);
- QString pinname = ctx->portPinToId(item.pin).c_str(ctx);
+ QString pinname = item.pin.c_str(ctx);
QtProperty *dhItem = addSubGroup(belpinsItem, belname + "-" + pinname);
addProperty(dhItem, QVariant::String, "Bel", belname, ElementType::BEL);
|