add commits && and dot style graph backgroud

Author: ArnoChenFx

NodeGraphQt/base/graph.py

@@ -19,7 +19,8 @@
                          PIPE_LAYOUT_CURVED,
                          PIPE_LAYOUT_STRAIGHT,
                          PIPE_LAYOUT_ANGLE,
-                         IN_PORT, OUT_PORT)
+                         IN_PORT, OUT_PORT,
+                         VIEWER_GRID_LINES)
 from ..widgets.viewer import NodeViewer
 from ..widgets.node_space_bar import node_space_bar
 
@@ -466,14 +467,14 @@ def set_grid_color(self, r, g, b):
         self.scene().grid_color = (r, g, b)
         self._viewer.force_update()
 
-    def display_grid(self, display=True):
+    def set_grid_mode(self, mode=VIEWER_GRID_LINES):
         """
-        Display node graph background grid.
+        Set node graph grid mode.
 
         Args:
-            display: False to not draw the background grid.
+            mode: VIEWER_GRID_LINES/VIEWER_GRID_DOTS/VIEWER_GRID_NONE.
         """
-        self.scene().grid = display
+        self.scene().grid_mode = mode
         self._viewer.force_update()
 
     def add_properties_bin(self, prop_bin):
@@ -1234,6 +1235,7 @@ def save_session(self, file_path):
             node_space = node_space.id
         serialized_data['graph'] = {'node_space': node_space, 'pipe_layout': self._viewer.get_pipe_layout()}
         serialized_data['graph']['graph_rect'] = self._viewer.scene_rect()
+        serialized_data['graph']['grid_mode'] = self.scene().grid_mode
 
         file_path = file_path.strip()
         with open(file_path, 'w') as file_out:
@@ -1282,6 +1284,7 @@ def import_session(self, file_path):
             self.set_node_space(self.root_node())
             self._viewer.set_pipe_layout(layout_data['graph']['pipe_layout'])
             self._viewer.set_scene_rect(layout_data['graph']['graph_rect'])
+            self.set_grid_mode(layout_data['graph'].get('grid_mode', VIEWER_GRID_LINES))
 
         self.set_node_space(self.root_node())
         self._undo_stack.clear()

NodeGraphQt/base/utils.py

@@ -93,10 +93,13 @@ def setup_context_menu(graph):
 
     pipe_menu = edit_menu.add_menu('&Pipe')
     pipe_menu.add_command('Curved Pipe', _curved_pipe)
-    pipe_menu.add_command('Straght Pipe', _straight_pipe)
+    pipe_menu.add_command('Straight Pipe', _straight_pipe)
     pipe_menu.add_command('Angle Pipe', _angle_pipe)
 
-    edit_menu.add_command('Toggle Disable Grid', _toggle_grid)
+    bg_menu = edit_menu.add_menu('&Grid Mode')
+    bg_menu.add_command('None', _bg_grid_none)
+    bg_menu.add_command('Lines', _bg_grid_lines)
+    bg_menu.add_command('Dots', _bg_grid_dots)
 
     edit_menu.add_separator()
 
@@ -276,8 +279,16 @@ def _angle_pipe(graph):
     graph.set_pipe_style(PIPE_LAYOUT_ANGLE)
 
 
-def _toggle_grid(graph):
-    graph.display_grid(not graph.scene().grid)
+def _bg_grid_none(graph):
+    graph.set_grid_mode(0)
+
+
+def _bg_grid_dots(graph):
+    graph.set_grid_mode(1)
+
+
+def _bg_grid_lines(graph):
+    graph.set_grid_mode(2)
 
 
 def __layout_graph(graph, down_stream=True):
@@ -342,7 +353,7 @@ def get_output_nodes(node):
         for cp in p.connected_ports():
             n = cp.node()
             if n.has_property('graph_rect'):
-                n.add_run_port(cp)
+                n.mark_node_to_be_cooked(cp)
             nodes[n.id] = n
     return list(nodes.values())
 
