commit-gnuradio
[Top][All Lists]
Advanced

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

[Commit-gnuradio] gnuradio-core ChangeLog src/lib/general/gr_prob...


From: Eric Blossom
Subject: [Commit-gnuradio] gnuradio-core ChangeLog src/lib/general/gr_prob...
Date: Wed, 21 Jun 2006 00:08:03 +0000

CVSROOT:        /sources/gnuradio
Module name:    gnuradio-core
Changes by:     Eric Blossom <eb>       06/06/21 00:08:03

Modified files:
        .              : ChangeLog 
        src/lib/general: gr_probe_avg_mag_sqrd_c.cc 
                         gr_probe_avg_mag_sqrd_c.h 
                         gr_probe_avg_mag_sqrd_c.i 
                         gr_probe_avg_mag_sqrd_f.cc 
                         gr_probe_avg_mag_sqrd_f.h 
                         gr_probe_avg_mag_sqrd_f.i 

Log message:
        added accessor for threshold

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/ChangeLog?cvsroot=gnuradio&r1=1.239&r2=1.240
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_c.cc?cvsroot=gnuradio&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_c.h?cvsroot=gnuradio&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_c.i?cvsroot=gnuradio&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_f.cc?cvsroot=gnuradio&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_f.h?cvsroot=gnuradio&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_f.i?cvsroot=gnuradio&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/ChangeLog,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -b -r1.239 -r1.240
--- ChangeLog   20 Jun 2006 22:24:31 -0000      1.239
+++ ChangeLog   21 Jun 2006 00:08:02 -0000      1.240
@@ -1,5 +1,8 @@
 2006-06-20  Eric Blossom  <address@hidden>
 
+       * src/lib/general/gr_probe_avg_mag_sqrd_{f,c}.{h,cc,i}: added accessor
+       for threshold.
+
        * src/python/gnuradio/blksimpl/pkt.py: result of refactoring
        gmsk2_pkt.py.  This is the common packet handling framework, and
        is modulation independent.  gmsk2_pkt is now deprecated.

Index: src/lib/general/gr_probe_avg_mag_sqrd_c.cc
===================================================================
RCS file: 
/sources/gnuradio/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_c.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/lib/general/gr_probe_avg_mag_sqrd_c.cc  7 Dec 2005 22:30:07 -0000       
1.1
+++ src/lib/general/gr_probe_avg_mag_sqrd_c.cc  21 Jun 2006 00:08:02 -0000      
1.2
@@ -64,6 +64,12 @@
   return noutput_items;
 }
 
+double
+gr_probe_avg_mag_sqrd_c::threshold() const
+{
+  return 10 * std::log10(d_threshold);
+}
+
 void
 gr_probe_avg_mag_sqrd_c::set_threshold(double decibels)
 {

Index: src/lib/general/gr_probe_avg_mag_sqrd_c.h
===================================================================
RCS file: 
/sources/gnuradio/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_c.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/lib/general/gr_probe_avg_mag_sqrd_c.h   7 Dec 2005 22:30:07 -0000       
1.1
+++ src/lib/general/gr_probe_avg_mag_sqrd_c.h   21 Jun 2006 00:08:02 -0000      
1.2
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2005,2006 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -60,9 +60,13 @@
            gr_vector_const_void_star &input_items,
            gr_vector_void_star &output_items);
 
+  // ACCESSORS
   bool unmuted () const { return d_unmuted; }
   double level () const { return d_level; }
 
+  double threshold() const;
+
+  // SETTERS
   void set_alpha (double alpha);
   void set_threshold (double decibels);
 };

Index: src/lib/general/gr_probe_avg_mag_sqrd_c.i
===================================================================
RCS file: 
/sources/gnuradio/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_c.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/lib/general/gr_probe_avg_mag_sqrd_c.i   7 Dec 2005 22:30:07 -0000       
1.1
+++ src/lib/general/gr_probe_avg_mag_sqrd_c.i   21 Jun 2006 00:08:02 -0000      
1.2
@@ -32,4 +32,5 @@
   double level () const { return d_level; }
   void set_alpha (double alpha);
   void set_threshold (double decibels);
+  double threshold();
 };

Index: src/lib/general/gr_probe_avg_mag_sqrd_f.cc
===================================================================
RCS file: 
/sources/gnuradio/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_f.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/lib/general/gr_probe_avg_mag_sqrd_f.cc  7 Dec 2005 22:30:07 -0000       
1.1
+++ src/lib/general/gr_probe_avg_mag_sqrd_f.cc  21 Jun 2006 00:08:02 -0000      
1.2
@@ -64,6 +64,12 @@
   return noutput_items;
 }
 
+double
+gr_probe_avg_mag_sqrd_f::threshold() const
+{
+  return 10 * std::log10(d_threshold);
+}
+
 void
 gr_probe_avg_mag_sqrd_f::set_threshold(double decibels)
 {

Index: src/lib/general/gr_probe_avg_mag_sqrd_f.h
===================================================================
RCS file: 
/sources/gnuradio/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_f.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/lib/general/gr_probe_avg_mag_sqrd_f.h   7 Dec 2005 22:30:07 -0000       
1.1
+++ src/lib/general/gr_probe_avg_mag_sqrd_f.h   21 Jun 2006 00:08:02 -0000      
1.2
@@ -60,9 +60,13 @@
            gr_vector_const_void_star &input_items,
            gr_vector_void_star &output_items);
 
+  // ACCESSORS
   bool unmuted () const { return d_unmuted; }
   double level () const { return d_level; }
 
+  double threshold() const;
+
+  // SETTERS
   void set_alpha (double alpha);
   void set_threshold (double decibels);
 };

Index: src/lib/general/gr_probe_avg_mag_sqrd_f.i
===================================================================
RCS file: 
/sources/gnuradio/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_f.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/lib/general/gr_probe_avg_mag_sqrd_f.i   7 Dec 2005 22:30:07 -0000       
1.1
+++ src/lib/general/gr_probe_avg_mag_sqrd_f.i   21 Jun 2006 00:08:02 -0000      
1.2
@@ -30,6 +30,7 @@
 public:
   bool unmuted () const { return d_unmuted; }
   double level () const { return d_level; }
+  double threshold() const;
   void set_alpha (double alpha);
   void set_threshold (double decibels);
 };




reply via email to

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