Merge branch 'master' into udp

3 files changed, 35 insertions, 16 deletions

diff --git a/grc/gui/Param.py b/grc/gui/Param.py
index b3018dab2..7c00c1b67 100644
--- a/grc/gui/Param.py
+++ b/grc/gui/Param.py
@@ -1,5 +1,5 @@
 """
-Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 This file is part of GNU Radio
 
 GNU Radio Companion is free software; you can redistribute it and/or
@@ -135,10 +135,21 @@ PARAM_LABEL_MARKUP_TMPL="""\
 <span underline="$underline" foreground="$foreground" font_desc="Sans 9">$encode($param.get_name())</span>"""
 
 TIP_MARKUP_TMPL="""\
+########################################
+#def truncate(string)
+	#set $max_len = 100
+	#set $string = str($string)
+	#if len($string) > $max_len
+$('%s...%s'%($string[:$max_len/2], $string[-$max_len/2:]))#slurp
+	#else
+$string#slurp
+	#end if
+#end def
+########################################
 Key: $param.get_key()
 Type: $param.get_type()
 #if $param.is_valid()
-Value: $param.get_evaluated()
+Value: $truncate($param.get_evaluated())
 #elif len($param.get_error_messages()) == 1
 Error: $(param.get_error_messages()[0])
 #else
diff --git a/grc/python/Param.py b/grc/python/Param.py
index e04bc8fcb..6dd008d1d 100644
--- a/grc/python/Param.py
+++ b/grc/python/Param.py
@@ -1,5 +1,5 @@
 """
-Copyright 2008, 2009 Free Software Foundation, Inc.
+Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
 This file is part of GNU Radio
 
 GNU Radio Companion is free software; you can redistribute it and/or
@@ -108,7 +108,23 @@ class Param(_Param, _GUIParam):
 		Get the repr (nice string format) for this param.
 		@return the string representation
 		"""
-		if not self.is_valid(): return self.get_value()
+		##################################################
+		# truncate helper method
+		##################################################
+		def _truncate(string, style=0):
+			max_len = max(27 - len(self.get_name()), 3)
+			if len(string) > max_len:
+				if style < 0: #front truncate
+					string = '...' + string[3-max_len:]
+				elif style == 0: #center truncate
+					string = string[:max_len/2 -3] + '...' + string[-max_len/2:]
+				elif style > 0: #rear truncate
+					string = string[:max_len-3] + '...'
+			return string
+		##################################################
+		# simple conditions
+		##################################################
+		if not self.is_valid(): return _truncate(self.get_value())
 		if self.get_value() in self.get_option_keys(): return self.get_option(self.get_value()).get_name()
 		##################################################
 		# display logic for numbers
@@ -126,7 +142,6 @@ class Param(_Param, _GUIParam):
 		# split up formatting by type
 		##################################################
 		truncate = 0 #default center truncate
-		max_len = max(27 - len(self.get_name()), 3)
 		e = self.get_evaluated()
 		t = self.get_type()
 		if isinstance(e, bool): return str(e)
@@ -141,16 +156,9 @@ class Param(_Param, _GUIParam):
 			truncate = -1
 		else: dt_str = str(e) #other types
 		##################################################
-		# truncate
+		# done
 		##################################################
-		if len(dt_str) > max_len:
-			if truncate < 0: #front truncate
-				dt_str = '...' + dt_str[3-max_len:]
-			elif truncate == 0: #center truncate
-				dt_str = dt_str[:max_len/2 -3] + '...' + dt_str[-max_len/2:]
-			elif truncate > 0: #rear truncate
-				dt_str = dt_str[:max_len-3] + '...'
-		return dt_str
+		return _truncate(dt_str, truncate)
 
 	def get_input(self, *args, **kwargs):
 		if self.get_type() in ('file_open', 'file_save'): return FileParam(self, *args, **kwargs)
diff --git a/usrp/firmware/src/common/build_eeprom.py b/usrp/firmware/src/common/build_eeprom.py
index ed9bb56a4..d73cbbc4f 100755
--- a/usrp/firmware/src/common/build_eeprom.py
+++ b/usrp/firmware/src/common/build_eeprom.py
@@ -146,7 +146,7 @@ def build_shell_script (out, ihx_filename, rev, prefix):
 
     out.write ('#!/bin/sh\n')
     out.write ('usrper -x load_firmware ' + prefix + '/share/usrp/rev%d/std.ihx\n' % rev)
-    out.write ('sleep 1\n')
+    out.write ('sleep 2\n')
     
     # print "len(image) =", len(image)
     
@@ -161,7 +161,7 @@ def build_shell_script (out, ihx_filename, rev, prefix):
                    (i2c_addr, rom_addr, ''.join (hex_image[0:l])))
         hex_image = hex_image[l:]
         rom_addr = rom_addr + l
-        out.write ('sleep 1\n')
+        out.write ('sleep 2\n')
 
 if __name__ == '__main__':
     usage = "usage: %prog -p PREFIX -r REV [options] bootfile.ihx"