1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
|
From d8d614770d69b2d4d06c84091033bbaba52b91fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20V=C3=A5gsether?= <hakon.vagsether@gmail.com>
Date: Sun, 16 Mar 2025 08:51:58 +0100
Subject: [PATCH 20/41] grc-qt: Always show key for missing blocks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Håkon Vågsether <hakon.vagsether@gmail.com>
---
grc/gui_qt/components/canvas/block.py | 180 +++++++++++++++-----------
1 file changed, 105 insertions(+), 75 deletions(-)
diff --git a/grc/gui_qt/components/canvas/block.py b/grc/gui_qt/components/canvas/block.py
index c6efe27e64..1b89d9170e 100755
--- a/grc/gui_qt/components/canvas/block.py
+++ b/grc/gui_qt/components/canvas/block.py
@@ -111,16 +111,16 @@ class GUIBlock(QGraphicsItem):
self.font.setBold(True)
# figure out height of block based on how many params there are
- i = 35
+ self.height = 35
+ if self.core.is_dummy_block:
+ self.height += 20
+ else:
+ for key, item in self.core.params.items():
+ value = item.value
+ if (value is not None and item.hide == "none") or (item.dtype == 'id' and self.force_show_id):
+ self.height += 20
# Check if we need to increase the height to fit all the ports
- for key, item in self.core.params.items():
- value = item.value
- if (value is not None and item.hide == "none") or (item.dtype == 'id' and self.force_show_id):
- i += 20
-
- self.height = i
-
def get_min_height_for_ports(ports):
min_height = (
2 * Constants.PORT_BORDER_SEPARATION +
@@ -151,18 +151,23 @@ class GUIBlock(QGraphicsItem):
# Figure out width of block based on widest line of text
fm = QFontMetrics(self.font)
largest_width = fm.width(self.core.label)
- for key, item in self.core.params.items():
- name = item.name
- value = item.value
- if (value is not None and item.hide == "none") or (item.dtype == 'id' and self.force_show_id):
- if len(value) > LONG_VALUE:
- value = value[:LONG_VALUE - 3] + '...'
-
- value_label = item.options[value] if value in item.options else value
- full_line = name + ": " + value_label
-
- if fm.width(full_line) > largest_width:
- largest_width = fm.width(full_line)
+ if self.core.is_dummy_block:
+ full_line = "key: " + self.core.key
+ if fm.width(full_line) > largest_width:
+ largest_width = fm.width(full_line)
+ else:
+ for key, item in self.core.params.items():
+ name = item.name
+ value = item.value
+ if (value is not None and item.hide == "none") or (item.dtype == 'id' and self.force_show_id):
+ if len(value) > LONG_VALUE:
+ value = value[:LONG_VALUE - 3] + '...'
+
+ value_label = item.options[value] if value in item.options else value
+ full_line = name + ": " + value_label
+
+ if fm.width(full_line) > largest_width:
+ largest_width = fm.width(full_line)
self.width = largest_width + 15
self.markups = []
@@ -299,65 +304,90 @@ class GUIBlock(QGraphicsItem):
# Draw param text
y_offset = 30 # params start 30 down from the top of the box
- for key, item in self.core.params.items():
- name = item.name
- value = item.value
- is_evaluated = item.value != str(item.get_evaluated())
-
- display_value = ""
-
- # Include the value defined by the user (after evaluation)
- if not is_evaluated or self.show_param_val or not self.show_param_expr:
- display_value += item.options[value] if value in item.options else value # TODO: pretty_print
-
- # Include the expression that was evaluated to get the value
- if is_evaluated and self.show_param_expr:
- expr_string = value # TODO: Truncate
-
- if display_value: # We are already displaying the value
- display_value = expr_string + "=" + display_value
- else:
- display_value = expr_string
-
- if len(display_value) > LONG_VALUE:
- display_value = display_value[:LONG_VALUE - 3] + '...'
-
- value_label = display_value
- if (value is not None and item.hide == "none") or (item.dtype == 'id' and self.force_show_id):
- if item.is_valid():
- painter.setPen(QPen(1))
- else:
- painter.setPen(Qt.red)
-
- self.font.setBold(True)
- painter.setFont(self.font)
- painter.drawText(
- QRectF(7.5, 0 + y_offset, self.width, self.height),
- Qt.AlignLeft,
- name + ": ",
- )
- fm = QFontMetrics(self.font)
- self.font.setBold(False)
- painter.setFont(self.font)
- painter.drawText(
- QRectF(
- 7.5 + fm.width(name + ": "),
- 0 + y_offset,
- self.width,
- self.height,
- ),
- Qt.AlignLeft,
- value_label,
- )
- y_offset += 20
- if self.markup_text:
- painter.setPen(Qt.gray)
+ if self.core.is_dummy_block:
+ painter.setPen(QPen(1))
+ self.font.setBold(True)
+ painter.setFont(self.font)
painter.drawText(
- QRectF(0, self.height + 5, self.markups_width, self.markups_height),
+ QRectF(7.5, 0 + y_offset, self.width, self.height),
Qt.AlignLeft,
- self.markup_text,
+ "key: ",
)
+ fm = QFontMetrics(self.font)
+ self.font.setBold(False)
+ painter.setFont(self.font)
+ painter.drawText(
+ QRectF(
+ 7.5 + fm.width("key: "),
+ 0 + y_offset,
+ self.width,
+ self.height,
+ ),
+ Qt.AlignLeft,
+ self.core.key,
+ )
+ y_offset += 20
+ else:
+ for key, item in self.core.params.items():
+ name = item.name
+ value = item.value
+ is_evaluated = item.value != str(item.get_evaluated())
+
+ display_value = ""
+
+ # Include the value defined by the user (after evaluation)
+ if not is_evaluated or self.show_param_val or not self.show_param_expr:
+ display_value += item.options[value] if value in item.options else value # TODO: pretty_print
+
+ # Include the expression that was evaluated to get the value
+ if is_evaluated and self.show_param_expr:
+ expr_string = value # TODO: Truncate
+
+ if display_value: # We are already displaying the value
+ display_value = expr_string + "=" + display_value
+ else:
+ display_value = expr_string
+
+ if len(display_value) > LONG_VALUE:
+ display_value = display_value[:LONG_VALUE - 3] + '...'
+
+ value_label = display_value
+ if (value is not None and item.hide == "none") or (item.dtype == 'id' and self.force_show_id) or self.core.is_dummy_block:
+ if item.is_valid():
+ painter.setPen(QPen(1))
+ else:
+ painter.setPen(Qt.red)
+
+ self.font.setBold(True)
+ painter.setFont(self.font)
+ painter.drawText(
+ QRectF(7.5, 0 + y_offset, self.width, self.height),
+ Qt.AlignLeft,
+ name + ": ",
+ )
+ fm = QFontMetrics(self.font)
+ self.font.setBold(False)
+ painter.setFont(self.font)
+ painter.drawText(
+ QRectF(
+ 7.5 + fm.width(name + ": "),
+ 0 + y_offset,
+ self.width,
+ self.height,
+ ),
+ Qt.AlignLeft,
+ value_label,
+ )
+ y_offset += 20
+
+ if self.markup_text:
+ painter.setPen(Qt.gray)
+ painter.drawText(
+ QRectF(0, self.height + 5, self.markups_width, self.markups_height),
+ Qt.AlignLeft,
+ self.markup_text,
+ )
def boundingRect(self):
# TODO: Comments should be a separate QGraphicsItem
--
2.47.3
|
