Changeset 4007

Timestamp:

05/30/07 11:07:17 (6 years ago)

Author:

DrewCormier

Message:

restructuring code to work without receiving data

Location:

experimental/components/image_capture/trunk/image_capture

Files:

• WorkModule.py (modified) (1 diff)
• image_capture.py (modified) (3 diffs)

experimental/components/image_capture/trunk/image_capture/WorkModule.py

@@ -63 +63 @@
         while self.is_running:
             self.data_signal.wait()
-            while len(self.data_queue) > 0:
-                self.data_queue_lock.acquire()
-                new_data = self.data_queue.pop()
-                self.data_queue_lock.release()
+
+            bytesOut = ['t', 'e', 's', 't'] 
+
+            # Output the new data
+            if self.image_capture_ref.outPort0_active:
+                print "attempting to send data in image_capture"
+                self.image_capture_ref.outPort0_servant.send_data(bytesOut)
+            else:
+                # reset the signal event variable
+                self.data_signal.clear()
+
+    
                                 
                 # TODO: add code for image capture
                 # TODO: add code that will format image as char sequence                
  
-                bytesOut = ['t', 'e', 's', 't'] 
-                
-
-                # Output the new data
-                if self.image_capture_ref.outPort0_active:
-                    self.image_capture_ref.outPort0_servant.send_data(bytesOut)
-                else:
-                    # reset the signal event variable
-                    self.data_signal.clear()
-                                
-

experimental/components/image_capture/trunk/image_capture/image_capture.py

@@ -112 +112 @@
 
     def connectPort(self, connection, connectionId):
+        print "connectPort in image_capture called\n"
         port = connection._narrow(standardInterfaces__POA.realChar)
         self.outPorts[str(connectionId)] = port
@@ -127 +128 @@
 
     def send_data(self, bytesOut):
+        print "send_data in image_capture called\n"
         self.data_buffer_lock.acquire()
         self.data_buffer.insert(0, bytesOut)
@@ -133 +135 @@
 
     def Process(self):
+        print "Process in image_capture called\n"
         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])
-                
-                self.data_event.clear()
+
+            bytesOut = ['t', 'e', 's', 't'] 
+
+            # Output the new data
+            if self.image_capture_ref.outPort0_active:
+                print "attempting to send data in image_capture"
+                self.image_capture_ref.outPort0_servant.send_data(bytesOut)
+            else:
+                # reset the signal event variable
+                self.data_signal.clear()
+
+
+#            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])
+#                
+#                self.data_event.clear()