Updated Links to be bezier curves + Added break link option when right click on it + Improved undo commands

Author: BenPyton

NodalScene.cpp

@@ -100,6 +100,15 @@ void NodalScene::save(QString fileName, const AudioSettings& settings)
     file.close();
 }
 
+void CheckCommand(const QUndoCommand* _command, int _depth = 0)
+{
+    qDebug() << "[DEBUG]" + QString("  ").repeated(_depth) + " - Command:" << _command->text();
+    for(int i = 0; i < _command->childCount(); ++i)
+    {
+        CheckCommand(_command->child(i), _depth + 1);
+    }
+}
+
 void NodalScene::load(QString fileName, AudioSettings& settings)
 {
     QFile file(fileName);
@@ -135,15 +144,62 @@ void NodalScene::load(QString fileName, AudioSettings& settings)
         settings.setDuration(root[DURATION].toDouble());
     }
 
-    reset();
 
     // ============== CREATE COMPONENTS =============
     if(!Utils::CheckJsonValue(root, COMPONENTS, QJsonValue::Array, 120))
         return;
     QJsonArray componentArray = root[COMPONENTS].toArray();
 
+    qDebug() << "[DEBUG] Check UndoStack";
+    for(int i = 0; i < m_undoStack->count(); ++i)
+    {
+        CheckCommand(m_undoStack->command(i));
+    }
+
+    qDebug() << "[DEBUG] Clear UndoStack";
+    m_undoStack->clear();
+
+    qDebug() << "[DEBUG] Check UndoStack";
+    for(int i = 0; i < m_undoStack->count(); ++i)
+    {
+        CheckCommand(m_undoStack->command(i));
+    }
+
+    qDebug() << "[DEBUG] Reset";
+    reset();
+
+    qDebug() << "[DEBUG] Check UndoStack";
+    for(int i = 0; i < m_undoStack->count(); ++i)
+    {
+        CheckCommand(m_undoStack->command(i));
+    }
+
+    qDebug() << "[DEBUG] Clear UndoStack";
+    m_undoStack->clear();
+
+    qDebug() << "[DEBUG] Check UndoStack";
+    for(int i = 0; i < m_undoStack->count(); ++i)
+    {
+        CheckCommand(m_undoStack->command(i));
+    }
+
+    qDebug() << "[DEBUG] Create Conponents";
     NodeItem::JsonToNodeArray(componentArray, this, QPointF(), m_undoStack);
+
+    qDebug() << "[DEBUG] Check UndoStack";
+    for(int i = 0; i < m_undoStack->count(); ++i)
+    {
+        CheckCommand(m_undoStack->command(i));
+    }
+
+    qDebug() << "[DEBUG] Clear UndoStack";
     m_undoStack->clear();
+
+    qDebug() << "[DEBUG] Check UndoStack";
+    for(int i = 0; i < m_undoStack->count(); ++i)
+    {
+        CheckCommand(m_undoStack->command(i));
+    }
 }
 
 int NodalScene::clearItems(int from)
@@ -152,8 +208,12 @@ int NodalScene::clearItems(int from)
     for(int i = m_nodeList.size()-1; i >= from; --i)
     {
         m_nodeList[i]->unlink();
+        m_undoStack->push(new DeleteComponentCommand(this, m_nodeList[i], m_nodeList[i]->pos()));
+
+        /*m_nodeList[i]->unlink();
+        removeItem(m_nodeList[i]);
         delete m_nodeList[i];
-        m_nodeList.remove(i);
+        m_nodeList.remove(i);*/
         nbRemoved++;
     }
 

UI/LinkItem.cpp

@@ -21,6 +21,8 @@
 #include "LinkItem.h"
 #include "NodalView.h"
 #include "PinItem.h"
+#include "NodeItem.h"
+#include "PinOutputItem.h"
 #include <QtMath>
 
 QVector<LinkItem*> LinkItem::s_linkList;
@@ -35,16 +37,18 @@ LinkItem::LinkItem(QGraphicsItem *parent)
 
     m_mousePos = QPointF(0, 0);
 
-    setZValue(10000);
+    setZValue(-10000);
 
-    s_linkList.append(this);
+    qDebug() << "Create LinkItem";
 }
 
 LinkItem::~LinkItem()
 {
-    int index = s_linkList.indexOf(this);
-    Q_ASSERT(index >= 0);
-    s_linkList.removeAt(index);
+    qDebug() << "Destroy LinkItem";
+    if (isRegistered(this))
+    {
+        unregisterLink(this);
+    }
 }
 
 void LinkItem::setMousePos(QPointF mousePos)
@@ -64,6 +68,36 @@ void LinkItem::prepareChange()
     prepareGeometryChange();
 }
 
+void LinkItem::check()
+{
+    qDebug() << "Check Link Item";
+    Q_ASSERT(scene() == nullptr);
+    Q_ASSERT(m_pinA == nullptr && m_pinB == nullptr);
+}
+
+void LinkItem::registerLink(LinkItem*_link)
+{
+    Q_ASSERT(_link != nullptr);
+    if(!isRegistered(_link))
+    {
+        s_linkList.append(_link);
+    }
+}
+
+void LinkItem::unregisterLink(LinkItem*_link)
+{
+    Q_ASSERT(_link != nullptr);
+    int index = s_linkList.indexOf(_link);
+    Q_ASSERT(index >= 0);
+    s_linkList.removeAt(index);
+}
+
+bool LinkItem::isRegistered(LinkItem *_link)
+{
+    Q_ASSERT(_link != nullptr);
+    return s_linkList.indexOf(_link) >= 0;
+}
+
 LinkItem *LinkItem::getLinkBetween(PinItem *_pinA, PinItem *_pinB)
 {
     LinkItem* link = nullptr;
@@ -77,6 +111,19 @@ LinkItem *LinkItem::getLinkBetween(PinItem *_pinA, PinItem *_pinB)
     return link;
 }
 
+QList<LinkItem*> LinkItem::getLinksWithPin(PinItem* _pin)
+{
+    QList<LinkItem*> links;
+    for(int i = 0; i < s_linkList.size(); ++i)
+    {
+        if(s_linkList[i]->m_pinA == _pin || s_linkList[i]->m_pinB == _pin)
+        {
+            links.append(s_linkList[i]);
+        }
+    }
+    return links;
+}
+
 PinItem *LinkItem::getPinThatIsNot(PinItem *pin)
 {
     PinItem* toReturn = nullptr;
@@ -97,15 +144,18 @@ void LinkItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
     Q_UNUSED(option);
     Q_UNUSED(widget);
 
-    QPen pen(QColor(200, 200, 200));
-    pen.setWidth(1);
-    pen.setCosmetic(true);
+    if(m_pinA != nullptr || m_pinB != nullptr)
+    {
+        bool isCompSelected = (m_pinA != nullptr && m_pinA->parentNode()->isSelected())
+            || (m_pinB != nullptr && m_pinB->parentNode()->isSelected());
 
-    QPointF firstPoint = (m_pinA != nullptr) ? m_pinA->scenePos() : m_mousePos;
-    QPointF secondPoint = (m_pinB != nullptr) ? m_pinB->scenePos() : m_mousePos;
+        QPen pen(QColor(200, 200, 200));
+        pen.setWidth(isCompSelected ? 3 : 1);
+        pen.setCosmetic(true);
 
-    painter->setPen(pen);
-    painter->drawLine(firstPoint, secondPoint);
+        painter->setPen(pen);
+        painter->drawPath(getLinePath());
+    }
 }
 
 QRectF LinkItem::boundingRect() const
@@ -124,21 +174,32 @@ QRectF LinkItem::boundingRect() const
 
 QPainterPath LinkItem::shape() const
 {
-    qreal width = 1.;
-    qreal pinRadius = 10.;
+    qreal width = 10.;
+    QPainterPathStroker pathStroker;
+    pathStroker.setWidth(width);
+    return pathStroker.createStroke(getLinePath());
+}
+
+QPainterPath LinkItem::getLinePath() const
+{
     QPointF firstPoint = (m_pinA != nullptr) ? m_pinA->scenePos() : m_mousePos;
     QPointF secondPoint = (m_pinB != nullptr) ? m_pinB->scenePos() : m_mousePos;
 
-    QPointF delta = secondPoint - firstPoint;
-    qreal length = qSqrt(delta.x() * delta.x() + delta.y() * delta.y());
-    QPointF dir = delta / length;
-    QPointF ortho(-dir.y(), dir.x());
+    qreal firstPointSign = 1.0;
+    if(m_pinA != nullptr)
+    {
+        firstPointSign = qgraphicsitem_cast<PinOutputItem*>(m_pinA) != nullptr ? 1.0 : -1.0 ;
+    }
+    qreal secondPointSign = -firstPointSign;
+
+    qreal minDist = 200.0;
+    qreal alpha = 0.6;
+    qreal dist = qMax(abs(firstPoint.x() - secondPoint.x()), minDist);
+    QPointF ctrlPoint1(firstPoint.x() + firstPointSign * dist * alpha, firstPoint.y());
+    QPointF ctrlPoint2(secondPoint.x() + secondPointSign * dist * alpha, secondPoint.y());
 
     QPainterPath path;
-    path.moveTo(firstPoint + dir * pinRadius + ortho * width);
-    path.lineTo(secondPoint - dir * pinRadius + ortho * width);
-    path.lineTo(secondPoint - dir * pinRadius - ortho * width);
-    path.lineTo(firstPoint + dir * pinRadius - ortho * width);
-    path.closeSubpath();
+    path.moveTo(firstPoint);
+    path.cubicTo(ctrlPoint1, ctrlPoint2, secondPoint);
     return path;
 }

UI/LinkItem.h

@@ -34,7 +34,7 @@ class LinkItem : public QGraphicsItem
     int type() const override { return Type; }
 
     LinkItem(QGraphicsItem *parent = nullptr);
-    ~LinkItem();
+    virtual ~LinkItem() override;
 
     void setPenStyle(Qt::PenStyle penStyle) { m_penStyle = penStyle; }
     void setPenSize(int size) { m_size = size; }
@@ -51,14 +51,22 @@ class LinkItem : public QGraphicsItem
 
     void prepareChange();
 
-    static LinkItem *getLinkBetween(PinItem* _pinA, PinItem* _pinB);
+    void check();
+
+    static void registerLink(LinkItem* _link);
+    static void unregisterLink(LinkItem* _link);
+    static bool isRegistered(LinkItem* _link);
+    static LinkItem* getLinkBetween(PinItem* _pinA, PinItem* _pinB);
+    static QList<LinkItem*> getLinksWithPin(PinItem* _pin);
 
 protected:
     virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget* widget) override;
     virtual QRectF boundingRect() const override;
     virtual QPainterPath shape() const override;
 
 private:
+    QPainterPath getLinePath() const;
+
     int m_size;
     Qt::PenStyle m_penStyle;
     PinItem* m_pinA;

UI/NodalView.cpp

@@ -345,7 +345,8 @@ void NodalView::showCustomContextMenu(const QPoint& _pos)
     // for QAbstractScrollArea and derived classes you would use:
     // QPoint globalPos = myWidget->viewport()->mapToGlobal(pos);
 
-    QAction act_breakLink("Break link(s)");
+    QAction act_breakAllLinks("Break all link(s)");
+    QAction act_breakLink("Break link");
     QAction act_removeComponents("Remove Component(s)");
 
     QMenu myMenu;
@@ -361,12 +362,11 @@ void NodalView::showCustomContextMenu(const QPoint& _pos)
     LinkItem* link = dynamic_cast<LinkItem*>(item);
     if(link != nullptr)
     {
-        //myMenu.addAction(&act_breakLink);
-        qDebug() << "Link !";
+        myMenu.addAction(&act_breakLink);
     }
     else if(pin != nullptr && pin->isLinked())
     {
-        myMenu.addAction(&act_breakLink);
+        myMenu.addAction(&act_breakAllLinks);
     }
     if(scene()->selectedItems().size() > 0)
     {
@@ -379,11 +379,15 @@ void NodalView::showCustomContextMenu(const QPoint& _pos)
 
     QAction* selectedAction = myMenu.exec(globalPos);
     if (selectedAction == &act_breakLink)
+    {
+        link->firstPin()->unlink(link->secondPin());
+    }
+    if (selectedAction == &act_breakAllLinks)
     {
         qDebug() << "break links";
         pin->unlinkAll();
     }
-    else if(selectedAction == &act_removeComponents)
+    else if (selectedAction == &act_removeComponents)
     {
         // something was chosen, do stuff
         getScene()->deleteSelection();