1 files changed, 254 insertions, 164 deletions
diff --git a/grc/examples/demod/mpsk_demod.grc b/grc/examples/demod/mpsk_demod.grc
index d93591e13..08108dcba 100644
--- a/grc/examples/demod/mpsk_demod.grc
+++ b/grc/examples/demod/mpsk_demod.grc
@@ -1,6 +1,61 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Mon Oct  5 18:26:32 2009</timestamp>
+  <timestamp>Mon Oct  5 18:34:52 2009</timestamp>
+  <block>
+    <key>options</key>
+    <param>
+      <key>id</key>
+      <value>mpsk_demod</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>MPSK Demod Demo</value>
+    </param>
+    <param>
+      <key>author</key>
+      <value></value>
+    </param>
+    <param>
+      <key>description</key>
+      <value></value>
+    </param>
+    <param>
+      <key>window_size</key>
+      <value>1280, 1024</value>
+    </param>
+    <param>
+      <key>generate_options</key>
+      <value>wx_gui</value>
+    </param>
+    <param>
+      <key>category</key>
+      <value>Custom</value>
+    </param>
+    <param>
+      <key>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>realtime_scheduling</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(10, 10)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
   <block>
     <key>variable</key>
     <param>
@@ -64,74 +119,96 @@
     </param>
   </block>
   <block>
-    <key>wxgui_constellationsink2</key>
+    <key>blks2_dxpsk_mod</key>
     <param>
       <key>id</key>
-      <value>wxgui_constellationsink2_0</value>
+      <value>blks2_dxpsk_mod_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>title</key>
-      <value>Constellation Plot</value>
+      <key>type</key>
+      <value>dqpsk</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
+      <key>samples_per_symbol</key>
+      <value>samps_per_sym</value>
     </param>
     <param>
-      <key>frame_rate</key>
-      <value>5</value>
+      <key>excess_bw</key>
+      <value>0.35</value>
     </param>
     <param>
-      <key>const_size</key>
-      <value>2048</value>
+      <key>gray_code</key>
+      <value>True</value>
     </param>
     <param>
-      <key>M</key>
-      <value>4</value>
+      <key>verbose</key>
+      <value>False</value>
     </param>
     <param>
-      <key>theta</key>
+      <key>log</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(391, 54)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>gr_throttle</key>
     <param>
-      <key>alpha</key>
-      <value>0.005</value>
+      <key>id</key>
+      <value>gr_throttle_0</value>
     </param>
     <param>
-      <key>fmax</key>
-      <value>0.06</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>mu</key>
-      <value>0.5</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>gain_mu</key>
-      <value>0.005</value>
+      <key>samples_per_second</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>symbol_rate</key>
-      <value>samp_rate/4.</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>omega_limit</key>
-      <value>0.005</value>
+      <key>_coordinate</key>
+      <value>(654, 142)</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value></value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>id</key>
+      <value>samps_per_sym</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(824, 212)</value>
+      <value>(7, 89)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -139,66 +216,81 @@
     </param>
   </block>
   <block>
-    <key>wxgui_fftsink2</key>
+    <key>gr_channel_model</key>
     <param>
       <key>id</key>
-      <value>wxgui_fftsink2_0</value>
+      <value>gr_channel_model_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>noise_voltage</key>
+      <value>noise</value>
     </param>
     <param>
-      <key>title</key>
-      <value>FFT Plot</value>
+      <key>freq_offset</key>
+      <value>freq_off</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
+      <key>epsilon</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>baseband_freq</key>
+      <key>taps</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>seed</key>
+      <value>42</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(487, 282)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
     <param>
-      <key>y_per_div</key>
-      <value>10</value>
+      <key>id</key>
+      <value>noise</value>
     </param>
     <param>
-      <key>y_divs</key>
-      <value>10</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>ref_level</key>
-      <value>50</value>
+      <key>label</key>
+      <value>Noise</value>
     </param>
     <param>
-      <key>ref_scale</key>
-      <value>2.0</value>
+      <key>value</key>
+      <value>.1</value>
     </param>
     <param>
-      <key>fft_size</key>
-      <value>1024</value>
+      <key>min</key>
+      <value>0</value>
     </param>
     <param>
-      <key>fft_rate</key>
-      <value>30</value>
+      <key>max</key>
+      <value>1</value>
     </param>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>num_steps</key>
+      <value>100</value>
     </param>
     <param>
-      <key>average</key>
-      <value>False</value>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0</value>
+      <key>converver</key>
+      <value>float_converter</value>
     </param>
     <param>
       <key>grid_pos</key>
@@ -210,7 +302,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(847, 10)</value>
+      <value>(259, 353)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -218,65 +310,54 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>samps_per_sym</value>
+      <value>freq_off</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>4</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(10, 278)</value>
+      <key>label</key>
+      <value>Freq Offset</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>value</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>blks2_dxpsk_mod</key>
-    <param>
-      <key>id</key>
-      <value>blks2_dxpsk_mod_0</value>
-    </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>min</key>
+      <value>-.5</value>
     </param>
     <param>
-      <key>type</key>
-      <value>dqpsk</value>
+      <key>max</key>
+      <value>.5</value>
     </param>
     <param>
-      <key>samples_per_symbol</key>
-      <value>samps_per_sym</value>
+      <key>num_steps</key>
+      <value>1000</value>
     </param>
     <param>
-      <key>excess_bw</key>
-      <value>0.35</value>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
     </param>
     <param>
-      <key>gray_code</key>
-      <value>True</value>
+      <key>converver</key>
+      <value>float_converter</value>
     </param>
     <param>
-      <key>verbose</key>
-      <value>False</value>
+      <key>grid_pos</key>
+      <value></value>
     </param>
     <param>
-      <key>log</key>
-      <value>False</value>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(391, 54)</value>
+      <value>(126, 345)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -284,30 +365,34 @@
     </param>
   </block>
   <block>
-    <key>gr_throttle</key>
+    <key>notebook</key>
     <param>
       <key>id</key>
-      <value>gr_throttle_0</value>
+      <value>notebook</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>style</key>
+      <value>wx.NB_TOP</value>
     </param>
     <param>
-      <key>samples_per_second</key>
-      <value>samp_rate</value>
+      <key>labels</key>
+      <value>['Constellation', 'Spectrum']</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(654, 142)</value>
+      <value>(520, 407)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -315,81 +400,62 @@
     </param>
   </block>
   <block>
-    <key>gr_channel_model</key>
+    <key>wxgui_constellationsink2</key>
     <param>
       <key>id</key>
-      <value>gr_channel_model_0</value>
+      <value>wxgui_constellationsink2_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>noise_voltage</key>
-      <value>noise</value>
-    </param>
-    <param>
-      <key>freq_offset</key>
-      <value>0.0</value>
+      <key>title</key>
+      <value>Constellation Plot</value>
     </param>
     <param>
-      <key>epsilon</key>
-      <value>1.0</value>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>taps</key>
-      <value>1.0</value>
+      <key>frame_rate</key>
+      <value>5</value>
     </param>
     <param>
-      <key>seed</key>
-      <value>42</value>
+      <key>const_size</key>
+      <value>2048</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(487, 282)</value>
+      <key>M</key>
+      <value>4</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>theta</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
     <param>
-      <key>id</key>
-      <value>noise</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value></value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>.1</value>
+      <key>alpha</key>
+      <value>0.005</value>
     </param>
     <param>
-      <key>min</key>
-      <value>0</value>
+      <key>fmax</key>
+      <value>0.06</value>
     </param>
     <param>
-      <key>max</key>
-      <value>1</value>
+      <key>mu</key>
+      <value>0.5</value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>100</value>
+      <key>gain_mu</key>
+      <value>0.005</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
+      <key>symbol_rate</key>
+      <value>samp_rate/4.</value>
     </param>
     <param>
-      <key>converver</key>
-      <value>float_converter</value>
+      <key>omega_limit</key>
+      <value>0.005</value>
     </param>
     <param>
       <key>grid_pos</key>
@@ -397,11 +463,11 @@
     </param>
     <param>
       <key>notebook</key>
-      <value></value>
+      <value>notebook, 0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(234, 324)</value>
+      <value>(824, 212)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -409,54 +475,78 @@
     </param>
   </block>
   <block>
-    <key>options</key>
+    <key>wxgui_fftsink2</key>
     <param>
       <key>id</key>
-      <value>mpsk_demod</value>
+      <value>wxgui_fftsink2_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
       <key>title</key>
-      <value>MPSK Demod Demo</value>
+      <value>FFT Plot</value>
     </param>
     <param>
-      <key>author</key>
-      <value></value>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>description</key>
-      <value></value>
+      <key>baseband_freq</key>
+      <value>0</value>
     </param>
     <param>
-      <key>window_size</key>
-      <value>1280, 1024</value>
+      <key>y_per_div</key>
+      <value>10</value>
     </param>
     <param>
-      <key>generate_options</key>
-      <value>wx_gui</value>
+      <key>y_divs</key>
+      <value>10</value>
     </param>
     <param>
-      <key>category</key>
-      <value>Custom</value>
+      <key>ref_level</key>
+      <value>50</value>
     </param>
     <param>
-      <key>run_options</key>
-      <value>prompt</value>
+      <key>ref_scale</key>
+      <value>2.0</value>
     </param>
     <param>
-      <key>run</key>
-      <value>True</value>
+      <key>fft_size</key>
+      <value>1024</value>
     </param>
     <param>
-      <key>realtime_scheduling</key>
+      <key>fft_rate</key>
+      <value>30</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>average</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>avg_alpha</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
       <value></value>
     </param>
     <param>
+      <key>notebook</key>
+      <value>notebook, 1</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(10, 10)</value>
+      <value>(847, 10)</value>
     </param>
     <param>
       <key>_rotation</key>