Changeset 1342 for trunk/gui/scripts/imageentry.tcl

Timestamp:

Mar 18, 2009, 2:59:21 PM (16 years ago)

Author:

gah

Message:

preliminary HQ output from molvisviewer; unexpand tabs; all jpeg generation at 100%

File:

• trunk/gui/scripts/imageentry.tcl (modified) (7 diffs)

trunk/gui/scripts/imageentry.tcl

@@ -47 +47 @@
 itcl::body Rappture::ImageEntry::constructor {owner path args} {
     if {[catch {$owner isa Rappture::ControlOwner} valid] != 0 || !$valid} {
-        error "bad object \"$owner\": should be Rappture::ControlOwner"
+        error "bad object \"$owner\": should be Rappture::ControlOwner"
     }
     set _owner $owner
@@ -57 +57 @@
     #
     itk_component add image {
-        ::label $itk_interior.image -borderwidth 0
+        ::label $itk_interior.image -borderwidth 0
     }
     pack $itk_component(image) -expand yes -fill both
@@ -64 +64 @@
     set str [$_owner xml get $path.current]
     if {[string length $str] == 0} {
-        set str [$_owner xml get $path.default]
+        set str [$_owner xml get $path.default]
     }
     if {[string length $str] > 0} {
-        value $str
+        value $str
     }
 
@@ -94 +94 @@
     set i [lsearch -exact $args -check]
     if {$i >= 0} {
-        set onlycheck 1
-        set args [lreplace $args $i $i]
+        set onlycheck 1
+        set args [lreplace $args $i $i]
     }
 
     if {[llength $args] == 1} {
-        if {$onlycheck} {
-            # someday we may add validation...
-            return
-        }
-        set newval [lindex $args 0]
-        if {[string length $newval] > 0} {
-            set imh [image create photo -data $newval]
-        } else {
-            set imh ""
-        }
-
-        if {$_imh != ""} {
-            image delete $_imh
-        }
-        set _imh $imh
-        _redraw
-        return $newval
+        if {$onlycheck} {
+            # someday we may add validation...
+            return
+        }
+        set newval [lindex $args 0]
+        if {[string length $newval] > 0} {
+            set imh [image create photo -data $newval]
+        } else {
+            set imh ""
+        }
+
+        if {$_imh != ""} {
+            image delete $_imh
+        }
+        set _imh $imh
+        _redraw
+        return $newval
 
     } elseif {[llength $args] != 0} {
-        error "wrong # args: should be \"value ?-check? ?newval?\""
+        error "wrong # args: should be \"value ?-check? ?newval?\""
     }
 
@@ -164 +164 @@
 itcl::body Rappture::ImageEntry::_redraw {} {
     if {"" == $_imh} {
-        $itk_component(image) configure -image ""
-        return
+        $itk_component(image) configure -image ""
+        return
     }
 
@@ -174 +174 @@
     set str [string trim [$_owner xml get $_path.resize]]
     if {"" == $str} {
-        set str "none"
+        set str "none"
     }
     switch -glob -- $str {
-        auto {
-            if {$_resize == ""} {
-                set _resize [image create photo]
-            }
-            set w [winfo width $itk_component(image)]
-            set h [winfo height $itk_component(image)]
-            if {$w/double($iw) < $h/double($ih)} {
-                set h [expr {round($w/double($iw)*$ih)}]
-            } else {
-                set w [expr {round($h/double($ih)*$iw)}]
-            }
-            $_resize configure -width $w -height $h
-            blt::winop resample $_imh $_resize
-            $itk_component(image) configure -image $_resize
-        }
-        width=* - height=* {
-            if {$_resize == ""} {
-                set _resize [image create photo]
-            }
-            if {[regexp {^width=([0-9]+)$} $str match size]} {
-                set w $size
-                set h [expr {round($w*$ih/double($iw))}]
-                $_resize configure -width $w -height $h
-                blt::winop resample $_imh $_resize
-                $itk_component(image) configure -image $_resize \
-                    -width $w -height $h
-            } elseif {[regexp {^height=([0-9]+)$} $str match size]} {
-                set h $size
-                set w [expr {round($h*$iw/double($ih))}]
-                $_resize configure -width $w -height $h
-                blt::winop resample $_imh $_resize
-                $itk_component(image) configure -image $_resize \
-                    -width $w -height $h
-            } else {
-                $itk_component(image) configure -image $_imh
-            }
-        }
-        default {
-            $itk_component(image) configure -image $_imh
-        }
+        auto {
+            if {$_resize == ""} {
+                set _resize [image create photo]
+            }
+            set w [winfo width $itk_component(image)]
+            set h [winfo height $itk_component(image)]
+            if {$w/double($iw) < $h/double($ih)} {
+                set h [expr {round($w/double($iw)*$ih)}]
+            } else {
+                set w [expr {round($h/double($ih)*$iw)}]
+            }
+            $_resize configure -width $w -height $h
+            blt::winop resample $_imh $_resize
+            $itk_component(image) configure -image $_resize
+        }
+        width=* - height=* {
+            if {$_resize == ""} {
+                set _resize [image create photo]
+            }
+            if {[regexp {^width=([0-9]+)$} $str match size]} {
+                set w $size
+                set h [expr {round($w*$ih/double($iw))}]
+                $_resize configure -width $w -height $h
+                blt::winop resample $_imh $_resize
+                $itk_component(image) configure -image $_resize \
+                    -width $w -height $h
+            } elseif {[regexp {^height=([0-9]+)$} $str match size]} {
+                set h $size
+                set w [expr {round($h*$iw/double($ih))}]
+                $_resize configure -width $w -height $h
+                blt::winop resample $_imh $_resize
+                $itk_component(image) configure -image $_resize \
+                    -width $w -height $h
+            } else {
+                $itk_component(image) configure -image $_imh
+            }
+        }
+        default {
+            $itk_component(image) configure -image $_imh
+        }
     }
 }
@@ -226 +226 @@
     set valid {normal disabled}
     if {[lsearch -exact $valid $itk_option(-state)] < 0} {
-        error "bad value \"$itk_option(-state)\": should be [join $valid {, }]"
+        error "bad value \"$itk_option(-state)\": should be [join $valid {, }]"
     }
     $itk_component(image) configure -state $itk_option(-state)