Skip to content
Closed
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
3 changes: 3 additions & 0 deletions NodeGraphQt/base/graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -1368,9 +1368,12 @@ def _deserialize(self, data, relative_pos=False, pos=None, set_parent=True):
for prop in node.model.properties.keys():
if prop in n_data.keys():
node.model.set_property(prop, n_data[prop])

# set custom properties.
for prop, val in n_data.get('custom', {}).items():
node.model.set_property(prop, val)
if prop in node.view.widgets:
node.view.widgets[prop].set_value(val)

nodes[n_id] = node

Expand Down
2 changes: 1 addition & 1 deletion NodeGraphQt/qgraphics/node_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ def _delete_port(self, port, text):
port (PortItem): port object.
text (QtWidgets.QGraphicsTextItem): port text object.
"""
port.delete()
[pipe.delete() for pipe in port.connected_pipes]
port.setParentItem(None)
text.setParentItem(None)
self.scene().removeItem(port)
Expand Down
12 changes: 5 additions & 7 deletions NodeGraphQt/widgets/viewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,7 @@ def _set_viewer_pan(self, pos_x, pos_y):
pos_x (float): x pos.
pos_y (float): y pos.
"""
speed = self._scene_range.width() * 0.0015
x = -pos_x * speed
y = -pos_y * speed
self._scene_range.adjust(x, y, x, y)
self._scene_range.adjust(pos_x, pos_y, pos_x, pos_y)
self._update_scene()

def scale(self, sx, sy, pos=None):
Expand Down Expand Up @@ -413,9 +410,10 @@ def mouseMoveEvent(self, event):
zoom = 0.1 if pos_x > 0 else -0.1
self._set_viewer_zoom(zoom, 0.05, pos=event.pos())
elif self.MMB_state or (self.LMB_state and self.ALT_state):
pos_x = (event.x() - self._previous_pos.x())
pos_y = (event.y() - self._previous_pos.y())
self._set_viewer_pan(pos_x, pos_y)
previous_pos = self.mapToScene(self._previous_pos)
current_pos = self.mapToScene(event.pos())
delta = previous_pos - current_pos
self._set_viewer_pan(delta.x(), delta.y())

if self.LMB_state and self._rubber_band.isActive:
rect = QtCore.QRect(self._origin_pos, event.pos()).normalized()
Expand Down
3 changes: 2 additions & 1 deletion example_auto_nodes.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
from NodeGraphQt import NodeGraph, setup_context_menu, \
QtWidgets, QtCore, PropertiesBinWidget, BackdropNode
PropertiesBinWidget, BackdropNode
from Qt import QtWidgets, QtCore
from example_auto_nodes import Publish, RootNode, update_nodes, setup_node_menu
import importlib
import inspect
Expand Down
2 changes: 1 addition & 1 deletion example_auto_nodes/input_nodes.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from NodeGraphQt import QtCore
from Qt import QtCore
from NodeGraphQt.constants import (NODE_PROP_VECTOR2,
NODE_PROP_VECTOR3,
NODE_PROP_VECTOR4)
Expand Down