diff options
| author | Tom Rondeau | 2011-05-08 19:58:43 +0100 |
|---|---|---|
| committer | Tom Rondeau | 2011-05-08 19:58:43 +0100 |
| commit | a72bde633dda63c4471111894ca6b92a87318d5f (patch) | |
| tree | c60e447e922b1a7076dd839ed8a94fcc9b665919 /grc/python/Block.py | |
| parent | bdd0bd405c2ea645395917c1abb91c964210c4d9 (diff) | |
| parent | 207a2ae73bd5d6cab201bb57ed8db64fd54cfd90 (diff) | |
| download | gnuradio-a72bde633dda63c4471111894ca6b92a87318d5f.tar.gz gnuradio-a72bde633dda63c4471111894ca6b92a87318d5f.tar.bz2 gnuradio-a72bde633dda63c4471111894ca6b92a87318d5f.zip | |
Merge branch 'master' into 8psk
Diffstat (limited to 'grc/python/Block.py')
| -rw-r--r-- | grc/python/Block.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/grc/python/Block.py b/grc/python/Block.py index bd03eb5cd..14a5859e4 100644 --- a/grc/python/Block.py +++ b/grc/python/Block.py @@ -1,5 +1,5 @@ """ -Copyright 2008, 2009 Free Software Foundation, Inc. +Copyright 2008-2011 Free Software Foundation, Inc. This file is part of GNU Radio GNU Radio Companion is free software; you can redistribute it and/or @@ -65,9 +65,8 @@ class Block(_Block, _GUIBlock): for check in self._checks: check_res = self.resolve_dependencies(check) try: - check_eval = self.get_parent().evaluate(check_res) - try: assert check_eval - except AssertionError: self.add_error_message('Check "%s" failed.'%check) + if not self.get_parent().evaluate(check_res): + self.add_error_message('Check "%s" failed.'%check) except: self.add_error_message('Check "%s" did not evaluate.'%check) def rewrite(self): @@ -134,9 +133,9 @@ class Block(_Block, _GUIBlock): try: value = param.get_evaluated() value = value + direction - assert 0 < value - param.set_value(value) - changed = True + if 0 < value: + param.set_value(value) + changed = True except: pass return changed |