[Commit-gnuradio] r8697 - in grc/trunk: examples/usrp src/grc_gnuradio

[jblum]

Author: jblum
Date: 2008-06-25 11:52:01 -0600 (Wed, 25 Jun 2008)
New Revision: 8697

Added:
   grc/trunk/examples/usrp/usrp_two_tone_loopback.grc.xml
Modified:
   grc/trunk/src/grc_gnuradio/FlowGraph.py
   grc/trunk/src/grc_gnuradio/Param.py
Log:
loopback example, and change in eval

Added: grc/trunk/examples/usrp/usrp_two_tone_loopback.grc.xml
===================================================================
--- grc/trunk/examples/usrp/usrp_two_tone_loopback.grc.xml                      
        (rev 0)
+++ grc/trunk/examples/usrp/usrp_two_tone_loopback.grc.xml      2008-06-25 
17:52:01 UTC (rev 8697)
@@ -0,0 +1,611 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+  <timestamp>Wed Jun 25 10:49:20 2008</timestamp>
+  <block>
+    <key>options</key>
+    <param>
+      <key>id</key>
+      <value>options</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>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>64e6/200</value>
+    </param>
+    <param>
+      <key>gui_coordinate</key>
+      <value>(10, 150)</value>
+    </param>
+    <param>
+      <key>gui_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>usrp_simple_source_x</key>
+    <param>
+      <key>id</key>
+      <value>usrp_simple_source_x</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>number</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>subdev_spec</key>
+      <value>None</value>
+    </param>
+    <param>
+      <key>frequency</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>decimation</key>
+      <value>200</value>
+    </param>
+    <param>
+      <key>gain</key>
+      <value>20</value>
+    </param>
+    <param>
+      <key>mux</key>
+      <value>0x0</value>
+    </param>
+    <param>
+      <key>auto_tr</key>
+      <value>None</value>
+    </param>
+    <param>
+      <key>rx_ant</key>
+      <value>None</value>
+    </param>
+    <param>
+      <key>gui_coordinate</key>
+      <value>(578, 319)</value>
+    </param>
+    <param>
+      <key>gui_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>int(100e6)</value>
+    </param>
+    <param>
+      <key>gui_coordinate</key>
+      <value>(109, 151)</value>
+    </param>
+    <param>
+      <key>gui_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_fftsink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_fftsink2</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>FFT Plot</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>baseband_freq</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>y_per_div</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>y_divs</key>
+      <value>8</value>
+    </param>
+    <param>
+      <key>ref_level</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>fft_size</key>
+      <value>512*2</value>
+    </param>
+    <param>
+      <key>fft_rate</key>
+      <value>15</value>
+    </param>
+    <param>
+      <key>avg_alpha</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>average</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>1, 2, 2, 4</value>
+    </param>
+    <param>
+      <key>gui_coordinate</key>
+      <value>(845, 228)</value>
+    </param>
+    <param>
+      <key>gui_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tone2</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Tone 2</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>75e3</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>150000</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>slider_type</key>
+      <value>horizontal</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>0, 4, 1, 2</value>
+    </param>
+    <param>
+      <key>gui_coordinate</key>
+      <value>(397, 478)</value>
+    </param>
+    <param>
+      <key>gui_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tone1</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Tone 1</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>50e3</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>150000</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <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>
+    <param>
+      <key>gui_coordinate</key>
+      <value>(220, 475)</value>
+    </param>
+    <param>
+      <key>gui_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>noise_ampl</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Noise Ampl</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>2000</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>5000</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>slider_type</key>
+      <value>vertical</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>1, 1, 2, 1</value>
+    </param>
+    <param>
+      <key>gui_coordinate</key>
+      <value>(20, 243)</value>
+    </param>
+    <param>
+      <key>gui_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tone_ampl</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Tone Ampl</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>5000</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>5000</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>slider_type</key>
+      <value>vertical</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>1, 0, 2, 1</value>
+    </param>
+    <param>
+      <key>gui_coordinate</key>
+      <value>(21, 422)</value>
+    </param>
+    <param>
+      <key>gui_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>usrp_simple_sink_x</key>
+    <param>
+      <key>id</key>
+      <value>usrp_simple_sink_x</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>number</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>subdev_spec</key>
+      <value>None</value>
+    </param>
+    <param>
+      <key>frequency</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>interpolation</key>
+      <value>400</value>
+    </param>
+    <param>
+      <key>gain</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>mux</key>
+      <value>0x0</value>
+    </param>
+    <param>
+      <key>auto_tr</key>
+      <value>None</value>
+    </param>
+    <param>
+      <key>tx_enb</key>
+      <value>None</value>
+    </param>
+    <param>
+      <key>gui_coordinate</key>
+      <value>(835, 5)</value>
+    </param>
+    <param>
+      <key>gui_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_float_to_complex</key>
+    <param>
+      <key>id</key>
+      <value>gr_float_to_complex</value>
+    </param>
+    <param>
+      <key>gui_coordinate</key>
+      <value>(634, 226)</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>
+    <param>
+      <key>num_inputs</key>
+      <value>3</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>gui_coordinate</key>
+      <value>(528, 78)</value>
+    </param>
+    <param>
+      <key>gui_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_sig_source_x</key>
+    <param>
+      <key>id</key>
+      <value>gr_sig_source_x</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>waveform</key>
+      <value>gr.GR_COS_WAVE</value>
+    </param>
+    <param>
+      <key>freq</key>
+      <value>tone1</value>
+    </param>
+    <param>
+      <key>amp</key>
+      <value>tone_ampl</value>
+    </param>
+    <param>
+      <key>offset</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gui_coordinate</key>
+      <value>(258, 20)</value>
+    </param>
+    <param>
+      <key>gui_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_sig_source_x</key>
+    <param>
+      <key>id</key>
+      <value>gr_sig_source_x0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>waveform</key>
+      <value>gr.GR_COS_WAVE</value>
+    </param>
+    <param>
+      <key>freq</key>
+      <value>tone2</value>
+    </param>
+    <param>
+      <key>amp</key>
+      <value>tone_ampl</value>
+    </param>
+    <param>
+      <key>offset</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gui_coordinate</key>
+      <value>(255, 179)</value>
+    </param>
+    <param>
+      <key>gui_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_noise_source_x</key>
+    <param>
+      <key>id</key>
+      <value>gr_noise_source_x</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>noise_type</key>
+      <value>gr.GR_GAUSSIAN</value>
+    </param>
+    <param>
+      <key>amp</key>
+      <value>noise_ampl</value>
+    </param>
+    <param>
+      <key>seed</key>
+      <value>42</value>
+    </param>
+    <param>
+      <key>gui_coordinate</key>
+      <value>(257, 337)</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>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_sig_source_x0</source_block_id>
+    <sink_block_id>gr_add_vxx</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_noise_source_x</source_block_id>
+    <sink_block_id>gr_add_vxx</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>2</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>usrp_simple_source_x</source_block_id>
+    <sink_block_id>wxgui_fftsink2</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_float_to_complex</source_block_id>
+    <sink_block_id>usrp_simple_sink_x</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_add_vxx</source_block_id>
+    <sink_block_id>gr_float_to_complex</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_add_vxx</source_block_id>
+    <sink_block_id>gr_float_to_complex</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+</flow_graph>
\ No newline at end of file

