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

Diff for /loncom/homework/imageresponse.pm between versions 1.74 and 1.84

version 1.74, 2006/03/09 01:11:12 version 1.84, 2007/08/29 10:07:42
Line 37  use Apache::londefdef(); Line 37  use Apache::londefdef();
 use Apache::Constants qw(:common :http);  use Apache::Constants qw(:common :http);
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));      &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
Line 57  sub start_imageresponse { Line 60  sub start_imageresponse {
     } elsif ($target eq 'analyze') {      } elsif ($target eq 'analyze') {
  my $part_id="$Apache::inputtags::part.$id";   my $part_id="$Apache::inputtags::part.$id";
  push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);   push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
    push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} },
         1);
     }      }
     return $result;      return $result;
 }  }
Line 70  sub end_imageresponse { Line 75  sub end_imageresponse {
     my $result;      my $result;
     if ($target eq 'edit') {      if ($target eq 'edit') {
  $result=&Apache::edit::end_table();   $result=&Apache::edit::end_table();
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex'
        && $Apache::lonhomework::type eq 'exam') {
  $result=&Apache::inputtags::exam_score_line($target);   $result=&Apache::inputtags::exam_score_line($target);
     }      }
   
Line 128  sub prep_image { Line 134  sub prep_image {
     my ($image,$mode,$name)=@_;      my ($image,$mode,$name)=@_;
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my $respid=$Apache::inputtags::response['-1'];      my $respid=$Apache::inputtags::response['-1'];
       my ($x,$y)=split(/:/,$Apache::lonhomework::history{"resource.$part.$respid.submission"});
       &draw_image($mode,$image,$x,$y,$Apache::response::foilgroup{"$name.area"});
   }
   
   sub draw_image {
       my ($mode,$image,$x,$y,$areas) = @_;
   
     my $id=&Apache::loncommon::get_cgi_id();      my $id=&Apache::loncommon::get_cgi_id();
   
     my (%x,$i);      my (%x,$i);
     $x{"cgi.$id.BGIMG"}=&Apache::lonnet::escape($image);      $x{"cgi.$id.BGIMG"}=&escape($image);
     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/ && !&Apache::response::show_answer()) {  
       if (defined($x)    && $x =~/\S/ 
    && defined($y) && $y =~/\S/ 
    && ($mode eq 'submission' || !&Apache::response::show_answer())
    && $mode ne 'answeronly') {
  my $length = 6;   my $length = 6;
  my $width = 1;   my $width = 1;
  my $extrawidth = 2;   my $extrawidth = 2;
Line 160  sub prep_image { Line 178  sub prep_image {
  $x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymax),($xmax),($ymin),   $x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymax),($xmax),($ymin),
       "FF0000",($width)));        "FF0000",($width)));
     }      }
     if ($mode eq 'answer') {      if ($mode eq 'answer' || $mode eq 'answeronly') {
  my $width = 1;   my $width = 1;
  my $extrawidth = 2;   my $extrawidth = 2;
  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:';   $x{"cgi.$id.OBJTYPE"}.='RECTANGLE:';
  $i=$x{"cgi.$id.OBJCOUNT"}++;   $i=$x{"cgi.$id.OBJCOUNT"}++;
Line 196  sub displayfoils { Line 213  sub displayfoils {
     my $result ='';      my $result ='';
     my $name;      my $name;
     my $temp=1;      my $temp=1;
       my @images;
     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");
Line 204  sub displayfoils { Line 222  sub displayfoils {
  &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=&clean_up_image($image);      $image=&clean_up_image($image);
  }    }
    push(@images,$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') {
Line 226  sub displayfoils { Line 245  sub displayfoils {
  }   }
  $temp++;   $temp++;
     }      }
       if ($target eq 'web') {
    &Apache::response::setup_prior_tries_hash(\&format_prior_response,
     [\@images]);
       }
       return $result;
   }
   
   sub format_prior_response {
       my ($mode,$answer,$other_data) = @_;
       my ($x,$y)=split(/:/,$answer);
       my $images = $other_data->[0];
   
       my $token = &draw_image('submission',$images->[0],$x,$y);
   
       return "<img class=\"LC_prior_image\" src=\"/adm/randomlabel.png?token=$token\" />";
       
   }
   
   sub display_answers {
       my ($target,$whichopt)=@_;
   
       my $result;
       foreach my $name (@$whichopt) {
    my $image=$Apache::response::foilgroup{"$name.image"};
    &Apache::lonxml::debug("image is $image");
    if ( $target eq 'web' && $image !~ /^http:/ ) {
       $image = &clean_up_image($image);
    } 
    my $token=&prep_image($image,'answeronly',$name);
   
    $result.=&Apache::response::answer_header('imageresponse');
    $result.=&Apache::response::answer_part('imageresponse',"<img src=\"/adm/randomlabel.png?token=$token\" /><br />\n");
    $result.=&Apache::response::answer_footer('imageresponse');
       }
     return $result;      return $result;
 }  }
   
Line 308  sub end_foilgroup { Line 361  sub end_foilgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     my @whichopt;      my @whichopt;
   
     if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
  $target eq 'analyze') {   $target eq 'analyze' || $target eq 'answer') {
   
  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);
       $Apache::lonxml::post_evaluate=0;
  } 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']);
    } elsif ($target eq 'answer'
    && $env{'form.answer_output_mode'} ne 'tex') {
       $result=&display_answers($target,\@whichopt);
  }   }
   
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::end_table();   $result=&Apache::edit::end_table();
     }      }
Line 366  sub start_foil { Line 428  sub start_foil {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
  $target eq 'analyze') {   $target eq 'analyze' || $target eq 'answer') {
  my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);   my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
  if ($name eq "") {   if ($name eq "") {
     &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");      &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
Line 409  sub end_foil { Line 471  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' || $target eq 'analyze') {       if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze'
    || $target eq 'answer') { 
  &Apache::lonxml::startredirection;    &Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  my $descr=&Apache::lonxml::get_all_text('/text',$parser,$style);   my $descr=&Apache::lonxml::get_all_text('/text',$parser,$style);
Line 425  sub start_text { Line 488  sub start_text {
 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' || $target eq 'analyze') {      if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze'
    || $target eq 'answer') {
  my $name = $Apache::imageresponse::curname;   my $name = $Apache::imageresponse::curname;
  if ( $Apache::imageresponse::conceptgroup   if ( $Apache::imageresponse::conceptgroup
      #&& !&Apache::response::showallfoils()       #&& !&Apache::response::showallfoils()
Line 443  sub end_text { Line 507  sub end_text {
 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' || $target eq 'analyze') {       my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures'));
       if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze'
    || $target eq 'answer') { 
  &Apache::lonxml::startredirection;    &Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  my $bgimg=&Apache::lonxml::get_all_text('/image',$parser,$style);   my $bgimg=&Apache::lonxml::get_all_text('/image',$parser,$style);
Line 452  sub start_image { Line 518  sub start_image {
   
  $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',undef,$only).' ';
  $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") {
Line 465  sub end_image { Line 531  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' || $target eq 'answer') {
  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
Line 520  sub start_rectangle { Line 586  sub start_rectangle {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
  $target eq 'analyze') {    $target eq 'analyze' || $target eq 'answer') { 
  &Apache::lonxml::startredirection;    &Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser,$style);   my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser,$style);
Line 552  sub end_rectangle { Line 618  sub end_rectangle {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
  $target eq 'analyze') {   $target eq 'analyze' || $target eq 'answer') {
  my $name = $Apache::imageresponse::curname;   my $name = $Apache::imageresponse::curname;
  my $area = &Apache::lonxml::endredirection;   my $area = &Apache::lonxml::endredirection;
  $area=~s/\s//g;   $area=~s/\s//g;
Line 574  sub start_polygon { Line 640  sub start_polygon {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
  $target eq 'analyze') {    $target eq 'analyze' || $target eq 'answer') { 
  &Apache::lonxml::startredirection;    &Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  my $coords=&Apache::lonxml::get_all_text('/polygon',$parser,$style);   my $coords=&Apache::lonxml::get_all_text('/polygon',$parser,$style);
Line 633  sub end_polygon { Line 699  sub end_polygon {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
  $target eq 'analyze') {   $target eq 'analyze' || $target eq 'answer') {
  my $name = $Apache::imageresponse::curname;   my $name = $Apache::imageresponse::curname;
  my $area = &Apache::lonxml::endredirection;   my $area = &Apache::lonxml::endredirection;
  $area=~s/\s*//g;   $area=~s/\s*//g;
Removed from v.1.74  
changed lines
  Added in v.1.84

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