[Commit-gnuradio] [gnuradio] 01/01: digital: (issue #784) fixes bug in constellation_rect GRC definition.

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch maint
in repository gnuradio.

commit b9034d561b09f2c10f85507662cfd3a3900efead
Author: Tom Rondeau <address@hidden>
Date:   Tue Apr 14 19:59:32 2015 -0400

    digital: (issue #784) fixes bug in constellation_rect GRC definition.
    
    Used work-in-progress name of function, not actual name.
    
    Also cleans up some tab and formatting issues.
---
 gr-digital/grc/digital_constellation.xml      | 21 ++++++----
 gr-digital/grc/digital_constellation_rect.xml | 60 ++++++++++++++++-----------
 2 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/gr-digital/grc/digital_constellation.xml 
b/gr-digital/grc/digital_constellation.xml
index 4ca7898..5254e4d 100644
--- a/gr-digital/grc/digital_constellation.xml
+++ b/gr-digital/grc/digital_constellation.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <!--
 ###################################################
-##Options Block:
-## options for window size,
-## and flow graph building.
+## Create a Constellation Object
 ###################################################
  -->
 <block>
@@ -18,7 +16,9 @@ self.$(id).gen_soft_dec_lut($precision)
 self.$(id).set_soft_dec_lut($soft_dec_lut, $precision)
 #end if
 </var_make>
+
   <var_value>digital.constellation_calcdist($const_points, $sym_map, $rot_sym, 
$dims)</var_value>
+
   <make></make>
   <!--<callback></callback>-->
 
@@ -28,24 +28,28 @@ self.$(id).set_soft_dec_lut($soft_dec_lut, $precision)
     <value>[0, 1, 3, 2]</value>
     <type>int_vector</type>
   </param>
+
   <param>
     <name>Constellation Points</name>
     <key>const_points</key>
     <value>[-1-1j, -1+1j, 1+1j, 1-1j]</value>
     <type>complex_vector</type>
-       </param>
-       <param>
+  </param>
+
+  <param>
     <name>Rotational Symmetry</name>
     <key>rot_sym</key>
     <value>4</value>
     <type>int</type>
-       </param>
-       <param>
+  </param>
+
+  <param>
     <name>Dimensionality</name>
     <key>dims</key>
     <value>1</value>
     <type>int</type>
-       </param>
+  </param>
+
   <param>
     <name>Soft Decisions Precision</name>
     <key>precision</key>
@@ -53,6 +57,7 @@ self.$(id).set_soft_dec_lut($soft_dec_lut, $precision)
     <type>int</type>
     <hide>part</hide>
   </param>
+
   <param>
     <name>Soft Decisions LUT</name>
     <key>soft_dec_lut</key>
diff --git a/gr-digital/grc/digital_constellation_rect.xml 
b/gr-digital/grc/digital_constellation_rect.xml
index fee750a..9e50fe8 100644
--- a/gr-digital/grc/digital_constellation_rect.xml
+++ b/gr-digital/grc/digital_constellation_rect.xml
@@ -1,67 +1,76 @@
 <?xml version="1.0"?>
 <!--
 ###################################################
-##Options Block:
-## options for window size,
-## and flow graph building.
+## Create a Rectangular Constellation Object
 ###################################################
  -->
 <block>
-       <name>Constellation Rect. Object</name>
-       <key>variable_constellation_rect</key>
+  <name>Constellation Rect. Object</name>
+  <key>variable_constellation_rect</key>
   <category>Modulators</category>
-       <import>from gnuradio import digital</import>
+  <import>from gnuradio import digital</import>
   <var_make>self.$(id) = $(id) = digital.constellation_rect($const_points, 
$sym_map, $rot_sym, $real_sect, $imag_sect, $w_real_sect, $w_imag_sect).base()
-#if str($softbits_lut) != 'None'
-self.$(id).set_softbits($softbits_lut, $precision)
+#if str($soft_dec_lut).lower() == '"auto"' or str($soft_dec_lut).lower() == 
"'auto'"
+self.$(id).gen_soft_dec_lut($precision)
+#else if str($soft_dec_lut) != 'None'
+self.$(id).set_soft_dec_lut($soft_dec_lut, $precision)
 #end if
 </var_make>
+
   <var_value>digital.constellation_rect($const_points, $sym_map, $rot_sym, 
$real_sect, $imag_sect, $w_real_sect, $w_imag_sect)</var_value>
+
   <make></make>
   <!--<callback>set_softbits($softbits_lut, $precision)</callback>-->
 
-       <param>
+  <param>
     <name>Symbol Map</name>
     <key>sym_map</key>
     <value>[0, 1, 3, 2]</value>
     <type>int_vector</type>
-       </param>
-       <param>
+  </param>
+
+  <param>
     <name>Constellation Points</name>
     <key>const_points</key>
     <value>[-1-1j, -1+1j, 1+1j, 1-1j]</value>
     <type>complex_vector</type>
-       </param>
-       <param>
+  </param>
+
+  <param>
     <name>Rotational Symmetry</name>
     <key>rot_sym</key>
     <value>4</value>
     <type>int</type>
-       </param>
-       <param>
+  </param>
+
+  <param>
     <name>Real Sectors</name>
     <key>real_sect</key>
     <value>2</value>
     <type>int</type>
-       </param>
-       <param>
+  </param>
+
+  <param>
     <name>Imaginary Sectors</name>
     <key>imag_sect</key>
     <value>2</value>
     <type>int</type>
-       </param>
-       <param>
+  </param>
+
+  <param>
     <name>Width Real Sectors</name>
     <key>w_real_sect</key>
     <value>1</value>
     <type>int</type>
-       </param>
-       <param>
+  </param>
+
+  <param>
     <name>Width Imaginary Sectors</name>
     <key>w_imag_sect</key>
     <value>1</value>
     <type>int</type>
-       </param>
+  </param>
+
   <param>
     <name>Soft bits precision</name>
     <key>precision</key>
@@ -69,11 +78,12 @@ self.$(id).set_softbits($softbits_lut, $precision)
     <type>int</type>
     <hide>part</hide>
   </param>
+
   <param>
-    <name>Soft bits LUT</name>
-    <key>softbits_lut</key>
+    <name>Soft Decisions LUT</name>
+    <key>soft_dec_lut</key>
     <value>None</value>
     <type>raw</type>
-    <hide>#if str($softbits_lut) == 'None' then 'part' else 'none'#</hide>
+    <hide>#if str($soft_dec_lut) == 'None' then 'part' else 'none'#</hide>
   </param>
 </block>