Skip to content

Commit c0ea79e

Browse files
jchanvfxjchanvfx
committed
clean up
1 parent cef4c6f commit c0ea79e

File tree

13 files changed

+156
-80
lines changed

13 files changed

+156
-80
lines changed

‎NodeGraphQt/base/graph.py‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727

2828
class QWidgetDrops(QtWidgets.QWidget):
29+
2930
def __init__(self):
3031
super(QWidgetDrops, self).__init__()
3132
self.setAcceptDrops(True)
@@ -61,7 +62,8 @@ def dropEvent(self, event):
6162

6263
class NodeGraph(QtCore.QObject):
6364
"""
64-
The ``NodeGraph`` class is the main controller for managing all nodes.
65+
The ``NodeGraph`` class is the main controller for managing all nodes
66+
and the node graph.
6567
6668
Inherited from: :class:`PySide2.QtCore.QObject`
6769
@@ -153,18 +155,24 @@ def __init__(self, parent=None):
153155
self._current_node_space = None
154156
self._editable = True
155157

156-
tab = QtWidgets.QShortcut(QtGui.QKeySequence(QtCore.Qt.Key_Tab), self._viewer)
157-
tab.activated.connect(self._toggle_tab_search)
158-
self._viewer.need_show_tab_search.connect(self._toggle_tab_search)
159-
160158
self._wire_signals()
161159
self._node_space_bar = node_space_bar(self)
162160
self._auto_update = True
163161

164162
def __repr__(self):
165-
return '<{} object at {}>'.format(self.__class__.__name__, hex(id(self)))
163+
return '<{} object at {}>'.format(
164+
self.__class__.__name__, hex(id(self)))
166165

167166
def _wire_signals(self):
167+
"""
168+
Connect up all the signals and slots here.
169+
"""
170+
# hard coded tab search.
171+
tab = QtWidgets.QShortcut(
172+
QtGui.QKeySequence(QtCore.Qt.Key_Tab), self._viewer)
173+
tab.activated.connect(self._toggle_tab_search)
174+
self._viewer.need_show_tab_search.connect(self._toggle_tab_search)
175+
168176
# internal signals.
169177
self._viewer.search_triggered.connect(self._on_search_triggered)
170178
self._viewer.connection_sliced.connect(self._on_connection_sliced)
@@ -391,6 +399,16 @@ def model(self):
391399
"""
392400
return self._model
393401

402+
@property
403+
def node_factory(self):
404+
"""
405+
Return the node factory object used by the node graph.
406+
407+
Returns:
408+
NodeFactory: node factory.
409+
"""
410+
return self._node_factory
411+
394412
@property
395413
def widget(self):
396414
"""

‎NodeGraphQt/base/model.py‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
from collections import defaultdict
44

55
from ..constants import (NODE_PROP,
6-
NODE_PROP_QLABEL,
7-
NODE_PROP_QLINEEDIT,
8-
NODE_PROP_QCHECKBOX,
9-
NODE_PROP_COLORPICKER)
6+
NODE_PROP_QLABEL,
7+
NODE_PROP_QLINEEDIT,
8+
NODE_PROP_QCHECKBOX,
9+
NODE_PROP_COLORPICKER)
1010
from ..errors import NodePropertyError
1111

1212

@@ -23,7 +23,7 @@ def __init__(self, node):
2323
self.data_type = 'NoneType'
2424

2525
def __repr__(self):
26-
return '<{}(\'{}\') @ {}>'.format(
26+
return '<{}(\'{}\') object at {}>'.format(
2727
self.__class__.__name__, self.name, hex(id(self)))
2828

2929
@property
@@ -94,6 +94,10 @@ def __init__(self):
9494
'outputs': NODE_PROP,
9595
}
9696

97+
def __repr__(self):
98+
return '<{}(\'{}\') object at {}>'.format(
99+
self.__class__.__name__, self.name, self.id)
100+
97101
def add_property(self, name, value, items=None, range=None,
98102
widget_type=NODE_PROP, tab='Properties',
99103
ext=None, funcs=None):
@@ -240,15 +244,23 @@ def to_dict(self):
240244
output_ports = []
241245
for name, model in node_dict.pop('inputs').items():
242246
if self.dynamic_port:
243-
input_ports.append({'name': name, 'multi_connection': model.multi_connection,
244-
'display_name': model.display_name, 'data_type': model.data_type})
247+
input_ports.append({
248+
'name': name,
249+
'multi_connection': model.multi_connection,
250+
'display_name': model.display_name,
251+
'data_type': model.data_type
252+
})
245253
connected_ports = model.to_dict['connected_ports']
246254
if connected_ports:
247255
inputs[name] = connected_ports
248256
for name, model in node_dict.pop('outputs').items():
249257
if self.dynamic_port:
250-
output_ports.append({'name': name, 'multi_connection': model.multi_connection,
251-
'display_name': model.display_name, 'data_type': model.data_type})
258+
output_ports.append({
259+
'name': name,
260+
'multi_connection': model.multi_connection,
261+
'display_name': model.display_name,
262+
'data_type': model.data_type
263+
})
252264
connected_ports = model.to_dict['connected_ports']
253265
if connected_ports:
254266
outputs[name] = connected_ports

‎NodeGraphQt/base/node.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,11 @@ def create_property(self, name, value, items=None, range=None,
281281
widget_type (int): widget flag to display in the ``PropertiesBinWidget``
282282
tab (str): name of the widget tab to display in the properties bin.
283283
ext (str): file ext of ``NODE_PROP_FILE``
284-
funcs (list) list of functions for NODE_PROP_BUTTON
284+
funcs (list[function]) list of functions for NODE_PROP_BUTTON
285285
"""
286-
self.model.add_property(name, value, items, range, widget_type, tab, ext, funcs)
286+
self.model.add_property(
287+
name, value, items, range, widget_type, tab, ext, funcs
288+
)
287289

