--- loncom/homework/imagechoice.pm 2004/01/14 22:59:18 1.3 +++ loncom/homework/imagechoice.pm 2005/08/25 19:33:14 1.9 @@ -1,4 +1,4 @@ -# $Id: imagechoice.pm,v 1.3 2004/01/14 22:59:18 albertel Exp $ +# $Id: imagechoice.pm,v 1.9 2005/08/25 19:33:14 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,7 +25,7 @@ package Apache::imagechoice; use strict; use Apache::Constants qw(:common :http); - +use Apache::lonnet; sub deletedata { my ($id)=@_; @@ -33,7 +33,10 @@ sub deletedata { } sub closewindow { - my ($r,$output,$filename)=@_; + my ($r,$output,$filename,$needimage,$display)=@_; + if ($needimage) { + $needimage=""; + } $r->print(<<"ENDSUBM");
The X coordinate is $x
\n"; } - if ($ENV{"imagechoice.$id.formy"}) { - $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formy"}. - '.value='.$ENV{"imagechoice.$id.y"}.';'; + 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; @@ -81,37 +87,44 @@ sub storedata { $coordstr.='('.shift(@coords).','.shift(@coords).')-'; } chop($coordstr); - $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formcoord"}.'.value="'.$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); + &closewindow($r,$output,$filename,$needimage,$display); } sub getcoord { my ($r,$type,$filename,$id)=@_; - my $heading='Position'; + my $heading='Select Position on Image'; my $nextstage=''; if ($type eq 'box') { - my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"}); + my (undef,@coords)=split(':',$env{"imagechoice.$id.coords"}); my $step=scalar(@coords)/2; if ($step == 0) { - $heading='First Coordinate'; + $heading='Select First Coordinate on Image'; #$nextstage=''; } elsif ($step == 1) { - $heading='Second Coordinate'; + $heading='Select Second Coordinate on Image'; #$nextstage=''; } else { - $heading='Finish or Cancel'; + $heading='Select Finish to store selection.'; $nextstage=''; } } elsif ($type eq 'polygon') { $heading='Enter Coordinate or click finish to close Polygon'; $nextstage=''; + } elsif ($type eq 'point') { + $heading='Click to select a Coordinate or click Finish to store current selection.'; + $nextstage=''; } $r->print(<<"END"); -