From 9988664127b367fa8fee4409f8460673d6f265e1 Mon Sep 17 00:00:00 2001
From: jblum
Date: Tue, 23 Jun 2009 20:38:18 +0000
Subject: Merging r11186:11273 from grc branch. Fixes, features, and
 reorganization for grc. Minor fixes and features for wxgui forms.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11274 221aa14e-8319-0410-a670-987f0aec2ac5
---
 grc/base/Block.py | 261 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 261 insertions(+)
 create mode 100644 grc/base/Block.py

(limited to 'grc/base/Block.py')

diff --git a/grc/base/Block.py b/grc/base/Block.py
new file mode 100644
index 000000000..867a14f57
--- /dev/null
+++ b/grc/base/Block.py
@@ -0,0 +1,261 @@
+"""
+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
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+GNU Radio Companion is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+"""
+
+from . import odict
+from Element import Element
+from Param import Param
+from Port import Port
+
+from Cheetah.Template import Template
+from UserDict import UserDict
+
+class TemplateArg(UserDict):
+	"""
+	A cheetah template argument created from a param.
+	The str of this class evaluates to the param's to code method.
+	The use of this class as a dictionary (enum only) will reveal the enum opts.
+	The __call__ or () method can return the param evaluated to a raw python data type.
+	"""
+
+	def __init__(self, param):
+		UserDict.__init__(self)
+		self._param = param
+		if param.is_enum():
+			for key in param.get_opt_keys():
+				self[key] = str(param.get_opt(key))
+
+	def __str__(self):
+		return str(self._param.to_code())
+
+	def __call__(self):
+		return self._param.get_evaluated()
+
+class Block(Element):
+
+	def __init__(self, flow_graph, n):
+		"""
+		Make a new block from nested data.
+		@param flow graph the parent element
+		@param n the nested odict
+		@return block a new block
+		"""
+		#build the block
+		Element.__init__(self, flow_graph)
+		#grab the data
+		params = n.findall('param')
+		sources = n.findall('source')
+		sinks = n.findall('sink')
+		self._name = n.find('name')
+		self._key = n.find('key')
+		self._category = n.find('category') or ''
+		self._block_wrapper_path = n.find('block_wrapper_path')
+		#create the param objects
+		self._params = odict()
+		#add the id param
+		self._params['id'] = self.get_parent().get_parent().Param(
+			self,
+			odict({
+				'name': 'ID',
+				'key': 'id',
+				'type': 'id',
+			})
+		)
+		self._params['_enabled'] = self.get_parent().get_parent().Param(
+			self,
+			odict({
+				'name': 'Enabled',
+				'key': '_enabled',
+				'type': 'raw',
+				'value': 'True',
+				'hide': 'all',
+			})
+		)
+		for param in map(lambda n: self.get_parent().get_parent().Param(self, n), params):
+			key = param.get_key()
+			#test against repeated keys
+			try: assert key not in self.get_param_keys()
+			except AssertionError: raise Exception, 'Key "%s" already exists in params'%key
+			#store the param
+			self._params[key] = param
+		#create the source objects
+		self._sources = odict()
+		for source in map(lambda n: self.get_parent().get_parent().Source(self, n), sources):
+			key = source.get_key()
+			#test against repeated keys
+			try: assert key not in self.get_source_keys()
+			except AssertionError: raise Exception, 'Key "%s" already exists in sources'%key
+			#store the port
+			self._sources[key] = source
+		#create the sink objects
+		self._sinks = odict()
+		for sink in map(lambda n: self.get_parent().get_parent().Sink(self, n), sinks):
+			key = sink.get_key()
+			#test against repeated keys
+			try: assert key not in self.get_sink_keys()
+			except AssertionError: raise Exception, 'Key "%s" already exists in sinks'%key
+			#store the port
+			self._sinks[key] = sink
+		#begin the testing
+		self.test()
+
+	def test(self):
+		"""
+		Call test on all children.
+		"""
+		map(lambda c: c.test(), self.get_params() + self.get_sinks() + self.get_sources())
+
+	def get_enabled(self):
+		"""
+		Get the enabled state of the block.
+		@return true for enabled
+		"""
+		try: return eval(self.get_param('_enabled').get_value())
+		except: return True
+
+	def set_enabled(self, enabled):
+		"""
+		Set the enabled state of the block.
+		@param enabled true for enabled
+		"""
+		self.get_param('_enabled').set_value(str(enabled))
+
+	def validate(self):
+		"""
+		Validate the block.
+		All ports and params must be valid.
+		All checks must evaluate to true.
+		"""
+		Element.validate(self)
+		for c in self.get_params() + self.get_ports() + self.get_connections():
+			try:
+				c.validate()
+				assert c.is_valid()
+			except AssertionError:
+				for msg in c.get_error_messages():
+					self.add_error_message('>>> %s:\n\t%s'%(c, msg))
+
+	def __str__(self): return 'Block - %s - %s(%s)'%(self.get_id(), self.get_name(), self.get_key())
+
+	def get_id(self): return self.get_param('id').get_value()
+	def is_block(self): return True
+	def get_name(self): return self._name
+	def get_key(self): return self._key
+	def get_category(self): return self._category
+	def get_doc(self): return ''
+	def get_ports(self): return self.get_sources() + self.get_sinks()
+	def get_block_wrapper_path(self): return self._block_wrapper_path
+
+	##############################################
+	# Access Params
+	##############################################
+	def get_param_keys(self): return self._params.keys()
+	def get_param(self, key): return self._params[key]
+	def get_params(self): return self._params.values()
+
+	##############################################
+	# Access Sinks
+	##############################################
+	def get_sink_keys(self): return self._sinks.keys()
+	def get_sink(self, key): return self._sinks[key]
+	def get_sinks(self): return self._sinks.values()
+
+	##############################################
+	# Access Sources
+	##############################################
+	def get_source_keys(self): return self._sources.keys()
+	def get_source(self, key): return self._sources[key]
+	def get_sources(self): return self._sources.values()
+
+	def get_connections(self):
+		return sum([port.get_connections() for port in self.get_ports()], [])
+
+	def resolve_dependencies(self, tmpl):
+		"""
+		Resolve a paramater dependency with cheetah templates.
+		@param tmpl the string with dependencies
+		@return the resolved value
+		"""
+		tmpl = str(tmpl)
+		if '$' not in tmpl: return tmpl
+		n = dict((p.get_key(), TemplateArg(p)) for p in self.get_params())
+		try: return str(Template(tmpl, n))
+		except Exception, e: return "-------->\n%s: %s\n<--------"%(e, tmpl)
+
+	##############################################
+	# Controller Modify
+	##############################################
+	def type_controller_modify(self, direction):
+		"""
+		Change the type controller.
+		@param direction +1 or -1
+		@return true for change
+		"""
+		changed = False
+		type_param = None
+		for param in filter(lambda p: p.is_enum(), self.get_params()):
+			children = self.get_ports() + self.get_params()
+			#priority to the type controller
+			if param.get_key() in ' '.join(map(lambda p: p._type, children)): type_param = param
+			#use param if type param is unset
+			if not type_param: type_param = param
+		if type_param:
+			#try to increment the enum by direction
+			try:
+				keys = type_param.get_option_keys()
+				old_index = keys.index(type_param.get_value())
+				new_index = (old_index + direction + len(keys))%len(keys)
+				type_param.set_value(keys[new_index])
+				changed = True
+			except: pass
+		return changed
+
+	def port_controller_modify(self, direction):
+		"""
+		Change the port controller.
+		@param direction +1 or -1
+		@return true for change
+		"""
+		return False
+
+	##############################################
+	## Import/Export Methods
+	##############################################
+	def export_data(self):
+		"""
+		Export this block's params to nested data.
+		@return a nested data odict
+		"""
+		n = odict()
+		n['key'] = self.get_key()
+		n['param'] = map(lambda p: p.export_data(), self.get_params())
+		return n
+
+	def import_data(self, n):
+		"""
+		Import this block's params from nested data.
+		Any param keys that do not exist will be ignored.
+		@param n the nested data odict
+		"""
+		params_n = n.findall('param')
+		for param_n in params_n:
+			key = param_n.find('key')
+			value = param_n.find('value')
+			#the key must exist in this block's params
+			if key in self.get_param_keys():
+				self.get_param(key).set_value(value)
-- 
cgit 


From de213686dfa9608bcf59e2c14a4e326049e9779e Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Fri, 14 Aug 2009 23:23:53 -0700
Subject: params, sources, and sinks now stored internally as lists. The keys
 for said objects are now only stored in one place (in the object).

---
 grc/base/Block.py | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

(limited to 'grc/base/Block.py')

diff --git a/grc/base/Block.py b/grc/base/Block.py
index 867a14f57..d5e104785 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -46,6 +46,9 @@ class TemplateArg(UserDict):
 	def __call__(self):
 		return self._param.get_evaluated()
 
+def _get_keys(lst): return [elem.get_key() for elem in lst]
+def _get_elem(lst, key): return lst[_get_keys(lst).index(key)]
+
 class Block(Element):
 
 	def __init__(self, flow_graph, n):
@@ -66,17 +69,17 @@ class Block(Element):
 		self._category = n.find('category') or ''
 		self._block_wrapper_path = n.find('block_wrapper_path')
 		#create the param objects
-		self._params = odict()
+		self._params = list()
 		#add the id param
-		self._params['id'] = self.get_parent().get_parent().Param(
+		self.get_params().append(self.get_parent().get_parent().Param(
 			self,
 			odict({
 				'name': 'ID',
 				'key': 'id',
 				'type': 'id',
 			})
-		)
-		self._params['_enabled'] = self.get_parent().get_parent().Param(
+		))
+		self.get_params().append(self.get_parent().get_parent().Param(
 			self,
 			odict({
 				'name': 'Enabled',
@@ -85,32 +88,32 @@ class Block(Element):
 				'value': 'True',
 				'hide': 'all',
 			})
-		)
+		))
 		for param in map(lambda n: self.get_parent().get_parent().Param(self, n), params):
 			key = param.get_key()
 			#test against repeated keys
 			try: assert key not in self.get_param_keys()
 			except AssertionError: raise Exception, 'Key "%s" already exists in params'%key
 			#store the param
