From c6604a45826c690de3fcd09b46a027904ecff7cd Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 7 Feb 2019 17:25:14 +0100 Subject: Fix reading conflicting wire in GUI for pips, fixes #225 --- gui/designwidget.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gui') 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), -- cgit v1.2.3 From bfc96cc962711a6e93eb0b7ce0dfefb6a41d8c31 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 7 Feb 2019 17:42:14 +0100 Subject: Better resize, FPGAViewWidget minimal is now 320x200, fixes #222 --- gui/fpgaviewwidget.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gui') 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); } -- cgit v1.2.3