Changeset 666 for trunk/software

Timestamp:

02/11/10 01:45:40 (2 years ago)

Author:

mosttw

Message:

Unbroke camera display, added caching

Files:

• trunk/software/rb/gui/camera.py (modified) (2 diffs)

trunk/software/rb/gui/camera.py

@@ -22 +22 @@
         def __init__(self):
                 gtk.DrawingArea.__init__(self)
-                self.pipeline = gst.parse_launch('appsrc ! autovideosink')
+                self.pixbuf = None
+                #self.pipeline = gst.parse_launch('appsrc ! autovideosink')
 
                 self.connect("expose-event", self.expose_cb)
         
         def push_frame(self, (source, ipl_image)):
-                self.pixbuf = ipl_image.to_gdk_pixbuf()
-
                 @gobject.idle_add
                 def update_gui():
+                        self.pixbuf = ipl_image.to_gdk_pixbuf()
+                        self.scaled_pixbuf = None
                         self.queue_draw()
                         return False
@@ -40 +41 @@
                 if not self.pixbuf:
                         return
-                drawable = da.window
                 alloc = self.get_allocation()
-                new_w = alloc.width
-                new_h = alloc.height
-                scaled_pixbuf = self.pixbuf.scale_simple(new_w, new_h, gtk.gdk.INTERP_NEAREST)
+                if self.scaled_pixbuf is None or self.scale != (alloc.width, alloc.height):
+                        drawable = da.window
+                        self.scaled_pixbuf = self.pixbuf.scale_simple(
+                                                                                                alloc.width, alloc.height,
+                                                                                                gtk.gdk.INTERP_NEAREST)
+                        self.scale = (alloc.width, alloc.height)
                 drawable.draw_pixbuf(
                     drawable.new_gc(),
-                    scaled_pixbuf,
-                                0, 0, # src_x, src_y,
-                                0, 0, # dest_x, dest_y,
-                                alloc.width, alloc.height
+                    self.scaled_pixbuf,
+                        0, 0, # src_x, src_y,
+                        0, 0, # dest_x, dest_y,
+                        alloc.width, alloc.height 
                 )