commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r7654 - in gnuradio/branches/releases/3.1: . gnuradio-


From: jcorgan
Subject: [Commit-gnuradio] r7654 - in gnuradio/branches/releases/3.1: . gnuradio-core/src/lib/general gnuradio-core/src/utils
Date: Wed, 13 Feb 2008 11:38:11 -0700 (MST)

Author: jcorgan
Date: 2008-02-13 11:38:11 -0700 (Wed, 13 Feb 2008)
New Revision: 7654

Added:
   
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc
   
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_peak_detector2_fb.h
   
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_peak_detector2_fb.i
   gnuradio/branches/releases/3.1/gnuradio-core/src/utils/README
   gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_char.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_int.py
   gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_short.py
Removed:
   gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_read_binary.py
Modified:
   gnuradio/branches/releases/3.1/AUTHORS
   gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/Makefile.am
   gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/general.i
   gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_math.h
   gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_const.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_iq.py
Log:
Merged relevant portions of changeset r7324 from trunk into release branch.
Adds plotting utilties, gr.peak_detector2, and branchless clipping.


Modified: gnuradio/branches/releases/3.1/AUTHORS
===================================================================
--- gnuradio/branches/releases/3.1/AUTHORS      2008-02-13 17:56:13 UTC (rev 
7653)
+++ gnuradio/branches/releases/3.1/AUTHORS      2008-02-13 18:38:11 UTC (rev 
7654)
@@ -11,3 +11,4 @@
 Joshua Lackey <address@hidden> Original GMSK implementation.
 Johnathan Corgan <address@hidden>  Build system, ongoing stuff, release manager
 Bdale Garbee <address@hidden>           Debian release packages
+Tom Rondeau <address@hidden>          Mostly digital waveforms and a little 
bit of trouble

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/Makefile.am    
2008-02-13 17:56:13 UTC (rev 7653)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/Makefile.am    
2008-02-13 18:38:11 UTC (rev 7654)
@@ -98,6 +98,7 @@
        gr_null_source.cc               \
        gr_pa_2x2_phase_combiner.cc     \
        gr_packet_sink.cc               \
+       gr_peak_detector2_fb.cc         \
        gr_phase_modulator_fc.cc        \
        gr_pll_carriertracking_cc.cc    \
        gr_pll_freqdet_cf.cc            \
@@ -230,6 +231,7 @@
        gr_null_source.h                \
        gr_pa_2x2_phase_combiner.h      \
        gr_packet_sink.h                \
+       gr_peak_detector2_fb.h          \
        gr_phase_modulator_fc.h         \
        gr_pll_carriertracking_cc.h     \
        gr_pll_freqdet_cf.h             \
@@ -363,6 +365,7 @@
        gr_null_source.i                \
        gr_pa_2x2_phase_combiner.i      \
        gr_packet_sink.i                \
+       gr_peak_detector2_fb.i          \
        gr_phase_modulator_fc.i         \
        gr_pll_carriertracking_cc.i     \
        gr_pll_freqdet_cf.i             \

Modified: gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/general.i
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/general.i      
2008-02-13 17:56:13 UTC (rev 7653)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/general.i      
2008-02-13 18:38:11 UTC (rev 7654)
@@ -118,6 +118,7 @@
 #include <gr_bin_statistics_f.h>
 #include <gr_glfsr_source_b.h>
 #include <gr_glfsr_source_f.h>
+#include <gr_peak_detector2_fb.h>
 %}
 
 %include "gr_nop.i"
@@ -216,3 +217,4 @@
 %include "gr_bin_statistics_f.i"
 %include "gr_glfsr_source_b.i"
 %include "gr_glfsr_source_f.i"
+%include "gr_peak_detector2_fb.i"

Modified: gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_math.h
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_math.h      
2008-02-13 17:56:13 UTC (rev 7653)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_math.h      
2008-02-13 18:38:11 UTC (rev 7654)
@@ -65,4 +65,17 @@
   return gr_fast_atan2f(z.imag(), z.real()); 
 }
 
+
+/* This bounds x by +/- clip without a branch */
+
+static inline float gr_branchless_clip(float x, float clip)
+{
+  float x1 = fabsf(x+clip);
+  float x2 = fabsf(x-clip);
+  x1 -= x2;
+  return 0.5*x1;
+}
+
+
+
 #endif /* _GR_MATH_H_ */

Copied: 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc
 (from rev 7324, 
gnuradio/trunk/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc)
===================================================================
--- 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc
                                (rev 0)
+++ 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc
        2008-02-13 18:38:11 UTC (rev 7654)
