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, 5 insertions, 4 deletions

diff --git a/grc/python/Platform.py b/grc/python/Platform.py
index d55dbf4ce..bb56d361b 100644
--- a/grc/python/Platform.py
+++ b/grc/python/Platform.py
@@ -20,10 +20,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 import os
 from gnuradio import gr
 from .. base.Platform import Platform as _Platform
+from .. gui.Platform import Platform as _GUIPlatform
 from FlowGraph import FlowGraph as _FlowGraph
 from Connection import Connection as _Connection
 from Block import Block as _Block
-from Port import Source,Sink
+from Port import Port as _Port
 from Param import Param as _Param
 from Generator import Generator
 from Constants import \
@@ -46,7 +47,7 @@ COLORS = (#title, #color spec
 	('Message', Constants.MSG_COLOR_SPEC),
 )
 
-class Platform(_Platform):
+class Platform(_Platform, _GUIPlatform):
 
 	def __init__(self):
 		"""
@@ -70,6 +71,7 @@ class Platform(_Platform):
 			generator=Generator,
 			colors=COLORS,
 		)
+		_GUIPlatform.__init__(self)
 
 	##############################################
 	# Constructors
@@ -77,6 +79,5 @@ class Platform(_Platform):
 	FlowGraph = _FlowGraph
 	Connection = _Connection
 	Block = _Block
-	Source = Source
-	Sink = Sink
+	Port = _Port
 	Param = _Param