optimise clean up

Author: jchanvfx

NodeGraphQt/base/utils.py

@@ -148,8 +148,7 @@ def _open_session(graph):
         graph (NodeGraphQt.NodeGraph): node graph.
     """
     current = graph.current_session()
-    viewer = graph.viewer()
-    file_path = viewer.load_dialog(current)
+    file_path = graph.load_dialog(current)
     if file_path:
         graph.load_session(file_path)
 
@@ -162,8 +161,7 @@ def _import_session(graph):
         graph (NodeGraphQt.NodeGraph): node graph.
     """
     current = graph.current_session()
-    viewer = graph.viewer()
-    file_path = viewer.load_dialog(current)
+    file_path = graph.load_dialog(current)
     if file_path:
         graph.import_session(file_path)
 
@@ -193,8 +191,7 @@ def _save_session_as(graph):
         graph (NodeGraphQt.NodeGraph): node graph.
     """
     current = graph.current_session()
-    viewer = graph.viewer()
-    file_path = viewer.save_dialog(current)
+    file_path = graph.save_dialog(current)
     if file_path:
         graph.save_session(file_path)
 
@@ -206,8 +203,7 @@ def _new_session(graph):
     Args:
         graph (NodeGraphQt.NodeGraph): node graph.
     """
-    viewer = graph.viewer()
-    if viewer.question_dialog('Clear Current Session?', 'Clear Session'):
+    if graph.question_dialog('Clear Current Session?', 'Clear Session'):
         graph.clear_session()
 
 

NodeGraphQt/qgraphics/node_base.py

@@ -55,42 +55,46 @@ def paint(self, painter, option, widget):
         self.auto_switch_mode()
 
         painter.save()
-        bg_border = 1.0
-        rect = QtCore.QRectF(0.5 - (bg_border / 2),
-                             0.5 - (bg_border / 2),
-                             self._width + bg_border,
-                             self._height + bg_border)
-        radius = 2
-        border_color = QtGui.QColor(*self.border_color)
-
-        path = QtGui.QPainterPath()
-        path.addRoundedRect(rect, radius, radius)
+        painter.setPen(QtCore.Qt.NoPen)
+        painter.setBrush(QtCore.Qt.NoBrush)
 
+        # base background.
+        margin = 1.0
         rect = self.boundingRect()
+        rect = QtCore.QRectF(rect.left() + margin,
+                             rect.top() + margin,
+                             rect.width() - (margin * 2),
+                             rect.height() - (margin * 2))
 
-        bg_color = QtGui.QColor(*self.color)
-        painter.setBrush(bg_color)
-        painter.setPen(QtCore.Qt.NoPen)
+        radius = 4.0
+        painter.setBrush(QtGui.QColor(*self.color))
         painter.drawRoundedRect(rect, radius, radius)
 
-        if self.selected and NODE_SEL_COLOR:
+        # light overlay on background when selected.
+        if self.selected:
             painter.setBrush(QtGui.QColor(*NODE_SEL_COLOR))
             painter.drawRoundedRect(rect, radius, radius)
 
-        label_rect = QtCore.QRectF(rect.left(), rect.top(), self._width, 28)
-        path = QtGui.QPainterPath()
-        path.addRoundedRect(label_rect, radius, radius)
-        painter.setBrush(QtGui.QColor(30, 30, 30, 200))
-        painter.fillPath(path, painter.brush())
+        # node name background.
+        padding = 3.0, 2.0
+        text_rect = self._text_item.boundingRect()
+        text_rect = QtCore.QRectF(text_rect.x() + padding[0],
+                                  rect.y() + padding[1],
+                                  rect.width() - padding[0] - margin,
+                                  text_rect.height() - (padding[1] * 2))
+        painter.setBrush(QtGui.QColor(0, 0, 0, 50))
+        if self.selected:
+            painter.setBrush(QtGui.QColor(*NODE_SEL_COLOR))
+        painter.drawRoundedRect(text_rect, 3.0, 3.0)
 
+        # node border
         border_width = 0.8
-        if self.selected and NODE_SEL_BORDER_COLOR:
+        border_color = QtGui.QColor(*self.border_color)
+        if self.selected:
             border_width = 1.2
             border_color = QtGui.QColor(*NODE_SEL_BORDER_COLOR)
-        border_rect = QtCore.QRectF(rect.left() - (border_width / 2),
-                                    rect.top() - (border_width / 2),
-                                    rect.width() + border_width,
-                                    rect.height() + border_width)
+        border_rect = QtCore.QRectF(rect.left(), rect.top(),
+                                    rect.width(), rect.height())
 
         pen = QtGui.QPen(border_color, border_width)
         pen.setCosmetic(self.viewer().get_zoom() < 0.0)
