--- ray/src/util/glare.csh	1991/05/02 13:21:02	1.5
+++ ray/src/util/glare.csh	1991/05/03 10:06:06	1.8
@@ -62,6 +62,10 @@ _EOF_
 		echo "You must specify a picture or an octree"
 		exit 1
 	endif
+	if ( $picture == $nofile && "$view" == "" ) then
+		echo "You must give a view if there is no picture"
+		exit 1
+	endif
 	if ( $picture != $nofile ) then
 		if ( ! -r $picture ) then
 			echo "Cannot read $picture"
@@ -132,14 +136,18 @@ if ($?DISPLAY && $picture != $nofile) then
 	echo ""
 	echo "Displaying glare sources in '$picture'..."
 	xglaresrc $picture $glarefile >& /dev/null
-	if ($status) then
-		x11image =+0+0 -g 2.6 $picture &
-		sleep 40
-		xglaresrc $picture $glarefile
+	if ($status == 2) then
+		echo "Starting ximage..."
+		ximage =+0+0 $picture &
+		WaitAndTryXglrAgain:
+			sleep 10
+			xglaresrc $picture $glarefile >& /dev/null
+		if ($status == 2) goto WaitAndTryXglrAgain
 	endif
 endif
 set ndxnam=("Guth Visual Comfort Probability" "Guth Disability Glare Ratio" "CIE Glare Index")
 set ndxcom=("glarendx -t guth_vcp" "glarendx -t guth_dgr" "glarendx -t cie_cgi")
+set bcdlvl=(50 124 18.5)
 while ( 1 )
 	echo ""
 	echo "	0.  Quit"
@@ -181,6 +189,11 @@ include=line.plt
 include=polar.plt
 title="$ndxnam[$choice]"
 subtitle="$subtitle"
+Bdata=
+	0	$bcdlvl[$choice]
+	360	$bcdlvl[$choice]
+;
+Blabel="BCD level"
 Adata=
 _EOF_
 			getinfo - < $gndxfile >> $plotfile