diff options
| author | Gonzalo Odiard <gonzalo@nautilus.localdomain> | 2010-01-24 16:57:10 (GMT) |
|---|---|---|
| committer | Gonzalo Odiard <gonzalo@nautilus.localdomain> | 2010-01-24 16:57:10 (GMT) |
| commit | a8205ece600eebaa97637b8d42255d2adc955e30 (patch) | |
| tree | 188b7089a37b8c6c4c736f2ee5326b82e507a424 /historietaactivity.py | |
| parent | 9b44554b5427e298976e9746e7683907c81674d5 (diff) | |
correcciones a la persistencia en las XO-1
Diffstat (limited to 'historietaactivity.py')
| -rw-r--r-- | historietaactivity.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/historietaactivity.py b/historietaactivity.py index 1d61824..f3f829b 100644 --- a/historietaactivity.py +++ b/historietaactivity.py @@ -257,16 +257,23 @@ class ComicBox(gtk.DrawingArea): self.width,self.height = window.get_size() self.image_height = 0 - print "self.image_name", self.image_name + #print "self.image_name", self.image_name + instance_path = os.path.join(activity.get_activity_root(), "instance") if (self.image == None) and (self.image_name != ""): - pixbuf = gtk.gdk.pixbuf_new_from_file(self.image_name) + # si la imagen no tiene el path viene del archivo de historieta ya grabado, + # si viene con path, es una imagen que se tomo del journal + if (not self.image_name.startswith(instance_path)): + pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.join(instance_path,self.image_name)) + else: + pixbuf = gtk.gdk.pixbuf_new_from_file(self.image_name) width_pxb = pixbuf.get_width() height_pxb = pixbuf.get_height() scale = (self.width) / (1.0 * width_pxb) - print "self.width", self.width, "width_pxb",width_pxb, "scale",scale + #print "self.width", self.width, "width_pxb",width_pxb, "scale",scale self.image_height = scale * height_pxb self.image = cairo.ImageSurface(cairo.FORMAT_ARGB32, self.width, self.image_height) if (scale != 1): + # falta tener en cuenta el caso de una imagen que venga del journal y tenga el tamanio justo, es decir con scale = 1 pixb_scaled = pixbuf.scale_simple(int(self.width), int(self.image_height), gtk.gdk.INTERP_BILINEAR) ct = cairo.Context(self.image) gtk_ct = gtk.gdk.CairoContext(ct) @@ -274,7 +281,6 @@ class ComicBox(gtk.DrawingArea): gtk_ct.paint() if (not self.image_saved): self.image_saved = True - instance_path = os.path.join(activity.get_activity_root(), "instance") #print instance_path image_file_name = "image"+str(self.posi)+".jpg" pixb_scaled.save(os.path.join(instance_path,image_file_name),"jpeg") |