summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2011-07-26 15:55:54 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2011-07-28 17:10:01 -0300
commitc5c558c96c034656d5e6a2521082a6dac4a1bab6 (patch)
treeade244d623b602386ee1d7393c8f3f82e210f892
parent28d87b68b4c97a24b071ec5263c3fa7b3c4ccd94 (diff)
downloadtuna-c5c558c96c034656d5e6a2521082a6dac4a1bab6.tar.gz
oscilloscope: Switch from Numeric to numpy
The numpy package obsoletes Numeric, several distros are removing Numeric or plain never included it, so switch to numpy. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--rpm/SPECS/tuna.spec2
-rwxr-xr-xtuna/oscilloscope.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/rpm/SPECS/tuna.spec b/rpm/SPECS/tuna.spec
index 636263b..73e5d21 100644
--- a/rpm/SPECS/tuna.spec
+++ b/rpm/SPECS/tuna.spec
@@ -31,7 +31,7 @@ installed.
Summary: Generic graphical signal plotting tool
Group: Applications/System
Requires: python-matplotlib
-Requires: python-numeric
+Requires: numpy
Requires: pygtk2
Requires: tuna = %{version}-%{release}
diff --git a/tuna/oscilloscope.py b/tuna/oscilloscope.py
index 30a275c..3b0c6fa 100755
--- a/tuna/oscilloscope.py
+++ b/tuna/oscilloscope.py
@@ -26,7 +26,7 @@
import gobject, gtk, os, sys
from matplotlib.backends.backend_gtkagg import \
FigureCanvasGTKAgg as figure_canvas
-import matplotlib.figure, matplotlib.ticker, Numeric
+import matplotlib.figure, matplotlib.ticker, numpy
class histogram_frame(gtk.Frame):
def __init__(self, title = "Statistics", width = 780, height = 100,
@@ -106,7 +106,7 @@ class oscilloscope_frame(gtk.Frame):
self.max_value = max_value
self.nr_samples_on_screen = nr_samples_on_screen
- self.ind = Numeric.arange(nr_samples_on_screen)
+ self.ind = numpy.arange(nr_samples_on_screen)
self.samples = [ 0.0 ] * nr_samples_on_screen
figure = matplotlib.figure.Figure(figsize = (10, 4), dpi = 100,