288290
def properties(self):
289291
"""

‎NodeGraphQt/base/port.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ def __init__(self, node, port):
2626

2727
def __repr__(self):
2828
port = str(self.__class__.__name__)
29-
return '<{}("{}") object at {}>'.format(port, self.name(), hex(id(self)))
29+
return '<{}("{}") object at {}>'.format(
30+
port, self.name(), hex(id(self)))
3031

3132
@property
3233
def view(self):

‎NodeGraphQt/pkg_info.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/python
22
# -*- coding: utf-8 -*-
3-
__version__ = '0.1.1'
3+
__version__ = '0.1.2'
44
__status__ = 'Work in Progress'
55
__license__ = 'MIT'
66

‎NodeGraphQt/widgets/file_dialog.py‎ renamed to ‎NodeGraphQt/widgets/dialogs.py‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ def set_dir(file):
1414
current_dir = os.path.split(file)[0]
1515

1616

17-
class file_dialog(object):
17+
class FileDialog(object):
1818

1919
@staticmethod
20-
def getSaveFileName(parent=None, title="Save File", file_dir=None, ext_filter="*"):
20+
def getSaveFileName(parent=None, title="Save File", file_dir=None,
21+
ext_filter="*"):
2122
if not file_dir:
2223
file_dir = current_dir
2324
file_dlg = QtWidgets.QFileDialog.getSaveFileName(
@@ -28,7 +29,8 @@ def getSaveFileName(parent=None, title="Save File", file_dir=None, ext_filter="*
2829
return file_dlg
2930

3031
@staticmethod
31-
def getOpenFileName(parent=None, title="Open File", file_dir=None, ext_filter="*"):
32+
def getOpenFileName(parent=None, title="Open File", file_dir=None,
33+
ext_filter="*"):
3234
if not file_dir:
3335
file_dir = current_dir
3436

@@ -42,10 +44,25 @@ def getOpenFileName(parent=None, title="Open File", file_dir=None, ext_filter="*
4244
return file_dlg
4345

4446

45-
def messageBox(text, title , buttons):
46-
msg = QtWidgets.QMessageBox()
47-
msg.setStyleSheet(STYLE_MESSAGEBOX)
48-
msg.setWindowTitle(title)
49-
msg.setInformativeText(text)
50-
msg.setStandardButtons(buttons)
51-
return msg.exec_()
47+
class BaseDialog(object):
48+
49+
@staticmethod
50+
def message_dialog(text, title):
51+
dlg = QtWidgets.QMessageBox()
52+
dlg.setStyleSheet(STYLE_MESSAGEBOX)
53+
dlg.setWindowTitle(title)
54+
dlg.setInformativeText(text)
55+
dlg.setStandardButtons(QtWidgets.QMessageBox.Ok)
56+
return dlg.exec_()
57+
58+
@staticmethod
59+
def question_dialog(text, title):
60+
dlg = QtWidgets.QMessageBox()
61+
dlg.setStyleSheet(STYLE_MESSAGEBOX)
62+
dlg.setWindowTitle(title)
63+
dlg.setInformativeText(text)
64+
dlg.setStandardButtons(
65+
QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No
66+
)
67+
dlg.exec_()
68+
return bool(dlg == QtWidgets.QMessageBox.Yes)

‎NodeGraphQt/widgets/node_space_bar.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44

55
class node_space_bar(QtWidgets.QWidget):
6+
67
def __init__(self, graph):
78
super(node_space_bar, self).__init__()
89
self.setMaximumHeight(20)
@@ -55,4 +56,4 @@ def set_node(self, node):
5556
self.add_node(node)
5657

5758
self._layout.addStretch()
58-
self.update()
59+
self.update()

‎NodeGraphQt/widgets/node_tree.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@ class NodeTreeWidget(QtWidgets.QTreeWidget):
3030
def __init__(self, parent=None, node_graph=None):
3131
super(NodeTreeWidget, self).__init__(parent)
3232
self.setDragDropMode(QtWidgets.QAbstractItemView.DragOnly)
33+
self.setWindowTitle('Node Tree')
3334
self.setHeaderHidden(True)
3435
self._factory = None
3536
self._custom_labels = {}
36-
self._set_node_factory(node_graph._node_factory)
37+
self._set_node_factory(node_graph.node_factory)
3738

3839
def __repr__(self):
3940
return '<{} object at {}>'.format(self.__class__.__name__, hex(id(self)))

‎NodeGraphQt/widgets/node_widgets.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/python
2-
from .file_dialog import file_dialog
2+
from .dialogs import FileDialog
33
from .properties import _ValueEdit
44
from .stylesheet import *
55

@@ -421,7 +421,7 @@ def __init__(self, parent=None, name='', label='', text='', ext="*"):
421421
self._ext = ext
422422

423423
def _on_select_file(self):
424-
file_path = file_dialog.getOpenFileName(ext_filter=self._ext)
424+
file_path = FileDialog.getOpenFileName(ext_filter=self._ext)
425425
file = file_path[0] or None
426426
if file:
427427
self.value = file

‎NodeGraphQt/widgets/properties.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/python
22
from collections import defaultdict
33

4+
from .dialogs import FileDialog
45
from .. import QtWidgets, QtCore, QtGui
56
from ..constants import (NODE_PROP_QLABEL,
67
NODE_PROP_QLINEEDIT,
@@ -18,7 +19,6 @@
1819
NODE_PROP_FLOAT,
1920
NODE_PROP_INT,
2021
NODE_PROP_BUTTON)
21-
from .file_dialog import file_dialog
2222

2323

2424
class BaseProperty(QtWidgets.QWidget):
@@ -312,9 +312,9 @@ def set_file_dir(self, dir):
312312
self._file_dir = dir
313313

314314
def _on_select_file(self):
315-
file_path = file_dialog.getOpenFileName(self,
316-
file_dir=self._file_dir,
317-
ext_filter=self._ext)
315+
file_path = FileDialog.getOpenFileName(self,
316+
file_dir=self._file_dir,
317+
ext_filter=self._ext)
318318
file = file_path[0] or None
319319
if file:
320320
self.set_value(file)
@@ -337,9 +337,9 @@ def set_value(self, value):
337337
class PropFileSavePath(PropFilePath):
338338

339339
def _on_select_file(self):
340-
file_path = file_dialog.getSaveFileName(self,
341-
file_dir=self._file_dir,
342-
ext_filter=self._ext)
340+
file_path = FileDialog.getSaveFileName(self,
341+
file_dir=self._file_dir,
342+
ext_filter=self._ext)
343343
file = file_path[0] or None
344344
if file:
345345
self.set_value(file)

0 commit comments

Comments
 (0)