[Csp-commits] APPLICATIONS/SimData/SimData Parse.py,1.8,1.9

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv31593/SimData

Modified Files:
	Parse.py 
Log Message:
see CHANGES.current

Index: Parse.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Parse.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Parse.py	18 Jul 2003 10:14:49 -0000	1.8
--- Parse.py	18 Jul 2003 18:44:08 -0000	1.9
***************
*** 608,619 ****
  	handlers = {
  		"Values"       : FloatListHandler,
! #		"Method"       : EnumHandler,
  	}
  
  	members = handlers.keys()
! 	required_members = members
  	
  	def __init__(self, dim, id, base, name, attrs):
  		SimpleHandler.__init__(self, id, base, name, attrs)
  		self._required_members = _LUTHandler.required_members
  		for i in range(dim): 
--- 608,620 ----
  	handlers = {
  		"Values"       : FloatListHandler,
! 		"Method"       : StringHandler,
  	}
  
  	members = handlers.keys()
! 	required_members = ["Values"]
  	
  	def __init__(self, dim, id, base, name, attrs):
  		SimpleHandler.__init__(self, id, base, name, attrs)
+ 		self._method = attrs.get("method", "linear")
  		self._required_members = _LUTHandler.required_members
  		for i in range(dim): 
***************
*** 657,663 ****
  		values, attrs = tags["Values"]
  		table.load(values, breaks)
! #		method, attrs = tags["Method"]
! #		table.method.parseXML(method)
! 		table.interpolate(spacing, table.LINEAR)
  		interface.set(object, name, table)
  
--- 658,667 ----
  		values, attrs = tags["Values"]
  		table.load(values, breaks)
! 		try:
! 			method = getattr(table, self._method.upper())
! 		except:
! 			msg = "LUTHander: unknown interpolation method '%s'" % self._method
! 			raise XMLSyntax, msg
! 		table.interpolate(spacing, method)
  		interface.set(object, name, table)