@@ -0,0 +1,106 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gr_peak_detector2_fb.h>
+#include <gr_io_signature.h>
+
+gr_peak_detector2_fb_sptr
+gr_make_peak_detector2_fb (float threshold_factor_rise,
+                          int look_ahead, float alpha)
+{
+  return gr_peak_detector2_fb_sptr (new gr_peak_detector2_fb 
(threshold_factor_rise, 
+                                 look_ahead, alpha));
+}
+
+gr_peak_detector2_fb::gr_peak_detector2_fb (float threshold_factor_rise, 
+                                           int look_ahead, float alpha)
+  : gr_sync_block ("peak_detector2_fb",
+                  gr_make_io_signature (1, 1, sizeof(float)),
+                  gr_make_io_signature2 (1, 2, sizeof(char), sizeof(float))),
+    d_threshold_factor_rise(threshold_factor_rise), 
+    d_look_ahead(look_ahead), d_alpha(alpha), d_avg(0.0f), d_found(false)
+{
+}
+
+int
+gr_peak_detector2_fb::work (int noutput_items,
+                           gr_vector_const_void_star &input_items,
+                           gr_vector_void_star &output_items) {
+  float *iptr = (float *) input_items[0];
+  char *optr = (char *) output_items[0];
+  
+  assert(noutput_items >= 2);
+
+  memset(optr, 0, noutput_items*sizeof(char));
+
+  for (int i = 0; i < noutput_items; i++) {
+
+    if (!d_found) {
+      // Have not yet detected presence of peak
+      if (iptr[i] > d_avg * (1.0f + d_threshold_factor_rise)) {
+       d_found = true;
+       d_look_ahead_remaining = d_look_ahead;
+        d_peak_val = -(float)INFINITY;
+      } 
+      else {
+       d_avg = d_alpha*iptr[i] + (1.0f - d_alpha)*d_avg;
+      }
+    } 
+    else {
+      // Detected presence of peak
+      if (iptr[i] > d_peak_val) {
+        d_peak_val = iptr[i];
+        d_peak_ind = i;
+      } 
+      else if (d_look_ahead_remaining <= 0) {
+        optr[d_peak_ind] = 1;
+        d_found = false;
+        d_avg = iptr[i];
+      }
+      
+      // Have not yet located peak, loop and keep searching.
+      d_look_ahead_remaining--;
+    }
+    
+    // Every iteration of the loop, write debugging signal out if
+    // connected:
+    if (output_items.size() == 2) {
+      float *sigout = (float *) output_items[1];
+      sigout[i] = d_avg;
+    }
+  } // loop
+  
+  if (!d_found) 
+    return noutput_items;
+  
+  // else if detected presence, keep searching during the next call to work.
+  int tmp = d_peak_ind;
+  d_peak_ind = 1;
+  
+  return tmp - 1; 
+}
+
+

Copied: 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_peak_detector2_fb.h
 (from rev 7324, 
gnuradio/trunk/gnuradio-core/src/lib/general/gr_peak_detector2_fb.h)
===================================================================
--- 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_peak_detector2_fb.h
                         (rev 0)
+++ 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_peak_detector2_fb.h
 2008-02-13 18:38:11 UTC (rev 7654)
@@ -0,0 +1,108 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifndef INCLUDED_gr_peak_detector2_FB_H
+#define INCLUDED_gr_peak_detector2_FB_H
+
+#include <gr_sync_block.h>
+
+class gr_peak_detector2_fb;
+typedef boost::shared_ptr<gr_peak_detector2_fb> gr_peak_detector2_fb_sptr;
+
+gr_peak_detector2_fb_sptr gr_make_peak_detector2_fb (float 
threshold_factor_rise = 7,
+                                                    int look_ahead = 1000,
+                                                    float alpha = 0.001);
+
+/*!
+ * \brief Detect the peak of a signal
+ * \ingroup block
+ *
+ * If a peak is detected, this block outputs a 1, 
+ * or it outputs 0's.  A separate debug output may be connected, to
+ * view the internal EWMA described below.
+ *
+ * \param threshold_factor_rise The threshold factor determins when a peak
+ *        is present. An EWMA average of the signal is calculated and when the 
+ *        value of the signal goes over threshold_factor_rise*average, we
+ *        call the peak.
+ * \param look_ahead The look-ahead value is used when the threshold is
+ *        found to locate the peak within this range.
+ * \param alpha The gain value of a single-pole moving average filter
+ */
+
+class gr_peak_detector2_fb : public gr_sync_block
+{
+  friend gr_peak_detector2_fb_sptr 
+  gr_make_peak_detector2_fb (float threshold_factor_rise, int look_ahead, 
float alpha);
+  
+  gr_peak_detector2_fb (float threshold_factor_rise, int look_ahead, float 
alpha);
+  
+private:
+  float d_threshold_factor_rise;
+  int d_look_ahead;
+  int d_look_ahead_remaining;
+  int d_peak_ind;
+  float d_peak_val;
+  float d_alpha;
+  float d_avg;
+  bool d_found;
+  
+public:
+  
+  /*! \brief Set the threshold factor value for the rise time
+   *  \param thr new threshold factor
+   */
+  void set_threshold_factor_rise(float thr) { d_threshold_factor_rise = thr; }
+  
+  /*! \brief Set the look-ahead factor
+   *  \param look new look-ahead factor
+   */
+  void set_look_ahead(int look) { d_look_ahead = look; }
+  
+  /*! \brief Set the running average alpha
+   *  \param alpha new alpha for running average
+   */
+  void set_alpha(int alpha) { d_alpha = alpha; }
+  
+  /*! \brief Get the threshold factor value for the rise time
+   *  \return threshold factor
+   */
+  float threshold_factor_rise() { return d_threshold_factor_rise; }
+  
+  /*! \brief Get the look-ahead factor value
+   *  \return look-ahead factor
+   */
+  int look_ahead() { return d_look_ahead; }
+  
+  /*! \brief Get the alpha value of the running average
+   *  \return alpha
+   */
+  float alpha() { return d_alpha; }
+  
+  int work (int noutput_items,
+           gr_vector_const_void_star &input_items,
+           gr_vector_void_star &output_items);
+};
+
+#endif
+
+

