Merge branch 'grc' from http://gnuradio.org/git/jblum.git into master

  we dont use test() -> remove it
  Made the window for the pass band filters integers (take firdes.WIN_XXX).
  Evaluation fix in param.to_code().
  Removed the flagging api and usage from the base classes.
  added ref scale param to fft and waterfall
  Switched the python classes to inherit from the base and gui classes.
  port and param types from an overloaded method
  todo
  Replaced TYPES in Port and Param with types parameter.
  made is_virtual_xxx a block level function, used by port and param classes
  added stream id type and checking in evaluate
  avoid loops
  Recursive resolution of virtual sources.
  added virtual source and added stream ids, logic to clone in port
  added rewrite methods to element to separate from validation logic
  Added virtual sink and logic to clone port.
  removed repurposing of pads
  Work on command line options for generated code.
  renamed the colors dialog to types
  use pkgpythondir
  ...

1 files changed, 3 insertions, 29 deletions

diff --git a/grc/gui/Platform.py b/grc/gui/Platform.py
index a32b0209f..8f0aa533d 100644
--- a/grc/gui/Platform.py
+++ b/grc/gui/Platform.py
@@ -1,5 +1,5 @@
 """
-Copyright 2008 Free Software Foundation, Inc.
+Copyright 2008, 2009 Free Software Foundation, Inc.
 This file is part of GNU Radio
 
 GNU Radio Companion is free software; you can redistribute it and/or
@@ -17,32 +17,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
-from FlowGraph import FlowGraph
-from Connection import Connection
-from Block import Block
-from Port import Port
-from Param import Param
+from Element import Element
 
-def conjoin_classes(name, c1, c2):
-	exec("""
-class %s(c1, c2):
-	def __init__(self, *args, **kwargs):
-		c1.__init__(self, *args, **kwargs)
-		c2.__init__(self, *args, **kwargs)
-"""%name, locals())
-	return locals()[name]
-
-def Platform(platform):
-	#combine with gui class
-	for attr, value in (
-		('FlowGraph', FlowGraph),
-		('Connection', Connection),
-		('Block', Block),
-		('Source', Port),
-		('Sink', Port),
-		('Param', Param),
-	):
-		old_value = getattr(platform, attr)
-		c = conjoin_classes(attr, old_value, value)
-		setattr(platform, attr, c)
-	return platform
+class Platform(Element): pass