From f0537a7da4571bd6aaab273a0588eaef04121648 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Fri, 21 Jan 2011 15:20:45 -0800
Subject: grc: moved wxgui blocks and python into gr-wxgui/grc

Prefixed wxgui blocks with WX GUI in the block names.
Added category to wxgui variables blocks (not in the main block tree.xml)
---
 gr-wxgui/grc/wxgui_constellationsink2.xml | 139 ++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 gr-wxgui/grc/wxgui_constellationsink2.xml

(limited to 'gr-wxgui/grc/wxgui_constellationsink2.xml')

diff --git a/gr-wxgui/grc/wxgui_constellationsink2.xml b/gr-wxgui/grc/wxgui_constellationsink2.xml
new file mode 100644
index 000000000..881c6eba3
--- /dev/null
+++ b/gr-wxgui/grc/wxgui_constellationsink2.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Constellation Sink
+###################################################
+ -->
+<block>
+	<name>WX GUI Constellation Sink</name>
+	<key>wxgui_constellationsink2</key>
+	<import>from gnuradio.wxgui import constsink_gl</import>
+	<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self'
+constsink_gl.const_sink_c(
+	$(parent).GetWin(),
+	title=$title,
+	sample_rate=$samp_rate,
+	frame_rate=$frame_rate,
+	const_size=$const_size,
+	M=$M,
+	theta=$theta,
+	alpha=$alpha,
+	fmax=$fmax,
+	mu=$mu,
+	gain_mu=$gain_mu,
+	symbol_rate=$symbol_rate,
+	omega_limit=$omega_limit,
+#if $win_size()
+	size=$win_size,
+#end if
+)
+#if not $grid_pos()
+$(parent).Add(self.$(id).win)
+#else
+$(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos()))))
+#end if</make>
+	<callback>set_sample_rate($samp_rate)</callback>
+	<param>
+		<name>Title</name>
+		<key>title</key>
+		<value>Constellation 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 Rate</name>
+		<key>frame_rate</key>
+		<value>5</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Constellation Size</name>
+		<key>const_size</key>
+		<value>2048</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>M</name>
+		<key>M</key>
+		<value>4</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Theta</name>
+		<key>theta</key>
+		<value>0</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Alpha</name>
+		<key>alpha</key>
+		<value>0.005</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Max Freq</name>
+		<key>fmax</key>
+		<value>0.06</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Mu</name>
+		<key>mu</key>
+		<value>0.5</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Gain Mu</name>
+		<key>gain_mu</key>
+		<value>0.005</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Symbol Rate</name>
+		<key>symbol_rate</key>
+		<value>samp_rate/4.</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Omega Limit</name>
+		<key>omega_limit</key>
+		<value>0.005</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Window Size</name>
+		<key>win_size</key>
+		<value></value>
+		<type>int_vector</type>
+		<hide>#if $win_size() then 'none' else 'part'#</hide>
+	</param>
+	<param>
+		<name>Grid Position</name>
+		<key>grid_pos</key>
+		<value></value>
+		<type>grid_pos</type>
+	</param>
+	<param>
+		<name>Notebook</name>
+		<key>notebook</key>
+		<value></value>
+		<type>notebook</type>
+	</param>
+	<check>not $win_size or len($win_size) == 2</check>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+	</sink>
+	<doc>
+Leave the window blank for the default size, otherwise enter a tuple of (width, height) pixels.
+
+Use the Grid Position (row, column, row span, column span) to position the graphical element in the window.
+
+Use the Notebook Param (notebook-id, page-index) to place the graphical element inside of a notebook page.
+	</doc>
+</block>
-- 
cgit 


From 47f621a14c9a6e3696155dd5a223da40bcb7721c Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 27 Feb 2011 23:18:11 -0800
Subject: grc: work on generator for gui flowgraphs to simplify generation

generator does not differentiate between notebooks and controls,
they are all block, but block are now sorted by variables present in the make

also adjusted categories listed in the wx and qt widget related blocks
---
 gr-wxgui/grc/wxgui_constellationsink2.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gr-wxgui/grc/wxgui_constellationsink2.xml')

diff --git a/gr-wxgui/grc/wxgui_constellationsink2.xml b/gr-wxgui/grc/wxgui_constellationsink2.xml
index 881c6eba3..c200790f9 100644
--- a/gr-wxgui/grc/wxgui_constellationsink2.xml
+++ b/gr-wxgui/grc/wxgui_constellationsink2.xml
@@ -7,6 +7,7 @@
 <block>
 	<name>WX GUI Constellation Sink</name>
 	<key>wxgui_constellationsink2</key>
+	<category>WX GUI Widgets</category>
 	<import>from gnuradio.wxgui import constsink_gl</import>
 	<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self'
 constsink_gl.const_sink_c(
-- 
cgit 


From a4f3c09ae4714da5ed1d5289e2f59bb864bf4074 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sat, 8 Oct 2011 14:41:11 -0400
Subject: wxgui: Updating constellation plot to work with gr-digital.

---
 gr-wxgui/grc/wxgui_constellationsink2.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gr-wxgui/grc/wxgui_constellationsink2.xml')

diff --git a/gr-wxgui/grc/wxgui_constellationsink2.xml b/gr-wxgui/grc/wxgui_constellationsink2.xml
index c200790f9..f9df9d4ac 100644
--- a/gr-wxgui/grc/wxgui_constellationsink2.xml
+++ b/gr-wxgui/grc/wxgui_constellationsink2.xml
@@ -18,7 +18,7 @@ constsink_gl.const_sink_c(
 	const_size=$const_size,
 	M=$M,
 	theta=$theta,
-	alpha=$alpha,
+	loop_bw=$loop_bw,
 	fmax=$fmax,
 	mu=$mu,
 	gain_mu=$gain_mu,
@@ -71,9 +71,9 @@ $(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos()))))
 		<type>real</type>
 	</param>
 	<param>
-		<name>Alpha</name>
-		<key>alpha</key>
-		<value>0.005</value>
+		<name>Loop Bandwidth</name>
+		<key>loop_bw</key>
+		<value>6.28/100.0</value>
 		<type>real</type>
 	</param>
 	<param>
-- 
cgit