simplified with some one liners, added check to ensure dual source has different...

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10328 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/grc/data/platforms/python/blocks/usrp_dual_source_x.xml b/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
index 2ed8f7656695a14d07fe1402e237c144d015267c..29ff7c8a080aadc59101ad4b8d8431b5b3a41856 100644 (file)
--- a/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
@@ -205,6 +205,7 @@ self.$(id).set_auto_tr_b($auto_tr_b)
                        <key>False</key>
                </option>
        </param>
+       <check>'$rx_ant_a' != '$rx_ant_b'</check>
        <source>
                <name>Aout</name>
                <type>$type</type>

diff --git a/grc/data/platforms/python/blocks/wxgui_fftsink2.xml b/grc/data/platforms/python/blocks/wxgui_fftsink2.xml
index 8687c691988687bd60bdf34ac963bdc702e8a995..6c6b747b34bcbf8625d5706ce267a81f8609accb 100644 (file)
--- a/grc/data/platforms/python/blocks/wxgui_fftsink2.xml
+++ b/grc/data/platforms/python/blocks/wxgui_fftsink2.xml
@@ -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,
 )

diff --git a/grc/data/platforms/python/blocks/wxgui_numbersink2.xml b/grc/data/platforms/python/blocks/wxgui_numbersink2.xml
index d5fc064e7cf2f695a3f34ed1ccb6082c11eff784..3e224228e97cab6345ffb5f2451b9385966acb8a 100644 (file)
--- a/grc/data/platforms/python/blocks/wxgui_numbersink2.xml
+++ b/grc/data/platforms/python/blocks/wxgui_numbersink2.xml
@@ -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,

diff --git a/grc/data/platforms/python/blocks/wxgui_scopesink2.xml b/grc/data/platforms/python/blocks/wxgui_scopesink2.xml
index 7cf49d5d6582382bae6f1859dfad811597076db5..819a8e9a9b71ffd6b10ad3e9a7cec5b2f3e83d38 100644 (file)
--- a/grc/data/platforms/python/blocks/wxgui_scopesink2.xml
+++ b/grc/data/platforms/python/blocks/wxgui_scopesink2.xml
@@ -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,
 )

diff --git a/grc/data/platforms/python/blocks/wxgui_waterfallsink2.xml b/grc/data/platforms/python/blocks/wxgui_waterfallsink2.xml
index a296097d09ae48cd28473612fa9cbd2f1690cbff..68d84dbba3e51a7602e53e4f29807d4e5c09402f 100644 (file)
--- a/grc/data/platforms/python/blocks/wxgui_waterfallsink2.xml
+++ b/grc/data/platforms/python/blocks/wxgui_waterfallsink2.xml
@@ -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