Skip to content

Commit f72e9cc

Browse files
committed
fix text_item issue
1 parent 898193d commit f72e9cc

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

NodeGraphQt/base/graph.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,6 @@ def set_node_space(self, node):
886886
else:
887887
self.editable = True
888888

889-
890889
def get_node_space(self):
891890
"""
892891
Get the node space of the node graph.
@@ -1191,10 +1190,7 @@ def _deserialize(self, data, relative_pos=False, pos=None, set_parent=True):
11911190
self.add_node(node, n_data.get('pos'), unique_name=set_parent)
11921191
node.set_disabled(n_data.get('disabled', False))
11931192
if isinstance(node, SubGraph):
1194-
if n_data.get('custom', None):
1195-
published = n_data['custom'].get('published', False)
1196-
else:
1197-
published = False
1193+
published = n_data['custom'].get('published', False)
11981194
if not published:
11991195
sub_graph = n_data.get('sub_graph', None)
12001196
if sub_graph:

NodeGraphQt/qgraphics/text_item.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from .. import QtWidgets, QtGui, QtCore
1+
from .. import QtWidgets, QtCore
22

33

44
class text_item(QtWidgets.QGraphicsTextItem):
@@ -12,7 +12,7 @@ def __init__(self, text, parent=None):
1212

1313
def _editingFinished(self):
1414
if self.isEditing:
15-
self.setTextInteractionFlags(QtGui.Qt.NoTextInteraction)
15+
self.setTextInteractionFlags(QtCore.Qt.NoTextInteraction)
1616
self.isEditing = False
1717
self.editingFinished.emit(self.toPlainText())
1818

@@ -26,6 +26,6 @@ def focusOutEvent(self, event):
2626
super(text_item, self).focusOutEvent(event)
2727

2828
def keyPressEvent(self, event):
29-
if event.key() is QtGui.Qt.Key_Return:
29+
if event.key() is QtCore.Qt.Key_Return:
3030
self._editingFinished()
3131
super(text_item, self).keyPressEvent(event)

NodeGraphQt/widgets/scene.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,21 @@ def __init__(self, parent=None):
1616
self.background_color = VIEWER_BG_COLOR
1717
self.grid_color = VIEWER_GRID_COLOR
1818
self._grid_mode = VIEWER_GRID_LINES
19-
self.editable = True
2019
self.setBackgroundBrush(self._bg_qcolor)
20+
self.editable = True
2121

2222
def __repr__(self):
2323
return '{}.{}(\'{}\')'.format(self.__module__,
2424
self.__class__.__name__,
2525
self.viewer())
2626

27-
def _draw_text(self, painter):
27+
def _draw_text(self, painter, pen):
2828
font = QtGui.QFont()
2929
font.setPixelSize(48)
3030
painter.setFont(font)
3131
parent = self.viewer()
3232
pos = QtCore.QPoint(20, parent.height()-20)
33+
painter.setPen(pen)
3334
painter.drawText(parent.mapToScene(pos), 'Not Editable')
3435

3536
def _draw_grid(self, painter, rect, pen, grid_size):
@@ -63,7 +64,8 @@ def _draw_dots(self, painter, rect, pen, grid_size):
6364
pen.setWidth(grid_size / 10)
6465
painter.setPen(pen)
6566

66-
[painter.drawPoint(int(x), int(y)) for x in range(first_left, right, grid_size) for y in range(first_top, bottom, grid_size)]
67+
[painter.drawPoint(int(x), int(y)) for x in range(first_left, right, grid_size)
68+
for y in range(first_top, bottom, grid_size)]
6769

6870
def drawBackground(self, painter, rect):
6971
super(NodeScene, self).drawBackground(painter, rect)
@@ -89,7 +91,9 @@ def drawBackground(self, painter, rect):
8991
self._draw_grid(painter, rect, pen, VIEWER_GRID_SIZE * 8)
9092

9193
if not self.editable:
92-
self._draw_text(painter)
94+
pen = QtGui.QPen(QtGui.QColor(*(90, 90, 90)))
95+
self._draw_text(painter, pen)
96+
9397
painter.restore()
9498

9599
def mousePressEvent(self, event):

0 commit comments

Comments
 (0)