--- loncom/homework/imagechoice.pm 2005/04/07 06:56:21 1.8 +++ loncom/homework/imagechoice.pm 2005/08/25 19:33:14 1.9 @@ -1,4 +1,4 @@ -# $Id: imagechoice.pm,v 1.8 2005/04/07 06:56:21 albertel Exp $ +# $Id: imagechoice.pm,v 1.9 2005/08/25 19:33:14 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,7 +33,7 @@ sub deletedata { } sub closewindow { - my ($r,$output,$filename,$needimage)=@_; + my ($r,$output,$filename,$needimage,$display)=@_; if ($needimage) { $needimage=""; } @@ -47,6 +47,7 @@ sub closewindow {

Position Selected

+$display $needimage @@ -69,13 +70,16 @@ sub storedata { $needimage=1; } + my $display; if ($type eq 'point') { my (undef,$x,$y)=split(':',$env{"imagechoice.$id.coords"}); if ($env{"imagechoice.$id.formx"}) { $output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formx"}.'.value='.$x.';'; + $display.="

The X coordinate is $x

\n"; } if ($env{"imagechoice.$id.formy"}) { $output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formy"}.'.value='.$y.';'; + $display.="

The Y coordinate is $y

\n"; } } elsif ($type eq 'polygon' or $type eq 'box') { my $coordstr; @@ -83,11 +87,14 @@ sub storedata { $coordstr.='('.shift(@coords).','.shift(@coords).')-'; } chop($coordstr); + $display.="

The selected coordinates are $coordstr

\n"; $output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formcoord"}.'.value="'.$coordstr.'";'; } - + if ($display) { + $display.="

If this window fails to close you may need to manually replace the old coordinates with the above value.

\n"; + } &deletedata($id); - &closewindow($r,$output,$filename,$needimage); + &closewindow($r,$output,$filename,$needimage,$display); } sub getcoord {