[Commit-gnuradio] r8994 - in grc/trunk: notes src/grc/gui/elements src/grc_gnuradio/blocks/filters src/grc_gnuradio/blocks/misc src/grc_gnuradio/data

[jblum]

Author: jblum
Date: 2008-07-24 00:28:35 -0600 (Thu, 24 Jul 2008)
New Revision: 8994

Added:
   grc/trunk/src/grc_gnuradio/blocks/filters/gr_iqcomp_cc.xml
   grc/trunk/src/grc_gnuradio/blocks/misc/note.xml
Removed:
   grc/trunk/src/grc_gnuradio/blocks/misc/hier_block.xml
Modified:
   grc/trunk/notes/todo.txt
   grc/trunk/src/grc/gui/elements/FlowGraph.py
   grc/trunk/src/grc_gnuradio/data/block_tree.xml
Log:
more blocks

Modified: grc/trunk/notes/todo.txt
===================================================================
--- grc/trunk/notes/todo.txt    2008-07-24 06:08:01 UTC (rev 8993)
+++ grc/trunk/notes/todo.txt    2008-07-24 06:28:35 UTC (rev 8994)
@@ -5,7 +5,6 @@
 -controlled step block
 
 ############ Features to Add: ####################
--save working directory after close
 -param editor, expand entry boxes in focus
 -change param dialog to panel within main window
 -default platform for preferences block
@@ -14,6 +13,7 @@
 -log slider gui control
 -recursive/nested categories
 -internal variables (dont show up as params)
+-multi block selection
 
 ############ Maybe: ####################
 -icons for certain blocks, + for add

Modified: grc/trunk/src/grc/gui/elements/FlowGraph.py
===================================================================
--- grc/trunk/src/grc/gui/elements/FlowGraph.py 2008-07-24 06:08:01 UTC (rev 
8993)
+++ grc/trunk/src/grc/gui/elements/FlowGraph.py 2008-07-24 06:28:35 UTC (rev 
8994)
@@ -88,8 +88,8 @@
                        if not filter(lambda e: e.is_block() and e.get_id() == 
id, self.get_elements()):
                                v_val = 
self.get_scroll_pane().get_vadjustment().get_value()
                                h_val = 
self.get_scroll_pane().get_hadjustment().get_value()
-                               x = random.randint(100,200) + int(v_val)
-                               y = random.randint(100,200) + int(h_val)
+                               x = random.randint(100,200) + int(h_val)
+                               y = random.randint(100,200) + int(v_val)
                                #get the new block
                                block = self.get_new_block(key)
                                block.set_coordinate((x, y))

Added: grc/trunk/src/grc_gnuradio/blocks/filters/gr_iqcomp_cc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/gr_iqcomp_cc.xml                  
        (rev 0)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/gr_iqcomp_cc.xml  2008-07-24 
06:28:35 UTC (rev 8994)
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##IQ Comp
+###################################################
+ -->
+<block>
+       <name>IQ Comp</name>
+       <key>gr_iqcomp_cc</key>
+       <import>from gnuradio import gr</import>
+       <make>gr.iqcomp_cc($mu)</make>
+       <param>
+               <name>Mu</name>
+               <key>mu</key>
+               <type>real</type>
+       </param>
+       <sink>
+               <name>in</name>
+               <type>complex</type>
+       </sink>
+       <source>
+               <name>out</name>
+               <type>complex</type>
+       </source>
+</block>

Deleted: grc/trunk/src/grc_gnuradio/blocks/misc/hier_block.xml

Added: grc/trunk/src/grc_gnuradio/blocks/misc/note.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/misc/note.xml                             
(rev 0)
+++ grc/trunk/src/grc_gnuradio/blocks/misc/note.xml     2008-07-24 06:28:35 UTC 
(rev 8994)
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Note Block (dummy)
+###################################################
+ -->
+<block>
+       <name>Note</name>
+       <key>note</key>
+       <make></make>
+       <param>
+               <name>Note</name>
+               <key>note</key>
+               <value></value>
+               <type>string</type>
+       </param>
+</block>

Modified: grc/trunk/src/grc_gnuradio/data/block_tree.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/data/block_tree.xml      2008-07-24 06:08:01 UTC 
(rev 8993)
+++ grc/trunk/src/grc_gnuradio/data/block_tree.xml      2008-07-24 06:28:35 UTC 
(rev 8994)
@@ -171,6 +171,7 @@
                <block>gr_fractional_interpolator_xx</block>
                <block>gr_keep_one_in_n</block>
                <block>gr_moving_average_xx</block>
+               <block>gr_iqcomp_cc</block>
        </cat>
        <cat>
                <name>Modulators</name>
@@ -245,7 +246,9 @@
        </cat>
        <cat>
                <name>Misc</name>
+               <block>note</block>
                <block>import</block>
+
                <block>gr_throttle</block>
                <block>gr_delay</block>
                <block>gr_repeat</block>
@@ -260,8 +263,6 @@
                <block>gr_kludge_copy</block>
                <block>gr_nop</block>
 
-               <block>hier_block</block>
-
                <block>xmlrpc_server</block>
                <block>xmlrpc_client</block>
        </cat>