From f9e5b6717d557de66799c2b8b7ca96cd62661e2f Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@kit.edu>
Date: Thu, 2 May 2013 16:37:54 +0200
Subject: modtool: updated to pimpl format
---
gr-utils/python/modtool/templates.py | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
(limited to 'gr-utils/python/modtool/templates.py')
diff --git a/gr-utils/python/modtool/templates.py b/gr-utils/python/modtool/templates.py
index 4f4469951c..0b6176a513 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
@@ -153,9 +153,9 @@ namespace gr {
* 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,7 @@ ${str_to_fancyc_comment($license)}
\#define INCLUDED_${modname.upper()}_${blockname.upper()}_H
\#include <${modname}/api.h>
-\#include <${grblocktype}.h>
+\#include <gnuradio/${grblocktype}.h>
namespace gr {
namespace ${modname} {
@@ -273,7 +273,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 +297,7 @@ namespace gr {
'''
-# Python block (from grextras!)
+# Python block
Templates['block_python'] = '''\#!/usr/bin/env python
${str_to_python_comment($license)}
#
@@ -587,7 +587,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 +672,7 @@ class ${modname.upper()}_API $blockname
};
#else
-\#include <${grblocktype}.h>
+\#include <gr_${grblocktype}.h>
class ${modname}_${blockname};
@@ -685,7 +685,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)});
--
cgit v1.2.3
From b3eeae23aca4eb340c1e33014dd2c1dae7859f6e Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Tue, 14 May 2013 18:39:03 +0100
Subject: modtool: update noblock for new api.
---
gr-utils/python/modtool/templates.py | 2 ++
1 file changed, 2 insertions(+)
(limited to 'gr-utils/python/modtool/templates.py')
diff --git a/gr-utils/python/modtool/templates.py b/gr-utils/python/modtool/templates.py
index 740ba5dabd..f970ce0ae2 100644
--- a/gr-utils/python/modtool/templates.py
+++ b/gr-utils/python/modtool/templates.py
@@ -251,7 +251,9 @@ ${str_to_fancyc_comment($license)}
\#define INCLUDED_${modname.upper()}_${blockname.upper()}_H
\#include <${modname}/api.h>
+#if $blocktype != 'noblock'
\#include <gnuradio/${grblocktype}.h>
+#end if
namespace gr {
namespace ${modname} {
--
cgit v1.2.3