Changeset 4084

Timestamp:

06/02/07 12:30:02 (6 years ago)

Author:

DrewCormier

Message:

successfully implemented threading in wx environment. image refreshes every time packet is received. other various changes

Location:

experimental/components/image_display/trunk/image_display

Files:

• WorkModule.py (modified) (2 diffs)
• image_display.py (modified) (8 diffs)

experimental/components/image_display/trunk/image_display/WorkModule.py

@@ -52 +52 @@
         self.process_thread = threading.Thread(target=self.Process)
         self.process_thread.start()
+ 
+        self.toggle = 1
   
                 
@@ -74 +76 @@
 
             while len(self.data_queue) > 0:
-                #get data from the buffer:
+                #get data from the buffer:           
                 self.data_queue_lock.acquire()
                 new_data = self.data_queue.pop()
                 self.data_queue_lock.release()
 
+#                my_file = open("/sdr/tmp.jpg", 'w')
+#                my_file.write(new_data)
+#                my_file.close()
+
                 #rescale the image to the standardized size            
-                self.image.Rescale(self.width, self.height) 
+                #self.image.Rescale(self.width, self.height) 
+                
+                #create new image out of the incomming bytes
+                #self.image.SetData(new_data)           
 
-                #create new image out of the incomming bytes
-                self.image.SetData(new_data)            
+                self.set_image()
+                if self.toggle == 1:
+                 self.toggle = 0
+                else:
+                 self.toggle = 1
 
-                self.image_display_ref.prnt_orb.prnt_frame.refresh(self.image)  
- 
+
             # reset the signal event variable
             self.data_signal.clear()
-                                
 
+    def set_image(self):
+        locker = wx.MutexGuiLocker()   #should refresh the gui when leaving the scope of this function
+                                       #should i start this function as a thread for this to work?
+        if self.toggle == 1:
+         tmp_filename = '/sdr/wxpython_cover_2.jpg'
+        else:
+         tmp_filename = '/sdr/wxpython_cover.jpg'
+
+        self.image = wx.Image(tmp_filename, wx.BITMAP_TYPE_JPEG)  # load a jpeg from file
+        self.image_display_ref.prnt_orb.prnt_frame.refresh(self.image)  
+ 
+

experimental/components/image_display/trunk/image_display/image_display.py

@@ -108 +108 @@
 class ORB_Init:
     """Takes care of initializing the ORB and bind the object"""
-    
+
+    # remove __init__ for threading approach.  thread cannot take input args?
     def __init__(self, prnt_frame, uuid, label):
-        self.prnt_frame = prnt_frame
+
+        print uuid
+        # for __init__:
+        #self.prnt_frame = prnt_frame
+        # for no __init__:
+        self.prnt_frame = app.frame
 
         # initialize the orb
@@ -131 +137 @@
         
         self.orb.run()
-      
+
+def ORB_Init_fun():
+        orb = ORB_Init(app, uuid, label) 
+
 
 #-------------------------------------------------------------------
@@ -148 +157 @@
         self.frame_size = temp_bmp.GetWidth(), temp_bmp.GetHeight()  
         wx.Frame.__init__(self, parent, id, self.title, wx.DefaultPosition, self.frame_size)
-
-
-
 
         self.bmp = wx.StaticBitmap(parent=self, bitmap = temp_bmp)
@@ -160 +166 @@
 
     def OnStartBtnButton(self, event): 
-        # locker = wx.MutexGuiLocker()
         orb = ORB_Init(self,uuid, label) 
         event.Skip() 
@@ -166 +171 @@
 
     def refresh(self, image):
-        #locker = wx.MutexGuiLocker()
         temp = image.ConvertToBitmap()
         size = temp.GetWidth(), temp.GetHeight()
@@ -177 +181 @@
     def OnInit(self):
         image = wx.Image("/sdr/wxpython_cover.jpg", wx.BITMAP_TYPE_JPEG)
+                
         self.frame = Frame(image)
         self.frame.Show()
@@ -184 +189 @@
 
 
-class AppThread(threading.Thread):
-    def run(self):
-        app = App()
-        app.MainLoop()
-
-
-class ORBThread(threading.Thread):
-    def run(self):
-        orb = ORB_Init(uuid, label)
-
-    
+class my_threads:
+    def __init__(self):
+
+        ## for non-global app:
+        #self.app = App()
+        #self.app_thread = threading.Thread(target=self.app.MainLoop)
+
+        #for global app:
+        self.app_thread = threading.Thread(target=app.MainLoop)
+
+        self.app_thread.start()
+
+        ## with arguments:
+        #self.orb_thread = threading.Thread(target=ORB_Init(app.frame, uuid, label))
+        #without arguments:
+        self.orb_thread = threading.Thread(target=ORB_Init_fun)
+
+        self.orb_thread.start()
+
+        print "\nthe orb thread has been started\n"
+
+  
 #-------------------------------------------------------------------
 # Code run when this file is executed
@@ -207 +223 @@
     print "Identifier - " + uuid + "  Label - " + label
    
-    i_am_threading = False
+    i_am_threading = True
 
     if i_am_threading:
-        print "starting the App thread\n"
-        mainAppThread = AppThread()
-        mainAppThread.start()
-
-        print "starting the ORB thread\n"
-        mainORBThread = ORBThread()
-        mainORBThread.start()
+        #for global app:
+        app = App()
+        
+        threads_running = my_threads()
     
     else: