--- loncom/homework/imageresponse.pm 2002/02/04 17:30:53 1.17
+++ loncom/homework/imageresponse.pm 2005/12/01 18:46:31 1.73
@@ -1,7 +1,8 @@
+
# The LearningOnline Network with CAPA
# image click response style
#
-# $Id: imageresponse.pm,v 1.17 2002/02/04 17:30:53 albertel Exp $
+# $Id: imageresponse.pm,v 1.73 2005/12/01 18:46:31 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,272 +26,608 @@
#
# http://www.lon-capa.org/
#
-
-#FIXME assumes multiple possbile submissions but only one is possible currently
+#FIXME LATER assumes multiple possible submissions but only one is possible
+#currently
package Apache::imageresponse;
use strict;
+use Image::Magick();
+use Apache::randomlylabel();
+use Apache::londefdef();
+use Apache::Constants qw(:common :http);
+use Apache::lonlocal;
+use Apache::lonnet;
BEGIN {
- &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
+ &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
}
sub start_imageresponse {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $result;
- #when in a radiobutton response use these
- &Apache::lonxml::register('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
- push (@Apache::lonxml::namespace,'imageresponse');
- my $id = &Apache::response::start_response($parstack,$safeeval);
- if ($target eq 'meta') {
- $result=&Apache::response::meta_package_write('imageresponse');
- }
- return $result;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result;
+ #when in a radiobutton response use these
+ &Apache::lonxml::register('Apache::imageresponse',
+ ('foilgroup','foil','text','image','rectangle',
+ 'polygon','conceptgroup'));
+ push (@Apache::lonxml::namespace,'imageresponse');
+ my $id = &Apache::response::start_response($parstack,$safeeval);
+ undef(%Apache::response::foilnames);
+ if ($target eq 'meta') {
+ $result=&Apache::response::meta_package_write('imageresponse');
+ } elsif ($target eq 'analyze') {
+ my $part_id="$Apache::inputtags::part.$id";
+ push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
+ }
+ return $result;
}
sub end_imageresponse {
- &Apache::response::end_response;
- pop @Apache::lonxml::namespace;
- &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ &Apache::response::end_response;
+ pop @Apache::lonxml::namespace;
+ &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
+ my $result;
+ if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+ undef(%Apache::response::foilnames);
+ return $result;
}
-%Apache::response::foilgroup={};
+%Apache::response::foilgroup=();
sub start_foilgroup {
- %Apache::response::foilgroup={};
- $Apache::imageresponse::conceptgroup=0;
- &Apache::response::setrandomnumber();
- return '';
+ %Apache::response::foilgroup=();
+ $Apache::imageresponse::conceptgroup=0;
+ &Apache::response::pushrandomnumber();
+ return '';
}
sub getfoilcounts {
- my ($parstack,$safeeval)=@_;
+ my ($parstack,$safeeval)=@_;
- my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
- # +1 since instructors will count from 1
- my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
- return ($count,$max);
+ my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
+ # +1 since instructors will count from 1
+ my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
+ #if (&Apache::response::showallfoils()) { $max=$count; }
+ return ($count,$max);
}
sub whichfoils {
- my ($max)=@_;
- if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
- my @names = @{ $Apache::response::foilgroup{'names'} };
- my @whichopt =();
- while ((($#whichopt+1) < $max) && ($#names > -1)) {
- &Apache::lonxml::debug("Have $#whichopt max is $max");
- my $aopt=int(rand($#names+1));
- &Apache::lonxml::debug("From $#names elms, picking $aopt");
- $aopt=splice(@names,$aopt,1);
- &Apache::lonxml::debug("Picked $aopt");
- push (@whichopt,$aopt);
- }
- return @whichopt;
+ my ($max)=@_;
+ if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
+ my @names = @{ $Apache::response::foilgroup{'names'} };
+ my @whichopt =();
+ while ((($#whichopt+1) < $max) && ($#names > -1)) {
+ &Apache::lonxml::debug("Have $#whichopt max is $max");
+ my $aopt;
+# if (&Apache::response::showallfoils()) {
+# $aopt=0;
+# } else {
+ $aopt=int(&Math::Random::random_uniform() * ($#names+1));
+# }
+ &Apache::lonxml::debug("From $#names elms, picking $aopt");
+ $aopt=splice(@names,$aopt,1);
+ &Apache::lonxml::debug("Picked $aopt");
+ push (@whichopt,$aopt);
+ }
+ return @whichopt;
+}
+
+sub prep_image {
+ my ($image,$mode,$name)=@_;
+ my $part=$Apache::inputtags::part;
+ my $respid=$Apache::inputtags::response['-1'];
+ my $id=&Apache::loncommon::get_cgi_id();
+ my (%x,$i);
+ $x{"cgi.$id.BGIMG"}=&Apache::lonnet::escape($image);
+ my ($x,$y)=split(/:/,$Apache::lonhomework::history{"resource.$part.$respid.submission"});
+ #draws 2 xs on the image at the clicked location
+ #one in white and then one in red on top of the one in white
+ if (defined($x) && $x=~/\S/ && defined($y) && $y =~/\S/ && !&Apache::response::show_answer()) {
+ my $length = 6;
+ my $width = 1;
+ my $extrawidth = 2;
+ my $xmin=($x-$length);
+ my $xmax=($x+$length);
+ my $ymin=($y-$length);
+ my $ymax=($y+$length);
+
+ $x{"cgi.$id.OBJTYPE"}.='LINE:';
+ $i=$x{"cgi.$id.OBJCOUNT"}++;
+ $x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymin),($xmax),($ymax),
+ "FFFFFF",($width+$extrawidth)));
+ $x{"cgi.$id.OBJTYPE"}.='LINE:';
+ $i=$x{"cgi.$id.OBJCOUNT"}++;
+ $x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymax),($xmax),($ymin),
+ "FFFFFF",($width+$extrawidth)));
+ $x{"cgi.$id.OBJTYPE"}.='LINE:';
+ $i=$x{"cgi.$id.OBJCOUNT"}++;
+ $x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymin),($xmax),($ymax),
+ "FF0000",($width)));
+ $x{"cgi.$id.OBJTYPE"}.='LINE:';
+ $i=$x{"cgi.$id.OBJCOUNT"}++;
+ $x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymax),($xmax),($ymin),
+ "FF0000",($width)));
+ }
+ if ($mode eq 'answer') {
+ my $width = 1;
+ my $extrawidth = 2;
+ my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
+ foreach my $area (@areas) {
+ if ($area=~/^rectangle:/) {
+ $x{"cgi.$id.OBJTYPE"}.='RECTANGLE:';
+ $i=$x{"cgi.$id.OBJCOUNT"}++;
+ my ($x1,$y1,$x2,$y2)=
+ ($area=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/);
+ $x{"cgi.$id.OBJ$i"}=join(':',($x1,$y1,$x2,$y2,"FFFFFF",
+ ($width+$extrawidth)));
+ $x{"cgi.$id.OBJTYPE"}.='RECTANGLE:';
+ $i=$x{"cgi.$id.OBJCOUNT"}++;
+ $x{"cgi.$id.OBJ$i"}=join(':',($x1,$y1,$x2,$y2,"00FF00",$width));
+ } elsif ($area=~/^polygon:(.*)/) {
+ $x{"cgi.$id.OBJTYPE"}.='POLYGON:';
+ $i=$x{"cgi.$id.OBJCOUNT"}++;
+ $x{"cgi.$id.OBJ$i"}=join(':',("FFFFFF",($width+$extrawidth)));
+ $x{"cgi.$id.OBJEXTRA$i"}=$1;
+ $x{"cgi.$id.OBJTYPE"}.='POLYGON:';
+ $i=$x{"cgi.$id.OBJCOUNT"}++;
+ $x{"cgi.$id.OBJ$i"}=join(':',("00FF00",$width));
+ $x{"cgi.$id.OBJEXTRA$i"}=$1;
+ }
+ }
+ }
+ &Apache::lonnet::appenv(%x);
+ return $id;
}
sub displayfoils {
- my (@whichopt) = @_;
- my $result ='';
- my $name;
- my $temp=1;
- foreach $name (@whichopt) {
- $result.=$Apache::response::foilgroup{"$name.text"}."<br />\n";
- my $image=$Apache::response::foilgroup{"$name.image"};
- if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
- $result.="<img src=\"$image\"/> <br />\n";
+ my ($target,@whichopt) = @_;
+ my $result ='';
+ my $name;
+ my $temp=1;
+ foreach $name (@whichopt) {
+ $result.=$Apache::response::foilgroup{"$name.text"};
+ &Apache::lonxml::debug("Text is $result");
+ if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="<br />\n";}
+ my $image=$Apache::response::foilgroup{"$name.image"};
+ &Apache::lonxml::debug("image is $image");
+ if ( $target eq 'web' && $image !~ /^http:/ ) {
+ $image=&clean_up_image($image);
+ }
+ &Apache::lonxml::debug("image is $image");
+ if ( &Apache::response::show_answer() ) {
+ if ($target eq 'tex') {
+ $result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n";
+ } else {
+ my $token=&prep_image($image,'answer',$name);
+ $result.="<img src=\"/adm/randomlabel.png?token=$token\" /><br />\n";
+ }
+ } else {
+ if ($target eq 'tex') {
+ $result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n";
+ } else {
+ my $id=$Apache::inputtags::response['-1'];
+ my $token=&prep_image($image);
+ my $temp=1;
+ $result.="<input type=\"image\" name=\"HWVAL_$id:$temp\" ".
+ "src=\"/adm/randomlabel.png?token=$token\" /><br />\n";
+ }
+ }
+ $temp++;
+ }
+ return $result;
+}
+
+sub clean_up_image {
+ my ($image)=@_;
+ if ($image =~ /\s*<img\s*/) {
+ ($image) = ($image =~ /src\s*=\s*[\"\']([^\"\']+)[\"\']/i);
+ if ($image !~ /^http:/) {
+ $image=&Apache::lonnet::hreflocation('',$image);
+ }
+ if (!$image) {
+ $image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
+ }
} else {
- $result.="<input type=\"image\" name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\" src=\"$image\"/> <br />\n";
+ $image=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$image);
+ &Apache::lonxml::debug("repcopying: $image");
+ if (&Apache::lonnet::repcopy($image) ne 'ok') {
+ $image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
+ }
}
- $temp++;
- }
- return $result;
+ return $image;
}
sub gradefoils {
- my (@whichopt) = @_;
- my $result='';
- my $x;
- my $y;
- my $result;
- my $id=$Apache::inputtags::response['-1'];
- my $temp=1;
- foreach my $name (@whichopt) {
- $x=$ENV{"form.HWVAL_$id:$temp.x"};
- $y=$ENV{"form.HWVAL_$id:$temp.y"};
- &Apache::lonxml::debug("Got a x of $x and a y of $y for $name");
- if (defined(@{ $Apache::response::foilgroup{"$name.area"} })) {
- my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
- my $grade="INCORRECT";
- foreach my $area (@areas) {
- &Apache::lonxml::debug("Area is $area for $name");
- $area =~ m/([a-z]*):/;
- &Apache::lonxml::debug("Area of type $1");
- if ($1 eq 'rectangle') {
- $grade=&grade_rectangle($area,$x,$y);
- } else {
- &Apache::lonxml::error("Unknown area style $area");
+ my (@whichopt) = @_;
+ my $x;
+ my $y;
+ my $result;
+ my $id=$Apache::inputtags::response['-1'];
+ my $temp=1;
+ foreach my $name (@whichopt) {
+ $x=$env{"form.HWVAL_$id:$temp.x"};
+ $y=$env{"form.HWVAL_$id:$temp.y"};
+ &Apache::lonxml::debug("Got a x of $x and a y of $y for $name");
+ if (defined($x) && defined($y) &&
+ defined(@{ $Apache::response::foilgroup{"$name.area"} })) {
+ my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
+ my $grade="INCORRECT";
+ foreach my $area (@areas) {
+ &Apache::lonxml::debug("Area is $area for $name");
+ $area =~ m/([a-z]*):/;
+ &Apache::lonxml::debug("Area of type $1");
+ if ($1 eq 'rectangle') {
+ $grade=&grade_rectangle($area,$x,$y);
+ } elsif ($1 eq 'polygon') {
+ $grade=&grade_polygon($area,$x,$y);
+ } else {
+ &Apache::lonxml::error("Unknown area style $area");
+ }
+ &Apache::lonxml::debug("Area said $grade");
+ if ($grade eq 'APPROX_ANS') { last; }
+ }
+ &Apache::lonxml::debug("Foil was $grade");
+ if ($grade eq 'INCORRECT') { $result= 'INCORRECT'; }
+ if (($grade eq 'APPROX_ANS') && ($result ne 'APPROX_ANS')) { $result=$grade; }
+ &Apache::lonxml::debug("Question is $result");
+ $temp++;
}
- &Apache::lonxml::debug("Area said $grade");
- if ($grade eq 'APPROX_ANS') { last; }
- }
- &Apache::lonxml::debug("Foil was $grade");
- if ($grade eq 'INCORRECT') { $result= 'INCORRECT'; }
- if (($grade eq 'APPROX_ANS') && ($result ne 'APPROX_ANS')) { $result=$grade; }
- &Apache::lonxml::debug("Question is $result");
- $temp++;
- }
- }
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y";
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result;
- return '';
+ }
+ my $responsestr="$x:$y";
+ my $part=$Apache::inputtags::part;
+ my %previous=&Apache::response::check_for_previous($responsestr,$part,$id);
+ if ($result
+ && $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; }
+ &Apache::response::handle_previous(\%previous,$result);
+ $Apache::lonhomework::results{"resource.$part.$id.submission"}=$responsestr;
+ $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$result;
+ return '';
}
sub end_foilgroup {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $result='';
- my @whichopt;
- if ($target eq 'web' || $target eq 'grade') {
- my ($count,$max) = &getfoilcounts($parstack,$safeeval);
- if ($count>$max) { $count=$max }
- &Apache::lonxml::debug("Count is $count from $max");
- @whichopt = &whichfoils($max);
- }
- if ($target eq 'web') {
- $result=&displayfoils(@whichopt);
- }
- if ($target eq 'grade') {
- if ( defined $ENV{'form.submitted'}) {
- &gradefoils(@whichopt);
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ my @whichopt;
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
+ $target eq 'analyze') {
+ my ($count,$max) = &getfoilcounts($parstack,$safeeval);
+ if ($count>$max) { $count=$max }
+ &Apache::lonxml::debug("Count is $count from $max");
+ @whichopt = &whichfoils($max);
+ if ($target eq 'web' || $target eq 'tex') {
+ $result=&displayfoils($target,@whichopt);
+ } elsif ($target eq 'grade') {
+ if ( defined $env{'form.submitted'}) { &gradefoils(@whichopt); }
+ } elsif ( $target eq 'analyze') {
+ &Apache::response::analyze_store_foilgroup(\@whichopt,
+ ['text','image','area']);
+ }
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
}
- }
- return $result;
+ &Apache::response::poprandomnumber();
+ return $result;
}
sub start_conceptgroup {
- $Apache::imageresponse::conceptgroup=1;
- %Apache::response::conceptgroup={};
- return '';
+ $Apache::imageresponse::conceptgroup=1;
+ %Apache::response::conceptgroup=();
+ return '';
}
sub end_conceptgroup {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- $Apache::imageresponse::conceptgroup=0;
- if ($target eq 'web' || $target eq 'grade') {
- if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
- my @names = @{ $Apache::response::conceptgroup{'names'} };
- my $pick=int(rand($#names+1));
- my $name=$names[$pick];
- if (defined(@{ $Apache::response::conceptgroup{"$name.area"} })) {
- push @{ $Apache::response::foilgroup{'names'} }, $name;
- $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"};
- $Apache::response::foilgroup{"$name.image"} = $Apache::response::conceptgroup{"$name.image"};
- push(@{ $Apache::response::foilgroup{"$name.area"} }, @{ $Apache::response::conceptgroup{"$name.area"} });
- my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
- $Apache::response::foilgroup{"$name.concept"} = $concept;
- &Apache::lonxml::debug("Selecting $name in $concept");
- }
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ $Apache::imageresponse::conceptgroup=0;
+ my $result;
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
+ $target eq 'analyze') {
+ &Apache::response::pick_foil_for_concept($target,
+ ['area','text','image'],
+ \%Apache::hint::image,
+ $parstack,$safeeval);
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
}
- }
- return '';
+ return $result;
+}
+
+sub insert_foil {
+ return '
+ <foil>
+ <image></image>
+ <text></text>
+ <rectangle></rectangle>
+ </foil>
+';
}
$Apache::imageresponse::curname='';
sub start_foil {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if ($target eq 'web' || $target eq 'grade') {
- my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
- if ($name eq '') { $name=$Apache::lonxml::curdepth; }
- if ( $Apache::imageresponse::conceptgroup ) {
- push(@{ $Apache::response::conceptgroup{'names'} }, $name);
- } else {
- push(@{ $Apache::response::foilgroup{'names'} }, $name);
- }
- $Apache::imageresponse::curname=$name;
- }
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result;
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
+ $target eq 'analyze') {
+ my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ if ($name eq "") {
+ &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
+ $name=$Apache::lonxml::curdepth;
+ }
+ if (defined($Apache::response::foilnames{$name})) {
+ &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
+ }
+ $Apache::response::foilnames{$name}++;
+ if ( $Apache::imageresponse::conceptgroup
+ #&& !&Apache::response::showallfoils()
+ ) {
+ push(@{ $Apache::response::conceptgroup{'names'} }, $name);
+ } else {
+ push(@{ $Apache::response::foilgroup{'names'} }, $name);
+ }
+ $Apache::imageresponse::curname=$name;
+ } elsif ($target eq 'edit') {
+ $result = &Apache::edit::tag_start($target,$token);
+ $result .= &Apache::edit::text_arg('Name:','name',$token);
+ $result .= &Apache::edit::end_row().
+ &Apache::edit::start_spanning_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'name');
+ if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+ }
+ return $result;;
}
sub end_foil {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result;
+ if ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
+ }
+ return $result;
}
sub start_text {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if ($target eq 'web') { &Apache::lonxml::startredirection; }
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
+ &Apache::lonxml::startredirection;
+ } elsif ($target eq 'edit') {
+ my $descr=&Apache::lonxml::get_all_text('/text',$parser,$style);
+ $result=&Apache::edit::tag_start($target,$token,'Task Description').
+ &Apache::edit::editfield($token->[1],$descr,'Text',60,2).
+ &Apache::edit::end_row();
+ } elsif ($target eq "modified") {
+ $result=$token->[4].&Apache::edit::modifiedfield('/text',$parser);
+ }
+ return $result;
}
sub end_text {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if ($target eq 'web') {
- my $name = $Apache::imageresponse::curname;
- if ( $Apache::imageresponse::conceptgroup ) {
- $Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection;
- } else {
- $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result;
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
+ my $name = $Apache::imageresponse::curname;
+ if ( $Apache::imageresponse::conceptgroup
+ #&& !&Apache::response::showallfoils()
+ ) {
+ $Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection;
+ } else {
+ $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection;
+ }
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
}
- }
- return '';
+ return $result;
}
sub start_image {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if ($target eq 'web') { &Apache::lonxml::startredirection; }
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
+ &Apache::lonxml::startredirection;
+ } elsif ($target eq 'edit') {
+ my $bgimg=&Apache::lonxml::get_all_text('/image',$parser,$style);
+ $Apache::edit::bgimgsrc=$bgimg;
+ $Apache::edit::bgimgsrcdepth=$Apache::lonxml::curdepth;
+
+ $result=&Apache::edit::tag_start($target,$token,'Clickable Image').
+ &Apache::edit::editline($token->[1],$bgimg,'Image Source File',40);
+ $result.=&Apache::edit::browse(undef,'textnode').' ';
+ $result.=&Apache::edit::search(undef,'textnode').
+ &Apache::edit::end_row();
+ } elsif ($target eq "modified") {
+ $result=$token->[4].&Apache::edit::modifiedfield('/image',$parser);
+ }
+ return $result;
}
sub end_image {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if ($target eq 'web') {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result;
my $name = $Apache::imageresponse::curname;
- my $image = &Apache::lonxml::endredirection;
- &Apache::lonxml::debug("out is $image");
- if ( $Apache::imageresponse::conceptgroup ) {
- $Apache::response::conceptgroup{"$name.image"} = $image;
- } else {
- $Apache::response::foilgroup{"$name.image"} = $image;
- }
- }
- return '';
+ if ($target eq 'web') {
+ my $image = &Apache::lonxml::endredirection();
+ &Apache::lonxml::debug("original image is $image");
+ if ( $Apache::imageresponse::conceptgroup
+ #&& !&Apache::response::showallfoils()
+ ) {
+ $Apache::response::conceptgroup{"$name.image"} = $image;
+ } else {
+ $Apache::response::foilgroup{"$name.image"} = $image;
+ }
+ } elsif ($target eq 'analyze') {
+ my $image = &Apache::lonxml::endredirection();
+ if ( $Apache::imageresponse::conceptgroup
+ #&& !&Apache::response::showallfoils()
+ ) {
+ $Apache::response::conceptgroup{"$name.image"} = $image;
+ } else {
+ $Apache::response::foilgroup{"$name.image"} = $image;
+ }
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
+ } elsif ($target eq 'tex') {
+ my $src = &Apache::lonxml::endredirection();
+
+ # There may be all sorts of whitespace on fore and aft:
+
+ $src =~ s/\s+$//s;
+ $src =~ s/^\s+//s;
+
+ #
+ # Gnuplot e.g. just generates the latex to put inplace.
+ #
+ my $graphinclude;
+ if ($src =~ /^%DYNAMICIMAGE/) {
+ # This is needed because the newline is not always passed -> tex.
+ # At present we don't care about the sizing info.
+
+ my ($commentline, $restofstuff) = split(/\n/, $src);
+ $graphinclude = $src;
+ $graphinclude =~ s/^$commentline//;
+ } else {
+ my ($path,$file) = &Apache::londefdef::get_eps_image($src);
+ my ($height_param,$width_param)=
+ &Apache::londefdef::image_size($src,0.3,$parstack,$safeeval);
+ $graphinclude = '\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'}';
+ }
+ $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent '.$graphinclude;
+ }
+ return $result;
}
sub start_rectangle {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if ($target eq 'web' || $target eq 'grade') { &Apache::lonxml::startredirection; }
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
+ $target eq 'analyze') {
+ &Apache::lonxml::startredirection;
+ } elsif ($target eq 'edit') {
+ my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser,$style);
+ $result=&Apache::edit::tag_start($target,$token,'Rectangle').
+ &Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40).
+ &Apache::edit::entercoord(undef,'textnode',undef,undef,'box').
+ &Apache::edit::end_row();
+ } elsif ($target eq "modified") {
+ &Apache::edit::deletecoorddata();
+ $result=$token->[4].&Apache::edit::modifiedfield('/rectangle',$parser);
+ }
+ return $result;
}
sub grade_rectangle {
- my ($spec,$x,$y) = @_;
- &Apache::lonxml::debug("Spec is $spec");
- $spec=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/;
- my $x1=$1;
- my $y1=$2;
- my $x2=$3;
- my $y2=$4;
- &Apache::lonxml::debug("Point $x1,$y1,$x2,$y2");
- if ($x1 > $x2) { my $temp=$x1;$x1=$x2;$x2=$temp; }
- if ($y1 > $y2) { my $temp=$y1;$y1=$y2;$y2=$temp; }
- if (($x >= $x1) && ($x <= $x2) && ($y >= $y1) && ($y <= $y2)) {
- return 'APPROX_ANS';
- }
- return 'INCORRECT';
+ my ($spec,$x,$y) = @_;
+ &Apache::lonxml::debug("Spec is $spec");
+ my ($x1,$y1,$x2,$y2)=($spec=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/);
+ &Apache::lonxml::debug("Point $x1,$y1,$x2,$y2");
+ if ($x1 > $x2) { my $temp=$x1;$x1=$x2;$x2=$temp; }
+ if ($y1 > $y2) { my $temp=$y1;$y1=$y2;$y2=$temp; }
+ if (($x >= $x1) && ($x <= $x2) && ($y >= $y1) && ($y <= $y2)) {
+ return 'APPROX_ANS';
+ }
+ return 'INCORRECT';
}
sub end_rectangle {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if ($target eq 'web' || $target eq 'grade') {
- my $name = $Apache::imageresponse::curname;
- my $area = &Apache::lonxml::endredirection;
- &Apache::lonxml::debug("out is $area for $name");
- if ( $Apache::imageresponse::conceptgroup ) {
- push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area";
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result;
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
+ $target eq 'analyze') {
+ my $name = $Apache::imageresponse::curname;
+ my $area = &Apache::lonxml::endredirection;
+ $area=~s/\s//g;
+ &Apache::lonxml::debug("out is $area for $name");
+ if ( $Apache::imageresponse::conceptgroup
+ #&& !&Apache::response::showallfoils()
+ ) {
+ push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area";
+ } else {
+ push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";
+ }
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
+ }
+ return $result;
+}
+
+sub start_polygon {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
+ $target eq 'analyze') {
+ &Apache::lonxml::startredirection;
+ } elsif ($target eq 'edit') {
+ my $coords=&Apache::lonxml::get_all_text('/polygon',$parser,$style);
+ $result=&Apache::edit::tag_start($target,$token,'Polygon').
+ &Apache::edit::editline($token->[1],$coords,'Coordinate list',40).
+ &Apache::edit::entercoord(undef,'textnode',undef,undef,'polygon').
+ &Apache::edit::end_row();
+ } elsif ($target eq "modified") {
+ $result=$token->[4].&Apache::edit::modifiedfield('/polygon',$parser);
+ }
+ return $result;
+}
+
+sub grade_polygon {
+ my ($spec,$x,$y) = @_;
+ &Apache::lonxml::debug("Spec is $spec");
+ $spec=~s/^polygon://;
+ my @polygon;
+ foreach my $coord (split('-',$spec)) {
+ my ($x,$y)=($coord=~m/\(([0-9]+),([0-9]+)\)/);
+ &Apache::lonxml::debug("x $x y $y");
+ push @polygon, {'x'=>$x,'y'=>$y};
+ }
+ #make end point start point
+ push @polygon, $polygon[0];
+ # cribbed from
+ # http://geometryalgorithms.com/Archive/algorithm_0103/algorithm_0103.htm
+ my $crossing = 0; # the crossing number counter
+
+ # loop through all edges of the polygon
+ for (my $i=0; $i<$#polygon; $i++) { # edge from V[i] to V[i+1]
+ if ((($polygon[$i]->{'y'} <= $y)
+ && ($polygon[$i+1]->{'y'} > $y)) # an upward crossing
+ ||
+ (($polygon[$i]->{'y'} > $y)
+ && ($polygon[$i+1]->{'y'} <= $y))) { # a downward crossing
+ # compute the actual edge-ray intersect x-coordinate
+ my $vt = ($y - $polygon[$i]->{'y'})
+ / ($polygon[$i+1]->{'y'} - $polygon[$i]->{'y'});
+ if ($x < $polygon[$i]->{'x'} + $vt *
+ ($polygon[$i+1]->{'x'} - $polygon[$i]->{'x'})) { # x<intersect
+ $crossing++; # a valid crossing of y=P.y right of P.x
+ }
+ }
+ }
+
+ # 0 if even (out), and 1 if odd (in)
+ if ($crossing%2) {
+ return 'APPROX_ANS';
} else {
- push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";
+ return 'INCORRECT';
+ }
+}
+
+sub end_polygon {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result;
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
+ $target eq 'analyze') {
+ my $name = $Apache::imageresponse::curname;
+ my $area = &Apache::lonxml::endredirection;
+ $area=~s/\s*//g;
+ &Apache::lonxml::debug("out is $area for $name");
+ if ( $Apache::imageresponse::conceptgroup
+ #&& !&Apache::response::showallfoils()
+ ) {
+ push @{ $Apache::response::conceptgroup{"$name.area"} },"polygon:$area";
+ } else {
+ push @{ $Apache::response::foilgroup{"$name.area"} },"polygon:$area";
+ }
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
}
- }
- return '';
+ return $result;
}
1;
__END__