Merge pull request #158 from ArnoChenFx/master

jchanvfx · web-flow · commit 91314297a63f · 2020-02-27T11:28:18.000+13:00
import with relative path
diff --git a/NodeGraphQt/base/commands.py b/NodeGraphQt/base/commands.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
-from NodeGraphQt import QtWidgets
+from .. import QtWidgets
 
-from NodeGraphQt.constants import IN_PORT, OUT_PORT
+from ..constants import IN_PORT, OUT_PORT
 
 
 class PropertyChangedCmd(QtWidgets.QUndoCommand):
diff --git a/NodeGraphQt/base/factory.py b/NodeGraphQt/base/factory.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-from NodeGraphQt.errors import NodeRegistrationError
+from ..errors import NodeRegistrationError
 
 
 class NodeFactory(object):
diff --git a/NodeGraphQt/base/graph.py b/NodeGraphQt/base/graph.py
@@ -5,22 +5,22 @@
 import re
 import copy
 
-from NodeGraphQt import QtCore, QtWidgets, QtGui
-from NodeGraphQt.base.commands import (NodeAddedCmd,
-                                       NodeRemovedCmd,
-                                       NodeMovedCmd,
-                                       PortConnectedCmd)
-from NodeGraphQt.base.factory import NodeFactory
-from NodeGraphQt.base.menu import NodeGraphMenu, NodesMenu
-from NodeGraphQt.base.model import NodeGraphModel
-from NodeGraphQt.base.node import NodeObject, BaseNode
-from NodeGraphQt.base.port import Port
-from NodeGraphQt.constants import (DRAG_DROP_ID,
-                                   PIPE_LAYOUT_CURVED,
-                                   PIPE_LAYOUT_STRAIGHT,
-                                   PIPE_LAYOUT_ANGLE,
-                                   IN_PORT, OUT_PORT)
-from NodeGraphQt.widgets.viewer import NodeViewer
+from .. import QtCore, QtWidgets, QtGui
+from .commands import (NodeAddedCmd,
+                       NodeRemovedCmd,
+                       NodeMovedCmd,
+                       PortConnectedCmd)
+from .factory import NodeFactory
+from .menu import NodeGraphMenu, NodesMenu
+from .model import NodeGraphModel
+from .node import NodeObject, BaseNode
+from .port import Port
+from ..constants import (DRAG_DROP_ID,
+                         PIPE_LAYOUT_CURVED,
+                         PIPE_LAYOUT_STRAIGHT,
+                         PIPE_LAYOUT_ANGLE,
+                         IN_PORT, OUT_PORT)
+from ..widgets.viewer import NodeViewer
 
 
 class QWidgetDrops(QtWidgets.QWidget):
@@ -43,7 +43,7 @@ def dropEvent(self, event):
             for url in event.mimeData().urls():
                 self.import_session(url.toLocalFile())
         else:
-            e.ignore()
+            event.ignore()
 
 
 class NodeGraph(QtCore.QObject):
@@ -119,6 +119,7 @@ class NodeGraph(QtCore.QObject):
     :parameters: :str
     :emits: new session path
     """
+
     def __init__(self, parent=None):
         super(NodeGraph, self).__init__(parent)
         self.setObjectName('NodeGraphQt')
@@ -204,7 +205,7 @@ def _on_property_bin_changed(self, node_id, prop_name, prop_value):
         node = self.get_node_by_id(node_id)
 
         # prevent signals from causing a infinite loop.
-        _exc = [float, int , str, bool, None]
+        _exc = [float, int, str, bool, None]
         if node.get_property(prop_name) != prop_value:
             if type(node.get_property(prop_name)) in _exc:
                 value = prop_value
@@ -351,8 +352,8 @@ def widget(self):
         if self._widget is None:
             self._widget = QWidgetDrops()
             self._widget.import_session = self.import_session
-            
-                        layout = QtWidgets.QVBoxLayout(self._widget)
+
+            layout = QtWidgets.QVBoxLayout(self._widget)
             layout.setContentsMargins(0, 0, 0, 0)
             layout.addWidget(self._viewer)
         return self._widget
@@ -1087,7 +1088,7 @@ def import_session(self, file_path):
         Args:
             file_path (str): path to the serialized layout file.
         """
-        
+
         file_path = file_path.strip()
         if not os.path.isfile(file_path):
             raise IOError('file does not exist.')
diff --git a/NodeGraphQt/base/menu.py b/NodeGraphQt/base/menu.py
@@ -1,9 +1,9 @@
 #!/usr/bin/python
 from distutils.version import LooseVersion
 
