commit-gnuradio
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r7656 - gnuradio/branches/releases/3.1/gnuradio-core/s

From: jcorgan
Subject: [Commit-gnuradio] r7656 - gnuradio/branches/releases/3.1/gnuradio-core/src/utils
Date: Wed, 13 Feb 2008 11:41:11 -0700 (MST) 
Author: jcorgan
Date: 2008-02-13 11:41:11 -0700 (Wed, 13 Feb 2008)
New Revision: 7656

Modified:
   gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_char.py
   gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_const.py
   gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_data.py
   gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_fft_c.py
   gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_fft_f.py
   gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_float.py
   gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_int.py
   gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_iq.py
   gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_short.py
Log:
Applied changeset r7529 on trunk to release branch.

Modified: gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_char.py
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_char.py      
2008-02-13 18:39:51 UTC (rev 7655)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_char.py      
2008-02-13 18:41:11 UTC (rev 7656)
@@ -20,7 +20,12 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import scipy
+try:
+    import scipy
+except ImportError:
+    print "Please install SciPy to run this script (http://www.scipy.org/)"
+    raise SystemExit, 1
+
 from optparse import OptionParser
 from gr_plot_data import plot_data
 

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_const.py
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_const.py     
2008-02-13 18:39:51 UTC (rev 7655)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_const.py     
2008-02-13 18:41:11 UTC (rev 7656)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,9 +20,19 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import scipy
-from pylab import *
-from matplotlib.font_manager import fontManager, FontProperties
+try:
+    import scipy
+except ImportError:
+    print "Please install SciPy to run this script (http://www.scipy.org/)"
+    raise SystemExit, 1
+
+try:
+    from pylab import *
+    from matplotlib.font_manager import fontManager, FontProperties
+except ImportError:
+    print "Please install Matplotlib to run this script 
(http://matplotlib.sourceforge.net/)"
+    raise SystemExit, 1
+
 from optparse import OptionParser
 
 matplotlib.interactive(True)

Modified: gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_data.py
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_data.py      
2008-02-13 18:39:51 UTC (rev 7655)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_data.py      
2008-02-13 18:41:11 UTC (rev 7656)
@@ -20,8 +20,18 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import scipy
-from pylab import *
+try:
+    import scipy
+except ImportError:
+    print "Please install SciPy to run this script (http://www.scipy.org/)"
+    raise SystemExit, 1
+
+try:
+    from pylab import *
+except ImportError:
+    print "Please install Matplotlib to run this script 
(http://matplotlib.sourceforge.net/)"
+    raise SystemExit, 1
+
 from optparse import OptionParser
 
 matplotlib.interactive(True)

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_fft_c.py
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_fft_c.py     
2008-02-13 18:39:51 UTC (rev 7655)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_fft_c.py     
2008-02-13 18:41:11 UTC (rev 7656)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,10 +20,20 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import scipy
-from pylab import *
+try:
+    import scipy
+    from scipy import fftpack
+except ImportError:
+    print "Please install SciPy to run this script (http://www.scipy.org/)"
+    raise SystemExit, 1
+
+try:
+    from pylab import *
+except ImportError:
+    print "Please install Matplotlib to run this script 
(http://matplotlib.sourceforge.net/)"
+    raise SystemExit, 1
+
 from optparse import OptionParser
-from scipy import fftpack
 from math import log10
 
 matplotlib.interactive(True)

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_fft_f.py
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_fft_f.py     
2008-02-13 18:39:51 UTC (rev 7655)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_fft_f.py     
2008-02-13 18:41:11 UTC (rev 7656)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,10 +20,20 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import scipy
-from pylab import *
+try:
+    import scipy
+    from scipy import fftpack
+except ImportError:
+    print "Please install SciPy to run this script (http://www.scipy.org/)"
+    raise SystemExit, 1
+
+try:
+    from pylab import *
+except ImportError:
+    print "Please install Matplotlib to run this script 
(http://matplotlib.sourceforge.net/)"
+    raise SystemExit, 1
+
 from optparse import OptionParser
-from scipy import fftpack
 from math import log10
 
 matplotlib.interactive(True)

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_float.py
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_float.py     
2008-02-13 18:39:51 UTC (rev 7655)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_float.py     
2008-02-13 18:41:11 UTC (rev 7656)
@@ -20,7 +20,12 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import scipy
+try:
+    import scipy
+except ImportError:
+    print "Please install SciPy to run this script (http://www.scipy.org/)"
+    raise SystemExit, 1
+
 from optparse import OptionParser
 from gr_plot_data import plot_data
 

Modified: gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_int.py
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_int.py       
2008-02-13 18:39:51 UTC (rev 7655)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_int.py       
2008-02-13 18:41:11 UTC (rev 7656)
@@ -20,7 +20,12 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import scipy
+try:
+    import scipy
+except ImportError:
+    print "Please install SciPy to run this script (http://www.scipy.org/)"
+    raise SystemExit, 1
+
 from optparse import OptionParser
 from gr_plot_data import plot_data
 

Modified: gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_iq.py
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_iq.py        
2008-02-13 18:39:51 UTC (rev 7655)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_iq.py        
2008-02-13 18:41:11 UTC (rev 7656)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,8 +20,18 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import scipy
-from pylab import *
+try:
+    import scipy
+except ImportError:
+    print "Please install SciPy to run this script (http://www.scipy.org/)"
+    raise SystemExit, 1
+
+try:
+    from pylab import *
+except ImportError:
+    print "Please install Matplotlib to run this script 
(http://matplotlib.sourceforge.net/)"
+    raise SystemExit, 1
+
 from optparse import OptionParser
 
 matplotlib.interactive(True)

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_short.py
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_short.py     
2008-02-13 18:39:51 UTC (rev 7655)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_short.py     
2008-02-13 18:41:11 UTC (rev 7656)
@@ -20,7 +20,12 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import scipy
+try:
+    import scipy
+except ImportError:
+    print "Please install SciPy to run this script (http://www.scipy.org/)"
+    raise SystemExit, 1
+
 from optparse import OptionParser
 from gr_plot_data import plot_data
reply via email to
[Prev in Thread] Current Thread [Next in Thread]