[Commit-gnuradio] r7820 - in grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python: blocks/graphical_sinks data

[jblum]

Author: jblum
Date: 2008-02-24 12:24:29 -0700 (Sun, 24 Feb 2008)
New Revision: 7820

Added:
   
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_fftsink2.xml
Modified:
   
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/block_tree.xml
Log:
wxgui scopesink and graphical window support

Added: 
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_fftsink2.xml
===================================================================
--- 
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_fftsink2.xml
                               (rev 0)
+++ 
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_fftsink2.xml
       2008-02-24 19:24:29 UTC (rev 7820)
@@ -0,0 +1,141 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!-- 
+###################################################
+##FFT Sink
+###################################################
+ -->
+<block>
+       <name>FFT Sink</name>
+       <key>wxgui_fftsink2</key>
+       <import>from gnuradio.wxgui import fftsink2</import>
+       <make>scopesink2.$type:fcn(
+       _frame,
+       baseband_freq=$baseband_freq,
+       y_per_div=$y_per_div,
+       y_divs=$y_divs,
+       ref_level=$ref_level,
+       sample_rate=$samp_rate,
+       fft_size=$fft_size,
+       fft_rate=$fft_rate,
+       average=$options:average,
+       avg_alpha=$avg_alpha,   
+       title=$title, 
+       peak_hold=$options:peak_hold,
+)</make>
+       <param>
+               <name>Type</name>       
+               <key>type</key>
+               <value>complex</value>
+               <type>enum</type>
+               <option>
+                       <name>Complex</name>
+                       <key>complex</key>
+                       <opt>fcn:fft_sink_c</opt>
+               </option>
+               <option>
+                       <name>Float</name>
+                       <key>float</key>
+                       <opt>fcn:fft_sink_f</opt>
+               </option>
+       </param>
+       <param>
+               <name>Title</name>      
+               <key>title</key>
+               <value>FFT Sink</value>
+               <type>string</type>
+       </param>
+       <param>
+               <name>Sample Rate</name>        
+               <key>samp_rate</key>
+               <value>samp_rate</value>
+               <type>real</type>
+       </param>
+       <param>
+               <name>Baseband Freq</name>      
+               <key>baseband_freq</key>
+               <value>0</value>
+               <type>real</type>
+       </param>
+       <param>
+               <name>Y per Div</name>  
+               <key>y_per_div</key>
+               <value>10</value>
+               <type>real</type>
+       </param>
+       <param>
+               <name>Y Divs</name>     
+               <key>y_divs</key>
+               <value>8</value>
+               <type>real</type>
+       </param>
+       <param>
+               <name>Reference Level</name>    
+               <key>ref_level</key>
+               <value>50</value>
+               <type>real</type>
+       </param>
+       <param>
+               <name>FFT Size</name>   
+               <key>fft_size</key>
+               <value>512</value>
+               <type>int</type>
+       </param>
+       <param>
+               <name>FFT Rate</name>   
+               <key>fft_rate</key>
+               <value>15</value>
+               <type>int</type>
+       </param>
+       <param>
+               <name>Average Alpha</name>      
+               <key>avg_alpha</key>
+               <value>2.0/15</value>
+               <type>real</type>
+       </param>
+       <param>
+               <name>Options</name>
+               <key>options</key>
+               <value>none</value>
+               <type>enum</type>
+               <option>
+                       <name>None</name>
+                       <key>none</key>
+                       <opt>peak_hold:False</opt>
+                       <opt>average:False</opt>
+               </option>
+               <option>
+                       <name>Average</name>
+                       <key>average</key>
+                       <opt>peak_hold:False</opt>
+                       <opt>average:True</opt>
+               </option>
+               <option>
+                       <name>Peak Hold</name>
+                       <key>peak_hold</key>
+                       <opt>peak_hold:True</opt>
+                       <opt>average:False</opt>
+               </option>
+       </param>
+       <param>
+               <name>Num Inputs</name> 
+               <key>num_inputs</key>
+               <value>1</value>
+               <type>int</type>
+       </param>        
+       <param>
+               <name>Grid Position</name>
+               <key>grid_pos</key>
+               <value>0, 0, 1, 1</value>
+               <type>int_vector</type>
+       </param>
+       <check>len($grid_pos) == 4</check>
+       <sink>
+               <name>in</name>
+               <type>$type</type>
+               <nports>$num_inputs</nports>
+       </sink>
+       <doc>
+Use the Grid Position (row, column, row span, column span) to position the 
graphical element in the window.
+       </doc>
+</block>

Modified: 
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/block_tree.xml
===================================================================
--- 
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/block_tree.xml 
    2008-02-24 19:09:29 UTC (rev 7819)
+++ 
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/block_tree.xml 
    2008-02-24 19:24:29 UTC (rev 7820)
@@ -34,7 +34,7 @@
                <name>Graphical Sinks</name>
                <block>number_sink</block>
                <block>wxgui_scopesink2</block> 
-               <block>fft_sink</block>
+               <block>wxgui_fftsink2</block>
                <block>constellation_sink</block>
                <block>waterfall_sink</block>
        </cat>