diff options
| author | Eddie Hung <eddieh@ece.ubc.ca> | 2019-02-07 13:59:39 -0800 |
|---|---|---|
| committer | Eddie Hung <eddieh@ece.ubc.ca> | 2019-02-07 13:59:39 -0800 |
| commit | 3e182608159c2053428ecd71d0dafb0b550d0a53 (patch) | |
| tree | 01490644fb72df33acde47d14ce26dd44a57bc3a /gui | |
| parent | 09207cf91ffe586ca3d1df3a965035c60b5b5fa0 (diff) | |
| parent | bfc96cc962711a6e93eb0b7ce0dfefb6a41d8c31 (diff) | |
| download | nextpnr-3e182608159c2053428ecd71d0dafb0b550d0a53.tar.gz nextpnr-3e182608159c2053428ecd71d0dafb0b550d0a53.tar.bz2 nextpnr-3e182608159c2053428ecd71d0dafb0b550d0a53.zip | |
Merge remote-tracking branch 'origin/master' into regressions
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/designwidget.cc | 8 | ||||
| -rw-r--r-- | gui/fpgaviewwidget.cc | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/gui/designwidget.cc b/gui/designwidget.cc index 235dd2cb..fc99cd14 100644 --- a/gui/designwidget.cc +++ b/gui/designwidget.cc @@ -706,8 +706,12 @@ void DesignWidget::onSelectionChanged(int num, const QItemSelection &, const QIt addProperty(topItem, QVariant::String, "Type", ctx->getPipType(pip).c_str(ctx));
addProperty(topItem, QVariant::Bool, "Available", ctx->checkPipAvail(pip));
addProperty(topItem, QVariant::String, "Bound Net", ctx->nameOf(ctx->getBoundPipNet(pip)), ElementType::NET);
- addProperty(topItem, QVariant::String, "Conflicting Wire",
- ctx->getWireName(ctx->getConflictingPipWire(pip)).c_str(ctx), ElementType::WIRE);
+ if (ctx->getConflictingPipWire(pip) != WireId()) {
+ addProperty(topItem, QVariant::String, "Conflicting Wire",
+ ctx->getWireName(ctx->getConflictingPipWire(pip)).c_str(ctx), ElementType::WIRE);
+ } else {
+ addProperty(topItem, QVariant::String, "Conflicting Wire", "", ElementType::NONE);
+ }
addProperty(topItem, QVariant::String, "Conflicting Net", ctx->nameOf(ctx->getConflictingPipNet(pip)),
ElementType::NET);
addProperty(topItem, QVariant::String, "Src Wire", ctx->getWireName(ctx->getPipSrcWire(pip)).c_str(ctx),
diff --git a/gui/fpgaviewwidget.cc b/gui/fpgaviewwidget.cc index 3fba6bff..0ad90527 100644 --- a/gui/fpgaviewwidget.cc +++ b/gui/fpgaviewwidget.cc @@ -102,7 +102,7 @@ void FPGAViewWidget::newContext(Context *ctx) pokeRenderer(); } -QSize FPGAViewWidget::minimumSizeHint() const { return QSize(640, 480); } +QSize FPGAViewWidget::minimumSizeHint() const { return QSize(320, 200); } QSize FPGAViewWidget::sizeHint() const { return QSize(640, 480); } |