Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions ui/edge_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from PySide6.QtGui import QPainterPath, QPen, QColor
from core.graph import Edge
from core.port_types import PORT_STYLES, PortType
import math

class EdgeItem(QGraphicsPathItem):
def __init__(self, edge=None, source_port=None, target_port=None):
Expand Down Expand Up @@ -51,8 +52,11 @@ def set_positions(self, source: QPointF, target: QPointF):
self.target_pos = target
self.update_path()

def set_target_pos(self, pos: QPointF):
self.target_pos = pos
def set_target_pos(self, pos: QPointF, is_port_input):
if is_port_input:
self.source_pos = pos
else:
self.target_pos = pos
self.update_path()


Expand All @@ -62,16 +66,17 @@ def update_path(self):

dx = self.target_pos.x() - self.source_pos.x()
dy = self.target_pos.y() - self.source_pos.y()

ctrl1_x = self.source_pos.x() + abs(dx) * 0.5
d_str = math.sqrt(dx ** 2 + dy ** 2) * 1.35

ctrl1_x = self.source_pos.x() + min(d_str, max(dx, pow(abs(dx), 0.8) + 250)) * 0.5
ctrl1_y = self.source_pos.y()
ctrl2_x = self.target_pos.x() - abs(dx) * 0.5
ctrl2_x = self.target_pos.x() - min(d_str, max(dx, pow(abs(dx), 0.8) + 250)) * 0.5
ctrl2_y = self.target_pos.y()

path.cubicTo(
QPointF(ctrl1_x, ctrl1_y),
QPointF(ctrl2_x, ctrl2_y),
self.target_pos
)

self.setPath(path)
2 changes: 1 addition & 1 deletion ui/graph_scene.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,5 +169,5 @@ def update_edges_for_node(self, node_item):

def mouseMoveEvent(self, event):
if self.drag_edge:
self.drag_edge.set_target_pos(event.scenePos())
self.drag_edge.set_target_pos(event.scenePos(), self.drag_edge.source_port.is_input)
super().mouseMoveEvent(event)
2 changes: 2 additions & 0 deletions ui/graph_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,8 @@ def _init_zoom_widget(self):
self.zoom_in_btn.setFixedSize(28, 28)

self.zoom_label = ZoomLabel("100%")
self.zoom_label.setFixedWidth(32)
self.zoom_label.setAlignment(Qt.AlignHCenter)
self.zoom_slider = QSlider(Qt.Horizontal)

self.zoom_slider.setRange(20, 300)
Expand Down