Changeset 3607

Timestamp:

05/02/07 15:57:52 (6 years ago)

Author:

DrewCormier

Message:

added generation of getPOrt method based on existing ports

Location:

WaveDev/trunk/WaveDev/wavedev/generate/templates/py_comp

Files:

• _sampleComp.py (modified) (1 diff)
• genStructure.py (modified) (3 diffs)

WaveDev/trunk/WaveDev/wavedev/generate/templates/py_comp/_sampleComp.py

@@ -34 +34 @@
         
     def getPort(self, id):
-        if str(id) == "data_in_cs":
-            return self.inPort0_var
-        elif str(id) == "data_out_cs":
-            return self.outPort0_var
-        elif str(id) == "send_timing_report":
-            return self.outPort1_var
-        
-        return None
+        __GET_PORT__
+        
+        return None  #port not found in available ports list
         
     def initialize(self):

WaveDev/trunk/WaveDev/wavedev/generate/templates/py_comp/genStructure.py

@@ -120 +120 @@
               self.writePortDecl(output,comp)
               continue
+         if l_out.find("__GET_PORT__") != -1:
+              self.writeGetPort(output,comp)
+              continue
 
 
@@ -152 +155 @@
 
 
-
+  #-----------------------------------------------------------------------------------
   def writePortDecl(output,comp):
     """ This function writes the corba declarations of the ports to the init method"""
 
+    #TODO: test this method
+    inCount = 0
+    for p in comp.ports:
+        if p.type == "Provides":
+            ts = " "*8 + "self.inPort" + inCount + '_servant = dataIn_complexShort_i(self, "' + p.name + '")\n'
+            ts = ts + " "*8 + 'self.inPort' + inCount + '_var = self.inPort' + inCount + '_servant._this()\n\n'  
+            output.write(ts)
+            inCount += 1
+
+    outCount = 0
+    for p in comp.ports:
+        if p.type == "Uses":
+            ts = " "*8 + 'self.outPort' + outCount + '_servant = dataOut_' + p.interface + '_i(self, "' + p.name + '")\n'
+            ts = ts + " "*8 + 'self.outPort' + outCount + '_var = self.outPort' + outCount + '_servant._this()\n'
+            ts = ts + " "*8 + 'self.outPort' + outCount + '_active = False\n\n'
+            output.write(ts)
+            outCount += 1
+  #----------------------------------------------------------------------------------------    
+
+  #----------------------------------------------------------------------------------------
+  def writeGetPort(output,comp):
+    #TODO: comment this method
     #TODO: test this method
     inCount = 0
     for p in c.ports:
         if p.type == "Provides":
-            ts = " "*8 + "self.inPort" + inCount + '_servant = dataIn_complexShort_i(self, "' + p.name + '")\n'
-            ts = ts + " "*8 + 'self.inPort' + inCount + '_var = self.inPort' + inCount + '_servant._this()\n\n'  
+            ts = " "*8 + 'if str(id) == "' + p.name + '":\n'
+            ts = ts + " "*12 + 'return ' + 'self.inPort' + inCount + '_var\n'
             output.write(ts)
             inCount += 1
@@ -168 +193 @@
     for p in c.ports:
         if p.type == "Uses":
-            ts = " "*8 + 'self.outPort' + outCount + '_servant = dataOut_' + p.interface + '_i(self, "' + p.name + '")\n'
-            ts = ts + " "*8 + 'self.outPort' + outCount + '_var = self.outPort' + outCount + '_servant._this()\n'
-            ts = ts + " "*8 + 'self.outPort' + outCount + '_active = False\n\n'
-            output.write(ts)
-            outCount += 1
-    
-
-
+            ts = " "*8 + 'if str(id) == "' + p.name + '":\n'
+            ts = ts + " "*12 + 'return ' + 'self.outPort' + outCount + '_var\n'
+            output.write(ts)
+            inCount += 1
+  #----------------------------------------------------------------------------------------
 
       '''