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

Comparing ray/src/util/glare.csh (file contents):
Revision 1.5 by greg, Thu May 2 13:21:02 1991 UTC vs.
Revision 1.11 by greg, Tue Nov 12 12:07:24 1991 UTC

# Line 62 | Line 62 | _EOF_
62                  echo "You must specify a picture or an octree"
63                  exit 1
64          endif
65 +        if ( $picture == $nofile && "$view" == "" ) then
66 +                echo "You must give a view if there is no picture"
67 +                exit 1
68 +        endif
69          if ( $picture != $nofile ) then
70                  if ( ! -r $picture ) then
71                          echo "Cannot read $picture"
72                          exit 1
73                  endif
74 <                set fgargs=($fgargs -p $picture -vf $picture)
74 >                set fgargs=($fgargs -p $picture)
75 >                if ( "$view" != "" ) then
76 >                        set view=(-vf $picture $view)
77 >                endif
78          endif
79          set fgargs=($fgargs $view)
80          if ( $octree != $nofile ) then
# Line 81 | Line 88 | With an octree, you should give the same options for -
88   so forth as are used to render the scene.  Please enter them below.
89  
90   _EOF_
91 +                if ($picture != $nofile) then
92 +                        echo "These are the parameters from the picture:"
93 +                        getinfo $picture
94 +                endif
95                  readvar rtargs
96                  set fgargs=($fgargs $rtargs $octree)
97          endif
# Line 127 | Line 138 | _EOF_
138          echo "Starting calculation..."
139          echo findglare $fgargs
140          findglare $fgargs > $glarefile
141 +        if ($status) then
142 +                echo "Uh-oh.  Something went wrong with findglare\!"
143 +                rm $glarefile
144 +                exit 1
145 +        endif
146   endif
147   if ($?DISPLAY && $picture != $nofile) then
148          echo ""
149          echo "Displaying glare sources in '$picture'..."
150 <        xglaresrc $picture $glarefile >& /dev/null
135 <        if ($status) then
136 <                x11image =+0+0 -g 2.6 $picture &
137 <                sleep 40
138 <                xglaresrc $picture $glarefile
139 <        endif
150 >        xglaresrc $picture $glarefile
151   endif
152   set ndxnam=("Guth Visual Comfort Probability" "Guth Disability Glare Ratio" "CIE Glare Index")
153   set ndxcom=("glarendx -t guth_vcp" "glarendx -t guth_dgr" "glarendx -t cie_cgi")
154 + set bcdlvl=(50 124 18.5)
155   while ( 1 )
156          echo ""
157          echo "  0.  Quit"
# Line 181 | Line 193 | include=line.plt
193   include=polar.plt
194   title="$ndxnam[$choice]"
195   subtitle="$subtitle"
196 + Bdata=
197 +        0       $bcdlvl[$choice]
198 +        360     $bcdlvl[$choice]
199 + ;
200 + Blabel="BCD level"
201   Adata=
202   _EOF_
203                          getinfo - < $gndxfile >> $plotfile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines