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.1 by greg, Wed Apr 24 18:27:08 1991 UTC vs.
Revision 1.5 by greg, Thu May 2 13:21:02 1991 UTC

# Line 53 | Line 53 | If the viewpoint is not the same as the picture, an er
53   If no view is specified, the view parameters are taken from the picture,
54   so the view specification is optional unless you are starting from an
55   octree.
56 +
57   _EOF_
58          readvar picture
59          readvar octree
# Line 90 | Line 91 | _EOF_
91                  if ("$<" =~ [yY]) then
92                          set fgargs=(-r 400 $fgargs)
93                  else
94 <                        set fgargs=(-r 200 $fgargs)
94 >                        set fgargs=(-r 250 $fgargs)
95                  endif
96 <                echo -n "Are these sources very bright? "
96 >                echo -n "Are these sources relatively bright? "
97                  if ("$<" =~ [nN]*) then
98                          set fgargs=(-c $fgargs)
99                  endif
# Line 130 | Line 131 | endif
131   if ($?DISPLAY && $picture != $nofile) then
132          echo ""
133          echo "Displaying glare sources in '$picture'..."
134 <        xglaresrc $picture $glarefile
134 >        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
140   endif
141 < set ndxnam=("Guth Visual Comfort Probability" "Guth Disability Glare Ratio")
142 < set ndxcom=(guth_vcp guth_dgr)
141 > set ndxnam=("Guth Visual Comfort Probability" "Guth Disability Glare Ratio" "CIE Glare Index")
142 > set ndxcom=("glarendx -t guth_vcp" "glarendx -t guth_dgr" "glarendx -t cie_cgi")
143   while ( 1 )
144          echo ""
145          echo "  0.  Quit"
# Line 172 | Line 173 | while ( 1 )
173                          else if ($octree != $nofile) then
174                                  set subtitle="$subtitle $octree"
175                          endif
176 +                        if ( "$subtitle" == "" ) then
177 +                                set subtitle="`getinfo < $glarefile | grep findglare`"
178 +                        endif
179                          cat <<_EOF_ > $plotfile
180 + include=line.plt
181   include=polar.plt
182   title="$ndxnam[$choice]"
183   subtitle="$subtitle"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines