version 1.37, 2003/10/27 19:27:09
|
version 1.61, 2005/01/31 23:09:55
|
Line 1
|
Line 1
|
|
|
# The LearningOnline Network with CAPA |
# The LearningOnline Network with CAPA |
# image click response style |
# image click response style |
# |
# |
Line 29
|
Line 30
|
#currently |
#currently |
|
|
package Apache::imageresponse; |
package Apache::imageresponse; |
use Apache::randomlylabel; |
|
use strict; |
use strict; |
use Image::Magick; |
use Image::Magick(); |
use GD; |
use Apache::randomlylabel(); |
|
use Apache::londefdef(); |
|
use Apache::Constants qw(:common :http); |
|
use Apache::lonlocal; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::imageresponse',('imageresponse')); |
&Apache::lonxml::register('Apache::imageresponse',('imageresponse')); |
Line 42 sub start_imageresponse {
|
Line 45 sub start_imageresponse {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
#when in a radiobutton response use these |
#when in a radiobutton response use these |
&Apache::lonxml::register('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup')); |
&Apache::lonxml::register('Apache::imageresponse', |
|
('foilgroup','foil','text','image','rectangle', |
|
'polygon','conceptgroup')); |
push (@Apache::lonxml::namespace,'imageresponse'); |
push (@Apache::lonxml::namespace,'imageresponse'); |
my $id = &Apache::response::start_response($parstack,$safeeval); |
my $id = &Apache::response::start_response($parstack,$safeeval); |
|
undef(%Apache::response::foilnames); |
if ($target eq 'meta') { |
if ($target eq 'meta') { |
$result=&Apache::response::meta_package_write('imageresponse'); |
$result=&Apache::response::meta_package_write('imageresponse'); |
} elsif ($target eq 'analyze') { |
} elsif ($target eq 'analyze') { |
Line 61 sub end_imageresponse {
|
Line 67 sub end_imageresponse {
|
&Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup')); |
&Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup')); |
my $result; |
my $result; |
if ($target eq 'edit') { $result=&Apache::edit::end_table(); } |
if ($target eq 'edit') { $result=&Apache::edit::end_table(); } |
|
undef(%Apache::response::foilnames); |
return $result; |
return $result; |
} |
} |
|
|
Line 68 sub end_imageresponse {
|
Line 75 sub end_imageresponse {
|
sub start_foilgroup { |
sub start_foilgroup { |
%Apache::response::foilgroup=(); |
%Apache::response::foilgroup=(); |
$Apache::imageresponse::conceptgroup=0; |
$Apache::imageresponse::conceptgroup=0; |
&Apache::response::setrandomnumber(); |
&Apache::response::pushrandomnumber(); |
return ''; |
return ''; |
} |
} |
|
|
Line 78 sub getfoilcounts {
|
Line 85 sub getfoilcounts {
|
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
# +1 since instructors will count from 1 |
# +1 since instructors will count from 1 |
my $count = $#{ $Apache::response::foilgroup{'names'} }+1; |
my $count = $#{ $Apache::response::foilgroup{'names'} }+1; |
if (&Apache::response::showallfoils()) { $max=$count; } |
#if (&Apache::response::showallfoils()) { $max=$count; } |
return ($count,$max); |
return ($count,$max); |
} |
} |
|
|
Line 90 sub whichfoils {
|
Line 97 sub whichfoils {
|
while ((($#whichopt+1) < $max) && ($#names > -1)) { |
while ((($#whichopt+1) < $max) && ($#names > -1)) { |
&Apache::lonxml::debug("Have $#whichopt max is $max"); |
&Apache::lonxml::debug("Have $#whichopt max is $max"); |
my $aopt; |
my $aopt; |
if (&Apache::response::showallfoils()) { |
# if (&Apache::response::showallfoils()) { |
$aopt=0; |
# $aopt=0; |
} else { |
# } else { |
$aopt=int(&Math::Random::random_uniform() * ($#names+1)); |
$aopt=int(&Math::Random::random_uniform() * ($#names+1)); |
} |
# } |
&Apache::lonxml::debug("From $#names elms, picking $aopt"); |
&Apache::lonxml::debug("From $#names elms, picking $aopt"); |
$aopt=splice(@names,$aopt,1); |
$aopt=splice(@names,$aopt,1); |
&Apache::lonxml::debug("Picked $aopt"); |
&Apache::lonxml::debug("Picked $aopt"); |
Line 103 sub whichfoils {
|
Line 110 sub whichfoils {
|
return @whichopt; |
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 { |
sub displayfoils { |
my ($target,@whichopt) = @_; |
my ($target,@whichopt) = @_; |
my $result =''; |
my $result =''; |
Line 114 sub displayfoils {
|
Line 188 sub displayfoils {
|
if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="<br />\n";} |
if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="<br />\n";} |
my $image=$Apache::response::foilgroup{"$name.image"}; |
my $image=$Apache::response::foilgroup{"$name.image"}; |
&Apache::lonxml::debug("image is $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 ( &Apache::response::show_answer() ) { |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n"; |
$result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n"; |
} else { |
} else { |
$result.="<img src=\"$image\"/> <br />\n"; |
my $token=&prep_image($image,'answer',$name); |
|
$result.="<img src=\"/adm/randomlabel.png?token=$token\" /><br />\n"; |
} |
} |
} else { |
} else { |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n"; |
$result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n"; |
} else { |
} else { |
$result.="<input type=\"image\" name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\" src=\"$image\"/> <br />\n"; |
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++; |
$temp++; |
Line 132 sub displayfoils {
|
Line 215 sub displayfoils {
|
return $result; |
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 { |
|
$image=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$image); |
|
if (&Apache::lonnet::repcopy($image) ne OK) { |
|
$image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif'; |
|
} |
|
} |
|
return $image; |
|
} |
|
|
sub gradefoils { |
sub gradefoils { |
my (@whichopt) = @_; |
my (@whichopt) = @_; |
my $x; |
my $x; |
Line 153 sub gradefoils {
|
Line 255 sub gradefoils {
|
&Apache::lonxml::debug("Area of type $1"); |
&Apache::lonxml::debug("Area of type $1"); |
if ($1 eq 'rectangle') { |
if ($1 eq 'rectangle') { |
$grade=&grade_rectangle($area,$x,$y); |
$grade=&grade_rectangle($area,$x,$y); |
|
} elsif ($1 eq 'polygon') { |
|
$grade=&grade_polygon($area,$x,$y); |
} else { |
} else { |
&Apache::lonxml::error("Unknown area style $area"); |
&Apache::lonxml::error("Unknown area style $area"); |
} |
} |
Line 166 sub gradefoils {
|
Line 270 sub gradefoils {
|
$temp++; |
$temp++; |
} |
} |
} |
} |
$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y"; |
my $responsestr="$x:$y"; |
$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result; |
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 ''; |
return ''; |
} |
} |
|
|
Line 175 sub end_foilgroup {
|
Line 285 sub end_foilgroup {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
my @whichopt; |
my @whichopt; |
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || |
|
$target eq 'analyze') { |
my ($count,$max) = &getfoilcounts($parstack,$safeeval); |
my ($count,$max) = &getfoilcounts($parstack,$safeeval); |
if ($count>$max) { $count=$max } |
if ($count>$max) { $count=$max } |
&Apache::lonxml::debug("Count is $count from $max"); |
&Apache::lonxml::debug("Count is $count from $max"); |
Line 191 sub end_foilgroup {
|
Line 302 sub end_foilgroup {
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::end_table(); |
$result=&Apache::edit::end_table(); |
} |
} |
|
&Apache::response::poprandomnumber(); |
return $result; |
return $result; |
} |
} |
|
|
Line 232 sub start_foil {
|
Line 344 sub start_foil {
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || |
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || |
$target eq 'analyze') { |
$target eq 'analyze') { |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
if ($name eq '') { $name=$Apache::lonxml::curdepth; } |
if (!$name) { |
|
&Apache::lonxml::error("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 |
if ( $Apache::imageresponse::conceptgroup |
&& !&Apache::response::showallfoils()) { |
#&& !&Apache::response::showallfoils() |
|
) { |
push(@{ $Apache::response::conceptgroup{'names'} }, $name); |
push(@{ $Apache::response::conceptgroup{'names'} }, $name); |
} else { |
} else { |
push(@{ $Apache::response::foilgroup{'names'} }, $name); |
push(@{ $Apache::response::foilgroup{'names'} }, $name); |
Line 264 sub start_text {
|
Line 384 sub start_text {
|
&Apache::edit::editfield($token->[1],$descr,'Text',60,2). |
&Apache::edit::editfield($token->[1],$descr,'Text',60,2). |
&Apache::edit::end_row(); |
&Apache::edit::end_row(); |
} elsif ($target eq "modified") { |
} elsif ($target eq "modified") { |
my $descr=&Apache::lonxml::get_all_text('/text',$parser); |
$result=$token->[4].&Apache::edit::modifiedfield('/text',$parser); |
$result=$token->[4].&Apache::edit::modifiedfield($token); |
|
&Apache::lonxml::debug($result); |
|
} |
} |
return $result; |
return $result; |
} |
} |
Line 277 sub end_text {
|
Line 395 sub end_text {
|
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
my $name = $Apache::imageresponse::curname; |
my $name = $Apache::imageresponse::curname; |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
&& !&Apache::response::showallfoils() ) { |
#&& !&Apache::response::showallfoils() |
|
) { |
$Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection; |
$Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection; |
} else { |
} else { |
$Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection; |
$Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection; |
Line 304 sub start_image {
|
Line 423 sub start_image {
|
$result.=&Apache::edit::search(undef,'textnode'). |
$result.=&Apache::edit::search(undef,'textnode'). |
&Apache::edit::end_row(); |
&Apache::edit::end_row(); |
} elsif ($target eq "modified") { |
} elsif ($target eq "modified") { |
my $bgimg=&Apache::lonxml::get_all_text('/image',$parser); |
$result=$token->[4].&Apache::edit::modifiedfield('/image',$parser); |
$result=$token->[4].&Apache::edit::modifiedfield($token); |
|
&Apache::lonxml::debug($result); |
|
} |
} |
return $result; |
return $result; |
} |
} |
Line 318 sub end_image {
|
Line 435 sub end_image {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
my $image = &Apache::lonxml::endredirection; |
my $image = &Apache::lonxml::endredirection; |
&Apache::lonxml::debug("original image is $image"); |
&Apache::lonxml::debug("original image is $image"); |
my $id=$Apache::inputtags::response['-1']; |
|
my $temp=1; |
|
my $x=$ENV{"form.HWVAL_$id:$temp.x"}; |
|
my $y=$ENV{"form.HWVAL_$id:$temp.y"}; |
|
if (defined ($x) && defined ($y)) { |
|
&Apache::lonxml::debug("x and y defined as $x,$y"); |
|
my $currentImage = &Apache::randomlylabel::get_image('/home/httpd/html'.$image,1); |
|
if (! defined($currentImage)) { |
|
&Apache::lonnet::logthis('Unable to create image object for '.$image); |
|
return ''; |
|
} |
|
my $red; |
|
if (!($red = $currentImage->colorResolve(255,0,0))) { |
|
$red = $currentImage->colorClosestHWB(255,0,0); |
|
} |
|
my $length = 6; |
|
$currentImage->line($x-$length,$y-$length,$x+$length,$y+$length,$red); |
|
$currentImage->line($x-$length,$y+$length,$x+$length,$y-$length,$red); |
|
|
|
my ($nameWOext) = ($image =~ /^.*\/(.*)\..*$/); |
|
&Apache::lonxml::debug("graph name $nameWOext"); |
|
my $webImageName = "/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_". |
|
$nameWOext.'.png'; #needs to be more random or specific |
|
my $newImageName = '/home/httpd'.$webImageName; |
|
|
|
my $imgfh = Apache::File->new('>'.$newImageName); |
|
print $imgfh $currentImage->png; |
|
$image = $webImageName; |
|
} |
|
&Apache::lonxml::debug("out image is $image"); |
|
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
&& !&Apache::response::showallfoils()) { |
#&& !&Apache::response::showallfoils() |
|
) { |
$Apache::response::conceptgroup{"$name.image"} = $image; |
$Apache::response::conceptgroup{"$name.image"} = $image; |
} else { |
} else { |
$Apache::response::foilgroup{"$name.image"} = $image; |
$Apache::response::foilgroup{"$name.image"} = $image; |
Line 357 sub end_image {
|
Line 445 sub end_image {
|
} elsif ($target eq 'analyze') { |
} elsif ($target eq 'analyze') { |
my $image = &Apache::lonxml::endredirection; |
my $image = &Apache::lonxml::endredirection; |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
&& !&Apache::response::showallfoils()) { |
#&& !&Apache::response::showallfoils() |
|
) { |
$Apache::response::conceptgroup{"$name.image"} = $image; |
$Apache::response::conceptgroup{"$name.image"} = $image; |
} else { |
} else { |
$Apache::response::foilgroup{"$name.image"} = $image; |
$Apache::response::foilgroup{"$name.image"} = $image; |
Line 424 sub end_image {
|
Line 513 sub end_image {
|
} elsif ($width ne '') { |
} elsif ($width ne '') { |
$width_param = $width*$scaling; |
$width_param = $width*$scaling; |
} |
} |
|
$width_param=&Apache::randomlabel::adjust_textwidth($width_param); |
#where can we find the picture? |
#where can we find the picture? |
if (-e $newsrc) { |
if (-e $newsrc) { |
if ($path) { |
if ($path) { |
$Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
$Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
} |
} |
} else { |
} else { |
my $temp_file; |
#care about eps dynamical generation |
my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat"; |
$Apache::response::foilgroup{"$name.image"}='\vskip 0 mm '.&Apache::londefdef::eps_generation($src,$file,$width_param); |
$temp_file = Apache::File->new('>>'.$filename); |
|
print $temp_file "$src\n"; |
|
$Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \graphicspath{{/home/httpd/prtspool/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
|
} |
} |
} |
} |
return $result; |
return $result; |
Line 443 sub end_image {
|
Line 530 sub end_image {
|
sub start_rectangle { |
sub start_rectangle { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || |
|
$target eq 'analyze') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser); |
my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser); |
$result=&Apache::edit::tag_start($target,$token,'Rectangle'). |
$result=&Apache::edit::tag_start($target,$token,'Rectangle'). |
&Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40). |
&Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40). |
&Apache::edit::entercoordpair(undef,'textnode'). |
&Apache::edit::entercoord(undef,'textnode',undef,undef,'box'). |
&Apache::edit::end_row(); |
&Apache::edit::end_row(); |
} elsif ($target eq "modified") { |
} elsif ($target eq "modified") { |
my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser); |
&Apache::edit::deletecoorddata(); |
$result=$token->[4].&Apache::edit::modifiedfield($token); |
$result=$token->[4].&Apache::edit::modifiedfield('/rectangle',$parser); |
&Apache::lonxml::debug($result); |
|
} |
} |
return $result; |
return $result; |
} |
} |
Line 462 sub start_rectangle {
|
Line 549 sub start_rectangle {
|
sub grade_rectangle { |
sub grade_rectangle { |
my ($spec,$x,$y) = @_; |
my ($spec,$x,$y) = @_; |
&Apache::lonxml::debug("Spec is $spec"); |
&Apache::lonxml::debug("Spec is $spec"); |
$spec=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/; |
my ($x1,$y1,$x2,$y2)=($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"); |
&Apache::lonxml::debug("Point $x1,$y1,$x2,$y2"); |
if ($x1 > $x2) { my $temp=$x1;$x1=$x2;$x2=$temp; } |
if ($x1 > $x2) { my $temp=$x1;$x1=$x2;$x2=$temp; } |
if ($y1 > $y2) { my $temp=$y1;$y1=$y2;$y2=$temp; } |
if ($y1 > $y2) { my $temp=$y1;$y1=$y2;$y2=$temp; } |
Line 479 sub grade_rectangle {
|
Line 562 sub grade_rectangle {
|
sub end_rectangle { |
sub end_rectangle { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || |
|
$target eq 'analyze') { |
my $name = $Apache::imageresponse::curname; |
my $name = $Apache::imageresponse::curname; |
my $area = &Apache::lonxml::endredirection; |
my $area = &Apache::lonxml::endredirection; |
|
$area=~s/\s//g; |
&Apache::lonxml::debug("out is $area for $name"); |
&Apache::lonxml::debug("out is $area for $name"); |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
&& !&Apache::response::showallfoils()) { |
#&& !&Apache::response::showallfoils() |
|
) { |
push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area"; |
push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area"; |
} else { |
} else { |
push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area"; |
push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area"; |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::end_table(); |
$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); |
|
$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 { |
|
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 $result; |
return $result; |
} |
} |