Changeset 4268

Timestamp:

07/09/07 17:50:18 (6 years ago)

Author:

jgaeddert

Message:

finished removing Amara from component_gen.py except for odd simplesequence of provides ports

Files:

• WaveDev/branches/WaveDevNoAmara/wavedev/XML_gen/component_gen.py (modified) (4 diffs)

WaveDev/branches/WaveDevNoAmara/wavedev/XML_gen/component_gen.py

@@ -21 +21 @@
 import os, copy
 import shutil
-from amara import binderytools
 
 import xml.dom.minidom
@@ -189 +188 @@
 def gen_prf(comp, waveformDir):
     componentName = unicode(comp.name)    
-    doc_prf = binderytools.bind_file('XML_gen/_prf.xml.tpl')
-    
+    doc_prf = xml.dom.minidom.parse('XML_gen/_prf.xml.tpl')
+    
+    propertiesNode = doc_prf.getElementsByTagName("properties")[0]
+
     for p in comp.properties:
         if p.elementType == "Simple":
-            e = doc_prf.xml_create_element(u'simple', attributes={u'name': unicode(p.name),u'id': unicode(p.id), u'type': unicode(p.type), u'mode': unicode(p.mode)})
-            doc_prf.properties.xml_append(e)
-            newLen = len(list(doc_prf.properties.simple))
-            e = doc_prf.xml_create_element(u'description',content=unicode(p.description))
-            doc_prf.properties.simple[newLen-1].xml_append(e)
-            e = doc_prf.xml_create_element(u'value',content=unicode(p.value))
-            doc_prf.properties.simple[newLen-1].xml_append(e)
-            e = doc_prf.xml_create_element(u'kind',attributes={u'kindtype': unicode(p.kind)})
-            doc_prf.properties.simple[newLen-1].xml_append(e)
+            e = doc_prf.createElement("simple")
+
+            # Add the property value
+            valueNode = doc_prf.createElement("value")
+            valueText = doc_prf.createTextNode(unicode(p.value))
+            valueNode.appendChild(valueText)
+
+            e.appendChild(valueNode)
 
         elif p.elementType == "SimpleSequence":
-            e = doc_prf.xml_create_element(u'simplesequence', attributes={u'name': unicode(p.name),u'id': unicode(p.id), u'type': unicode(p.type), u'mode': unicode(p.mode)})
-            doc_prf.properties.xml_append(e)
-            newLen = len(list(doc_prf.properties.simplesequence))
-            e = doc_prf.xml_create_element(u'description',content=unicode(p.description))
-            doc_prf.properties.simplesequence[newLen-1].xml_append(e)
-
-            e = doc_prf.xml_create_element(u'values')
-            doc_prf.properties.simplesequence[newLen-1].xml_append(e)
-
+            e = doc_prf.createElement("simplesequence")
+
+            # Add the property values
+            valuesNode = doc_prf.createElement("values")
             for x in p.values:
-                e = doc_prf.xml_create_element(u'value',content=unicode(x[0]))
-                doc_prf.properties.simplesequence[newLen-1].values.xml_append(e)
-            e = doc_prf.xml_create_element(u'kind',attributes={u'kindtype': unicode(p.kind)})
-            doc_prf.properties.simplesequence[newLen-1].xml_append(e)
-
+                valueNode = doc_prf.createElement("value")
+                valueText = doc_prf.createTextNode(x[0])
+                valueNode.appendChild(valueText)
+                valuesNode.appendChild(valueNode)
+
+            e.appendChild(valuesNode)
+
+        e.setAttribute("type", unicode(p.type))
+        e.setAttribute("id", unicode(p.id))
+        e.setAttribute("name", unicode(p.name))
+        e.setAttribute("mode", unicode(p.mode))
+
+        # Add the property description
+        descriptionNode = doc_prf.createElement("description")
+        descriptionText = doc_prf.createTextNode(unicode(p.description))
+        descriptionNode.appendChild(descriptionText)
+        e.appendChild(descriptionNode)
+            
+        # Add the property kind
+        kindNode = doc_prf.createElement("kind")
+        kindNode.setAttribute("kindtype", unicode(p.kind))
+        e.appendChild(kindNode)
+
+        propertiesNode.appendChild(e)
+            
+    """
     # Create a simplesequence of string type that lists each Provides port in the component
     # Used for connecting to components from outside the framework (ex. control gui)
@@ -241 +257 @@
         e = doc_prf.xml_create_element(u'kind',attributes={u'kindtype': u'configure'})
         doc_prf.properties.simplesequence[newLen-1].xml_append(e)
-    
+    """
     
     # Now do final processing and write to file
@@ -248 +264 @@
     #outputFileName_prf = comp.name + 'Resource' + '.prf.xml'
     
-    data = doc_prf.xml()
+    data = doc_prf.toxml('UTF-8')
     xmlBeautify.beautify(data,compDir + '.' + outputFileName_prf + '.tmp')