Merged r9481:9518 on jblum/grc_reorganize into trunk. Reorganized grc source under gnuradio.grc module. Trunk passes make distcheck.

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

1 files changed, 146 insertions, 0 deletions

diff --git a/grc/data/platforms/python/blocks/wxgui_scopesink2.xml b/grc/data/platforms/python/blocks/wxgui_scopesink2.xml
new file mode 100644
index 000000000..7cf49d5d6
--- /dev/null
+++ b/grc/data/platforms/python/blocks/wxgui_scopesink2.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Scope Sink
+###################################################
+ -->
+<block>
+	<name>Scope Sink</name>
+	<key>wxgui_scopesink2</key>
+	<import>from gnuradio.wxgui import scopesink2</import>
+	<import>from gnuradio import gr</import>
+	<make>scopesink2.$(type.fcn)(
+	self.GetWin(),
+	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
+	t_scale=$t_scale,
+	num_inputs=$num_inputs,
+)
+self.$(id).win.$(marker)()
+#set $grid_pos = $grid_pos.eval
+#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>
+<!--
+$(id).win.info.scopesink.set_trigger_channel($(trigger_channel))
+$(id).win.info.scopesink.set_trigger_mode(gr.$(trigger_mode)) -->
+	<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:scope_sink_c</opt>
+		</option>
+		<option>
+			<name>Float</name>
+			<key>float</key>
+			<opt>fcn:scope_sink_f</opt>
+		</option>
+	</param>
+	<param>
+		<name>Title</name>
+		<key>title</key>
+		<value>Scope 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>Frame Decimation</name>
+		<key>frame_decim</key>
+		<value>15</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>V Scale</name>
+		<key>v_scale</key>
+		<value>0</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>T Scale</name>
+		<key>t_scale</key>
+		<value>.001</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Marker</name>
+		<key>marker</key>
+		<value>set_format_line</value>
+		<type>enum</type>
+		<option>
+			<name>Line</name>
+			<key>set_format_line</key>
+		</option>
+		<option>
+			<name>Dot</name>
+			<key>set_format_dot</key>
+		</option>
+		<option>
+			<name>Plus</name>
+			<key>set_format_plus</key>
+		</option>
+	</param>
+	<!-- <param>
+		<name>Trigger Channel</name>
+		<key>trigger_channel</key>
+		<value>0</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Trigger Mode</name>
+		<key>trigger_mode</key>
+		<value>gr_TRIG_AUTO</value>
+		<type>enum</type>
+		<option>
+			<name>Auto</name>
+			<key>gr_TRIG_AUTO</key>
+		</option>
+		<option>
+			<name>Positive Slope</name>
+			<key>gr_TRIG_POS_SLOPE</key>
+		</option>
+		<option>
+			<name>Negative Slope</name>
+			<key>gr_TRIG_NEG_SLOPE</key>
+		</option>
+	</param> -->
+	<param>
+		<name>Num Inputs</name>
+		<key>num_inputs</key>
+		<value>1</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Grid Position</name>
+		<key>grid_pos</key>
+		<value></value>
+		<type>grid_pos</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>$type</type>
+		<nports>$num_inputs</nports>
+	</sink>
+	<doc>
+Set the V Scale to 0 for the scope to auto-scale.
+
+Use the Grid Position (row, column, row span, column span) to position the graphical element in the window.
+	</doc>
+</block>