Skip to content

Commit 7690a6b

Browse files
ArnoChenFxArnoChenFx
committed
modify ui style
1 parent 4abdb92 commit 7690a6b

File tree

8 files changed

+36
-33
lines changed

8 files changed

+36
-33
lines changed

‎NodeGraphQt/widgets/properties.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ class _ColorSolid(QtWidgets.QWidget):
2727

2828
def __init__(self, parent=None, color=None):
2929
super(_ColorSolid, self).__init__(parent)
30-
self.setMinimumSize(15, 15)
31-
self.setMaximumSize(15, 15)
30+
self.setFixedSize(15, 15)
3231
self.color = color or (0, 0, 0)
3332

3433
def paintEvent(self, event):
@@ -37,7 +36,7 @@ def paintEvent(self, event):
3736
painter = QtGui.QPainter(self)
3837
painter.setPen(QtCore.Qt.NoPen)
3938
painter.setBrush(QtGui.QColor(*self._color))
40-
painter.drawRoundedRect(rect, 4, 4)
39+
painter.drawRoundedRect(rect, 1, 1)
4140

4241
@property
4342
def color(self):
@@ -56,7 +55,6 @@ class PropColorPicker(BaseProperty):
5655
def __init__(self, parent=None):
5756
super(PropColorPicker, self).__init__(parent)
5857
self._solid = _ColorSolid(self)
59-
self._solid.setMaximumHeight(15)
6058
self._label = QtWidgets.QLabel()
6159
self._update_label()
6260

@@ -70,7 +68,7 @@ def __init__(self, parent=None):
7068
layout.addWidget(button, 1, QtCore.Qt.AlignLeft)
7169

7270
def _on_select_color(self):
73-
color = QtWidgets.QColorDialog.getColor(QtGui.QColor(*self.get_value()))
71+
color = QtWidgets.QColorDialog.getColor(QtGui.QColor(*self.get_value()),options=QtWidgets.QColorDialog.ShowAlphaChannel)
7472
if color.isValid():
7573
self.set_value(color.getRgb())
7674

@@ -165,7 +163,7 @@ def get_value(self):
165163

166164
def set_value(self, value):
167165
if value != self.get_value():
168-
self.setText(value)
166+
self.setText(str(value))
169167
self.value_changed.emit(self.toolTip(), value)
170168

171169

@@ -460,6 +458,7 @@ def _read_node(self, node):
460458
if tab != 'Node':
461459
self.add_tab(tab)
462460

461+
widget_height = 25
463462
# populate tab properties.
464463
for tab in sorted(tab_mapping.keys()):
465464
prop_window = self.__tab_windows[tab]
@@ -470,6 +469,7 @@ def _read_node(self, node):
470469

471470
WidClass = WIDGET_MAP.get(wid_type)
472471
widget = WidClass()
472+
widget.setFixedHeight(widget_height)
473473
if prop_name in common_props.keys():
474474
if 'items' in common_props[prop_name].keys():
475475
widget.set_items(common_props[prop_name]['items'])
@@ -491,6 +491,7 @@ def _read_node(self, node):
491491
WidClass = WIDGET_MAP.get(wid_type)
492492

