modtool: Fixes for intial templates of a block.

1. adds '$' to args in the GRC xml <make> tag.
2. sets <+ITYPE+> and <+OTYPE+> for all I/O data types in io_signature and in work functions to be more clear what needs modification.

Conflicts:

	gr-utils/src/python/modtool/templates.py

1 files changed, 6 insertions, 0 deletions

diff --git a/gr-utils/src/python/modtool/util_functions.py b/gr-utils/src/python/modtool/util_functions.py
index c40dbd73b..9551056f0 100644
--- a/gr-utils/src/python/modtool/util_functions.py
+++ b/gr-utils/src/python/modtool/util_functions.py
@@ -81,6 +81,12 @@ def strip_arg_types(string):
     string = strip_default_values(string)
     return ", ".join([part.strip().split(' ')[-1] for part in string.split(',')])
 
+def strip_arg_types_grc(string):
+    """" Strip the argument types from a list of arguments for GRC make tag.
+    Example: "int arg1, double arg2" -> "$arg1, $arg2" """
+    string = strip_default_values(string)
+    return ", ".join(['$' + part.strip().split(' ')[-1] for part in string.split(',')])
+
 def get_modname():
     """ Grep the current module's name from gnuradio.project or CMakeLists.txt """
     modname_trans = {'howto-write-a-block': 'howto'}