Modified: grc/trunk/src/grc_gnuradio/FlowGraph.py
===================================================================
--- grc/trunk/src/grc_gnuradio/FlowGraph.py     2008-06-25 03:34:35 UTC (rev 
8696)
+++ grc/trunk/src/grc_gnuradio/FlowGraph.py     2008-06-25 17:52:01 UTC (rev 
8697)
@@ -54,10 +54,11 @@
                if self.is_flagged():
                        self.deflag()
                        #reload namespace
-                       self.n = n = dict() #namespace
+                       n_imp = dict()
+                       n_var = dict()
                        #load imports
                        for imp in self.get_imports():
-                               try: exec imp in n
+                               try: exec imp in n_imp
                                except: pass
                        #load variables
                        for variable in self.get_variables():
@@ -65,11 +66,14 @@
                                        if variable.get_key() == 
'variable_chooser':
                                                choices = 
variable.get_param('choices').to_code()
                                                value_index = 
variable.get_param('value_index').to_code()
-                                               e = eval("%s[%s]"%(choices, 
value_index), n, n)                                         
+                                               e = eval("%s[%s]"%(choices, 
value_index), n_imp, n_imp)                                         
                                        else:
-                                               e = 
eval(variable.get_param('value').to_code(), n, n)
-                                       n[variable.get_id()] = e
+                                               e = 
eval(variable.get_param('value').to_code(), n_imp, n_imp)
+                                       n_var[variable.get_id()] = e
                                except: pass
+                       #merge variable and import namespace
+                       n_imp.update(n_var)
+                       self.n = n_imp
                #evaluate
                e = eval(expr, self.n, self.n)
                return e

Modified: grc/trunk/src/grc_gnuradio/Param.py
===================================================================
--- grc/trunk/src/grc_gnuradio/Param.py 2008-06-25 03:34:35 UTC (rev 8696)
+++ grc/trunk/src/grc_gnuradio/Param.py 2008-06-25 17:52:01 UTC (rev 8697)
@@ -228,12 +228,12 @@
                """                                     
                v = self.get_value()
                t = self.get_type()
-               if t in ('string', 'file_open', 'file_save'): 
+               if t in ('string', 'file_open', 'file_save'): #string types
                        if self._stringify_flag:
                                return '"%s"'%v.replace('"', '\"')
                        else:
                                return v
-               elif t in ('complex_vector', 'real_vector', 'int_vector'): 
+               elif t in ('complex_vector', 'real_vector', 'int_vector'): 
#vector types
                        if self._lisitify_flag:
                                return '(%s, )'%v
                        else: