Changeset 4523

Timestamp:

08/01/07 10:39:04 (6 years ago)

Author:

jgaeddert

Message:

hacking application_gen.py to work with current framework

Files:

• WaveDev/trunk/WaveDev/wavedev/XML_gen/application_gen.py (modified) (5 diffs)

WaveDev/trunk/WaveDev/wavedev/XML_gen/application_gen.py

@@ -197 +197 @@
             cname = unicode(n.name)
             devFlag = False
+
+            print "Processing connection : "
+            print "  component name  : " + cname
+            print "  local comp type : " + n.type
+            print "  local port type : " + i.localPort.type
+            print "  local port name : " + unicode(i.localPort.name)
+            print "  remote comp type: " + i.remoteComp.type
+            print "  remote port type: " + i.remotePort.type
+            print "  remote port name: " + unicode(i.remotePort.name)
+
             if i.localPort.type == 'Uses':
                 uname = unicode(i.localPort.name)
@@ -204 +214 @@
                 c1name = cname
                 c2name = unicode(i.remoteComp.name)
-                if i.remoteComp.type == "device" \
-                or i.remoteComp.type == "executabledevice" \
+                if i.remoteComp.type.lower() == "device" \
+                or i.remoteComp.type.lower() == "executabledevice" \
                 or i.remoteComp.type.lower() == "aggregatedevice":
                     dev_pname = u'DomainName1/' + pname
@@ -216 +226 @@
                 c2name = cname
                 c1name = unicode(i.remoteComp.name)
-                if n.type == "device" \
-                or n.type == "executabledevice" \
+                if n.type.lower() == "device" \
+                or n.type.lower() == "executabledevice" \
                 or n.type.lower() == "aggregatedevice":
                     dev_pname = u'DomainName1/' + pname
                     devFlag = True
-            
+
             connectinterfaceNode = doc_sad.createElement("connectinterface")
             connectinterfaceNode.setAttribute("id",u'DCE:' + unicode(uuidgen()))
@@ -230 +240 @@
             findbyUsesNode = doc_sad.createElement("findby")
             namingserviceUsesNode = doc_sad.createElement("namingservice")
+            # TODO: this is a dirty hack that needs to be fixed!
+            if c1name == "USRP1":
+                c1name = "DomainName1/USRP1"
             namingserviceUsesNode.setAttribute("name", c1name)
             
@@ -263 +276 @@
                 findbyProvidesNode.appendChild(namingserviceProvidesNode)
                 connectinterfaceNode.appendChild(findbyProvidesNode)
+                connectinterfaceNode.appendChild(usesportNode)
 
             # Append connectinterface to connections