1 files changed, 703 insertions, 531 deletions
diff --git a/gr-trellis/examples/grc/tcm.grc b/gr-trellis/examples/grc/tcm.grc
index 451d940962..9e2b57c8ff 100644
--- a/gr-trellis/examples/grc/tcm.grc
+++ b/gr-trellis/examples/grc/tcm.grc
@@ -1,384 +1,510 @@
-<?xml version='1.0' encoding='ASCII'?>
-<?grc format='1' created='3.7.6'?>
+<?xml version='1.0' encoding='utf-8'?>
+<?grc format='1' created='3.7.11'?>
 <flow_graph>
   <timestamp>Wed Oct  1 11:04:18 2014</timestamp>
   <block>
     <key>options</key>
     <param>
-      <key>id</key>
-      <value>tcm</value>
+      <key>author</key>
+      <value>AA</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>window_size</key>
+      <value>2048, 2048</value>
     </param>
     <param>
-      <key>title</key>
-      <value>Trellis Coded Modulation</value>
+      <key>category</key>
+      <value>Custom</value>
     </param>
     <param>
-      <key>author</key>
-      <value>AA</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
       <key>description</key>
       <value>gnuradio flow graph</value>
     </param>
     <param>
-      <key>window_size</key>
-      <value>2048, 2048</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>generate_options</key>
-      <value>wx_gui</value>
+      <key>_coordinate</key>
+      <value>(0, 4)</value>
     </param>
     <param>
-      <key>category</key>
-      <value>Custom</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>run_options</key>
-      <value>prompt</value>
+      <key>generate_options</key>
+      <value>qt_gui</value>
     </param>
     <param>
-      <key>run</key>
-      <value>True</value>
+      <key>hier_block_src_path</key>
+      <value>.:</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>tcm</value>
     </param>
     <param>
       <key>max_nouts</key>
       <value>0</value>
     </param>
     <param>
-      <key>realtime_scheduling</key>
+      <key>qt_qss_theme</key>
       <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <key>realtime_scheduling</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(10, 10)</value>
+      <key>run_command</key>
+      <value>{python} -u {filename}</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>thread_safe_setters</key>
+      <value></value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>Trellis Coded Modulation</value>
     </param>
   </block>
   <block>
     <key>variable</key>
     <param>
-      <key>id</key>
-      <value>prefix</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
+      <key>_coordinate</key>
+      <value>(472, 4)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>Es</value>
+    </param>
+    <param>
       <key>value</key>
-      <value>"@FSM_FILE_INSTALL_DIR@"</value>
+      <value>sum(numpy.square(numpy.abs(constellation)))/(len(constellation)/(1.0*dim))</value>
     </param>
+  </block>
+  <block>
+    <key>variable_qtgui_range</key>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
+      <key>value</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>1</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(320, 13)</value>
+      <value>(552, 4)</value>
+    </param>
+    <param>
+      <key>gui_hint</key>
+      <value></value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>variable</key>
     <param>
       <key>id</key>
-      <value>dim</value>
+      <value>EsN0_dB</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>label</key>
+      <value>Es/N0 (dB)</value>
     </param>
     <param>
-      <key>value</key>
-      <value>mod[0]</value>
+      <key>min_len</key>
+      <value>200</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>orient</key>
+      <value>Qt.Horizontal</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(464, 229)</value>
+      <key>start</key>
+      <value>-10</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>step</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>stop</key>
+      <value>20</value>
+    </param>
+    <param>
+      <key>rangeType</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>widget</key>
+      <value>counter_slider</value>
     </param>
   </block>
   <block>
     <key>variable</key>
     <param>
-      <key>id</key>
-      <value>constellation</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>mod[1]</value>
+      <key>_coordinate</key>
+      <value>(176, 68)</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(312, 229)</value>
+      <key>id</key>
+      <value>R</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>value</key>
+      <value>100e3</value>
     </param>
   </block>
   <block>
     <key>variable</key>
     <param>
-      <key>id</key>
-      <value>mod</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>fu.psk4</value>
+      <key>_coordinate</key>
+      <value>(176, 4)</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(336, 157)</value>
+      <key>id</key>
+      <value>block</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>value</key>
+      <value>500*16</value>
     </param>
   </block>
   <block>
     <key>variable</key>
     <param>
-      <key>id</key>
-      <value>fsm</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>"awgn1o2_4.fsm"</value>
+      <key>_coordinate</key>
+      <value>(272, 196)</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(320, 77)</value>
+      <key>id</key>
+      <value>constellation</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>value</key>
+      <value>mod[1]</value>
     </param>
   </block>
   <block>
     <key>variable</key>
     <param>
-      <key>id</key>
-      <value>R</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>100e3</value>
+      <key>_coordinate</key>
+      <value>(472, 68)</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(216, 109)</value>
+      <key>id</key>
+      <value>dim</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>value</key>
+      <value>mod[0]</value>
     </param>
   </block>
   <block>
     <key>variable</key>
     <param>
-      <key>id</key>
-      <value>noisevar</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
+      <key>_coordinate</key>
+      <value>(272, 68)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>fsm</value>
+    </param>
+    <param>
       <key>value</key>
-      <value>10**(-EsN0_dB/10.0)  * Es   /2.0</value>
+      <value>"awgn1o2_4.fsm"</value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(728, 157)</value>
+      <value>(272, 132)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
+    <param>
+      <key>id</key>
+      <value>mod</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>fu.psk4</value>
+    </param>
   </block>
   <block>
     <key>variable</key>
     <param>
-      <key>id</key>
-      <value>Es</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
+      <key>_coordinate</key>
+      <value>(432, 132)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>noisevar</value>
+    </param>
+    <param>
       <key>value</key>
-      <value>sum(numpy.square(numpy.abs(constellation)))/(len(constellation)/(1.0*dim))</value>
+      <value>10**(-EsN0_dB/10.0)  * Es   /2.0</value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
+      <key>_enabled</key>
+      <value>1</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(528, 157)</value>
+      <value>(272, 4)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>variable</key>
     <param>
       <key>id</key>
-      <value>block</value>
+      <value>prefix</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>value</key>
+      <value>"@FSM_FILE_INSTALL_DIR@"</value>
     </param>
+  </block>
+  <block>
+    <key>analog_noise_source_x</key>
     <param>
-      <key>value</key>
-      <value>500*16</value>
+      <key>amp</key>
+      <value>noisevar**0.5</value>
     </param>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(216, 29)</value>
+      <value>(664, 356)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>blocks_throttle</key>
     <param>
       <key>id</key>
-      <value>blocks_throttle_0</value>
+      <value>analog_noise_source_x_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>type</key>
-      <value>byte</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>samples_per_second</key>
-      <value>R</value>
+      <key>noise_type</key>
+      <value>analog.GR_GAUSSIAN</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>ignoretag</key>
-      <value>True</value>
+      <key>seed</key>
+      <value>-42</value>
     </param>
+  </block>
+  <block>
+    <key>analog_random_source_x</key>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(0, 276)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
+      <key>id</key>
+      <value>analog_random_source_x_0</value>
+    </param>
+    <param>
       <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(208, 380)</value>
+      <key>max</key>
+      <value>2</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>blocks_add_xx</key>
     <param>
-      <key>id</key>
-      <value>blocks_add_xx_1</value>
+      <key>min</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>num_samps</key>
+      <value>1007</value>
     </param>
     <param>
       <key>type</key>
-      <value>float</value>
+      <value>byte</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>2</value>
+      <key>repeat</key>
+      <value>True</value>
     </param>
+  </block>
+  <block>
+    <key>blks2_error_rate</key>
     <param>
-      <key>vlen</key>
+      <key>bits_per_symbol</key>
       <value>1</value>
     </param>
     <param>
@@ -386,841 +512,893 @@
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(912, 488)</value>
+      <value>(688, 504)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>virtual_sink</key>
     <param>
       <key>id</key>
-      <value>virtual_sink_0_0</value>
+      <value>blks2_error_rate_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>info</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(224, 316)</value>
+      <key>type</key>
+      <value>'SER'</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>win_size</key>
+      <value>block*100</value>
     </param>
   </block>
   <block>
-    <key>virtual_sink</key>
+    <key>blocks_add_xx</key>
     <param>
-      <key>id</key>
-      <value>virtual_sink_0</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>observation</value>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(832, 620)</value>
+      <value>(888, 304)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>virtual_source</key>
     <param>
       <key>id</key>
-      <value>virtual_source_0</value>
+      <value>blocks_add_xx_1</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>observation</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(64, 732)</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>num_inputs</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
     </param>
   </block>
   <block>
-    <key>virtual_sink</key>
+    <key>blocks_throttle</key>
     <param>
-      <key>id</key>
-      <value>virtual_sink_0_1</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>estimate</value>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(800, 732)</value>
+      <value>(208, 300)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>analog_noise_source_x</key>
     <param>
       <key>id</key>
-      <value>analog_noise_source_x_0</value>
+      <value>blocks_throttle_0</value>
     </param>
     <param>
-      <key>_enabled</key>
+      <key>ignoretag</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>float</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>noise_type</key>
-      <value>analog.GR_GAUSSIAN</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>amp</key>
-      <value>noisevar**0.5</value>
+      <key>samples_per_second</key>
+      <value>R</value>
     </param>
     <param>
-      <key>seed</key>
-      <value>-42</value>
+      <key>type</key>
+      <value>byte</value>
     </param>
     <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+  </block>
+  <block>
+    <key>digital_chunks_to_symbols_xx</key>
+    <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>dimension</key>
+      <value>dim</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(384, 502)</value>
+      <value>(632, 292)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>EsN0_dB</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Es/N0 (dB)</value>
+      <value>digital_chunks_to_symbols_xx_0</value>
     </param>
     <param>
-      <key>value</key>
-      <value>4.0</value>
+      <key>in_type</key>
+      <value>byte</value>
     </param>
     <param>
-      <key>min</key>
-      <value>-10</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>max</key>
-      <value>30</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>1000</value>
+      <key>num_ports</key>
+      <value>1</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
+      <key>out_type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>converver</key>
-      <value>float_converter</value>
+      <key>symbol_table</key>
+      <value>constellation</value>
     </param>
+  </block>
+  <block>
+    <key>import</key>
     <param>
-      <key>grid_pos</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>notebook</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(608, 105)</value>
+      <value>(0, 116)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
+    <param>
+      <key>id</key>
+      <value>import_0</value>
+    </param>
+    <param>
+      <key>import</key>
+      <value>import numpy</value>
+    </param>
   </block>
   <block>
-    <key>analog_random_source_x</key>
+    <key>import</key>
     <param>
-      <key>id</key>
-      <value>analog_random_source_x_0</value>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>byte</value>
+      <key>_coordinate</key>
+      <value>(0, 164)</value>
     </param>
     <param>
-      <key>min</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
-      <key>max</key>
-      <value>2</value>
-    </param>
-    <param>
-      <key>num_samps</key>
-      <value>1007</value>
+      <key>id</key>
+      <value>import_0_0</value>
     </param>
     <param>
-      <key>repeat</key>
-      <value>True</value>
+      <key>import</key>
+      <value>import gnuradio.trellis.fsm_utils as fu</value>
     </param>
+  </block>
+  <block>
+    <key>note</key>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(8, 359)</value>
+      <value>(312, 628)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>wxgui_numbersink2</key>
     <param>
       <key>id</key>
-      <value>wxgui_numbersink2_3_0_0</value>
+      <value>note_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>note</key>
+      <value>Substititue the metrics/Viterbi block with Viterbi_combo</value>
     </param>
+  </block>
+  <block>
+    <key>qtgui_number_sink</key>
     <param>
-      <key>type</key>
-      <value>float</value>
+      <key>autoscale</key>
+      <value>False</value>
     </param>
     <param>
-      <key>title</key>
-      <value>BER</value>
+      <key>avg</key>
+      <value>0</value>
     </param>
     <param>
-      <key>units</key>
-      <value>BER</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>R</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>min_value</key>
-      <value>0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>max_value</key>
-      <value>1.0</value>
+      <key>_enabled</key>
+      <value>1</value>
     </param>
     <param>
-      <key>factor</key>
-      <value>1.0</value>
+      <key>_coordinate</key>
+      <value>(896, 492)</value>
     </param>
     <param>
-      <key>decimal_places</key>
-      <value>6</value>
+      <key>gui_hint</key>
+      <value></value>
     </param>
     <param>
-      <key>ref_level</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
-      <key>number_rate</key>
-      <value>15</value>
+      <key>graph_type</key>
+      <value>qtgui.NUM_GRAPH_HORIZ</value>
     </param>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>id</key>
+      <value>qtgui_number_sink_0</value>
     </param>
     <param>
-      <key>average</key>
-      <value>False</value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0.001</value>
+      <key>color1</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>show_gauge</key>
-      <value>False</value>
+      <key>factor1</key>
+      <value>1</value>
     </param>
     <param>
-      <key>win_size</key>
-      <value></value>
+      <key>label1</key>
+      <value>BER</value>
     </param>
     <param>
-      <key>grid_pos</key>
+      <key>unit1</key>
       <value></value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>color10</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>factor10</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>label10</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>unit10</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(728, 1133)</value>
+      <key>color2</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>factor2</key>
+      <value>1</value>
     </param>
-  </block>
-  <block>
-    <key>virtual_source</key>
     <param>
-      <key>id</key>
-      <value>virtual_source_0_0</value>
+      <key>label2</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>unit2</key>
+      <value></value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>info</value>
+      <key>color3</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(80, 1148)</value>
+      <key>factor3</key>
+      <value>1</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>label3</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>virtual_source</key>
     <param>
-      <key>id</key>
-      <value>virtual_source_0_0_0</value>
+      <key>unit3</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>color4</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>estimate</value>
+      <key>factor4</key>
+      <value>1</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(72, 1244)</value>
+      <key>label4</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>unit4</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>blks2_error_rate</key>
     <param>
-      <key>id</key>
-      <value>blks2_error_rate_0</value>
+      <key>color5</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>factor5</key>
+      <value>1</value>
     </param>
     <param>
-      <key>type</key>
-      <value>'SER'</value>
+      <key>label5</key>
+      <value></value>
     </param>
     <param>
-      <key>win_size</key>
-      <value>block*100</value>
+      <key>unit5</key>
+      <value></value>
     </param>
     <param>
-      <key>bits_per_symbol</key>
+      <key>color6</key>
+      <value>("black", "black")</value>
+    </param>
+    <param>
+      <key>factor6</key>
       <value>1</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>label6</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>unit6</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>color7</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>factor7</key>
+      <value>1</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(312, 1184)</value>
+      <key>label7</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>unit7</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>note</key>
     <param>
-      <key>id</key>
-      <value>note_0</value>
+      <key>color8</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>factor8</key>
+      <value>1</value>
     </param>
     <param>
-      <key>note</key>
-      <value>Substititue the metrics/Viterbi block with Viterbi_combo</value>
+      <key>label8</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <key>unit8</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(712, 868)</value>
+      <key>color9</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>factor9</key>
+      <value>1</value>
     </param>
-  </block>
-  <block>
-    <key>trellis_metrics_x</key>
     <param>
-      <key>id</key>
-      <value>trellis_metrics_x_0</value>
+      <key>label9</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>False</value>
+      <key>unit9</key>
+      <value></value>
     </param>
     <param>
-      <key>type</key>
-      <value>f</value>
+      <key>max</key>
+      <value>1</value>
     </param>
     <param>
-      <key>card</key>
-      <value>trellis.fsm(prefix+fsm).O()</value>
+      <key>min</key>
+      <value>0</value>
     </param>
     <param>
-      <key>dim</key>
-      <value>dim</value>
+      <key>name</key>
+      <value>"BER"</value>
     </param>
     <param>
-      <key>table</key>
-      <value>constellation</value>
+      <key>nconnections</key>
+      <value>1</value>
     </param>
     <param>
-      <key>metric_type</key>
-      <value>digital.TRELLIS_EUCLIDEAN</value>
+      <key>update_time</key>
+      <value>0.10</value>
     </param>
+  </block>
+  <block>
+    <key>trellis_encoder_xx</key>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
+      <key>blocklength</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>blockwise</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>fsm_args</key>
+      <value>prefix+fsm</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(304, 711)</value>
+      <value>(392, 292)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>trellis_viterbi_x</key>
     <param>
       <key>id</key>
-      <value>trellis_viterbi_x_0</value>
+      <value>trellis_encoder_xx_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>False</value>
+      <key>init_state</key>
+      <value>0</value>
     </param>
     <param>
-      <key>type</key>
-      <value>b</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>prefix+fsm</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>block_size</key>
-      <value>block</value>
+      <key>type</key>
+      <value>bb</value>
     </param>
+  </block>
+  <block>
+    <key>trellis_metrics_x</key>
     <param>
-      <key>init_state</key>
-      <value>-1</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>final_state</key>
-      <value>-1</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>table</key>
+      <value>constellation</value>
     </param>
     <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>dim</key>
+      <value>dim</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>False</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(544, 711)</value>
+      <value>(200, 684)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>trellis_viterbi_combined_xx</key>
     <param>
       <key>id</key>
-      <value>trellis_viterbi_combined_xx_0</value>
+      <value>trellis_metrics_x_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>type</key>
-      <value>f</value>
+      <key>metric_type</key>
+      <value>digital.TRELLIS_EUCLIDEAN</value>
     </param>
     <param>
-      <key>out_type</key>
-      <value>b</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>prefix+fsm</value>
+      <key>card</key>
+      <value>trellis.fsm(prefix+fsm).O()</value>
     </param>
     <param>
-      <key>block_size</key>
-      <value>block</value>
+      <key>type</key>
+      <value>f</value>
     </param>
+  </block>
+  <block>
+    <key>trellis_viterbi_combined_xx</key>
     <param>
-      <key>init_state</key>
-      <value>-1</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>final_state</key>
-      <value>-1</value>
+      <key>block_size</key>
+      <value>block</value>
     </param>
     <param>
-      <key>dim</key>
-      <value>dim</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
       <key>table</key>
       <value>constellation</value>
     </param>
     <param>
-      <key>metric_type</key>
-      <value>digital.TRELLIS_EUCLIDEAN</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>dim</key>
+      <value>dim</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>fsm_args</key>
+      <value>prefix+fsm</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>final_state</key>
+      <value>-1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(440, 866)</value>
+      <value>(248, 484)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>import</key>
     <param>
       <key>id</key>
-      <value>import_0</value>
+      <value>trellis_viterbi_combined_xx_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>init_state</key>
+      <value>-1</value>
     </param>
     <param>
-      <key>import</key>
-      <value>import numpy</value>
+      <key>type</key>
+      <value>f</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(16, 140)</value>
+      <key>metric_type</key>
+      <value>digital.TRELLIS_EUCLIDEAN</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
+    <param>
+      <key>out_type</key>
+      <value>b</value>
+    </param>
   </block>
   <block>
-    <key>import</key>
+    <key>trellis_viterbi_x</key>
     <param>
-      <key>id</key>
-      <value>import_0_0</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>block_size</key>
+      <value>block</value>
     </param>
     <param>
-      <key>import</key>
-      <value>import gnuradio.trellis.fsm_utils as fu</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
+      <key>_enabled</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>fsm_args</key>
+      <value>prefix+fsm</value>
+    </param>
+    <param>
+      <key>final_state</key>
+      <value>-1</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(24, 196)</value>
+      <value>(440, 684)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>digital_chunks_to_symbols_xx</key>
     <param>
       <key>id</key>
-      <value>digital_chunks_to_symbols_xx_0</value>
+      <value>trellis_viterbi_x_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>init_state</key>
+      <value>-1</value>
     </param>
     <param>
-      <key>in_type</key>
-      <value>byte</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>out_type</key>
-      <value>float</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>symbol_table</key>
-      <value>constellation</value>
+      <key>type</key>
+      <value>b</value>
     </param>
+  </block>
+  <block>
+    <key>virtual_sink</key>
     <param>
-      <key>dimension</key>
-      <value>dim</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>num_ports</key>
-      <value>1</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(992, 316)</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>id</key>
+      <value>virtual_sink_0</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>stream_id</key>
+      <value>observation</value>
+    </param>
+  </block>
+  <block>
+    <key>virtual_sink</key>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(696, 373)</value>
+      <value>(224, 428)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
+    <param>
+      <key>id</key>
+      <value>virtual_sink_0_0</value>
+    </param>
+    <param>
+      <key>stream_id</key>
+      <value>info</value>
+    </param>
   </block>
   <block>
-    <key>trellis_encoder_xx</key>
+    <key>virtual_source</key>
     <param>
-      <key>id</key>
-      <value>trellis_encoder_xx_0</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>bb</value>
-    </param>
-    <param>
-      <key>fsm_args</key>
-      <value>prefix+fsm</value>
+      <key>_coordinate</key>
+      <value>(0, 532)</value>
     </param>
     <param>
-      <key>init_state</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
-      <key>blockwise</key>
-      <value>False</value>
+      <key>id</key>
+      <value>virtual_source_0</value>
     </param>
     <param>
-      <key>blocklength</key>
-      <value>0</value>
+      <key>stream_id</key>
+      <value>observation</value>
     </param>
+  </block>
+  <block>
+    <key>virtual_source</key>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(328, 428)</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(424, 373)</value>
+      <key>id</key>
+      <value>virtual_source_0_0</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>stream_id</key>
+      <value>info</value>
     </param>
   </block>
   <connection>
@@ -1230,26 +1408,20 @@
     <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_chunks_to_symbols_xx_0</source_block_id>
-    <sink_block_id>blocks_add_xx_1</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
     <source_block_id>analog_random_source_x_0</source_block_id>
     <sink_block_id>blocks_throttle_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_throttle_0</source_block_id>
-    <sink_block_id>trellis_encoder_xx_0</sink_block_id>
+    <source_block_id>analog_random_source_x_0</source_block_id>
+    <sink_block_id>virtual_sink_0_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>trellis_encoder_xx_0</source_block_id>
-    <sink_block_id>digital_chunks_to_symbols_xx_0</sink_block_id>
+    <source_block_id>blks2_error_rate_0</source_block_id>
+    <sink_block_id>qtgui_number_sink_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -1260,57 +1432,57 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>virtual_source_0</source_block_id>
-    <sink_block_id>trellis_metrics_x_0</sink_block_id>
+    <source_block_id>blocks_throttle_0</source_block_id>
+    <sink_block_id>trellis_encoder_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>trellis_metrics_x_0</source_block_id>
-    <sink_block_id>trellis_viterbi_x_0</sink_block_id>
+    <source_block_id>digital_chunks_to_symbols_xx_0</source_block_id>
+    <sink_block_id>blocks_add_xx_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>analog_random_source_x_0</source_block_id>
-    <sink_block_id>virtual_sink_0_0</sink_block_id>
+    <source_block_id>trellis_encoder_xx_0</source_block_id>
+    <sink_block_id>digital_chunks_to_symbols_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>trellis_viterbi_x_0</source_block_id>
-    <sink_block_id>virtual_sink_0_1</sink_block_id>
+    <source_block_id>trellis_metrics_x_0</source_block_id>
+    <sink_block_id>trellis_viterbi_x_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>virtual_source_0</source_block_id>
-    <sink_block_id>trellis_viterbi_combined_xx_0</sink_block_id>
+    <source_block_id>trellis_viterbi_combined_xx_0</source_block_id>
+    <sink_block_id>blks2_error_rate_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>0</sink_key>
+    <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>trellis_viterbi_combined_xx_0</source_block_id>
-    <sink_block_id>virtual_sink_0_1</sink_block_id>
+    <source_block_id>trellis_viterbi_x_0</source_block_id>
+    <sink_block_id>blks2_error_rate_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>0</sink_key>
+    <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>blks2_error_rate_0</source_block_id>
-    <sink_block_id>wxgui_numbersink2_3_0_0</sink_block_id>
+    <source_block_id>virtual_source_0</source_block_id>
+    <sink_block_id>trellis_metrics_x_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>virtual_source_0_0</source_block_id>
-    <sink_block_id>blks2_error_rate_0</sink_block_id>
+    <source_block_id>virtual_source_0</source_block_id>
+    <sink_block_id>trellis_viterbi_combined_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>virtual_source_0_0_0</source_block_id>
+    <source_block_id>virtual_source_0_0</source_block_id>
     <sink_block_id>blks2_error_rate_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>1</sink_key>
+    <sink_key>0</sink_key>
   </connection>
 </flow_graph>