-			self._params[key] = param
+			self.get_params().append(param)
 		#create the source objects
-		self._sources = odict()
+		self._sources = list()
 		for source in map(lambda n: self.get_parent().get_parent().Source(self, n), sources):
 			key = source.get_key()
 			#test against repeated keys
 			try: assert key not in self.get_source_keys()
 			except AssertionError: raise Exception, 'Key "%s" already exists in sources'%key
 			#store the port
-			self._sources[key] = source
+			self.get_sources().append(source)
 		#create the sink objects
-		self._sinks = odict()
+		self._sinks = list()
 		for sink in map(lambda n: self.get_parent().get_parent().Sink(self, n), sinks):
 			key = sink.get_key()
 			#test against repeated keys
 			try: assert key not in self.get_sink_keys()
 			except AssertionError: raise Exception, 'Key "%s" already exists in sinks'%key
 			#store the port
-			self._sinks[key] = sink
+			self.get_sinks().append(sink)
 		#begin the testing
 		self.test()
 
@@ -164,23 +167,23 @@ class Block(Element):
 	##############################################
 	# Access Params
 	##############################################
-	def get_param_keys(self): return self._params.keys()
-	def get_param(self, key): return self._params[key]
-	def get_params(self): return self._params.values()
+	def get_param_keys(self): return _get_keys(self._params)
+	def get_param(self, key): return _get_elem(self._params, key)
+	def get_params(self): return self._params
 
 	##############################################
 	# Access Sinks
 	##############################################
-	def get_sink_keys(self): return self._sinks.keys()
-	def get_sink(self, key): return self._sinks[key]
-	def get_sinks(self): return self._sinks.values()
+	def get_sink_keys(self): return _get_keys(self._sinks)
+	def get_sink(self, key): return _get_elem(self._sinks, key)
+	def get_sinks(self): return self._sinks
 
 	##############################################
 	# Access Sources
 	##############################################
-	def get_source_keys(self): return self._sources.keys()
-	def get_source(self, key): return self._sources[key]
-	def get_sources(self): return self._sources.values()
+	def get_source_keys(self): return _get_keys(self._sources)
+	def get_source(self, key): return _get_elem(self._sources, key)
+	def get_sources(self): return self._sources
 
 	def get_connections(self):
 		return sum([port.get_connections() for port in self.get_ports()], [])
-- 
cgit 


From 63c928575c10741ac6a6c3c3c8be9c238e7b8432 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 17 Aug 2009 00:54:11 -0700
Subject: Removed Source and Sink classes as Port subclasses. A port can be a
 source or a sink based on the dir parameter.

---
 grc/base/Block.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'grc/base/Block.py')

diff --git a/grc/base/Block.py b/grc/base/Block.py
index d5e104785..82d276567 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -98,7 +98,7 @@ class Block(Element):
 			self.get_params().append(param)
 		#create the source objects
 		self._sources = list()
-		for source in map(lambda n: self.get_parent().get_parent().Source(self, n), sources):
+		for source in map(lambda n: self.get_parent().get_parent().Port(self, n, dir='source'), sources):
 			key = source.get_key()
 			#test against repeated keys
 			try: assert key not in self.get_source_keys()
@@ -107,7 +107,7 @@ class Block(Element):
 			self.get_sources().append(source)
 		#create the sink objects
 		self._sinks = list()
-		for sink in map(lambda n: self.get_parent().get_parent().Sink(self, n), sinks):
+		for sink in map(lambda n: self.get_parent().get_parent().Port(self, n, dir='sink'), sinks):
 			key = sink.get_key()
 			#test against repeated keys
 			try: assert key not in self.get_sink_keys()
-- 
cgit 


From bf232a6e6e73d156c9a46c26842480352c6794c0 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Thu, 20 Aug 2009 01:30:23 -0700
Subject: added continuation mode for pad source and sinks

---
 grc/base/Block.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'grc/base/Block.py')

diff --git a/grc/base/Block.py b/grc/base/Block.py
index 82d276567..349e71f76 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -47,7 +47,9 @@ class TemplateArg(UserDict):
 		return self._param.get_evaluated()
 
 def _get_keys(lst): return [elem.get_key() for elem in lst]
-def _get_elem(lst, key): return lst[_get_keys(lst).index(key)]
+def _get_elem(lst, key):
+	try: return lst[_get_keys(lst).index(key)]
+	except ValueError: raise ValueError, 'Key "%s" not found in %s.'%(key, _get_keys(lst))
 
 class Block(Element):
 
-- 
cgit 


From 854bed10dfb61e9f9feab5259a75e809941089ab Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 26 Aug 2009 11:23:23 -0700
Subject: Added virtual sink and logic to clone port. Tweaks to the base
 validation routines. Validate twice in the update until rewrite functions are
 implemented.

---
 grc/base/Block.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'grc/base/Block.py')

diff --git a/grc/base/Block.py b/grc/base/Block.py
index 349e71f76..491c594cc 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -145,13 +145,12 @@ class Block(Element):
 		Validate the block.
 		All ports and params must be valid.
 		All checks must evaluate to true.
+		Validate the params, ports, and the connections to this block.
 		"""
 		Element.validate(self)
 		for c in self.get_params() + self.get_ports() + self.get_connections():
-			try:
-				c.validate()
-				assert c.is_valid()
-			except AssertionError:
+			c.validate()
+			if not c.is_valid():
 				for msg in c.get_error_messages():
 					self.add_error_message('>>> %s:\n\t%s'%(c, msg))
 
-- 
cgit 


From dc9e9db16047ec589a7b0488fac04c5bb682903c Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 26 Aug 2009 13:29:28 -0700
Subject: added rewrite methods to element to separate from validation logic

---
 grc/base/Block.py | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'grc/base/Block.py')

diff --git a/grc/base/Block.py b/grc/base/Block.py
index 491c594cc..d2266e783 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -140,6 +140,14 @@ class Block(Element):
 		"""
 		self.get_param('_enabled').set_value(str(enabled))
 
