Added connectors to allow pins to be moved away from grid points

Author: joern274

plugins/gui/include/gui/graph_widget/items/nets/separated_graphics_net.h

@@ -85,10 +85,19 @@ namespace hal
          */
         virtual void finalize();
 
+        /**
+         * Add extra lines to connect wire to pin in iconic representation
+         */
+        void setInputConnector(const QList<QLineF>& con);
+        void setOutputConnector(const QList<QLineF>& con);
+
     protected:
         static qreal sAlpha;
 
         QVector<QPointF> mInputPositions;
         QVector<QPointF> mOutputPositions;
+
+        QList<QLineF> mInputConnector;
+        QList<QLineF> mOutputConnector;
     };
 }

plugins/gui/include/gui/graph_widget/items/nets/standard_arrow_net.h

@@ -46,7 +46,7 @@ namespace hal {
          * @param n - The underlying net
          * @param l - The lines this GraphicsNet consists of
          */
-        StandardArrowNet(Net* n, const Lines& l, const QList<QPointF>& knots = QList<QPointF>());
+        StandardArrowNet(Net* n, const Lines& l, const QList<QPointF>& knots, const QList<QLineF>& connectors);
         /**
          * Adds an input position.
          *

plugins/gui/include/gui/graph_widget/items/nets/standard_graphics_net.h

@@ -124,7 +124,7 @@ namespace hal
          * @param n - The undelying net of the StandardGraphicsNet
          * @param l - The lines this GraphicsNet consists of
          */
-        StandardGraphicsNet(Net* n, const Lines& l, const QList<QPointF>& knots = QList<QPointF>());
+        StandardGraphicsNet(Net* n, const Lines& l, const QList<QPointF>& knots, const QList<QLineF>& connectors);
 
         /**
          * Draws the StandardGraphicsNet in the scene.

plugins/gui/include/gui/graph_widget/items/nodes/gates/graphics_gate.h

@@ -26,9 +26,7 @@
 #pragma once
 
 #include "gui/graph_widget/items/nodes/graphics_node.h"
-#include "hal_core/netlist/gate_library/enums/gate_type_property.h"
 
-#include <memory>
 #include <QPainterPath>
 
 namespace hal
@@ -55,6 +53,8 @@ namespace hal
          */
         GraphicsGate(Gate* g);
 
+        virtual QList<QLineF> connectors(u32 netId, bool isInput) const;
+
     protected:
 
         struct GraphicsGatePin
@@ -66,6 +66,7 @@ namespace hal
             bool isInput;
             float x;
             float y;
+            QList<QLineF> connectors;
         };
 
         enum ShapeType { StandardShape, InverterShape, AndShape, OrShape };

plugins/gui/include/gui/graph_widget/items/nodes/graphics_node.h

@@ -29,6 +29,7 @@
 
 #include <QString>
 #include <QFont>
+#include <QLineF>
 
 namespace hal
 {
@@ -190,7 +191,10 @@ namespace hal
          */
         static QColor sTextColor;
 
-
+        /**
+         * Return shape connectors between external net and pin, empty list if no connector available (default)
+         */
+        virtual QList<QLineF> connectors(u32 netId, bool isInput) const;
     //    qreal xOffset() const;
     //    qreal yOffset() const;
 

plugins/gui/include/gui/graph_widget/layouters/graph_layouter.h

@@ -390,7 +390,7 @@ namespace hal
         bool mDone;
         int mRollbackStatus;
 
-        QRect mNodeBoundingBox;
+        QRect mSceneBoundingBox;
         NetLayoutConnectionMetric mConnectionMetric;
         QHash<NetLayoutWire, QList<u32>> mWireHash;
         QHash<NetLayoutPoint, NetLayoutJunctionEntries> mJunctionEntries;
@@ -427,6 +427,7 @@ namespace hal
     public:
         StandardGraphicsNet::Lines mLines;
         QList<QPointF> mKnots;
+        QList<QLineF> mConnectorLines;
         DrawNetThread(u32 id, GraphLayouter* parent) : QThread(parent), mId(id), mLayouter(parent) {;}
         u32 id() const { return mId; }
         void run() override;

plugins/gui/include/gui/graph_widget/layouters/net_layout_point.h

@@ -80,7 +80,8 @@ namespace hal {
         QGraphicsEllipseItem* graphicsFactory(float r) const;
         int distanceTo(const NetLayoutPoint& other) const;
         int yGrid() const;
-        QPoint gridPoint() const { return QPoint(x(),yGrid()); }
+        QPoint rightGridPoint() const { return QPoint(x(),yGrid()); }
+        QPoint leftGridPoint() const { return QPoint(x()-1,yGrid()); }
         bool isEndpoint() const;
         bool isUndefined() const { return x()==INT_MIN || y()==INT_MIN; }
         NetLayoutPoint nextPoint(const NetLayoutDirection& dir, bool omitEndpoint=false) const;

plugins/gui/src/graph_widget/items/nets/arrow_separated_net.cpp

@@ -92,6 +92,10 @@ namespace hal
         {
             QPointF to(position.x() - sWireLength, position.y());
             painter->drawLine(position, to);
+            for (const QLineF& con : mInputConnector)
+            {
+                painter->drawLine(con.translated(position));
+            }
             painter->save();
             painter->setRenderHint(QPainter::Antialiasing, true);
             sPen.setStyle(Qt::PenStyle::SolidLine);
@@ -106,6 +110,10 @@ namespace hal
         {
             QPointF to(position.x() + sWireLength, position.y());
             painter->drawLine(position, to);
+            for (const QLineF& con : mOutputConnector)
+            {
+                painter->drawLine(con.translated(position));
+            }
             painter->save();
             painter->setRenderHint(QPainter::Antialiasing, true);
             sPen.setStyle(Qt::PenStyle::SolidLine);

plugins/gui/src/graph_widget/items/nets/separated_graphics_net.cpp

@@ -26,4 +26,14 @@ namespace hal
         mRect = mShape.boundingRect();
         mRect.adjust(-sLineWidth, -sLineWidth, sLineWidth, sLineWidth);
     }
+
+    void SeparatedGraphicsNet::setInputConnector(const QList<QLineF>& con)
+    {
+        mInputConnector = con;
+    }
+
+    void SeparatedGraphicsNet::setOutputConnector(const QList<QLineF>& con)
+    {
+        mOutputConnector = con;
+    }
 }

plugins/gui/src/graph_widget/items/nets/standard_arrow_net.cpp

@@ -2,8 +2,8 @@
 
 namespace hal
 {
-    StandardArrowNet::StandardArrowNet(Net* n, const Lines &l, const QList<QPointF>& knots)
-        : StandardGraphicsNet(n,l,knots), mArrowNet(n)
+    StandardArrowNet::StandardArrowNet(Net* n, const Lines &l, const QList<QPointF>& knots, const QList<QLineF>& connectors)
+        : StandardGraphicsNet(n,l,knots,connectors), mArrowNet(n)
     {;}
 
     void StandardArrowNet::setInputPosition(const QPointF& pos)