[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r7766 - in grc/branches/grc_reloaded/src/grc: gui/elem
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r7766 - in grc/branches/grc_reloaded/src/grc: gui/elements platforms/gnuradio_python platforms/gnuradio_python/blocks/sinks platforms/gnuradio_python/blocks/sources platforms/gnuradio_python/data |
|
Date: |
Wed, 20 Feb 2008 22:40:17 -0700 (MST) |
Author: jblum
Date: 2008-02-20 22:40:16 -0700 (Wed, 20 Feb 2008)
New Revision: 7766
Added:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sinks/gr_file_sink.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sinks/gr_wavfile_sink.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_file_source.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_wavfile_source.xml
Modified:
grc/branches/grc_reloaded/src/grc/gui/elements/Param.py
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/Param.py
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/block_tree.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/default_flow_graph.grc.xml
Log:
file source sink blocks
Modified: grc/branches/grc_reloaded/src/grc/gui/elements/Param.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/gui/elements/Param.py 2008-02-21
05:29:28 UTC (rev 7765)
+++ grc/branches/grc_reloaded/src/grc/gui/elements/Param.py 2008-02-21
05:40:16 UTC (rev 7766)
@@ -76,13 +76,13 @@
If the button was clicked, open a file dialog in open/save
format.
Replace the text in the entry with the new filename from the
file dialog.
"""
- file_path = self.param.evaluate()
+ file_path = self.param.is_valid() and self.param.evaluate() or
''
#bad file paths will be redirected to default
if not path.exists(path.dirname(file_path)): file_path =
DEFAULT_FILE_PATH
- if self.get_type() == 'file_open':
+ if self.param.get_type() == 'file_open':
file_dialog = gtk.FileChooserDialog('Open a Data
File...', None,
gtk.FILE_CHOOSER_ACTION_OPEN,
('gtk-cancel',gtk.RESPONSE_CANCEL,'gtk-open',gtk.RESPONSE_OK))
- elif self.get_type() == 'file_save':
+ elif self.param.get_type() == 'file_save':
file_dialog = gtk.FileChooserDialog('Save a Data
File...', None,
gtk.FILE_CHOOSER_ACTION_SAVE,
('gtk-cancel',gtk.RESPONSE_CANCEL, 'gtk-save',gtk.RESPONSE_OK))
file_dialog.set_do_overwrite_confirmation(True)
Modified: grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/Param.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/Param.py
2008-02-21 05:29:28 UTC (rev 7765)
+++ grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/Param.py
2008-02-21 05:40:16 UTC (rev 7766)
@@ -131,7 +131,7 @@
e = str(e)
assert(os.path.exists(os.path.dirname(e)))
assert(not os.path.isdir(e))
- assert(path.basename(e))
+ assert(os.path.basename(e))
return e
elif t == 'id':
#can python use this as a variable?
Added:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sinks/gr_file_sink.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sinks/gr_file_sink.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sinks/gr_file_sink.xml
2008-02-21 05:40:16 UTC (rev 7766)
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##File Sink
+###################################################
+ -->
+<block>
+ <name>File Sink</name>
+ <key>gr_file_sink</key>
+ <dep>from gnuradio import gr</dep>
+ <fcn>gr.file_sink($type:size*$vlen, $file)</fcn>
+ <param>
+ <name>File</name>
+ <key>file</key>
+ <value></value>
+ <type>file_save</type>
+ </param>
+ <param>
+ <name>Input Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>type:complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>type:float</opt>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>type:int</opt>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>type:short</opt>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>type:byte</opt>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen >= 1</check>
+ <sink>
+ <name>in</name>
+ <type>$type:type</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <doc>
+File sink writes a data stream to a binary file.
+ </doc>
+</block>
Added:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sinks/gr_wavfile_sink.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sinks/gr_wavfile_sink.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sinks/gr_wavfile_sink.xml
2008-02-21 05:40:16 UTC (rev 7766)
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Wav File Sink
+###################################################
+ -->
+<block>
+ <name>Wav File Sink</name>
+ <key>gr_wavfile_sink</key>
+ <dep>from gnuradio import gr</dep>
+ <fcn>gr.wavfile_sink($file, $nchan, $samp_rate, $bits_per_sample)</fcn>
+ <param>
+ <name>File</name>
+ <key>file</key>
+ <value></value>
+ <type>file_save</type>
+ </param>
+ <param>
+ <name>N Channels</name>
+ <key>nchan</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Sample Rate</name>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Bits per Sample</name>
+ <key>bits_per_sample</key>
+ <value>8</value>
+ <type>int</type>
+ </param>
+ <check>1 <= $nchan</check>
+ <sink>
+ <name>in</name>
+ <type>float</type>
+ <nports>$nchan</nports>
+ </sink>
+ <doc>
+Write N data streams to the .wav file.
+ </doc>
+</block>
Added:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_file_source.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_file_source.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_file_source.xml
2008-02-21 05:40:16 UTC (rev 7766)
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##File Source
+###################################################
+ -->
+<block>
+ <name>File Source</name>
+ <key>gr_file_source</key>
+ <dep>from gnuradio import gr</dep>
+ <fcn>gr.file_source($type:size*$vlen, $file, $repeat)</fcn>
+ <param>
+ <name>File</name>
+ <key>file</key>
+ <value></value>
+ <type>file_open</type>
+ </param>
+ <param>
+ <name>Output Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>type:complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>type:float</opt>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>type:int</opt>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>type:short</opt>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>type:byte</opt>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </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>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen >= 1</check>
+ <source>
+ <name>out</name>
+ <type>$type:type</type>
+ <vlen>$vlen</vlen>
+ </source>
+ <doc>
+File source reads a binary file to a data stream.
+Repeat specifies if the file should be re-read when the end is reached.
+ </doc>
+</block>
Added:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_wavfile_source.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_wavfile_source.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_wavfile_source.xml
2008-02-21 05:40:16 UTC (rev 7766)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Wav File Source
+###################################################
+ -->
+<block>
+ <name>Wav File Source</name>
+ <key>gr_wavfile_source</key>
+ <dep>from gnuradio import gr</dep>
+ <fcn>gr.wavfile_source($file, $repeat)</fcn>
+ <param>
+ <name>File</name>
+ <key>file</key>
+ <value></value>
+ <type>file_open</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>
+ <param>
+ <name>N Channels</name>
+ <key>nchan</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>1 <= $nchan</check>
+ <source>
+ <name>out</name>
+ <type>float</type>
+ <nports>$nchan</nports>
+ </source>
+ <doc>
+Read N streams from a .wav file.
+Repeat specifies if the file should be re-read when the end is reached.
+ </doc>
+</block>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/block_tree.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/block_tree.xml
2008-02-21 05:29:28 UTC (rev 7765)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/block_tree.xml
2008-02-21 05:40:16 UTC (rev 7766)
@@ -13,20 +13,20 @@
<block>vector_source</block>
<block>random_source</block>
<block>gr_null_source</block>
- <block>file_source</block>
+ <block>gr_file_source</block>
<block>udp_source</block>
<block>audio_source</block>
- <block>wave_source</block>
+ <block>gr_wavfile_source</block>
<block>usrp_source</block>
<block>usrp_dual_source</block>
</cat>
<cat>
<name>Sinks</name>
<block>gr_null_sink</block>
- <block>file_sink</block>
+ <block>gr_file_sink</block>
<block>udp_sink</block>
<block>audio_sink</block>
- <block>wave_sink</block>
+ <block>gr_wavfile_sink</block>
<block>usrp_sink</block>
<block>usrp_dual_sink</block>
</cat>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/default_flow_graph.grc.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/default_flow_graph.grc.xml
2008-02-21 05:29:28 UTC (rev 7765)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/default_flow_graph.grc.xml
2008-02-21 05:40:16 UTC (rev 7766)
@@ -25,7 +25,7 @@
</param>
<param>
<key>value</key>
- <value>32e3</value>
+ <value>32000</value>
</param>
<param>
<key>position</key>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r7766 - in grc/branches/grc_reloaded/src/grc: gui/elements platforms/gnuradio_python platforms/gnuradio_python/blocks/sinks platforms/gnuradio_python/blocks/sources platforms/gnuradio_python/data,
jblum <=