graph and viewer fixes from #228

Author: jchanvfx

NodeGraphQt/base/graph.py

@@ -1293,7 +1293,6 @@ def _deserialize(self, data, relative_pos=False, pos=None):
 
         # build the nodes.
         nodes = {}
-        new_node_connections = {}
         for n_id, n_data in data.get('nodes', {}).items():
             identifier = n_data['type_']
             node = self._node_factory.create_node_instance(identifier)
@@ -1306,6 +1305,8 @@ def _deserialize(self, data, relative_pos=False, pos=None):
                 # 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
                 self.add_node(node, n_data.get('pos'))

NodeGraphQt/widgets/viewer.py

@@ -189,10 +189,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):
@@ -474,9 +471,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()

NodeGraphQt/widgets/viewer_nav.py

@@ -107,7 +107,6 @@ def __init__(self, parent=None):
         self.setSpacing(0)
 
         # self.viewport().setAutoFillBackground(False)
-        # bg_color = QtGui.QColor(*VIEWER_BG_COLOR).darker(110).toTuple()
         self.setStyleSheet(
             'QListView {{border: 0px;background-color: rgb({0},{1},{2});}}'
             .format(*VIEWER_NAV_BG_COLOR)

docs/index.rst

@@ -6,8 +6,6 @@ https://github.com/jchanvfx/NodeGraphQt
 .. image:: _images/screenshot.png
     :width: 95%
 
-NodeGraphQt documentation.
-
 ----
 
 .. toctree::