Merged grc developer branch r10679:10938

Misc fixes and internal changes.
Added help menu for usage tips.
Added drag and drop for blocks.
Removed callback controls, adopted forms.
Any type can have enumerated options.



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10941 221aa14e-8319-0410-a670-987f0aec2ac5

1 files changed, 74 insertions, 59 deletions

diff --git a/grc/examples/usrp/usrp2_fft.grc b/grc/examples/usrp/usrp2_fft.grc
index e7e93b3ff..134bd4614 100644
--- a/grc/examples/usrp/usrp2_fft.grc
+++ b/grc/examples/usrp/usrp2_fft.grc
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Fri Jan 23 11:38:11 2009</timestamp>
+  <timestamp>Wed Apr 15 17:30:20 2009</timestamp>
   <block>
     <key>options</key>
     <param>
       <key>id</key>
-      <value>top_block</value>
+      <value>usrp2_fft</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -13,7 +13,7 @@
     </param>
     <param>
       <key>title</key>
-      <value>USRP2 FFT</value>
+      <value>USRP2 FFT Plotter</value>
     </param>
     <param>
       <key>author</key>
@@ -21,7 +21,7 @@
     </param>
     <param>
       <key>description</key>
-      <value>FFT of Spectrum</value>
+      <value>FFT waveform plot</value>
     </param>
     <param>
       <key>window_size</key>
@@ -36,6 +36,10 @@
       <value>Custom</value>
     </param>
     <param>
+      <key>realtime_scheduling</key>
+      <value></value>
+    </param>
+    <param>
       <key>_coordinate</key>
       <value>(10, 10)</value>
     </param>
@@ -48,6 +52,29 @@
     <key>variable</key>
     <param>
       <key>id</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>100e6/decim</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(10, 170)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
       <value>decim</value>
     </param>
     <param>
@@ -56,11 +83,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>4</value>
+      <value>16</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(35, 149)</value>
+      <value>(24, 267)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -68,50 +95,50 @@
     </param>
   </block>
   <block>
-    <key>usrp2_source_xxxx</key>
+    <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>usrp2_source_xxxx_0</value>
+      <value>tun_freq</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>label</key>
+      <value>USRP2 Freq (Hz)</value>
     </param>
     <param>
-      <key>interface</key>
-      <value></value>
+      <key>value</key>
+      <value>2.45e9</value>
     </param>
     <param>
-      <key>mac_addr</key>
-      <value></value>
+      <key>min</key>
+      <value>2.4e9</value>
     </param>
     <param>
-      <key>frequency</key>
-      <value>freq</value>
+      <key>max</key>
+      <value>2.5e9</value>
     </param>
     <param>
-      <key>decimation</key>
-      <value>decim</value>
+      <key>num_steps</key>
+      <value>100</value>
     </param>
     <param>
-      <key>gain</key>
-      <value>0</value>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
     </param>
     <param>
-      <key>auto_tr</key>
-      <value></value>
+      <key>converver</key>
+      <value>float_converter</value>
     </param>
     <param>
-      <key>rx_ant</key>
+      <key>grid_pos</key>
       <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(177, 271)</value>
+      <value>(32, 365)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -138,23 +165,19 @@
     </param>
     <param>
       <key>samp_rate</key>
-      <value>100e6/decim</value>
+      <value>samp_rate</value>
     </param>
     <param>
       <key>baseband_freq</key>
-      <value>freq</value>
+      <value>tun_freq</value>
     </param>
     <param>
       <key>y_per_div</key>
       <value>10</value>
     </param>
     <param>
-      <key>y_divs</key>
-      <value>12</value>
-    </param>
-    <param>
       <key>ref_level</key>
-      <value>20</value>
+      <value>10</value>
     </param>
     <param>
       <key>fft_size</key>
@@ -165,16 +188,16 @@
       <value>30</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0</value>
+      <key>peak_hold</key>
+      <value>False</value>
     </param>
     <param>
       <key>average</key>
       <value>False</value>
     </param>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>avg_alpha</key>
+      <value>0</value>
     </param>
     <param>
       <key>grid_pos</key>
@@ -182,7 +205,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(384, 72)</value>
+      <value>(466, 100)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -190,50 +213,42 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
+    <key>usrp2_source_xxxx</key>
     <param>
       <key>id</key>
-      <value>freq</value>
+      <value>usrp2_source_xxxx_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>Frequency (Hz)</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>-100e6</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>max</key>
-      <value>100e6</value>
+      <key>interface</key>
+      <value></value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>100</value>
+      <key>mac_addr</key>
+      <value></value>
     </param>
     <param>
-      <key>slider_length</key>
-      <value>200</value>
+      <key>decimation</key>
+      <value>decim</value>
     </param>
     <param>
-      <key>slider_type</key>
-      <value>horizontal</value>
+      <key>frequency</key>
+      <value>tun_freq</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value></value>
+      <key>gain</key>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(139, 129)</value>
+      <value>(211, 200)</value>
     </param>
     <param>
       <key>_rotation</key>