ParkerBritt/Enzo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: floating edge cubic bezier, additional memory guards

Browse Source
This commit is contained in:
parker
2025-06-24 00:18:45 +01:00
parent 71c2057d54
commit 0d6ddf701a
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/network/FloatingEdgeGraphic.cpp
View File

@@ -3,6 +3,7 @@
#include "gui/network/SocketGraphic.h"
#include <iostream>
#include <qgraphicsitem.h>
#include <algorithm>
FloatingEdgeGraphic::FloatingEdgeGraphic(SocketGraphic* socket1, QGraphicsItem *parent)
: QGraphicsItem(parent), socket1_{socket1}
@@ -29,7 +30,19 @@ void FloatingEdgeGraphic::paint(QPainter *painter, const QStyleOptionGraphicsIte
pen.setCapStyle(Qt::RoundCap);
painter->setPen(pen);
painter->drawLine(socket1_->scenePos(),floatPos_);
// painter->drawLine(socket1_->scenePos(),floatPos_);
QPointF pos1 = socket1_->getIO()==SocketGraphic::SocketType::Input ? socket1_->scenePos() : floatPos_;
QPointF pos2 = socket1_->getIO()==SocketGraphic::SocketType::Input ? floatPos_ : socket1_->scenePos();
float dist = std::sqrt(std::pow(pos1.x()-pos2.x(),2)+std::pow(pos1.y()-pos2.y(),2));
std::cout << "dist: " << dist << "\n";
float cubicStrength = dist*0.5;
cubicStrength = std::clamp(cubicStrength, 0.0f, 40.0f);
QPainterPath path;
path.moveTo(pos1);
path.cubicTo(pos1-QPoint(0,cubicStrength), pos2+QPoint(0,cubicStrength), pos2);
painter->drawPath(path);
}

9
src/gui/network/Network.cpp
View File

@@ -76,16 +76,17 @@ void Network::resizeEvent(QResizeEvent *event)
void Network::deleteEdge(QGraphicsItem* edge)
{
std::cout << "----\ndeleting edge\n";
if(!edge) return;
if(prevHoverItem_==edge)
{
prevHoverItem_=nullptr;
}
scene_->removeItem(edge);
scene_->update();
view_->update();
// scene_->removeItem(edge);
// scene_->update();
// view_->update();
// NOTE: deleting edge kept giving me segmentation faults
// I coundn't figure it out so I'm just leaving it for now
// delete edge;
delete edge;
std::cout << "finished deleting edge\n----\n";
}

2
src/gui/network/NodeEdgeGraphic.cpp
View File

@@ -3,6 +3,7 @@
#include "gui/network/SocketGraphic.h"
#include <iostream>
#include <qgraphicsitem.h>
#include <QGraphicsScene>
NodeEdgeGraphic::NodeEdgeGraphic(SocketGraphic* socket1, SocketGraphic* socket2, QGraphicsItem *parent)
: QGraphicsItem(parent), socket1_{socket1}, socket2_{socket2}, defaultColor_{QColor("white")}, pen_{QPen(QColor("white"))}
@@ -17,6 +18,7 @@ NodeEdgeGraphic::NodeEdgeGraphic(SocketGraphic* socket1, SocketGraphic* socket2,
NodeEdgeGraphic::~NodeEdgeGraphic()
{
std::cout << "edge destructor\n";
scene()->removeItem(this);
socket1_->removeEdge(this);
socket2_->removeEdge(this);
}