[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gnuradio-commit
Subject:    [Commit-gnuradio] r9082 - gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib
From:       trondeau () gnuradio ! org
Date:       2008-07-31 3:40:33
Message-ID: 20080731034033.40EF9380074 () nyquist ! gnuradio ! org
[Download RAW message or body]

Author: trondeau
Date: 2008-07-30 21:40:32 -0600 (Wed, 30 Jul 2008)
New Revision: 9082

Modified:
   gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui.i
   gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_c.cc
   gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_c.h
   gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_f.cc
   gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_f.h
Log:
Adding display name as input

Modified: gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui.i
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui.i	2008-07-31 \
                03:39:54 UTC (rev 9081)
+++ gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui.i	2008-07-31 \
03:40:32 UTC (rev 9082) @@ -33,16 +33,16 @@
 
 GR_SWIG_BLOCK_MAGIC(qtgui,sink_c)
 
-qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, const std::vector<float> &window,
-				     float fmin, float fmax);
+  qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, const std::vector<float> \
&window, +				       float fmin=-0.5, float fmax=0.5, const std::string \
&name="Display");  
 class qtgui_sink_c : public gr_block
 {
 private:
   friend qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, const std::vector<float> \
                &window,
-					      float fmin, float fmax);
+					      float fmin, float fmax, const std::string &name);
   qtgui_sink_c (int fftsize, const std::vector<float> &window,
-		float fmin, float fmax);
+		float fmin, float fmax, const std::string &name);
 
 public:
   void start_app();
@@ -57,15 +57,15 @@
 GR_SWIG_BLOCK_MAGIC(qtgui,sink_f)
   
 qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, const std::vector<float> &window,
-				     float fmin, float fmax);
+				     float fmin, float fmax, const std::string &name="Display");
 
 class qtgui_sink_f : public gr_block
 {
 private:
   friend qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, const std::vector<float> \
                &window,
-					      float fmin, float fmax);
+					      float fmin, float fmax, const std::string &name);
   qtgui_sink_fy (int fftsize, const std::vector<float> &window,
-		 float fmin, float fmax);
+		 float fmin, float fmax, const std::string &name);
   
 public:
   void start_app();

Modified: gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_c.cc
 ===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_c.cc	2008-07-31 \
                03:39:54 UTC (rev 9081)
+++ gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_c.cc	2008-07-31 \
03:40:32 UTC (rev 9082) @@ -32,17 +32,18 @@
 
 qtgui_sink_c_sptr
 qtgui_make_sink_c (int fftsize, const std::vector<float> &window,
-		   float fmin, float fmax)
+		   float fmin, float fmax, const std::string &name)
 {
-  return qtgui_sink_c_sptr (new qtgui_sink_c (fftsize, window, fmin, fmax));
+  return qtgui_sink_c_sptr (new qtgui_sink_c (fftsize, window, fmin, fmax, name));
 }
 
 qtgui_sink_c::qtgui_sink_c (int fftsize, const std::vector<float> &window,
-			    float fmin, float fmax)
+			    float fmin, float fmax, const std::string &name)
   : gr_block ("sink_c",
 	      gr_make_io_signature (1, 1, sizeof(gr_complex)),
 	      gr_make_io_signature (0, 0, 0)),
