summaryrefslogtreecommitdiff
path: root/grc/core/generator
diff options
context:
space:
mode:
authorBastian Bloessl <mail@bastibl.net>2019-06-16 11:05:51 +0200
committerMartin Braun <martin.braun@ettus.com>2019-06-19 13:00:00 -0700
commit3750f748501ec83d60c489dfa700522f3be21b00 (patch)
tree7b7695cbe292b278942f58d5179d665eb16d3a4c /grc/core/generator
parentf9447f11df7ff3fe01959fc42f86ce509b152ac0 (diff)
runtime: port ctrlport monitor to 3.8 and qt5
Diffstat (limited to 'grc/core/generator')
-rw-r--r--grc/core/generator/flow_graph.py.mako16
1 files changed, 9 insertions, 7 deletions
diff --git a/grc/core/generator/flow_graph.py.mako b/grc/core/generator/flow_graph.py.mako
index f1696f72c2..291b89f0a6 100644
--- a/grc/core/generator/flow_graph.py.mako
+++ b/grc/core/generator/flow_graph.py.mako
@@ -357,11 +357,9 @@ def main(top_block_cls=${class_name}, options=None):
tb.wait()
qapp.aboutToQuit.connect(quitting)
% for m in monitors:
- if 'en' in m.params:
- if m.params['en'].get_value():
- (tb.${m.name}).start()
- else:
- sys.stderr.write("Monitor '{0}' does not have an enable ('en') parameter.".format("tb.${m.name}"))
+ % if m.params['en'].get_value() == 'True':
+ tb.${m.name}.start()
+ % endif
% endfor
qapp.exec_()
% elif generate_options == 'bokeh_gui':
@@ -400,7 +398,9 @@ def main(top_block_cls=${class_name}, options=None):
% if flow_graph.get_option('run_options') == 'prompt':
tb.start(${ flow_graph.get_option('max_nouts') or '' })
% for m in monitors:
- (tb.${m.name}).start()
+ % if m.params['en'].get_value() == 'True':
+ tb.${m.name}.start()
+ % endif
% endfor
try:
input('Press Enter to quit: ')
@@ -411,7 +411,9 @@ def main(top_block_cls=${class_name}, options=None):
tb.start(${flow_graph.get_option('max_nouts') or ''})
% endif
% for m in monitors:
- (tb.${m.name}).start()
+ % if m.params['en'].get_value() == 'True':
+ tb.${m.name}.start()
+ % endif
% endfor
tb.wait()
% endif