[Commit-gnuradio] r10328 - gnuradio/trunk/grc/data/platforms/python/blocks

[jblum]

Author: jblum
Date: 2009-01-28 12:09:53 -0700 (Wed, 28 Jan 2009)
New Revision: 10328

Modified:
   gnuradio/trunk/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
   gnuradio/trunk/grc/data/platforms/python/blocks/wxgui_fftsink2.xml
   gnuradio/trunk/grc/data/platforms/python/blocks/wxgui_numbersink2.xml
   gnuradio/trunk/grc/data/platforms/python/blocks/wxgui_scopesink2.xml
   gnuradio/trunk/grc/data/platforms/python/blocks/wxgui_waterfallsink2.xml
Log:
simplified with some one liners, added check to ensure dual source has 
different ants

Modified: gnuradio/trunk/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/usrp_dual_source_x.xml      
2009-01-28 18:41:23 UTC (rev 10327)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/usrp_dual_source_x.xml      
2009-01-28 19:09:53 UTC (rev 10328)
@@ -205,6 +205,7 @@
                        <key>False</key>
                </option>
        </param>
+       <check>'$rx_ant_a' != '$rx_ant_b'</check>
        <source>
                <name>Aout</name>
                <type>$type</type>

Modified: gnuradio/trunk/grc/data/platforms/python/blocks/wxgui_fftsink2.xml
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/wxgui_fftsink2.xml  
2009-01-28 18:41:23 UTC (rev 10327)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/wxgui_fftsink2.xml  
2009-01-28 19:09:53 UTC (rev 10328)
@@ -18,11 +18,7 @@
        fft_size=$fft_size,
        fft_rate=$fft_rate,
        average=$average,
-#if $avg_alpha.eval == 0
-       avg_alpha=None,
-#else
-       avg_alpha=$avg_alpha,
-#end if
+       avg_alpha=#if $avg_alpha.eval then $avg_alpha else 'None'#,
        title=$title,
        peak_hold=$peak_hold,
 )

Modified: gnuradio/trunk/grc/data/platforms/python/blocks/wxgui_numbersink2.xml
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/wxgui_numbersink2.xml       
2009-01-28 18:41:23 UTC (rev 10327)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/wxgui_numbersink2.xml       
2009-01-28 19:09:53 UTC (rev 10328)
@@ -20,11 +20,7 @@
        sample_rate=$samp_rate,
        number_rate=$number_rate,
        average=$options.average,
-#if $avg_alpha.eval == 0
-       avg_alpha=None,
-#else
-       avg_alpha=$avg_alpha,
-#end if
+       avg_alpha=#if $avg_alpha.eval then $avg_alpha else 'None'#,
        label=$title,
        peak_hold=$options.peak_hold,
        show_gauge=$show_gauge,

Modified: gnuradio/trunk/grc/data/platforms/python/blocks/wxgui_scopesink2.xml
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/wxgui_scopesink2.xml        
2009-01-28 18:41:23 UTC (rev 10327)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/wxgui_scopesink2.xml        
2009-01-28 19:09:53 UTC (rev 10328)
@@ -14,11 +14,7 @@
        title=$title,
        sample_rate=$samp_rate,
        frame_decim=$frame_decim,
-#if $v_scale.eval == 0
-       v_scale=None,
-#else
-       v_scale=$v_scale,
-#end if
+       v_scale=#if $v_scale.eval then $v_scale else 'None'#,
        t_scale=$t_scale,
        num_inputs=$num_inputs,
 )

Modified: 
gnuradio/trunk/grc/data/platforms/python/blocks/wxgui_waterfallsink2.xml
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/wxgui_waterfallsink2.xml    
2009-01-28 18:41:23 UTC (rev 10327)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/wxgui_waterfallsink2.xml    
2009-01-28 19:09:53 UTC (rev 10328)
@@ -17,11 +17,7 @@
        fft_size=$fft_size,
        fft_rate=$fft_rate,
        average=$options.average,
-#if $avg_alpha.eval == 0
-       avg_alpha=None,
-#else
-       avg_alpha=$avg_alpha,
-#end if
+       avg_alpha=#if $avg_alpha.eval then $avg_alpha else 'None'#,
        title=$title,
 )
 #set $grid_pos = $grid_pos.eval