[Commit-gnuradio] r11376 - in gnuradio/trunk/grc: blocks python

[jcorgan]

Author: jcorgan
Date: 2009-07-08 00:32:08 -0600 (Wed, 08 Jul 2009)
New Revision: 11376

Modified:
   gnuradio/trunk/grc/blocks/parameter.xml
   gnuradio/trunk/grc/python/Param.py
   gnuradio/trunk/grc/python/flow_graph.tmpl
Log:
Adds short commandline parameter handling in GRC.

Modified: gnuradio/trunk/grc/blocks/parameter.xml
===================================================================
--- gnuradio/trunk/grc/blocks/parameter.xml     2009-07-07 00:40:25 UTC (rev 
11375)
+++ gnuradio/trunk/grc/blocks/parameter.xml     2009-07-08 06:32:08 UTC (rev 
11376)
@@ -17,6 +17,12 @@
                <hide>#if $label() then 'none' else 'part'#</hide>
        </param>
        <param>
+               <name>Short ID</name>
+               <key>short_id</key>
+               <value></value>
+               <type>string</type>
+       </param>
+       <param>
                <name>Value</name>
                <key>value</key>
                <value>0</value>
@@ -74,6 +80,10 @@
 
 Leave the label blank to use the parameter id as the label.
 
-When type is not None, this parameter also becomes a command line option of 
the form --[id] [value].
+When type is not None, this parameter also becomes a command line option of 
the form:
+
+-[short_id] --[id] [value]
+
+The Short ID field may be left blank.
        </doc>
 </block>

Modified: gnuradio/trunk/grc/python/Param.py
===================================================================
--- gnuradio/trunk/grc/python/Param.py  2009-07-07 00:40:25 UTC (rev 11375)
+++ gnuradio/trunk/grc/python/Param.py  2009-07-08 06:32:08 UTC (rev 11376)
@@ -302,6 +302,13 @@
                elif t in ('string', 'file_open', 'file_save'):
                        #do not check if file/directory exists, that is a 
runtime issue
                        e = eval_string(v)
+                       str_e = str(e)
+                       if t == 'string' and self.get_name() == 'Short ID' and 
len(str_e) > 0:
+                               try: 
+                                       assert len(str_e) == 1
+                                       ord_e = ord(str_e)
+                                       assert ord_e >= ord('a') and ord_e <= 
ord('z') or ord_e >= ord('A') and ord_e <= ord('Z')
+                               except AssertionError: raise Exception, 'Short 
ID "%s" must be a single letter'%v
                        return str(e)
                #########################
                # Unique ID Type

Modified: gnuradio/trunk/grc/python/flow_graph.tmpl
===================================================================
--- gnuradio/trunk/grc/python/flow_graph.tmpl   2009-07-07 00:40:25 UTC (rev 
11375)
+++ gnuradio/trunk/grc/python/flow_graph.tmpl   2009-07-08 06:32:08 UTC (rev 
11376)
@@ -189,7 +189,7 @@
                #set $type = $param.get_param('type').get_value()
                #if $type
                        #silent 
$params_eq_list.append('%s=options.%s'%($param.get_id(), $param.get_id()))
-       parser.add_option("--$param.get_id()", dest="$param.get_id()", 
type="$type", default=$param.get_make(),
+       parser.add_option("-$param.get_param('short_id').get_value()", 
"--$param.get_id()", dest="$param.get_id()", type="$type", 
default=$param.get_make(),
                help="Set $($param.get_param('label').evaluate() or 
$param.get_id()) [default=%default]")
                #end if
        #end for