Changeset 1932 for branches/blt4/gui/scripts/imageentry.tcl

Timestamp:

Oct 25, 2010 3:16:06 PM (14 years ago)

Author:

gah

Message:

 

File:

• branches/blt4/gui/scripts/imageentry.tcl (modified) (2 diffs)

branches/blt4/gui/scripts/imageentry.tcl

@@ -151 +151 @@
         set newval [lindex $args 0]
         if {[string length $newval] > 0} {
-            set imh [image create photo -data $newval]
+            set imh [image create picture -data $newval]
         } else {
             set imh ""
@@ -176 +176 @@
     set fmt [$_owner xml get $_path.convert]
     if {"" != $fmt && "" != $_imh} {
-        if {"pgm" == $fmt} { set fmt "ppm -grayscale" }
-        set bytes [eval $_imh data -format $fmt]
-        set bytes [Rappture::encoding::decode -as b64 $bytes]
+        switch -- $fmt {
+            "pgm" - "ppm" {
+                $_imh export pbm -data bytes
+            }
+            "jpeg" {
+                $_imh export jpg -data bytes
+            }
+            "tiff" {
+                $_imh export tif -data bytes
+            }
+            "bmp" - "png" - "xbm" - "xpm" {
+                $_imh export $fmt -data bytes
+            }
+            default {
+                error "unknown image format \"$fmt\""
+            }
+        }
     }
     return $bytes