From d902f1e112636d4c9d1257c50ee259db382770f5 Mon Sep 17 00:00:00 2001 From: jblum Date: Wed, 28 Jan 2009 19:09:53 +0000 Subject: [PATCH] simplified with some one liners, added check to ensure dual source has different ants git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10328 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/data/platforms/python/blocks/usrp_dual_source_x.xml | 1 + grc/data/platforms/python/blocks/wxgui_fftsink2.xml | 6 +----- grc/data/platforms/python/blocks/wxgui_numbersink2.xml | 6 +----- grc/data/platforms/python/blocks/wxgui_scopesink2.xml | 6 +----- grc/data/platforms/python/blocks/wxgui_waterfallsink2.xml | 6 +----- 5 files changed, 5 insertions(+), 20 deletions(-) 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 2ed8f765..29ff7c8a 100644 --- 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) False + '$rx_ant_a' != '$rx_ant_b' Aout $type diff --git a/grc/data/platforms/python/blocks/wxgui_fftsink2.xml b/grc/data/platforms/python/blocks/wxgui_fftsink2.xml index 8687c691..6c6b747b 100644 --- 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 d5fc064e..3e224228 100644 --- 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 7cf49d5d..819a8e9a 100644 --- 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 a296097d..68d84dbb 100644 --- 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 -- 2.47.2