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

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

version 1.52, 2004/03/15 22:09:52 version 1.73, 2005/12/01 18:46:31
Line 36  use Apache::randomlylabel(); Line 36  use Apache::randomlylabel();
 use Apache::londefdef();  use Apache::londefdef();
 use Apache::Constants qw(:common :http);  use Apache::Constants qw(:common :http);
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonnet;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));      &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
Line 75  sub end_imageresponse { Line 76  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 85  sub getfoilcounts { Line 86  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 97  sub whichfoils { Line 98  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 120  sub prep_image { Line 121  sub prep_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) && $x=~/\S/ && defined($y) && $y =~/\S/) {      if (defined($x) && $x=~/\S/ && defined($y) && $y =~/\S/ && !&Apache::response::show_answer()) {
  my $length = 6;   my $length = 6;
  my $width = 1;   my $width = 1;
  my $extrawidth = 2;   my $extrawidth = 2;
Line 227  sub clean_up_image { Line 228  sub clean_up_image {
  }   }
     } else {      } else {
  $image=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$image);   $image=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$image);
  if (&Apache::lonnet::repcopy($image) ne OK) {   &Apache::lonxml::debug("repcopying: $image");
    if (&Apache::lonnet::repcopy($image) ne 'ok') {
     $image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';      $image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
  }   }
     }      }
Line 242  sub gradefoils { Line 244  sub gradefoils {
     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"} })) {
Line 270  sub gradefoils { Line 272  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 288  sub end_foilgroup { Line 296  sub end_foilgroup {
  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 'analyze') {   } elsif ( $target eq 'analyze') {
     &Apache::response::analyze_store_foilgroup(\@whichopt,      &Apache::response::analyze_store_foilgroup(\@whichopt,
       ['text','image','area']);        ['text','image','area']);
Line 296  sub end_foilgroup { Line 304  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 334  sub insert_foil { Line 343  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)=@_;
       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') {   $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 "") {
       &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
       $name=$Apache::lonxml::curdepth;
    }
  if (defined($Apache::response::foilnames{$name})) {   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::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}++;   $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);
  }   }
  $Apache::imageresponse::curname=$name;   $Apache::imageresponse::curname=$name;
     }      } elsif ($target eq 'edit') {
     return '';   $result  = &Apache::edit::tag_start($target,$token);
    $result .= &Apache::edit::text_arg('Name:','name',$token);
    $result .= &Apache::edit::end_row().
       &Apache::edit::start_spanning_row();
       } elsif ($target eq 'modified') {
    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
        $safeeval,'name');
    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
       } 
       return $result;;
 }  }
   
 sub end_foil {  sub end_foil {
Line 368  sub start_text { Line 391  sub start_text {
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {       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,$style);
  $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();
Line 384  sub end_text { Line 407  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 401  sub start_image { Line 425  sub start_image {
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {       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,$style);
  $Apache::edit::bgimgsrc=$bgimg;   $Apache::edit::bgimgsrc=$bgimg;
  $Apache::edit::bgimgsrcdepth=$Apache::lonxml::curdepth;   $Apache::edit::bgimgsrcdepth=$Apache::lonxml::curdepth;
   
Line 421  sub end_image { Line 445  sub end_image {
     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");
  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 '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 440  sub end_image { Line 466  sub end_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);  
  my $width_param = '';   #  There may be all sorts of whitespace on fore and aft:
  my $height_param = '';  
  my $scaling = .3;   $src =~ s/\s+$//s;
  my $image = Image::Magick->new;   $src =~ s/^\s+//s;
  my $current_figure = $image->Read($src);  
  $width_param = $image->Get('width') * $scaling;;   #
  $height_param = $image->Get('height') * $scaling;;   #  Gnuplot e.g. just generates the latex to put inplace.
  undef $image;   #
  my $epssrc = $src;   my $graphinclude;
  $epssrc =~ s/(\.gif|\.jpg)$/\.eps/i;   if ($src =~ /^%DYNAMICIMAGE/) {
  if (not -e $epssrc) {      # This is needed because the newline is not always passed -> tex.
     my $localfile = $epssrc;      # At present we don't care about the sizing info.
     $localfile =~ s/.*(\/res)/$1/;  
     my $file;      my ($commentline, $restofstuff) = split(/\n/, $src);
     my $path;      $graphinclude = $src;
     if ($localfile =~ m!(.*)/([^/]*)$!) {      $graphinclude =~ s/^$commentline//;
  $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 $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 {   } else {
     #care about eps dynamical generation      my ($path,$file) = &Apache::londefdef::get_eps_image($src);
     $Apache::response::foilgroup{"$name.image"}='\vskip 0 mm '.&Apache::londefdef::eps_generation($src,$file,$width_param);      my ($height_param,$width_param)=
    &Apache::londefdef::image_size($src,0.3,$parstack,$safeeval);
       $graphinclude = '\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'}';
  }   }
    $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent '.$graphinclude;
     }       } 
     return $result;      return $result;
 }  }
Line 519  sub start_rectangle { Line 502  sub start_rectangle {
  $target eq 'analyze') {    $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,$style);
  $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::entercoord(undef,'textnode',undef,undef,'box').      &Apache::edit::entercoord(undef,'textnode',undef,undef,'box').
Line 551  sub end_rectangle { Line 534  sub end_rectangle {
  $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()
        ) {
     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";
Line 571  sub start_polygon { Line 556  sub start_polygon {
  $target eq 'analyze') {    $target eq 'analyze') { 
  &Apache::lonxml::startredirection;    &Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  my $coords=&Apache::lonxml::get_all_text('/polygon',$parser);   my $coords=&Apache::lonxml::get_all_text('/polygon',$parser,$style);
  $result=&Apache::edit::tag_start($target,$token,'Polygon').   $result=&Apache::edit::tag_start($target,$token,'Polygon').
     &Apache::edit::editline($token->[1],$coords,'Coordinate list',40).      &Apache::edit::editline($token->[1],$coords,'Coordinate list',40).
     &Apache::edit::entercoord(undef,'textnode',undef,undef,'polygon').      &Apache::edit::entercoord(undef,'textnode',undef,undef,'polygon').
Line 633  sub end_polygon { Line 618  sub end_polygon {
  $area=~s/\s*//g;   $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"} },"polygon:$area";      push @{ $Apache::response::conceptgroup{"$name.area"} },"polygon:$area";
  } else {   } else {
     push @{ $Apache::response::foilgroup{"$name.area"} },"polygon:$area";      push @{ $Apache::response::foilgroup{"$name.area"} },"polygon:$area";
Removed from v.1.52  
changed lines
  Added in v.1.73

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