-from NodeGraphQt import QtGui, QtCore
-from NodeGraphQt.errors import NodeMenuError
-from NodeGraphQt.widgets.actions import BaseMenu, GraphAction, NodeAction
+from .. import QtGui, QtCore
+from ..errors import NodeMenuError
+from ..widgets.actions import BaseMenu, GraphAction, NodeAction
 
 
 class NodeGraphMenu(object):
diff --git a/NodeGraphQt/base/model.py b/NodeGraphQt/base/model.py
@@ -2,12 +2,12 @@
 import json
 from collections import defaultdict
 
-from NodeGraphQt.constants import (NODE_PROP,
-                                   NODE_PROP_QLABEL,
-                                   NODE_PROP_QLINEEDIT,
-                                   NODE_PROP_QCHECKBOX,
-                                   NODE_PROP_COLORPICKER)
-from NodeGraphQt.errors import NodePropertyError
+from ..constants import (NODE_PROP,
+                        NODE_PROP_QLABEL,
+                        NODE_PROP_QLINEEDIT,
+                        NODE_PROP_QCHECKBOX,
+                        NODE_PROP_COLORPICKER)
+from ..errors import NodePropertyError
 
 
 class PortModel(object):
diff --git a/NodeGraphQt/base/node.py b/NodeGraphQt/base/node.py
@@ -1,25 +1,25 @@
 #!/usr/bin/python
-from NodeGraphQt.base.commands import PropertyChangedCmd
-from NodeGraphQt.base.model import NodeModel
-from NodeGraphQt.base.port import Port
-from NodeGraphQt.constants import (NODE_PROP,
-                                   NODE_PROP_QLINEEDIT,
-                                   NODE_PROP_QTEXTEDIT,
-                                   NODE_PROP_QCOMBO,
-                                   NODE_PROP_QCHECKBOX,
-                                   NODE_PROP_FILE,
-                                   NODE_PROP_FLOAT,
-                                   NODE_PROP_INT,
-                                   IN_PORT, OUT_PORT)
-from NodeGraphQt.errors import PortRegistrationError
-from NodeGraphQt.qgraphics.node_backdrop import BackdropNodeItem
-from NodeGraphQt.qgraphics.node_base import NodeItem
-from NodeGraphQt.widgets.node_widgets import (NodeComboBox,
-                                              NodeLineEdit,
-                                              NodeFloatEdit,
-                                              NodeIntEdit,
-                                              NodeCheckBox,
-                                              NodeFilePath)
+from .commands import PropertyChangedCmd
+from .model import NodeModel
+from .port import Port
+from ..constants import (NODE_PROP,
+                         NODE_PROP_QLINEEDIT,
+                         NODE_PROP_QTEXTEDIT,
+                         NODE_PROP_QCOMBO,
+                         NODE_PROP_QCHECKBOX,
+                         NODE_PROP_FILE,
+                         NODE_PROP_FLOAT,
+                         NODE_PROP_INT,
+                         IN_PORT, OUT_PORT)
+from ..errors import PortRegistrationError
+from ..qgraphics.node_backdrop import BackdropNodeItem
+from ..qgraphics.node_base import NodeItem
+from ..widgets.node_widgets import (NodeComboBox,
+                                    NodeLineEdit,
+                                    NodeFloatEdit,
+                                    NodeIntEdit,
+                                    NodeCheckBox,
+                                    NodeFilePath)
 
 
 class classproperty(object):
@@ -709,7 +709,7 @@ def update_combo_menu(self, name, items):
             return
         old_value = self.get_property(name)
         self.set_property(name, items)
-        _name = '_'+name+"_"
+        _name = '_' + name + "_"
         if not self.has_property(_name):
             self.create_property(_name, items)
         else:
diff --git a/NodeGraphQt/base/port.py b/NodeGraphQt/base/port.py
@@ -1,11 +1,11 @@
 #!/usr/bin/python
-from NodeGraphQt.base.commands import (PortConnectedCmd,
-                                       PortDisconnectedCmd,
-                                       PortVisibleCmd,
-                                       NodeInputConnectedCmd,
-                                       NodeInputDisconnectedCmd)
-from NodeGraphQt.base.model import PortModel
-from NodeGraphQt.constants import IN_PORT, OUT_PORT
+from .commands import (PortConnectedCmd,
+                             PortDisconnectedCmd,
+                             PortVisibleCmd,
+                             NodeInputConnectedCmd,
+                             NodeInputDisconnectedCmd)
+from .model import PortModel
+from ..constants import IN_PORT, OUT_PORT
 
 
 class Port(object):
diff --git a/NodeGraphQt/base/utils.py b/NodeGraphQt/base/utils.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 from distutils.version import LooseVersion
 
