[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8041 - in grc/branches/grc_reloaded/src: grc/gui grc/
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r8041 - in grc/branches/grc_reloaded/src: grc/gui grc/gui/elements grc_gnuradio/blocks/conversions grc_gnuradio/blocks/operators grc_gnuradio/blocks/sources grc_gnuradio/data grc_gnuradio/wxgui |
|
Date: |
Tue, 18 Mar 2008 14:54:56 -0600 (MDT) |
Author: jblum
Date: 2008-03-18 14:54:55 -0600 (Tue, 18 Mar 2008)
New Revision: 8041
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_deinterleave.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_interleave.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_stream_to_streams.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_stream_to_vector.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_streams_to_stream.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_streams_to_vector.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_vector_to_stream.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_vector_to_streams.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_noise_source_x.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_vector_source_x.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/random_source_x.xml
Modified:
grc/branches/grc_reloaded/src/grc/gui/FileDialogs.py
grc/branches/grc_reloaded/src/grc/gui/MainWindow.py
grc/branches/grc_reloaded/src/grc/gui/elements/Param.py
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_add_const_vxx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_add_vxx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_and_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_divide_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_multiply_vxx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_not_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_or_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_sub_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_xor_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_sig_source_x.xml
grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
grc/branches/grc_reloaded/src/grc_gnuradio/wxgui/Controls.py
Log:
fixed binary logic operators, finished stream conversions, some sources, misc
adjustments
Modified: grc/branches/grc_reloaded/src/grc/gui/FileDialogs.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/gui/FileDialogs.py 2008-03-18
13:22:43 UTC (rev 8040)
+++ grc/branches/grc_reloaded/src/grc/gui/FileDialogs.py 2008-03-18
20:54:55 UTC (rev 8041)
@@ -33,7 +33,7 @@
##the filter for flow graph files
FLOW_GRAPH_FILE_FILTER = gtk.FileFilter()
-FLOW_GRAPH_FILE_FILTER.set_name('FG Files')
+FLOW_GRAPH_FILE_FILTER.set_name('GRC Files')
FLOW_GRAPH_FILE_FILTER.add_pattern('*'+FLOW_GRAPH_FILE_EXTENSION)
##the filter for image files
Modified: grc/branches/grc_reloaded/src/grc/gui/MainWindow.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/gui/MainWindow.py 2008-03-18 13:22:43 UTC
(rev 8040)
+++ grc/branches/grc_reloaded/src/grc/gui/MainWindow.py 2008-03-18 20:54:55 UTC
(rev 8041)
@@ -246,8 +246,9 @@
gtk.Window.set_title(self, title)
#set tab titles
for page in self._get_pages():
+ title =
os.path.basename(page.get_file_path()).replace(FLOW_GRAPH_FILE_EXTENSION, '')
or ' '#dont allow blank
page.set_text(''.join((
-
(os.path.split(page.get_file_path())[1] or NEW_FLOGRAPH_TITLE),
+ (title or NEW_FLOGRAPH_TITLE),
(page.get_saved() and ' ' or
'*'), #blank must be non empty
)
)
Modified: grc/branches/grc_reloaded/src/grc/gui/elements/Param.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/gui/elements/Param.py 2008-03-18
13:22:43 UTC (rev 8040)
+++ grc/branches/grc_reloaded/src/grc/gui/elements/Param.py 2008-03-18
20:54:55 UTC (rev 8041)
@@ -121,7 +121,7 @@
def update(self):
"""Called when an external change occurs.
Update the graphical input by calling the change handler."""
- if self.input: self._handle_changed()
+ if hasattr(self, 'input'): self._handle_changed()
def get_input_object(self, callback=None):
"""!
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_deinterleave.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_deinterleave.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_deinterleave.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Deinterleave
+###################################################
+ -->
+<block>
+ <name>Deinterleave</name>
+ <key>gr_deinterleave</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.deinterleave($type.size*$vlen)</make>
+ <param>
+ <name>IO Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Streams</name>
+ <key>num_streams</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$num_streams > 0</check>
+ <check>$vlen >= 1</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ <nports>$num_streams</nports>
+ </source>
+ <doc>
+deinterleave a single input into N outputs
+ </doc>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_interleave.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_interleave.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_interleave.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Interleave
+###################################################
+ -->
+<block>
+ <name>Interleave</name>
+ <key>gr_interleave</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.interleave($type.size*$vlen)</make>
+ <param>
+ <name>IO Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Streams</name>
+ <key>num_streams</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$num_streams > 0</check>
+ <check>$vlen >= 1</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ <nports>$num_streams</nports>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </source>
+ <doc>
+interleave N inputs to a single output
+ </doc>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_stream_to_streams.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_stream_to_streams.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_stream_to_streams.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Stream to Streams
+###################################################
+ -->
+<block>
+ <name>Stream to Streams</name>
+ <key>gr_stream_to_streams</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.stream_to_streams($type.size*$vlen, $num_streams)</make>
+ <param>
+ <name>IO Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Streams</name>
+ <key>num_streams</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$num_streams > 0</check>
+ <check>$vlen >= 1</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ <nports>$num_streams</nports>
+ </source>
+ <doc>
+convert a stream of items into a N streams of items
+ </doc>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_stream_to_vector.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_stream_to_vector.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_stream_to_vector.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Stream to Vector
+###################################################
+ -->
+<block>
+ <name>Stream to Vector</name>
+ <key>gr_stream_to_vector</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.stream_to_vector($type.size*$vlen, $num_items)</make>
+ <param>
+ <name>IO Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Items</name>
+ <key>num_items</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$num_items > 0</check>
+ <check>$vlen >= 1</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen*$num_items</vlen>
+ </source>
+ <doc>
+convert a stream of items into a stream of blocks containing nitems_per_block
+ </doc>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_streams_to_stream.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_streams_to_stream.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_streams_to_stream.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Streams to Stream
+###################################################
+ -->
+<block>
+ <name>Streams to Stream</name>
+ <key>gr_streams_to_stream</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.streams_to_stream($type.size*$vlen, $num_streams)</make>
+ <param>
+ <name>IO Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Streams</name>
+ <key>num_streams</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$num_streams > 0</check>
+ <check>$vlen >= 1</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ <nports>$num_streams</nports>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </source>
+ <doc>
+Convert N streams of 1 item into a 1 stream of N items
+ </doc>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_streams_to_vector.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_streams_to_vector.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_streams_to_vector.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Streams to Vector
+###################################################
+ -->
+<block>
+ <name>Streams to Vector</name>
+ <key>gr_streams_to_vector</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.streams_to_vector($type.size*$vlen, $num_streams)</make>
+ <param>
+ <name>IO Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Streams</name>
+ <key>num_streams</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$num_streams > 0</check>
+ <check>$vlen >= 1</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ <nports>$num_streams</nports>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen*$num_streams</vlen>
+ </source>
+ <doc>
+convert N streams of items to 1 stream of vector length N
+ </doc>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_vector_to_stream.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_vector_to_stream.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_vector_to_stream.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Vector to Stream
+###################################################
+ -->
+<block>
+ <name>Vector to Stream</name>
+ <key>gr_vector_to_stream</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.vector_to_stream($type.size*$vlen, $num_items)</make>
+ <param>
+ <name>IO Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Items</name>
+ <key>num_items</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$num_items > 0</check>
+ <check>$vlen >= 1</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen*$num_items</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </source>
+ <doc>
+convert a stream of blocks of nitems_per_block items into a stream of items
+ </doc>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_vector_to_streams.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_vector_to_streams.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_vector_to_streams.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Vector to Streams
+###################################################
+ -->
+<block>
+ <name>Vector to Streams</name>
+ <key>gr_vector_to_streams</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.vector_to_streams($type.size*$vlen, $num_streams)</make>
+ <param>
+ <name>IO Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Streams</name>
+ <key>num_streams</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$num_streams > 0</check>
+ <check>$vlen >= 1</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen*$num_streams</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ <nports>$num_streams</nports>
+ </source>
+ <doc>
+Convert 1 stream of vectors of length N to N streams of items.
+ </doc>
+</block>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_add_const_vxx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_add_const_vxx.xml
2008-03-18 13:22:43 UTC (rev 8040)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_add_const_vxx.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -54,7 +54,7 @@
<type>int</type>
</param>
<check>len($const) == $vec_len</check>
- <check>$vec_len >= 1</check>
+ <check>$vec_len >= 1</check>
<sink>
<name>in</name>
<type>$type</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_add_vxx.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_add_vxx.xml
2008-03-18 13:22:43 UTC (rev 8040)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_add_vxx.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -48,8 +48,8 @@
<value>1</value>
<type>int</type>
</param>
- <check>$num_inputs >= 2</check>
- <check>$vlen >= 1</check>
+ <check>$num_inputs >= 2</check>
+ <check>$vlen >= 1</check>
<sink>
<name>in</name>
<type>$type</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_and_xx.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_and_xx.xml
2008-03-18 13:22:43 UTC (rev 8040)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_and_xx.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -9,8 +9,14 @@
<name>And</name>
<key>gr_and_xx</key>
<import>from gnuradio import gr</import>
- <make>gr.and_$(type.fcn)()</make>
+ <make>gr.and_$(type.fcn)()</make>
<param>
+ <name>Num Inputs</name>
+ <key>num_inputs</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
<name>IO Type</name>
<key>type</key>
<type>enum</type>
@@ -29,10 +35,12 @@
<key>byte</key>
<opt>fcn:bb</opt>
</option>
- </param>
+ </param>
+ <check>$num_inputs >= 2</check>
<sink>
<name>in</name>
<type>$type</type>
+ <nports>$num_inputs</nports>
</sink>
<source>
<name>out</name>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_divide_xx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_divide_xx.xml
2008-03-18 13:22:43 UTC (rev 8040)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_divide_xx.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -42,7 +42,7 @@
<opt>fcn:ss</opt>
</option>
</param>
- <check>$num_inputs >= 2</check>
+ <check>$num_inputs >= 2</check>
<sink>
<name>in</name>
<type>$type</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_multiply_vxx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_multiply_vxx.xml
2008-03-18 13:22:43 UTC (rev 8040)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_multiply_vxx.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -48,8 +48,8 @@
<value>1</value>
<type>int</type>
</param>
- <check>$num_inputs >= 2</check>
- <check>$vlen >= 1</check>
+ <check>$num_inputs >= 2</check>
+ <check>$vlen >= 1</check>
<sink>
<name>in</name>
<type>$type</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_not_xx.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_not_xx.xml
2008-03-18 13:22:43 UTC (rev 8040)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_not_xx.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -11,6 +11,12 @@
<import>from gnuradio import gr</import>
<make>gr.not_$(type.fcn)()</make>
<param>
+ <name>Num Inputs</name>
+ <key>num_inputs</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
<name>IO Type</name>
<key>type</key>
<type>enum</type>
@@ -29,10 +35,12 @@
<key>byte</key>
<opt>fcn:bb</opt>
</option>
- </param>
+ </param>
+ <check>$num_inputs >= 2</check>
<sink>
<name>in</name>
<type>$type</type>
+ <nports>$num_inputs</nports>
</sink>
<source>
<name>out</name>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_or_xx.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_or_xx.xml
2008-03-18 13:22:43 UTC (rev 8040)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_or_xx.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -9,8 +9,14 @@
<name>Or</name>
<key>gr_or_xx</key>
<import>from gnuradio import gr</import>
- <make>gr.or_$(type.fcn)()</make>
+ <make>gr.or_$(type.fcn)()</make>
<param>
+ <name>Num Inputs</name>
+ <key>num_inputs</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
<name>IO Type</name>
<key>type</key>
<type>enum</type>
@@ -29,10 +35,12 @@
<key>byte</key>
<opt>fcn:bb</opt>
</option>
- </param>
+ </param>
+ <check>$num_inputs >= 2</check>
<sink>
<name>in</name>
<type>$type</type>
+ <nports>$num_inputs</nports>
</sink>
<source>
<name>out</name>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_sub_xx.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_sub_xx.xml
2008-03-18 13:22:43 UTC (rev 8040)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_sub_xx.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -42,7 +42,7 @@
<opt>fcn:ss</opt>
</option>
</param>
- <check>$num_inputs >= 2</check>
+ <check>$num_inputs >= 2</check>
<sink>
<name>in</name>
<type>$type</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_xor_xx.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_xor_xx.xml
2008-03-18 13:22:43 UTC (rev 8040)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_xor_xx.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -9,8 +9,14 @@
<name>Xor</name>
<key>gr_xor_xx</key>
<import>from gnuradio impxort gr</import>
- <make>gr.xor_$(type.fcn)()</make>
+ <make>gr.xor_$(type.fcn)()</make>
<param>
+ <name>Num Inputs</name>
+ <key>num_inputs</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
<name>IO Type</name>
<key>type</key>
<type>enum</type>
@@ -29,10 +35,12 @@
<key>byte</key>
<opt>fcn:bb</opt>
</option>
- </param>
+ </param>
+ <check>$num_inputs >= 2</check>
<sink>
<name>in</name>
<type>$type</type>
+ <nports>$num_inputs</nports>
</sink>
<source>
<name>out</name>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_noise_source_x.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_noise_source_x.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_noise_source_x.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Noise Source
+###################################################
+ -->
+<block>
+ <name>Noise Source</name>
+ <key>gr_noise_source_x</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.noise_source_$(type.fcn)($noise_type, $amp, $seed)</make>
+ <callback>set_amplitude($amp)</callback>
+ <param>
+ <name>Output Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>fcn:c</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:f</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>fcn:i</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>fcn:s</opt>
+ </option>
+ </param>
+ <param>
+ <name>Noise Type</name>
+ <key>noise_type</key>
+ <value>gr.GR_GAUSSIAN</value>
+ <type>enum</type>
+ <option>
+ <name>Uniform</name>
+ <key>gr.GR_UNIFORM</key>
+ </option>
+ <option>
+ <name>Gaussian</name>
+ <key>gr.GR_GAUSSIAN</key>
+ </option>
+ <option>
+ <name>Laplacian</name>
+ <key>gr.GR_LAPLACIAN</key>
+ </option>
+ <option>
+ <name>Impulse</name>
+ <key>gr.GR_IMPULSE</key>
+ </option>
+ </param>
+ <param>
+ <name>Amplitude</name>
+ <key>amp</key>
+ <value>1</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Seed</name>
+ <key>seed</key>
+ <value>42</value>
+ <type>int</type>
+ </param>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ </source>
+</block>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_sig_source_x.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_sig_source_x.xml
2008-03-18 13:22:43 UTC (rev 8040)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_sig_source_x.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -9,7 +9,7 @@
<name>Signal Source</name>
<key>gr_sig_source_x</key>
<import>from gnuradio import gr</import>
- <make>$(type.fcn)($samp_rate, $waveform, $freq, $amp, $offset)</make>
+ <make>gr.sig_source_$(type.fcn)($samp_rate, $waveform, $freq, $amp,
$offset)</make>
<callback>set_sampling_freq($samp_rate)</callback>
<callback>set_frequency($freq)</callback>
<callback>set_amplitude($amp)</callback>
@@ -21,22 +21,22 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>fcn:gr.sig_source_c</opt>
+ <opt>fcn:c</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>fcn:gr.sig_source_f</opt>
+ <opt>fcn:f</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:gr.sig_source_i</opt>
+ <opt>fcn:i</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:gr.sig_source_s</opt>
+ <opt>fcn:s</opt>
</option>
</param>
<param>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_vector_source_x.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_vector_source_x.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_vector_source_x.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Vector Source
+###################################################
+ -->
+<block>
+ <name>Vector Source</name>
+ <key>gr_vector_source_x</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.vector_source_$(type.fcn)($vector, $repeat)</make>
+ <param>
+ <name>Output Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>fcn:c</opt>
+ <opt>vec_type:complex_vector</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:f</opt>
+ <opt>vec_type:real_vector</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>fcn:i</opt>
+ <opt>vec_type:int_vector</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>fcn:s</opt>
+ <opt>vec_type:int_vector</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>fcn:b</opt>
+ <opt>vec_type:int_vector</opt>
+ </option>
+ </param>
+ <param>
+ <name>Vector</name>
+ <key>vector</key>
+ <value>0, 0, 0</value>
+ <type>$type.vec_type</type>
+ </param>
+ <param>
+ <name>Repeat</name>
+ <key>repeat</key>
+ <value>True</value>
+ <type>enum</type>
+ <option>
+ <name>Yes</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>No</name>
+ <key>False</key>
+ </option>
+ </param>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/random_source_x.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/random_source_x.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/random_source_x.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Random Source
+## Custom wrapper for vector source
+###################################################
+ -->
+<block>
+ <name>Random Source</name>
+ <key>random_source_x</key>
+ <import>from gnuradio import gr</import>
+ <import>import random</import>
+ <make>#if $type.range_type == 'real'
+gr.vector_source_$(type.fcn)([random.uniform($min, $max) for i in
range($num_samples)], $repeat)
+#else
+gr.vector_source_$(type.fcn)([random.randint($min, $max) for i in
range($num_samples)], $repeat)
+#end if</make>
+ <param>
+ <name>Output Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:f</opt>
+ <opt>range_type:real</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>fcn:i</opt>
+ <opt>range_type:int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>fcn:s</opt>
+ <opt>range_type:int</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>fcn:b</opt>
+ <opt>range_type:int</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Samples</name>
+ <key>num_samples</key>
+ <value>1024</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Min</name>
+ <key>min</key>
+ <value>0</value>
+ <type>$type.range_type</type>
+ </param>
+ <param>
+ <name>Max</name>
+ <key>max</key>
+ <value>100</value>
+ <type>$type.range_type</type>
+ </param>
+ <param>
+ <name>Repeat</name>
+ <key>repeat</key>
+ <value>True</value>
+ <type>enum</type>
+ <option>
+ <name>Yes</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>No</name>
+ <key>False</key>
+ </option>
+ </param>
+ <check>$num_samples > 0</check>
+ <check>$min <= $max</check>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ </source>
+</block>
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
2008-03-18 13:22:43 UTC (rev 8040)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
2008-03-18 20:54:55 UTC (rev 8041)
@@ -9,9 +9,9 @@
<cat>
<name>Sources</name>
<block>gr_sig_source_x</block>
- <block>noise_source</block>
- <block>vector_source</block>
- <block>random_source</block>
+ <block>gr_noise_source_x</block>
+ <block>gr_vector_source_x</block>
+ <block>random_source_x</block>
<block>gr_null_source</block>
<block>gr_file_source</block>
<block>gr_udp_source</block>
@@ -75,17 +75,17 @@
</cat>
<cat>
<name>Stream Conversions</name>
- <block>interleave</block>
- <block>deinterleave</block>
+ <block>gr_interleave</block>
+ <block>gr_deinterleave</block>
- <block>streams_to_stream</block>
- <block>stream_to_streams</block>
+ <block>gr_streams_to_stream</block>
+ <block>gr_stream_to_streams</block>
- <block>streams_to_vector</block>
- <block>vector_to_streams</block>
+ <block>gr_streams_to_vector</block>
+ <block>gr_vector_to_streams</block>
- <block>stream_to_vector</block>
- <block>vector_to_stream</block>
+ <block>gr_stream_to_vector</block>
+ <block>gr_vector_to_stream</block>
</cat>
<cat>
<name>Misc Conversions</name>
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/wxgui/Controls.py
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/wxgui/Controls.py
2008-03-18 13:22:43 UTC (rev 8040)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/wxgui/Controls.py
2008-03-18 20:54:55 UTC (rev 8041)
@@ -217,18 +217,18 @@
A scroll event is detected. Read the slider, call the callback.
"""
new_value = str(self.get_value()) #the new value must be
a string!
+ self._set_slider_value(new_value)
+ self.text_box.SetValue(new_value)
try: self.call()
except Exception, e: print 'Error in handle scroll: "%s".'%e
- self._set_slider_value(new_value)
- self.text_box.SetValue(new_value)
def _handle_enter(self, event=None):
"""!
An enter key was pressed. Read the text box, call the callback.
"""
- new_value = str(self.text_box.GetValue()) #the new value
must be a string!
+ new_value = str(self.text_box.GetValue()) #the new value
must be a string!
+ self._set_slider_value(new_value)
+ self.text_box.SetValue(new_value)
try: self.call()
except Exception, e: print 'Error in handle enter: "%s".'%e
- self._set_slider_value(new_value)
- self.text_box.SetValue(new_value)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8041 - in grc/branches/grc_reloaded/src: grc/gui grc/gui/elements grc_gnuradio/blocks/conversions grc_gnuradio/blocks/operators grc_gnuradio/blocks/sources grc_gnuradio/data grc_gnuradio/wxgui,
jblum <=