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.22 by greg, Sat Aug 26 16:07:22 2017 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
9 <                        RAWFILE ZFILE AMBFILE OPTFILE EXPOSURE ZONE REPORT} {
8 >        foreach n {objects scene materials illum mkillum mkpmap render oconv rvu rpict pfilt
9 >                        RAWFILE ZFILE AMBFILE PGMAP PCMAP OPTFILE EXPOSURE ZONE REPORT} {
10                  if {! [info exists radvar($n)]} {
11                          set radvar($n) {}
12                  }
# Line 83 | Line 83 | proc setradvar stmt {          # assign a rad variable
83                  mat* { eval lappend radvar(materials) $vval }
84                  ill* { eval lappend radvar(illum) $vval }
85                  mki* { eval lappend radvar(mkillum) $vval }
86 +                mkp* { eval lappend radvar(mkpmap) $vval }
87                  ren* { eval lappend radvar(render) $vval }
88                  oco* { eval lappend radvar(oconv) $vval }
89 +                rvu { eval lappend radvar(rvu) $vval }
90 +                rpi* { eval lappend radvar(rpict) $vval }
91                  pf* { eval lappend radvar(pfilt) $vval }
92                  vi* { lappend radvar(view) $vval }
93                  ZO* { set radvar(ZONE) $vval }
# Line 104 | Line 107 | proc setradvar stmt {          # assign a rad variable
107                  REP* { set radvar(REPORT) $vval }
108                  RAW* { set radvar(RAWFILE) $vval }
109                  ZF* {set radvar(ZFILE) $vval }
110 +                PGM* {set radvar(PGMAP) $vval }
111 +                PCM* {set radvar(PCMAP) $vval }
112          }
113                  
114   }
# Line 121 | Line 126 | proc putradvar {fi vn} {       # print out a rad variable
126                  }
127                  return
128          }
124 –        if {[lsearch -exact {ZONE QUALITY OCTREE PICTURE AMBFILE OPTFILE
125 –                        EXPOSURE RESOLUTION UP INDIRECT DETAIL PENUMBRAS
126 –                        EYESEP RAWFILE ZFILE VARIABILITY REPORT} $vn] >= 0} {
127 –                puts $fi "$vn= $radvar($vn)"
128 –                return
129 –        }
129          puts -nonewline $fi "$vn="
130          set vnl [expr [string length $vn] + 1]
131          set pos $vnl
# Line 153 | Line 152 | proc load_vars {f {vl all}} {  # load RIF variables
152          if {"$vl" == "all" && ! [chksave]} {return 0}
153          set curmess {Please wait...}
154          update
155 <        if [catch {exec rad -n -w -e $f >& /usr/tmp/ro[pid]}] {
156 <                set curmess [exec cat /usr/tmp/ro[pid]]
157 <                exec rm -f /usr/tmp/ro[pid]
155 >        if [catch {exec rad -n -w -e $f >& /tmp/ro[pid]}] {
156 >                set curmess [exec cat /tmp/ro[pid]]
157 >                exec rm -f /tmp/ro[pid]
158                  return 0
159          }
160 <        set fi [open /usr/tmp/ro[pid] r]
160 >        set fi [open /tmp/ro[pid] r]
161          if {"$vl" == "all"} {
162                  catch {unset radvar}
163                  while {[gets $fi curli] != -1} {
# Line 191 | Line 190 | proc load_vars {f {vl all}} {  # load RIF variables
190          }
191          set alldone [eof $fi]
192          close $fi
193 <        exec rm -f /usr/tmp/ro[pid]
193 >        exec rm -f /tmp/ro[pid]
194          preen
195          return 1
196   }

Diff Legend

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