+	def rewrite(self):
+		"""
+		Rewrite critical structures.
+		Call rewrite on all sub elements.
+		"""
+		Element.rewrite(self)
+		for elem in self.get_ports() + self.get_params(): elem.rewrite()
+
 	def validate(self):
 		"""
 		Validate the block.
-- 
cgit 


From 576d3978c7fafe5d6727c77281e3aad6d92074d2 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 29 Aug 2009 01:04:58 -0700
Subject: Replaced TYPES in Port and Param with types parameter. Replaced odict
 in options for storing options with a list. Fix virtual port check in flow
 graph template.

---
 grc/base/Block.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'grc/base/Block.py')

diff --git a/grc/base/Block.py b/grc/base/Block.py
index d2266e783..737010305 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -91,7 +91,7 @@ class Block(Element):
 				'hide': 'all',
 			})
 		))
-		for param in map(lambda n: self.get_parent().get_parent().Param(self, n), params):
+		for param in map(lambda n: self.get_parent().get_parent().Param(block=self, n=n), params):
 			key = param.get_key()
 			#test against repeated keys
 			try: assert key not in self.get_param_keys()
@@ -100,7 +100,7 @@ class Block(Element):
 			self.get_params().append(param)
 		#create the source objects
 		self._sources = list()
-		for source in map(lambda n: self.get_parent().get_parent().Port(self, n, dir='source'), sources):
+		for source in map(lambda n: self.get_parent().get_parent().Port(block=self, n=n, dir='source'), sources):
 			key = source.get_key()
 			#test against repeated keys
 			try: assert key not in self.get_source_keys()
@@ -109,7 +109,7 @@ class Block(Element):
 			self.get_sources().append(source)
 		#create the sink objects
 		self._sinks = list()
-		for sink in map(lambda n: self.get_parent().get_parent().Port(self, n, dir='sink'), sinks):
+		for sink in map(lambda n: self.get_parent().get_parent().Port(block=self, n=n, dir='sink'), sinks):
 			key = sink.get_key()
 			#test against repeated keys
 			try: assert key not in self.get_sink_keys()
-- 
cgit 


From 152fcbc219cd2e4f6df7b38843844bc85fdf2bc2 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 30 Aug 2009 10:34:10 -0700
Subject: Switched the python classes to inherit from the base and gui classes.
 Use only **kwargs so all contructor parameters must be passed with keys.
 Moved gui input forms classes from base to gui param module.

---
 grc/base/Block.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'grc/base/Block.py')

diff --git a/grc/base/Block.py b/grc/base/Block.py
index 737010305..a9dae660a 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -74,16 +74,16 @@ class Block(Element):
 		self._params = list()
 		#add the id param
 		self.get_params().append(self.get_parent().get_parent().Param(
-			self,
-			odict({
+			block=self,
+			n=odict({
 				'name': 'ID',
 				'key': 'id',
 				'type': 'id',
 			})
 		))
 		self.get_params().append(self.get_parent().get_parent().Param(
-			self,
-			odict({
+			block=self,
+			n=odict({
 				'name': 'Enabled',
 				'key': '_enabled',
 				'type': 'raw',
-- 
cgit 


From 6b47cc3dc64d86cb19eb28ab4843a0f278db6d0a Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Thu, 3 Sep 2009 15:46:07 -0700
Subject: we dont use test() -> remove it

---
 grc/base/Block.py | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'grc/base/Block.py')

diff --git a/grc/base/Block.py b/grc/base/Block.py
index a9dae660a..fc501205f 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -116,14 +116,6 @@ class Block(Element):
 			except AssertionError: raise Exception, 'Key "%s" already exists in sinks'%key
 			#store the port
 			self.get_sinks().append(sink)
-		#begin the testing
-		self.test()
-
-	def test(self):
-		"""
-		Call test on all children.
-		"""
-		map(lambda c: c.test(), self.get_params() + self.get_sinks() + self.get_sources())
 
 	def get_enabled(self):
 		"""
-- 
cgit 


From 58cebfd63726dc2082ab31681afcd78e25c36132 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 5 Sep 2009 00:45:14 -0700
Subject: Implement a recursive validation api in the base Element class.

The rewrite and validate methods will invoke themselves on the child elements.
The error messages are now a super-list of element and child error messages.

As a side-effect, this cleans up code in base Block and Flowgraph class.
---
 grc/base/Block.py | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'grc/base/Block.py')

diff --git a/grc/base/Block.py b/grc/base/Block.py
index fc501205f..cb21c3958 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -132,28 +132,6 @@ class Block(Element):
 		"""
 		self.get_param('_enabled').set_value(str(enabled))
 
-	def rewrite(self):
-		"""
-		Rewrite critical structures.
-		Call rewrite on all sub elements.
-		"""
-		Element.rewrite(self)
-		for elem in self.get_ports() + self.get_params(): elem.rewrite()
-
-	def validate(self):
-		"""
-		Validate the block.
-		All ports and params must be valid.
-		All checks must evaluate to true.
-		Validate the params, ports, and the connections to this block.
-		"""
-		Element.validate(self)
-		for c in self.get_params() + self.get_ports() + self.get_connections():
-			c.validate()
-			if not c.is_valid():
-				for msg in c.get_error_messages():
-					self.add_error_message('>>> %s:\n\t%s'%(c, msg))
-
 	def __str__(self): return 'Block - %s - %s(%s)'%(self.get_id(), self.get_name(), self.get_key())
 
 	def get_id(self): return self.get_param('id').get_value()
@@ -163,6 +141,7 @@ class Block(Element):
 	def get_category(self): return self._category
 	def get_doc(self): return ''
 	def get_ports(self): return self.get_sources() + self.get_sinks()
+	def get_children(self): return self.get_ports() + self.get_params()
 	def get_block_wrapper_path(self): return self._block_wrapper_path
 
 	##############################################
-- 
cgit 


From 24b3c103b859737d086d4813d6d345882b926e81 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Fri, 18 Sep 2009 20:37:05 -0700
Subject: bug fix for handling loading of dynamic params

---
 grc/base/Block.py | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'grc/base/Block.py')

diff --git a/grc/base/Block.py b/grc/base/Block.py
index cb21c3958..43f9ba4e9 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -233,12 +233,22 @@ class Block(Element):
 		"""
 		Import this block's params from nested data.
 		Any param keys that do not exist will be ignored.
+		Since params can be dynamically created based another param,
+		call rewrite, and repeat the load until the params stick.
+		This call to rewrite will also create any dynamic ports
+		that are needed for the connections creation phase.
 		@param n the nested data odict
 		"""
-		params_n = n.findall('param')
-		for param_n in params_n:
-			key = param_n.find('key')
-			value = param_n.find('value')
-			#the key must exist in this block's params
-			if key in self.get_param_keys():
-				self.get_param(key).set_value(value)
+		get_hash = lambda: reduce(lambda x, y: x | y, [hash(param) for param in self.get_params()], 0)
+		my_hash = 0
+		while get_hash() != my_hash:
+			params_n = n.findall('param')
+			for param_n in params_n:
+				key = param_n.find('key')
+				value = param_n.find('value')
+				#the key must exist in this block's params
+				if key in self.get_param_keys():
+					self.get_param(key).set_value(value)
+			#store hash and call rewrite
+			my_hash = get_hash()
+			self.rewrite()
-- 
cgit 


From 803943020c3d53686f2b65a70cd24a780b46c925 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Fri, 18 Sep 2009 23:27:06 -0700
Subject: xor that hash

---
 grc/base/Block.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'grc/base/Block.py')

diff --git a/grc/base/Block.py b/grc/base/Block.py
index 43f9ba4e9..203e878e4 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -239,7 +239,7 @@ class Block(Element):
 		that are needed for the connections creation phase.
 		@param n the nested data odict
 		"""
-		get_hash = lambda: reduce(lambda x, y: x | y, [hash(param) for param in self.get_params()], 0)
+		get_hash = lambda: reduce(lambda x, y: x ^ y, [hash(param) for param in self.get_params()], 0)
 		my_hash = 0
 		while get_hash() != my_hash:
 			params_n = n.findall('param')
-- 
cgit 


From dcd4b6efd6e0a0130fbdc8f8aa5db1bc182e653f Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Fri, 25 Sep 2009 12:54:33 -0700
Subject: hash the tuple of hashes to id the current params

---
 grc/base/Block.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'grc/base/Block.py')

