[Commit-gnuradio] [gnuradio] 09/16: grc: flowgraph template: split arg parser from main()

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 7983bfda035153495bb6b01451484593ecfcf8d3
Author: Sebastian Koslowski <address@hidden>
Date:   Mon Sep 28 20:19:04 2015 +0200

    grc: flowgraph template: split arg parser from main()
---
 grc/python/flow_graph.tmpl | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl
index 4e4e945..52f4902 100644
--- a/grc/python/flow_graph.tmpl
+++ b/grc/python/flow_graph.tmpl
@@ -312,11 +312,11 @@ $param.get_make()#slurp
 $short_id#slurp
 #end def
 #if not $generate_options.startswith('hb')
+#set $params_eq_list = list()
+#if $parameters
 
 
-def main(top_block_cls=$(class_name)):
-    #set $params_eq_list = list()
-    #if $parameters
+def argument_parser():
     parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
     #for $param in $parameters
         #set $type = $param.get_param('type').get_value()
@@ -327,12 +327,20 @@ def main(top_block_cls=$(class_name)):
         help="Set $($param.get_param('label').get_evaluated() or 
$param.get_id()) [default=%default]")
         #end if
     #end for
-    (options, args) = parser.parse_args()
+    return parser
+#end if
+
+
+def main(top_block_cls=$(class_name), options=None):
+    #if $parameters
+    if options is None:
+        options, _ = argument_parser().parse_args()
     #end if
     #if $flow_graph.get_option('realtime_scheduling')
     if gr.enable_realtime_scheduling() != gr.RT_OK:
         print "Error: failed to enable real-time scheduling."
     #end if
+
     #if $generate_options == 'wx_gui'
     tb = top_block_cls($(', '.join($params_eq_list)))
         #if $flow_graph.get_option('max_nouts')
@@ -347,8 +355,10 @@ def main(top_block_cls=$(class_name)):
     #elif $generate_options == 'qt_gui'
     from distutils.version import StrictVersion
     if StrictVersion(Qt.qVersion()) >= StrictVersion("4.5.0"):
-        Qt.QApplication.setGraphicsSystem(gr.prefs().get_string('qtgui', 
'style', 'raster'))
+        style = gr.prefs().get_string('qtgui', 'style', 'raster')
+        Qt.QApplication.setGraphicsSystem(style)
     qapp = Qt.QApplication(sys.argv)
+
     tb = top_block_cls($(', '.join($params_eq_list)))
     #if $flow_graph.get_option('run')
         #if $flow_graph.get_option('max_nouts')