summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/grc_gr_wxgui.m41
-rw-r--r--gr-wxgui/Makefile.am2
-rw-r--r--gr-wxgui/grc/.gitignore2
-rw-r--r--gr-wxgui/grc/Makefile.am44
-rw-r--r--gr-wxgui/grc/__init__.py (renamed from grc/grc_gnuradio/wxgui/__init__.py)0
-rw-r--r--gr-wxgui/grc/panel.py (renamed from grc/grc_gnuradio/wxgui/panel.py)0
-rw-r--r--gr-wxgui/grc/top_block_gui.py (renamed from grc/grc_gnuradio/wxgui/top_block_gui.py)0
-rw-r--r--gr-wxgui/grc/variable_check_box.xml (renamed from grc/blocks/variable_check_box.xml)3
-rw-r--r--gr-wxgui/grc/variable_chooser.xml (renamed from grc/blocks/variable_chooser.xml)3
-rw-r--r--gr-wxgui/grc/variable_slider.xml (renamed from grc/blocks/variable_slider.xml)3
-rw-r--r--gr-wxgui/grc/variable_static_text.xml (renamed from grc/blocks/variable_static_text.xml)3
-rw-r--r--gr-wxgui/grc/variable_text_box.xml (renamed from grc/blocks/variable_text_box.xml)3
-rw-r--r--gr-wxgui/grc/wxgui_constellationsink2.xml (renamed from grc/blocks/wxgui_constellationsink2.xml)2
-rw-r--r--gr-wxgui/grc/wxgui_fftsink2.xml (renamed from grc/blocks/wxgui_fftsink2.xml)2
-rw-r--r--gr-wxgui/grc/wxgui_histosink2.xml (renamed from grc/blocks/wxgui_histosink2.xml)2
-rw-r--r--gr-wxgui/grc/wxgui_numbersink2.xml (renamed from grc/blocks/wxgui_numbersink2.xml)2
-rw-r--r--gr-wxgui/grc/wxgui_scopesink2.xml (renamed from grc/blocks/wxgui_scopesink2.xml)2
-rw-r--r--gr-wxgui/grc/wxgui_termsink.xml (renamed from grc/blocks/wxgui_termsink.xml)2
-rw-r--r--gr-wxgui/grc/wxgui_waterfallsink2.xml (renamed from grc/blocks/wxgui_waterfallsink2.xml)2
-rw-r--r--grc/blocks/Makefile.am12
-rw-r--r--grc/blocks/block_tree.xml5
-rw-r--r--grc/grc_gnuradio/Makefile.am6
-rw-r--r--grc/python/Platform.py2
23 files changed, 66 insertions, 37 deletions
diff --git a/config/grc_gr_wxgui.m4 b/config/grc_gr_wxgui.m4
index c443f7c6c..17925fcc5 100644
--- a/config/grc_gr_wxgui.m4
+++ b/config/grc_gr_wxgui.m4
@@ -36,6 +36,7 @@ AC_DEFUN([GRC_GR_WXGUI],[
AC_CONFIG_FILES([ \
gr-wxgui/Makefile \
gr-wxgui/gr-wxgui.pc \
+ gr-wxgui/grc/Makefile \
gr-wxgui/src/Makefile \
gr-wxgui/src/python/Makefile \
gr-wxgui/src/python/plotter/Makefile \
diff --git a/gr-wxgui/Makefile.am b/gr-wxgui/Makefile.am
index cee66e587..cfc7a429c 100644
--- a/gr-wxgui/Makefile.am
+++ b/gr-wxgui/Makefile.am
@@ -27,7 +27,7 @@ EXTRA_DIST += \
README.gl
if PYTHON
-SUBDIRS = src
+SUBDIRS = src grc
etcdir = $(gr_prefsdir)
dist_etc_DATA = gr-wxgui.conf
diff --git a/gr-wxgui/grc/.gitignore b/gr-wxgui/grc/.gitignore
new file mode 100644
index 000000000..b336cc7ce
--- /dev/null
+++ b/gr-wxgui/grc/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/gr-wxgui/grc/Makefile.am b/gr-wxgui/grc/Makefile.am
new file mode 100644
index 000000000..26217077a
--- /dev/null
+++ b/gr-wxgui/grc/Makefile.am
@@ -0,0 +1,44 @@
+#
+# Copyright 2011 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+grcblocksdir = $(grc_blocksdir)
+dist_grcblocks_DATA = \
+ variable_check_box.xml \
+ variable_chooser.xml \
+ variable_slider.xml \
+ variable_static_text.xml \
+ variable_text_box.xml \
+ wxgui_constellationsink2.xml \
+ wxgui_fftsink2.xml \
+ wxgui_histosink2.xml \
+ wxgui_numbersink2.xml \
+ wxgui_scopesink2.xml \
+ wxgui_termsink.xml \
+ wxgui_waterfallsink2.xml
+
+#The wxgui module contains a top_block + wxgui frame.
+wxgui_pythondir = $(pythondir)/grc_gnuradio/wxgui
+wxgui_python_PYTHON = \
+ __init__.py \
+ panel.py \
+ top_block_gui.py
diff --git a/grc/grc_gnuradio/wxgui/__init__.py b/gr-wxgui/grc/__init__.py
index 81427253b..81427253b 100644
--- a/grc/grc_gnuradio/wxgui/__init__.py
+++ b/gr-wxgui/grc/__init__.py
diff --git a/grc/grc_gnuradio/wxgui/panel.py b/gr-wxgui/grc/panel.py
index e62133cac..e62133cac 100644
--- a/grc/grc_gnuradio/wxgui/panel.py
+++ b/gr-wxgui/grc/panel.py
diff --git a/grc/grc_gnuradio/wxgui/top_block_gui.py b/gr-wxgui/grc/top_block_gui.py
index 333ccf1c1..333ccf1c1 100644
--- a/grc/grc_gnuradio/wxgui/top_block_gui.py
+++ b/gr-wxgui/grc/top_block_gui.py
diff --git a/grc/blocks/variable_check_box.xml b/gr-wxgui/grc/variable_check_box.xml
index a703703c7..d1e4d990c 100644
--- a/grc/blocks/variable_check_box.xml
+++ b/gr-wxgui/grc/variable_check_box.xml
@@ -6,8 +6,9 @@
###################################################
-->
<block>
- <name>Variable Check Box</name>
+ <name>WX GUI Check Box</name>
<key>variable_check_box</key>
+ <category>Variables</category>
<import>from gnuradio.wxgui import forms</import>
<var_make>self.$(id) = $(id) = $value</var_make>
<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self'
diff --git a/grc/blocks/variable_chooser.xml b/gr-wxgui/grc/variable_chooser.xml
index ee41f26db..99bf4389c 100644
--- a/grc/blocks/variable_chooser.xml
+++ b/gr-wxgui/grc/variable_chooser.xml
@@ -7,8 +7,9 @@
###################################################
-->
<block>
- <name>Variable Chooser</name>
+ <name>WX GUI Chooser</name>
<key>variable_chooser</key>
+ <category>Variables</category>
<import>from gnuradio.wxgui import forms</import>
<var_make>self.$(id) = $(id) = $value</var_make>
<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self'
diff --git a/grc/blocks/variable_slider.xml b/gr-wxgui/grc/variable_slider.xml
index c13d20856..09aa4d3d7 100644
--- a/grc/blocks/variable_slider.xml
+++ b/gr-wxgui/grc/variable_slider.xml
@@ -6,8 +6,9 @@
###################################################
-->
<block>
- <name>Variable Slider</name>
+ <name>WX GUI Slider</name>
<key>variable_slider</key>
+ <category>Variables</category>
<import>from gnuradio.wxgui import forms</import>
<var_make>self.$(id) = $(id) = $value</var_make>
<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self'
diff --git a/grc/blocks/variable_static_text.xml b/gr-wxgui/grc/variable_static_text.xml
index c866b998d..d7bb30eea 100644
--- a/grc/blocks/variable_static_text.xml
+++ b/gr-wxgui/grc/variable_static_text.xml
@@ -6,8 +6,9 @@
###################################################
-->
<block>
- <name>Variable Static Text</name>
+ <name>WX GUI Static Text</name>
<key>variable_static_text</key>
+ <category>Variables</category>
<import>from gnuradio.wxgui import forms</import>
<var_make>self.$(id) = $(id) = $value</var_make>
<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self'
diff --git a/grc/blocks/variable_text_box.xml b/gr-wxgui/grc/variable_text_box.xml
index 1b4b4355e..c5416aee7 100644
--- a/grc/blocks/variable_text_box.xml
+++ b/gr-wxgui/grc/variable_text_box.xml
@@ -6,8 +6,9 @@
###################################################
-->
<block>
- <name>Variable Text Box</name>
+ <name>WX GUI Text Box</name>
<key>variable_text_box</key>
+ <category>Variables</category>
<import>from gnuradio.wxgui import forms</import>
<var_make>self.$(id) = $(id) = $value</var_make>
<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self'
diff --git a/grc/blocks/wxgui_constellationsink2.xml b/gr-wxgui/grc/wxgui_constellationsink2.xml
index 598b55064..881c6eba3 100644
--- a/grc/blocks/wxgui_constellationsink2.xml
+++ b/gr-wxgui/grc/wxgui_constellationsink2.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Constellation Sink</name>
+ <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'
diff --git a/grc/blocks/wxgui_fftsink2.xml b/gr-wxgui/grc/wxgui_fftsink2.xml
index 8df8f90d0..b06220d1e 100644
--- a/grc/blocks/wxgui_fftsink2.xml
+++ b/gr-wxgui/grc/wxgui_fftsink2.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>FFT Sink</name>
+ <name>WX GUI FFT Sink</name>
<key>wxgui_fftsink2</key>
<import>from gnuradio import window</import>
<import>from gnuradio.wxgui import fftsink2</import>
diff --git a/grc/blocks/wxgui_histosink2.xml b/gr-wxgui/grc/wxgui_histosink2.xml
index 9edf9650d..2f475fe2e 100644
--- a/grc/blocks/wxgui_histosink2.xml
+++ b/gr-wxgui/grc/wxgui_histosink2.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Histo Sink</name>
+ <name>WX GUI Histo Sink</name>
<key>wxgui_histosink2</key>
<import>from gnuradio.wxgui import histosink_gl</import>
<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self'
diff --git a/grc/blocks/wxgui_numbersink2.xml b/gr-wxgui/grc/wxgui_numbersink2.xml
index ad93dec08..b3b4cb254 100644
--- a/grc/blocks/wxgui_numbersink2.xml
+++ b/gr-wxgui/grc/wxgui_numbersink2.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Number Sink</name>
+ <name>WX GUI Number Sink</name>
<key>wxgui_numbersink2</key>
<import>from gnuradio.wxgui import numbersink2</import>
<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self'
diff --git a/grc/blocks/wxgui_scopesink2.xml b/gr-wxgui/grc/wxgui_scopesink2.xml
index ef0377373..43922f45e 100644
--- a/grc/blocks/wxgui_scopesink2.xml
+++ b/gr-wxgui/grc/wxgui_scopesink2.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Scope Sink</name>
+ <name>WX GUI Scope Sink</name>
<key>wxgui_scopesink2</key>
<import>from gnuradio.wxgui import scopesink2</import>
<import>from gnuradio import gr</import>
diff --git a/grc/blocks/wxgui_termsink.xml b/gr-wxgui/grc/wxgui_termsink.xml
index 985d89b58..ae15b98a6 100644
--- a/grc/blocks/wxgui_termsink.xml
+++ b/gr-wxgui/grc/wxgui_termsink.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Terminal Sink</name>
+ <name>WX GUI Terminal Sink</name>
<key>wxgui_termsink</key>
<import>from gnuradio.wxgui import termsink</import>
diff --git a/grc/blocks/wxgui_waterfallsink2.xml b/gr-wxgui/grc/wxgui_waterfallsink2.xml
index 3de67597f..9789994be 100644
--- a/grc/blocks/wxgui_waterfallsink2.xml
+++ b/gr-wxgui/grc/wxgui_waterfallsink2.xml
@@ -5,7 +5,7 @@
###################################################
-->
<block>
- <name>Waterfall Sink</name>
+ <name>WX GUI Waterfall Sink</name>
<key>wxgui_waterfallsink2</key>
<import>from gnuradio import window</import>
<import>from gnuradio.wxgui import waterfallsink2</import>
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 56893b46f..40353a1fa 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -221,20 +221,8 @@ dist_ourdata_DATA = \
usrp_simple_sink_x.xml \
usrp_simple_source_x.xml \
variable.xml \
- variable_check_box.xml \
- variable_chooser.xml \
variable_config.xml \
- variable_slider.xml \
- variable_static_text.xml \
- variable_text_box.xml \
virtual_sink.xml \
virtual_source.xml \
- wxgui_constellationsink2.xml \
- wxgui_fftsink2.xml \
- wxgui_histosink2.xml \
- wxgui_numbersink2.xml \
- wxgui_scopesink2.xml \
- wxgui_termsink.xml \
- wxgui_waterfallsink2.xml \
xmlrpc_client.xml \
xmlrpc_server.xml
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 644841884..782d6ca9b 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -286,11 +286,6 @@
<cat>
<name>Variables</name>
<block>variable</block>
- <block>variable_slider</block>
- <block>variable_chooser</block>
- <block>variable_check_box</block>
- <block>variable_text_box</block>
- <block>variable_static_text</block>
<block>variable_config</block>
<block>parameter</block>
</cat>
diff --git a/grc/grc_gnuradio/Makefile.am b/grc/grc_gnuradio/Makefile.am
index 63bb72822..c53d07b4e 100644
--- a/grc/grc_gnuradio/Makefile.am
+++ b/grc/grc_gnuradio/Makefile.am
@@ -42,9 +42,3 @@ usrp_python_PYTHON = \
usrp/common.py \
usrp/dual_usrp.py \
usrp/simple_usrp.py
-
-wxgui_pythondir = $(grc_gnuradio_prefix)/wxgui
-wxgui_python_PYTHON = \
- wxgui/__init__.py \
- wxgui/panel.py \
- wxgui/top_block_gui.py
diff --git a/grc/python/Platform.py b/grc/python/Platform.py
index 04db0b9b0..ec3f94096 100644
--- a/grc/python/Platform.py
+++ b/grc/python/Platform.py
@@ -1,5 +1,5 @@
"""
-Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Radio
GNU Radio Companion is free software; you can redistribute it and/or
generated by cgit (git 2.34.1) at 2025-03-28 05:42:16 +0000