[Commit-gnuradio] r6161 - gnuradio/trunk/gnuradio-core/src/lib/general

[eb]

Author: eb
Date: 2007-08-21 13:15:43 -0600 (Tue, 21 Aug 2007)
New Revision: 6161

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_firdes.h
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_firdes.i
Log:
fix for ticket:153, missing throw decl in .i file

Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_firdes.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_firdes.h    2007-08-21 
16:54:51 UTC (rev 6160)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_firdes.h    2007-08-21 
19:15:43 UTC (rev 6161)
@@ -172,7 +172,7 @@
    * \p beta:                   Only used for Kaiser
    */
   static std::vector<float>
-  hilbert (unsigned int ntaps,
+  hilbert (unsigned int ntaps = 19,
           win_type windowtype = WIN_RECTANGULAR,
           double beta = 6.76);
    

Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_firdes.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_firdes.i    2007-08-21 
16:54:51 UTC (rev 6160)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_firdes.i    2007-08-21 
19:15:43 UTC (rev 6161)
@@ -39,7 +39,8 @@
            double cutoff_freq,         // Hz center of transition band
            double transition_width,    // Hz width of transition band
            win_type window = WIN_HAMMING,
-           double beta = 6.76) throw(std::out_of_range); // used only with 
Kaiser
+           double beta = 6.76          // used only with Kaiser
+           ) throw(std::out_of_range, std::runtime_error);
 
   /*!
    * \brief use "window method" to design a high-pass FIR filter
@@ -61,7 +62,8 @@
             double cutoff_freq,                // Hz center of transition band
             double transition_width,           // Hz width of transition band
             win_type window = WIN_HAMMING,
-            double beta = 6.76) throw(std::out_of_range); // used only with 
Kaiser
+            double beta = 6.76                 // used only with Kaiser
+            ) throw(std::out_of_range, std::runtime_error); 
 
   /*!
    * \brief use "window method" to design a band-pass FIR filter
@@ -85,7 +87,8 @@
             double high_cutoff_freq,           // Hz center of transition band
             double transition_width,           // Hz width of transition band
             win_type window = WIN_HAMMING,
-            double beta = 6.76) throw(std::out_of_range); // used only with 
Kaiser
+            double beta = 6.76                 // used only with Kaiser
+            ) throw(std::out_of_range, std::runtime_error); 
 
 
   /*!
@@ -110,8 +113,9 @@
             double low_cutoff_freq,            // Hz center of transition band
             double high_cutoff_freq,           // Hz center of transition band
             double transition_width,           // Hz width of transition band
-            win_type window = WIN_HAMMING,
-            double beta = 6.76) throw(std::out_of_range); // used only with 
Kaiser
+            win_type window = WIN_HAMMING,     // used only with Kaiser
+            double beta = 6.76
+            ) throw(std::out_of_range, std::runtime_error); 
 
 
   /*!
@@ -136,8 +140,9 @@
               double low_cutoff_freq,          // Hz center of transition band
               double high_cutoff_freq,         // Hz center of transition band
               double transition_width,         // Hz width of transition band
-              win_type window = WIN_HAMMING,
-              double beta = 6.76) throw(std::out_of_range); // used only with 
Kaiser
+              win_type window = WIN_HAMMING,   // used only with Kaiser
+              double beta = 6.76
+              ) throw(std::out_of_range, std::runtime_error);
 
   /*!\brief design a Hilbert Transform Filter
    *
@@ -146,9 +151,10 @@
    * \p beta:                   Only used for Kaiser
    */
   static std::vector<float>
-  hilbert (unsigned int ntaps,
+  hilbert (unsigned int ntaps = 19,
           win_type windowtype = WIN_RECTANGULAR,
-          double beta = 6.76) throw(std::out_of_range);
+          double beta = 6.76
+          ) throw(std::out_of_range, std::runtime_error);
    
   /*!
    * \brief design a Root Cosine FIR Filter (do we need a window?)
@@ -184,5 +190,5 @@
    * Return window given type, ntaps and optional beta.
    */
   static std::vector<float> gr_firdes::window (win_type type, int ntaps, 
double beta) 
-    throw(std::runtime_error);
+    throw(std::runtime_error, std::runtime_error);
 };