1 files changed, 407 insertions, 155 deletions
diff --git a/gr-uhd/examples/grc/uhd_tx_dpsk.grc b/gr-uhd/examples/grc/uhd_tx_dpsk.grc
index 5d57617673..815d87b742 100644
--- a/gr-uhd/examples/grc/uhd_tx_dpsk.grc
+++ b/gr-uhd/examples/grc/uhd_tx_dpsk.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Mon Mar 18 11:11:06 2013</timestamp>
+  <timestamp>Sat Jul 12 14:07:03 2014</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -29,7 +29,7 @@
     </param>
     <param>
       <key>generate_options</key>
-      <value>wx_gui</value>
+      <value>qt_gui</value>
     </param>
     <param>
       <key>category</key>
@@ -52,8 +52,12 @@
       <value></value>
     </param>
     <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(10, 10)</value>
+      <value>(-1, 0)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -75,8 +79,12 @@
       <value>4</value>
     </param>
     <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(10, 100)</value>
+      <value>(-1, 84)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -84,10 +92,10 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
+    <key>parameter</key>
     <param>
       <key>id</key>
-      <value>ampl</value>
+      <value>gain</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -95,43 +103,66 @@
     </param>
     <param>
       <key>label</key>
-      <value>Amplitude</value>
+      <value>Default Gain</value>
     </param>
     <param>
       <key>value</key>
-      <value>.1</value>
+      <value>0</value>
     </param>
     <param>
-      <key>min</key>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>g</value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(589, 0)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>parameter</key>
     <param>
-      <key>max</key>
-      <value>1</value>
+      <key>id</key>
+      <value>freq</value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>100</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
+      <key>label</key>
+      <value>Default Frequency</value>
     </param>
     <param>
-      <key>converver</key>
-      <value>float_converter</value>
+      <key>value</key>
+      <value>2.45e9</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value></value>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>f</value>
     </param>
     <param>
-      <key>notebook</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(7, 299)</value>
+      <value>(433, 1)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -165,8 +196,12 @@
       <value>s</value>
     </param>
     <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(334, 15)</value>
+      <value>(304, 0)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -177,7 +212,7 @@
     <key>parameter</key>
     <param>
       <key>id</key>
-      <value>freq</value>
+      <value>address</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -185,23 +220,27 @@
     </param>
     <param>
       <key>label</key>
-      <value>Default Frequency</value>
+      <value>IP Address</value>
     </param>
     <param>
       <key>value</key>
-      <value>2.45e9</value>
+      <value>addr=192.168.10.2</value>
     </param>
     <param>
       <key>type</key>
-      <value>eng_float</value>
+      <value>string</value>
     </param>
     <param>
       <key>short_id</key>
-      <value>f</value>
+      <value>a</value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(463, 17)</value>
+      <value>(147, 0)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -209,10 +248,10 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
+    <key>variable_qtgui_range</key>
     <param>
       <key>id</key>
-      <value>tun_gain</value>
+      <value>ampl</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -220,43 +259,47 @@
     </param>
     <param>
       <key>label</key>
-      <value>UHD Gain</value>
+      <value>Amplitude</value>
     </param>
     <param>
       <key>value</key>
-      <value>gain</value>
+      <value>0.1</value>
     </param>
     <param>
-      <key>min</key>
+      <key>start</key>
       <value>0</value>
     </param>
     <param>
-      <key>max</key>
-      <value>20</value>
+      <key>stop</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>step</key>
+      <value>0.01</value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>100</value>
+      <key>widget</key>
+      <value>counter_slider</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
+      <key>orient</key>
+      <value>Qt.Horizontal</value>
     </param>
     <param>
-      <key>converver</key>
-      <value>float_converter</value>
+      <key>min_len</key>
+      <value>200</value>
     </param>
     <param>
-      <key>grid_pos</key>
+      <key>gui_hint</key>
       <value></value>
     </param>
     <param>
-      <key>notebook</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(151, 441)</value>
+      <value>(-1, 307)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -264,7 +307,7 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
+    <key>variable_qtgui_range</key>
     <param>
       <key>id</key>
       <value>tun_freq</value>
@@ -275,43 +318,47 @@
     </param>
     <param>
       <key>label</key>
-      <value>Freq (Hz)</value>
+      <value>UHD Freq (Hz)</value>
     </param>
     <param>
       <key>value</key>
-      <value>freq</value>
+      <value>2.45e9</value>
     </param>
     <param>
-      <key>min</key>
+      <key>start</key>
       <value>2.4e9</value>
     </param>
     <param>
-      <key>max</key>
+      <key>stop</key>
       <value>2.5e9</value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>100</value>
+      <key>step</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>widget</key>
+      <value>counter_slider</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
+      <key>orient</key>
+      <value>Qt.Horizontal</value>
     </param>
     <param>
-      <key>converver</key>
-      <value>float_converter</value>
+      <key>min_len</key>
+      <value>200</value>
     </param>
     <param>
-      <key>grid_pos</key>
+      <key>gui_hint</key>
       <value></value>
     </param>
     <param>
-      <key>notebook</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(7, 441)</value>
+      <value>(0, 436)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -319,38 +366,58 @@
     </param>
   </block>
   <block>
-    <key>analog_random_source_x</key>
+    <key>variable_qtgui_range</key>
     <param>
       <key>id</key>
-      <value>analog_random_source_x_0</value>
+      <value>tun_gain</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>byte</value>
+      <key>label</key>
+      <value>UHD Tx Gain</value>
     </param>
     <param>
-      <key>min</key>
+      <key>value</key>
       <value>0</value>
     </param>
     <param>
-      <key>max</key>
-      <value>2**8</value>
+      <key>start</key>
+      <value>0</value>
     </param>
     <param>
-      <key>num_samps</key>
-      <value>1000</value>
+      <key>stop</key>
+      <value>20</value>
     </param>
     <param>
-      <key>repeat</key>
-      <value>True</value>
+      <key>step</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>widget</key>
+      <value>counter_slider</value>
+    </param>
+    <param>
+      <key>orient</key>
+      <value>Qt.Horizontal</value>
+    </param>
+    <param>
+      <key>min_len</key>
+      <value>200</value>
+    </param>
+    <param>
+      <key>gui_hint</key>
+      <value></value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(177, 162)</value>
+      <value>(137, 435)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -358,10 +425,10 @@
     </param>
   </block>
   <block>
-    <key>digital_dxpsk_mod</key>
+    <key>analog_random_source_x</key>
     <param>
       <key>id</key>
-      <value>digital_dxpsk_mod_0</value>
+      <value>analog_random_source_x_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -369,31 +436,43 @@
     </param>
     <param>
       <key>type</key>
-      <value>dqpsk</value>
+      <value>byte</value>
     </param>
     <param>
-      <key>samples_per_symbol</key>
-      <value>samps_per_sym</value>
+      <key>min</key>
+      <value>0</value>
     </param>
     <param>
-      <key>excess_bw</key>
-      <value>0.35</value>
+      <key>max</key>
+      <value>2**8</value>
     </param>
     <param>
-      <key>mod_code</key>
-      <value>"gray"</value>
+      <key>num_samps</key>
+      <value>1000</value>
     </param>
     <param>
-      <key>verbose</key>
-      <value>False</value>
+      <key>repeat</key>
+      <value>True</value>
     </param>
     <param>
-      <key>log</key>
-      <value>False</value>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(366, 162)</value>
+      <value>(-1, 171)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -401,69 +480,58 @@
     </param>
   </block>
   <block>
-    <key>parameter</key>
+    <key>digital_dxpsk_mod</key>
     <param>
       <key>id</key>
-      <value>gain</value>
+      <value>digital_dxpsk_mod_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>Default Gain</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>0</value>
-    </param>
-    <param>
       <key>type</key>
-      <value>eng_float</value>
+      <value>dqpsk</value>
     </param>
     <param>
-      <key>short_id</key>
-      <value>g</value>
+      <key>samples_per_symbol</key>
+      <value>samps_per_sym</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(619, 15)</value>
+      <key>excess_bw</key>
+      <value>0.35</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>mod_code</key>
+      <value>"gray"</value>
     </param>
-  </block>
-  <block>
-    <key>parameter</key>
     <param>
-      <key>id</key>
-      <value>address</value>
+      <key>verbose</key>
+      <value>False</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>log</key>
+      <value>False</value>
     </param>
     <param>
-      <key>label</key>
-      <value>IP Address</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>value</key>
-      <value>addr=192.168.10.2</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>type</key>
-      <value>string</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>short_id</key>
-      <value>a</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(177, 14)</value>
+      <value>(190, 171)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -493,10 +561,18 @@
       <value></value>
     </param>
     <param>
+      <key>stream_chans</key>
+      <value>[]</value>
+    </param>
+    <param>
       <key>dev_addr</key>
       <value>address</value>
     </param>
     <param>
+      <key>dev_args</key>
+      <value>""</value>
+    </param>
+    <param>
       <key>sync</key>
       <value></value>
     </param>
@@ -1125,8 +1201,20 @@
       <value>0</value>
     </param>
     <param>
