Merging r11186:11273 from grc branch.

Fixes, features, and reorganization for grc.
Minor fixes and features for wxgui forms.



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

1 files changed, 126 insertions, 0 deletions

diff --git a/grc/blocks/wxgui_waterfallsink2.xml b/grc/blocks/wxgui_waterfallsink2.xml
new file mode 100644
index 000000000..6d76ee867
--- /dev/null
+++ b/grc/blocks/wxgui_waterfallsink2.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Waterfall Sink
+###################################################
+ -->
+<block>
+	<name>Waterfall Sink</name>
+	<key>wxgui_waterfallsink2</key>
+	<import>from gnuradio.wxgui import waterfallsink2</import>
+	<make>waterfallsink2.$(type.fcn)(
+	self.GetWin(),
+	baseband_freq=$baseband_freq,
+	y_per_div=$y_per_div,
+	ref_level=$ref_level,
+	sample_rate=$samp_rate,
+	fft_size=$fft_size,
+	fft_rate=$fft_rate,
+	average=$options.average,
+	avg_alpha=#if $avg_alpha() then $avg_alpha else 'None'#,
+	title=$title,
+)
+#set $grid_pos = $grid_pos()
+#if not grid_pos
+self.Add(self.$(id).win)
+#else
+self.GridAdd(self.$(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2], $grid_pos[3])
+#end if</make>
+	<callback>set_baseband_freq($baseband_freq)</callback>
+	<callback>set_sample_rate($samp_rate)</callback>
+	<param>
+		<name>Type</name>
+		<key>type</key>
+		<value>complex</value>
+		<type>enum</type>
+		<option>
+			<name>Complex</name>
+			<key>complex</key>
+			<opt>fcn:waterfall_sink_c</opt>
+		</option>
+		<option>
+			<name>Float</name>
+			<key>float</key>
+			<opt>fcn:waterfall_sink_f</opt>
+		</option>
+	</param>
+	<param>
+		<name>Title</name>
+		<key>title</key>
+		<value>Waterfall Plot</value>
+		<type>string</type>
+	</param>
+	<param>
+		<name>Sample Rate</name>
+		<key>samp_rate</key>
+		<value>samp_rate</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Baseband Freq</name>
+		<key>baseband_freq</key>
+		<value>0</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Y per Div</name>
+		<key>y_per_div</key>
+		<value>10</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Reference Level</name>
+		<key>ref_level</key>
+		<value>50</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>FFT Size</name>
+		<key>fft_size</key>
+		<value>512</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>FFT Rate</name>
+		<key>fft_rate</key>
+		<value>15</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Average Alpha</name>
+		<key>avg_alpha</key>
+		<value>0</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Options</name>
+		<key>options</key>
+		<value>none</value>
+		<type>enum</type>
+		<option>
+			<name>None</name>
+			<key>none</key>
+			<opt>average:False</opt>
+		</option>
+		<option>
+			<name>Average</name>
+			<key>average</key>
+			<opt>average:True</opt>
+		</option>
+	</param>
+	<param>
+		<name>Grid Position</name>
+		<key>grid_pos</key>
+		<value></value>
+		<type>grid_pos</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>$type</type>
+	</sink>
+	<doc>
+Set Average Alpha to 0 for automatic setting.
+
+Use the Grid Position (row, column, row span, column span) to position the graphical element in the window.
+	</doc>
+</block>