Copied: 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_peak_detector2_fb.i
 (from rev 7324, 
gnuradio/trunk/gnuradio-core/src/lib/general/gr_peak_detector2_fb.i)
===================================================================
--- 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_peak_detector2_fb.i
                         (rev 0)
+++ 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_peak_detector2_fb.i
 2008-02-13 18:38:11 UTC (rev 7654)
@@ -0,0 +1,45 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+
+GR_SWIG_BLOCK_MAGIC(gr,peak_detector2_fb)
+  
+  gr_peak_detector2_fb_sptr gr_make_peak_detector2_fb (float 
threshold_factor_rise = 7,
+                                                      int look_ahead = 1000,
+                                                      float alpha=0.001);
+
+class gr_peak_detector2_fb : public gr_sync_block
+{
+private:
+  gr_peak_detector2_fb (float threshold_factor_rise, int look_ahead, float 
alpha);
+  
+public:
+  void set_threshold_factor_rise(float thr) { d_threshold_factor_rise = thr; }
+  void set_look_ahead(int look) { d_look_ahead = look; }
+  void set_alpha(int alpha) { d_avg_alpha = alpha; }
+  
+  float threshold_factor_rise() { return d_threshold_factor_rise; } 
+  int look_ahead() { return d_look_ahead; }
+  float alpha() { return d_avg_alpha; }
+};
+
+

Copied: gnuradio/branches/releases/3.1/gnuradio-core/src/utils/README (from rev 
7324, gnuradio/trunk/gnuradio-core/src/utils/README)
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/utils/README               
                (rev 0)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/README       
2008-02-13 18:38:11 UTC (rev 7654)
@@ -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.

Copied: gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_char.py 
(from rev 7324, gnuradio/trunk/gnuradio-core/src/utils/gr_plot_char.py)
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_char.py      
                        (rev 0)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_char.py      
2008-02-13 18:38:11 UTC (rev 7654)
@@ -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
+    

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 17:56:13 UTC (rev 7653)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_const.py     
2008-02-13 18:38:11 UTC (rev 7654)
@@ -20,89 +20,172 @@
 # 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):
+
+        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)
+    dc = draw_constellation(filename, options)
 
-    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()
-
 if __name__ == "__main__":
     try:
         main()

Copied: gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_fft_c.py 
(from rev 7324, gnuradio/trunk/gnuradio-core/src/utils/gr_plot_fft_c.py)
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_fft_c.py     
                        (rev 0)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_fft_c.py     
2008-02-13 18:38:11 UTC (rev 7654)
@@ -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
+    
+
+

Copied: gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_fft_f.py 
(from rev 7324, gnuradio/trunk/gnuradio-core/src/utils/gr_plot_fft_f.py)
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_fft_f.py     
                        (rev 0)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_fft_f.py     
2008-02-13 18:38:11 UTC (rev 7654)
@@ -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
+    
+
+

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 17:56:13 UTC (rev 7653)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_float.py     
2008-02-13 18:38:11 UTC (rev 7654)
@@ -20,56 +20,146 @@
 # 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)
+    dc = draw_fft_c(filename, options)
 
-    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()
-
 if __name__ == "__main__":
     try:
         main()
     except KeyboardInterrupt:
         pass
     
-
-

Copied: gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_int.py 
(from rev 7324, gnuradio/trunk/gnuradio-core/src/utils/gr_plot_int.py)
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_int.py       
                        (rev 0)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_int.py       
2008-02-13 18:38:11 UTC (rev 7654)
@@ -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
+    

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 17:56:13 UTC (rev 7653)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_iq.py        
2008-02-13 18:38:11 UTC (rev 7654)
@@ -20,53 +20,145 @@
 # 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)
+    dc = draw_fft(filename, options)
 
-    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()
-
 if __name__ == "__main__":
     try:
         main()

Copied: gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_short.py 
(from rev 7324, gnuradio/trunk/gnuradio-core/src/utils/gr_plot_short.py)
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_short.py     
                        (rev 0)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_plot_short.py     
2008-02-13 18:38:11 UTC (rev 7654)
@@ -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
+    

Deleted: 
gnuradio/branches/releases/3.1/gnuradio-core/src/utils/gr_read_binary.py





reply via email to

[Prev in Thread] Current Thread [Next in Thread]