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/Param.py | 261 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 261 insertions(+)
 create mode 100644 grc/base/Param.py

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

diff --git a/grc/base/Param.py b/grc/base/Param.py
new file mode 100644
index 000000000..8166d54ec
--- /dev/null
+++ b/grc/base/Param.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
+import pygtk
+pygtk.require('2.0')
+import gtk
+
+class InputParam(gtk.HBox):
+	"""The base class for an input parameter inside the input parameters dialog."""
+
+	def __init__(self, param, _handle_changed):
+		gtk.HBox.__init__(self)
+		self.param = param
+		self._handle_changed = _handle_changed
+		self.label = gtk.Label('') #no label, markup is added by set_markup
+		self.label.set_size_request(150, -1)
+		self.pack_start(self.label, False)
+		self.set_markup = lambda m: self.label.set_markup(m)
+		self.tp = None
+	def set_color(self, color): pass
+
+class EntryParam(InputParam):
+	"""Provide an entry box for strings and numbers."""
+
+	def __init__(self, *args, **kwargs):
+		InputParam.__init__(self, *args, **kwargs)
+		self.entry = input = gtk.Entry()
+		input.set_text(self.param.get_value())
+		input.connect('changed', self._handle_changed)
+		self.pack_start(input, True)
+		self.get_text = input.get_text
+		#tool tip
+		self.tp = gtk.Tooltips()
+		self.tp.set_tip(self.entry, '')
+		self.tp.enable()
+	def set_color(self, color): self.entry.modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse(color))
+
+class EnumParam(InputParam):
+	"""Provide an entry box for Enum types with a drop down menu."""
+
+	def __init__(self, *args, **kwargs):
+		InputParam.__init__(self, *args, **kwargs)
+		self._input = gtk.combo_box_new_text()
+		for option in self.param.get_options(): self._input.append_text(option.get_name())
+		self._input.set_active(self.param.get_option_keys().index(self.param.get_value()))
+		self._input.connect('changed', self._handle_changed)
+		self.pack_start(self._input, False)
+	def get_text(self): return self.param.get_option_keys()[self._input.get_active()]
+
+class EnumEntryParam(InputParam):
+	"""Provide an entry box and drop down menu for Raw Enum types."""
+
+	def __init__(self, *args, **kwargs):
+		InputParam.__init__(self, *args, **kwargs)
+		self._input = gtk.combo_box_entry_new_text()
+		for option in self.param.get_options(): self._input.append_text(option.get_name())
+		try: self._input.set_active(self.param.get_option_keys().index(self.param.get_value()))
+		except:
+			self._input.set_active(-1)
+			self._input.get_child().set_text(self.param.get_value())
+		self._input.connect('changed', self._handle_changed)
+		self._input.get_child().connect('changed', self._handle_changed)
+		self.pack_start(self._input, False)
+	def get_text(self):
+		if self._input.get_active() == -1: return self._input.get_child().get_text()
+		return self.param.get_option_keys()[self._input.get_active()]
+	def set_color(self, color):
+		if self._input.get_active() == -1: #custom entry, use color
+			self._input.get_child().modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse(color))
+		else: #from enum, make white background
+			self._input.get_child().modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse('#ffffff'))
+
+class Option(Element):
+
+	def __init__(self, param, n):
+		Element.__init__(self, param)
+		self._name = n.find('name')
+		self._key = n.find('key')
+		self._opts = dict()
+		opts = n.findall('opt')
+		#test against opts when non enum
+		try: assert self.get_parent().is_enum() or not opts
+		except AssertionError: raise Exception, 'Options for non-enum types cannot have sub-options'
+		#extract opts
+		for opt in opts:
+			#separate the key:value
+			try: key, value = opt.split(':')
+			except: raise Exception, 'Error separating "%s" into key:value'%opt
+			#test against repeated keys
+			try: assert not self._opts.has_key(key)
+			except AssertionError: raise Exception, 'Key "%s" already exists in option'%key
+			#store the option
+			self._opts[key] = value
+
+	def __str__(self): return 'Option %s(%s)'%(self.get_name(), self.get_key())
+	def get_name(self): return self._name
+	def get_key(self): return self._key
+
+	##############################################
+	# Access Opts
+	##############################################
+	def get_opt_keys(self): return self._opts.keys()
+	def get_opt(self, key): return self._opts[key]
+	def get_opts(self): return self._opts.values()
+
+class Param(Element):
+
+	##possible param types
+	TYPES = ['enum', 'raw']
+
+	def __init__(self, block, n):
+		"""
+		Make a new param from nested data.
+		@param block the parent element
+		@param n the nested odict
+		@return a new param
+		"""
+		#grab the data
+		self._name = n.find('name')
+		self._key = n.find('key')
+		value = n.find('value') or ''
+		self._type = n.find('type')
+		self._hide = n.find('hide') or ''
+		#build the param
+		Element.__init__(self, block)
+		#create the Option objects from the n data
+		self._options = odict()
+		for option in map(lambda o: Option(self, o), n.findall('option')):
+			key = option.get_key()
+			#test against repeated keys
+			try: assert key not in self.get_option_keys()
+			except AssertionError: raise Exception, 'Key "%s" already exists in options'%key
+			#store the option
+			self._options[key] = option
+		#test the enum options
+		if self.is_enum():
+			#test against options with identical keys
+			try: assert len(set(self.get_option_keys())) == len(self._options)
+			except AssertionError: raise Exception, 'Options keys "%s" are not unique.'%self.get_option_keys()
+			#test against inconsistent keys in options
+			opt_keys = self._options.values()[0].get_opt_keys()
+			for option in self._options.values():
+				try: assert set(opt_keys) == set(option.get_opt_keys())
+				except AssertionError: raise Exception, 'Opt keys "%s" are not identical across all options.'%opt_keys
+			#if a value is specified, it must be in the options keys
+			self._value = value or self.get_option_keys()[0]
+			try: assert self.get_value() in self.get_option_keys()
+			except AssertionError: raise Exception, 'The value "%s" is not in the possible values of "%s".'%(self.get_value(), self.get_option_keys())
+		else: self._value = value or ''
+
+	def test(self):
+		"""
+		call test on all children
+		"""
+		map(lambda c: c.test(), self.get_options())
+
+	def validate(self):
+		"""
+		Validate the param.
+		The value must be evaluated and type must a possible type.
+		"""
+		Element.validate(self)
+		try: assert self.get_type() in self.TYPES
+		except AssertionError: self.add_error_message('Type "%s" is not a possible type.'%self.get_type())
+
+	def get_evaluated(self): raise NotImplementedError
+
+	def to_code(self):
+		"""
+		Convert the value to code.
+		@throw NotImplementedError
+		"""
+		raise NotImplementedError
+
+	def get_color(self): return '#FFFFFF'
+	def __str__(self): return 'Param - %s(%s)'%(self.get_name(), self.get_key())
+	def is_param(self): return True
+	def get_name(self): return self._name
+	def get_key(self): return self._key
+	def get_hide(self): return self.get_parent().resolve_dependencies(self._hide)
+
+	def get_value(self):
+		value = self._value
+		if self.is_enum() and value not in self.get_option_keys():
+			value = self.get_option_keys()[0]
+			self.set_value(value)
+		return value
+
+	def set_value(self, value):
+		self.flag()
+		self._value = str(value) #must be a string
+
+	def get_type(self): return self.get_parent().resolve_dependencies(self._type)
+	def is_enum(self): return self._type == 'enum'
+
+	def __repr__(self):
+		"""
+		Get the repr (nice string format) for this param.
+		Just return the value (special case enum).
+		Derived classes can handle complex formatting.
+		@return the string representation
+		"""
+		if self.is_enum(): return self.get_option(self.get_value()).get_name()
+		return self.get_value()
+
+	def get_input_class(self):
+		"""
+		Get the graphical gtk class to represent this parameter.
+		An enum requires and combo parameter.
+		A non-enum with options gets a combined entry/combo parameter.
+		All others get a standard entry parameter.
+		@return gtk input class
+		"""
+		if self.is_enum(): return EnumParam
+		if self.get_options(): return EnumEntryParam
+		return EntryParam
+
+	##############################################
+	# Access Options
+	##############################################
+	def get_option_keys(self): return self._options.keys()
+	def get_option(self, key): return self._options[key]
+	def get_options(self): return self._options.values()
+
+	##############################################
+	# Access Opts
+	##############################################
+	def get_opt_keys(self): return self._options[self.get_value()].get_opt_keys()
+	def get_opt(self, key): return self._options[self.get_value()].get_opt(key)
+	def get_opts(self): return self._options[self.get_value()].get_opts()
+
+	##############################################
+	## Import/Export Methods
+	##############################################
+	def export_data(self):
+		"""
+		Export this param's key/value.
+		@return a nested data odict
+		"""
+		n = odict()
+		n['key'] = self.get_key()
+		n['value'] = self.get_value()
+		return n
-- 
cgit 


From 9cdea550a868695d3b75dc79ccde4a4cc3b78851 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 10 Aug 2009 22:29:55 -0700
Subject: apply diff from previous commits

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

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

diff --git a/grc/base/Param.py b/grc/base/Param.py
index 8166d54ec..93c1c52bd 100644
--- a/grc/base/Param.py
+++ b/grc/base/Param.py
@@ -165,6 +165,8 @@ class Param(Element):
 			try: assert self.get_value() in self.get_option_keys()
 			except AssertionError: raise Exception, 'The value "%s" is not in the possible values of "%s".'%(self.get_value(), self.get_option_keys())
 		else: self._value = value or ''
+		#begin the testing
+		self.test()
 
 	def test(self):
 		"""
-- 
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/Param.py | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

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

diff --git a/grc/base/Param.py b/grc/base/Param.py
index 93c1c52bd..d1b22454f 100644
--- a/grc/base/Param.py
+++ b/grc/base/Param.py
@@ -88,6 +88,11 @@ class EnumEntryParam(InputParam):
 		else: #from enum, make white background
 			self._input.get_child().modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse('#ffffff'))
 
+def _get_keys(lst): return [elem.get_key() for elem in lst]
+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 Option(Element):
 
 	def __init__(self, param, n):
@@ -123,16 +128,14 @@ class Option(Element):
 
 class Param(Element):
 
-	##possible param types
-	TYPES = ['enum', 'raw']
-
-	def __init__(self, block, n):
+	def __init__(self, block, n, types):
 		"""
 		Make a new param from nested data.
 		@param block the parent element
 		@param n the nested odict
-		@return a new param
+		@param types a list of possible types
 		"""
+		self._types = types
 		#grab the data
 		self._name = n.find('name')
 		self._key = n.find('key')
@@ -142,22 +145,22 @@ class Param(Element):
 		#build the param
 		Element.__init__(self, block)
 		#create the Option objects from the n data
-		self._options = odict()
-		for option in map(lambda o: Option(self, o), n.findall('option')):
+		self._options = list()
+		for option in map(lambda o: Option(param=self, n=o), n.findall('option')):
 			key = option.get_key()
 			#test against repeated keys
 			try: assert key not in self.get_option_keys()
 			except AssertionError: raise Exception, 'Key "%s" already exists in options'%key
 			#store the option
-			self._options[key] = option
+			self.get_options().append(option)
 		#test the enum options
 		if self.is_enum():
 			#test against options with identical keys
-			try: assert len(set(self.get_option_keys())) == len(self._options)
+			try: assert len(set(self.get_option_keys())) == len(self.get_options())
 			except AssertionError: raise Exception, 'Options keys "%s" are not unique.'%self.get_option_keys()
 			#test against inconsistent keys in options
-			opt_keys = self._options.values()[0].get_opt_keys()
-			for option in self._options.values():
+			opt_keys = self.get_options()[0].get_opt_keys()
+			for option in self.get_options():
 				try: assert set(opt_keys) == set(option.get_opt_keys())
 				except AssertionError: raise Exception, 'Opt keys "%s" are not identical across all options.'%opt_keys
 			#if a value is specified, it must be in the options keys
@@ -180,7 +183,7 @@ class Param(Element):
 		The value must be evaluated and type must a possible type.
 		"""
 		Element.validate(self)
-		try: assert self.get_type() in self.TYPES
+		try: assert self.get_type() in self._types
 		except AssertionError: self.add_error_message('Type "%s" is not a possible type.'%self.get_type())
 
 	def get_evaluated(self): raise NotImplementedError
@@ -197,7 +200,7 @@ class Param(Element):
 	def is_param(self): return True
 	def get_name(self): return self._name
 	def get_key(self): return self._key
-	def get_hide(self): return self.get_parent().resolve_dependencies(self._hide)
+	def get_hide(self): return self.get_parent().resolve_dependencies(self._hide).strip()
 
 	def get_value(self):
 		value = self._value
@@ -238,16 +241,16 @@ class Param(Element):
 	##############################################
 	# Access Options
 	##############################################
-	def get_option_keys(self): return self._options.keys()
-	def get_option(self, key): return self._options[key]
-	def get_options(self): return self._options.values()
+	def get_option_keys(self): return _get_keys(self.get_options())
+	def get_option(self, key): return _get_elem(self.get_options(), key)
+	def get_options(self): return self._options
 
 	##############################################
 	# Access Opts
 	##############################################
-	def get_opt_keys(self): return self._options[self.get_value()].get_opt_keys()
-	def get_opt(self, key): return self._options[self.get_value()].get_opt(key)
-	def get_opts(self): return self._options[self.get_value()].get_opts()
+	def get_opt_keys(self): return self.get_option(self.get_value()).get_opt_keys()
+	def get_opt(self, key): return self.get_option(self.get_value()).get_opt(key)
+	def get_opts(self): return self.get_option(self.get_value()).get_opts()
 
 	##############################################
 	## Import/Export Methods
-- 
cgit 


From cc13a27310e4ab91ebf90ee2d9cd6e3c659e1bc0 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 30 Aug 2009 09:35:55 -0700
Subject: port and param types from an overloaded method

---
 grc/base/Param.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

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

diff --git a/grc/base/Param.py b/grc/base/Param.py
index d1b22454f..21d306592 100644
--- a/grc/base/Param.py
+++ b/grc/base/Param.py
@@ -128,14 +128,12 @@ class Option(Element):
 
 class Param(Element):
 
-	def __init__(self, block, n, types):
+	def __init__(self, block, n):
 		"""
 		Make a new param from nested data.
 		@param block the parent element
 		@param n the nested odict
-		@param types a list of possible types
 		"""
-		self._types = types
 		#grab the data
 		self._name = n.find('name')
 		self._key = n.find('key')
@@ -183,7 +181,7 @@ class Param(Element):
 		The value must be evaluated and type must a possible type.
 		"""
 		Element.validate(self)
-		try: assert self.get_type() in self._types
+		try: assert self.get_type() in self.get_types()
 		except AssertionError: self.add_error_message('Type "%s" is not a possible type.'%self.get_type())
 
 	def get_evaluated(self): raise NotImplementedError
@@ -195,6 +193,13 @@ class Param(Element):
 		"""
 		raise NotImplementedError
 
+	def get_types(self):
+		"""
+		Get a list of all possible param types.
+		@throw NotImplementedError
+		"""
+		raise NotImplementedError
+
 	def get_color(self): return '#FFFFFF'
 	def __str__(self): return 'Param - %s(%s)'%(self.get_name(), self.get_key())
 	def is_param(self): return True
-- 
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/Param.py | 80 -------------------------------------------------------
 1 file changed, 80 deletions(-)

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

diff --git a/grc/base/Param.py b/grc/base/Param.py
index 21d306592..9279e736b 100644
--- a/grc/base/Param.py
+++ b/grc/base/Param.py
@@ -19,74 +19,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 from . import odict
 from Element import Element
-import pygtk
-pygtk.require('2.0')
-import gtk
-
-class InputParam(gtk.HBox):
-	"""The base class for an input parameter inside the input parameters dialog."""
-
-	def __init__(self, param, _handle_changed):
-		gtk.HBox.__init__(self)
-		self.param = param
-		self._handle_changed = _handle_changed
-		self.label = gtk.Label('') #no label, markup is added by set_markup
-		self.label.set_size_request(150, -1)
-		self.pack_start(self.label, False)
-		self.set_markup = lambda m: self.label.set_markup(m)
-		self.tp = None
-	def set_color(self, color): pass
-
-class EntryParam(InputParam):
-	"""Provide an entry box for strings and numbers."""
-
-	def __init__(self, *args, **kwargs):
-		InputParam.__init__(self, *args, **kwargs)
-		self.entry = input = gtk.Entry()
-		input.set_text(self.param.get_value())
-		input.connect('changed', self._handle_changed)
-		self.pack_start(input, True)
-		self.get_text = input.get_text
-		#tool tip
-		self.tp = gtk.Tooltips()
-		self.tp.set_tip(self.entry, '')
-		self.tp.enable()
-	def set_color(self, color): self.entry.modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse(color))
-
-class EnumParam(InputParam):
-	"""Provide an entry box for Enum types with a drop down menu."""
-
-	def __init__(self, *args, **kwargs):
-		InputParam.__init__(self, *args, **kwargs)
-		self._input = gtk.combo_box_new_text()
-		for option in self.param.get_options(): self._input.append_text(option.get_name())
-		self._input.set_active(self.param.get_option_keys().index(self.param.get_value()))
-		self._input.connect('changed', self._handle_changed)
-		self.pack_start(self._input, False)
-	def get_text(self): return self.param.get_option_keys()[self._input.get_active()]
-
-class EnumEntryParam(InputParam):
-	"""Provide an entry box and drop down menu for Raw Enum types."""
-
-	def __init__(self, *args, **kwargs):
-		InputParam.__init__(self, *args, **kwargs)
-		self._input = gtk.combo_box_entry_new_text()
-		for option in self.param.get_options(): self._input.append_text(option.get_name())
-		try: self._input.set_active(self.param.get_option_keys().index(self.param.get_value()))
-		except:
-			self._input.set_active(-1)
-			self._input.get_child().set_text(self.param.get_value())
-		self._input.connect('changed', self._handle_changed)
-		self._input.get_child().connect('changed', self._handle_changed)
-		self.pack_start(self._input, False)
-	def get_text(self):
-		if self._input.get_active() == -1: return self._input.get_child().get_text()
-		return self.param.get_option_keys()[self._input.get_active()]
-	def set_color(self, color):
-		if self._input.get_active() == -1: #custom entry, use color
-			self._input.get_child().modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse(color))
-		else: #from enum, make white background
-			self._input.get_child().modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse('#ffffff'))
 
 def _get_keys(lst): return [elem.get_key() for elem in lst]
 def _get_elem(lst, key):
@@ -231,18 +163,6 @@ class Param(Element):
 		if self.is_enum(): return self.get_option(self.get_value()).get_name()
 		return self.get_value()
 
-	def get_input_class(self):
-		"""
-		Get the graphical gtk class to represent this parameter.
-		An enum requires and combo parameter.
-		A non-enum with options gets a combined entry/combo parameter.
-		All others get a standard entry parameter.
-		@return gtk input class
-		"""
-		if self.is_enum(): return EnumParam
-		if self.get_options(): return EnumEntryParam
-		return EntryParam
-
 	##############################################
 	# Access Options
 	##############################################
-- 
cgit 


From 30513fdc9afa3d8e9d4dce4214299d89aed3c409 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 2 Sep 2009 13:16:47 -0700
Subject: Removed the flagging api and usage from the base classes. Far better
 to flag the namespace for renewing once in the flowgraph.py

---
 grc/base/Param.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/grc/base/Param.py b/grc/base/Param.py
index 9279e736b..eb7a57f51 100644
--- a/grc/base/Param.py
+++ b/grc/base/Param.py
@@ -146,9 +146,7 @@ class Param(Element):
 			self.set_value(value)
 		return value
 
-	def set_value(self, value):
-		self.flag()
-		self._value = str(value) #must be a string
+	def set_value(self, value): self._value = str(value) #must be a string
 
 	def get_type(self): return self.get_parent().resolve_dependencies(self._type)
 	def is_enum(self): return self._type == 'enum'
-- 
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/Param.py | 8 --------
 1 file changed, 8 deletions(-)

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

diff --git a/grc/base/Param.py b/grc/base/Param.py
index eb7a57f51..e56eac36e 100644
--- a/grc/base/Param.py
+++ b/grc/base/Param.py
@@ -98,14 +98,6 @@ class Param(Element):
 			try: assert self.get_value() in self.get_option_keys()
 			except AssertionError: raise Exception, 'The value "%s" is not in the possible values of "%s".'%(self.get_value(), self.get_option_keys())
 		else: self._value = value or ''
-		#begin the testing
-		self.test()
-
-	def test(self):
-		"""
-		call test on all children
-		"""
-		map(lambda c: c.test(), self.get_options())
 
 	def validate(self):
 		"""
-- 
cgit 


From 2aef04843d248d0584b4865c62d7ca0772113dc9 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Thu, 28 Oct 2010 17:22:25 -0700
Subject: uhd: added ref clock option to single usrp blocks, minor grc fix on
 empty option keys

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

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

diff --git a/grc/base/Param.py b/grc/base/Param.py
index e56eac36e..5cd0f9d6d 100644
--- a/grc/base/Param.py
+++ b/grc/base/Param.py
@@ -94,7 +94,7 @@ class Param(Element):
 				try: assert set(opt_keys) == set(option.get_opt_keys())
 				except AssertionError: raise Exception, 'Opt keys "%s" are not identical across all options.'%opt_keys
 			#if a value is specified, it must be in the options keys
-			self._value = value or self.get_option_keys()[0]
+			self._value = value if value or value in self.get_option_keys() else self.get_option_keys()[0]
 			try: assert self.get_value() in self.get_option_keys()
 			except AssertionError: raise Exception, 'The value "%s" is not in the possible values of "%s".'%(self.get_value(), self.get_option_keys())
 		else: self._value = value or ''
-- 
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/Param.py | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

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

diff --git a/grc/base/Param.py b/grc/base/Param.py
index 5cd0f9d6d..c2fa5461a 100644
--- a/grc/base/Param.py
+++ b/grc/base/Param.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
@@ -34,16 +34,16 @@ class Option(Element):
 		self._opts = dict()
 		opts = n.findall('opt')
 		#test against opts when non enum
-		try: assert self.get_parent().is_enum() or not opts
-		except AssertionError: raise Exception, 'Options for non-enum types cannot have sub-options'
+		if not self.get_parent().is_enum() and opts:
+			raise Exception, 'Options for non-enum types cannot have sub-options'
 		#extract opts
 		for opt in opts:
 			#separate the key:value
 			try: key, value = opt.split(':')
 			except: raise Exception, 'Error separating "%s" into key:value'%opt
 			#test against repeated keys
-			try: assert not self._opts.has_key(key)
-			except AssertionError: raise Exception, 'Key "%s" already exists in option'%key
+			if self._opts.has_key(key):
+				raise Exception, 'Key "%s" already exists in option'%key
 			#store the option
 			self._opts[key] = value
 
@@ -79,24 +79,24 @@ class Param(Element):
 		for option in map(lambda o: Option(param=self, n=o), n.findall('option')):
 			key = option.get_key()
 			#test against repeated keys
-			try: assert key not in self.get_option_keys()
-			except AssertionError: raise Exception, 'Key "%s" already exists in options'%key
+			if key in self.get_option_keys():
+				raise Exception, 'Key "%s" already exists in options'%key
 			#store the option
 			self.get_options().append(option)
 		#test the enum options
 		if self.is_enum():
 			#test against options with identical keys
-			try: assert len(set(self.get_option_keys())) == len(self.get_options())
-			except AssertionError: raise Exception, 'Options keys "%s" are not unique.'%self.get_option_keys()
+			if len(set(self.get_option_keys())) != len(self.get_options()):
+				raise Exception, 'Options keys "%s" are not unique.'%self.get_option_keys()
 			#test against inconsistent keys in options
 			opt_keys = self.get_options()[0].get_opt_keys()
 			for option in self.get_options():
-				try: assert set(opt_keys) == set(option.get_opt_keys())
-				except AssertionError: raise Exception, 'Opt keys "%s" are not identical across all options.'%opt_keys
+				if set(opt_keys) != set(option.get_opt_keys()):
+					raise Exception, 'Opt keys "%s" are not identical across all options.'%opt_keys
 			#if a value is specified, it must be in the options keys
 			self._value = value if value or value in self.get_option_keys() else self.get_option_keys()[0]
-			try: assert self.get_value() in self.get_option_keys()
-			except AssertionError: raise Exception, 'The value "%s" is not in the possible values of "%s".'%(self.get_value(), self.get_option_keys())
+			if self.get_value() not in self.get_option_keys():
+				raise Exception, 'The value "%s" is not in the possible values of "%s".'%(self.get_value(), self.get_option_keys())
 		else: self._value = value or ''
 
 	def validate(self):
@@ -105,8 +105,8 @@ class Param(Element):
 		The value must be evaluated and type must a possible type.
 		"""
 		Element.validate(self)
-		try: assert self.get_type() in self.get_types()
-		except AssertionError: self.add_error_message('Type "%s" is not a possible type.'%self.get_type())
+		if self.get_type() not in self.get_types():
+			self.add_error_message('Type "%s" is not a possible type.'%self.get_type())
 
 	def get_evaluated(self): raise NotImplementedError
 
-- 
cgit