@@ -193,13 +197,9 @@ def _set_base_size(self, add_w=0.0, add_h=0.0):
             add_w (float): additional width.
             add_h (float): additional height.
         """
-        self._width = NODE_WIDTH
-        self._height = NODE_HEIGHT
         width, height = self.calc_size(add_w, add_h)
-        if width > self._width:
-            self._width = width
-        if height > self._height:
-            self._height = height
+        self._width = width if width > NODE_WIDTH else NODE_WIDTH
+        self._height = height if height > NODE_HEIGHT else NODE_HEIGHT
 
     def _set_text_color(self, color):
         """
@@ -253,7 +253,7 @@ def calc_size(self, add_w=0.0, add_h=0.0):
         Returns:
             tuple(float, float): width, height.
         """
-        width = 0
+        width = self._text_item.boundingRect().width()
         height = self._text_item.boundingRect().height()
 
         if self._widgets:
@@ -301,7 +301,6 @@ def calc_size(self, add_w=0.0, add_h=0.0):
 
         width += add_w
         height += add_h
-
         return width, height
 
     def align_icon(self, h_offset=0.0, v_offset=0.0):
@@ -313,7 +312,7 @@ def align_icon(self, h_offset=0.0, v_offset=0.0):
             h_offset (float): horizontal offset.
         """
         x = 2.0 + h_offset
-        y = 2.0 + v_offset
+        y = 1.0 + v_offset
         self._icon_item.setPos(x, y)
 
     def align_label(self, h_offset=0.0, v_offset=0.0):
@@ -324,12 +323,11 @@ def align_label(self, h_offset=0.0, v_offset=0.0):
             v_offset (float): vertical offset.
             h_offset (float): horizontal offset.
         """
+        rect = self.boundingRect()
         text_rect = self._text_item.boundingRect()
-        text_x = (self._width / 2) - (text_rect.width() / 2)
-        text_y = 2.0
-        text_x += h_offset
-        text_y += v_offset
-        self._text_item.setPos(text_x, text_y)
+        x = rect.center().x() - (text_rect.width() / 2)
+        y = 0.0
+        self._text_item.setPos(x + h_offset, y + v_offset)
 
     def align_widgets(self, v_offset=0.0):
         """
@@ -425,9 +423,9 @@ def draw_node(self):
         # (do all the graphic item layout offsets here)
 
         # align label text
-        self.align_label(h_offset=0.0, v_offset=0.0)
+        self.align_label()
         # arrange icon
-        self.align_icon(h_offset=0.0, v_offset=0.0)
+        self.align_icon()
         # arrange input and output ports.
         self.align_ports(v_offset=height + (height / 2))
         # arrange node widgets
@@ -776,47 +774,45 @@ def paint(self, painter, option, widget):
         self.auto_switch_mode()
 
         painter.save()
-        bg_border = 1.0
-        rect = QtCore.QRectF(0.5 - (bg_border / 2),
-                             0.5 - (bg_border / 2),
-                             self._width + bg_border,
-                             self._height + bg_border)
-        radius = 2
-        border_color = QtGui.QColor(*self.border_color)
-
-        path = QtGui.QPainterPath()
-        path.addRoundedRect(rect, radius, radius)
+        painter.setPen(QtCore.Qt.NoPen)
+        painter.setBrush(QtCore.Qt.NoBrush)
 
+        # base background.
+        margin = 1.0
         rect = self.boundingRect()
+        rect = QtCore.QRectF(rect.left() + margin,
+                             rect.top() + margin,
+                             rect.width() - (margin * 2),
+                             rect.height() - (margin * 2))
 
-        bg_color = QtGui.QColor(*self.color)
-        painter.setBrush(bg_color)
-        painter.setPen(QtCore.Qt.NoPen)
+        radius = 4.0
+        painter.setBrush(QtGui.QColor(*self.color))
         painter.drawRoundedRect(rect, radius, radius)
 
-        if self.selected and NODE_SEL_COLOR:
+        # light overlay on background when selected.
+        if self.selected:
             painter.setBrush(QtGui.QColor(*NODE_SEL_COLOR))
             painter.drawRoundedRect(rect, radius, radius)
 
-        label_rect = QtCore.QRectF(rect.left(), rect.top(), self._width, 15)
-        path = QtGui.QPainterPath()
-        path.addRoundedRect(label_rect, radius, radius)
-        painter.setBrush(QtGui.QColor(30, 30, 30, 200))
-        painter.fillPath(path, painter.brush())
-
-        label_rect = QtCore.QRectF(rect.left(), rect.bottom()-15, self._width, 15)
-        path = QtGui.QPainterPath()
-        path.addRoundedRect(label_rect, radius, radius)
-        painter.fillPath(path, painter.brush())
+        # top & bottom edge background.
+        padding = 2.0
+        height = 10
+        painter.setBrush(QtGui.QColor(0, 0, 0, 50))
+        if self.selected:
+            painter.setBrush(QtGui.QColor(*NODE_SEL_COLOR))
+        for y in [rect.y() + padding, rect.height() - height - 1]:
+            top_rect = QtCore.QRectF(rect.x() + padding, y,
+                                     rect.width() - (padding * 2), height)
+            painter.drawRoundedRect(top_rect, 3.0, 3.0)
 
+        # node border
         border_width = 0.8
-        if self.selected and NODE_SEL_BORDER_COLOR:
+        border_color = QtGui.QColor(*self.border_color)
+        if self.selected:
             border_width = 1.2
             border_color = QtGui.QColor(*NODE_SEL_BORDER_COLOR)
-        border_rect = QtCore.QRectF(rect.left() - (border_width / 2),
-                                    rect.top() - (border_width / 2),
-                                    rect.width() + border_width,
-                                    rect.height() + border_width)
+        border_rect = QtCore.QRectF(rect.left(), rect.top(),
+                                    rect.width(), rect.height())
 
         pen = QtGui.QPen(border_color, border_width)
         pen.setCosmetic(self.viewer().get_zoom() < 0.0)
@@ -830,31 +826,27 @@ def paint(self, painter, option, widget):
 
     def align_icon(self, h_offset=0.0, v_offset=0.0):
         """
-        Align node icon to the default top left of the node.
+        Align node icon to the right side of the node.
 
         Args:
             v_offset (float): vertical offset.
             h_offset (float): horizontal offset.
         """
-        # icon_rect = self._icon_item.boundingRect()
-        # x = self._width / 2 - (icon_rect.width() / 2) + h_offset
-        # y = self._height / 2 - (icon_rect.height() / 2) + v_offset
-        x = 2.0 + h_offset
-        y = 17.0 + v_offset
-        self._icon_item.setPos(x, y)
+        y = self._height / 2
+        y -= self._icon_item.boundingRect().height()
+        self._icon_item.setPos(self._width + h_offset, y + v_offset)
 
     def align_label(self, h_offset=0.0, v_offset=0.0):
         """
-        Align node label to the default top center of the node.
+        Align node label to the right side of the node.
 
         Args:
             v_offset (float): vertical offset.
             h_offset (float): horizontal offset.
         """
-        text_rect = self.text_item.boundingRect()
-        text_x = self._width + 10 + h_offset
-        text_y = self._height / 2 - (text_rect.height() / 2)
-        self.text_item.setPos(text_x, text_y)
+        y = self._height / 2
+        y -= self.text_item.boundingRect().height() / 2
+        self.text_item.setPos(self._width + h_offset, y + v_offset)
 
     def align_ports(self, v_offset=0.0):
         """
@@ -901,13 +893,13 @@ def draw_node(self):
         # (do all the graphic item layout offsets here)
 
         # arrange label text
-        self.align_label(h_offset=0.0, v_offset=0.0)
+        self.align_label(h_offset=8)
         # arrange icon
-        self.align_icon(h_offset=0.0, v_offset=0.0)
+        self.align_icon(h_offset=6, v_offset=-4)
         # arrange input and output ports.
         self.align_ports()
         # arrange node widgets
-        self.align_widgets(v_offset=0.0)
+        self.align_widgets()
 
         self.update()
 
@@ -931,12 +923,10 @@ def calc_size(self, add_w=0.0, add_h=0.0):
         port_width = 0.0
         if self._input_items:
             port = list(self._input_items.keys())[0]
-            height += port.boundingRect().height()
             port_width = port.boundingRect().width()
 
         if self._output_items:
             port = list(self._output_items.keys())[0]
-            height += port.boundingRect().height()
             port_width = port.boundingRect().width()
 
         in_count = len([p for p in self.inputs if p.isVisible()])
@@ -947,12 +937,10 @@ def calc_size(self, add_w=0.0, add_h=0.0):
             for w in self._widgets.values():
                 wid_height += w.boundingRect().height()
             wid_height += wid_height / len(self._widgets.values())
-            if wid_height > height:
-                height = wid_height
+            height = wid_height
 
         width += add_w
-        height += add_h + 15
-
+        height += add_h
         return width, height
 
     def add_input(self, name='input', multi_port=False, display_name=True,
@@ -975,7 +963,7 @@ def add_input(self, name='input', multi_port=False, display_name=True,
             name, multi_port, False, locked, painter_func)
 
     def add_output(self, name='output', multi_port=False, display_name=True,
-                  locked=False, painter_func=None):
+                   locked=False, painter_func=None):
         """
         Adds a port qgraphics item into the node with the "port_type" set as
         OUT_PORT