ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/src/util/do_results.tcl
(Generate patch)

Comparing src/util/do_results.tcl (file contents):
Revision 2.1 by greg, Wed Sep 13 14:52:19 1995 UTC vs.
Revision 2.3 by greg, Thu Sep 21 10:51:28 1995 UTC

# Line 80 | Line 80 | proc list_views {} {           # List finished and unfinished p
80   proc delpic {} {                # Delete selected pictures
81          global curmess
82          set selected_pics [get_selpics 1]
83 <        if {"$selected_pics" == {}} {
83 >        if {$selected_pics == {}} {
84                  set curmess "No pictures selected."
85                  return
86          }
# Line 119 | Line 119 | proc get_selpics {{getall 0}} {                # return selected pic
119   proc dsppic {} {                # Display selected pictures
120          global curmess dispcom radvar
121          set selected_pics [get_selpics]
122 <        if {"$selected_pics" == {}} {
122 >        if {$selected_pics == {}} {
123                  set curmess "No pictures selected."
124                  return
125          }
126 <        if {"$radvar(EXPOSURE)" == {}} {
126 >        if {$radvar(EXPOSURE) == {}} {
127                  set ev 0
128          } else {
129                  if [regexp {^[+-]} $radvar(EXPOSURE)] {
130 <                        set ev $radvar(EXPOSURE)
130 >                        set ev [expr {round($radvar(EXPOSURE))}]
131                  } else {
132 <                        set ev [expr {log($radvar(EXPOSURE))/log(2)}]
132 >                        set ev [expr {round(log($radvar(EXPOSURE))/log(2))}]
133                  }
134 –                if {$ev < 0} {
135 –                        set ev [expr {int($ev - .5)}]
136 –                } else {
137 –                        set ev [expr {int($ev + .5)}]
138 –                }
134          }
135          foreach p $selected_pics {
136 <                if [string match *.unf $p] {
136 >                if {[string match *.unf $p] ||
137 >                                $radvar(PICTURE) == $radvar(RAWFILE)} {
138                          set dc [format $dispcom $ev $p]
139                  } else {
140                          set dc [format $dispcom 0 $p]
# Line 263 | Line 259 | proc do_results w {            # Results screen
259          place $w.prte -relwidth .5714 -relheight .0610 -relx .3571 -rely .8537
260          helplink $w.prte trad results printcommand
261          # Fill in views
262 <        if {[info exists radvar(RAWFILE)] && $radvar(RAWFILE) != {}} {
262 >        if {$radvar(RAWFILE) != {}} {
263                  set rawfroot $radvar(RAWFILE)
264 +                if {$radvar(RAWFILE) == $radvar(PICTURE)} {
265 +                        set curmess "Warning: finished views are unfiltered"
266 +                }
267          } else {
268                  set rawfroot $radvar(PICTURE)
270 –        }
271 –        if {! [info exists radvar(ZFILE)]} {
272 –                set radvar(ZFILE) {}
269          }
270          list_views
271   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines