Diff for /loncom/homework/imageresponse.pm between versions 1.34 and 1.52

version 1.34, 2003/08/01 15:50:43 version 1.52, 2004/03/15 22:09:52
Line 1 Line 1
   
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # image click response style  # image click response style
 #  #
Line 25 Line 26
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # July,August 2003 H. K. Ng  
 #  
 #FIXME LATER assumes multiple possible submissions but only one is possible   #FIXME LATER assumes multiple possible submissions but only one is possible 
 #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'));
 }  }
   
 sub start_imageresponse {  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',
   push (@Apache::lonxml::namespace,'imageresponse');        ('foilgroup','foil','text','image','rectangle',
   my $id = &Apache::response::start_response($parstack,$safeeval);         'polygon','conceptgroup'));
   if ($target eq 'meta') {      push (@Apache::lonxml::namespace,'imageresponse');
     $result=&Apache::response::meta_package_write('imageresponse');      my $id = &Apache::response::start_response($parstack,$safeeval);
   }      undef(%Apache::response::foilnames);
   return $result;      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 {  sub end_imageresponse {
Line 60  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;
 }  }
   
 %Apache::response::foilgroup=();  %Apache::response::foilgroup=();
 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::setrandomnumber();
   return '';      return '';
 }  }
   
 sub getfoilcounts {  sub getfoilcounts {
   my ($parstack,$safeeval)=@_;      my ($parstack,$safeeval)=@_;
   
   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);
 }  }
   
 sub whichfoils {  sub whichfoils {
   my ($max)=@_;      my ($max)=@_;
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }      if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
   my @names = @{ $Apache::response::foilgroup{'names'} };      my @names = @{ $Apache::response::foilgroup{'names'} };
   my @whichopt =();      my @whichopt =();
   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");
    $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/) {
    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::lonxml::debug("From $#names elms, picking $aopt");      &Apache::lonnet::appenv(%x);
     $aopt=splice(@names,$aopt,1);      return $id;
     &Apache::lonxml::debug("Picked $aopt");  
     push (@whichopt,$aopt);  
   }  
   return @whichopt;  
 }  }
   
 sub displayfoils {  sub displayfoils {
   my ($target,@whichopt) = @_;      my ($target,@whichopt) = @_;
   my $result ='';      my $result ='';
   my $name;      my $name;
   my $temp=1;      my $temp=1;
   foreach $name (@whichopt) {      foreach $name (@whichopt) {
     $result.=$Apache::response::foilgroup{"$name.text"};   $result.=$Apache::response::foilgroup{"$name.text"};
     &Apache::lonxml::debug("Text is $result");   &Apache::lonxml::debug("Text is $result");
     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 ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {   if ( $target eq 'web' && $image !~ /^http:/ ) {
       if ($target eq 'tex') {      $image=&clean_up_image($image);
  $result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n";   } 
       } else {   &Apache::lonxml::debug("image is $image");
         $result.="<img src=\"$image\"/> <br />\n";   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 {      } else {
       if ($target eq 'tex') {   $image=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$image);
  $result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n";   if (&Apache::lonnet::repcopy($image) ne OK) {
       } else {      $image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
         $result.="<input type=\"image\" name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\" src=\"$image\"/> <br />\n";   }
       }      }
     }      return $image;
     $temp++;  
   }  
   return $result;  
 }  }
   
 sub gradefoils {  sub gradefoils {
   my (@whichopt) = @_;      my (@whichopt) = @_;
   my $x;      my $x;
   my $y;      my $y;
   my $result;      my $result;
   my $id=$Apache::inputtags::response['-1'];      my $id=$Apache::inputtags::response['-1'];
   my $temp=1;      my $temp=1;
   foreach my $name (@whichopt) {      foreach my $name (@whichopt) {
     $x=$ENV{"form.HWVAL_$id:$temp.x"};   $x=$ENV{"form.HWVAL_$id:$temp.x"};
     $y=$ENV{"form.HWVAL_$id:$temp.y"};   $y=$ENV{"form.HWVAL_$id:$temp.y"};
     &Apache::lonxml::debug("Got a x of $x and a y of $y for $name");   &Apache::lonxml::debug("Got a x of $x and a y of $y for $name");
     if (defined($x) && defined($y) &&   if (defined($x) && defined($y) &&
  defined(@{ $Apache::response::foilgroup{"$name.area"} })) {      defined(@{ $Apache::response::foilgroup{"$name.area"} })) {
       my @areas = @{ $Apache::response::foilgroup{"$name.area"} };      my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
       my $grade="INCORRECT";      my $grade="INCORRECT";
       foreach my $area (@areas) {      foreach my $area (@areas) {
  &Apache::lonxml::debug("Area is $area for $name");   &Apache::lonxml::debug("Area is $area for $name");
  $area =~ m/([a-z]*):/;   $area =~ m/([a-z]*):/;
  &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);
  } else {   } elsif ($1 eq 'polygon') {
   &Apache::lonxml::error("Unknown area style $area");      $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::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y";
       }      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result;
       &Apache::lonxml::debug("Foil was $grade");      return '';
       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 '';  
 }  }
   
 sub end_foilgroup {  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' ||
     my ($count,$max) = &getfoilcounts($parstack,$safeeval);   $target eq 'analyze') {
     if ($count>$max) { $count=$max }   my ($count,$max) = &getfoilcounts($parstack,$safeeval);
     &Apache::lonxml::debug("Count is $count from $max");   if ($count>$max) { $count=$max }
     @whichopt = &whichfoils($max);   &Apache::lonxml::debug("Count is $count from $max");
     if ($target eq 'web' || $target eq 'tex') {   @whichopt = &whichfoils($max);
  $result=&displayfoils($target,@whichopt);   if ($target eq 'web' || $target eq 'tex') {
     } elsif ($target eq 'grade') {      $result=&displayfoils($target,@whichopt);
  if ( defined $ENV{'form.submitted'}) { &gradefoils(@whichopt); }   } elsif ($target eq 'grade') {
     }       if ( defined $ENV{'form.submitted'}) { &gradefoils(@whichopt); }
   } elsif ($target eq 'edit') {   } elsif ( $target eq 'analyze') {
       $result=&Apache::edit::end_table();      &Apache::response::analyze_store_foilgroup(\@whichopt,
   }        ['text','image','area']);
   return $result;   }
       } elsif ($target eq 'edit') {
    $result=&Apache::edit::end_table();
       }
       return $result;
 }  }
   
 sub start_conceptgroup {  sub start_conceptgroup {
   $Apache::imageresponse::conceptgroup=1;      $Apache::imageresponse::conceptgroup=1;
   %Apache::response::conceptgroup=();      %Apache::response::conceptgroup=();
   return '';      return '';
 }  }
   
 sub end_conceptgroup {  sub end_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::imageresponse::conceptgroup=0;      $Apache::imageresponse::conceptgroup=0;
   my $result;      my $result;
   if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
     if (defined(@{ $Apache::response::conceptgroup{'names'} })) {   $target eq 'analyze') {
       my @names = @{ $Apache::response::conceptgroup{'names'} };   &Apache::response::pick_foil_for_concept($target,
       my $pick=int(&Math::Random::random_uniform() * ($#names+1));   ['area','text','image'],
       my $name=$names[$pick];   \%Apache::hint::image,
       if (defined(@{ $Apache::response::conceptgroup{"$name.area"} })) {   $parstack,$safeeval);
  push @{ $Apache::response::foilgroup{'names'} }, $name;      } elsif ($target eq 'edit') {
  $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"};   $result=&Apache::edit::end_table();
  $Apache::response::foilgroup{"$name.image"} = $Apache::response::conceptgroup{"$name.image"};      }
  push(@{ $Apache::response::foilgroup{"$name.area"} }, @{ $Apache::response::conceptgroup{"$name.area"} });      return $result;
  my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);  
  $Apache::response::foilgroup{"$name.concept"} = $concept;  
  &Apache::lonxml::debug("Selecting $name in $concept");  
       }  
     }  
   } elsif ($target eq 'edit') {  
       $result=&Apache::edit::end_table();  
   }  
   return $result;  
 }  }
   
 sub insert_foil {  sub insert_foil {
Line 233  sub insert_foil { Line 333  sub insert_foil {
   
 $Apache::imageresponse::curname='';  $Apache::imageresponse::curname='';
 sub start_foil {  sub start_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
     my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);   $target eq 'analyze') {
     if ($name eq '') { $name=$Apache::lonxml::curdepth; }   my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
     if ( $Apache::imageresponse::conceptgroup   if ($name eq '') { $name=$Apache::lonxml::curdepth; }
  && !&Apache::response::showallfoils()) {   if (defined($Apache::response::foilnames{$name})) {
       push(@{ $Apache::response::conceptgroup{'names'} }, $name);      &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
     } else {   }
       push(@{ $Apache::response::foilgroup{'names'} }, $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;
     }      }
     $Apache::imageresponse::curname=$name;      return '';
   }  
   return '';  
 }  }
   
 sub end_foil {  sub end_foil {
Line 258  sub end_foil { Line 363  sub end_foil {
 }  }
   
 sub start_text {  sub start_text {
   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 'tex') {       if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
      &Apache::lonxml::startredirection;    &Apache::lonxml::startredirection; 
   } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
     my $descr=&Apache::lonxml::get_all_text('/text',$parser);   my $descr=&Apache::lonxml::get_all_text('/text',$parser);
     $result=&Apache::edit::tag_start($target,$token,'Task Description').   $result=&Apache::edit::tag_start($target,$token,'Task Description').
  &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;  
 }  }
   
 sub end_text {  sub end_text {
   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 'tex') {      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;
    }
       } elsif ($target eq 'edit') {
    $result=&Apache::edit::end_table();
     }      }
   } elsif ($target eq 'edit') {      return $result;
       $result=&Apache::edit::end_table();  
   }  
   return $result;  
 }  }
   
 sub start_image {  sub start_image {
   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 'tex') {       if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
       &Apache::lonxml::startredirection;    &Apache::lonxml::startredirection; 
   } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
     my $bgimg=&Apache::lonxml::get_all_text('/image',$parser);   my $bgimg=&Apache::lonxml::get_all_text('/image',$parser);
     $Apache::edit::bgimgsrc=$bgimg;   $Apache::edit::bgimgsrc=$bgimg;
     $Apache::edit::bgimgsrcdepth=$Apache::lonxml::curdepth;   $Apache::edit::bgimgsrcdepth=$Apache::lonxml::curdepth;
   
     $result=&Apache::edit::tag_start($target,$token,'Clickable Image').   $result=&Apache::edit::tag_start($target,$token,'Clickable Image').
  &Apache::edit::editline($token->[1],$bgimg,'Image Source File',40);      &Apache::edit::editline($token->[1],$bgimg,'Image Source File',40);
     $result.=&Apache::edit::browse(undef,'textnode').' ';   $result.=&Apache::edit::browse(undef,'textnode').' ';
     $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;  
 }  }
   
 sub end_image {  sub end_image {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result;      my $result;
   my $name = $Apache::imageresponse::curname;      my $name = $Apache::imageresponse::curname;
   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'];   if ( $Apache::imageresponse::conceptgroup
     my $temp=1;       && !&Apache::response::showallfoils()) {
     my $x=$ENV{"form.HWVAL_$id:$temp.x"};      $Apache::response::conceptgroup{"$name.image"} = $image;
     my $y=$ENV{"form.HWVAL_$id:$temp.y"};   } else {
     if (defined ($x) && defined ($y)) {      $Apache::response::foilgroup{"$name.image"} = $image;
  &Apache::lonxml::debug("x and y defined as $x,$y");   }
  my $currentImage = &Apache::randomlylabel::get_image('/home/httpd/html'.$image,1);      } elsif ($target eq 'analyze') {
  if (! defined($currentImage)) {   my $image = &Apache::lonxml::endredirection;
     &Apache::lonnet::logthis('Unable to create image object for '.$image);   if ( $Apache::imageresponse::conceptgroup
     return '';       && !&Apache::response::showallfoils()) {
  }      $Apache::response::conceptgroup{"$name.image"} = $image;
  my $red;   } else {
  if (!($red = $currentImage->colorResolve(255,0,0))) {      $Apache::response::foilgroup{"$name.image"} = $image;
     $red = $currentImage->colorClosestHWB(255,0,0);   }
       } elsif ($target eq 'edit') {
    $result=&Apache::edit::end_table();
       } elsif ($target eq 'tex') {
    my $src = &Apache::lonxml::endredirection;
    $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
    my $width_param = '';
    my $height_param = '';
    my $scaling = .3;
    my $image = Image::Magick->new;
    my $current_figure = $image->Read($src);
    $width_param = $image->Get('width') * $scaling;;
    $height_param = $image->Get('height') * $scaling;;
    undef $image;
    my $epssrc = $src;
    $epssrc =~ s/(\.gif|\.jpg)$/\.eps/i;
    if (not -e $epssrc) {
       my $localfile = $epssrc;
       $localfile =~ s/.*(\/res)/$1/;
       my $file;
       my $path;
       if ($localfile =~ m!(.*)/([^/]*)$!) {
    $file = $2;
    $path = $1.'/'; 
       }
       my $signal_eps = 0;
       my @content_directory = &Apache::lonnet::dirlist($path);
       for (my $iy=0;$iy<=$#content_directory;$iy++) {
    my @tempo_array = split(/&/,$content_directory[$iy]);
    $content_directory[$iy] = $tempo_array[0];
    if ($file eq $tempo_array[0]) {
       $signal_eps = 1;
       last;
    }
       }
       if ($signal_eps) {
    my $eps_file = &Apache::lonnet::getfile($localfile);
       } else {
    $localfile = $src;
    $localfile =~ s/.*(\/res)/$1/;
    my $as = &Apache::lonnet::getfile($src);      
       }
  }   }
  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  
  && !&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;  
     $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);  
     my $width_param = '';  
     my $height_param = '';  
     my $scaling = .3;  
     my $image = Image::Magick->new;  
     my $current_figure = $image->Read($src);  
     $width_param = $image->Get('width') * $scaling;;  
     $height_param = $image->Get('height') * $scaling;;  
     undef $image;  
     my $epssrc = $src;  
     $epssrc =~ s/(\.gif|\.jpg)$/\.eps/i;  
     if (not -e $epssrc) {  
  my $localfile = $epssrc;  
  $localfile =~ s/.*(\/res)/$1/;  
  my $file;   my $file;
  my $path;   my $path;
  if ($localfile =~ m!(.*)/([^/]*)$!) {   if ($src =~ m!(.*)/([^/]*)$!) {
     $file = $2;      $file = $2;
     $path = $1.'/';       $path = $1.'/'; 
  }  
  my $signal_eps = 0;  
  my @content_directory = &Apache::lonnet::dirlist($path);  
  for (my $iy=0;$iy<=$#content_directory;$iy++) {  
     my @tempo_array = split(/&/,$content_directory[$iy]);  
     $content_directory[$iy] = $tempo_array[0];  
     if ($file eq $tempo_array[0]) {  
  $signal_eps = 1;  
  last;  
     }  
  }   }
  if ($signal_eps) {   my $newsrc = $src;
     my $eps_file = &Apache::lonnet::getfile($localfile);   $newsrc =~ s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;
  } else {   $file=~s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;
     $localfile = $src;   #do we have any specified size of the picture?
     $localfile =~ s/.*(\/res)/$1/;   my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); 
     my $as = &Apache::lonnet::getfile($src);         my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); 
    my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval);
    if ($TeXwidth ne '') { 
       $width_param = $TeXwidth; 
    } elsif ($TeXheight ne '') { 
       $width_param = $TeXheight/$height_param*$width_param;
    } elsif ($width ne '') {
       $width_param = $width*$scaling;      
  }   }
     }   #where can we find the picture?
     my $file;   if (-e $newsrc) {
     my $path;      if ($path) {
     if ($src =~ m!(.*)/([^/]*)$!) {   $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
  $file = $2;      }
  $path = $1.'/';    } else {
     }      #care about eps dynamical generation
     my $newsrc = $src;      $Apache::response::foilgroup{"$name.image"}='\vskip 0 mm '.&Apache::londefdef::eps_generation($src,$file,$width_param);
     $newsrc =~ s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;  
     $file=~s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;  
     #do we have any specified size of the picture?  
     my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval);   
     my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval);   
     my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval);  
     if ($TeXwidth ne '') {   
  $width_param = $TeXwidth;   
     } elsif ($TeXheight ne '') {   
  $width_param = $TeXheight/$height_param*$width_param;  
     } elsif ($width ne '') {  
  $width_param = $width*$scaling;        
     }  
     #where can we find the picture?  
     if (-e $newsrc) {  
  if ($path) {  
   $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';  
  }   }
     } else {      } 
  my $temp_file;      return $result;
  my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";  
  $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;  
 }  }
   
 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' ||
      &Apache::lonxml::startredirection;    $target eq 'analyze') { 
   } elsif ($target eq 'edit') {   &Apache::lonxml::startredirection; 
     my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser);      } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token,'Rectangle').   my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser);
  &Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40).   $result=&Apache::edit::tag_start($target,$token,'Rectangle').
         &Apache::edit::entercoordpair(undef,'textnode').      &Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40).
         &Apache::edit::end_row();      &Apache::edit::entercoord(undef,'textnode',undef,undef,'box').
   } elsif ($target eq "modified") {      &Apache::edit::end_row();
     my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser);      } elsif ($target eq "modified") {
     $result=$token->[4].&Apache::edit::modifiedfield($token);   &Apache::edit::deletecoorddata();
     &Apache::lonxml::debug($result);   $result=$token->[4].&Apache::edit::modifiedfield('/rectangle',$parser);
   }      }
   return $result;      return $result;
 }  }
   
 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;      &Apache::lonxml::debug("Point $x1,$y1,$x2,$y2");
   my $y1=$2;      if ($x1 > $x2) { my $temp=$x1;$x1=$x2;$x2=$temp; }
   my $x2=$3;      if ($y1 > $y2) { my $temp=$y1;$y1=$y2;$y2=$temp; }
   my $y2=$4;      if (($x >= $x1) && ($x <= $x2) && ($y >= $y1) && ($y <= $y2)) {
   &Apache::lonxml::debug("Point $x1,$y1,$x2,$y2");   return 'APPROX_ANS';
   if ($x1 > $x2) { my $temp=$x1;$x1=$x2;$x2=$temp; }      }
   if ($y1 > $y2) { my $temp=$y1;$y1=$y2;$y2=$temp; }      return 'INCORRECT';
   if (($x >= $x1) && ($x <= $x2) && ($y >= $y1) && ($y <= $y2)) {  
     return 'APPROX_ANS';  
   }  
   return 'INCORRECT';  
 }  }
   
 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' ||
     my $name = $Apache::imageresponse::curname;   $target eq 'analyze') {
     my $area = &Apache::lonxml::endredirection;   my $name = $Apache::imageresponse::curname;
     &Apache::lonxml::debug("out is $area for $name");   my $area = &Apache::lonxml::endredirection;
     if ( $Apache::imageresponse::conceptgroup   &Apache::lonxml::debug("out is $area for $name");
  && !&Apache::response::showallfoils()) {   if ( $Apache::imageresponse::conceptgroup
       push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area";       && !&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);
    $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 {      } else {
       push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";   return 'INCORRECT';
     }      }
   } elsif ($target eq 'edit') {  }
       $result=&Apache::edit::end_table();  
   }  sub end_polygon {
   return $result;      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;
 }  }
 1;  1;
 __END__  __END__

Removed from v.1.34  
changed lines
  Added in v.1.52


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>