--- loncom/homework/imagechoice.pm 2004/01/09 23:22:19 1.1 +++ loncom/homework/imagechoice.pm 2004/01/14 22:59:18 1.3 @@ -1,4 +1,4 @@ -# $Id: imagechoice.pm,v 1.1 2004/01/09 23:22:19 albertel Exp $ +# $Id: imagechoice.pm,v 1.3 2004/01/14 22:59:18 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,10 +26,11 @@ package Apache::imagechoice; use strict; use Apache::Constants qw(:common :http); -# -# Single coordinate, defined - store it -# +sub deletedata { + my ($id)=@_; + &Apache::lonnet::delenv("imagechoice\\.$id\\.coords"); +} sub closewindow { my ($r,$output,$filename)=@_; @@ -43,67 +44,67 @@ sub closewindow {

Position Selected

- + ENDSUBM } sub storedata { - my ($r,$mode,$filename,$id)=@_; + my ($r,$type,$filename,$id)=@_; - my (undef,@coords)=split(':',$ENV{"cgi.$id.coords"}); + my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"}); my $output; - if ($ENV{"cgi.$id.formwidth"}) { - $output.='opener.document.forms.'.$ENV{"cgi.$id.formname"}.'.'.$ENV{"cgi.$id.formwidth"}.'.value=document.pickimg.width;'; + if ($ENV{"imagechoice.$id.formwidth"}) { + $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formwidth"}.'.value=document.pickimg.width;'; } - if ($ENV{"cgi.$id.formheight"}) { - $output.='opener.document.forms.'.$ENV{"cgi.$id.formname"}.'.'.$ENV{"cgi.$id.formheight"}.'.value=document.pickimg.height;'; + if ($ENV{"imagechoice.$id.formheight"}) { + $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formheight"}.'.value=document.pickimg.height;'; } - if ((defined($ENV{"cgi.$id.x"})) && (defined($ENV{"cgi.$id.y"})) && - ($mode ne 'pairtwo') && ($mode ne 'pairthree')) { + if ((defined($ENV{"imagechoice.$id.x"})) && (defined($ENV{"imagechoice.$id.y"})) && + ($type ne 'pairtwo') && ($type ne 'pairthree')) { my $output=''; - if ($ENV{"cgi.$id.formx"}) { - $output.='opener.document.forms.'.$ENV{"cgi.$id.formname"}.'.'.$ENV{"cgi.$id.formx"}. - '.value='.$ENV{"cgi.$id.x"}.';'; + if ($ENV{"imagechoice.$id.formx"}) { + $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formx"}. + '.value='.$ENV{"imagechoice.$id.x"}.';'; } - if ($ENV{"cgi.$id.formy"}) { - $output.='opener.document.forms.'.$ENV{"cgi.$id.formname"}.'.'.$ENV{"cgi.$id.formy"}. - '.value='.$ENV{"cgi.$id.y"}.';'; + if ($ENV{"imagechoice.$id.formy"}) { + $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formy"}. + '.value='.$ENV{"imagechoice.$id.y"}.';'; } - } elsif ($mode eq 'pairthree') { - my $output=''; - my $outputpair='('.$ENV{"cgi.$id.selx"}.','.$ENV{"cgi.$id.sely"}.')-('.$ENV{"cgi.$id.x"}.','.$ENV{"cgi.$id.y"}.')'; - - if ($ENV{"cgi.$id.formcoord"}) { - $output.='opener.document.forms.'.$ENV{"cgi.$id.formname"}.'.'.$ENV{"cgi.$id.formcoord"}. - '.value="'.$outputpair.'";'; - } - } elsif ($mode eq 'polygon') { + } elsif ($type eq 'polygon' or $type eq 'box') { my $coordstr; while (@coords) { $coordstr.='('.shift(@coords).','.shift(@coords).')-'; } chop($coordstr); - $output.='opener.document.forms.'.$ENV{"cgi.$id.formname"}.'.'.$ENV{"cgi.$id.formcoord"}.'.value="'.$coordstr.'";'; + $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formcoord"}.'.value="'.$coordstr.'";'; } + &deletedata($id); &closewindow($r,$output,$filename); } sub getcoord { - my ($r,$mode,$filename,$id)=@_; + my ($r,$type,$filename,$id)=@_; my $heading='Position'; my $nextstage=''; - if ($mode eq 'pair') { - $heading='First Coordinate'; - $nextstage=''; - } elsif ($mode eq 'pairtwo') { - $heading='Second Coordinate'; - $nextstage=''; - } elsif ($mode eq 'polygon') { + if ($type eq 'box') { + my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"}); + my $step=scalar(@coords)/2; + if ($step == 0) { + $heading='First Coordinate'; + #$nextstage=''; + } elsif ($step == 1) { + $heading='Second Coordinate'; + #$nextstage=''; + } else { + $heading='Finish or Cancel'; + $nextstage=''; + } + } elsif ($type eq 'polygon') { $heading='Enter Coordinate or click finish to close Polygon'; $nextstage=''; } @@ -113,6 +114,8 @@ sub getcoord {

Select $heading on Image

$nextstage + +
@@ -123,10 +126,11 @@ END sub savecoord { my ($id)=@_; if (defined($ENV{"form.image.x"}) && defined($ENV{"form.image.y"})) { - my $data=join(':',($ENV{"cgi.$id.coords"},$ENV{"form.image.x"}, + my $data=join(':',($ENV{"imagechoice.$id.coords"},$ENV{"form.image.x"}, $ENV{"form.image.y"})); - &Apache::lonnet::appenv("cgi.$id.coords"=>$data); + &Apache::lonnet::appenv("imagechoice.$id.coords"=>$data); } + return int(scalar(split(':',$ENV{"imagechoice.$id.coords"}))/2); } sub drawX { @@ -153,7 +157,7 @@ sub drawX { sub drawPolygon { my ($id,$imid)=@_; - my (undef,@coords)=split(':',$ENV{"cgi.$id.coords"}); + my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"}); my $coordstr; while (@coords) { $coordstr.='('.shift(@coords).','.shift(@coords).')-'; @@ -171,18 +175,32 @@ sub drawPolygon { return %x; } +sub drawBox { + my ($id,$imid)=@_; + my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"}); + my %x; + if (scalar(@coords) < 4) { return %x; } + my $width = 1; + my $extrawidth = 2; + my $i=$x{"cgi.$imid.BOXCOUNT"}++; + $x{"cgi.$imid.BOX$i"}=join(':',(@coords,"FFFFFF",($width+$extrawidth))); + $i=$x{"cgi.$imid.BOXCOUNT"}++; + $x{"cgi.$imid.BOX$i"}=join(':',(@coords,"00FF00",$width)); + return %x; +} + sub drawimage { - my ($r,$mode,$filename,$id)=@_; + my ($r,$type,$filename,$id)=@_; my $imid=&Apache::loncommon::get_cgi_id(); - my (undef,@coords)=split(':',$ENV{"cgi.$id.coords"}); - if (scalar(@coords) < 2) { return $filename; } - $filename=&Apache::lonnet::filelocation('',$filename); + my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"}); + if (scalar(@coords) < 2) { return &Apache::lonnet::hreflocation('',$filename); } my %data; $data{"cgi.$imid.BGIMG"}=$filename; - my $x=@coords[-2]; - my $y=@coords[-1]; + my $x=$coords[-2]; + my $y=$coords[-1]; %data=(%data,&drawX($imid,$x,$y)); - if ($mode eq "polygon") { %data=(%data,&drawPolygon($id,$imid)); } + if ($type eq "polygon") { %data=(%data,&drawPolygon($id,$imid)); } + if ($type eq "box") { %data=(%data,&drawBox($id,$imid)); } &Apache::lonnet::appenv(%data); return "/adm/randomlabel.png?token=$imid" } @@ -192,16 +210,23 @@ sub handler { $r->content_type('text/html'); my %data; my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'}); - my $filename = $ENV{"cgi.$id.file"}; - my $formname = $ENV{"cgi.$id.formname"}; - my $mode=$ENV{"cgi.$id.mode"}; - $filename=&Apache::lonnet::unescape($filename); - &savecoord($id); - my $imurl=&drawimage($r,$mode,$filename,$id); - if ($ENV{'form.finish'} eq 'Finish') { - &storedata($r,$mode,$imurl,$id); + my $filename = &Apache::lonnet::unescape($ENV{"imagechoice.$id.file"}); + my $formname = $ENV{"imagechoice.$id.formname"}; + if ($ENV{'form.cancel'} eq 'Cancel') { + &deletedata($id); + &closewindow($r,'',$filename); + return OK; + } + my $type=$ENV{"imagechoice.$id.type"}; + if (defined($ENV{'form.type'})) { $type=$ENV{'form.type'}; } + my $numcoords=&savecoord($id); + &Apache::lonnet::logthis("num coords is $numcoords"); + my $imurl=&drawimage($r,$type,$filename,$id); + if (($ENV{'form.finish'} eq 'Finish')) { + &storedata($r,$type,$imurl,$id); + } else { + &getcoord($r,$type,$imurl,$id); } - &getcoord($r,$mode,$imurl,$id); return OK; }