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

Author: jblum

config/grc_grc.m4

@@ -1,4 +1,4 @@
-dnl Copyright 2008 Free Software Foundation, Inc.
+dnl Copyright 2008, 2009 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Radio
 dnl
@@ -47,27 +47,15 @@ AC_DEFUN([GRC_GRC],[
     AC_SUBST(PYTHONW)
 
     AC_CONFIG_FILES([ \
-        grc/src/grc_gnuradio/Makefile \
-        grc/src/grc_gnuradio/wxgui/Makefile \
-        grc/src/grc_gnuradio/blks2/Makefile \
-        grc/src/grc_gnuradio/usrp/Makefile \
-        grc/src/Makefile \
-        grc/src/platforms/Makefile \
-        grc/src/platforms/base/Makefile \
-        grc/src/platforms/python/Makefile \
-        grc/src/platforms/python/utils/Makefile \
-        grc/src/platforms/gui/Makefile \
-        grc/src/utils/Makefile \
-        grc/src/gui/Makefile \
-        grc/examples/Makefile \
         grc/Makefile \
-        grc/data/Makefile \
-        grc/data/platforms/Makefile \
-        grc/data/platforms/base/Makefile \
-        grc/data/platforms/python/Makefile \
-        grc/data/platforms/python/blocks/Makefile \
-        grc/scripts/Makefile \
+        grc/base/Makefile \
+        grc/blocks/Makefile \
+        grc/examples/Makefile \
         grc/freedesktop/Makefile \
+        grc/grc_gnuradio/Makefile \
+        grc/gui/Makefile \
+        grc/python/Makefile \
+        grc/scripts/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(grc)

gr-wxgui/src/python/forms/converters.py

@@ -85,22 +85,28 @@ class eval_converter(abstract_converter):
 	Possible uses, set a complex number, constellation points.
 	Used in text box.
 	"""
-	def external_to_internal(self, s):
-		return str(s)
+	def __init__(self, formatter=lambda x: '%s'%(x)):
+		self._formatter = formatter
+	def external_to_internal(self, v):
+		return self._formatter(v)
 	def internal_to_external(self, s):
 		return eval(s)
 	def help(self):
 		return "Value must be evaluatable by python's eval."
 
 class str_converter(abstract_converter):
+	def __init__(self, formatter=lambda x: '%s'%(x)):
+		self._formatter = formatter
 	def external_to_internal(self, v):
-		return str(v)
+		return self._formatter(v)
 	def internal_to_external(self, s):
 		return str(s)
 
 class int_converter(abstract_converter):
+	def __init__(self, formatter=lambda x: '%d'%round(x)):
+		self._formatter = formatter
 	def external_to_internal(self, v):
-		return str(int(round(v)))
+		return self._formatter(v)
 	def internal_to_external(self, s):
 		return int(s, 0)
 	def help(self):
@@ -127,7 +133,8 @@ def __init__(self, minimum, maximum, num_steps, cast):
 		self._scaler = float(maximum - minimum)/num_steps
 		self._cast = cast
 	def external_to_internal(self, v):
-		return (v - self._offset)/self._scaler
+		#slider's internal representation is an integer
+		return int(round((v - self._offset)/self._scaler))
 	def internal_to_external(self, v):
 		return self._cast(v*self._scaler + self._offset)
 	def help(self):

gr-wxgui/src/python/forms/forms.py

@@ -115,7 +115,6 @@ def _add_widget(self, widget, label='', flag=0, label_prop=0, widget_prop=1):
 		self.subscribe(INT_KEY, update)
 		self.subscribe(INT_KEY, self._translate_internal_to_external)
 		self.subscribe(EXT_KEY, self._translate_external_to_internal)
-		if self._callback: self.subscribe(EXT_KEY, self._callback)
 
 	def _translate_external_to_internal(self, external):
 		try:
@@ -134,6 +133,7 @@ def _translate_internal_to_external(self, internal):
 		except Exception, e:
 			self._err_msg(internal, e)
 			self[EXT_KEY] = self[EXT_KEY] #reset to last good setting
+		if self._callback: self._callback(self[EXT_KEY])
 
 	def _err_msg(self, value, e):
 		print >> sys.stderr, self, 'Error translating value: "%s"\n\t%s\n\t%s'%(value, e, self._converter.help())

grc/Makefile.am

@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008, 2009 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -23,13 +23,43 @@ include $(top_srcdir)/grc/Makefile.inc
 
 if PYTHON
 SUBDIRS = \
-	data \
+	base \
+	blocks \
 	examples \
-	scripts \
-	src
+	grc_gnuradio \
+	gui \
+	python \
+	scripts
 
 ## append freedesktop to the list of subdirs when xdg utils are present
 if XDG_UTILS
 SUBDIRS += freedesktop
 endif
+
+ourpythondir = $(grc_src_prefix)
+ourpython_PYTHON = __init__.py
+
+etcdir = $(gr_sysconfdir)
+dist_etc_DATA = grc.conf
+
+EXTRA_DIST = \
+	$(srcdir)/__init__.py.in \
+	$(srcdir)/grc.conf.in
+
+BUILT_SOURCES = \
+	__init__.py \
+	grc.conf
+
+__init__.py: $(srcdir)/__init__.py.in Makefile
+	sed \
+		-e 's|@VERSION[@]|$(VERSION)|g' \
+	$< > $@
+
+grc.conf: $(srcdir)/grc.conf.in Makefile
+	sed \
+		-e 's|@pythonw[@]|$(PYTHONW)|g' \
+		-e 's|@blocksdir[@]|$(grc_blocksdir)|g' \
+		-e 's|@docdir[@]|$(gr_docdir)|g' \
+	$< > $@
+
 endif

grc/Makefile.inc

@@ -20,8 +20,5 @@
 #
 
 include $(top_srcdir)/Makefile.common
-grc_gnuradio_prefix = $(pythondir)/grc_gnuradio
 grc_src_prefix = $(pythondir)/gnuradio/grc
-grc_base_data_reldir = grc/base
-grc_python_data_reldir = grc/python
-grc_blocks_data_reldir = grc/blocks
+grc_blocksdir = $(pkgdatadir)/grc/blocks

grc/src/gui/Constants.py grc/__init__.py.in

@@ -1,5 +1,5 @@
 """
-Copyright 2008, 2009 Free Software Foundation, Inc.
+Copyright 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,5 @@
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
-import pygtk
-pygtk.require('2.0')
-import gtk
-import os
-
-##default path for the open/save dialogs
-DEFAULT_FILE_PATH = os.getcwd()
-
-##file extensions
-IMAGE_FILE_EXTENSION = '.png'
-
-##name for new/unsaved flow graphs
-NEW_FLOGRAPH_TITLE = 'untitled'
-
-##main window constraints
-MIN_WINDOW_WIDTH = 600
-MIN_WINDOW_HEIGHT = 400
-##dialog constraints
-MIN_DIALOG_WIDTH = 500
-MIN_DIALOG_HEIGHT = 500
-##default sizes
-DEFAULT_BLOCKS_WINDOW_WIDTH = 100
-DEFAULT_REPORTS_WINDOW_WIDTH = 100
-
-##The size of the state saving cache in the flow graph (for undo/redo functionality)
-STATE_CACHE_SIZE = 42
-
-##Shared targets for drag and drop of blocks
-DND_TARGETS = [('STRING', gtk.TARGET_SAME_APP, 0)]
+#package and version constants
+VERSION = '@VERSION@'

grc/src/platforms/base/Block.py grc/base/Block.py

@@ -17,7 +17,7 @@
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
-from ... utils import odict
+from . import odict
 from Element import Element
 from Param import Param
 from Port import Port
@@ -44,7 +44,7 @@ def __str__(self):
 		return str(self._param.to_code())
 
 	def __call__(self):
-		return self._param.evaluate()
+		return self._param.get_evaluated()
 
 class Block(Element):
 
@@ -89,26 +89,26 @@ def __init__(self, flow_graph, n):
 		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: self._exit_with_error('Key "%s" already exists in params'%key)
+			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: self._exit_with_error('Key "%s" already exists in sources'%key)
+			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: self._exit_with_error('Key "%s" already exists in sinks'%key)
+			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
@@ -141,11 +141,14 @@ def validate(self):
 		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: assert(c.is_valid())
+			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))
+					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())
 
@@ -256,4 +259,3 @@ def import_data(self, n):
 			#the key must exist in this block's params
 			if key in self.get_param_keys():
 				self.get_param(key).set_value(value)
-		self.validate()

grc/src/platforms/base/Connection.py grc/base/Connection.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
@@ -18,7 +18,7 @@
 """
 
 from Element import Element
-from ... utils import odict
+from . import odict
 
 class Connection(Element):
 
@@ -59,10 +59,11 @@ def validate(self):
 		Validate the connections.
 		The ports must match in type.
 		"""
+		Element.validate(self)
 		source_type = self.get_source().get_type()
 		sink_type = self.get_sink().get_type()
 		try: assert source_type == sink_type
-		except AssertionError: self._add_error_message('Source type "%s" does not match sink type "%s".'%(source_type, sink_type))
+		except AssertionError: self.add_error_message('Source type "%s" does not match sink type "%s".'%(source_type, sink_type))
 
 	def get_enabled(self):
 		"""

grc/src/platforms/base/Constants.py.in grc/base/Constants.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
@@ -19,12 +19,7 @@
 
 import os
 
-#package and version constants
-PACKAGE = '@PACKAGE@'
-VERSION = '@VERSION@'
-
-#setup paths
-PKG_DIR = os.environ.get('GR_DATADIR', '@pkgdatadir@')
-DATA_DIR = os.path.join(PKG_DIR, '@reldatadir@')
+#data files
+DATA_DIR = os.path.dirname(__file__)
 FLOW_GRAPH_DTD = os.path.join(DATA_DIR, 'flow_graph.dtd')
 BLOCK_TREE_DTD = os.path.join(DATA_DIR, 'block_tree.dtd')

grc/src/platforms/base/Element.py grc/base/Element.py

@@ -21,7 +21,6 @@ class Element(object):
 
 	def __init__(self, parent=None):
 		self._parent = parent
-		self._error_messages = []
 		self.flag()
 
 	def test(self):
@@ -31,45 +30,17 @@ def test(self):
 		"""
 		pass
 
-	def validate(self):
-		"""
-		Validate the data in this element.
-		Set the error message non blank for errors.
-		Overload this method in sub-classes.
-		"""
-		pass
-
-	def is_valid(self):
-		self._error_messages = []#reset err msgs
-		if self.get_enabled():
-			try: self.validate()
-			except: pass
-		return not self.get_error_messages()
+	##################################################
+	# Element Validation API
+	##################################################
+	def validate(self): self._error_messages = list()
+	def is_valid(self): return not self.get_error_messages() or not self.get_enabled()
+	def add_error_message(self, msg): self._error_messages.append(msg)
+	def get_error_messages(self): return self._error_messages
 
 	def get_enabled(self): return True
 
-	def _add_error_message(self, msg):
-		self._error_messages.append(msg)
-
-	def get_error_messages(self):
-		return self._error_messages
-
-	def get_parent(self):
-		return self._parent
-
-	def _exit_with_error(self, error):
-		parent = self
-		#build hier list of elements
-		elements = list()
-		while(parent):
-			elements.insert(0, parent)
-			parent = parent.get_parent()
-		#build error string
-		err_str = ">>> Error:"
-		for i, element in enumerate(elements + [error]):
-			err_str = err_str + '\n' + ''.join('   '*(i+2)) + str(element)
-		err_str = err_str + '\n'
-		exit(err_str)
+	def get_parent(self): return self._parent
 
 	##############################################
 	## Update flagging