Changeset 10671 for ossiedev/branches/0.8.x/tools/WaveDev/wavedev/generate/templates/py_comp/genStructure.py

Timestamp:

04/15/11 00:10:39 (2 years ago)

Author:

jawil06

Message:

Merging trunk to 0.8.x branch

Files:

• ossiedev/branches/0.8.x/tools/WaveDev/wavedev/generate/templates/py_comp/genStructure.py (modified) (4 diffs)

ossiedev/branches/0.8.x/tools/WaveDev/wavedev/generate/templates/py_comp/genStructure.py

@@ -25 +25 @@
 
 class genAll:
-  def __init__(self, path, wavedevPath, active_wave):
+  def __init__(self, path, wavedevPath, active_wave, preamble=None):
     if path[len(path)-1] != '/':
         path = path + '/'
@@ -33 +33 @@
     self.wavedevPath = wavedevPath
     self.active_wave = active_wave
+    self.preamble = preamble
     LoadConfiguration(self)
 
@@ -282 +283 @@
         ts = " "*12 + "if property not in self.propertySet:\n"; output.write(ts)
         ts = " "*16 + "self.propertySet.append(property)\n"; output.write(ts)
-
+        
         if p.type == "short" or p.type == "ushort":
             tcast = "int("
         elif p.type == "float" or p.type == "double":
             tcast = "float("
+        elif p.type == "long" or p.type == "ulong":
+            tcast = "long("
+        elif p.type == "boolean":
+            tcast = "bool("
+        elif p.type == "string":
+            tcast = "str("
         else:
             print "ERROR.  property type not supported in generate/templates/py_comp/genStructure.writeReadProps"
@@ -568 +575 @@
 name.  The new GPL is written to the beginning of the outFile'''
 
-      inFile = open(self.sourcepreamble,'r')
+      
       outFile.write('#! /usr/bin/env python\n\n')
       outFile.write("'''\n")
-      for line in inFile.readlines():
-          l_out = line.replace("__COMP_NAME__",name)
-          #l_out = l_out.replace("__YEAR__",date.today().year.__str__())
-          #l_out = l_out.replace("__DEVELOPER__",self.developer)
-          outFile.write(l_out)
-      outFile.write("'''\n\n")
-      inFile.close()
-
-
-
+      if(self.preamble == None):
+          inFile = open(self.sourcepreamble,'r')
+          for line in inFile.readlines():
+              l_out = line.replace("__COMP_NAME__",name)
+              #l_out = l_out.replace("__YEAR__",date.today().year.__str__())
+              #l_out = l_out.replace("__DEVELOPER__",self.developer)
+              outFile.write(l_out)
+          outFile.write("'''\n\n")
+          inFile.close()
+      else:
+          outFile.write(self.preamble)
+          outFile.write("'''\n\n")
+
+
+