[Commit-gnuradio] [gnuradio] 29/57: grc: fixes bug with controlport monitors where true/false enable parameter is not respected.

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit ee5df93249556975143aa35e564312856cf89a1f
Author: Tom Rondeau <address@hidden>
Date:   Thu May 8 21:54:52 2014 -0400

    grc: fixes bug with controlport monitors where true/false enable parameter 
is not respected.
---
 grc/python/Generator.py    | 8 ++++----
 grc/python/flow_graph.tmpl | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/grc/python/Generator.py b/grc/python/Generator.py
index 9bafeb0..45958ba 100644
--- a/grc/python/Generator.py
+++ b/grc/python/Generator.py
@@ -35,7 +35,7 @@ class Generator(object):
         """
         Initialize the generator object.
         Determine the file to generate.
-        
+
         Args:
             flow_graph: the flow graph object
             file_path: the path to write the file to
@@ -74,7 +74,7 @@ Add a Misc->Throttle block to your flow graph to avoid CPU 
congestion.''')
     def get_popen(self):
         """
         Execute this python flow graph.
-        
+
         Returns:
             a popen object
         """
@@ -99,7 +99,7 @@ Add a Misc->Throttle block to your flow graph to avoid CPU 
congestion.''')
     def __str__(self):
         """
         Convert the flow graph to python code.
-        
+
         Returns:
             a string of python code
         """
@@ -147,7 +147,7 @@ Add a Misc->Throttle block to your flow graph to avoid CPU 
congestion.''')
             'flow_graph': self._flow_graph,
             'variables': variables,
             'parameters': parameters,
-                        'monitors': monitors,
+            'monitors': monitors,
             'blocks': blocks,
             'connections': connections,
             'messages': messages,
diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl
index 4cd7cc0..30a991e 100644
--- a/grc/python/flow_graph.tmpl
+++ b/grc/python/flow_graph.tmpl
@@ -334,7 +334,11 @@ if __name__ == '__main__':
         tb.wait()
     qapp.connect(qapp, Qt.SIGNAL("aboutToQuit()"), quitting)
         #for $m in $monitors
-    (tb.$m.get_id()).start()
+    if $m.has_param('en'):
+        if $m.get_param('en').get_value():
+            (tb.$m.get_id()).start()
+    else:
+        sys.stderr.write("Monitor '{0}' does not have an enable ('en') 
parameter.".format("tb.$m.get_id()"))
         #end for
     qapp.exec_()
     tb = None #to clean up Qt widgets