Bugfix: class StandardArrowNet adapted for new layout algorithm

emsec · Nov 9, 2023 · 898bc7e · 898bc7e
1 parent cff610b
commit 898bc7e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/plugins/gui/include/gui/graph_widget/items/nets/standard_arrow_net.h b/plugins/gui/include/gui/graph_widget/items/nets/standard_arrow_net.h
@@ -47,7 +47,7 @@ namespace hal {
          * @param n - The underlying net
          * @param l - The lines this GraphicsNet consists of
          */
-        StandardArrowNet(Net* n, const Lines& l);
+        StandardArrowNet(Net* n, const Lines& l, const QList<QPointF>& knots = QList<QPointF>());
         /**
          * Adds an input position.
          *

diff --git a/plugins/gui/src/graph_widget/items/nets/standard_arrow_net.cpp b/plugins/gui/src/graph_widget/items/nets/standard_arrow_net.cpp
@@ -2,8 +2,8 @@
 
 namespace hal
 {
-    StandardArrowNet::StandardArrowNet(Net* n, const Lines &l)
-        : StandardGraphicsNet(n,l), mArrowNet(n)
+    StandardArrowNet::StandardArrowNet(Net* n, const Lines &l, const QList<QPointF>& knots)
+        : StandardGraphicsNet(n,l,knots), mArrowNet(n)
     {;}
 
     void StandardArrowNet::setInputPosition(const QPointF& pos)

diff --git a/plugins/gui/src/graph_widget/layouters/graph_layouter.cpp b/plugins/gui/src/graph_widget/layouters/graph_layouter.cpp
@@ -934,25 +934,25 @@ namespace hal
             case EndpointList::HasGlobalEndpoint:
                 if (epl.hasInputArrow())
                 {
-                    StandardArrowNet* san = new StandardArrowNet(n, dnt->mLines);
+                    StandardArrowNet* san = new StandardArrowNet(n, dnt->mLines, dnt->mKnots);
                     graphicsNet           = san;
                     int yGridPos          = mGlobalInputHash.value(dnt->id(), -1);
                     Q_ASSERT(yGridPos >= 0);
                     const EndpointCoordinate& epc = mEndpointHash.value(QPoint(mNodeBoundingBox.left(), yGridPos * 2));
-                    san->setInputPosition(QPointF(mCoordX.value(mNodeBoundingBox.left()).lanePosition(-1), epc.lanePosition(0, true)));
+                    san->setInputPosition(QPointF(mCoordX.value(mNodeBoundingBox.left()).lanePosition(0), epc.lanePosition(0, true)));
                 }
                 if (epl.hasOutputArrow())
                 {
                     if (graphicsNet) mScene->addGraphItem(graphicsNet);
-                    StandardArrowNet* san = new StandardArrowNet(n, dnt->mLines);
+                    StandardArrowNet* san = new StandardArrowNet(n, dnt->mLines, dnt->mKnots);
                     graphicsNet           = san;
                     int yGridPos          = mGlobalOutputHash.value(dnt->id(), -1);
                     Q_ASSERT(yGridPos >= 0);
                     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(mCoordX.value(pnt.x()).lanePosition(nlj->rect().right() + 1), epc.lanePosition(0, true)));
+                    san->setOutputPosition(QPointF(mCoordX.value(pnt.x()).lanePosition(nlj->rect().right()), epc.lanePosition(0, true)));
                 }
                 break;
             case EndpointList::SourceAndDestination:
@@ -1400,9 +1400,9 @@ namespace hal
 
             for (const QPoint& pnt : jt.value()->netById(mId).mKnots)
             {
-                float x = scX.lanePosition(pnt.x());
-                float y = isEndpoint ? epcIt.value().lanePosition(pnt.y(), true) : scY.lanePosition(pnt.y());
-                mKnots.append(QPointF(x,y));
+                float xp = scX.lanePosition(pnt.x());
+                float yp = isEndpoint ? epcIt.value().lanePosition(pnt.y(), true) : scY.lanePosition(pnt.y());
+                mKnots.append(QPointF(xp,yp));
             }
         }
     }