diff --git a/grc/base/Block.py b/grc/base/Block.py
index 203e878e4..b2015cc40 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -239,7 +239,7 @@ class Block(Element):
 		that are needed for the connections creation phase.
 		@param n the nested data odict
 		"""
-		get_hash = lambda: reduce(lambda x, y: x ^ y, [hash(param) for param in self.get_params()], 0)
+		get_hash = lambda: hash(tuple(map(hash, self.get_params())))
 		my_hash = 0
 		while get_hash() != my_hash:
 			params_n = n.findall('param')
-- 
cgit 


From 61830989ce554e6dfac41bba2ced7006c424e0bc Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 6 Dec 2009 23:18:27 -0500
Subject: removed unused import statements, thanks pyflakes

---
 grc/base/Block.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'grc/base/Block.py')

diff --git a/grc/base/Block.py b/grc/base/Block.py
index b2015cc40..42eb6b3fb 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -19,8 +19,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 from . import odict
 from Element import Element
-from Param import Param
-from Port import Port
 
 from Cheetah.Template import Template
 from UserDict import UserDict
-- 
cgit 


From 66d7b23402dd9c366bb6c824d693274ccf3868db Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Thu, 14 Apr 2011 10:40:36 -0700
Subject: grc: replaced asserts in base subdirectory

---
 grc/base/Block.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'grc/base/Block.py')

diff --git a/grc/base/Block.py b/grc/base/Block.py
index 42eb6b3fb..fe7ad3c2f 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -1,5 +1,5 @@
 """
-Copyright 2008, 2009 Free Software Foundation, Inc.
+Copyright 2008-2011 Free Software Foundation, Inc.
 This file is part of GNU Radio
 
 GNU Radio Companion is free software; you can redistribute it and/or
@@ -92,8 +92,8 @@ class Block(Element):
 		for param in map(lambda n: self.get_parent().get_parent().Param(block=self, n=n), params):
 			key = param.get_key()
 			#test against repeated keys
-			try: assert key not in self.get_param_keys()
-			except AssertionError: raise Exception, 'Key "%s" already exists in params'%key
+			if key in self.get_param_keys():
+				raise Exception, 'Key "%s" already exists in params'%key
 			#store the param
 			self.get_params().append(param)
 		#create the source objects
@@ -101,8 +101,8 @@ class Block(Element):
 		for source in map(lambda n: self.get_parent().get_parent().Port(block=self, n=n, dir='source'), sources):
 			key = source.get_key()
 			#test against repeated keys
-			try: assert key not in self.get_source_keys()
-			except AssertionError: raise Exception, 'Key "%s" already exists in sources'%key
+			if key in self.get_source_keys():
+				raise Exception, 'Key "%s" already exists in sources'%key
 			#store the port
 			self.get_sources().append(source)
 		#create the sink objects
@@ -110,8 +110,8 @@ class Block(Element):
 		for sink in map(lambda n: self.get_parent().get_parent().Port(block=self, n=n, dir='sink'), sinks):
 			key = sink.get_key()
 			#test against repeated keys
-			try: assert key not in self.get_sink_keys()
-			except AssertionError: raise Exception, 'Key "%s" already exists in sinks'%key
+			if key in self.get_sink_keys():
+				raise Exception, 'Key "%s" already exists in sinks'%key
 			#store the port
 			self.get_sinks().append(sink)
 
-- 
cgit 


From 515d1b6f91f5dd28997525b1e88006bbfc0f170a Mon Sep 17 00:00:00 2001
From: Tim O'Shea
Date: Wed, 26 Sep 2012 14:18:30 -0400
Subject: added the ability to open custom GRC hier block definitions from
 graphs using an instance of them

---
 grc/base/Block.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'grc/base/Block.py')

diff --git a/grc/base/Block.py b/grc/base/Block.py
index fe7ad3c2f..a20be9db9 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -67,6 +67,7 @@ class Block(Element):
 		self._name = n.find('name')
 		self._key = n.find('key')
 		self._category = n.find('category') or ''
+		self._grc_source = n.find('grc_source') or ''
 		self._block_wrapper_path = n.find('block_wrapper_path')
 		#create the param objects
 		self._params = list()
-- 
cgit