--- loncom/homework/imagechoice.pm 2004/01/12 19:53:54 1.2 +++ loncom/homework/imagechoice.pm 2004/09/09 20:35:10 1.6 @@ -1,4 +1,4 @@ -# $Id: imagechoice.pm,v 1.2 2004/01/12 19:53:54 albertel Exp $ +# $Id: imagechoice.pm,v 1.6 2004/09/09 20:35:10 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,11 +29,14 @@ use Apache::Constants qw(:common :http); sub deletedata { my ($id)=@_; - &Apache::lonnet::delenv("imagechoice\\.$id"); + &Apache::lonnet::delenv("imagechoice\\.$id\\.coords"); } sub closewindow { - my ($r,$output,$filename)=@_; + my ($r,$output,$filename,$needimage)=@_; + if ($needimage) { + $needimage=""; + } $r->print(<<"ENDSUBM");

Position Selected

- +$needimage ENDSUBM } sub storedata { - my ($r,$mode,$filename,$id)=@_; + my ($r,$type,$filename,$id)=@_; my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"}); - my $output; + my ($output,$needimage); if ($ENV{"imagechoice.$id.formwidth"}) { $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formwidth"}.'.value=document.pickimg.width;'; + $needimage=1; } if ($ENV{"imagechoice.$id.formheight"}) { $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formheight"}.'.value=document.pickimg.height;'; + $needimage=1; } - if ((defined($ENV{"imagechoice.$id.x"})) && (defined($ENV{"imagechoice.$id.y"})) && - ($mode ne 'pairtwo') && ($mode ne 'pairthree')) { - my $output=''; + 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='.$ENV{"imagechoice.$id.x"}.';'; + $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formx"}.'.value='.$x.';'; } 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{"imagechoice.$id.selx"}.','.$ENV{"imagechoice.$id.sely"}.')-('.$ENV{"imagechoice.$id.x"}.','.$ENV{"imagechoice.$id.y"}.')'; - - if ($ENV{"imagechoice.$id.formcoord"}) { - $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formcoord"}. - '.value="'.$outputpair.'";'; + $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formy"}.'.value='.$y.';'; } - } elsif ($mode eq 'polygon') { + } elsif ($type eq 'polygon' or $type eq 'box') { my $coordstr; while (@coords) { $coordstr.='('.shift(@coords).','.shift(@coords).')-'; @@ -91,28 +85,39 @@ sub storedata { chop($coordstr); $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formcoord"}.'.value="'.$coordstr.'";'; } + &deletedata($id); - &closewindow($r,$output,$filename); + &closewindow($r,$output,$filename,$needimage); } sub getcoord { - my ($r,$mode,$filename,$id)=@_; - my $heading='Position'; + my ($r,$type,$filename,$id)=@_; + my $heading='Select Position on Image'; 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='Select First Coordinate on Image'; + #$nextstage=''; + } elsif ($step == 1) { + $heading='Select Second Coordinate on Image'; + #$nextstage=''; + } else { + $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"); -

Select $heading on Image

+

$heading

$nextstage @@ -125,67 +130,87 @@ END } sub savecoord { - my ($id)=@_; + my ($id,$type)=@_; if (defined($ENV{"form.image.x"}) && defined($ENV{"form.image.y"})) { - my $data=join(':',($ENV{"imagechoice.$id.coords"},$ENV{"form.image.x"}, - $ENV{"form.image.y"})); + my $data; + if ($type eq 'point') { + $data=join(':',(undef,$ENV{"form.image.x"},$ENV{"form.image.y"})); + } else { + $data=join(':',($ENV{"imagechoice.$id.coords"}, + $ENV{"form.image.x"},$ENV{"form.image.y"})); + } &Apache::lonnet::appenv("imagechoice.$id.coords"=>$data); } + return int(scalar(split(':',$ENV{"imagechoice.$id.coords"}))/2); +} + +sub add_obj { + my ($x,$id,$type,$args,$extra)=@_; + + $$x{"cgi.$id.OBJTYPE"}.=$type.':'; + my $i=$$x{"cgi.$id.OBJCOUNT"}++; + $$x{"cgi.$id.OBJ$i"}=$args; + if (defined($extra)) { $$x{"cgi.$id.OBJEXTRA$i"}=$extra; } } sub drawX { - my ($imid,$x,$y)=@_; - my %x; - $x{"cgi.$imid.LINECOUNT"}=4; + my ($data,$imid,$x,$y)=@_; my $length = 6; my $width = 1; my $extrawidth = 2; - $x{"cgi.$imid.LINE0"}= - join(':',(($x-$length),($y-$length),($x+$length),($y+$length), - "FFFFFF",($width+$extrawidth))); - $x{"cgi.$imid.LINE1"}= + &add_obj($data,$imid,'LINE', + join(':',(($x-$length),($y-$length),($x+$length),($y+$length), + "FFFFFF",($width+$extrawidth)))); + &add_obj($data,$imid,'LINE', join(':',(($x-$length),($y+$length),($x+$length),($y-$length), - "FFFFFF",($width+$extrawidth))); - $x{"cgi.$imid.LINE2"}= + "FFFFFF",($width+$extrawidth)))); + &add_obj($data,$imid,'LINE', join(':',(($x-$length),($y-$length),($x+$length),($y+$length), - "FF0000",($width))); - $x{"cgi.$imid.LINE3"}= + "FF0000",($width)))); + &add_obj($data,$imid,'LINE', join(':',(($x-$length),($y+$length),($x+$length),($y-$length), - "FF0000",($width))); - return %x; + "FF0000",($width)))); } sub drawPolygon { - my ($id,$imid)=@_; + my ($data,$id,$imid)=@_; my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"}); my $coordstr; while (@coords) { $coordstr.='('.shift(@coords).','.shift(@coords).')-'; } chop($coordstr); - my %x; my $width = 1; my $extrawidth = 2; - my $i=$x{"cgi.$imid.POLYCOUNT"}++; - $x{"cgi.$imid.POLYOPT$i"}=join(':',("FFFFFF",($width+$extrawidth)),'1'); - $x{"cgi.$imid.POLY$i"}=$coordstr; - $i=$x{"cgi.$imid.POLYCOUNT"}++; - $x{"cgi.$imid.POLYOPT$i"}=join(':',("00FF00",$width),'1'); - $x{"cgi.$imid.POLY$i"}=$coordstr; - return %x; + &add_obj($data,$imid,'POLYGON', + join(':',("FFFFFF",($width+$extrawidth)),'1'),$coordstr); + &add_obj($data,$imid,'POLYGON', + join(':',("00FF00",($width)),'1'),$coordstr); +} + +sub drawBox { + my ($data,$id,$imid)=@_; + my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"}); + if (scalar(@coords) < 4) { return ''; } + my $width = 1; + my $extrawidth = 2; + &add_obj($data,$imid,'RECTANGLE', + join(':',(@coords,"FFFFFF",($width+$extrawidth)))); + &add_obj($data,$imid,'RECTANGLE',join(':',(@coords,"00FF00",$width))); } sub drawimage { - my ($r,$mode,$filename,$id)=@_; + my ($r,$type,$filename,$id)=@_; my $imid=&Apache::loncommon::get_cgi_id(); 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]; - %data=(%data,&drawX($imid,$x,$y)); - if ($mode eq "polygon") { %data=(%data,&drawPolygon($id,$imid)); } + my $x=$coords[-2]; + my $y=$coords[-1]; + &drawX(\%data,$imid,$x,$y); + if ($type eq "polygon") { &drawPolygon(\%data,$id,$imid); } + if ($type eq "box") { &drawBox(\%data,$id,$imid); } &Apache::lonnet::appenv(%data); return "/adm/randomlabel.png?token=$imid" } @@ -197,17 +222,20 @@ sub handler { my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'}); my $filename = &Apache::lonnet::unescape($ENV{"imagechoice.$id.file"}); my $formname = $ENV{"imagechoice.$id.formname"}; - my $mode=$ENV{"imagechoice.$id.mode"}; if ($ENV{'form.cancel'} eq 'Cancel') { &deletedata($id); &closewindow($r,'',$filename); + return OK; } - &savecoord($id); - my $imurl=&drawimage($r,$mode,$filename,$id); - if ($ENV{'form.finish'} eq 'Finish') { - &storedata($r,$mode,$imurl,$id); + my $type=$ENV{"imagechoice.$id.type"}; + if (defined($ENV{'form.type'})) { $type=$ENV{'form.type'}; } + my $numcoords=&savecoord($id,$type); + 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; }