Skip to content

Commit

Permalink
Merge branch 'master' into feature/toggle_nets
Browse files Browse the repository at this point in the history
  • Loading branch information
joern274 committed Nov 17, 2023
2 parents 3af13db + 4efe0a6 commit 091b374
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions plugins/gui/src/graph_widget/layouters/graph_layouter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -958,8 +958,7 @@ namespace hal
QPoint pnt(mNodeBoundingBox.right() + 1, yGridPos * 2);
const EndpointCoordinate& epc = mEndpointHash.value(pnt);
const NetLayoutJunction* nlj = mJunctionHash.value(pnt);
Q_ASSERT(nlj);
san->setOutputPosition(QPointF(mCoordArrayX->lanePosition(pnt.x(),nlj->rect().right()), epc.lanePosition(0, true)));
san->setOutputPosition(QPointF(mCoordArrayX->lanePosition(pnt.x(),nlj?nlj->rect().right():0), epc.lanePosition(0, true)));
}
break;
case EndpointList::SourceAndDestination:
Expand Down Expand Up @@ -1447,9 +1446,8 @@ namespace hal

const NetLayoutJunction* nlj = mLayouter->mJunctionHash.value(it.key());
int ix = it.key().x();
float xjLeft = mLayouter->mCoordArrayX->lanePosition(ix,nlj->rect().left());
float xjRight = mLayouter->mCoordArrayX->lanePosition(ix,nlj->rect().right());
Q_ASSERT(nlj);
float xjLeft = mLayouter->mCoordArrayX->lanePosition(ix,nlj?nlj->rect().left():0);
float xjRight = mLayouter->mCoordArrayX->lanePosition(ix,nlj?nlj->rect().right():0);

for (int inpInx : inputsById)
{
Expand Down

0 comments on commit 091b374

Please sign in to comment.