[Commit-gnuradio] gnuradio-core ChangeLog src/lib/io/gr_oscope_gu...

[Eric Blossom]

CVSROOT:        /sources/gnuradio
Module name:    gnuradio-core
Changes by:     Eric Blossom <eb>       06/06/16 06:32:38

Modified files:
        .              : ChangeLog 
        src/lib/io     : gr_oscope_guts.cc gr_oscope_guts.h 
                         gr_oscope_sink.i gr_oscope_sink_x.cc 
                         gr_oscope_sink_x.h 

Log message:
        added set_sample_rate method

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/ChangeLog?cvsroot=gnuradio&r1=1.236&r2=1.237
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/io/gr_oscope_guts.cc?cvsroot=gnuradio&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/io/gr_oscope_guts.h?cvsroot=gnuradio&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/io/gr_oscope_sink.i?cvsroot=gnuradio&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/io/gr_oscope_sink_x.cc?cvsroot=gnuradio&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/io/gr_oscope_sink_x.h?cvsroot=gnuradio&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/ChangeLog,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -b -r1.236 -r1.237
--- ChangeLog   16 Jun 2006 04:53:10 -0000      1.236
+++ ChangeLog   16 Jun 2006 06:32:38 -0000      1.237
@@ -1,5 +1,8 @@
 2006-06-15  Eric Blossom  <address@hidden>
 
+       * src/lib/io/gr_oscope_guts.{h,cc,i},
+       src/lib/io/gr_oscope_sink_x.{h,cc}: added set_sample_rate method.
+
        * src/lib/general/gr_keep_one_in_n.{h,cc,i}: added set_n method.
 
 2006-06-13  Eric Blossom  <address@hidden>

Index: src/lib/io/gr_oscope_guts.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/io/gr_oscope_guts.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/lib/io/gr_oscope_guts.cc        17 Feb 2006 22:34:14 -0000      1.6
+++ src/lib/io/gr_oscope_guts.cc        16 Jun 2006 06:32:38 -0000      1.7
@@ -257,6 +257,14 @@
   return true;
 }
 
+bool
+gr_oscope_guts::set_sample_rate(double sample_rate)
+{
+  d_sample_rate = sample_rate;
+  return set_update_rate(update_rate());
+}
+
+
 void
 gr_oscope_guts::update_rate_or_decimation_changed ()
 {
@@ -332,7 +340,7 @@
 }
 
 double
-gr_oscope_guts::sampling_rate () const
+gr_oscope_guts::sample_rate () const
 {
   return d_sample_rate;
 }

Index: src/lib/io/gr_oscope_guts.h
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/io/gr_oscope_guts.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/lib/io/gr_oscope_guts.h 16 Nov 2005 05:48:04 -0000      1.3
+++ src/lib/io/gr_oscope_guts.h 16 Jun 2006 06:32:38 -0000      1.4
@@ -97,11 +97,12 @@
   bool set_trigger_mode (gr_trigger_mode mode);
   bool set_trigger_level (double trigger_level);
   bool set_trigger_level_auto ();                              // set to 50% 
level
+  bool set_sample_rate(double sample_rate);
 
 
   // ACCESSORS
   int num_channels () const;
-  double sampling_rate () const;
+  double sample_rate () const;
   double update_rate () const;
   int get_decimation_count () const;
   int get_trigger_channel () const;

Index: src/lib/io/gr_oscope_sink.i
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/io/gr_oscope_sink.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/lib/io/gr_oscope_sink.i 16 Nov 2005 05:40:07 -0000      1.3
+++ src/lib/io/gr_oscope_sink.i 16 Jun 2006 06:32:38 -0000      1.4
@@ -34,7 +34,7 @@
  protected:
   gr_oscope_sink_x (const std::string name,
                    gr_io_signature_sptr input_sig,
-                   double sampling_rate);
+                   double sample_rate);
 
  public:
   ~gr_oscope_sink_x ();
@@ -45,10 +45,11 @@
   bool set_trigger_mode (gr_trigger_mode mode);
   bool set_trigger_level (double trigger_level);
   bool set_trigger_level_auto ();                              // set to 50% 
level
+  bool set_sample_rate(double sample_rate);
 
   // ACCESSORS
   int num_channels () const;
-  double sampling_rate () const;
+  double sample_rate () const;
   double update_rate () const;
   int get_decimation_count () const;
   int get_trigger_channel () const;
@@ -64,12 +65,12 @@
 GR_SWIG_BLOCK_MAGIC(gr,oscope_sink_f)
 
 gr_oscope_sink_f_sptr
-gr_make_oscope_sink_f (double sampling_rate, gr_msg_queue_sptr msgq);
+gr_make_oscope_sink_f (double sample_rate, gr_msg_queue_sptr msgq);
 
 class gr_oscope_sink_f : public gr_oscope_sink_x
 {
 private:
-  gr_oscope_sink_f (double sampling_rate, gr_msg_queue_sptr msgq);
+  gr_oscope_sink_f (double sample_rate, gr_msg_queue_sptr msgq);
 
 public:
   ~gr_oscope_sink_f ();

Index: src/lib/io/gr_oscope_sink_x.cc
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/io/gr_oscope_sink_x.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/lib/io/gr_oscope_sink_x.cc      10 Sep 2004 06:57:06 -0000      1.1
+++ src/lib/io/gr_oscope_sink_x.cc      16 Jun 2006 06:32:38 -0000      1.2
@@ -81,6 +81,12 @@
   return d_guts->set_trigger_level_auto ();
 }
 
+bool
+gr_oscope_sink_x::set_sample_rate (double sample_rate)
+{
+  return d_guts->set_sample_rate (sample_rate);
+}
+
 // ACCESSORS
 
 int
@@ -90,9 +96,9 @@
 }
 
 double
-gr_oscope_sink_x::sampling_rate () const
+gr_oscope_sink_x::sample_rate () const
 {
-  return d_guts->sampling_rate ();
+  return d_guts->sample_rate ();
 }
 
 double

Index: src/lib/io/gr_oscope_sink_x.h
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/io/gr_oscope_sink_x.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/lib/io/gr_oscope_sink_x.h       10 Sep 2004 06:57:06 -0000      1.1
+++ src/lib/io/gr_oscope_sink_x.h       16 Jun 2006 06:32:38 -0000      1.2
@@ -53,11 +53,12 @@
   bool set_trigger_mode (gr_trigger_mode mode);
   bool set_trigger_level (double trigger_level);
   bool set_trigger_level_auto ();                              // set to 50% 
level
+  bool set_sample_rate(double sample_rate);
 
 
   // ACCESSORS
   int num_channels () const;
-  double sampling_rate () const;
+  double sample_rate () const;
   double update_rate () const;
   int get_decimation_count () const;
   int get_trigger_channel () const;