diff options
| author | jblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-09-07 21:38:12 +0000 |
|---|---|---|
| committer | jblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-09-07 21:38:12 +0000 |
| commit | c86f6c23c6883f73d953d64c28ab42cedb77e4d7 (patch) | |
| tree | 0193b2a649eb0f7f1065912862de340a02848e16 /grc/scripts | |
| parent | ddec4fc07744a6519086b1b111f29d551b7f19c6 (diff) | |
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
Diffstat (limited to 'grc/scripts')
| -rw-r--r-- | grc/scripts/Makefile.am | 2 | ||||
| -rwxr-xr-x | grc/scripts/grc | 10 | ||||
| -rwxr-xr-x | grc/scripts/usrp_diagnostics | 9 |
3 files changed, 7 insertions, 14 deletions
diff --git a/grc/scripts/Makefile.am b/grc/scripts/Makefile.am index be4ae1b8d0..27a77b18ba 100644 --- a/grc/scripts/Makefile.am +++ b/grc/scripts/Makefile.am @@ -19,7 +19,7 @@ # Boston, MA 02110-1301, USA. # -include $(top_srcdir)/Makefile.common +include $(top_srcdir)/grc/Makefile.inc EXTRA_DIST = $(bin_SCRIPTS) diff --git a/grc/scripts/grc b/grc/scripts/grc index 44d07a7eed..93a9a05c0e 100755 --- a/grc/scripts/grc +++ b/grc/scripts/grc @@ -17,12 +17,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA """ -##@package Editor -#Execute the flow graph editor GUI. This file must be called by the python interpreter. -#@author Josh Blum -import grc -from grc.Constants import VERSION,FLOW_GRAPH_FILE_EXTENSION +from gnuradio.grc.platforms.base.Constants import VERSION, FLOW_GRAPH_FILE_EXTENSION from optparse import OptionParser if __name__ == "__main__": @@ -37,7 +33,7 @@ and you are welcome to redistribute it. """%VERSION parser = OptionParser(usage=usage, version=version) (options, args) = parser.parse_args() - from grc_gnuradio.Platform import Platform - from grc.ActionHandler import ActionHandler + from gnuradio.grc.platforms.python.Platform import Platform + from gnuradio.grc.gui.ActionHandler import ActionHandler ActionHandler(args, Platform()) diff --git a/grc/scripts/usrp_diagnostics b/grc/scripts/usrp_diagnostics index a7d9d6f5dd..b8e3163990 100755 --- a/grc/scripts/usrp_diagnostics +++ b/grc/scripts/usrp_diagnostics @@ -17,9 +17,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA """ -##@package Graphics.USRPDiagnostics -#A dialog for querying USRP subdevices. USRP interfacing methods encapsulated here. -#@author Josh Blum from gnuradio import usrp import os @@ -28,12 +25,12 @@ import pygtk pygtk.require('2.0') import gtk -from grc.gui.Dialogs import TextDisplay +from gnuradio.grc.gui.Dialogs import TextDisplay -from grc_gnuradio.Platform import Platform +from gnuradio.grc.platforms.python.Platform import Platform platform = Platform(block_paths_internal_only=['usrp_diagnostics.xml']) -from grc.gui.elements.Platform import Platform +from gnuradio.grc.platforms.gui.Platform import Platform platform = Platform(platform) flow_graph = platform.get_new_flow_graph() |