493493
widget = WidClass()
494+
widget.setFixedHeight(widget_height)
494495
prop_window.add_widget(prop_name,
495496
widget,
496497
model.get_property(prop_name),

‎NodeGraphQt/widgets/stylesheet.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
subcontrol-origin: margin;
2424
subcontrol-position: top center;
2525
color: rgba(255, 255, 255, 85);
26+
padding: 0px;
27+
left:-4px;
2628
}
2729
'''
2830

‎NodeGraphQt/widgets/viewer.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,14 @@ def __init__(self, parent=None):
8181
menu_bar = QtWidgets.QMenuBar(self)
8282
menu_bar.setNativeMenuBar(False)
8383
# shortcuts don't work with "setVisibility(False)".
84-
menu_bar.resize(0, 0)
84+
# menu_bar.resize(0, 0)
85+
menu_bar.setMaximumWidth(0)
8586

8687
self._ctx_menu = BaseMenu('NodeGraph', self)
8788
self._ctx_node_menu = BaseMenu('Nodes', self)
8889
menu_bar.addMenu(self._ctx_menu)
89-
# menu_bar.addMenu(self._ctx_node_menu)
90-
# self._ctx_node_menu.setDisabled(True)
90+
menu_bar.addMenu(self._ctx_node_menu)
91+
self._ctx_node_menu.setDisabled(True)
9192

9293
self.acyclic = True
9394
self.LMB_state = False

‎example_auto_nodes/data_node.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ def __init__(self):
1818
self.add_output('out',list)
1919
self.create_property("out", value)
2020

21-
self.add_float_input('0', 'X', value=value[0], tab='widgets')
21+
self.add_float_input('0', 'X', value=value[0])
2222
self.view.widgets['0'].value_changed.connect(lambda: self.updateValue(0))
2323

24-
self.add_float_input('1', 'Y', value=value[1], tab='widgets')
24+
self.add_float_input('1', 'Y', value=value[1])
2525
self.view.widgets['1'].value_changed.connect(lambda: self.updateValue(1))
2626

27-
self.add_float_input('2', 'Z', value=value[2], tab='widgets')
27+
self.add_float_input('2', 'Z', value=value[2])
2828
self.view.widgets['2'].value_changed.connect(lambda: self.updateValue(2))
2929

3030
self.defaultValue = value
@@ -105,7 +105,7 @@ def __init__(self):
105105
items.append("all to float")
106106
items.append("all to string")
107107
items.append("eval string")
108-
self.add_combo_menu('method', 'Method', items=items, tab='widgets')
108+
self.add_combo_menu('method', 'Method', items=items)
109109
self.view.widgets['method'].value_changed.connect(self.cook)
110110

111111
def run(self):

‎example_auto_nodes/input_nodes.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def __init__(self):
1515
self.defaultValue = 0.0
1616

1717
self.output = self.add_output('out',float)
18-
self.add_float_input('out', 'Float Value', value=self.defaultValue, tab='widgets')
18+
self.add_float_input('out', 'Float Value', value=self.defaultValue)
1919
self.view.widgets['out'].value_changed.connect(self.cook)
2020

2121

@@ -30,7 +30,7 @@ class TickTimeNode(AutoNode):
3030
def __init__(self):
3131
super(TickTimeNode, self).__init__()
3232
self.add_output('out',float)
33-
self.add_float_input('out', 'Data Input', value=0.0, tab='widgets')
33+
self.add_float_input('out', 'Data Input', value=0.0)
3434
self.view.widgets['out'].value_changed.connect(self.cook)
3535

3636
self.timer = QtCore.QTimer()
@@ -56,7 +56,7 @@ def __init__(self):
5656
super(TextFileInputNode, self).__init__()
5757
self.add_output('out',str)
5858
self.create_property('out', "")
59-
self.add_text_input('path', 'Text File Path', text='', tab='widgets')
59+
self.add_text_input('path', 'Text File Path', text='')
6060
self.view.widgets['path'].value_changed.connect(self.cook)
6161

6262
def run(self):
@@ -91,5 +91,5 @@ def __init__(self):
9191
self.add_output('out')
9292

9393
# create QLineEdit text input widget.
94-
self.add_text_input('out', 'Text Input', tab='widgets')
94+
self.add_text_input('out', 'Text Input')
9595
self.view.widgets['out'].value_changed.connect(self.cook)

‎example_auto_nodes/node_base/auto_node.py‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
def rand_color(seed_type):
88
seed = id(seed_type)
9-
random.seed(seed+10)
9+
random.seed(seed + 10)
1010
r = random.randint(50, 200)
1111
random.seed(seed + 5)
1212
g = random.randint(50, 200)
@@ -16,14 +16,14 @@ def rand_color(seed_type):
1616

1717

1818
class AutoNode(BaseNode):
19-
def __init__(self,defaultInputType=None,defaultOutputType=None):
19+
def __init__(self, defaultInputType=None, defaultOutputType=None):
2020
super(AutoNode, self).__init__()
2121
self.needCook = True
2222
self._autoCook = True
2323
self._error = False
2424
self.matchTypes = [[float, int]]
2525
self.errorColor = (200, 50, 50)
26-
self.stopCookColor = (200,200,200)
26+
self.stopCookColor = (200, 200, 200)
2727

2828
self.defaultColor = self.get_property("color")
2929
self.defaultValue = None
@@ -35,13 +35,13 @@ def autoCook(self):
3535
return self._autoCook
3636

3737
@autoCook.setter
38-
def autoCook(self,mode):
38+
def autoCook(self, mode):
3939
if mode is self._autoCook:
4040
return
4141

4242
self._autoCook = mode
4343
if mode:
44-
self.set_property('color',self.defaultColor)
44+
self.set_property('color', self.defaultColor)
4545
else:
4646
self.defaultColor = self.get_property("color")
4747
self.set_property('color', self.stopCookColor)
@@ -70,7 +70,7 @@ def getInputData(self, port):
7070
data = from_port.node().get_property(from_port.name())
7171
return data
7272

73-
def cook(self, forceCook = False):
73+
def cook(self, forceCook=False):
7474
if not self._autoCook and forceCook is not True:
7575
return
7676

@@ -94,10 +94,9 @@ def cook(self, forceCook = False):
9494

9595
self.cookNextNode()
9696

97-
9897
def run(self):
9998
pass
100-
#print("RUN {} Node".format(self.name()))
99+
# print("RUN {} Node".format(self.name()))
101100

102101
def on_input_connected(self, to_port, from_port):
103102
if self.checkPortType(to_port, from_port):
@@ -118,7 +117,7 @@ def set_disabled(self, mode=False):
118117
self.cook()
119118

120119
def checkPortType(self, to_port, from_port):
121-
if hasattr(to_port,"DataType") and hasattr(from_port,"DataType"):
120+
if hasattr(to_port, "DataType") and hasattr(from_port, "DataType"):
122121
if to_port.DataType is not from_port.DataType:
123122
for types in self.matchTypes:
124123
if to_port.DataType in types and from_port.DataType in types:
@@ -145,7 +144,7 @@ def set_port_type(self, port, value_type):
145144
current_port = outputs[port]
146145

147146
if current_port:
148-
if hasattr(current_port,"DataType"):
147+
if hasattr(current_port, "DataType"):
149148
if current_port.DataType is value_type:
150149
return
151150
else:
@@ -154,8 +153,8 @@ def set_port_type(self, port, value_type):
154153
current_port.border_color = rand_color(value_type)
155154
current_port.color = rand_color(value_type)
156155
conn_type = 'multi' if current_port.multi_connection() else 'single'
157-
dtat_type_name = value_type.__name__ if value_type else "all"
158-
current_port.view.setToolTip('{}: {} ({}) '.format(current_port.name(),dtat_type_name,conn_type))
156+
data_type_name = value_type.__name__ if value_type else "all"
157+
current_port.view.setToolTip('{}: {} ({}) '.format(current_port.name(), data_type_name, conn_type))
159158

160159
def create_property(self, name, value, items=None, range=None,
161160
widget_type=NODE_PROP, tab=None):
@@ -187,7 +186,7 @@ def _close_error(self):
187186
self.set_property('color', self.defaultColor)
188187
self._view._tooltip_disable(False)
189188

190-
def _show_error(self,message):
189+
def _show_error(self, message):
191190
if not self._error:
192191
self.defaultColor = self.get_property("color")
193192

@@ -198,7 +197,7 @@ def _show_error(self,message):
198197
tooltip += '<br/>{}<br/>'.format(self._view.type_)
199198
self._view.setToolTip(tooltip)
200199

201-
def error(self,message = None):
200+
def error(self, message=None):
202201
if message is None:
203202
return self._error
204203

‎example_auto_nodes/node_base/module_node.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class ModuleNode(AutoNode):
4747
def __init__(self,defaultInputType=None,defaultOutputType=None):
4848
super(ModuleNode, self).__init__(defaultInputType,defaultOutputType)
4949
self.set_color(25, 58, 51)
50-
self.add_combo_menu('funcs', 'Functions', items=list(self.module_functions.keys()), tab='widgets')
50+
self.add_combo_menu('funcs', 'Functions', items=list(self.module_functions.keys()))
5151

5252
# switch math function type
5353
self.view.widgets['funcs'].value_changed.connect(self.addFunction)

‎example_auto_nodes/viewer_nodes.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class DataViewerNode(AutoNode):
77
def __init__(self):
88
super(DataViewerNode, self).__init__()
99
self.add_input('in data')
10-
self.add_text_input('data', 'Data Viewer', tab='widgets')
10+
self.add_text_input('data', 'Data Viewer')
1111
self.add_output("out")
1212
self.create_property("out",None)
1313

0 commit comments

Comments
 (0)