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

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

version 1.45, 2004/01/15 19:51:30 version 1.52, 2004/03/15 22:09:52
Line 31 Line 31
   
 package Apache::imageresponse;  package Apache::imageresponse;
 use strict;  use strict;
 use Image::Magick;  use Image::Magick();
 use Apache::randomlylabel;  use Apache::randomlylabel();
   use Apache::londefdef();
 use Apache::Constants qw(:common :http);  use Apache::Constants qw(:common :http);
   use Apache::lonlocal;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));      &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
Line 48  sub start_imageresponse { Line 50  sub start_imageresponse {
        'polygon','conceptgroup'));         '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 64  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 111  sub prep_image { Line 115  sub prep_image {
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my $respid=$Apache::inputtags::response['-1'];      my $respid=$Apache::inputtags::response['-1'];
     my $id=&Apache::loncommon::get_cgi_id();      my $id=&Apache::loncommon::get_cgi_id();
     my %x;      my (%x,$i);
     $x{"cgi.$id.BGIMG"}=$image;      $x{"cgi.$id.BGIMG"}=&Apache::lonnet::escape($image);
     my ($x,$y)=split(/:/,$Apache::lonhomework::history{"resource.$part.$respid.submission"});      my ($x,$y)=split(/:/,$Apache::lonhomework::history{"resource.$part.$respid.submission"});
     #draws 2 xs on the image at the clicked location      #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      #one in white and then one in red on top of the one in white
     if (defined($x) && defined($y)) {      if (defined($x) && $x=~/\S/ && defined($y) && $y =~/\S/) {
  $x{"cgi.$id.LINECOUNT"}=4;  
  my $length = 6;   my $length = 6;
  my $width = 1;   my $width = 1;
  my $extrawidth = 2;   my $extrawidth = 2;
  $x{"cgi.$id.LINE0"}=   my $xmin=($x-$length);
     join(':',(($x-$length),($y-$length),($x+$length),($y+$length),   my $xmax=($x+$length); 
       "FFFFFF",($width+$extrawidth)));   my $ymin=($y-$length);
  $x{"cgi.$id.LINE1"}=   my $ymax=($y+$length);
     join(':',(($x-$length),($y+$length),($x+$length),($y-$length),  
       "FFFFFF",($width+$extrawidth)));   $x{"cgi.$id.OBJTYPE"}.='LINE:';
  $x{"cgi.$id.LINE2"}=   $i=$x{"cgi.$id.OBJCOUNT"}++;
     join(':',(($x-$length),($y-$length),($x+$length),($y+$length),   $x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymin),($xmax),($ymax),
       "FF0000",($width)));        "FFFFFF",($width+$extrawidth)));
  $x{"cgi.$id.LINE3"}=   $x{"cgi.$id.OBJTYPE"}.='LINE:';
     join(':',(($x-$length),($y+$length),($x+$length),($y-$length),   $i=$x{"cgi.$id.OBJCOUNT"}++;
       "FF0000",($width)));   $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') {      if ($mode eq 'answer') {
  my $width = 1;   my $width = 1;
Line 140  sub prep_image { Line 152  sub prep_image {
  my @areas = @{ $Apache::response::foilgroup{"$name.area"} };   my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
  foreach my $area (@areas) {   foreach my $area (@areas) {
     if ($area=~/^rectangle:/) {      if ($area=~/^rectangle:/) {
    $x{"cgi.$id.OBJTYPE"}.='RECTANGLE:';
    $i=$x{"cgi.$id.OBJCOUNT"}++;
  my ($x1,$y1,$x2,$y2)=   my ($x1,$y1,$x2,$y2)=
     ($area=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/);      ($area=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/);
  my $i=$x{"cgi.$id.BOXCOUNT"}++;   $x{"cgi.$id.OBJ$i"}=join(':',($x1,$y1,$x2,$y2,"FFFFFF",
  $x{"cgi.$id.BOX$i"}=join(':',($x1,$y1,$x2,$y2,"FFFFFF",  
       ($width+$extrawidth)));        ($width+$extrawidth)));
  $i=$x{"cgi.$id.BOXCOUNT"}++;   $x{"cgi.$id.OBJTYPE"}.='RECTANGLE:';
  $x{"cgi.$id.BOX$i"}=join(':',($x1,$y1,$x2,$y2,"00FF00",$width));   $i=$x{"cgi.$id.OBJCOUNT"}++;
    $x{"cgi.$id.OBJ$i"}=join(':',($x1,$y1,$x2,$y2,"00FF00",$width));
     } elsif ($area=~/^polygon:(.*)/) {      } elsif ($area=~/^polygon:(.*)/) {
  my $i=$x{"cgi.$id.POLYCOUNT"}++;   $x{"cgi.$id.OBJTYPE"}.='POLYGON:';
  $x{"cgi.$id.POLYOPT$i"}=join(':',("FFFFFF",($width+$extrawidth)));   $i=$x{"cgi.$id.OBJCOUNT"}++;
  $x{"cgi.$id.POLY$i"}=$1;   $x{"cgi.$id.OBJ$i"}=join(':',("FFFFFF",($width+$extrawidth)));
  $i=$x{"cgi.$id.POLYCOUNT"}++;   $x{"cgi.$id.OBJEXTRA$i"}=$1;
  $x{"cgi.$id.POLYOPT$i"}=join(':',("00FF00",$width));   $x{"cgi.$id.OBJTYPE"}.='POLYGON:';
  $x{"cgi.$id.POLY$i"}=$1;   $i=$x{"cgi.$id.OBJCOUNT"}++;
    $x{"cgi.$id.OBJ$i"}=join(':',("00FF00",$width));
    $x{"cgi.$id.OBJEXTRA$i"}=$1;
     }      }
  }   }
     }      }
Line 173  sub displayfoils { Line 189  sub displayfoils {
  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:/ ) {   if ( $target eq 'web' && $image !~ /^http:/ ) {
     $image=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$image);      $image=&clean_up_image($image);
     if (&Apache::lonnet::repcopy($image) ne OK) {   } 
  $image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';  
     }  
  }  
  &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') {
Line 202  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 306  sub start_foil { Line 338  sub start_foil {
  $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 eq '') { $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);
Line 469  sub end_image { Line 505  sub end_image {
  $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";  
     $newsrc=~s/\/home\/httpd\/html\/res//;  
     $newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//;  
     $newsrc=~s/\/\.\//\//;  
     $newsrc=~s/\/([^\/]+)\.(ps|eps)/\//;  
     $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';  
  }   }
     }       } 
     return $result;      return $result;
Line 601  sub end_polygon { Line 630  sub end_polygon {
  $target eq 'analyze') {   $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()) {
Removed from v.1.45  
changed lines
  Added in v.1.52

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