[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8865 - in grc/trunk: examples/audio examples/simple e
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r8865 - in grc/trunk: examples/audio examples/simple examples/usrp examples/xmlrpc src/grc_gnuradio src/grc_gnuradio/blocks/graphical_sinks src/grc_gnuradio/blocks/misc src/grc_gnuradio/blocks/variables src/grc_gnuradio/data |
|
Date: |
Fri, 11 Jul 2008 00:09:18 -0600 (MDT) |
Author: jblum
Date: 2008-07-11 00:09:16 -0600 (Fri, 11 Jul 2008)
New Revision: 8865
Modified:
grc/trunk/examples/audio/dial_tone.grc.xml
grc/trunk/examples/simple/ber_simulation.grc.xml
grc/trunk/examples/usrp/usrp_two_tone_loopback.grc.xml
grc/trunk/examples/usrp/usrp_wbfm_receive.grc.xml
grc/trunk/examples/xmlrpc/xmlrpc_client.grc.xml
grc/trunk/examples/xmlrpc/xmlrpc_server.grc.xml
grc/trunk/src/grc_gnuradio/Block.py
grc/trunk/src/grc_gnuradio/Param.py
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_constellationsink2.xml
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_fftsink2.xml
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_numbersink2.xml
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_scopesink2.xml
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_waterfallsink2.xml
grc/trunk/src/grc_gnuradio/blocks/misc/xmlrpc_server.xml
grc/trunk/src/grc_gnuradio/blocks/variables/variable_chooser.xml
grc/trunk/src/grc_gnuradio/blocks/variables/variable_sink.xml
grc/trunk/src/grc_gnuradio/blocks/variables/variable_slider.xml
grc/trunk/src/grc_gnuradio/data/default_flow_graph.grc.xml
grc/trunk/src/grc_gnuradio/data/flow_graph.tmpl
Log:
generate top block classes
Modified: grc/trunk/examples/audio/dial_tone.grc.xml
===================================================================
--- grc/trunk/examples/audio/dial_tone.grc.xml 2008-07-11 01:00:37 UTC (rev
8864)
+++ grc/trunk/examples/audio/dial_tone.grc.xml 2008-07-11 06:09:16 UTC (rev
8865)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Sat May 31 20:29:21 2008</timestamp>
+ <timestamp>Thu Jul 10 23:01:15 2008</timestamp>
<block>
<key>variable</key>
<param>
@@ -8,6 +8,10 @@
<value>samp_rate</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>value</key>
<value>32000</value>
</param>
@@ -21,47 +25,16 @@
</param>
</block>
<block>
- <key>options</key>
+ <key>gr_add_vxx</key>
<param>
<key>id</key>
- <value>options</value>
+ <value>gr_add_vxx</value>
</param>
<param>
- <key>title</key>
- <value>Dial Tone</value>
+ <key>_enabled</key>
+ <value>True</value>
</param>
<param>
- <key>author</key>
- <value>Example</value>
- </param>
- <param>
- <key>description</key>
- <value>example flow graph</value>
- </param>
- <param>
- <key>window_size</key>
- <value>1280, 1024</value>
- </param>
- <param>
- <key>generate_options</key>
- <value>wx_gui</value>
- </param>
- <param>
- <key>gui_coordinate</key>
- <value>(10, 10)</value>
- </param>
- <param>
- <key>gui_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>gr_add_vxx</key>
- <param>
- <key>id</key>
- <value>gr_add_vxx</value>
- </param>
- <param>
<key>type</key>
<value>float</value>
</param>
@@ -89,6 +62,10 @@
<value>audio_sink</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>samp_rate</key>
<value>32000</value>
</param>
@@ -120,6 +97,10 @@
<value>gr_noise_source_x</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -151,6 +132,10 @@
<value>gr_sig_source_x</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -190,6 +175,10 @@
<value>gr_sig_source_x0</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -229,6 +218,10 @@
<value>ampl</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>label</key>
<value>Volume</value>
</param>
@@ -249,6 +242,10 @@
<value>100</value>
</param>
<param>
+ <key>slider_type</key>
+ <value>horizontal</value>
+ </param>
+ <param>
<key>grid_pos</key>
<value>0, 0, 1, 2</value>
</param>
@@ -268,6 +265,10 @@
<value>noise</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>label</key>
<value>Noise</value>
</param>
@@ -288,6 +289,10 @@
<value>100</value>
</param>
<param>
+ <key>slider_type</key>
+ <value>horizontal</value>
+ </param>
+ <param>
<key>grid_pos</key>
<value>1, 0, 1, 2</value>
</param>
@@ -300,6 +305,45 @@
<value>0</value>
</param>
</block>
+ <block>
+ <key>options</key>
+ <param>
+ <key>id</key>
+ <value>dial_tone</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>title</key>
+ <value>Dial Tone</value>
+ </param>
+ <param>
+ <key>author</key>
+ <value>Example</value>
+ </param>
+ <param>
+ <key>description</key>
+ <value>example flow graph</value>
+ </param>
+ <param>
+ <key>window_size</key>
+ <value>1280, 1024</value>
+ </param>
+ <param>
+ <key>generate_options</key>
+ <value>wx_gui</value>
+ </param>
+ <param>
+ <key>gui_coordinate</key>
+ <value>(10, 10)</value>
+ </param>
+ <param>
+ <key>gui_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
<connection>
<source_block_id>gr_sig_source_x0</source_block_id>
<sink_block_id>gr_add_vxx</sink_block_id>
Modified: grc/trunk/examples/simple/ber_simulation.grc.xml
===================================================================
--- grc/trunk/examples/simple/ber_simulation.grc.xml 2008-07-11 01:00:37 UTC
(rev 8864)
+++ grc/trunk/examples/simple/ber_simulation.grc.xml 2008-07-11 06:09:16 UTC
(rev 8865)
@@ -1,48 +1,17 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Fri Jun 6 12:15:48 2008</timestamp>
+ <timestamp>Thu Jul 10 23:01:33 2008</timestamp>
<block>
- <key>options</key>
+ <key>import</key>
<param>
<key>id</key>
- <value>options</value>
+ <value>import</value>
</param>
<param>
- <key>title</key>
- <value>BER Simulation</value>
+ <key>_enabled</key>
+ <value>True</value>
</param>
<param>
- <key>author</key>
- <value>Example</value>
- </param>
- <param>
- <key>description</key>
- <value>Adjust the noise and constellation... see what happens!</value>
- </param>
- <param>
- <key>window_size</key>
- <value>1280, 1024</value>
- </param>
- <param>
- <key>generate_options</key>
- <value>wx_gui</value>
- </param>
- <param>
- <key>gui_coordinate</key>
- <value>(16, 10)</value>
- </param>
- <param>
- <key>gui_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>import</key>
- <param>
- <key>id</key>
- <value>import</value>
- </param>
- <param>
<key>import</key>
<value>import math</value>
</param>
@@ -62,6 +31,10 @@
<value>gr_add_vxx</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>complex</value>
</param>
@@ -89,6 +62,10 @@
<value>wxgui_constellationsink2</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>title</key>
<value>"Constellation: "+str(const)</value>
</param>
@@ -124,6 +101,10 @@
<value>gr_noise_source_x</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>complex</value>
</param>
@@ -155,6 +136,10 @@
<value>gr_chunks_to_symbols_xx</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>in_type</key>
<value>byte</value>
</param>
@@ -186,6 +171,10 @@
<value>samp_rate</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>value</key>
<value>50e3</value>
</param>
@@ -205,6 +194,10 @@
<value>random_source_x</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>byte</value>
</param>
@@ -240,6 +233,10 @@
<value>wxgui_numbersink2</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -315,6 +312,10 @@
<value>noise</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>value</key>
<value>.25</value>
</param>
@@ -334,6 +335,10 @@
<value>const</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>value</key>
<value>1+1j, 1-1j, -1-1j, -1+1j</value>
</param>
@@ -353,6 +358,10 @@
<value>gr_throttle</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>byte</value>
</param>
@@ -380,6 +389,10 @@
<value>blks2_error_rate</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>"BER"</value>
</param>
@@ -407,6 +420,10 @@
<value>gr_constellation_decoder_cb</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>sym_position</key>
<value>const</value>
</param>
@@ -423,6 +440,45 @@
<value>0</value>
</param>
</block>
+ <block>
+ <key>options</key>
+ <param>
+ <key>id</key>
+ <value>ber_sim</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>title</key>
+ <value>BER Simulation</value>
+ </param>
+ <param>
+ <key>author</key>
+ <value>Example</value>
+ </param>
+ <param>
+ <key>description</key>
+ <value>Adjust the noise and constellation... see what happens!</value>
+ </param>
+ <param>
+ <key>window_size</key>
+ <value>1280, 1024</value>
+ </param>
+ <param>
+ <key>generate_options</key>
+ <value>wx_gui</value>
+ </param>
+ <param>
+ <key>gui_coordinate</key>
+ <value>(16, 10)</value>
+ </param>
+ <param>
+ <key>gui_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
<connection>
<source_block_id>blks2_error_rate</source_block_id>
<sink_block_id>wxgui_numbersink2</sink_block_id>
Modified: grc/trunk/examples/usrp/usrp_two_tone_loopback.grc.xml
===================================================================
--- grc/trunk/examples/usrp/usrp_two_tone_loopback.grc.xml 2008-07-11
01:00:37 UTC (rev 8864)
+++ grc/trunk/examples/usrp/usrp_two_tone_loopback.grc.xml 2008-07-11
06:09:16 UTC (rev 8865)
@@ -1,48 +1,17 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Wed Jun 25 10:49:20 2008</timestamp>
+ <timestamp>Thu Jul 10 23:02:01 2008</timestamp>
<block>
- <key>options</key>
+ <key>variable</key>
<param>
<key>id</key>
- <value>options</value>
+ <value>samp_rate</value>
</param>
<param>
- <key>title</key>
- <value>USRP Loopback - 2 Tone</value>
+ <key>_enabled</key>
+ <value>True</value>
</param>
<param>
- <key>author</key>
- <value>Example</value>
- </param>
- <param>
- <key>description</key>
- <value>Loopback test with basic rx and basic tx</value>
- </param>
- <param>
- <key>window_size</key>
- <value>1280, 1024</value>
- </param>
- <param>
- <key>generate_options</key>
- <value>wx_gui</value>
- </param>
- <param>
- <key>gui_coordinate</key>
- <value>(10, 10)</value>
- </param>
- <param>
- <key>gui_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>variable</key>
- <param>
- <key>id</key>
- <value>samp_rate</value>
- </param>
- <param>
<key>value</key>
<value>64e6/200</value>
</param>
@@ -62,6 +31,10 @@
<value>usrp_simple_source_x</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>complex</value>
</param>
@@ -113,6 +86,10 @@
<value>tun_freq</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>value</key>
<value>int(100e6)</value>
</param>
@@ -132,6 +109,10 @@
<value>wxgui_fftsink2</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>complex</value>
</param>
@@ -199,6 +180,10 @@
<value>tone2</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>label</key>
<value>Tone 2</value>
</param>
@@ -242,6 +227,10 @@
<value>tone1</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>label</key>
<value>Tone 1</value>
</param>
@@ -285,6 +274,10 @@
<value>noise_ampl</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>label</key>
<value>Noise Ampl</value>
</param>
@@ -328,6 +321,10 @@
<value>tone_ampl</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>label</key>
<value>Tone Ampl</value>
</param>
@@ -371,6 +368,10 @@
<value>usrp_simple_sink_x</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>complex</value>
</param>
@@ -422,6 +423,10 @@
<value>gr_float_to_complex</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>gui_coordinate</key>
<value>(634, 226)</value>
</param>
@@ -437,6 +442,10 @@
<value>gr_add_vxx</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -464,6 +473,10 @@
<value>gr_sig_source_x</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -503,6 +516,10 @@
<value>gr_sig_source_x0</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -542,6 +559,10 @@
<value>gr_noise_source_x</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -566,6 +587,45 @@
<value>0</value>
</param>
</block>
+ <block>
+ <key>options</key>
+ <param>
+ <key>id</key>
+ <value>top_block</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>title</key>
+ <value>USRP Loopback - 2 Tone</value>
+ </param>
+ <param>
+ <key>author</key>
+ <value>Example</value>
+ </param>
+ <param>
+ <key>description</key>
+ <value>Loopback test with basic rx and basic tx</value>
+ </param>
+ <param>
+ <key>window_size</key>
+ <value>1280, 1024</value>
+ </param>
+ <param>
+ <key>generate_options</key>
+ <value>wx_gui</value>
+ </param>
+ <param>
+ <key>gui_coordinate</key>
+ <value>(10, 10)</value>
+ </param>
+ <param>
+ <key>gui_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
<connection>
<source_block_id>gr_sig_source_x</source_block_id>
<sink_block_id>gr_add_vxx</sink_block_id>
Modified: grc/trunk/examples/usrp/usrp_wbfm_receive.grc.xml
===================================================================
--- grc/trunk/examples/usrp/usrp_wbfm_receive.grc.xml 2008-07-11 01:00:37 UTC
(rev 8864)
+++ grc/trunk/examples/usrp/usrp_wbfm_receive.grc.xml 2008-07-11 06:09:16 UTC
(rev 8865)
@@ -1,48 +1,17 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Mon Jun 9 13:17:36 2008</timestamp>
+ <timestamp>Thu Jul 10 23:02:11 2008</timestamp>
<block>
- <key>options</key>
+ <key>variable</key>
<param>
<key>id</key>
- <value>options</value>
+ <value>decim</value>
</param>
<param>
- <key>title</key>
- <value>USRP WBFM Receive</value>
+ <key>_enabled</key>
+ <value>True</value>
</param>
<param>
- <key>author</key>
- <value>Example</value>
- </param>
- <param>
- <key>description</key>
- <value>WBFM Receive with Basic RX or TV RX</value>
- </param>
- <param>
- <key>window_size</key>
- <value>1280, 1024</value>
- </param>
- <param>
- <key>generate_options</key>
- <value>wx_gui</value>
- </param>
- <param>
- <key>gui_coordinate</key>
- <value>(10, 10)</value>
- </param>
- <param>
- <key>gui_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>variable</key>
- <param>
- <key>id</key>
- <value>decim</value>
- </param>
- <param>
<key>value</key>
<value>200</value>
</param>
@@ -62,6 +31,10 @@
<value>usrp_simple_source_x</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>complex</value>
</param>
@@ -113,6 +86,10 @@
<value>fine</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>label</key>
<value>Fine Freq</value>
</param>
@@ -133,6 +110,10 @@
<value>100</value>
</param>
<param>
+ <key>slider_type</key>
+ <value>horizontal</value>
+ </param>
+ <param>
<key>grid_pos</key>
<value>0, 2, 1, 2</value>
</param>
@@ -152,6 +133,10 @@
<value>blks2_wfm_rcv</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>quad_rate</key>
<value>64e6/decim</value>
</param>
@@ -175,6 +160,10 @@
<value>audio_sink</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>samp_rate</key>
<value>32000</value>
</param>
@@ -206,6 +195,10 @@
<value>gr_multiply_const_vxx</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -233,6 +226,10 @@
<value>wxgui_fftsink2</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>complex</value>
</param>
@@ -300,6 +297,10 @@
<value>volume</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>label</key>
<value>Volume</value>
</param>
@@ -320,6 +321,10 @@
<value>100</value>
</param>
<param>
+ <key>slider_type</key>
+ <value>horizontal</value>
+ </param>
+ <param>
<key>grid_pos</key>
<value>1, 1, 1, 2</value>
</param>
@@ -339,6 +344,10 @@
<value>freq</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>label</key>
<value>Frequency</value>
</param>
@@ -359,6 +368,10 @@
<value>1000</value>
</param>
<param>
+ <key>slider_type</key>
+ <value>horizontal</value>
+ </param>
+ <param>
<key>grid_pos</key>
<value>0, 0, 1, 2</value>
</param>
@@ -371,6 +384,45 @@
<value>0</value>
</param>
</block>
+ <block>
+ <key>options</key>
+ <param>
+ <key>id</key>
+ <value>top_block</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>title</key>
+ <value>USRP WBFM Receive</value>
+ </param>
+ <param>
+ <key>author</key>
+ <value>Example</value>
+ </param>
+ <param>
+ <key>description</key>
+ <value>WBFM Receive with Basic RX or TV RX</value>
+ </param>
+ <param>
+ <key>window_size</key>
+ <value>1280, 1024</value>
+ </param>
+ <param>
+ <key>generate_options</key>
+ <value>wx_gui</value>
+ </param>
+ <param>
+ <key>gui_coordinate</key>
+ <value>(10, 10)</value>
+ </param>
+ <param>
+ <key>gui_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
<connection>
<source_block_id>usrp_simple_source_x</source_block_id>
<sink_block_id>blks2_wfm_rcv</sink_block_id>
Modified: grc/trunk/examples/xmlrpc/xmlrpc_client.grc.xml
===================================================================
--- grc/trunk/examples/xmlrpc/xmlrpc_client.grc.xml 2008-07-11 01:00:37 UTC
(rev 8864)
+++ grc/trunk/examples/xmlrpc/xmlrpc_client.grc.xml 2008-07-11 06:09:16 UTC
(rev 8865)
@@ -1,13 +1,17 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Sat May 31 20:23:48 2008</timestamp>
+ <timestamp>Thu Jul 10 23:06:23 2008</timestamp>
<block>
<key>options</key>
<param>
<key>id</key>
- <value>options</value>
+ <value>client_block</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>title</key>
<value>XMLRPC Client</value>
</param>
@@ -43,6 +47,10 @@
<value>samp_rate</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>value</key>
<value>32000</value>
</param>
@@ -62,6 +70,10 @@
<value>xmlrpc_client0</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>addr</key>
<value>localhost</value>
</param>
@@ -90,40 +102,13 @@
<key>xmlrpc_client</key>
<param>
<key>id</key>
- <value>xmlrpc_client1</value>
+ <value>xmlrpc_client</value>
</param>
<param>
- <key>addr</key>
- <value>localhost</value>
+ <key>_enabled</key>
+ <value>True</value>
</param>
<param>
- <key>port</key>
- <value>1234</value>
- </param>
- <param>
- <key>callback</key>
- <value>set_offset</value>
- </param>
- <param>
- <key>variable</key>
- <value>offset</value>
- </param>
- <param>
- <key>gui_coordinate</key>
- <value>(608, 39)</value>
- </param>
- <param>
- <key>gui_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>xmlrpc_client</key>
- <param>
- <key>id</key>
- <value>xmlrpc_client</value>
- </param>
- <param>
<key>addr</key>
<value>localhost</value>
</param>
@@ -155,6 +140,10 @@
<value>freq</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>label</key>
<value>Frequency (Hz)</value>
</param>
@@ -175,6 +164,10 @@
<value>100</value>
</param>
<param>
+ <key>slider_type</key>
+ <value>horizontal</value>
+ </param>
+ <param>
<key>grid_pos</key>
<value>0, 0, 1, 2</value>
</param>
@@ -194,6 +187,10 @@
<value>ampl</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>label</key>
<value>Amplitude</value>
</param>
@@ -214,6 +211,10 @@
<value>100</value>
</param>
<param>
+ <key>slider_type</key>
+ <value>horizontal</value>
+ </param>
+ <param>
<key>grid_pos</key>
<value>1, 0, 1, 2</value>
</param>
@@ -233,6 +234,10 @@
<value>offset</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>label</key>
<value>Offset</value>
</param>
@@ -265,4 +270,39 @@
<value>0</value>
</param>
</block>
+ <block>
+ <key>xmlrpc_client</key>
+ <param>
+ <key>id</key>
+ <value>xmlrpc_client1</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>addr</key>
+ <value>localhost</value>
+ </param>
+ <param>
+ <key>port</key>
+ <value>1234</value>
+ </param>
+ <param>
+ <key>callback</key>
+ <value>set_offset</value>
+ </param>
+ <param>
+ <key>variable</key>
+ <value>offset*ampl</value>
+ </param>
+ <param>
+ <key>gui_coordinate</key>
+ <value>(608, 39)</value>
+ </param>
+ <param>
+ <key>gui_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
</flow_graph>
\ No newline at end of file
Modified: grc/trunk/examples/xmlrpc/xmlrpc_server.grc.xml
===================================================================
--- grc/trunk/examples/xmlrpc/xmlrpc_server.grc.xml 2008-07-11 01:00:37 UTC
(rev 8864)
+++ grc/trunk/examples/xmlrpc/xmlrpc_server.grc.xml 2008-07-11 06:09:16 UTC
(rev 8865)
@@ -1,48 +1,17 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Sat May 31 19:15:18 2008</timestamp>
+ <timestamp>Thu Jul 10 23:02:53 2008</timestamp>
<block>
- <key>options</key>
+ <key>variable</key>
<param>
<key>id</key>
- <value>options</value>
+ <value>samp_rate</value>
</param>
<param>
- <key>title</key>
- <value>XMLRPC Server</value>
+ <key>_enabled</key>
+ <value>True</value>
</param>
<param>
- <key>author</key>
- <value>Example</value>
- </param>
- <param>
- <key>description</key>
- <value>example flow graph</value>
- </param>
- <param>
- <key>window_size</key>
- <value>1280, 1024</value>
- </param>
- <param>
- <key>generate_options</key>
- <value>wx_gui</value>
- </param>
- <param>
- <key>gui_coordinate</key>
- <value>(10, 10)</value>
- </param>
- <param>
- <key>gui_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>variable</key>
- <param>
- <key>id</key>
- <value>samp_rate</value>
- </param>
- <param>
<key>value</key>
<value>32000</value>
</param>
@@ -62,6 +31,10 @@
<value>gr_sig_source_x</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -101,6 +74,10 @@
<value>freq</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>value</key>
<value>1000</value>
</param>
@@ -120,6 +97,10 @@
<value>ampl</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>value</key>
<value>1</value>
</param>
@@ -139,6 +120,10 @@
<value>offset</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>value</key>
<value>0</value>
</param>
@@ -158,6 +143,10 @@
<value>xmlrpc_server</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>addr</key>
<value>localhost</value>
</param>
@@ -181,6 +170,10 @@
<value>gr_throttle</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -208,6 +201,10 @@
<value>wxgui_scopesink2</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -259,6 +256,10 @@
<value>wxgui_fftsink2</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -319,6 +320,45 @@
<value>0</value>
</param>
</block>
+ <block>
+ <key>options</key>
+ <param>
+ <key>id</key>
+ <value>server_block</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>title</key>
+ <value>XMLRPC Server</value>
+ </param>
+ <param>
+ <key>author</key>
+ <value>Example</value>
+ </param>
+ <param>
+ <key>description</key>
+ <value>example flow graph</value>
+ </param>
+ <param>
+ <key>window_size</key>
+ <value>1280, 1024</value>
+ </param>
+ <param>
+ <key>generate_options</key>
+ <value>wx_gui</value>
+ </param>
+ <param>
+ <key>gui_coordinate</key>
+ <value>(10, 10)</value>
+ </param>
+ <param>
+ <key>gui_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
<connection>
<source_block_id>gr_sig_source_x</source_block_id>
<sink_block_id>gr_throttle</sink_block_id>
Modified: grc/trunk/src/grc_gnuradio/Block.py
===================================================================
--- grc/trunk/src/grc_gnuradio/Block.py 2008-07-11 01:00:37 UTC (rev 8864)
+++ grc/trunk/src/grc_gnuradio/Block.py 2008-07-11 06:09:16 UTC (rev 8865)
@@ -38,6 +38,7 @@
@param n the nested odict
@return block a new block
"""
+ self.self_flag = False
#grab the data
doc = Utils.exists_or_else(n, 'doc', '')
imports = map(lambda i: i.strip(), Utils.listify(n, 'import'))
@@ -110,5 +111,13 @@
def get_make(self): return self.resolve_dependencies(self._make)
def get_callbacks(self):
- return map(lambda c: self.get_id() + '.' +
self.resolve_dependencies(c), self._callbacks)
-
+ """!
+ Get a list of function callbacks for this block.
+ Set the self flag so that variables references are rewritten
with self.
+ Unset the self flag before returning the callbacks.
+ @return a list of strings
+ """
+ self.self_flag = True
+ callbacks = map(lambda c: self.get_id() + '.' +
self.resolve_dependencies(c), self._callbacks)
+ self.self_flag = False
+ return callbacks
Modified: grc/trunk/src/grc_gnuradio/Param.py
===================================================================
--- grc/trunk/src/grc_gnuradio/Param.py 2008-07-11 01:00:37 UTC (rev 8864)
+++ grc/trunk/src/grc_gnuradio/Param.py 2008-07-11 06:09:16 UTC (rev 8865)
@@ -20,6 +20,7 @@
#Flow graph block parameters.
address@hidden Josh Blum
+import expr_utils
from grc.elements.Param import Param as _Param
import os
@@ -203,8 +204,26 @@
def to_code(self):
"""!
Convert the value to code.
+ Call the internal to code method.
+ If the block's self flag was set,
+ append self. to variable references.
@return a string representing the code
"""
+ code = self._to_code()
+ #add self. to variables
+ if self.get_parent().self_flag:
+ code_splits = expr_utils.expr_split(code)
+ var_ids = [var.get_id() for var in
self.get_parent().get_parent().get_variables()]
+ for i, cs in enumerate(code_splits):
+ if cs in var_ids: code_splits[i] = "self.%s"%cs
+ code = ''.join(code_splits)
+ return code
+
+ def _to_code(self):
+ """!
+ Convert the value to code.
+ @return a string representing the code
+ """
v = self.get_value()
t = self.get_type()
if t in ('string', 'file_open', 'file_save'): #string types
Modified:
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_constellationsink2.xml
===================================================================
---
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_constellationsink2.xml
2008-07-11 01:00:37 UTC (rev 8864)
+++
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_constellationsink2.xml
2008-07-11 06:09:16 UTC (rev 8865)
@@ -10,17 +10,17 @@
<key>wxgui_constellationsink2</key>
<import>from gnuradio.wxgui import scopesink2</import>
<make>scopesink2.constellation_sink(
- tb.GetWin(),
+ self.GetWin(),
title=$title,
sample_rate=$samp_rate,
frame_decim=$frame_decim,
)
-$(id).win.$(marker)()
+self.$(id).win.$(marker)()
#set $grid_pos = $grid_pos.eval
#if not grid_pos
-tb.Add($(id).win)
+self.Add(self.$(id).win)
#else
-tb.GridAdd($(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2], $grid_pos[3])
+self.GridAdd(self.$(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])
#end if</make>
<callback>set_sample_rate($samp_rate)</callback>
<param>
Modified: grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_fftsink2.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_fftsink2.xml
2008-07-11 01:00:37 UTC (rev 8864)
+++ grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_fftsink2.xml
2008-07-11 06:09:16 UTC (rev 8865)
@@ -10,7 +10,7 @@
<key>wxgui_fftsink2</key>
<import>from gnuradio.wxgui import fftsink2</import>
<make>fftsink2.$(type.fcn)(
- tb.GetWin(),
+ self.GetWin(),
baseband_freq=$baseband_freq,
y_per_div=$y_per_div,
y_divs=$y_divs,
@@ -29,9 +29,9 @@
)
#set $grid_pos = $grid_pos.eval
#if not grid_pos
-tb.Add($(id).win)
+self.Add(self.$(id).win)
#else
-tb.GridAdd($(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2], $grid_pos[3])
+self.GridAdd(self.$(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])
#end if</make>
<param>
<name>Type</name>
Modified:
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_numbersink2.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_numbersink2.xml
2008-07-11 01:00:37 UTC (rev 8864)
+++ grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_numbersink2.xml
2008-07-11 06:09:16 UTC (rev 8865)
@@ -10,7 +10,7 @@
<key>wxgui_numbersink2</key>
<import>from gnuradio.wxgui import numbersink2</import>
<make>numbersink2.$(type.fcn)(
- tb.GetWin(),
+ self.GetWin(),
unit=$units,
base_value=$base_value,
minval=$min_value,
@@ -29,12 +29,12 @@
label=$title,
peak_hold=$options.peak_hold,
)
-$(id).set_show_gauge($show_gauge)
+self.$(id).set_show_gauge($show_gauge)
#set $grid_pos = $grid_pos.eval
#if not grid_pos
-tb.Add($(id).win)
+self.Add(self.$(id).win)
#else
-tb.GridAdd($(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2], $grid_pos[3])
+self.GridAdd(self.$(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])
#end if</make>
<param>
<name>Type</name>
Modified: grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_scopesink2.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_scopesink2.xml
2008-07-11 01:00:37 UTC (rev 8864)
+++ grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_scopesink2.xml
2008-07-11 06:09:16 UTC (rev 8865)
@@ -11,7 +11,7 @@
<import>from gnuradio.wxgui import scopesink2</import>
<import>from gnuradio import gr</import>
<make>scopesink2.$(type.fcn)(
- tb.GetWin(),
+ self.GetWin(),
title=$title,
sample_rate=$samp_rate,
frame_decim=$frame_decim,
@@ -23,12 +23,12 @@
t_scale=$t_scale,
num_inputs=$num_inputs,
)
-$(id).win.$(marker)()
+self.$(id).win.$(marker)()
#set $grid_pos = $grid_pos.eval
#if not grid_pos
-tb.Add($(id).win)
+self.Add(self.$(id).win)
#else
-tb.GridAdd($(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2], $grid_pos[3])
+self.GridAdd(self.$(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])
#end if</make>
<!--
$(id).win.info.scopesink.set_trigger_channel($(trigger_channel))
Modified:
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_waterfallsink2.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_waterfallsink2.xml
2008-07-11 01:00:37 UTC (rev 8864)
+++ grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_waterfallsink2.xml
2008-07-11 06:09:16 UTC (rev 8865)
@@ -10,7 +10,7 @@
<key>wxgui_waterfallsink2</key>
<import>from gnuradio.wxgui import waterfallsink2</import>
<make>waterfallsink2.$(type.fcn)(
- tb.GetWin(),
+ self.GetWin(),
baseband_freq=$baseband_freq,
y_per_div=$y_per_div,
ref_level=$ref_level,
@@ -27,9 +27,9 @@
)
#set $grid_pos = $grid_pos.eval
#if not grid_pos
-tb.Add($(id).win)
+self.Add(self.$(id).win)
#else
-tb.GridAdd($(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2], $grid_pos[3])
+self.GridAdd(self.$(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])
#end if</make>
<param>
<name>Type</name>
Modified: grc/trunk/src/grc_gnuradio/blocks/misc/xmlrpc_server.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/misc/xmlrpc_server.xml 2008-07-11
01:00:37 UTC (rev 8864)
+++ grc/trunk/src/grc_gnuradio/blocks/misc/xmlrpc_server.xml 2008-07-11
06:09:16 UTC (rev 8865)
@@ -11,13 +11,8 @@
<import>import SimpleXMLRPCServer</import>
<import>import threading</import>
<make>SimpleXMLRPCServer.SimpleXMLRPCServer(($addr, $port),
allow_none=True)
-$(id).register_function(tb.stop, "run")
-$(id).register_function(tb.start, "start")
-$(id).register_function(tb.stop, "stop")
-$(id).register_function(tb.stop, "wait")
-for key in filter(lambda k: k.startswith("_set_"), globals().keys()):
- $(id).register_function(globals()[key], key[1:])
-threading.Thread(target=$(id).serve_forever).start()</make>
+self.$(id).register_instance(self)
+threading.Thread(target=self.$(id).serve_forever).start()</make>
<param>
<name>Address</name>
<key>addr</key>
Modified: grc/trunk/src/grc_gnuradio/blocks/variables/variable_chooser.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/variables/variable_chooser.xml
2008-07-11 01:00:37 UTC (rev 8864)
+++ grc/trunk/src/grc_gnuradio/blocks/variables/variable_chooser.xml
2008-07-11 06:09:16 UTC (rev 8865)
@@ -10,8 +10,8 @@
<key>variable_chooser</key>
<make>$(choices)[$value_index]
_$(id)_control = grc_wxgui.$(chooser_type)_control(
- window=tb.GetWin(),
- callback=_set_$(id),
+ window=self.GetWin(),
+ callback=self.set_$(id),
#if $label.eval
label=$label,
#else
@@ -23,9 +23,9 @@
)
#set $grid_pos = $grid_pos.eval
#if not grid_pos
-tb.Add(_$(id)_control)
+self.Add(_$(id)_control)
#else
-tb.GridAdd(_$(id)_control, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])
+self.GridAdd(_$(id)_control, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])
#end if</make>
<param>
<name>Label</name>
Modified: grc/trunk/src/grc_gnuradio/blocks/variables/variable_sink.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/variables/variable_sink.xml
2008-07-11 01:00:37 UTC (rev 8864)
+++ grc/trunk/src/grc_gnuradio/blocks/variables/variable_sink.xml
2008-07-11 06:09:16 UTC (rev 8865)
@@ -10,7 +10,7 @@
<key>variable_sink</key>
<import>from grc_gnuradio import blks2 as grc_blks2</import>
<make>grc_blks2.queue_sink_$(type.fcn)($vlen)
-grc_blks2.queue_sink_thread($id, _set_$(variable))</make>
+grc_blks2.queue_sink_thread(self.$id, set_$(variable))</make>
<param>
<name>Type</name>
<key>type</key>
Modified: grc/trunk/src/grc_gnuradio/blocks/variables/variable_slider.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/variables/variable_slider.xml
2008-07-11 01:00:37 UTC (rev 8864)
+++ grc/trunk/src/grc_gnuradio/blocks/variables/variable_slider.xml
2008-07-11 06:09:16 UTC (rev 8865)
@@ -10,8 +10,8 @@
<key>variable_slider</key>
<make>$value
_$(id)_control = grc_wxgui.slider_$(slider_type)_control(
- window=tb.GetWin(),
- callback=_set_$(id),
+ window=self.GetWin(),
+ callback=self.set_$(id),
#if $label.eval
label=$label,
#else
@@ -24,9 +24,9 @@
)
#set $grid_pos = $grid_pos.eval
#if not grid_pos
-tb.Add(_$(id)_control)
+self.Add(_$(id)_control)
#else
-tb.GridAdd(_$(id)_control, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])
+self.GridAdd(_$(id)_control, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])
#end if</make>
<param>
<name>Label</name>
Modified: grc/trunk/src/grc_gnuradio/data/default_flow_graph.grc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/data/default_flow_graph.grc.xml 2008-07-11
01:00:37 UTC (rev 8864)
+++ grc/trunk/src/grc_gnuradio/data/default_flow_graph.grc.xml 2008-07-11
06:09:16 UTC (rev 8865)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!--
+<!--
###################################################
##Default Flow Graph:
## include an options block and a variable for sample rate
@@ -9,9 +9,9 @@
<block>
<key>options</key>
<param>
- <key>id</key>
- <value>options</value>
- </param>
+ <key>id</key>
+ <value>top_block</value>
+ </param>
<param>
<key>gui_coordinate</key>
<value>(10, 10)</value>
@@ -24,13 +24,13 @@
<block>
<key>variable</key>
<param>
- <key>id</key>
+ <key>id</key>
<value>samp_rate</value>
- </param>
+ </param>
<param>
- <key>value</key>
+ <key>value</key>
<value>32000</value>
- </param>
+ </param>
<param>
<key>gui_coordinate</key>
<value>(10, 150)</value>
Modified: grc/trunk/src/grc_gnuradio/data/flow_graph.tmpl
===================================================================
--- grc/trunk/src/grc_gnuradio/data/flow_graph.tmpl 2008-07-11 01:00:37 UTC
(rev 8864)
+++ grc/trunk/src/grc_gnuradio/data/flow_graph.tmpl 2008-07-11 06:09:16 UTC
(rev 8865)
@@ -27,6 +27,8 @@
$imp
#end for
+#set $class_name = $flow_graph.get_option('id')
+#set $var_ids_str = ', '.join(['self'] + [var.get_id() for var in $variables])
#if $gui_type == 'wx_gui'
#import os
#from grc.Constants import MAIN_WINDOW_PREFIX,DATA_DIR
@@ -36,74 +38,92 @@
#if sys.platform == 'cygwin'
#set $WX_APP_ICON = None
#end if
-tb = grc_wxgui.top_block_gui(
- title="$MAIN_WINDOW_PREFIX - Executing:
$flow_graph.get_option('title')",
- icon=$WX_APP_ICON,
-)
+class $(class_name)(grc_wxgui.top_block_gui):
+
+ def __init__($var_ids_str):
+ grc_wxgui.top_block_gui.__init__(
+ self,
+ title="$MAIN_WINDOW_PREFIX - Executing:
$flow_graph.get_option('title')",
+ icon=$WX_APP_ICON,
+ )
#elif $gui_type == 'no_gui'
-tb = gr.top_block()
+class $(class_name)(gr.top_block):
+
+ def __init__($var_ids_str):
+ gr.top_block.__init__(self)
#end if
########################################################
-## Create Callbacks
-########################################################
-$DIVIDER
-# Callbacks
-$DIVIDER
-#for $var in $variables
- #set $id = $var.get_id()
- #set $var_callbacks = filter(lambda c: id in ''.join(c.split('(')[1:]),
$callbacks)
-def _set_$(id)(_$id):
- global $id
- $id = _$id
- #for $callback in $var_callbacks
- $callback
- #end for
-
-#end for
-########################################################
## Create Variables
########################################################
-$DIVIDER
-# Variables
-$DIVIDER
+ $DIVIDER
+ # Variables
+ $DIVIDER
#for $var in $variables
-$("%s = %s"%($var.get_id(), $var.get_make()))
+ self.$var.get_id() = $var.get_id()
+ #set $code = '\n\t\t'.join($var.get_make().splitlines()[1:])
+ #if $code
+ $code
+ #end if
#end for
########################################################
## Create Blocks
########################################################
-$DIVIDER
-# Blocks
-$DIVIDER
+ $DIVIDER
+ # Blocks
+ $DIVIDER
#for $blk in filter(lambda b: b.get_make(), $blocks)
-$("%s = %s"%($blk.get_id(), $blk.get_make()))
+ #set $code = '\n\t\t'.join($blk.get_make().splitlines())
+ $("self.%s = %s"%($blk.get_id(), $code))
#end for
########################################################
## Create Connections
########################################################
-$DIVIDER
-# Connections
-$DIVIDER
+ $DIVIDER
+ # Connections
+ $DIVIDER
#for $con in $connections
#set $source = $con.get_source()
#set $sink = $con.get_sink()
-$("tb.connect((%s, %s), (%s, %s))"%(
- $source.get_parent().get_id(),
- $source.get_key(),
- $sink.get_parent().get_id(),
- $sink.get_key(),
- )
-)
+ $("self.connect((self.%s, %s), (self.%s, %s))"%(
+ $source.get_parent().get_id(),
+ $source.get_key(),
+ $sink.get_parent().get_id(),
+ $sink.get_key(),
+ )
+ )
#end for
+########################################################
+## Create Callbacks
+########################################################
+ $DIVIDER
+ # Callbacks
+ $DIVIDER
+#for $var in $variables
+ #set $id = $var.get_id()
+ #set $var_callbacks = filter(lambda c: id in ''.join(c.split('(')[1:]),
$callbacks)
+ def set_$(id)(self, $id):
+ self.$id = $id
+ #for $callback in $var_callbacks
+ self.$callback
+ #end for
+
+#end for
+if __name__ == '__main__':
+#for $var in $variables
+ #set $code = $var.get_make().splitlines()[0]
+ $var.get_id() = $code
+#end for
+ #set $var_ids_str = ', '.join(["%s=%s"%(var.get_id(), var.get_id()) for
var in $variables])
+ tb = $(class_name)($var_ids_str)
#if $gui_type == 'wx_gui'
-tb.Run()
+ tb.Run()
#elif $gui_type == 'no_gui'
-tb.start()
-raw_input('Press Enter to quit: ')
-tb.stop()
+ tb.start()
+ raw_input('Press Enter to quit: ')
+ tb.stop()
#end if
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8865 - in grc/trunk: examples/audio examples/simple examples/usrp examples/xmlrpc src/grc_gnuradio src/grc_gnuradio/blocks/graphical_sinks src/grc_gnuradio/blocks/misc src/grc_gnuradio/blocks/variables src/grc_gnuradio/data,
jblum <=