summaryrefslogtreecommitdiff
path: root/grc
diff options
context:
space:
mode:
authorjblum2009-03-14 05:54:43 +0000
committerjblum2009-03-14 05:54:43 +0000
commit7d0955ef7bc7a41855ca3301976c6616981fa27e (patch)
tree293c45ab5b844fad230cc7a4f48d4e454854245c /grc
parentcdc6f1d7b55c69c28c6fb4fe99faf4397bd39ba0 (diff)
downloadgnuradio-7d0955ef7bc7a41855ca3301976c6616981fa27e.tar.gz
gnuradio-7d0955ef7bc7a41855ca3301976c6616981fa27e.tar.bz2
gnuradio-7d0955ef7bc7a41855ca3301976c6616981fa27e.zip
Add vlen to subtract, divide, and float2complex.
Takes care of #302 and #303 git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10598 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'grc')
-rw-r--r--grc/data/platforms/python/blocks/gr_divide_xx.xml11
-rw-r--r--grc/data/platforms/python/blocks/gr_float_to_complex.xml12
-rw-r--r--grc/data/platforms/python/blocks/gr_sub_xx.xml11
3 files changed, 31 insertions, 3 deletions
diff --git a/grc/data/platforms/python/blocks/gr_divide_xx.xml b/grc/data/platforms/python/blocks/gr_divide_xx.xml
index 7f8752919..04667bc2a 100644
--- a/grc/data/platforms/python/blocks/gr_divide_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_divide_xx.xml
@@ -9,7 +9,7 @@
<name>Divide</name>
<key>gr_divide_xx</key>
<import>from gnuradio import gr</import>
- <make>gr.divide_$(type.fcn)()</make>
+ <make>gr.divide_$(type.fcn)($vlen)</make>
<param>
<name>IO Type</name>
<key>type</key>
@@ -36,19 +36,28 @@
</option>
</param>
<param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <param>
<name>Num Inputs</name>
<key>num_inputs</key>
<value>2</value>
<type>int</type>
</param>
+ <check>$vlen &gt; 0</check>
<check>$num_inputs &gt;= 2</check>
<sink>
<name>in</name>
<type>$type</type>
+ <vlen>$vlen</vlen>
<nports>$num_inputs</nports>
</sink>
<source>
<name>out</name>
<type>$type</type>
+ <vlen>$vlen</vlen>
</source>
</block>
diff --git a/grc/data/platforms/python/blocks/gr_float_to_complex.xml b/grc/data/platforms/python/blocks/gr_float_to_complex.xml
index e8734fc6a..a1644efd7 100644
--- a/grc/data/platforms/python/blocks/gr_float_to_complex.xml
+++ b/grc/data/platforms/python/blocks/gr_float_to_complex.xml
@@ -9,18 +9,28 @@
<name>Float To Complex</name>
<key>gr_float_to_complex</key>
<import>from gnuradio import gr</import>
- <make>gr.float_to_complex()</make>
+ <make>gr.float_to_complex($vlen)</make>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen &gt; 0</check>
<sink>
<name>in</name>
<type>float</type>
+ <vlen>$vlen</vlen>
</sink>
<sink>
<name>in</name>
<type>float</type>
+ <vlen>$vlen</vlen>
<optional>1</optional>
</sink>
<source>
<name>out</name>
<type>complex</type>
+ <vlen>$vlen</vlen>
</source>
</block>
diff --git a/grc/data/platforms/python/blocks/gr_sub_xx.xml b/grc/data/platforms/python/blocks/gr_sub_xx.xml
index 488e6c364..f1f4797e0 100644
--- a/grc/data/platforms/python/blocks/gr_sub_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_sub_xx.xml
@@ -9,7 +9,7 @@
<name>Subtract</name>
<key>gr_sub_xx</key>
<import>from gnuradio import gr</import>
- <make>gr.sub_$(type.fcn)()</make>
+ <make>gr.sub_$(type.fcn)($vlen)</make>
<param>
<name>IO Type</name>
<key>type</key>
@@ -36,19 +36,28 @@
</option>
</param>
<param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <param>
<name>Num Inputs</name>
<key>num_inputs</key>
<value>2</value>
<type>int</type>
</param>
+ <check>$vlen &gt; 0</check>
<check>$num_inputs &gt;= 2</check>
<sink>
<name>in</name>
<type>$type</type>
+ <vlen>$vlen</vlen>
<nports>$num_inputs</nports>
</sink>
<source>
<name>out</name>
<type>$type</type>
+ <vlen>$vlen</vlen>
</source>
</block>