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

Comparing ray/src/util/do_file.tcl (file contents):
Revision 2.16 by gwlarson, Tue Oct 20 11:52:15 1998 UTC vs.
Revision 2.19 by greg, Sun Jun 3 20:32:49 2012 UTC

# Line 1 | Line 1
1 < # SCCSid "$SunId$ LBL"
1 > # RCSid: $Id$
2   #
3   # Choose the Rad Input File to work on.
4   #
5  
6   proc preen {} {                 # clean up radvar
7          global radvar rifname
8 <        foreach n {objects scene materials illum mkillum render oconv pfilt
8 >        foreach n {objects scene materials illum mkillum render oconv rvu rpict pfilt
9                          RAWFILE ZFILE AMBFILE OPTFILE EXPOSURE ZONE REPORT} {
10                  if {! [info exists radvar($n)]} {
11                          set radvar($n) {}
# Line 85 | Line 85 | proc setradvar stmt {          # assign a rad variable
85                  mki* { eval lappend radvar(mkillum) $vval }
86                  ren* { eval lappend radvar(render) $vval }
87                  oco* { eval lappend radvar(oconv) $vval }
88 +                rvu { eval lappend radvar(rvu) $vval }
89 +                rpi* { eval lappend radvar(rpict) $vval }
90                  pf* { eval lappend radvar(pfilt) $vval }
91                  vi* { lappend radvar(view) $vval }
92                  ZO* { set radvar(ZONE) $vval }
# Line 153 | Line 155 | proc load_vars {f {vl all}} {  # load RIF variables
155          if {"$vl" == "all" && ! [chksave]} {return 0}
156          set curmess {Please wait...}
157          update
158 <        if [catch {exec rad -n -w -e $f >& /usr/tmp/ro[pid]}] {
159 <                set curmess [exec cat /usr/tmp/ro[pid]]
160 <                exec rm -f /usr/tmp/ro[pid]
158 >        if [catch {exec rad -n -w -e $f >& /tmp/ro[pid]}] {
159 >                set curmess [exec cat /tmp/ro[pid]]
160 >                exec rm -f /tmp/ro[pid]
161                  return 0
162          }
163 <        set fi [open /usr/tmp/ro[pid] r]
163 >        set fi [open /tmp/ro[pid] r]
164          if {"$vl" == "all"} {
165                  catch {unset radvar}
166                  while {[gets $fi curli] != -1} {
# Line 191 | Line 193 | proc load_vars {f {vl all}} {  # load RIF variables
193          }
194          set alldone [eof $fi]
195          close $fi
196 <        exec rm -f /usr/tmp/ro[pid]
196 >        exec rm -f /tmp/ro[pid]
197          preen
198          return 1
199   }

Diff Legend

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