10 files changed, 1372 insertions, 189 deletions
diff --git a/gnuradio-core/src/utils/README b/gnuradio-core/src/utils/README
new file mode 100644
index 0000000000..0c4657ba9d
--- /dev/null
+++ b/gnuradio-core/src/utils/README
@@ -0,0 +1,40 @@
+* gr_plot_*.py:
+These are a collection of Python scripts to enable viewing and analysis of files produced by GNU Radio flow graphs. Most of them work off complex data produced by digital waveforms.
+
+
+** gr_plot_float.py:
+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.
+
+
+
+** gr_plot_iq.py:
+Takes a GNU Radio complex binary file and displays the I&Q data 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.
+
+
+
+** gr_plot_const.py:
+Takes a GNU Radio complex binary file and displays the I&Q data versus time and the constellation plot (I vs. Q). 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.
+
+
+
+** gr_plot_fft_c.py:
+Takes a GNU Radio complex binary file and displays the I&Q data versus time as well as the frequency domain (FFT) plot. The y-axis values are plotted assuming volts as the amplitude of the I&Q streams and converted into dBm in the frequency domain (the 1/N power adjustment out of the FFT is performed internally).
+
+The script plots a certain block of data at a time, specified on the command line as -B or --block. This value defaults to 1000. The start position in the file can be set by specifying -s or --start and defaults to 0 (the start of 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 and frequency axis, set the sample rate (-R or --sample-rate) to the sample rate used when capturing the samples.
+
+
+
+** gr_plot_fft_f.py:
+Takes a GNU Radio floating point binary file and displays the samples versus time as well as the frequency domain (FFT) plot. The y-axis values are plotted assuming volts as the amplitude of the I&Q streams and converted into dBm in the frequency domain (the 1/N power adjustment out of the FFT is performed internally).
+
+The script plots a certain block of data at a time, specified on the command line as -B or --block. This value defaults to 1000. The start position in the file can be set by specifying -s or --start and defaults to 0 (the start of 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 and frequency axis, set the sample rate (-R or --sample-rate) to the sample rate used when capturing the samples.
diff --git a/gnuradio-core/src/utils/gr_plot_char.py b/gnuradio-core/src/utils/gr_plot_char.py
new file mode 100755
index 0000000000..6f799cdd2a
--- /dev/null
+++ b/gnuradio-core/src/utils/gr_plot_char.py
@@ -0,0 +1,165 @@
+#!/usr/bin/env python
+#
+# Copyright 2007 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 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."
+
+    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
+    filename = args[0]
+
+    dc = draw_fft_c(filename, options)
+
+if __name__ == "__main__":
+    try:
+        main()
+    except KeyboardInterrupt:
+        pass
+    
diff --git a/gnuradio-core/src/utils/gr_plot_const.py b/gnuradio-core/src/utils/gr_plot_const.py
index effda3e0cd..bbcbb85cc2 100755
--- a/gnuradio-core/src/utils/gr_plot_const.py
+++ b/gnuradio-core/src/utils/gr_plot_const.py
@@ -20,88 +20,171 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import pylab, math
+import scipy
 from pylab import *
-import struct, sys
+from matplotlib.font_manager import fontManager, FontProperties
 from optparse import OptionParser
 
-import gr_read_binary
+matplotlib.interactive(True)
+matplotlib.use('TkAgg')
 
-class zoom:
-    def __init__(self, xdata, reals, imags, sp_iq, sp_const, plot_const, manager):
-        self.sp_iq = sp_iq
-        self.sp_const = sp_const
-        self.xaxis = xdata
-        self.reals = reals
-        self.imags = imags
-        self.plot_const = plot_const
-        self.manager = manager
+class draw_constellation:
+    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
+
+        # 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.95, ("File: %s" % filename), weight="heavy", size=16)
+        self.text_file_pos = figtext(0.10, 0.90, "File Position: ", weight="heavy", size=16)
+        self.text_block    = figtext(0.40, 0.90, ("Block Size: %d" % self.block_length),
+                                     weight="heavy", size=16)        
+        self.text_sr       = figtext(0.60, 0.90, ("Sample Rate: %.2f" % self.sample_rate),
+                                     weight="heavy", size=16)
+        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_iq.get_xlim()
-           
-    def __call__(self, event):
-        newxlim = self.sp_iq.get_xlim()
 
+        self.manager = get_current_fig_manager()
+        connect('draw_event', self.zoom)
+        connect('key_press_event', self.click)
+        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)
+        #print "Read in %d items" % len(iq)
+        if(len(iq) == 0):
+            print "End of File"
+        else:
+            self.reals = [r.real for r in iq]
+            self.imags = [i.imag for i in iq]
+
+            self.time = [i*(1/self.sample_rate) for i in range(len(self.reals))]
+            
+    def make_plots(self):
+        # if specified on the command-line, set file pointer
+        self.hfile.seek(16*self.start, 1)
+
+        self.get_data()
+        
+        # Subplot for real and imaginary parts of signal
+        self.sp_iq = self.fig.add_subplot(2,1,1, position=[0.075, 0.2, 0.4, 0.6])
+        self.sp_iq.set_title(("I&Q"), fontsize=self.title_font_size, fontweight="bold")
+        self.sp_iq.set_xlabel("Time (s)", fontsize=self.label_font_size, fontweight="bold")
+        self.sp_iq.set_ylabel("Amplitude (V)", fontsize=self.label_font_size, fontweight="bold")
+        self.plot_iq = plot(self.time, self.reals, 'bo-', self.time, self.imags, 'ro-')
+        self.sp_iq.axis([min(self.time), max(self.time),
+                         1.5*min([min(self.reals), min(self.imags)]),
+                         1.5*max([max(self.reals), max(self.imags)])])
+
+        # Subplot for constellation plot
+        self.sp_const = self.fig.add_subplot(2,2,1, position=[0.575, 0.2, 0.4, 0.6])
+        self.sp_const.set_title(("Constellation"), fontsize=self.title_font_size, fontweight="bold")
+        self.sp_const.set_xlabel("Inphase", fontsize=self.label_font_size, fontweight="bold")
+        self.sp_const.set_ylabel("Qaudrature", fontsize=self.label_font_size, fontweight="bold")
+        self.plot_const = plot(self.reals, self.imags, 'bo')
+        self.sp_const.axis([-2, 2, -2, 2])
+
+        draw()
+
+    def update_plots(self):
+        self.plot_iq[0].set_data([self.time, self.reals])
+        self.plot_iq[1].set_data([self.time, self.imags])
+        self.sp_iq.axis([min(self.time), max(self.time),
+                         1.5*min([min(self.reals), min(self.imags)]),
+                         1.5*max([max(self.reals), max(self.imags)])])
+
+        self.plot_const[0].set_data([self.reals, self.imags])
+        self.sp_const.axis([-2, 2, -2, 2])
+        draw()
+        
+    def zoom(self, event):
+        newxlim = self.sp_iq.get_xlim()
         if(newxlim != self.xlim):
             self.xlim = newxlim
-            r = self.reals[int(self.xlim[0]) : int(self.xlim[1])]
-            i = self.imags[int(self.xlim[0]) : int(self.xlim[1])]
+            r = self.reals[int(ceil(self.xlim[0])) : int(ceil(self.xlim[1]))]
+            i = self.imags[int(ceil(self.xlim[0])) : int(ceil(self.xlim[1]))]
 
             self.plot_const[0].set_data(r, i)
             self.sp_const.axis([-2, 2, -2, 2])
             self.manager.canvas.draw()
+            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() >= 16*self.block_length ):
+            self.hfile.seek(-16*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] output_filename"
-    parser = OptionParser(conflict_handler="resolve", usage=usage)
-    parser.add_option("-s", "--size", type="int", default=None,
-                      help="Specify the number of points to plot [default=%default]")
-    parser.add_option("", "--skip", type="int", default=None,
-                      help="Specify the number of points to skip [default=%default]")
+    usage="%prog: [options] input_filename"
+    description = "Takes a GNU Radio complex binary file and displays the I&Q data versus time and the constellation plot (I vs. Q). 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,
+                      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
     filename = args[0]
 
-    iq = gr_read_binary.read_complex_binary(filename)
-
-    if(options.skip is None):
-        options.skip = 0
-    
-    if((options.size is None) or ((options.skip+options.size) > len(iq[0]))):
-        options.size = len(iq[0]) - options.skip
-
-    reals = iq[0][options.skip : options.skip + options.size]
-    imags = iq[1][options.skip : options.skip + options.size]
-    x = range(options.skip, options.skip + options.size)
-    
-    # PLOT
-    f = figure(1, figsize=(16, 12), facecolor='w')
-    rcParams['xtick.labelsize'] = 16
-    rcParams['ytick.labelsize'] = 16
-
-    # Subplot for real and imaginary parts of signal
-    sp1 = f.add_subplot(2,1,1)
-    sp1.set_title(("I&Q"), fontsize=26, fontweight="bold")
-    sp1.set_xlabel("Time (s)", fontsize=20, fontweight="bold")
-    sp1.set_ylabel("Amplitude (V)", fontsize=20, fontweight="bold")
-    plot(x, reals, 'bo-', x, imags, 'ro-')
-
-    # Subplot for constellation plot
-    sp2 = f.add_subplot(2,1,2)
-    sp2.set_title(("Constellation"), fontsize=26, fontweight="bold")
-    sp2.set_xlabel("Inphase", fontsize=20, fontweight="bold")
-    sp2.set_ylabel("Qaudrature", fontsize=20, fontweight="bold")
-    p2 = plot(reals, imags, 'bo')
-    sp2.axis([-2, 2, -2, 2])
-    
-    manager = get_current_fig_manager()
-    zm = zoom(x, reals, imags, sp1, sp2, p2, manager)
-    connect('draw_event', zm)
-    
-    show()
+    dc = draw_constellation(filename, options)
 
 if __name__ == "__main__":
     try:
diff --git a/gnuradio-core/src/utils/gr_plot_fft_c.py b/gnuradio-core/src/utils/gr_plot_fft_c.py
new file mode 100755
index 0000000000..924566968e
--- /dev/null
+++ b/gnuradio-core/src/utils/gr_plot_fft_c.py
@@ -0,0 +1,221 @@
+#!/usr/bin/env python
+#
+# Copyright 2007 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
+from scipy import fftpack
+from math import log10
+
+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_iq.get_xlim()
+
+        self.manager = get_current_fig_manager()
+        connect('draw_event', self.zoom)
+        connect('key_press_event', self.click)
+        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)
+        #print "Read in %d items" % len(self.iq)
+        if(len(self.iq) == 0):
+            print "End of File"
+        else:
+            self.reals = [r.real for r in self.iq]
+            self.imags = [i.imag for i in self.iq]
+
+            self.iq_fft = self.dofft(self.iq)
+
+            self.time = [i*(1/self.sample_rate) for i in range(len(self.reals))]
+            self.freq = self.calc_freq(self.time, self.sample_rate)
+
+            
+    def dofft(self, iq):
+        N = len(iq)
+        iq_fft = fftpack.fftshift(scipy.fft(iq))       # fft and shift axis
+        iq_fft = [20*log10(abs(i/N)) for i in iq_fft]  # convert to decibels, adjust power
+        return iq_fft
+
+    def calc_freq(self, time, sample_rate):
+        N = len(time)
+        Fs = 1.0 / (max(time) - min(time))
+        Fn = 0.5 * sample_rate
+        freq = [-Fn + i*Fs for i in range(N)]
+        return freq
+        
+    def make_plots(self):
+        # if specified on the command-line, set file pointer
+        self.hfile.seek(16*self.start, 1)
+
+        self.get_data()
+        
+        # Subplot for real and imaginary parts of signal
+        self.sp_iq = self.fig.add_subplot(2,1,1, position=[0.075, 0.2, 0.4, 0.6])
+        self.sp_iq.set_title(("I&Q"), fontsize=self.title_font_size, fontweight="bold")
+        self.sp_iq.set_xlabel("Time (s)", fontsize=self.label_font_size, fontweight="bold")
+        self.sp_iq.set_ylabel("Amplitude (V)", fontsize=self.label_font_size, fontweight="bold")
+        self.plot_iq = plot(self.time, self.reals, 'bo-', self.time, self.imags, 'ro-')
+        self.sp_iq.set_ylim([1.5*min([min(self.reals), min(self.imags)]),
+                             1.5*max([max(self.reals), max(self.imags)])])
+
+        # Subplot for constellation plot
+        self.sp_fft = self.fig.add_subplot(2,2,1, position=[0.575, 0.2, 0.4, 0.6])
+        self.sp_fft.set_title(("FFT"), fontsize=self.title_font_size, fontweight="bold")
+        self.sp_fft.set_xlabel("Frequency (Hz)", fontsize=self.label_font_size, fontweight="bold")
+        self.sp_fft.set_ylabel("Power (dBm)", fontsize=self.label_font_size, fontweight="bold")
+        self.plot_fft = plot(self.freq, self.iq_fft, '-bo')
+        self.sp_fft.set_ylim([min(self.iq_fft)-10, max(self.iq_fft)+10])
+        
+        draw()
+
+    def update_plots(self):
+        self.plot_iq[0].set_data([self.time, self.reals])
+        self.plot_iq[1].set_data([self.time, self.imags])
+        self.sp_iq.set_ylim([1.5*min([min(self.reals), min(self.imags)]),
+                             1.5*max([max(self.reals), max(self.imags)])])
+
+        self.plot_fft[0].set_data([self.freq, self.iq_fft])
+        self.sp_fft.set_ylim([min(self.iq_fft)-10, max(self.iq_fft)+10])
+
+        draw()
+        
+    def zoom(self, event):
+        newxlim = self.sp_iq.get_xlim()
+        if(newxlim != self.xlim):
+            self.xlim = newxlim
+            xmin = max(0, int(ceil(self.sample_rate*self.xlim[0])))
+            xmax = min(int(ceil(self.sample_rate*self.xlim[1])), len(self.iq))
+
+            iq = self.iq[xmin : xmax]
+            time = self.time[xmin : xmax]
+            
+            iq_fft = self.dofft(iq)
+            freq = self.calc_freq(time, self.sample_rate)
+            
+            self.plot_fft[0].set_data(freq, iq_fft)
+            self.sp_fft.axis([min(freq), max(freq),
+                              min(iq_fft)-10, max(iq_fft)+10])
+
+            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() >= 16*self.block_length ):
+            self.hfile.seek(-16*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 complex binary file and displays the I&Q data versus time as well as the frequency domain (FFT) plot. The y-axis values are plotted assuming volts as the amplitude of the I&Q streams and converted into dBm in the frequency domain (the 1/N power adjustment out of the FFT is performed internally). The script plots a certain block of data at a time, specified on the command line as -B or --block. This value defaults to 1000. The start position in the file can be set by specifying -s or --start and defaults to 0 (the start of 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 and frequency 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,
+                      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
+    filename = args[0]
+
+    dc = draw_fft_c(filename, options)
+
+if __name__ == "__main__":
+    try:
+        main()
+    except KeyboardInterrupt:
+        pass
+    
+
+
diff --git a/gnuradio-core/src/utils/gr_plot_fft_f.py b/gnuradio-core/src/utils/gr_plot_fft_f.py
new file mode 100755
index 0000000000..717efdfb58
--- /dev/null
+++ b/gnuradio-core/src/utils/gr_plot_fft_f.py
@@ -0,0 +1,223 @@
+#!/usr/bin/env python
+#
+# Copyright 2007 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
+from scipy import fftpack
+from math import log10
+
+matplotlib.interactive(True)
+matplotlib.use('TkAgg')
+
+class draw_fft_f:
+    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('draw_event', self.zoom)
+        connect('key_press_event', self.click)
+        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)
+        #print "Read in %d items" % len(self.floats)
+        if(len(self.floats) == 0):
+            print "End of File"
+        else:
+            self.f_fft = self.dofft(self.floats)
+
+            self.time = [i*(1/self.sample_rate) for i in range(len(self.floats))]
+            self.freq = self.calc_freq(self.time, self.sample_rate)
+            
+    def dofft(self, f):
+        N = len(f)
+        f_fft = fftpack.fftshift(scipy.fft(f))       # fft and shift axis
+        f_dB = list()
+        for f in f_fft:
+            try:
+                f_dB.append(20*log10(abs(f/N)))  # convert to decibels, adjust power
+            except OverflowError:                # protect against taking log(0)
+                f = 1e-14                        # not sure if this is the best way to do this
+                f_dB.append(20*log10(abs(f/N)))
+                
+        return f_dB
+
+    def calc_freq(self, time, sample_rate):
+        N = len(time)
+        Fs = 1.0 / (max(time) - min(time))
+        Fn = 0.5 * sample_rate
+        freq = [-Fn + i*Fs for i in range(N)]
+        return freq
+        
+    def make_plots(self):
+        # if specified on the command-line, set file pointer
+        self.hfile.seek(16*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.4, 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.floats, 'bo-')
+        self.sp_f.set_ylim([1.5*min(self.floats),
+                            1.5*max(self.floats)])
+
+        # Subplot for constellation plot
+        self.sp_fft = self.fig.add_subplot(2,2,1, position=[0.575, 0.2, 0.4, 0.6])
+        self.sp_fft.set_title(("FFT"), fontsize=self.title_font_size, fontweight="bold")
+        self.sp_fft.set_xlabel("Frequency (Hz)", fontsize=self.label_font_size, fontweight="bold")
+        self.sp_fft.set_ylabel("Power (dBm)", fontsize=self.label_font_size, fontweight="bold")
+        self.plot_fft = plot(self.freq, self.f_fft, '-bo')
+        self.sp_fft.set_ylim([min(self.f_fft)-10, max(self.f_fft)+10])
+        
+        draw()
+
+    def update_plots(self):
+        self.plot_f[0].set_data([self.time, self.floats])
+        self.sp_f.set_ylim([1.5*min(self.floats),
+                            1.5*max(self.floats)])
+
+        self.plot_fft[0].set_data([self.freq, self.f_fft])
+        self.sp_fft.set_ylim([min(self.f_fft)-10, max(self.f_fft)+10])
+
+        draw()
+        
+    def zoom(self, event):
+        newxlim = self.sp_f.get_xlim()
+        if(newxlim != self.xlim):
+            self.xlim = newxlim
+            xmin = max(0, int(ceil(self.sample_rate*self.xlim[0])))
+            xmax = min(int(ceil(self.sample_rate*self.xlim[1])), len(self.floats))
+
+            f = self.floats[xmin : xmax]
+            time = self.time[xmin : xmax]
+            
+            f_fft = self.dofft(f)
+            freq = self.calc_freq(time, self.sample_rate)
+                        
+            self.plot_fft[0].set_data(freq, f_fft)
+            self.sp_fft.axis([min(freq), max(freq),
+                              min(f_fft)-10, max(f_fft)+10])
+
+            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 sample data versus time as well as the frequency domain (FFT) plot. The y-axis values are plotted assuming volts as the amplitude of the I&Q streams and converted into dBm in the frequency domain (the 1/N power adjustment out of the FFT is performed internally). The script plots a certain block of data at a time, specified on the command line as -B or --block. This value defaults to 1000. The start position in the file can be set by specifying -s or --start and defaults to 0 (the start of 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 and frequency 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,
+                      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
+    filename = args[0]
+
+    dc = draw_fft_f(filename, options)
+
+if __name__ == "__main__":
+    try:
+        main()
+    except KeyboardInterrupt:
+        pass
+    
+
+
diff --git a/gnuradio-core/src/utils/gr_plot_float.py b/gnuradio-core/src/utils/gr_plot_float.py
index e4043a6408..473326012d 100755
--- a/gnuradio-core/src/utils/gr_plot_float.py
+++ b/gnuradio-core/src/utils/gr_plot_float.py
@@ -20,50 +20,142 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import pylab, math
+import scipy
 from pylab import *
-import struct, sys
 from optparse import OptionParser
 
-import gr_read_binary
+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] output_filename"
-    parser = OptionParser(conflict_handler="resolve", usage=usage)
-    parser.add_option("-s", "--size", type="int", default=None,
-                      help="Specify the number of points to plot [default=%default]")
-    parser.add_option("", "--skip", type="int", default=None,
-                      help="Specify the number of points to skip [default=%default]")
+    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."
 
+    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
     filename = args[0]
 
-    fl = gr_read_binary.read_float_binary(filename)
-
-    if(options.skip is None):
-        options.skip = 0
-    
-    if((options.size is None) or ((options.skip+options.size) > len(iq[0]))):
-        options.size = len(fl) - options.skip
-
-    x = range(options.skip, options.skip + options.size)
-    
-    # PLOT REAL AND IMAGINARY PARTS
-    
-    f = figure(1, figsize=(16, 12), facecolor='w')
-    rcParams['xtick.labelsize'] = 16
-    rcParams['ytick.labelsize'] = 16
-
-    sp1 = f.add_subplot(1,1,1)
-    sp1.set_title(("GNU Radio Float"), fontsize=26, fontweight="bold")
-    sp1.set_xlabel("Time (s)", fontsize=20, fontweight="bold")
-    sp1.set_ylabel("Amplitude (V)", fontsize=20, fontweight="bold")
-    plot(x, fl, 'bo-')
-
-    show()
+    dc = draw_fft_c(filename, options)
 
 if __name__ == "__main__":
     try:
@@ -71,5 +163,3 @@ if __name__ == "__main__":
     except KeyboardInterrupt:
         pass
     
-
-
diff --git a/gnuradio-core/src/utils/gr_plot_int.py b/gnuradio-core/src/utils/gr_plot_int.py
new file mode 100755
index 0000000000..ef2c7170a2
--- /dev/null
+++ b/gnuradio-core/src/utils/gr_plot_int.py
@@ -0,0 +1,165 @@
+#!/usr/bin/env python
+#
+# Copyright 2007 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 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."
+
+    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
+    filename = args[0]
+
+    dc = draw_fft_c(filename, options)
+
+if __name__ == "__main__":
+    try:
+        main()
+    except KeyboardInterrupt:
+        pass
+    
diff --git a/gnuradio-core/src/utils/gr_plot_iq.py b/gnuradio-core/src/utils/gr_plot_iq.py
index db5d99a114..1bb24517ec 100755
--- a/gnuradio-core/src/utils/gr_plot_iq.py
+++ b/gnuradio-core/src/utils/gr_plot_iq.py
@@ -20,52 +20,144 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import pylab, math
+import scipy
 from pylab import *
-import struct, sys
 from optparse import OptionParser
 
-import gr_read_binary
+matplotlib.interactive(True)
+matplotlib.use('TkAgg')
+
+class draw_fft:
+    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_iq.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()//8))
+        self.iq = scipy.fromfile(self.hfile, dtype=scipy.complex64, count=self.block_length)
+        #print "Read in %d items" % len(self.iq)
+        if(len(self.iq) == 0):
+            print "End of File"
+        else:
+            self.reals = [r.real for r in self.iq]
+            self.imags = [i.imag for i in self.iq]
+            self.time = [i*(1/self.sample_rate) for i in range(len(self.reals))]
+            
+    def make_plots(self):
+        # if specified on the command-line, set file pointer
+        self.hfile.seek(16*self.start, 1)
+
+        self.get_data()
+        
+        # Subplot for real and imaginary parts of signal
+        self.sp_iq = self.fig.add_subplot(2,1,1, position=[0.075, 0.14, 0.85, 0.67])
+        self.sp_iq.set_title(("I&Q"), fontsize=self.title_font_size, fontweight="bold")
+        self.sp_iq.set_xlabel("Time (s)", fontsize=self.label_font_size, fontweight="bold")
+        self.sp_iq.set_ylabel("Amplitude (V)", fontsize=self.label_font_size, fontweight="bold")
+        self.plot_iq = plot(self.time, self.reals, 'bo-', self.time, self.imags, 'ro-')
+        self.sp_iq.set_ylim([1.5*min([min(self.reals), min(self.imags)]),
+                             1.5*max([max(self.reals), max(self.imags)])])
+        
+        draw()
+
+    def update_plots(self):
+        self.plot_iq[0].set_data([self.time, self.reals])
+        self.plot_iq[1].set_data([self.time, self.imags])
+        self.sp_iq.set_ylim([1.5*min([min(self.reals), min(self.imags)]),
+                             1.5*max([max(self.reals), max(self.imags)])])
+        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() >= 16*self.block_length ):
+            self.hfile.seek(-16*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] output_filename"
-    parser = OptionParser(conflict_handler="resolve", usage=usage)
-    parser.add_option("-s", "--size", type="int", default=None,
-                      help="Specify the number of points to plot [default=%default]")
-    parser.add_option("", "--skip", type="int", default=None,
-                      help="Specify the number of points to skip [default=%default]")
+    usage="%prog: [options] input_filename"
+    description = "Takes a GNU Radio complex binary file and displays the I&Q data 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,
+                      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
     filename = args[0]
 
-    iq = gr_read_binary.read_complex_binary(filename)
-
-    if(options.skip is None):
-        options.skip = 0
-    
-    if((options.size is None) or ((options.skip+options.size) > len(iq[0]))):
-        options.size = len(iq[0]) - options.skip
-
-    reals = iq[0][options.skip : options.skip + options.size]
-    imags = iq[1][options.skip : options.skip + options.size]
-    x = range(options.skip, options.skip + options.size)
-    
-    # PLOT REAL AND IMAGINARY PARTS
-    
-    f = figure(1, figsize=(16, 12), facecolor='w')
-    rcParams['xtick.labelsize'] = 16
-    rcParams['ytick.labelsize'] = 16
-
-    sp1 = f.add_subplot(1,1,1)
-    sp1.set_title(("I&Q"), fontsize=26, fontweight="bold")
-    sp1.set_xlabel("Time (s)", fontsize=20, fontweight="bold")
-    sp1.set_ylabel("Amplitude (V)", fontsize=20, fontweight="bold")
-    plot(x, reals, 'bo-', x, imags, 'ro-')
-
-    show()
+    dc = draw_fft(filename, options)
 
 if __name__ == "__main__":
     try:
diff --git a/gnuradio-core/src/utils/gr_plot_short.py b/gnuradio-core/src/utils/gr_plot_short.py
new file mode 100755
index 0000000000..0bb091def1
--- /dev/null
+++ b/gnuradio-core/src/utils/gr_plot_short.py
@@ -0,0 +1,165 @@
+#!/usr/bin/env python
+#
+# Copyright 2007 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 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."
+
+    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
+    filename = args[0]
+
+    dc = draw_fft_c(filename, options)
+
+if __name__ == "__main__":
+    try:
+        main()
+    except KeyboardInterrupt:
+        pass
+    
diff --git a/gnuradio-core/src/utils/gr_read_binary.py b/gnuradio-core/src/utils/gr_read_binary.py
deleted file mode 100644
index ae91b44806..0000000000
--- a/gnuradio-core/src/utils/gr_read_binary.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2007 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 struct
-
-def read_binary(filename, type):
-    n = struct.calcsize(type)
-    f = open(filename, 'rb')
-    out = list()
-    lin = f.read(n)
-    while(len(lin) == n):
-        cp = struct.unpack(type, lin)
-        out.append(cp)
-        lin = f.read(n)
-    return out
-
-def read_char_binary(filename):
-    return read_binary(filename, 'c')
-
-def read_float_binary(filename):
-    return read_binary(filename, 'f')
-
-def read_int_binary(filename):
-    return read_binary(filename, 'i')
-
-def read_short_binary(filename):
-    return read_binary(filename, 'h')
-
-def read_complex_binary(filename):
-    n = struct.calcsize('ff')
-    f = open(filename, 'rb')
-    re = list()
-    im = list()
-    lin = f.read(n)
-    while(len(lin) == n):
-        cp = struct.unpack('ff', lin)
-        re.append(cp[0])
-        im.append(cp[1])
-        lin = f.read(n)
-    return (re, im)
-
-