Apply changes from gr upstream #3
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Due to an error in the yml code of the variable_struct block, this block is unusable. Signed-off-by: Volker Schroer <[email protected]>
When os.path.join is used, it appends an extra directory to the config file path. For grc the config file is $HOME/.config/gnuradio/grc.conf/grc.conf and for grc qt the file is $HOME/.config/gnuradio/grc.conf/grc_qt.conf. This patch proposes to change this and remove the grc.conf directory from the path. This would make the grc config file $HOME/.config/gnuradio/grc.conf and the grc qt config file $HOME/.config/gnuradio/grc_qt.conf. All that is needed to accomplish this is to remove the use of os.path.join to generate the gui_prefs_file. Signed-off-by: Chris Gorman <[email protected]>
As the ErrorsDialog should only display the errors of the fg, the entries should be readonly and not editable. Signed-off-by: Volker Schroer <[email protected]>
Changing the completion mode from InlineCompletion to PopupCompletion for the searchbar makes the intermediate results more readable. Signed-off-by: Volker Schroer <[email protected]>
Without this fix, GRC tries to populate a full block-property dialog
when opening a property dialog on connections. This improves the
checking for the right attributes to correctly identify connections, and
removes the following spurious output when opening property dialogs on
connections:
Traceback (most recent call last):
File "..../grc/gui/PropsDialog.py", line 210, in update_gui
self._update_docs_page()
File "..../grc/gui/PropsDialog.py", line 219, in _update_docs_page
in_tree = self._block.category and self._block.category[0] == "Core"
AttributeError: 'Connection' object has no attribute 'category'
Signed-off-by: Martin Braun <[email protected]>
Fixes the following issue: Create a port with automatic type deduction which is *not* in the streaming domain (e.g., create an RFNoC RX streamer block with no changes to settings from the default). GRC will attempt to guess the dtype of this port (e.g., if it is connected to another block that does sc16, it will now also be sc16). However, due to the order in which objects are evaluated, the first time this is attempted is before the connection objects are generated, which means the auto-type deduction will fail the first time it is attempted. The issue is, on failure, we re-set the port domain to 'stream' unconditionally. If the port domain was anything else (e.g., as above, 'rfnoc') then it will temporarily disable any domain-specific settings until the connection object is created, which is too late to import connection-and-domain-specific settings. With this change, we simply don't touch the domain when the auto-type deduction fails. Signed-off-by: Martin Braun <[email protected]>
grc --gtk only shows an error but displays the block
Loading: "/home/schroer/gnuradiocomponents/bugs/yaml_config.grc"
Failed to evaluate variable block yaml_config_0
Traceback (most recent call last):
File "/usr/local/gnuradio/lib64/python3.12/site-packages/gnuradio/grc/core/FlowGraph.py", line 286, in _reload_variables
value = eval(variable_block.value, namespace,
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
grc --qt shows an error and segfaults sometimes
Failed to evaluate variable block yaml_config_0
Traceback (most recent call last):
File "/usr/local/gnuradio/lib64/python3.12/site-packages/gnuradio/grc/core/FlowGraph.py", line 286, in _reload_variables
value = eval(variable_block.value, namespace,
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "<string>", line 1, in <module>
FileNotFoundError: [Errno 2] Datei oder Verzeichnis nicht gefunden: ''
Traceback (most recent call last):
File "/usr/local/gnuradio/lib64/python3.12/site-packages/gnuradio/grc/gui_qt/components/block_library.py", line 140, in <lambda>
lambda block: self.add_block(block.data(Qt.UserRole))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Signed-off-by: Volker Schroer <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
update gnuradio-companion repo to prepare grc separation