-from NodeGraphQt import QtGui, QtCore
+from .. import QtGui, QtCore
 
 
 def setup_context_menu(graph):
diff --git a/NodeGraphQt/constants.py b/NodeGraphQt/constants.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 import os
 from .pkg_info import __version__
-from NodeGraphQt import QtWidgets
+from . import QtWidgets
 
 #: Current version of the NodeGraphQt framework.
 VERSION = __version__
diff --git a/NodeGraphQt/errors.py b/NodeGraphQt/errors.py
@@ -1,7 +1,17 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
+
+
 class NodeMenuError(Exception): pass
+
+
 class NodePropertyError(Exception): pass
+
+
 class NodeWidgetError(Exception): pass
+
+
 class NodeRegistrationError(Exception): pass
+
+
 class PortRegistrationError(Exception): pass
diff --git a/NodeGraphQt/qgraphics/node_abstract.py b/NodeGraphQt/qgraphics/node_abstract.py
@@ -1,8 +1,9 @@
 #!/usr/bin/python
-from NodeGraphQt import QtCore, QtWidgets
 
-from NodeGraphQt.constants import (Z_VAL_NODE, NODE_WIDTH, NODE_HEIGHT,
-                                   ITEM_CACHE_MODE)
+from .. import QtCore, QtWidgets
+
+from ..constants import (Z_VAL_NODE, NODE_WIDTH, NODE_HEIGHT,
+                                                    ITEM_CACHE_MODE)
 
 
 class AbstractNodeItem(QtWidgets.QGraphicsItem):
diff --git a/NodeGraphQt/qgraphics/node_backdrop.py b/NodeGraphQt/qgraphics/node_backdrop.py
@@ -1,12 +1,12 @@
 #!/usr/bin/python
 
-from NodeGraphQt import QtGui, QtCore, QtWidgets
-from NodeGraphQt.constants import (Z_VAL_PIPE,
-                                   NODE_SEL_COLOR,
-                                   NODE_SEL_BORDER_COLOR)
-from NodeGraphQt.qgraphics.node_abstract import AbstractNodeItem
-from NodeGraphQt.qgraphics.pipe import Pipe
-from NodeGraphQt.qgraphics.port import PortItem
+from .. import QtGui, QtCore, QtWidgets
+from ..constants import (Z_VAL_PIPE,
+                         NODE_SEL_COLOR,
+                         NODE_SEL_BORDER_COLOR)
+from .node_abstract import AbstractNodeItem
+from .pipe import Pipe
+from .port import PortItem
 
 
 class BackdropSizer(QtWidgets.QGraphicsItem):
diff --git a/NodeGraphQt/qgraphics/node_base.py b/NodeGraphQt/qgraphics/node_base.py
@@ -1,15 +1,16 @@
 #!/usr/bin/python
 
