Changeset 3899

Timestamp:

05/24/07 12:09:38 (6 years ago)

Author:

DrewCormier

Message:

automated dataOut class definitions

Location:

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

Files:

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

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

@@ -67 +67 @@
 __DATA_IN_CLASS_DEFS__        
 
+__DATA_OUT_CLASS_DEFS__
 
-#------------------------------------------------------------------
-# dataOut_complexShort_i class definition
-#------------------------------------------------------------------
-class dataOut_complexShort_i(CF__POA.Port):
-    def __init__(self, parent, name):
-        self.parent = parent
-        self.outPorts = {}
-        self.name = name
-        
-        self.data_buffer = []
-        self.data_event = threading.Event()
-        self.data_buffer_lock = threading.Lock()
-        
-        self.is_running = True
-        self.process_thread = threading.Thread(target = self.Process)
-        self.process_thread.start()
-        
-    def connectPort(self, connection, connectionId):
-        port = connection._narrow(standardInterfaces__POA.complexShort)
-        self.outPorts[str(connectionId)] = port
-        self.parent.outPort0_active = True
-        
-    def disconnectPort(self, connectionId):
-        self.outPorts.pop(str(connectionId))
-        if len(self.outPorts)==0:
-            self.parent.outPort0_active = False
-            
-    def releasePort(self):
-        # shut down the Process thread
-        self.is_running = False
-        self.data_event.set()
-        
-    def send_data(self, I, Q):
-        self.data_buffer_lock.acquire()
-        self.data_buffer.insert(0, (I,Q))
-        self.data_buffer_lock.release()
-        self.data_event.set()
-        
-    def Process(self):
-        while self.is_running:
-            self.data_event.wait()
-            while len(self.data_buffer) > 0:
-                self.data_buffer_lock.acquire()
-                new_data = self.data_buffer.pop()
-                self.data_buffer_lock.release()
-                
-                for port in self.outPorts.values():
-                    port.pushPacket(new_data[0], new_data[1])
-                    
-                if (self.parent.outPort1_active):
-                    self.parent.outPort1_servant.send_timing_message(self.parent.naming_service_name, self.name, "pushPacket", "end", len(new_data[0]))
-                    
-            else:
-                self.data_event.clear()
 
 #------------------------------------------------------------------

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

@@ -131 +131 @@
               self.writeDataInClassDefs(output,comp)
               continue
+          if l_out.find("__DATA_OUT_CLASS_DEFS__") != -1:
+              self.writeDataOutClassDefs(output,comp)
+              continue
           output.write(l_out)  #if none of the continue statements have been executed
 
@@ -186 +189 @@
     for p in comp.ports:
         if p.type == "Uses":
-            ts = " "*8 + 'self.outPort' + str(outCount) + '_servant = dataOut_' + p.interface + '_i(self, "' + p.name + '")\n'
+            ts = " "*8 + 'self.outPort' + str(outCount) + '_servant = dataOut_' + p.interface.name + '_i(self, "' + p.name + '")\n'
             ts = ts + " "*8 + 'self.outPort' + str(outCount) + '_var = self.outPort' + str(outCount) + '_servant._this()\n'
             ts = ts + " "*8 + 'self.outPort' + str(outCount) + '_active = False\n\n'
@@ -266 +269 @@
   #------------------------------------------------------------------------------------
   def writeDataInClassDefs(self,output,comp):
+    '''Generates the code for the in port class definitions'''
+
     def_types_written = " "   #keeps track of the interface names that have been written already so that a certain interface (e.g., complexShort) does not get defined more than once
+
     for p in comp.ports:
         if p.type == "Provides" and def_types_written.find(p.interface.name) == -1:
@@ -284 +290 @@
 
             def_types_written = def_types_written + p.interface.name        
+  #------------------------------------------------------------------------------------
+
+
+  #------------------------------------------------------------------------------------
+  def writeDataOutClassDefs(self,output,comp):
+    '''generates the code for the out port class definitions'''
+    #TODO: test this method
+    def_types_written = " "    #keeps track of the interface names that have been written already so that a certain interface (e.g., complexShort) does not get defined more than once
+    out_port_count = -1
+
+    for p in comp.ports:
+        out_port_count = out_port_count + 1
+        if p.type == "Uses" and def_types_written.find(p.interface.name) == -1:
+            ts = "#------------------------------------------------------------------\n"
+            ts = ts + "# dataOut_complexShort_i class definition\n"
+            ts = ts + "#------------------------------------------------------------------\n"
+            ts = ts + "class dataOut_" + p.interface.name + "_i(CF__POA.Port):\n" 
+            output.write(ts)
+ 
+            #create the __init__ method
+            ts = " "*4 + "def __init__(self, parent, name):\n\
+        self.parent = parent\n\
+        self.outPorts = {}\n\
+        self.name = name\n\
+        \n\
+        self.data_buffer = []\n\
+        self.data_event = threading.Event()\n\
+        self.data_buffer_lock = threading.Lock()\n\
+        \n\
+        self.is_running = True\n\
+        self.process_thread = threading.Thread(target = self.Process)\n\
+        self.process_thread.start()\n\n"
+            output.write(ts)
+
+            #create connectPort method
+            ts = " "*4 + "def connectPort(self, connection, connectionId):\n"
+            ts = ts + " "*8 + "port = connection._narrow(" + p.interface.nameSpace + "__POA." + p.interface.name + ")\n"
+            ts = ts + " "*8 + "self.outPorts[str(connectionId)] = port\n"
+            ts = ts + " "*8 + "self.parent.outPort" + str(out_port_count) + "_active = True\n\n"
+            output.write(ts)
+        
+            #create disconnectPort method
+            ts = " "*4 + "def disconnectPort(self, connectionId):\n\
+        self.outPorts.pop(str(connectionId))\n\
+        if len(self.outPorts)==0:\n\
+            self.parent.outPort0_active = False\n\n"
+            output.write(ts)
+
+            #create releasePort method
+            ts = " "*4 + "def releasePort(self):\n\
+        # shut down the Process thread\n\
+        self.is_running = False\n\
+        self.data_event.set()\n\n"
+            output.write(ts)
+        
+            #create send_data method
+            ts = " "*4 + "# WARNING:  I and Q may have to be changed depending on what data you are receiving (e.g., bytesIn for realChar)\n\
+    def send_data(self, I, Q):\n\
+        self.data_buffer_lock.acquire()\n\
+        self.data_buffer.insert(0, (I,Q))\n\
+        self.data_buffer_lock.release()\n\
+        self.data_event.set()\n\n"
+            output.write(ts)
+        
+            #create Process method
+            ts = " "*4 + "def Process(self):\n\
+        while self.is_running:\n\
+            self.data_event.wait()\n\
+            while len(self.data_buffer) > 0:\n\
+                self.data_buffer_lock.acquire()\n\
+                new_data = self.data_buffer.pop()\n\
+                self.data_buffer_lock.release()\n\
+                \n\
+                for port in self.outPorts.values():\n\
+                    port.pushPacket(new_data[0], new_data[1])\n\
+                \n\
+                self.data_event.clear()\n\n"
+            output.write(ts)
+
+            #TODO: add code for timing support    
+                    
+            def_types_written = def_types_written + p.interface.name     
   #------------------------------------------------------------------------------------