Merge pull request #12 from moyogo/intorfloat

use intOrFloat() for attributes of axis and map
This commit is contained in:
Erik van Blokland 2017-05-13 10:21:18 +02:00 committed by GitHub
commit 63a14e32bc

View File

@ -345,9 +345,9 @@ class BaseDocWriter(object):
axisElement = ET.Element('axis') axisElement = ET.Element('axis')
axisElement.attrib['tag'] = axisObject.tag axisElement.attrib['tag'] = axisObject.tag
axisElement.attrib['name'] = axisObject.name axisElement.attrib['name'] = axisObject.name
axisElement.attrib['minimum'] = str(axisObject.minimum) axisElement.attrib['minimum'] = self.intOrFloat(axisObject.minimum)
axisElement.attrib['maximum'] = str(axisObject.maximum) axisElement.attrib['maximum'] = self.intOrFloat(axisObject.maximum)
axisElement.attrib['default'] = str(axisObject.default) axisElement.attrib['default'] = self.intOrFloat(axisObject.default)
for languageCode, labelName in axisObject.labelNames.items(): for languageCode, labelName in axisObject.labelNames.items():
languageElement = ET.Element('labelname') languageElement = ET.Element('labelname')
languageElement.attrib[u'xml:lang'] = languageCode languageElement.attrib[u'xml:lang'] = languageCode
@ -356,8 +356,8 @@ class BaseDocWriter(object):
if axisObject.map: if axisObject.map:
for inputValue, outputValue in axisObject.map: for inputValue, outputValue in axisObject.map:
mapElement = ET.Element('map') mapElement = ET.Element('map')
mapElement.attrib['input'] = str(inputValue) mapElement.attrib['input'] = self.intOrFloat(inputValue)
mapElement.attrib['output'] = str(outputValue) mapElement.attrib['output'] = self.intOrFloat(outputValue)
axisElement.append(mapElement) axisElement.append(mapElement)
self.root.findall('.axes')[0].append(axisElement) self.root.findall('.axes')[0].append(axisElement)