-    d_fftsize(fftsize), d_window(window), d_fmin(fmin), d_fmax(fmax)
+    d_fftsize(fftsize), d_window(window), 
+    d_fmin(fmin), d_fmax(fmax), d_name(name)
 {
   d_main_gui = NULL;
   pthread_mutex_init(&d_pmutex, NULL);
@@ -83,7 +84,7 @@
 
   uint64_t maxBufferSize = 32768;
   d_main_gui = new SpectrumGUIClass(maxBufferSize, d_fftsize, d_fmin, d_fmax);
-  d_main_gui->SetDisplayTitle("Freq Display");
+  d_main_gui->SetDisplayTitle(d_name);
   d_main_gui->OpenSpectrumWindow(NULL);
 
   qtgui_obj object(d_qApplication);

Modified: gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_c.h
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_c.h	2008-07-31 \
                03:39:54 UTC (rev 9081)
+++ gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_c.h	2008-07-31 \
03:40:32 UTC (rev 9082) @@ -34,20 +34,21 @@
 typedef boost::shared_ptr<qtgui_sink_c> qtgui_sink_c_sptr;
 
 qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, const std::vector<float> &window,
-				     float fmin=-0.5, float fmax=0.5);
+				     float fmin=-0.5, float fmax=0.5, const std::string &name="Display");
 
 class qtgui_sink_c : public gr_block
 {
 private:
   friend qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, const std::vector<float> \
                &window,
-					      float fmin, float fmax);
+					      float fmin, float fmax, const std::string &name);
   qtgui_sink_c (int fftsize, const std::vector<float> &window,
-		float fmin, float fmax);
+		float fmin, float fmax, const std::string &name);
   
   int d_fftsize;
   std::vector<float> d_window;
   float d_fmin;
   float d_fmax;
+  std::string d_name;
   
   pthread_mutex_t d_pmutex;
 

Modified: gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_f.cc
 ===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_f.cc	2008-07-31 \
                03:39:54 UTC (rev 9081)
+++ gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_f.cc	2008-07-31 \
03:40:32 UTC (rev 9082) @@ -32,17 +32,18 @@
 
 qtgui_sink_f_sptr
 qtgui_make_sink_f (int fftsize, const std::vector<float> &window,
-		   float fmin, float fmax)
+		   float fmin, float fmax, const std::string &name)
 {
-  return qtgui_sink_f_sptr (new qtgui_sink_f (fftsize, window, fmin, fmax));
+  return qtgui_sink_f_sptr (new qtgui_sink_f (fftsize, window, fmin, fmax, name));
 }
 
 qtgui_sink_f::qtgui_sink_f (int fftsize, const std::vector<float> &window,
-			    float fmin, float fmax)
+			    float fmin, float fmax, const std::string &name)
   : gr_block ("sink_f",
 	      gr_make_io_signature (1, 1, sizeof(float)),
 	      gr_make_io_signature (0, 0, 0)),
-    d_fftsize(fftsize), d_window(window), d_fmin(fmin), d_fmax(fmax)
+    d_fftsize(fftsize), d_window(window), 
+    d_fmin(fmin), d_fmax(fmax), d_name(name)
 {
   d_main_gui = NULL;
   pthread_mutex_init(&d_pmutex, NULL);
@@ -83,7 +84,7 @@
 
   uint64_t maxBufferSize = 32768;
   d_main_gui = new SpectrumGUIClass(maxBufferSize, d_fftsize, d_fmin, d_fmax);
-  d_main_gui->SetDisplayTitle("Freq Display");
+  d_main_gui->SetDisplayTitle(d_name);
   d_main_gui->OpenSpectrumWindow(NULL);
 
   qtgui_obj object(d_qApplication);

Modified: gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_f.h
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_f.h	2008-07-31 \
                03:39:54 UTC (rev 9081)
+++ gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_f.h	2008-07-31 \
03:40:32 UTC (rev 9082) @@ -34,20 +34,21 @@
 typedef boost::shared_ptr<qtgui_sink_f> qtgui_sink_f_sptr;
 
 qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, const std::vector<float> &window,
-				     float fmin=-0.5, float fmax=0.5);
+				     float fmin=-0.5, float fmax=0.5, const std::string &name="Display");
 
 class qtgui_sink_f : public gr_block
 {
 private:
   friend qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, const std::vector<float> \
                &window,
-					      float fmin, float fmax);
+					      float fmin, float fmax, const std::string &name);
   qtgui_sink_f (int fftsize, const std::vector<float> &window,
-		float fmin, float fmax);
+		float fmin, float fmax, const std::string &name);
   
   int d_fftsize;
   std::vector<float> d_window;
   float d_fmin;
   float d_fmax;
+  std::string d_name;
   
   pthread_mutex_t d_pmutex;
 


[prev in list] [next in list] [prev in thread] [next in thread]