[Commit-gnuradio] [gnuradio] 01/05: grc: fix parameter blocks, empty Short ID and string type

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 06d05df4a9f29e382305ea8f002c84cdcdcf5323
Author: Tim O'Shea <address@hidden>
Date:   Thu Jun 9 17:16:34 2016 -0400

    grc: fix parameter blocks, empty Short ID and string type
---
 grc/blocks/parameter.xml           | 2 +-
 grc/core/generator/flow_graph.tmpl | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/grc/blocks/parameter.xml b/grc/blocks/parameter.xml
index 0c10da4..b071321 100644
--- a/grc/blocks/parameter.xml
+++ b/grc/blocks/parameter.xml
@@ -55,7 +55,7 @@
                </option>
                <option>
                        <name>String</name>
-                       <key>string</key>
+                       <key>str</key>
                        <opt>type:string</opt>
         </option>
         <!-- Do not forget to add option value type handler import into
diff --git a/grc/core/generator/flow_graph.tmpl 
b/grc/core/generator/flow_graph.tmpl
index 38b113f..50b39e1 100644
--- a/grc/core/generator/flow_graph.tmpl
+++ b/grc/core/generator/flow_graph.tmpl
@@ -347,7 +347,10 @@ def argument_parser():
         #if $type
             #silent $params_eq_list.append('%s=options.%s'%($param.get_id(), 
$param.get_id()))
     parser.add_argument(
-        "$make_short_id($param)", "--$param.get_id().replace('_', '-')", 
dest="$param.get_id()", type=$type, default=$make_default($type, $param),
+        #if $make_short_id($param)
+        "$make_short_id($param)", #slurp
+        #end if
+        "--$param.get_id().replace('_', '-')", dest="$param.get_id()", 
type=$type, default=$make_default($type, $param),
         help="Set $($param.get_param('label').get_evaluated() or 
$param.get_id()) [default=%default]")
         #end if
     #end for