+      <key>len_tag_name</key>
+      <value></value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(783, 162)</value>
+      <value>(617, 163)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1156,8 +1244,24 @@
       <value>1</value>
     </param>
     <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(566, 186)</value>
+      <value>(388, 193)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1165,10 +1269,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_fftsink2</key>
+    <key>qtgui_freq_sink_x</key>
     <param>
       <key>id</key>
-      <value>wxgui_fftsink2_0</value>
+      <value>qtgui_freq_sink_x_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1179,76 +1283,224 @@
       <value>complex</value>
     </param>
     <param>
-      <key>title</key>
+      <key>name</key>
       <value>Transmit Spectrum</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
+      <key>fftsize</key>
+      <value>1024</value>
     </param>
     <param>
-      <key>baseband_freq</key>
+      <key>wintype</key>
+      <value>firdes.WIN_BLACKMAN_hARRIS</value>
+    </param>
+    <param>
+      <key>fc</key>
       <value>tun_freq</value>
     </param>
     <param>
-      <key>y_per_div</key>
-      <value>10</value>
+      <key>bw</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>autoscale</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>average</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>y_divs</key>
+      <key>ymin</key>
+      <value>-140</value>
+    </param>
+    <param>
+      <key>ymax</key>
       <value>10</value>
     </param>
     <param>
-      <key>ref_level</key>
-      <value>0</value>
+      <key>nconnections</key>
+      <value>1</value>
     </param>
     <param>
-      <key>ref_scale</key>
-      <value>2</value>
+      <key>update_time</key>
+      <value>0.10</value>
     </param>
     <param>
-      <key>fft_size</key>
-      <value>1024</value>
+      <key>gui_hint</key>
+      <value></value>
     </param>
     <param>
-      <key>fft_rate</key>
-      <value>20</value>
+      <key>label1</key>
+      <value></value>
     </param>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>width1</key>
+      <value>1</value>
     </param>
     <param>
-      <key>average</key>
-      <value>False</value>
+      <key>color1</key>
+      <value>"blue"</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0</value>
+      <key>alpha1</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>label2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>width2</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>color2</key>
+      <value>"red"</value>
     </param>
     <param>
-      <key>win</key>
-      <value>None</value>
+      <key>alpha2</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>win_size</key>
+      <key>label3</key>
       <value></value>
     </param>
     <param>
-      <key>grid_pos</key>
+      <key>width3</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>color3</key>
+      <value>"green"</value>
+    </param>
+    <param>
+      <key>alpha3</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>label4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>width4</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>color4</key>
+      <value>"black"</value>
+    </param>
+    <param>
+      <key>alpha4</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>label5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>width5</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>color5</key>
+      <value>"cyan"</value>
+    </param>
+    <param>
+      <key>alpha5</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>label6</key>
       <value></value>
     </param>
     <param>
-      <key>notebook</key>
+      <key>width6</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>color6</key>
+      <value>"magenta"</value>
+    </param>
+    <param>
+      <key>alpha6</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>label7</key>
       <value></value>
     </param>
     <param>
-      <key>freqvar</key>
-      <value>None</value>
+      <key>width7</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>color7</key>
+      <value>"yellow"</value>
+    </param>
+    <param>
+      <key>alpha7</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>label8</key>
+      <value></value>
+    </param>
+    <param>
+      <key>width8</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>color8</key>
+      <value>"dark red"</value>
+    </param>
+    <param>
+      <key>alpha8</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>label9</key>
+      <value></value>
+    </param>
+    <param>
+      <key>width9</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>color9</key>
+      <value>"dark green"</value>
+    </param>
+    <param>
+      <key>alpha9</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>label10</key>
+      <value></value>
+    </param>
+    <param>
+      <key>width10</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>color10</key>
+      <value>"dark blue"</value>
+    </param>
+    <param>
+      <key>alpha10</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(827, 299)</value>
+      <value>(619, 285)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1263,19 +1515,19 @@
   </connection>
   <connection>
     <source_block_id>blocks_multiply_const_vxx_0</source_block_id>
-    <sink_block_id>wxgui_fftsink2_0</sink_block_id>
+    <sink_block_id>uhd_usrp_sink_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_multiply_const_vxx_0</source_block_id>
-    <sink_block_id>uhd_usrp_sink_0</sink_block_id>
+    <source_block_id>digital_dxpsk_mod_0</source_block_id>
+    <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_dxpsk_mod_0</source_block_id>
-    <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id>
+    <source_block_id>blocks_multiply_const_vxx_0</source_block_id>
+    <sink_block_id>qtgui_freq_sink_x_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>