diff options
Diffstat (limited to 'gr-utils/python/modtool/templates.py')
| -rw-r--r-- | gr-utils/python/modtool/templates.py | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/gr-utils/python/modtool/templates.py b/gr-utils/python/modtool/templates.py index 4f4469951c..f970ce0ae2 100644 --- a/gr-utils/python/modtool/templates.py +++ b/gr-utils/python/modtool/templates.py @@ -105,7 +105,7 @@ ${str_to_fancyc_comment($license)} \#include "config.h" \#endif -\#include <gr_io_signature.h> +\#include <gnuradio/io_signature.h> #if $blocktype == 'noblock' \#include <${modname}/${blockname}.h> #else @@ -147,15 +147,15 @@ namespace gr { #if $blocktype == 'sink' #set $outputsig = '0, 0, 0' #else -#set $outputsig = '<+MIN_IN+>, <+MAX_IN+>, sizeof (<+float+>)' +#set $outputsig = '<+MIN_OUT+>, <+MAX_OUT+>, sizeof (<+float+>)' #end if /* * The private constructor */ ${blockname}_impl::${blockname}_impl(${strip_default_values($arglist)}) - : ${grblocktype}("${blockname}", - gr_make_io_signature($inputsig), - gr_make_io_signature($outputsig)$decimation) + : gr::${grblocktype}("${blockname}", + gr::io_signature::make($inputsig), + gr::io_signature::make($outputsig)$decimation) #if $blocktype == 'hier' { connect(self(), 0, d_firstblock, 0); @@ -251,7 +251,9 @@ ${str_to_fancyc_comment($license)} \#define INCLUDED_${modname.upper()}_${blockname.upper()}_H \#include <${modname}/api.h> -\#include <${grblocktype}.h> +#if $blocktype != 'noblock' +\#include <gnuradio/${grblocktype}.h> +#end if namespace gr { namespace ${modname} { @@ -263,9 +265,10 @@ namespace gr { */ class ${modname.upper()}_API $blockname { + public: ${blockname}(${arglist}); ~${blockname}(); - private: + private: }; #else /*! @@ -273,7 +276,7 @@ namespace gr { * \ingroup ${modname} * */ - class ${modname.upper()}_API ${blockname} : virtual public $grblocktype + class ${modname.upper()}_API ${blockname} : virtual public gr::$grblocktype { public: typedef boost::shared_ptr<${blockname}> sptr; @@ -297,7 +300,7 @@ namespace gr { ''' -# Python block (from grextras!) +# Python block Templates['block_python'] = '''\#!/usr/bin/env python ${str_to_python_comment($license)} # @@ -529,12 +532,16 @@ gr_modtool help <command> -- Shows the help for a given command. ''' # SWIG string Templates['swig_block_magic'] = """#if $version == '36' +#if $blocktype != 'noblock' GR_SWIG_BLOCK_MAGIC($modname, $blockname); +#end if %include "${modname}_${blockname}.h" #else %include "${modname}/${blockname}.h" +#if $blocktype != 'noblock' GR_SWIG_BLOCK_MAGIC2($modname, $blockname); #end if +#end if """ ## Old stuff @@ -587,7 +594,7 @@ ${modname}_make_${blockname} (${strip_default_values($arglist)}) * The private constructor */ ${modname}_${blockname}::${modname}_${blockname} (${strip_default_values($arglist)}) - : ${grblocktype} ("${blockname}", + : gr_${grblocktype} ("${blockname}", gr_make_io_signature($inputsig), gr_make_io_signature($outputsig)$decimation) { @@ -672,7 +679,7 @@ class ${modname.upper()}_API $blockname }; #else -\#include <${grblocktype}.h> +\#include <gr_${grblocktype}.h> class ${modname}_${blockname}; @@ -685,7 +692,7 @@ ${modname.upper()}_API ${modname}_${blockname}_sptr ${modname}_make_${blockname} * \ingroup ${modname} * */ -class ${modname.upper()}_API ${modname}_${blockname} : public $grblocktype +class ${modname.upper()}_API ${modname}_${blockname} : public gr_$grblocktype { private: friend ${modname.upper()}_API ${modname}_${blockname}_sptr ${modname}_make_${blockname} (${strip_default_values($arglist)}); |