@@ -522,10 +533,14 @@ def _update_nodes(nodes):
         nodes (list[NodeGraphQt.BaseNode]): nodes to be run.
     """
     for node in nodes:
-        if node.disabled():
-            node.when_disabled()
-        else:
-            node.run()
+        try:
+            if node.disabled():
+                node.when_disabled()
+            else:
+                node.run()
+        except Exception as error:
+            print("Error Update Node : {}\n{}" .format(node, str(error)))
+            break
 
 
 def update_node_down_stream(node):
@@ -571,6 +586,7 @@ def update_nodes_by_up(nodes):
 
     _update_nodes(topological_sort_by_up(all_nodes=nodes))
 
+
 # auto layout
 
 

NodeGraphQt/constants.py

@@ -88,10 +88,13 @@
 
 # === NODE VIEWER ===
 
+VIEWER_GRID_NONE = 0
+VIEWER_GRID_DOTS = 1
+VIEWER_GRID_LINES = 2
+
 VIEWER_BG_COLOR = (35, 35, 35)
 VIEWER_GRID_COLOR = (45, 45, 45)
-VIEWER_GRID_OVERLAY = True
-VIEWER_GRID_SIZE = 20
+VIEWER_GRID_SIZE = 50
 
 DRAG_DROP_ID = 'n0deGraphQT'
 

NodeGraphQt/widgets/scene.py

@@ -2,19 +2,20 @@
 from .. import QtGui, QtCore, QtWidgets
 
 from ..constants import (VIEWER_BG_COLOR,
-                                                    VIEWER_GRID_SIZE,
-                                                    VIEWER_GRID_OVERLAY,
-                                                    VIEWER_GRID_COLOR)
+                         VIEWER_GRID_SIZE,
+                         VIEWER_GRID_COLOR,
+                         VIEWER_GRID_NONE,
+                         VIEWER_GRID_DOTS,
+                         VIEWER_GRID_LINES)
 
 
 class NodeScene(QtWidgets.QGraphicsScene):
 
     def __init__(self, parent=None):
         super(NodeScene, self).__init__(parent)
         self.background_color = VIEWER_BG_COLOR
-        self.grid = VIEWER_GRID_OVERLAY
         self.grid_color = VIEWER_GRID_COLOR
-
+        self._grid_mode = VIEWER_GRID_LINES
         self.setBackgroundBrush(self._bg_qcolor)
 
     def __repr__(self):
@@ -31,13 +32,32 @@ def _draw_grid(self, painter, rect, pen, grid_size):
         first_left = left - (left % grid_size)
         first_top = top - (top % grid_size)
 
-        lines = []
-        lines.extend([QtCore.QLineF(x, top, x, bottom) for x in range(first_left, right, grid_size)])
+        lines = [QtCore.QLineF(x, top, x, bottom) for x in range(first_left, right, grid_size)]
         lines.extend([QtCore.QLineF(left, y, right, y) for y in range(first_top, bottom, grid_size)])
 
         painter.setPen(pen)
         painter.drawLines(lines)
 
+    def _draw_dots(self, painter, rect, pen, grid_size):
+        zoom = self.viewer().get_zoom()
+        if zoom < 0:
+            grid_size = int(abs(zoom) / 0.3 + 1) * grid_size
+
+        left = int(rect.left())
+        right = int(rect.right())
+        top = int(rect.top())
+        bottom = int(rect.bottom())
+
+        first_left = left - (left % grid_size)
+        first_top = top - (top % grid_size)
+
+        pen.setWidth(grid_size / 10)
+        painter.setPen(pen)
+
+        for x in range(first_left, right, grid_size):
+            for y in range(first_top, bottom, grid_size):
+                painter.drawPoint(int(x), int(y))
+
     def drawBackground(self, painter, rect):
         super(NodeScene, self).drawBackground(painter, rect)
 
@@ -46,21 +66,20 @@ def drawBackground(self, painter, rect):
         painter.setRenderHint(QtGui.QPainter.Antialiasing, False)
         painter.setBrush(self.backgroundBrush())
 
-        if not self._grid:
-            painter.restore()
-            return
-
-        zoom = self.viewer().get_zoom()
-
-        if zoom > -0.5:
+        if self._grid_mode is VIEWER_GRID_DOTS:
             pen = QtGui.QPen(QtGui.QColor(*self.grid_color), 0.65)
-            self._draw_grid(painter, rect, pen, VIEWER_GRID_SIZE)
-
-        color = self._bg_qcolor.darker(150)
-        if zoom < -0.0:
-            color = color.darker(100 - int(zoom * 110))
-        pen = QtGui.QPen(color, 0.65)
-        self._draw_grid(painter, rect, pen, VIEWER_GRID_SIZE * 8)
+            self._draw_dots(painter, rect, pen, VIEWER_GRID_SIZE)
+        elif self._grid_mode is VIEWER_GRID_LINES:
+            zoom = self.viewer().get_zoom()
+            if zoom > -0.5:
+                pen = QtGui.QPen(QtGui.QColor(*self.grid_color), 0.65)
+                self._draw_grid(painter, rect, pen, VIEWER_GRID_SIZE)
+
+            color = self._bg_qcolor.darker(150)
+            if zoom < -0.0:
+                color = color.darker(100 - int(zoom * 110))
+            pen = QtGui.QPen(color, 0.65)
+            self._draw_grid(painter, rect, pen, VIEWER_GRID_SIZE * 8)
 
         painter.restore()
 
@@ -92,12 +111,12 @@ def viewer(self):
         return self.views()[0] if self.views() else None
 
     @property
-    def grid(self):
-        return self._grid
+    def grid_mode(self):
+        return self._grid_mode
 
-    @grid.setter
-    def grid(self, mode=True):
-        self._grid = mode
+    @grid_mode.setter
+    def grid_mode(self, mode=VIEWER_GRID_LINES):
+        self._grid_mode = mode
 
     @property
     def grid_color(self):

NodeGraphQt/widgets/tab_search.py

@@ -215,10 +215,9 @@ def build_menu_tree(self):
 
         max_depth = 0
         for node_type in node_types:
-            trees = node_type.split(".")
-            trees.pop(-1)
+            trees = ".".join(node_type.split(".")[:-1]).split("::")
             for depth, menu_name in enumerate(trees):
-                menu_path = ".".join(trees[:depth+1])
+                menu_path = "::".join(trees[:depth+1])
                 if depth in menu_tree.keys():
                     if menu_name not in menu_tree[depth].keys():
                         new_menu = QtWidgets.QMenu(menu_name)
@@ -229,7 +228,7 @@ def build_menu_tree(self):
                     new_menu.setStyleSheet(STYLE_QMENU)
                     menu_tree[depth] = {menu_path: new_menu}
                 if depth > 0:
-                    new_menu.parentPath = ".".join(trees[:depth])
+                    new_menu.parentPath = "::".join(trees[:depth])
 
                 max_depth = max(max_depth,depth)
 

NodeGraphQt/widgets/viewer.py

@@ -94,6 +94,8 @@ def __init__(self, parent=None):
         menu_bar.addMenu(self._ctx_node_menu)
         self._ctx_node_menu.setDisabled(True)
 
+        self._zoom_value = self.get_zoom()
+
         self.acyclic = True
         self.LMB_state = False
         self.RMB_state = False
@@ -398,7 +400,7 @@ def wheelEvent(self, event):
             delta = event.angleDelta().y()
             if delta == 0:
                 delta = event.angleDelta().x()
-
+        self._zoom_value += delta
         self._set_viewer_zoom(delta, pos=event.pos())
 
     def dropEvent(self, event):
@@ -917,6 +919,9 @@ def clear_key_state(self):
         self.SHIFT_state = False
         self.ALT_state = False
 
+    def get_real_zoom(self):
+        return self._zoom_value
+
     def use_opengl(self):
         format = QtOpenGL.QGLFormat(QtOpenGL.QGL.SampleBuffers)
         format.setSamples(4)

example_auto_nodes.py

@@ -118,7 +118,7 @@ def show_nodes_list(node):
 
     # register nodes
     reg_nodes = get_nodes_from_folder(os.getcwd() + "/example_auto_nodes")
-    BackdropNode.__identifier__ = 'Utility'
+    BackdropNode.__identifier__ = 'Utility::Backdrop'
     reg_nodes.append(BackdropNode)
     reg_nodes.extend(get_published_nodes_from_folder(os.getcwd() + "/example_auto_nodes/published_nodes"))
     [graph.register_node(n) for n in reg_nodes]