[Commit-gnuradio] r5714 - in grc/branches/jblum_work: notes src src/Graphics src/SignalBlockDefs

[jblum]

Author: jblum
Date: 2007-06-06 15:20:55 -0600 (Wed, 06 Jun 2007)
New Revision: 5714

Modified:
   grc/branches/jblum_work/notes/notes.txt
   grc/branches/jblum_work/src/Graphics/Dialogs.py
   grc/branches/jblum_work/src/MathExprParser.py
   grc/branches/jblum_work/src/SignalBlockDefs/Filters.py
   grc/branches/jblum_work/src/SignalBlockDefs/SignalBlockTree.py
Log:
added Goertzel filter, added min and max functions for parser

Modified: grc/branches/jblum_work/notes/notes.txt
===================================================================
--- grc/branches/jblum_work/notes/notes.txt     2007-06-06 20:09:00 UTC (rev 
5713)
+++ grc/branches/jblum_work/notes/notes.txt     2007-06-06 21:20:55 UTC (rev 
5714)
@@ -20,7 +20,6 @@
 -stdin/out communication protocal (non graphical)
 -include dtd in saved flow graphs
 -immediate display of tool tips in entry boxes
--help window for functions in the math expression parser
 -function to import taps from a file
 -fm demod example with expansion of wfm_recv block
 

Modified: grc/branches/jblum_work/src/Graphics/Dialogs.py
===================================================================
--- grc/branches/jblum_work/src/Graphics/Dialogs.py     2007-06-06 20:09:00 UTC 
(rev 5713)
+++ grc/branches/jblum_work/src/Graphics/Dialogs.py     2007-06-06 21:20:55 UTC 
(rev 5714)
@@ -213,7 +213,7 @@
 <b>Misc Functions   <i>(complex arguments)</i></b> 
        abs(z*) pow(b, p) sqrt(z) log10(z) log(z, [b=e]) ln(z) exp(z) 
 <b>Misc Functions   <i>(floating point arguments)</i></b> 
-       floor(f) ceil(f) radians(deg) degrees(rad) mod(f1, f2) atan2(y, x) 
sgn(f)
+       floor(f) ceil(f) radians(deg) degrees(rad) mod(f1, f2) atan2(y, x) 
sgn(f) min(f*) max(f*)
 <b>Filter Taps Generators   <i>(floating point arguments, rates and 
frequencies in Hz)</i></b> 
        low_pass(gain, samp_rate, cutoff_freq, width, [window=hamming], 
[beta=6.76])
        high_pass(gain, samp_rate, cutoff_freq, width, [window=hamming], 
[beta=6.76])   

Modified: grc/branches/jblum_work/src/MathExprParser.py
===================================================================
--- grc/branches/jblum_work/src/MathExprParser.py       2007-06-06 20:09:00 UTC 
(rev 5713)
+++ grc/branches/jblum_work/src/MathExprParser.py       2007-06-06 21:20:55 UTC 
(rev 5714)
@@ -202,7 +202,9 @@
        'degrees' : lambda f: math.degrees(verify_float(f)),
        'mod' : lambda f1, f2: math.fmod(verify_float(f1), verify_float(f2)),
        'atan2' : lambda y, x: math.atan2(verify_float(y), verify_float(x)),
-       'sgn' : lambda f: abs(verify_float(f))/verify_float(f)
+       'sgn' : lambda f: abs(verify_float(f))/verify_float(f),
+       'min' : lambda *f: verify_number(min(*map(verify_float, f))),
+       'max' : lambda *f: verify_number(max(*map(verify_float, f))),
 }
 
 #########################################################

Modified: grc/branches/jblum_work/src/SignalBlockDefs/Filters.py
===================================================================
--- grc/branches/jblum_work/src/SignalBlockDefs/Filters.py      2007-06-06 
20:09:00 UTC (rev 5713)
+++ grc/branches/jblum_work/src/SignalBlockDefs/Filters.py      2007-06-06 
21:20:55 UTC (rev 5714)
@@ -263,6 +263,15 @@
        sb.add_param('Num Taps', Int(10, min=0))
        return sb, lambda fg, num_taps: fcn(num_taps.parse())
        
+def Goertzel(sb):   
+       fcn = gr.goertzel_fc  
+       sb.add_input_socket('in', Float())
+       sb.add_output_socket('out', Complex())
+       sb.add_param('Rate', Int())
+       sb.add_param('Length', Int())
+       sb.add_param('Frequency', Float())   
+       return sb, lambda fg, rate, len, freq: 
fcn(rate.parse(),len.parse(),freq.parse()) 
+       
 def PowerSquelch(sb):
        fcn = gr.simple_squelch_cc
        sb.add_input_socket('in', Complex())

Modified: grc/branches/jblum_work/src/SignalBlockDefs/SignalBlockTree.py
===================================================================
--- grc/branches/jblum_work/src/SignalBlockDefs/SignalBlockTree.py      
2007-06-06 20:09:00 UTC (rev 5713)
+++ grc/branches/jblum_work/src/SignalBlockDefs/SignalBlockTree.py      
2007-06-06 21:20:55 UTC (rev 5714)
@@ -120,7 +120,8 @@
                                ('Window', Filters.Window),
                                ('Root Raised Cosine', 
Filters.RootRaisedCosine),                                                      
         
                                ('Single Pole IIR Filter', 
Filters.SinglePoleIIRFilter),
-                               ('Hilbert', Filters.Hilbert),   
+                               ('Hilbert', Filters.Hilbert),
+                               ('Goertzel', Filters.Goertzel), 
                                ('Power Squelch', Filters.PowerSquelch),
                                ('Downsample', Filters.Downsample),
                                ('Upsample', Filters.Upsample),