diff options
| author | Håkon Vågsether <haakonsv@gmail.com> | 2018-10-21 01:18:06 +0200 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-11-14 15:41:27 -0800 |
| commit | 41beef9575b340f3f2aca7b90cb6c3921db6722a (patch) | |
| tree | a325847a4d5d52508e7eee370d168771f027b156 /grc/core | |
| parent | 523e4ab0f549eefd6cf219105c6d8200a1450082 (diff) | |
grc: Fix generation of QT-GUI hier blocks
Previously, typos in hier_block.py were creating errors. This was a bug
when converting from Cheetah to Mako.
Diffstat (limited to 'grc/core')
| -rw-r--r-- | grc/core/generator/hier_block.py | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/grc/core/generator/hier_block.py b/grc/core/generator/hier_block.py index 9632c6e7cc..cdced796cb 100644 --- a/grc/core/generator/hier_block.py +++ b/grc/core/generator/hier_block.py @@ -88,8 +88,8 @@ class HierBlockGenerator(TopBlockGenerator): p = collections.OrderedDict() p['id'] = param_block.name p['label'] = param_block.params['label'].get_value() or param_block.name - p['dtype'] = 'raw' - p['value'] = param_block.params['value'].get_value() + p['dtype'] = param_block.params['value'].dtype + p['default'] = param_block.params['value'].get_value() p['hide'] = param_block.params['hide'].get_value() data['parameters'].append(p) @@ -150,25 +150,24 @@ class QtHierBlockGenerator(HierBlockGenerator): block_n = collections.OrderedDict() # insert flags after category - for key, value in six.iteritems(n['block']): + for key, value in six.iteritems(n): block_n[key] = value if key == 'category': block_n['flags'] = 'need_qt_gui' - if not block_n['name'].upper().startswith('QT GUI'): - block_n['name'] = 'QT GUI ' + block_n['name'] + if not block_n['label'].upper().startswith('QT GUI'): + block_n['label'] = 'QT GUI ' + block_n['label'] gui_hint_param = collections.OrderedDict() - gui_hint_param['name'] = 'GUI Hint' - gui_hint_param['key'] = 'gui_hint' - gui_hint_param['value'] = '' - gui_hint_param['type'] = 'gui_hint' + gui_hint_param['id'] = 'gui_hint' + gui_hint_param['label'] = 'GUI Hint' + gui_hint_param['dtype'] = 'gui_hint' gui_hint_param['hide'] = 'part' - block_n['param'].append(gui_hint_param) + block_n['parameters'].append(gui_hint_param) - block_n['make'] += ( - "\n<% win = 'self.' + id %>" - "\n${ gui_hint % win }" + block_n['templates']['make'] += ( + "\n<% win = 'self.%s'%id %>" + "\n${ gui_hint() % win }" ) return block_n |