Changeset 4089

Timestamp:

06/02/07 14:16:34 (6 years ago)

Author:

DrewCormier

Message:

removed button. cleaned up code a little

Files:

• experimental/components/image_display/trunk/image_display/image_display.py (modified) (4 diffs)

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

@@ -159 +159 @@
 
         self.bmp = wx.StaticBitmap(parent=self, bitmap = temp_bmp)
-        #self.bmp = wx.EmptyBitmap(width=1000, height=1000, depth=-1)
-        self.StartBtn = wx.Button(id= -1, label= "Start ORB", name= "StartBtn",  
-            parent= self, pos= wx.Point(1,1), size= wx.Size(200, 50)) 
-        self.StartBtn.Bind(wx.EVT_BUTTON, self.OnStartBtnButton, id = -1) 
-
-
-    def OnStartBtnButton(self, event): 
-        orb = ORB_Init(self,uuid, label) 
-        event.Skip() 
-
 
     def refresh(self, image):
@@ -174 +164 @@
         size = temp.GetWidth(), temp.GetHeight()
         self.bmp = wx.StaticBitmap(parent=self, bitmap = temp)
+
 
 #-------------------------------------------------------------------
@@ -192 +183 @@
     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"
 
   
@@ -223 +202 @@
     print "Identifier - " + uuid + "  Label - " + label
    
-    i_am_threading = True
-
-    if i_am_threading:
-        #for global app:
-        app = App()
-        
-        threads_running = my_threads()
-    
-    else:
-        app = App()
-        app.MainLoop() 
-
+    app = App()
+        
+    threads_running = my_threads()
+    
+