Apply changes from gr upstream

blocks/variable_struct.block.yml.py

@@ -10,6 +10,10 @@
 parameters:
 """
 
+FUNCTIONCALL = """\
+field{0}:value{0},\
+"""
+
 TEMPLATES = """\
 
 templates:
@@ -26,17 +30,6 @@
             % endif
             % endfor
         }})
-    var_value: |-
-        struct({{
-            % for i in range({0}):
-            <%
-                field = context.get('field' + str(i))
-            %>
-            % if len(str(field)) > 2:
-            ${{field}}: ${{field}},
-            % endif
-            % endfor
-        }})
 """
 
 FIELD0 = """\
@@ -86,8 +79,8 @@ def make_yml(num_fields):
     return ''.join((
         HEADER.format(num_fields),
         FIELD0, ''.join(FIELDS.format(i) for i in range(1, num_fields)),
-        ''.join(VALUES.format(i) for i in range(num_fields)),
-        'value: ${value}\n\nasserts:\n',
+        ''.join(VALUES.format(i) for i in range(num_fields)),'value: ${struct({',
+        ''.join(FUNCTIONCALL.format(i) for i in range(num_fields)),'})}\n\nasserts:\n',
         ''.join(ASSERTS.format(i) for i in range(num_fields)),
         ''.join(TEMPLATES.format(num_fields)),
         FOOTER

core/Connection.py

@@ -23,7 +23,9 @@ class Connection(Element):
     """
 
     is_connection = True
+    category = []
     documentation = {'': ''}
+    doc_url = ''
 
     def __init__(self, parent, source, sink):
         """

core/FlowGraph.py

@@ -288,7 +288,7 @@ def _reload_variables(self, namespace: dict) -> dict:
                 namespace[variable_block.name] = value
                 # rewrite on subsequent blocks depends on an updated self.namespace
                 self.namespace.update(namespace)
-            except TypeError:  # Type Errors may happen, but that doesn't matter as they are displayed in the gui
+            except (TypeError, FileNotFoundError):  # Type Errors or FileNotFoundError may happen, but that doesn't matter as they are displayed in the gui
                 pass
             except Exception:
                 log.exception(f'Failed to evaluate variable block {variable_block.name}', exc_info=True)

core/ports/port.py

@@ -163,7 +163,7 @@ def find_port(finder):
             self.set_evaluated('vlen', port.vlen)
             self.domain = port.domain
         except AttributeError:
-            self.domain = Constants.DEFAULT_DOMAIN
+            pass
 
     def add_clone(self):
         """

gui/Config.py

@@ -28,8 +28,7 @@ class Config(CoreConfig):
 
     name = 'GNU Radio Companion'
 
-    gui_prefs_file = os.environ.get(
-        'GRC_PREFS_PATH', os.path.join(get_config_file_path(), 'grc.conf'))
+    gui_prefs_file = os.environ.get('GRC_PREFS_PATH', get_config_file_path())
 
     def __init__(self, install_prefix, *args, **kwargs):
         CoreConfig.__init__(self, *args, **kwargs)

gui/PropsDialog.py

@@ -239,6 +239,8 @@ def _update_docs_page(self):
             if urlparse(url).scheme not in ("", "file"):
                 icon += "🌐"
             self._docs_link.set_markup(f'<a href="{url}">{icon} Visit Documentation Page</a>')
+        elif self._block.is_connection:
+            self._docs_link.set_markup('Connection Properties')
         else:
             self._docs_link.set_markup('Out of Tree Block, No documentation URL specified')
 

gui_qt/Config.py

@@ -11,8 +11,7 @@ class Config(CoreConfig):
 
     name = 'GNU Radio Companion'
 
-    gui_prefs_file = os.environ.get(
-        'GRC_QT_PREFS_PATH', os.path.join(get_config_file_path(), 'grc_qt.conf'))
+    gui_prefs_file = os.environ.get('GRC_QT_PREFS_PATH', get_config_file_path('grc_qt.conf'))
 
     def __init__(self, install_prefix, *args, **kwargs):
         CoreConfig.__init__(self, *args, **kwargs)

gui_qt/components/block_library.py

@@ -48,6 +48,7 @@ def on_return_pressed(self):
             self.parent.populate_tree(self.parent._block_tree)
         else:
             log.info(f"No block named {label}")
+            self.parent.reset()
 
 
 def get_items(model):
@@ -165,7 +166,7 @@ def __init__(self):
         self.populate_tree(self._block_tree)
 
         completer = QCompleter(self._block_tree_flat.keys())
-        completer.setCompletionMode(QCompleter.InlineCompletion)
+        completer.setCompletionMode(QCompleter.PopupCompletion)
         completer.setCaseSensitivity(Qt.CaseInsensitive)
         completer.setFilterMode(Qt.MatchContains)
         self._search_bar.setCompleter(completer)

gui_qt/components/dialogs.py

@@ -23,6 +23,7 @@ def __init__(self, flowgraph):
         self.buttonBox = QDialogButtonBox(buttons)
         self.buttonBox.rejected.connect(self.reject)  # close
         self.treeview = QTreeView()
+        self.treeview.setEditTriggers(QTreeView.NoEditTriggers)
         self.model = QStandardItemModel()
         self.treeview.setModel(self.model)
         self.layout = QVBoxLayout()
@@ -33,7 +34,7 @@ def __init__(self, flowgraph):
 
     def update(self):
         # TODO: Make sure the columns are wide enough
-        self.model = QStandardItemModel()
+        self.model.clear()
         self.model.setHorizontalHeaderLabels(['Source', 'Aspect', 'Message'])
         for element, message in self.flowgraph.iter_error_messages():
             if element.is_block:
@@ -51,7 +52,6 @@ def update(self):
             else:
                 src = aspect = QStandardItem('')
             self.model.appendRow([src, aspect, QStandardItem(message)])
-        self.treeview.setModel(self.model)
 
 
 class PropsDialog(QDialog):

gui_qt/components/variable_editor.py

@@ -168,9 +168,15 @@ def _rebuild(self):
             else:
                 variable_.setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled)
                 if block.enabled:
-                    variable_.setText(1, str(block.evaluate(block.value)))
-                    variable_.setForeground(0, self._tree.palette().color(self.palette().WindowText))
-                    variable_.setForeground(1, self._tree.palette().color(self.palette().WindowText))
+                    try:
+                        variable_.setText(1, str(block.evaluate(block.value)))
+                        variable_.setForeground(0, self._tree.palette().color(self.palette().WindowText))
+                        variable_.setForeground(1, self._tree.palette().color(self.palette().WindowText))
+                    except Exception:
+                        log.exception(f'Failed to evaluate variable block {block.name}', exc_info=True)
+                        variable_.setText(1, '<Open Properties>')
+                        variable_.setForeground(0, self._tree.palette().color(self.palette().Disabled, self.palette().WindowText))
+                        variable_.setForeground(1, self._tree.palette().color(self.palette().Disabled, self.palette().WindowText))
                 else:
                     variable_.setText(1, '<Open Properties>')
                     variable_.setForeground(0, self._tree.palette().color(self.palette().Disabled, self.palette().WindowText))