Skip to content

Commit eaa6136

Browse files
committed
properties clean up.
1 parent fc40706 commit eaa6136

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

NodeGraphQt/custom_widgets/properties.py

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323

2424

2525
class BaseProperty(QtWidgets.QWidget):
26+
"""
27+
Base widget class for a node property.
28+
"""
2629

2730
value_changed = QtCore.Signal(str, object)
2831

@@ -733,23 +736,16 @@ def get_value(self):
733736
}
734737

735738

736-
def registerPropType(name, prop_class, override=False):
737-
global WIDGET_MAP
738-
if name in WIDGET_MAP.keys() and not override:
739-
raise Exception(
740-
'Prop type {} has already exists, '
741-
'u can use override=True to override)'
742-
.format(name)
743-
)
744-
WIDGET_MAP[name] = prop_class
745-
746739
# main property widgets.
747740

748741

749-
class PropWindow(QtWidgets.QWidget):
742+
class PropListWidget(QtWidgets.QWidget):
743+
"""
744+
Node properties list displayed under a tab in the NodePropWidget widget.
745+
"""
750746

751747
def __init__(self, parent=None):
752-
super(PropWindow, self).__init__(parent)
748+
super(PropListWidget, self).__init__(parent)
753749
self.__layout = QtWidgets.QGridLayout()
754750
self.__layout.setColumnStretch(1, 1)
755751
self.__layout.setSpacing(6)
@@ -759,7 +755,9 @@ def __init__(self, parent=None):
759755
layout.addLayout(self.__layout)
760756

761757
def __repr__(self):
762-
return '<PropWindow object at {}>'.format(hex(id(self)))
758+
return '<{} object at {}>'.format(
759+
self.__class__.__name__, hex(id(self))
760+
)
763761

764762
def add_widget(self, name, widget, value, label=None):
765763
"""
@@ -850,7 +848,9 @@ def __init__(self, parent=None, node=None):
850848
self._read_node(node)
851849

852850
def __repr__(self):
853-
return '<NodePropWidget object at {}>'.format(hex(id(self)))
851+
return '<{} object at {}>'.format(
852+
self.__class__.__name__, hex(id(self))
853+
)
854854

855855
def _on_close(self):
856856
"""
@@ -899,8 +899,8 @@ def _read_node(self, node):
899899
if wid_type == 0:
900900
continue
901901

902-
WidClass = WIDGET_MAP.get(wid_type)
903-
widget = WidClass()
902+
_WidgetClass = WIDGET_MAP.get(wid_type)
903+
widget = _WidgetClass()
904904
if prop_name in common_props.keys():
905905
if 'items' in common_props[prop_name].keys():
906906
widget.set_items(common_props[prop_name]['items'])
@@ -919,9 +919,9 @@ def _read_node(self, node):
919919
prop_window = self.__tab_windows['Node']
920920
for prop_name in default_props:
921921
wid_type = model.get_widget_type(prop_name)
922-
WidClass = WIDGET_MAP.get(wid_type)
922+
_WidgetClass = WIDGET_MAP.get(wid_type)
923923

924-
widget = WidClass()
924+
widget = _WidgetClass()
925925
prop_window.add_widget(prop_name,
926926
widget,
927927
model.get_property(prop_name),
@@ -963,11 +963,11 @@ def add_tab(self, name):
963963
name (str): tab name.
964964
965965
Returns:
966-
PropWindow: tab child widget.
966+
PropListWidget: tab child widget.
967967
"""
968968
if name in self.__tab_windows.keys():
969969
raise AssertionError('Tab name {} already taken!'.format(name))
970-
self.__tab_windows[name] = PropWindow(self)
970+
self.__tab_windows[name] = PropListWidget(self)
971971
self.__tab.addTab(self.__tab_windows[name], name)
972972
return self.__tab_windows[name]
973973

@@ -999,21 +999,21 @@ class TestNode(BaseNode):
999999

10001000
def __init__(self):
10011001
super(TestNode, self).__init__()
1002-
self.create_property('label_test', 'foo bar',
1002+
self.create_property('label_test', 'Test Text',
10031003
widget_type=NODE_PROP_QLABEL)
1004-
self.create_property('line_edit', 'hello',
1004+
self.create_property('line_edit', 'Test Text',
10051005
widget_type=NODE_PROP_QLINEEDIT)
10061006
self.create_property('color_picker', (0, 0, 255),
10071007
widget_type=NODE_PROP_COLORPICKER)
10081008
self.create_property('integer', 10,
10091009
widget_type=NODE_PROP_QSPINBOX)
1010-
self.create_property('list', 'foo',
1011-
items=['foo', 'bar'],
1010+
self.create_property('list', 'item1',
1011+
items=['item1', 'item2', 'item3'],
10121012
widget_type=NODE_PROP_QCOMBO)
10131013
self.create_property('range', 50,
10141014
range=(45, 55),
10151015
widget_type=NODE_PROP_SLIDER)
1016-
self.create_property('text_edit', 'test text',
1016+
self.create_property('text_edit', 'Test Text',
10171017
widget_type=NODE_PROP_QTEXTEDIT,
10181018
tab='text')
10191019

0 commit comments

Comments
 (0)