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.6 by greg, Thu May 2 15:32:06 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 61 | 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"
# Line 90 | Line 95 | _EOF_
95                  if ("$<" =~ [yY]) then
96                          set fgargs=(-r 400 $fgargs)
97                  else
98 <                        set fgargs=(-r 200 $fgargs)
98 >                        set fgargs=(-r 250 $fgargs)
99                  endif
100 <                echo -n "Are these sources very bright? "
100 >                echo -n "Are these sources relatively bright? "
101                  if ("$<" =~ [nN]*) then
102                          set fgargs=(-c $fgargs)
103                  endif
# Line 130 | Line 135 | endif
135   if ($?DISPLAY && $picture != $nofile) then
136          echo ""
137          echo "Displaying glare sources in '$picture'..."
138 <        xglaresrc $picture $glarefile
138 >        xglaresrc $picture $glarefile >& /dev/null
139          if ($status) then
140                  x11image =+0+0 -g 2.6 $picture &
141                  sleep 40
142                  xglaresrc $picture $glarefile
143          endif
144   endif
145 < set ndxnam=("Guth Visual Comfort Probability" "Guth Disability Glare Ratio")
146 < set ndxcom=(guth_vcp guth_dgr)
145 > set ndxnam=("Guth Visual Comfort Probability" "Guth Disability Glare Ratio" "CIE Glare Index")
146 > set ndxcom=("glarendx -t guth_vcp" "glarendx -t guth_dgr" "glarendx -t cie_cgi")
147   while ( 1 )
148          echo ""
149          echo "  0.  Quit"
# Line 172 | Line 177 | while ( 1 )
177                          else if ($octree != $nofile) then
178                                  set subtitle="$subtitle $octree"
179                          endif
180 +                        if ( "$subtitle" == "" ) then
181 +                                set subtitle="`getinfo < $glarefile | grep findglare`"
182 +                        endif
183                          cat <<_EOF_ > $plotfile
184 + include=line.plt
185   include=polar.plt
186   title="$ndxnam[$choice]"
187   subtitle="$subtitle"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines