[Commit-gnuradio] [gnuradio] 02/37: digital: using new var_value for constellation variables

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit 6d9dfac64806ad2d1eb77a9ae909e4b9d66ea7fd
Author: Tom Rondeau <address@hidden>
Date:   Wed Jul 2 16:33:59 2014 -0400

    digital: using new var_value for constellation variables
---
 gr-digital/grc/digital_constellation.xml      |  90 +++++++++++------------
 gr-digital/grc/digital_constellation_rect.xml | 102 ++++++++++++--------------
 2 files changed, 88 insertions(+), 104 deletions(-)

diff --git a/gr-digital/grc/digital_constellation.xml 
b/gr-digital/grc/digital_constellation.xml
index 8d2a34f..4ca7898 100644
--- a/gr-digital/grc/digital_constellation.xml
+++ b/gr-digital/grc/digital_constellation.xml
@@ -7,65 +7,57 @@
 ###################################################
  -->
 <block>
-       <name>Constellation Object</name>
-       <key>variable_constellation</key>
-        <category>Modulators</category>
-       <import>from gnuradio import digital</import>
-        <var_make>self.$(id) = $(id) = 
digital.constellation_calcdist($const_points, $sym_map, $rot_sym, $dims).base()
+  <name>Constellation Object</name>
+  <key>variable_constellation</key>
+  <category>Modulators</category>
+  <import>from gnuradio import digital</import>
+  <var_make>self.$(id) = $(id) = digital.constellation_calcdist($const_points, 
$sym_map, $rot_sym, $dims).base()
 #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>
-        <make></make>
-        <!--<callback></callback>-->
+  <var_value>digital.constellation_calcdist($const_points, $sym_map, $rot_sym, 
$dims)</var_value>
+  <make></make>
+  <!--<callback></callback>-->
 
-        <!-- Required to 'trick' GRC into using this as a proper variable-->
-        <param>
-          <name>Ignore Me</name>
-          <key>value</key>
-          <value>"ok"</value>
-          <type>raw</type>
-          <hide>all</hide>
-        </param>
-
-       <param>
-          <name>Symbol Map</name>
-          <key>sym_map</key>
-          <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>
+    <name>Symbol Map</name>
+    <key>sym_map</key>
+    <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>
-          <name>Rotational Symmetry</name>
-          <key>rot_sym</key>
-          <value>4</value>
-          <type>int</type>
+    <name>Rotational Symmetry</name>
+    <key>rot_sym</key>
+    <value>4</value>
+    <type>int</type>
        </param>
        <param>
-          <name>Dimensionality</name>
-          <key>dims</key>
-          <value>1</value>
-          <type>int</type>
+    <name>Dimensionality</name>
+    <key>dims</key>
+    <value>1</value>
+    <type>int</type>
        </param>
-        <param>
-          <name>Soft Decisions Precision</name>
-          <key>precision</key>
-          <value>8</value>
-          <type>int</type>
-          <hide>part</hide>
-        </param>
-        <param>
-          <name>Soft Decisions LUT</name>
-          <key>soft_dec_lut</key>
-          <value>None</value>
-          <type>raw</type>
-          <hide>#if str($soft_dec_lut) == 'None' then 'part' else 
'none'#</hide>
-        </param>
+  <param>
+    <name>Soft Decisions Precision</name>
+    <key>precision</key>
+    <value>8</value>
+    <type>int</type>
+    <hide>part</hide>
+  </param>
+  <param>
+    <name>Soft Decisions LUT</name>
+    <key>soft_dec_lut</key>
+    <value>None</value>
+    <type>raw</type>
+    <hide>#if str($soft_dec_lut) == 'None' then 'part' else 'none'#</hide>
+  </param>
 </block>
diff --git a/gr-digital/grc/digital_constellation_rect.xml 
b/gr-digital/grc/digital_constellation_rect.xml
index e6acc14..fee750a 100644
--- a/gr-digital/grc/digital_constellation_rect.xml
+++ b/gr-digital/grc/digital_constellation_rect.xml
@@ -9,79 +9,71 @@
 <block>
        <name>Constellation Rect. Object</name>
        <key>variable_constellation_rect</key>
-        <category>Modulators</category>
+  <category>Modulators</category>
        <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()
+  <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)
 #end if
 </var_make>
-        <make></make>
-        <!--<callback>set_softbits($softbits_lut, $precision)</callback>-->
-
-        <!-- Required to 'trick' GRC into using this as a proper variable-->
-        <param>
-          <name>Ignore Me</name>
-          <key>value</key>
-          <value>"ok"</value>
-          <type>raw</type>
-          <hide>all</hide>
-        </param>
+  <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>
-          <name>Symbol Map</name>
-          <key>sym_map</key>
-          <value>[0, 1, 3, 2]</value>
-          <type>int_vector</type>
+    <name>Symbol Map</name>
+    <key>sym_map</key>
+    <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>
+    <name>Constellation Points</name>
+    <key>const_points</key>
+    <value>[-1-1j, -1+1j, 1+1j, 1-1j]</value>
+    <type>complex_vector</type>
        </param>
        <param>
-          <name>Rotational Symmetry</name>
-          <key>rot_sym</key>
-          <value>4</value>
-          <type>int</type>
+    <name>Rotational Symmetry</name>
+    <key>rot_sym</key>
+    <value>4</value>
+    <type>int</type>
        </param>
        <param>
-          <name>Real Sectors</name>
-          <key>real_sect</key>
-          <value>2</value>
-          <type>int</type>
+    <name>Real Sectors</name>
+    <key>real_sect</key>
+    <value>2</value>
+    <type>int</type>
        </param>
        <param>
-          <name>Imaginary Sectors</name>
-          <key>imag_sect</key>
-          <value>2</value>
-          <type>int</type>
+    <name>Imaginary Sectors</name>
+    <key>imag_sect</key>
+    <value>2</value>
+    <type>int</type>
        </param>
        <param>
-          <name>Width Real Sectors</name>
-          <key>w_real_sect</key>
-          <value>1</value>
-          <type>int</type>
+    <name>Width Real Sectors</name>
+    <key>w_real_sect</key>
+    <value>1</value>
+    <type>int</type>
        </param>
        <param>
-          <name>Width Imaginary Sectors</name>
-          <key>w_imag_sect</key>
-          <value>1</value>
-          <type>int</type>
+    <name>Width Imaginary Sectors</name>
+    <key>w_imag_sect</key>
+    <value>1</value>
+    <type>int</type>
        </param>
-        <param>
-          <name>Soft bits precision</name>
-          <key>precision</key>
-          <value>8</value>
-          <type>int</type>
-          <hide>part</hide>
-        </param>
-        <param>
-          <name>Soft bits LUT</name>
-          <key>softbits_lut</key>
-          <value>None</value>
-          <type>raw</type>
-          <hide>#if str($softbits_lut) == 'None' then 'part' else 
'none'#</hide>
-        </param>
+  <param>
+    <name>Soft bits precision</name>
+    <key>precision</key>
+    <value>8</value>
+    <type>int</type>
+    <hide>part</hide>
+  </param>
+  <param>
+    <name>Soft bits LUT</name>
+    <key>softbits_lut</key>
+    <value>None</value>
+    <type>raw</type>
+    <hide>#if str($softbits_lut) == 'None' then 'part' else 'none'#</hide>
+  </param>
 </block>