Changeset 3529

Timestamp:

04/30/07 13:09:21 (6 years ago)

Author:

DrewCormier

Message:

stuff for generating port declaration stuff in init method. not tested yet

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

@@ -21 +21 @@
         self.naming_service_name = label
         self.poa = poa
-        
-        self.inPort0_servant = dataIn_complexShort_i(self, "data_in_cs")
-        self.inPort0_var = self.inPort0_servant._this()
-        
-        self.outPort0_servant = dataOut_complexShort_i(self, "data_out_cs")
-        self.outPort0_var = self.outPort0_servant._this()
-        self.outPort0_active = False
-        self.outPort1_servant = dataOut_timingStatus_i(self, "send_timing_report")
-        self.outPort1_var = self.outPort1_servant._this()
-        self.outPort1_active = False
-        
+
+         __PORT_DECL__
+
         self.propertySet = []
         self.work_mod = None

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

@@ -110 +110 @@
          l_out = line.replace('__CLASS_NAME__',comp.name)
          output.write(l_out)
-         
+
+         if l_out.find("__PORT_DECL__") != -1:
+              self.writePortDecl(output,comp)
+              continue
+
 
       input_tmpl.close()
@@ -136 +140 @@
       output_wm.close()
 
+      
+
+
+
+
+
+  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 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'  
+            output.write(ts)
+            inCount += 1
+
+    outCount = 0
+    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
+    
+
 
 
       '''        
-        for line in inputH.readlines():
-          l_out = line.replace("__CLASS_DEF__",comp.name.upper()+"_IMPL_H")
-          l_out = l_out.replace("__Class_name__",comp.name+"_i")
-          if l_out.find("__PORT_DECL__") != -1:
-              self.writePortDecl(outputH,comp)
-              continue
-          if l_out.find("__ACE_INCLUDES__") != -1:
-              if comp.ace == True:
-                  l_out = '#include "ace/Task.h"\n'
-              else:
-                  continue
-          if l_out.find("__ACE_INHERIT__") != -1:
-              if comp.ace == True:
-                  l_out = l_out.replace("__ACE_INHERIT__",", public ACE_Task<ACE_MT_SYNCH>")
-              else:
-                  l_out = l_out.replace("__ACE_INHERIT__","")
-          if l_out.find("__ACE_SVC_DECL__") != -1:
-              if comp.ace == True:
-                  l_out = l_out.replace("__ACE_SVC_DECL__",'int svc(void);\n        size_t queue_size;')
-              else:
-                  continue   
-          if l_out.find("__FRIEND_DECL__") != -1:
-              l_out = l_out.replace("__FRIEND_DECL__","")
-              self.writeFriendDecl(outputH,comp)
-              continue
-                   
-          outputH.write(l_out)
-          
-        inputH.close()
-        outputH.close()
-        
+                
         # generate the .cpp files for each component
-        inputCPP = open('generate/templates/custom_ports/sampleComp.cpp','r')
-        outputCPP = open(self.path + comp.name + "/" + comp.name + ".cpp",'w')
-        self.addGPL(outputCPP,comp.name)
         for line in inputCPP.readlines():
-          l_out = line.replace("__IncludeFile__",comp.name)
-          l_out = l_out.replace("__Class_name__",comp.name+"_i")
-          #l_out = l_out.replace("__NS_name__","ossie" + comp.name+"Resource")
           if l_out.find("__PORT_INST__") != -1:
               self.writePortInst(outputCPP,comp)
@@ -187 +183 @@
               self.writeDelPort(outputCPP,comp)
               continue
-          if l_out.find("__ACE_SVC_PORTS__") != -1:
-              self.writeACESvcPorts(outputCPP,comp)
-              continue
-          if l_out.find("__ACE_SVC_DEF__") != -1:
-              if comp.ace == True:
-                  self.writeACESvcDef(outputCPP,comp,'component',comp.timing, comp)
-              continue              
-          outputCPP.write(l_out)
-          
-        inputCPP.close()
-        outputCPP.close()
-        
-        # generate the main.cpp files for each component
-        inputMain = open('generate/templates/custom_ports/sampleMain.cpp','r')
-        outputMain = open(self.path + comp.name + "/main.cpp",'w')
-        self.addGPL(outputMain,comp.name)
-        
-        for line in inputMain.readlines():
-          l_out = line.replace("__IncludeFile__",comp.name)
-          l_out = l_out.replace("__Class_name__",comp.name+"_i")
-          l_out = l_out.replace("__CLASS_VAR__",comp.name.lower())
-          if l_out.find("__CLASS_VAR_ACE__") != -1:
-              if comp.ace == True:
-                  l_out = l_out.replace("__CLASS_VAR_ACE__",comp.name.lower())
-              else:
-                  continue          
-          if l_out.find("__NAME_SPACE__") != -1:
-              ns_list = []
-              for p in comp.ports:
-                  if p.interface.nameSpace not in ns_list:
-                      ns_list.append(p.interface.nameSpace)
-              l_out = ''
-              for tmpns in ns_list:
-                  l_out += 'using namespace ' + tmpns + ';\n'
-
-          outputMain.write(l_out)
-          
-        inputMain.close()
-        outputMain.close()
+        
         
         # generate the port_impl.h file