-from NodeGraphQt import QtGui, QtCore, QtWidgets
-from NodeGraphQt.constants import (IN_PORT, OUT_PORT,
-                                   NODE_WIDTH, NODE_HEIGHT,
-                                   NODE_ICON_SIZE, ICON_NODE_BASE,
-                                   NODE_SEL_COLOR, NODE_SEL_BORDER_COLOR,
-                                   PORT_FALLOFF, Z_VAL_NODE, Z_VAL_NODE_WIDGET,
-                                   ITEM_CACHE_MODE)
-from NodeGraphQt.errors import NodeWidgetError
-from NodeGraphQt.qgraphics.node_abstract import AbstractNodeItem
-from NodeGraphQt.qgraphics.port import PortItem
+from .. import QtGui, QtCore, QtWidgets
+from ..constants import (IN_PORT, OUT_PORT,
+                         NODE_WIDTH, NODE_HEIGHT,
+                         NODE_ICON_SIZE, ICON_NODE_BASE,
+                         NODE_SEL_COLOR, NODE_SEL_BORDER_COLOR,
+                         PORT_FALLOFF, Z_VAL_NODE, Z_VAL_NODE_WIDGET,
+                         ITEM_CACHE_MODE)
+from ..errors import NodeWidgetError
+from .node_abstract import AbstractNodeItem
+from .port import PortItem
+
 
 class XDisabledItem(QtWidgets.QGraphicsItem):
     """
@@ -493,11 +494,11 @@ def post_init(self, viewer=None, pos=None):
     def auto_switch_mode(self):
         if ITEM_CACHE_MODE is QtWidgets.QGraphicsItem.ItemCoordinateCache:
             return
-        rect= self.sceneBoundingRect()
+        rect = self.sceneBoundingRect()
         l = self.viewer().mapToGlobal(self.viewer().mapFromScene(rect.topLeft()))
-        r = self.viewer().mapToGlobal(self.viewer().mapFromScene( rect.topRight()))
+        r = self.viewer().mapToGlobal(self.viewer().mapFromScene(rect.topRight()))
         # with is the node with in screen
-        width = r.x()-l.x()
+        width = r.x() - l.x()
 
         self.set_proxy_mode(width < self._porxy_mode_threshold)
 
diff --git a/NodeGraphQt/qgraphics/pipe.py b/NodeGraphQt/qgraphics/pipe.py
@@ -1,16 +1,16 @@
 #!/usr/bin/python
 import math
 
-from NodeGraphQt import QtCore, QtGui, QtWidgets
-from NodeGraphQt.constants import (
+from .. import QtCore, QtGui, QtWidgets
+from ..constants import (
     PIPE_DEFAULT_COLOR, PIPE_ACTIVE_COLOR,
     PIPE_HIGHLIGHT_COLOR, PIPE_DISABLED_COLOR,
     PIPE_STYLE_DASHED, PIPE_STYLE_DEFAULT, PIPE_STYLE_DOTTED,
     PIPE_LAYOUT_STRAIGHT, PIPE_WIDTH, IN_PORT, OUT_PORT, Z_VAL_PIPE,
     Z_VAL_NODE_WIDGET,
     PIPE_LAYOUT_ANGLE, PIPE_LAYOUT_CURVED,
     ITEM_CACHE_MODE)
-from NodeGraphQt.qgraphics.port import PortItem
+from .port import PortItem
 
 PIPE_STYLES = {
     PIPE_STYLE_DEFAULT: QtCore.Qt.SolidLine,
diff --git a/NodeGraphQt/qgraphics/port.py b/NodeGraphQt/qgraphics/port.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
-from NodeGraphQt import QtGui, QtCore, QtWidgets
+from .. import QtGui, QtCore, QtWidgets
 
-from NodeGraphQt.constants import (
+from ..constants import (
     IN_PORT, OUT_PORT,
     PORT_DEFAULT_COLOR,
     PORT_DEFAULT_BORDER_COLOR,
diff --git a/NodeGraphQt/qgraphics/slicer.py b/NodeGraphQt/qgraphics/slicer.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
-from NodeGraphQt import QtCore, QtGui, QtWidgets
-from NodeGraphQt.constants import Z_VAL_NODE_WIDGET, PIPE_SLICER_COLOR
+from .. import QtCore, QtGui, QtWidgets
+from ..constants import Z_VAL_NODE_WIDGET, PIPE_SLICER_COLOR
 
 
 class SlicerPipe(QtWidgets.QGraphicsPathItem):
diff --git a/NodeGraphQt/widgets/actions.py b/NodeGraphQt/widgets/actions.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
-from NodeGraphQt import QtCore, QtWidgets
-from NodeGraphQt.widgets.stylesheet import STYLE_QMENU
+from .. import QtCore, QtWidgets
+from .stylesheet import STYLE_QMENU
 
 
 class BaseMenu(QtWidgets.QMenu):
diff --git a/NodeGraphQt/widgets/file_dialog.py b/NodeGraphQt/widgets/file_dialog.py
@@ -1,5 +1,5 @@
-from NodeGraphQt import QtWidgets
-from NodeGraphQt.widgets.stylesheet import STYLE_MESSAGEBOX
+from .. import QtWidgets
+from .stylesheet import STYLE_MESSAGEBOX
 import os
 
 current_dir = os.path.expanduser('~')
diff --git a/NodeGraphQt/widgets/node_tree.py b/NodeGraphQt/widgets/node_tree.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-from NodeGraphQt import QtWidgets, QtCore
-from NodeGraphQt.constants import DRAG_DROP_ID
+from .. import QtWidgets, QtCore
+from ..constants import DRAG_DROP_ID
 
 
 TYPE_NODE = QtWidgets.QTreeWidgetItem.UserType + 1
diff --git a/NodeGraphQt/widgets/node_widgets.py b/NodeGraphQt/widgets/node_widgets.py
diff --git a/NodeGraphQt/widgets/properties.py b/NodeGraphQt/widgets/properties.py
diff --git a/NodeGraphQt/widgets/properties_bin.py b/NodeGraphQt/widgets/properties_bin.py
diff --git a/NodeGraphQt/widgets/scene.py b/NodeGraphQt/widgets/scene.py
diff --git a/NodeGraphQt/widgets/stylesheet.py b/NodeGraphQt/widgets/stylesheet.py
diff --git a/NodeGraphQt/widgets/tab_search.py b/NodeGraphQt/widgets/tab_search.py
diff --git a/NodeGraphQt/widgets/viewer.py b/NodeGraphQt/widgets/viewer.py
