diff options
| author | jblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-05-01 20:28:04 +0000 |
|---|---|---|
| committer | jblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-05-01 20:28:04 +0000 |
| commit | a3ba8cf268816af51c4bb39ea7ecd7e85ea0807b (patch) | |
| tree | 21dbd446e92672a56b323e005088d3c03edc238f /grc/src/platforms/python/Param.py | |
| parent | 6ce881caaacdd60a8bea37584c7286e08bea97a7 (diff) | |
Merged grc developer branch r10679:10938
Misc fixes and internal changes.
Added help menu for usage tips.
Added drag and drop for blocks.
Removed callback controls, adopted forms.
Any type can have enumerated options.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10941 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'grc/src/platforms/python/Param.py')
| -rw-r--r-- | grc/src/platforms/python/Param.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/grc/src/platforms/python/Param.py b/grc/src/platforms/python/Param.py index efebe92e5d..e75a882a47 100644 --- a/grc/src/platforms/python/Param.py +++ b/grc/src/platforms/python/Param.py @@ -1,5 +1,5 @@ """ -Copyright 2008 Free Software Foundation, Inc. +Copyright 2008, 2009 Free Software Foundation, Inc. This file is part of GNU Radio GNU Radio Companion is free software; you can redistribute it and/or @@ -94,7 +94,7 @@ class Param(_Param): Get the repr (nice string format) for this param. @return the string representation """ - if self.is_enum(): return _Param.__repr__(self) + if self.get_value() in self.get_option_keys(): return self.get_option(self.get_value()).get_name() ################################################## # display logic for numbers ################################################## @@ -158,7 +158,7 @@ class Param(_Param): #special 'hex': Constants.INT_COLOR_SPEC, 'string': Constants.BYTE_VECTOR_COLOR_SPEC, - 'id': '#DDDDDD', + 'id': Constants.ID_COLOR_SPEC, 'grid_pos': Constants.INT_VECTOR_COLOR_SPEC, }[self.get_type()] except: return _Param.get_color(self) |