[Commit-gnuradio] r11329 - in gnuradio/branches/developers/jblum/grc/grc: . base python

[jblum]

Author: jblum
Date: 2009-07-02 19:43:14 -0600 (Thu, 02 Jul 2009)
New Revision: 11329

Modified:
   gnuradio/branches/developers/jblum/grc/grc/base/Platform.py
   gnuradio/branches/developers/jblum/grc/grc/python/Block.py
   gnuradio/branches/developers/jblum/grc/grc/todo.txt
Log:
The block's category can override the block tree category.



Modified: gnuradio/branches/developers/jblum/grc/grc/base/Platform.py
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/base/Platform.py 2009-07-03 
00:09:39 UTC (rev 11328)
+++ gnuradio/branches/developers/jblum/grc/grc/base/Platform.py 2009-07-03 
01:43:14 UTC (rev 11329)
@@ -129,7 +129,9 @@
                                if block_key not in self.get_block_keys():
                                        print >> sys.stderr, 'Warning: Block 
key "%s" not found when loading category tree.'%(block_key)
                                        continue
-                               block_tree.add_block(parent, 
self.get_block(block_key))
+                               block = self.get_block(block_key)
+                               #if it exists, the block's category overrides 
the block tree
+                               if not block.get_category(): 
block_tree.add_block(parent, block)
                #load the block tree
                for block_tree_file in self._block_tree_files:
                        #recursivly add all blocks in the tree

Modified: gnuradio/branches/developers/jblum/grc/grc/python/Block.py
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/python/Block.py  2009-07-03 
00:09:39 UTC (rev 11328)
+++ gnuradio/branches/developers/jblum/grc/grc/python/Block.py  2009-07-03 
01:43:14 UTC (rev 11329)
@@ -130,7 +130,7 @@
                return '\n'.join([doc, 
extract_docs.extract(self.get_key())]).strip('\n')
 
        def get_category(self):
-               #category = extract_category.extract(self.get_key())
+               category = extract_category.extract(self.get_key())
                #if category: return category
                return _Block.get_category(self)
 

Modified: gnuradio/branches/developers/jblum/grc/grc/todo.txt
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/todo.txt 2009-07-03 00:09:39 UTC 
(rev 11328)
+++ gnuradio/branches/developers/jblum/grc/grc/todo.txt 2009-07-03 01:43:14 UTC 
(rev 11329)
@@ -69,8 +69,6 @@
   * will not update for non-enum params
   * needs to account for added or removed params
   * example with grid params need update after notebook change
-* notebooks need to be organized in dependency hierarchy
-  * use expr utils
 
 ##################################################
 # Future