diff options
author | Johnathan Corgan | 2009-09-09 17:38:27 -0700 |
---|---|---|
committer | Johnathan Corgan | 2009-09-09 17:38:27 -0700 |
commit | 7f3dc5c263a55d1a992d28d374fc7acc9ebe412b (patch) | |
tree | 61f23680cb4c3a8a83dbf947868e0340725856c3 /grc/base/Block.py | |
parent | 3c8af34f675eadd64b5fc3f0065793f3b3ff47f0 (diff) | |
parent | b8f69ad7ba49aa85239f6de611ddfd040344f66b (diff) | |
download | gnuradio-7f3dc5c263a55d1a992d28d374fc7acc9ebe412b.tar.gz gnuradio-7f3dc5c263a55d1a992d28d374fc7acc9ebe412b.tar.bz2 gnuradio-7f3dc5c263a55d1a992d28d374fc7acc9ebe412b.zip |
Merge branch 'grc' of http://gnuradio.org/git/jblum into master
* 'grc' of http://gnuradio.org/git/jblum:
use show signal to perform initial gui update
Fixed the usrp and usrp2 probe scripts to work with the new gui param api.
propsdialog tweaks
more code cleanup for properties dialog
Rework the params/properties dialog and param gui class:
renamed params dialog to props dialog
remove unused imports, copyright date update, tweak
Created recursive create labels and shapes method for gui element.
replaced dict[rot] storage of areas and lines with a single list for the current rotation
standardized the Element inheritance __init__ usage in gui
better error msg for empty statements
Implement a recursive validation api in the base Element class.
Diffstat (limited to 'grc/base/Block.py')
-rw-r--r-- | grc/base/Block.py | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/grc/base/Block.py b/grc/base/Block.py index fc501205f..cb21c3958 100644 --- a/grc/base/Block.py +++ b/grc/base/Block.py @@ -132,28 +132,6 @@ class Block(Element): """ self.get_param('_enabled').set_value(str(enabled)) - def rewrite(self): - """ - Rewrite critical structures. - Call rewrite on all sub elements. - """ - Element.rewrite(self) - for elem in self.get_ports() + self.get_params(): elem.rewrite() - - def validate(self): - """ - Validate the block. - All ports and params must be valid. - All checks must evaluate to true. - Validate the params, ports, and the connections to this block. - """ - Element.validate(self) - for c in self.get_params() + self.get_ports() + self.get_connections(): - c.validate() - if not c.is_valid(): - for msg in c.get_error_messages(): - self.add_error_message('>>> %s:\n\t%s'%(c, msg)) - def __str__(self): return 'Block - %s - %s(%s)'%(self.get_id(), self.get_name(), self.get_key()) def get_id(self): return self.get_param('id').get_value() @@ -163,6 +141,7 @@ class Block(Element): def get_category(self): return self._category def get_doc(self): return '' def get_ports(self): return self.get_sources() + self.get_sinks() + def get_children(self): return self.get_ports() + self.get_params() def get_block_wrapper_path(self): return self._block_wrapper_path ############################################## |