[BACK]Return to imageresponse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/imageresponse.pm between versions 1.35 and 1.36

version 1.35, 2003/09/22 20:49:01 version 1.36, 2003/09/24 19:20:58
Line 37  use Image::Magick; Line 37  use Image::Magick;
 use GD;  use GD;
   
 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',('foilgroup','foil','text','image','rectangle','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);
   if ($target eq 'meta') {      if ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('imageresponse');   $result=&Apache::response::meta_package_write('imageresponse');
   }      }
   return $result;      return $result;
 }  }
   
 sub end_imageresponse {  sub end_imageresponse {
Line 65  sub end_imageresponse { Line 65  sub end_imageresponse {
   
 %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");   &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");
     push (@whichopt,$aopt);   push (@whichopt,$aopt);
   }      }
   return @whichopt;      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::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";   $result.="<img src=\"$image\"/> <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";   $result.="<input type=\"image\" name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\" src=\"$image\"/> <br />\n";
       }      }
     }   }
     $temp++;   $temp++;
   }      }
   return $result;      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 {   } else {
   &Apache::lonxml::error("Unknown area style $area");      &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);   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");
     @whichopt = &whichfoils($max);   @whichopt = &whichfoils($max);
     if ($target eq 'web' || $target eq 'tex') {   if ($target eq 'web' || $target eq 'tex') {
  $result=&displayfoils($target,@whichopt);      $result=&displayfoils($target,@whichopt);
     } elsif ($target eq 'grade') {   } elsif ($target eq 'grade') {
  if ( defined $ENV{'form.submitted'}) { &gradefoils(@whichopt); }      if ( defined $ENV{'form.submitted'}) { &gradefoils(@whichopt); }
     }    } 
   } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
       $result=&Apache::edit::end_table();   $result=&Apache::edit::end_table();
   }      }
   return $result;      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'} })) {   if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
       my @names = @{ $Apache::response::conceptgroup{'names'} };      my @names = @{ $Apache::response::conceptgroup{'names'} };
       my $pick=int(&Math::Random::random_uniform() * ($#names+1));      my $pick=int(&Math::Random::random_uniform() * ($#names+1));
       my $name=$names[$pick];      my $name=$names[$pick];
       if (defined(@{ $Apache::response::conceptgroup{"$name.area"} })) {      if (defined(@{ $Apache::response::conceptgroup{"$name.area"} })) {
  push @{ $Apache::response::foilgroup{'names'} }, $name;   push @{ $Apache::response::foilgroup{'names'} }, $name;
  $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"};   $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"};
  $Apache::response::foilgroup{"$name.image"} = $Apache::response::conceptgroup{"$name.image"};   $Apache::response::foilgroup{"$name.image"} = $Apache::response::conceptgroup{"$name.image"};
  push(@{ $Apache::response::foilgroup{"$name.area"} }, @{ $Apache::response::conceptgroup{"$name.area"} });   push(@{ $Apache::response::foilgroup{"$name.area"} }, @{ $Apache::response::conceptgroup{"$name.area"} });
  my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);   my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
  $Apache::response::foilgroup{"$name.concept"} = $concept;   $Apache::response::foilgroup{"$name.concept"} = $concept;
  &Apache::lonxml::debug("Selecting $name in $concept");   &Apache::lonxml::debug("Selecting $name in $concept");
       }      }
     }   }
   } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
       $result=&Apache::edit::end_table();   $result=&Apache::edit::end_table();
   }      }
   return $result;      return $result;
 }  }
   
 sub insert_foil {  sub insert_foil {
Line 233  sub insert_foil { Line 233  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);   my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
     if ($name eq '') { $name=$Apache::lonxml::curdepth; }   if ($name eq '') { $name=$Apache::lonxml::curdepth; }
     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);
     }   }
     $Apache::imageresponse::curname=$name;   $Apache::imageresponse::curname=$name;
   }      }
   return '';      return '';
 }  }
   
 sub end_foil {  sub end_foil {
Line 258  sub end_foil { Line 258  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') { 
      &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);   my $descr=&Apache::lonxml::get_all_text('/text',$parser);
     $result=$token->[4].&Apache::edit::modifiedfield($token);   $result=$token->[4].&Apache::edit::modifiedfield($token);
     &Apache::lonxml::debug($result);   &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') {
     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') {      } elsif ($target eq 'edit') {
       $result=&Apache::edit::end_table();   $result=&Apache::edit::end_table();
   }      }
   return $result;      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') { 
       &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);   my $bgimg=&Apache::lonxml::get_all_text('/image',$parser);
     $result=$token->[4].&Apache::edit::modifiedfield($token);   $result=$token->[4].&Apache::edit::modifiedfield($token);
     &Apache::lonxml::debug($result);   &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'];   my $id=$Apache::inputtags::response['-1'];
     my $temp=1;   my $temp=1;
     my $x=$ENV{"form.HWVAL_$id:$temp.x"};   my $x=$ENV{"form.HWVAL_$id:$temp.x"};
     my $y=$ENV{"form.HWVAL_$id:$temp.y"};   my $y=$ENV{"form.HWVAL_$id:$temp.y"};
     if (defined ($x) && defined ($y)) {   if (defined ($x) && defined ($y)) {
  &Apache::lonxml::debug("x and y defined as $x,$y");      &Apache::lonxml::debug("x and y defined as $x,$y");
  my $currentImage = &Apache::randomlylabel::get_image('/home/httpd/html'.$image,1);      my $currentImage = &Apache::randomlylabel::get_image('/home/httpd/html'.$image,1);
  if (! defined($currentImage)) {      if (! defined($currentImage)) {
     &Apache::lonnet::logthis('Unable to create image object for '.$image);   &Apache::lonnet::logthis('Unable to create image object for '.$image);
     return '';   return '';
  }      }
  my $red;      my $red;
  if (!($red = $currentImage->colorResolve(255,0,0))) {      if (!($red = $currentImage->colorResolve(255,0,0))) {
     $red = $currentImage->colorClosestHWB(255,0,0);   $red = $currentImage->colorClosestHWB(255,0,0);
  }      }
  my $length = 6;      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);
  $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 =~ /^.*\/(.*)\..*$/);      my ($nameWOext) = ($image =~ /^.*\/(.*)\..*$/);
  &Apache::lonxml::debug("graph name $nameWOext");      &Apache::lonxml::debug("graph name $nameWOext");
  my $webImageName = "/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_".      my $webImageName = "/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_".
     $nameWOext.'.png'; #needs to be more random or specific   $nameWOext.'.png'; #needs to be more random or specific
  my $newImageName = '/home/httpd'.$webImageName;      my $newImageName = '/home/httpd'.$webImageName;
       
  my $imgfh = Apache::File->new('>'.$newImageName);       my $imgfh = Apache::File->new('>'.$newImageName); 
  print $imgfh $currentImage->png;      print $imgfh $currentImage->png;
  $image = $webImageName;      $image = $webImageName;
     }   }
     &Apache::lonxml::debug("out image is $image");   &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;
     }   }
   } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
       $result=&Apache::edit::end_table();   $result=&Apache::edit::end_table();
   } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
     my $src = &Apache::lonxml::endredirection;   my $src = &Apache::lonxml::endredirection;
     $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);   $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
     my $width_param = '';   my $width_param = '';
     my $height_param = '';   my $height_param = '';
     my $scaling = .3;   my $scaling = .3;
     my $image = Image::Magick->new;   my $image = Image::Magick->new;
     my $current_figure = $image->Read($src);   my $current_figure = $image->Read($src);
     $width_param = $image->Get('width') * $scaling;;   $width_param = $image->Get('width') * $scaling;;
     $height_param = $image->Get('height') * $scaling;;   $height_param = $image->Get('height') * $scaling;;
     undef $image;   undef $image;
     my $epssrc = $src;   my $epssrc = $src;
     $epssrc =~ s/(\.gif|\.jpg)$/\.eps/i;   $epssrc =~ s/(\.gif|\.jpg)$/\.eps/i;
     if (not -e $epssrc) {   if (not -e $epssrc) {
  my $localfile = $epssrc;      my $localfile = $epssrc;
  $localfile =~ s/.*(\/res)/$1/;      $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 $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;
    $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 {   } else {
     $localfile = $src;      my $temp_file;
     $localfile =~ s/.*(\/res)/$1/;      my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
     my $as = &Apache::lonnet::getfile($src);            $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.'} ';
  }   }
     }      } 
     my $file;      return $result;
     my $path;  
     if ($src =~ m!(.*)/([^/]*)$!) {  
  $file = $2;  
  $path = $1.'/';   
     }  
     my $newsrc = $src;  
     $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;  
  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;    &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::entercoordpair(undef,'textnode').
         &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);   my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser);
     $result=$token->[4].&Apache::edit::modifiedfield($token);   $result=$token->[4].&Apache::edit::modifiedfield($token);
     &Apache::lonxml::debug($result);   &Apache::lonxml::debug($result);
   }      }
   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]+)\)/;      $spec=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/;
   my $x1=$1;      my $x1=$1;
   my $y1=$2;      my $y1=$2;
   my $x2=$3;      my $x2=$3;
   my $y2=$4;      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; }
   if (($x >= $x1) && ($x <= $x2) && ($y >= $y1) && ($y <= $y2)) {      if (($x >= $x1) && ($x <= $x2) && ($y >= $y1) && ($y <= $y2)) {
     return 'APPROX_ANS';   return 'APPROX_ANS';
   }      }
   return 'INCORRECT';      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;   my $name = $Apache::imageresponse::curname;
     my $area = &Apache::lonxml::endredirection;   my $area = &Apache::lonxml::endredirection;
     &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;      return $result;
 }  }
 1;  1;
 __END__  __END__
Removed from v.1.35  
changed lines
  Added in v.1.36

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