[Commit-gnuradio] r7655 - gnuradio/branches/releases/3.1/gnuradio-core/src/utils

[jcorgan]

Author: jcorgan
Date: 2008-02-13 11:39:51 -0700 (Wed, 13 Feb 2008)
New Revision: 7655

Added:
   gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_data.py
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_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 r7528 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:38:11 UTC (rev 7654)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_char.py      
2008-02-13 18:39:51 UTC (rev 7655)
@@ -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
 # 
@@ -21,125 +21,12 @@
 # 
 
 import scipy
-from pylab import *
 from optparse import OptionParser
+from gr_plot_data import plot_data
 
-matplotlib.interactive(True)
-matplotlib.use('TkAgg')
-
-class draw_fft_c:
-    def __init__(self, filename, options):
-        self.hfile = open(filename, "r")
-        self.block_length = options.block
-        self.start = options.start
-        self.sample_rate = options.sample_rate
-
-        self.axis_font_size = 16
-        self.label_font_size = 18
-        self.title_font_size = 20
-        self.text_size = 22
-
-        # Setup PLOT
-        self.fig = figure(1, figsize=(16, 9), facecolor='w')
-        rcParams['xtick.labelsize'] = self.axis_font_size
-        rcParams['ytick.labelsize'] = self.axis_font_size
-        
-        self.text_file     = figtext(0.10, 0.94, ("File: %s" % filename), 
weight="heavy", size=self.text_size)
-        self.text_file_pos = figtext(0.10, 0.88, "File Position: ", 
weight="heavy", size=self.text_size)
-        self.text_block    = figtext(0.40, 0.88, ("Block Size: %d" % 
self.block_length),
-                                     weight="heavy", size=self.text_size)
-        self.text_sr       = figtext(0.60, 0.88, ("Sample Rate: %.2f" % 
self.sample_rate),
-                                     weight="heavy", size=self.text_size)
-        self.make_plots()
-
-        self.button_left_axes = self.fig.add_axes([0.45, 0.01, 0.05, 0.05], 
frameon=True)
-        self.button_left = Button(self.button_left_axes, "<")
-        self.button_left_callback = 
self.button_left.on_clicked(self.button_left_click)
-
-        self.button_right_axes = self.fig.add_axes([0.50, 0.01, 0.05, 0.05], 
frameon=True)
-        self.button_right = Button(self.button_right_axes, ">")
-        self.button_right_callback = 
self.button_right.on_clicked(self.button_right_click)
-
-        self.xlim = self.sp_f.get_xlim()
-
-        self.manager = get_current_fig_manager()
-        connect('key_press_event', self.click)
-        show()
-        
-    def get_data(self):
-        self.text_file_pos.set_text("File Position: %d" % (self.hfile.tell()))
-        f = scipy.fromfile(self.hfile, dtype=scipy.int8, 
count=self.block_length)
-        #print "Read in %d items" % len(self.f)
-        if(len(f) == 0):
-            print "End of File"
-        else:
-            self.f = f
-            self.time = [i*(1/self.sample_rate) for i in range(len(self.f))]
-        
-    def make_plots(self):
-        # if specified on the command-line, set file pointer
-        self.hfile.seek(8*self.start, 1)
-
-        self.get_data()
-        
-        # Subplot for real and imaginary parts of signal
-        self.sp_f = self.fig.add_subplot(2,1,1, position=[0.075, 0.2, 0.875, 
0.6])
-        self.sp_f.set_title(("Amplitude"), fontsize=self.title_font_size, 
fontweight="bold")
-        self.sp_f.set_xlabel("Time (s)", fontsize=self.label_font_size, 
fontweight="bold")
-        self.sp_f.set_ylabel("Amplitude (V)", fontsize=self.label_font_size, 
fontweight="bold")
-        self.plot_f = plot(self.time, self.f, 'bo-')
-        self.sp_f.set_ylim([1.5*min(self.f),
-                            1.5*max(self.f)])
-
-        draw()
-
-    def update_plots(self):
-        self.plot_f[0].set_data([self.time, self.f])
-        self.sp_f.set_ylim([1.5*min(self.f),
-                            1.5*max(self.f)])
-        draw()
-        
-    def click(self, event):
-        forward_valid_keys = [" ", "down", "right"]
-        backward_valid_keys = ["up", "left"]
-
-        if(find(event.key, forward_valid_keys)):
-            self.step_forward()
-            
-        elif(find(event.key, backward_valid_keys)):
-            self.step_backward()
-
-    def button_left_click(self, event):
-        self.step_backward()
-
-    def button_right_click(self, event):
-        self.step_forward()
-
-    def step_forward(self):
-        self.get_data()
-        self.update_plots()
-
-    def step_backward(self):
-        # Step back in file position
-        if(self.hfile.tell() >= 2*self.block_length ):
-            self.hfile.seek(-2*self.block_length, 1)
-        else:
-            self.hfile.seek(-self.hfile.tell(),1)
-        self.get_data()
-        self.update_plots()
-        
-            
-
-#FIXME: there must be a way to do this with a Python builtin
-def find(item_in, list_search):
-    for l in list_search:
-        if item_in == l:
-            return True
-    return False
-
 def main():
-    usage="%prog: [options] input_filename"
-    description = "Takes a GNU Radio floating point binary file and displays 
the samples versus time. You can set the block size to specify how many points 
to read in at a time and the start position in the file. By default, the system 
assumes a sample rate of 1, so in time, each sample is plotted versus the 
sample number. To set a true time axis, set the sample rate (-R or 
--sample-rate) to the sample rate used when capturing the samples."
+    usage="%prog: [options] input_filenames"
+    description = "Takes a GNU Radio byte/char binary file and displays the 
samples versus time. You can set the block size to specify how many points to 
read in at a time and the start position in the file. By default, the system 
assumes a sample rate of 1, so in time, each sample is plotted versus the 
sample number. To set a true time axis, set the sample rate (-R or 
--sample-rate) to the sample rate used when capturing the samples."
 
     parser = OptionParser(conflict_handler="resolve", usage=usage, 
description=description)
     parser.add_option("-B", "--block", type="int", default=1000,
@@ -150,12 +37,13 @@
                       help="Set the sampler rate of the data 
[default=%default]")
     
     (options, args) = parser.parse_args ()
-    if len(args) != 1:
+    if len(args) < 1:
         parser.print_help()
         raise SystemExit, 1
-    filename = args[0]
+    filenames = args
 
-    dc = draw_fft_c(filename, options)
+    datatype=scipy.int8
+    dc = plot_data(datatype, filenames, options)
 
 if __name__ == "__main__":
     try:

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:38:11 UTC (rev 7654)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_const.py     
2008-02-13 18:39:51 UTC (rev 7655)
@@ -35,6 +35,9 @@
         self.start = options.start
         self.sample_rate = options.sample_rate
 
+        self.datatype = scipy.complex64
+        self.sizeof_data = self.datatype().nbytes    # number of bytes per 
sample in file
+
         self.axis_font_size = 16
         self.label_font_size = 18
         self.title_font_size = 20
@@ -68,8 +71,8 @@
         show()
 
     def get_data(self):
-        self.text_file_pos.set_text("File Position: %d" % 
(self.hfile.tell()//8))
-        iq = scipy.fromfile(self.hfile, dtype=scipy.complex64, 
count=self.block_length)
+        self.text_file_pos.set_text("File Position: %d" % 
(self.hfile.tell()//self.sizeof_data))
+        iq = scipy.fromfile(self.hfile, dtype=self.datatype, 
count=self.block_length)
         #print "Read in %d items" % len(iq)
         if(len(iq) == 0):
             print "End of File"
@@ -81,7 +84,7 @@
             
     def make_plots(self):
         # if specified on the command-line, set file pointer
-        self.hfile.seek(16*self.start, 1)
+        self.hfile.seek(self.sizeof_data*self.start, 1)
 
         self.get_data()
         
@@ -150,8 +153,8 @@
 
     def step_backward(self):
         # Step back in file position
-        if(self.hfile.tell() >= 16*self.block_length ):
-            self.hfile.seek(-16*self.block_length, 1)
+        if(self.hfile.tell() >= 2*self.sizeof_data*self.block_length ):
+            self.hfile.seek(-2*self.sizeof_data*self.block_length, 1)
         else:
             self.hfile.seek(-self.hfile.tell(),1)
         self.get_data()

Copied: gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_data.py 
(from rev 7528, gnuradio/trunk/gnuradio-core/src/utils/gr_plot_data.py)
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_data.py      
                        (rev 0)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_data.py      
2008-02-13 18:39:51 UTC (rev 7655)
@@ -0,0 +1,189 @@
+#!/usr/bin/env python
+#
+# Copyright 2007,2008 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.
+# 
+
+import scipy
+from pylab import *
+from optparse import OptionParser
+
+matplotlib.interactive(True)
+matplotlib.use('TkAgg')
+
+class plot_data:
+    def __init__(self, datatype, filenames, options):
+        self.hfile = list()
+        self.legend_text = list()
+        for f in filenames:
+            self.hfile.append(open(f, "r"))
+            self.legend_text.append(f)
+
+        self.block_length = options.block
+        self.start = options.start
+        self.sample_rate = options.sample_rate
+
+        self.datatype = datatype
+        self.sizeof_data = datatype().nbytes    # number of bytes per sample 
in file
+
+        self.axis_font_size = 16
+        self.label_font_size = 18
+        self.title_font_size = 20
+        self.text_size = 22
+
+        # Setup PLOT
+        self.fig = figure(1, figsize=(16, 9), facecolor='w')
+        rcParams['xtick.labelsize'] = self.axis_font_size
+        rcParams['ytick.labelsize'] = self.axis_font_size
+        
+        self.text_file_pos = figtext(0.10, 0.88, "File Position: ", 
weight="heavy", size=self.text_size)
+        self.text_block    = figtext(0.40, 0.88, ("Block Size: %d" % 
self.block_length),
+                                     weight="heavy", size=self.text_size)
+        self.text_sr       = figtext(0.60, 0.88, ("Sample Rate: %.2f" % 
self.sample_rate),
+                                     weight="heavy", size=self.text_size)
+        self.make_plots()
+
+        self.button_left_axes = self.fig.add_axes([0.45, 0.01, 0.05, 0.05], 
frameon=True)
+        self.button_left = Button(self.button_left_axes, "<")
+        self.button_left_callback = 
self.button_left.on_clicked(self.button_left_click)
+
+        self.button_right_axes = self.fig.add_axes([0.50, 0.01, 0.05, 0.05], 
frameon=True)
+        self.button_right = Button(self.button_right_axes, ">")
+        self.button_right_callback = 
self.button_right.on_clicked(self.button_right_click)
+
+        self.xlim = self.sp_f.get_xlim()
+
+        self.manager = get_current_fig_manager()
+        connect('key_press_event', self.click)
+        show()
+        
+    def get_data(self, hfile):
+        self.text_file_pos.set_text("File Position: %d" % 
(hfile.tell()//self.sizeof_data))
+        f = scipy.fromfile(hfile, dtype=self.datatype, count=self.block_length)
+        #print "Read in %d items" % len(self.f)
+        if(len(f) == 0):
+            print "End of File"
+        else:
+            self.f = f
+            self.time = [i*(1/self.sample_rate) for i in range(len(self.f))]
+        
+    def make_plots(self):
+        self.sp_f = self.fig.add_subplot(2,1,1, position=[0.075, 0.2, 0.875, 
0.6])
+        self.sp_f.set_title(("Amplitude"), fontsize=self.title_font_size, 
fontweight="bold")
+        self.sp_f.set_xlabel("Time (s)", fontsize=self.label_font_size, 
fontweight="bold")
+        self.sp_f.set_ylabel("Amplitude (V)", fontsize=self.label_font_size, 
fontweight="bold")
+        self.plot_f = list()
+
+        maxval = -1e12
+        minval = 1e12
+
+        for hf in self.hfile:
+            # if specified on the command-line, set file pointer
+            hf.seek(self.sizeof_data*self.start, 1)
+
+            self.get_data(hf)
+        
+            # Subplot for real and imaginary parts of signal
+            self.plot_f += plot(self.time, self.f, 'o-')
+            maxval = max(maxval, max(self.f))
+            minval = min(minval, min(self.f))
+
+        self.sp_f.set_ylim([1.5*minval, 1.5*maxval])
+
+        self.leg = self.sp_f.legend(self.plot_f, self.legend_text)
+
+        draw()
+
+    def update_plots(self):
+        maxval = -1e12
+        minval = 1e12
+        for hf,p in zip(self.hfile,self.plot_f):
+            self.get_data(hf)
+            p.set_data([self.time, self.f])
+            maxval = max(maxval, max(self.f))
+            minval = min(minval, min(self.f))
+
+        self.sp_f.set_ylim([1.5*minval, 1.5*maxval])
+        
+        draw()
+        
+    def click(self, event):
+        forward_valid_keys = [" ", "down", "right"]
+        backward_valid_keys = ["up", "left"]
+
+        if(find(event.key, forward_valid_keys)):
+            self.step_forward()
+            
+        elif(find(event.key, backward_valid_keys)):
+            self.step_backward()
+
+    def button_left_click(self, event):
+        self.step_backward()
+
+    def button_right_click(self, event):
+        self.step_forward()
+
+    def step_forward(self):
+        self.update_plots()
+
+    def step_backward(self):
+        for hf in self.hfile:
+            # Step back in file position
+            if(hf.tell() >= 2*self.sizeof_data*self.block_length ):
+                hf.seek(-2*self.sizeof_data*self.block_length, 1)
+            else:
+                hf.seek(-hf.tell(),1)
+        self.update_plots()
+        
+            
+
+#FIXME: there must be a way to do this with a Python builtin
+def find(item_in, list_search):
+    for l in list_search:
+        if item_in == l:
+            return True
+    return False
+
+def main():
+    usage="%prog: [options] input_filenames"
+    description = "This is just a test program for this class. It should 
really be called by gr_plot_<datatype>.py for a specific type of file data 
(float, int, byte, etc.)."
+
+    parser = OptionParser(conflict_handler="resolve", usage=usage, 
description=description)
+    parser.add_option("-B", "--block", type="int", default=1000,
+                      help="Specify the block size [default=%default]")
+    parser.add_option("-s", "--start", type="int", default=0,
+                      help="Specify where to start in the file 
[default=%default]")
+    parser.add_option("-R", "--sample-rate", type="float", default=1.0,
+                      help="Set the sampler rate of the data 
[default=%default]")
+    
+    (options, args) = parser.parse_args ()
+    if len(args) < 1:
+        parser.print_help()
+        raise SystemExit, 1
+    filenames = args
+             
+    datatype=scipy.float32
+    dc = plot_data(datatype, filenames, options)
+
+if __name__ == "__main__":
+    try:
+        main()
+    except KeyboardInterrupt:
+        pass
+    

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:38:11 UTC (rev 7654)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_fft_c.py     
2008-02-13 18:39:51 UTC (rev 7655)
@@ -36,6 +36,9 @@
         self.start = options.start
         self.sample_rate = options.sample_rate
 
+        self.datatype = scipy.complex64
+        self.sizeof_data = self.datatype().nbytes    # number of bytes per 
sample in file
+
         self.axis_font_size = 16
         self.label_font_size = 18
         self.title_font_size = 20
@@ -70,8 +73,8 @@
         show()
         
     def get_data(self):
-        self.text_file_pos.set_text("File Position: %d" % 
(self.hfile.tell()//8))
-        self.iq = scipy.fromfile(self.hfile, dtype=scipy.complex64, 
count=self.block_length)
+        self.text_file_pos.set_text("File Position: %d" % 
(self.hfile.tell()//self.sizeof_data))
+        self.iq = scipy.fromfile(self.hfile, dtype=self.datatype, 
count=self.block_length)
         #print "Read in %d items" % len(self.iq)
         if(len(self.iq) == 0):
             print "End of File"
@@ -100,7 +103,7 @@
         
     def make_plots(self):
         # if specified on the command-line, set file pointer
-        self.hfile.seek(16*self.start, 1)
+        self.hfile.seek(self.sizeof_data*self.start, 1)
 
         self.get_data()
         
@@ -175,8 +178,8 @@
 
     def step_backward(self):
         # Step back in file position
-        if(self.hfile.tell() >= 16*self.block_length ):
-            self.hfile.seek(-16*self.block_length, 1)
+        if(self.hfile.tell() >= 2*self.sizeof_data*self.block_length ):
+            self.hfile.seek(-2*self.sizeof_data*self.block_length, 1)
         else:
             self.hfile.seek(-self.hfile.tell(),1)
         self.get_data()

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:38:11 UTC (rev 7654)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_fft_f.py     
2008-02-13 18:39:51 UTC (rev 7655)
@@ -36,6 +36,9 @@
         self.start = options.start
         self.sample_rate = options.sample_rate
 
+        self.datatype = scipy.float32
+        self.sizeof_data = self.datatype().nbytes    # number of bytes per 
sample in file
+
         self.axis_font_size = 16
         self.label_font_size = 18
         self.title_font_size = 20
@@ -70,8 +73,8 @@
         show()
         
     def get_data(self):
-        self.text_file_pos.set_text("File Position: %d" % 
(self.hfile.tell()//4))
-        self.floats = scipy.fromfile(self.hfile, dtype=scipy.float32, 
count=self.block_length)
+        self.text_file_pos.set_text("File Position: %d" % 
(self.hfile.tell()//self.sizeof_data))
+        self.floats = scipy.fromfile(self.hfile, dtype=self.datatype, 
count=self.block_length)
         #print "Read in %d items" % len(self.floats)
         if(len(self.floats) == 0):
             print "End of File"
@@ -103,7 +106,7 @@
         
     def make_plots(self):
         # if specified on the command-line, set file pointer
-        self.hfile.seek(16*self.start, 1)
+        self.hfile.seek(self.sizeof_data*self.start, 1)
 
         self.get_data()
         
@@ -177,8 +180,8 @@
 
     def step_backward(self):
         # Step back in file position
-        if(self.hfile.tell() >= 8*self.block_length ):
-            self.hfile.seek(-8*self.block_length, 1)
+        if(self.hfile.tell() >= 2*self.sizeof_data*self.block_length ):
+            self.hfile.seek(-2*self.sizeof_data*self.block_length, 1)
         else:
             self.hfile.seek(-self.hfile.tell(),1)
         self.get_data()

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:38:11 UTC (rev 7654)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_float.py     
2008-02-13 18:39:51 UTC (rev 7655)
@@ -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
 # 
@@ -21,124 +21,11 @@
 # 
 
 import scipy
-from pylab import *
 from optparse import OptionParser
+from gr_plot_data import plot_data
 
-matplotlib.interactive(True)
-matplotlib.use('TkAgg')
-
-class draw_fft_c:
-    def __init__(self, filename, options):
-        self.hfile = open(filename, "r")
-        self.block_length = options.block
-        self.start = options.start
-        self.sample_rate = options.sample_rate
-
-        self.axis_font_size = 16
-        self.label_font_size = 18
-        self.title_font_size = 20
-        self.text_size = 22
-
-        # Setup PLOT
-        self.fig = figure(1, figsize=(16, 9), facecolor='w')
-        rcParams['xtick.labelsize'] = self.axis_font_size
-        rcParams['ytick.labelsize'] = self.axis_font_size
-        
-        self.text_file     = figtext(0.10, 0.94, ("File: %s" % filename), 
weight="heavy", size=self.text_size)
-        self.text_file_pos = figtext(0.10, 0.88, "File Position: ", 
weight="heavy", size=self.text_size)
-        self.text_block    = figtext(0.40, 0.88, ("Block Size: %d" % 
self.block_length),
-                                     weight="heavy", size=self.text_size)
-        self.text_sr       = figtext(0.60, 0.88, ("Sample Rate: %.2f" % 
self.sample_rate),
-                                     weight="heavy", size=self.text_size)
-        self.make_plots()
-
-        self.button_left_axes = self.fig.add_axes([0.45, 0.01, 0.05, 0.05], 
frameon=True)
-        self.button_left = Button(self.button_left_axes, "<")
-        self.button_left_callback = 
self.button_left.on_clicked(self.button_left_click)
-
-        self.button_right_axes = self.fig.add_axes([0.50, 0.01, 0.05, 0.05], 
frameon=True)
-        self.button_right = Button(self.button_right_axes, ">")
-        self.button_right_callback = 
self.button_right.on_clicked(self.button_right_click)
-
-        self.xlim = self.sp_f.get_xlim()
-
-        self.manager = get_current_fig_manager()
-        connect('key_press_event', self.click)
-        show()
-        
-    def get_data(self):
-        self.text_file_pos.set_text("File Position: %d" % 
(self.hfile.tell()//4))
-        f = scipy.fromfile(self.hfile, dtype=scipy.float32, 
count=self.block_length)
-        #print "Read in %d items" % len(self.f)
-        if(len(f) == 0):
-            print "End of File"
-        else:
-            self.f = f
-            self.time = [i*(1/self.sample_rate) for i in range(len(self.f))]
-        
-    def make_plots(self):
-        # if specified on the command-line, set file pointer
-        self.hfile.seek(8*self.start, 1)
-
-        self.get_data()
-        
-        # Subplot for real and imaginary parts of signal
-        self.sp_f = self.fig.add_subplot(2,1,1, position=[0.075, 0.2, 0.875, 
0.6])
-        self.sp_f.set_title(("Amplitude"), fontsize=self.title_font_size, 
fontweight="bold")
-        self.sp_f.set_xlabel("Time (s)", fontsize=self.label_font_size, 
fontweight="bold")
-        self.sp_f.set_ylabel("Amplitude (V)", fontsize=self.label_font_size, 
fontweight="bold")
-        self.plot_f = plot(self.time, self.f, 'bo-')
-        self.sp_f.set_ylim([1.5*min(self.f),
-                            1.5*max(self.f)])
-
-        draw()
-
-    def update_plots(self):
-        self.plot_f[0].set_data([self.time, self.f])
-        self.sp_f.set_ylim([1.5*min(self.f),
-                            1.5*max(self.f)])
-        draw()
-        
-    def click(self, event):
-        forward_valid_keys = [" ", "down", "right"]
-        backward_valid_keys = ["up", "left"]
-
-        if(find(event.key, forward_valid_keys)):
-            self.step_forward()
-            
-        elif(find(event.key, backward_valid_keys)):
-            self.step_backward()
-
-    def button_left_click(self, event):
-        self.step_backward()
-
-    def button_right_click(self, event):
-        self.step_forward()
-
-    def step_forward(self):
-        self.get_data()
-        self.update_plots()
-
-    def step_backward(self):
-        # Step back in file position
-        if(self.hfile.tell() >= 8*self.block_length ):
-            self.hfile.seek(-8*self.block_length, 1)
-        else:
-            self.hfile.seek(-self.hfile.tell(),1)
-        self.get_data()
-        self.update_plots()
-        
-            
-
-#FIXME: there must be a way to do this with a Python builtin
-def find(item_in, list_search):
-    for l in list_search:
-        if item_in == l:
-            return True
-    return False
-
 def main():
-    usage="%prog: [options] input_filename"
+    usage="%prog: [options] input_filenames"
     description = "Takes a GNU Radio floating point binary file and displays 
the samples versus time. You can set the block size to specify how many points 
to read in at a time and the start position in the file. By default, the system 
assumes a sample rate of 1, so in time, each sample is plotted versus the 
sample number. To set a true time axis, set the sample rate (-R or 
--sample-rate) to the sample rate used when capturing the samples."
 
     parser = OptionParser(conflict_handler="resolve", usage=usage, 
description=description)
@@ -150,12 +37,13 @@
                       help="Set the sampler rate of the data 
[default=%default]")
     
     (options, args) = parser.parse_args ()
-    if len(args) != 1:
+    if len(args) < 1:
         parser.print_help()
         raise SystemExit, 1
-    filename = args[0]
+    filenames = args
 
-    dc = draw_fft_c(filename, options)
+    datatype=scipy.float32
+    dc = plot_data(datatype, filenames, options)
 
 if __name__ == "__main__":
     try:

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:38:11 UTC (rev 7654)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_int.py       
2008-02-13 18:39:51 UTC (rev 7655)
@@ -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
 # 
@@ -21,125 +21,12 @@
 # 
 
 import scipy
-from pylab import *
 from optparse import OptionParser
+from gr_plot_data import plot_data
 
-matplotlib.interactive(True)
-matplotlib.use('TkAgg')
-
-class draw_fft_c:
-    def __init__(self, filename, options):
-        self.hfile = open(filename, "r")
-        self.block_length = options.block
-        self.start = options.start
-        self.sample_rate = options.sample_rate
-
-        self.axis_font_size = 16
-        self.label_font_size = 18
-        self.title_font_size = 20
-        self.text_size = 22
-
-        # Setup PLOT
-        self.fig = figure(1, figsize=(16, 9), facecolor='w')
-        rcParams['xtick.labelsize'] = self.axis_font_size
-        rcParams['ytick.labelsize'] = self.axis_font_size
-        
-        self.text_file     = figtext(0.10, 0.94, ("File: %s" % filename), 
weight="heavy", size=self.text_size)
-        self.text_file_pos = figtext(0.10, 0.88, "File Position: ", 
weight="heavy", size=self.text_size)
-        self.text_block    = figtext(0.40, 0.88, ("Block Size: %d" % 
self.block_length),
-                                     weight="heavy", size=self.text_size)
-        self.text_sr       = figtext(0.60, 0.88, ("Sample Rate: %.2f" % 
self.sample_rate),
-                                     weight="heavy", size=self.text_size)
-        self.make_plots()
-
-        self.button_left_axes = self.fig.add_axes([0.45, 0.01, 0.05, 0.05], 
frameon=True)
-        self.button_left = Button(self.button_left_axes, "<")
-        self.button_left_callback = 
self.button_left.on_clicked(self.button_left_click)
-
-        self.button_right_axes = self.fig.add_axes([0.50, 0.01, 0.05, 0.05], 
frameon=True)
-        self.button_right = Button(self.button_right_axes, ">")
-        self.button_right_callback = 
self.button_right.on_clicked(self.button_right_click)
-
-        self.xlim = self.sp_f.get_xlim()
-
-        self.manager = get_current_fig_manager()
-        connect('key_press_event', self.click)
-        show()
-        
-    def get_data(self):
-        self.text_file_pos.set_text("File Position: %d" % 
(self.hfile.tell()//4))
-        f = scipy.fromfile(self.hfile, dtype=scipy.int32, 
count=self.block_length)
-        #print "Read in %d items" % len(self.f)
-        if(len(f) == 0):
-            print "End of File"
-        else:
-            self.f = f
-            self.time = [i*(1/self.sample_rate) for i in range(len(self.f))]
-        
-    def make_plots(self):
-        # if specified on the command-line, set file pointer
-        self.hfile.seek(8*self.start, 1)
-
-        self.get_data()
-        
-        # Subplot for real and imaginary parts of signal
-        self.sp_f = self.fig.add_subplot(2,1,1, position=[0.075, 0.2, 0.875, 
0.6])
-        self.sp_f.set_title(("Amplitude"), fontsize=self.title_font_size, 
fontweight="bold")
-        self.sp_f.set_xlabel("Time (s)", fontsize=self.label_font_size, 
fontweight="bold")
-        self.sp_f.set_ylabel("Amplitude (V)", fontsize=self.label_font_size, 
fontweight="bold")
-        self.plot_f = plot(self.time, self.f, 'bo-')
-        self.sp_f.set_ylim([1.5*min(self.f),
-                            1.5*max(self.f)])
-
-        draw()
-
-    def update_plots(self):
-        self.plot_f[0].set_data([self.time, self.f])
-        self.sp_f.set_ylim([1.5*min(self.f),
-                            1.5*max(self.f)])
-        draw()
-        
-    def click(self, event):
-        forward_valid_keys = [" ", "down", "right"]
-        backward_valid_keys = ["up", "left"]
-
-        if(find(event.key, forward_valid_keys)):
-            self.step_forward()
-            
-        elif(find(event.key, backward_valid_keys)):
-            self.step_backward()
-
-    def button_left_click(self, event):
-        self.step_backward()
-
-    def button_right_click(self, event):
-        self.step_forward()
-
-    def step_forward(self):
-        self.get_data()
-        self.update_plots()
-
-    def step_backward(self):
-        # Step back in file position
-        if(self.hfile.tell() >= 8*self.block_length ):
-            self.hfile.seek(-8*self.block_length, 1)
-        else:
-            self.hfile.seek(-self.hfile.tell(),1)
-        self.get_data()
-        self.update_plots()
-        
-            
-
-#FIXME: there must be a way to do this with a Python builtin
-def find(item_in, list_search):
-    for l in list_search:
-        if item_in == l:
-            return True
-    return False
-
 def main():
-    usage="%prog: [options] input_filename"
-    description = "Takes a GNU Radio floating point binary file and displays 
the samples versus time. You can set the block size to specify how many points 
to read in at a time and the start position in the file. By default, the system 
assumes a sample rate of 1, so in time, each sample is plotted versus the 
sample number. To set a true time axis, set the sample rate (-R or 
--sample-rate) to the sample rate used when capturing the samples."
+    usage="%prog: [options] input_filenames"
+    description = "Takes a GNU Radio integer binary file and displays the 
samples versus time. You can set the block size to specify how many points to 
read in at a time and the start position in the file. By default, the system 
assumes a sample rate of 1, so in time, each sample is plotted versus the 
sample number. To set a true time axis, set the sample rate (-R or 
--sample-rate) to the sample rate used when capturing the samples."
 
     parser = OptionParser(conflict_handler="resolve", usage=usage, 
description=description)
     parser.add_option("-B", "--block", type="int", default=1000,
@@ -150,12 +37,13 @@
                       help="Set the sampler rate of the data 
[default=%default]")
     
     (options, args) = parser.parse_args ()
-    if len(args) != 1:
+    if len(args) < 1:
         parser.print_help()
         raise SystemExit, 1
-    filename = args[0]
+    filenames = args
 
-    dc = draw_fft_c(filename, options)
+    datatype=scipy.int32
+    dc = plot_data(datatype, filenames, options)
 
 if __name__ == "__main__":
     try:

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:38:11 UTC (rev 7654)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_iq.py        
2008-02-13 18:39:51 UTC (rev 7655)
@@ -34,6 +34,9 @@
         self.start = options.start
         self.sample_rate = options.sample_rate
 
+        self.datatype = scipy.complex64
+        self.sizeof_data = self.datatype().nbytes    # number of bytes per 
sample in file
+
         self.axis_font_size = 16
         self.label_font_size = 18
         self.title_font_size = 20
@@ -67,8 +70,8 @@
         show()
 
     def get_data(self):
-        self.text_file_pos.set_text("File Position: %d" % 
(self.hfile.tell()//8))
-        self.iq = scipy.fromfile(self.hfile, dtype=scipy.complex64, 
count=self.block_length)
+        self.text_file_pos.set_text("File Position: %d" % 
(self.hfile.tell()//self.sizeof_data))
+        self.iq = scipy.fromfile(self.hfile, dtype=self.datatype, 
count=self.block_length)
         #print "Read in %d items" % len(self.iq)
         if(len(self.iq) == 0):
             print "End of File"
@@ -79,7 +82,7 @@
             
     def make_plots(self):
         # if specified on the command-line, set file pointer
-        self.hfile.seek(16*self.start, 1)
+        self.hfile.seek(self.sizeof_data*self.start, 1)
 
         self.get_data()
         
@@ -123,8 +126,8 @@
 
     def step_backward(self):
         # Step back in file position
-        if(self.hfile.tell() >= 16*self.block_length ):
-            self.hfile.seek(-16*self.block_length, 1)
+        if(self.hfile.tell() >= 2*self.sizeof_data*self.block_length ):
+            self.hfile.seek(-2*self.sizeof_data*self.block_length, 1)
         else:
             self.hfile.seek(-self.hfile.tell(),1)
         self.get_data()

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:38:11 UTC (rev 7654)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_short.py     
2008-02-13 18:39:51 UTC (rev 7655)
@@ -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
 # 
@@ -21,125 +21,12 @@
 # 
 
 import scipy
-from pylab import *
 from optparse import OptionParser
+from gr_plot_data import plot_data
 
-matplotlib.interactive(True)
-matplotlib.use('TkAgg')
-
-class draw_fft_c:
-    def __init__(self, filename, options):
-        self.hfile = open(filename, "r")
-        self.block_length = options.block
-        self.start = options.start
-        self.sample_rate = options.sample_rate
-
-        self.axis_font_size = 16
-        self.label_font_size = 18
-        self.title_font_size = 20
-        self.text_size = 22
-
-        # Setup PLOT
-        self.fig = figure(1, figsize=(16, 9), facecolor='w')
-        rcParams['xtick.labelsize'] = self.axis_font_size
-        rcParams['ytick.labelsize'] = self.axis_font_size
-        
-        self.text_file     = figtext(0.10, 0.94, ("File: %s" % filename), 
weight="heavy", size=self.text_size)
-        self.text_file_pos = figtext(0.10, 0.88, "File Position: ", 
weight="heavy", size=self.text_size)
-        self.text_block    = figtext(0.40, 0.88, ("Block Size: %d" % 
self.block_length),
-                                     weight="heavy", size=self.text_size)
-        self.text_sr       = figtext(0.60, 0.88, ("Sample Rate: %.2f" % 
self.sample_rate),
-                                     weight="heavy", size=self.text_size)
-        self.make_plots()
-
-        self.button_left_axes = self.fig.add_axes([0.45, 0.01, 0.05, 0.05], 
frameon=True)
-        self.button_left = Button(self.button_left_axes, "<")
-        self.button_left_callback = 
self.button_left.on_clicked(self.button_left_click)
-
-        self.button_right_axes = self.fig.add_axes([0.50, 0.01, 0.05, 0.05], 
frameon=True)
-        self.button_right = Button(self.button_right_axes, ">")
-        self.button_right_callback = 
self.button_right.on_clicked(self.button_right_click)
-
-        self.xlim = self.sp_f.get_xlim()
-
-        self.manager = get_current_fig_manager()
-        connect('key_press_event', self.click)
-        show()
-        
-    def get_data(self):
-        self.text_file_pos.set_text("File Position: %d" % 
(self.hfile.tell()//2))
-        f = scipy.fromfile(self.hfile, dtype=scipy.int16, 
count=self.block_length)
-        #print "Read in %d items" % len(self.f)
-        if(len(f) == 0):
-            print "End of File"
-        else:
-            self.f = f
-            self.time = [i*(1/self.sample_rate) for i in range(len(self.f))]
-        
-    def make_plots(self):
-        # if specified on the command-line, set file pointer
-        self.hfile.seek(8*self.start, 1)
-
-        self.get_data()
-        
-        # Subplot for real and imaginary parts of signal
-        self.sp_f = self.fig.add_subplot(2,1,1, position=[0.075, 0.2, 0.875, 
0.6])
-        self.sp_f.set_title(("Amplitude"), fontsize=self.title_font_size, 
fontweight="bold")
-        self.sp_f.set_xlabel("Time (s)", fontsize=self.label_font_size, 
fontweight="bold")
-        self.sp_f.set_ylabel("Amplitude (V)", fontsize=self.label_font_size, 
fontweight="bold")
-        self.plot_f = plot(self.time, self.f, 'bo-')
-        self.sp_f.set_ylim([1.5*min(self.f),
-                            1.5*max(self.f)])
-
-        draw()
-
-    def update_plots(self):
-        self.plot_f[0].set_data([self.time, self.f])
-        self.sp_f.set_ylim([1.5*min(self.f),
-                            1.5*max(self.f)])
-        draw()
-        
-    def click(self, event):
-        forward_valid_keys = [" ", "down", "right"]
-        backward_valid_keys = ["up", "left"]
-
-        if(find(event.key, forward_valid_keys)):
-            self.step_forward()
-            
-        elif(find(event.key, backward_valid_keys)):
-            self.step_backward()
-
-    def button_left_click(self, event):
-        self.step_backward()
-
-    def button_right_click(self, event):
-        self.step_forward()
-
-    def step_forward(self):
-        self.get_data()
-        self.update_plots()
-
-    def step_backward(self):
-        # Step back in file position
-        if(self.hfile.tell() >= 4*self.block_length ):
-            self.hfile.seek(-4*self.block_length, 1)
-        else:
-            self.hfile.seek(-self.hfile.tell(),1)
-        self.get_data()
-        self.update_plots()
-        
-            
-
-#FIXME: there must be a way to do this with a Python builtin
-def find(item_in, list_search):
-    for l in list_search:
-        if item_in == l:
-            return True
-    return False
-
 def main():
-    usage="%prog: [options] input_filename"
-    description = "Takes a GNU Radio floating point binary file and displays 
the samples versus time. You can set the block size to specify how many points 
to read in at a time and the start position in the file. By default, the system 
assumes a sample rate of 1, so in time, each sample is plotted versus the 
sample number. To set a true time axis, set the sample rate (-R or 
--sample-rate) to the sample rate used when capturing the samples."
+    usage="%prog: [options] input_filenames"
+    description = "Takes a GNU Radio short integer binary file and displays 
the samples versus time. You can set the block size to specify how many points 
to read in at a time and the start position in the file. By default, the system 
assumes a sample rate of 1, so in time, each sample is plotted versus the 
sample number. To set a true time axis, set the sample rate (-R or 
--sample-rate) to the sample rate used when capturing the samples."
 
     parser = OptionParser(conflict_handler="resolve", usage=usage, 
description=description)
     parser.add_option("-B", "--block", type="int", default=1000,
@@ -150,12 +37,13 @@
                       help="Set the sampler rate of the data 
[default=%default]")
     
     (options, args) = parser.parse_args ()
-    if len(args) != 1:
+    if len(args) < 1:
         parser.print_help()
         raise SystemExit, 1
-    filename = args[0]
+    filenames = args
 
-    dc = draw_fft_c(filename, options)
+    datatype=scipy.int16
+    dc = plot_data(datatype, filenames, options)
 
 if __name__ == "__main__":
     try: