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

Diff for /loncom/homework/imageresponse.pm between versions 1.77 and 1.103

version 1.77, 2006/05/18 22:02:03 version 1.103, 2011/11/14 03:08:01
Line 1 Line 1
   #
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # image click response style  # image click response style
 #  #
Line 29 Line 29
 #FIXME LATER assumes multiple possible submissions but only one is possible   #FIXME LATER assumes multiple possible submissions but only one is possible 
 #currently  #currently
   
   
   =head1 NAME
   
   Apache::imageresponse
   
   =head1 SYNOPSIS
   
   Coordinates the response to clicking an image.
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org.
   
   =head1 SUBROUTINES
   
   =over
   
   =item start_imageresponse()
   
   =item end_imageresponse()
   
   =item start_foilgroup()
   
   =item getfoilcounts()
   
   =item whichfoils()
   
   =item prep_image()
   
   =item draw_image()
   
   =item displayfoils()
   
   =item format_prior_response()
   
   =item display_answers()
   
   =item clean_up_image()
   
   =item gradefoils()
   
   =item stringify_submission()
   
   =item get_submission()
   
   =item end_foilgroup()
   
   =item start_conceptgroup()
   
   =item end_conceptgroup()
   
   =item insert_foil()
   
   =item start_foil()
   
   =item end_foil()
   
   =item start_text()
   
   =item end_text()
   
   =item start_image()
   
   =item end_image()
   
   =item start_rectangle()
   
   =item grade_rectangle()
   
   =item end_rectangle()
   
   =item start_polygon()
   
   =item grade_polygon()
   
   =item end_polygon()
   
   =back
   
   =cut
   
   
 package Apache::imageresponse;  package Apache::imageresponse;
 use strict;  use strict;
 use Image::Magick();  use Image::Magick();
Line 37  use Apache::londefdef(); Line 118  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 56  sub start_imageresponse { Line 140  sub start_imageresponse {
  $result=&Apache::response::meta_package_write('imageresponse');   $result=&Apache::response::meta_package_write('imageresponse');
     } elsif ($target eq 'analyze') {      } elsif ($target eq 'analyze') {
  my $part_id="$Apache::inputtags::part.$id";   my $part_id="$Apache::inputtags::part.$id";
           $Apache::lonhomework::analyze{"$part_id.type"} = 'imageresponse';
  push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);   push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
    push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} },
         1);
       } elsif ( $target eq 'edit' ) {
    $result .= &Apache::edit::tag_start($target,$token).
       &Apache::edit::text_arg('Max Number Of Shown Foils:',
       'max',$token,'4').
       &Apache::edit::end_row().
       &Apache::edit::start_spanning_row();
       } elsif ( $target eq 'modified' ) {
    my $constructtag=
       &Apache::edit::get_new_args($token,$parstack,$safeeval,'max');
    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }      }
     return $result;      return $result;
 }  }
Line 64  sub start_imageresponse { Line 161  sub start_imageresponse {
 sub end_imageresponse {  sub end_imageresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
       my $part_id     = $Apache::inputtags::part;
       my $response_id = $Apache::inputtags::response[-1]; 
   
     pop(@Apache::lonxml::namespace);      pop(@Apache::lonxml::namespace);
     &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));      &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
   
Line 79  sub end_imageresponse { Line 179  sub end_imageresponse {
           
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||       if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
  &Apache::lonxml::increment_counter(&Apache::response::repetition());          my $repetition = &Apache::response::repetition();
    &Apache::lonxml::increment_counter($repetition, 
      "$part_id.$response_id");
    if ($target eq 'analyze') {
       &Apache::lonhomework::set_bubble_lines();
    }
   
     }      }
     &Apache::response::end_response();      &Apache::response::end_response();
   
     return $result;      return $result;
 }  }
   
 %Apache::response::foilgroup=();  %Apache::response::foilgroup=();
 sub start_foilgroup {  sub start_foilgroup {
       my ($target) = @_;
     %Apache::response::foilgroup=();      %Apache::response::foilgroup=();
     $Apache::imageresponse::conceptgroup=0;      $Apache::imageresponse::conceptgroup=0;
     &Apache::response::pushrandomnumber();      &Apache::response::pushrandomnumber(undef,$target);
     return '';      return '';
 }  }
   
Line 100  sub getfoilcounts { Line 206  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);
 }  }
   
 sub whichfoils {  sub whichfoils {
     my ($max)=@_;      my ($max)=@_;
     if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }      return if (!defined(@{ $Apache::response::foilgroup{'names'} }));
     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 prep_image {  sub prep_image {
     my ($image,$mode,$name)=@_;      my ($image,$mode,$name)=@_;
     my $part=$Apache::inputtags::part;  
     my $respid=$Apache::inputtags::response['-1'];      my ($x,$y)= &get_submission($name);
       &Apache::lonxml::debug("for $name drawing click at $x and $y");
       &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/       if (defined($x)    && $x =~/\S/ 
  && defined($y) && $y =~/\S/    && defined($y) && $y =~/\S/ 
  && !&Apache::response::show_answer()   && ($mode eq 'submission' || !&Apache::response::show_answer())
  && $mode ne 'answeronly') {   && $mode ne 'answeronly') {
  my $length = 6;   my $length = 6;
  my $width = 1;   my $width = 1;
Line 167  sub prep_image { Line 282  sub prep_image {
     if ($mode eq 'answer' || $mode eq 'answeronly') {      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 191  sub prep_image { Line 305  sub prep_image {
     }      }
  }   }
     }      }
     &Apache::lonnet::appenv(%x);      &Apache::lonnet::appenv(\%x);
     return $id;      return $id;
 }  }
   
 sub displayfoils {  sub displayfoils {
     my ($target,@whichopt) = @_;      my ($target,@whichopt) = @_;
     my $result ='';      my $result ='';
     my $name;  
     my $temp=1;      my $temp=1;
     foreach $name (@whichopt) {      my @images;
       foreach my $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 ( $target eq 'web' && $image !~ /^http:/ ) {   if ( ($target eq 'web' || $target eq 'answer') 
        && $image !~ /^https?\:/ ) {
     $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 221  sub displayfoils { Line 337  sub displayfoils {
     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 {
  my $id=$Apache::inputtags::response['-1'];   my $respid=$Apache::inputtags::response['-1'];
  my $token=&prep_image($image);   my $token=&prep_image($image,'submission',$name);
  my $temp=1;   my $input_id = "HWVAL_$respid:$temp";
  $result.="<input type=\"image\" name=\"HWVAL_$id:$temp\" ".   my $id = $env{'form.request.prefix'}.$input_id;
     "src=\"/adm/randomlabel.png?token=$token\" /><br />\n";   $result.='<img onclick="image_response_click(\''.$id.'\',event);"
                          src="/adm/randomlabel.png?token='.$token.'" 
                                  id="'.$id.'_imageresponse"
                                   />'.
          '<br />'.
          '<input type="hidden" name="'.$input_id.'_token" value="'.$token.'" />'.
          '<input type="hidden" name="'.$input_id.'" value="'.
          join(':',&get_submission($name)).'" />';
     }      }
  }   }
  $temp++;   $temp++;
     }      }
       if ($target eq 'web') {
           &get_prior_options(\@images,\@whichopt);
       }
       return $result;
   }
   
   sub get_prior_options {
       my ($currimages,$curropt) = @_;
       return unless((ref($curropt) eq 'ARRAY') && 
                     (ref($currimages) eq 'ARRAY'));
       my $part = $Apache::inputtags::part;
       my $respid   = $Apache::inputtags::response[-1];
       foreach my $i (1..$Apache::lonhomework::history{'version'}) {
           my $partprefix = "$i:resource.$part";
           my $sub_key = "$partprefix.$respid.submission";
           next if (!exists($Apache::lonhomework::history{$sub_key}));
           my $type_key = "$partprefix.type";
           my @whichopt = ();
           my @images = ();
           if ($Apache::lonhomework::history{$type_key} eq 'randomizetry') {
               my $order_key = "$partprefix.$respid.foilorder";
               @whichopt = &Apache::lonnet::str2array($Apache::lonhomework::history{$order_key});
               if (@whichopt > 0) {
                   foreach my $name (@whichopt) {
                       my $image=$Apache::response::foilgroup{"$name.image"};
                       if ($image !~ /^https?\:/ ) {
                           $image=&clean_up_image($image);
                       }
                       push(@images,$image);
                   }
               }
           } else {
               @whichopt = @{$curropt};
               @images = @{$currimages};
           }
           my $submission = $Apache::lonhomework::history{$sub_key};
           my $output =  &format_prior_response('grade',$submission,
                                                [\@images,\@whichopt]);
           if (defined($output)) {
               $Apache::inputtags::submission_display{$sub_key} = $output;
           }
       }
   }
   
   sub format_prior_response {
       my ($mode,$answer,$other_data) = @_;
       
       my $result;
   
       # make a copy of the data in the refs
       my @images = @{ $other_data->[0] };
       my @foils = @{ $other_data->[1] };
       foreach my $name (@foils) {
    my $image = pop(@images);
    my ($x,$y) = &get_submission($name,$answer);
    my $token = &draw_image('submission',$image,$x,$y);
    $result .=
       '<img class="LC_prior_image"
                     src="/adm/randomlabel.png?token='.$token.'" /><br />';
       }
     return $result;      return $result;
 }  }
   
 sub display_answers {  sub display_answers {
     my ($target,$whichopt)=@_;      my ($target,$whichopt)=@_;
   
     my $result;      my $result=&Apache::response::answer_header('imageresponse');
     foreach my $name (@$whichopt) {      foreach my $name (@$whichopt) {
  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' || $target eq 'answer')
        && $image !~ /^https?\:/ ) {
     $image = &clean_up_image($image);      $image = &clean_up_image($image);
  }    } 
  my $token=&prep_image($image,'answeronly',$name);   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_part('imageresponse',"<img src=\"/adm/randomlabel.png?token=$token\" /><br />\n");
  $result.=&Apache::response::answer_footer('imageresponse');  
     }      }
       $result.=&Apache::response::answer_footer('imageresponse');
     return $result;      return $result;
 }  }
   
Line 256  sub clean_up_image { Line 439  sub clean_up_image {
     my ($image)=@_;      my ($image)=@_;
     if ($image =~ /\s*<img\s*/) {      if ($image =~ /\s*<img\s*/) {
  ($image) = ($image =~ /src\s*=\s*[\"\']([^\"\']+)[\"\']/i);   ($image) = ($image =~ /src\s*=\s*[\"\']([^\"\']+)[\"\']/i);
  if ($image !~ /^http:/) {   if ($image !~ /^https?\:/) {
     $image=&Apache::lonnet::hreflocation('',$image);      $image=&Apache::lonnet::hreflocation('',$image);
  }   }
  if (!$image) {   if (!$image) {
Line 283  sub gradefoils { Line 466  sub gradefoils {
  return;   return;
     }      }
           
     my $x;      my @results;
     my $y;  
     my $result;  
     my $temp=1;      my $temp=1;
       my %response;
     foreach my $name (@whichopt) {      foreach my $name (@whichopt) {
  $x=$env{"form.HWVAL_$id:$temp.x"};   my ($x,$y) = split(':',$env{"form.HWVAL_$id:$temp"});
  $y=$env{"form.HWVAL_$id:$temp.y"};   $response{$name} = $env{"form.HWVAL_$id:$temp"};
  &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 304  sub gradefoils { Line 486  sub gradefoils {
  } elsif ($1 eq 'polygon') {   } elsif ($1 eq 'polygon') {
     $grade=&grade_polygon($area,$x,$y);      $grade=&grade_polygon($area,$x,$y);
  } else {   } else {
     &Apache::lonxml::error("Unknown area style $area");      &Apache::lonxml::error(&mt('Unknown area style [_1]',$area));
  }   }
  &Apache::lonxml::debug("Area said $grade");   &Apache::lonxml::debug("Area said $grade");
  if ($grade eq 'APPROX_ANS') { last; }   if ($grade eq 'APPROX_ANS') { last; }
     }      }
     &Apache::lonxml::debug("Foil was $grade");      &Apache::lonxml::debug("Foil was $grade");
     if ($grade eq 'INCORRECT') { $result= 'INCORRECT'; }      push(@results, $grade)
     if (($grade eq 'APPROX_ANS') && ($result ne 'APPROX_ANS')) { $result=$grade; }   } else {
     &Apache::lonxml::debug("Question is $result");      push(@results, 'MISSING_ANSWER')
     $temp++;  
  }   }
    $temp++;
       }
       if ($Apache::lonhomework::type eq 'randomizetry') {
           $Apache::lonhomework::results{"resource.$partid.$id.foilorder"} = &Apache::lonnet::array2str(@whichopt);
     }      }
     my $responsestr="$x:$y";      my ($result) = &Apache::inputtags::finalizeawards(\@results,[]);
       &Apache::lonxml::debug("Question is $result");
   
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my %previous=&Apache::response::check_for_previous($responsestr,$part,$id);      my %previous=
     if ($result    &Apache::response::check_for_previous(&stringify_submission(\%response),
  && $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; }        $part,$id);
       if ($result) { 
    if ($Apache::lonhomework::type eq 'survey') { 
               $result='SUBMITTED';
           } elsif ($Apache::lonhomework::type eq 'surveycred') { 
               $result='SUBMITTED_CREDIT'; 
           } elsif ($Apache::lonhomework::type eq 'anonsurvey') { 
               $result='ANONYMOUS'; 
           } elsif ($Apache::lonhomework::type eq 'anonsurveycred') { 
               $result='ANONYMOUS_CREDIT'; 
           }
       }
   
     &Apache::response::handle_previous(\%previous,$result);      &Apache::response::handle_previous(\%previous,$result);
     $Apache::lonhomework::results{"resource.$part.$id.submission"}=$responsestr;      $Apache::lonhomework::results{"resource.$part.$id.submission"}=
    &stringify_submission(\%response);
     $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$result;      $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$result;
     return;      return;
 }  }
   
   sub stringify_submission {
       my ($response) = @_;
       return &Apache::lonnet::hash2str(%{ $response });
   }
   
   sub get_submission {
       my ($name,$string) = @_;
   
       if (!defined($string)) {
    my $part=$Apache::inputtags::part;
    my $respid=$Apache::inputtags::response['-1'];
       $string = 
       $Apache::lonhomework::history{"resource.$part.$respid.submission"};
       }
   
       if ($string !~ /=/) {
    return split(':',$string);
       } else {
    my %response = &Apache::lonnet::str2hash($string);
    return split(':',$response{$name});
       }
   }
   
 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='';
Line 343  sub end_foilgroup { Line 566  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);
               if ($Apache::lonhomework::type eq 'randomizetry') {
                   if ($target eq 'web') {
                       &get_prior_options($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') {
Line 400  sub start_foil { Line 629  sub start_foil {
  $target eq 'analyze' || $target eq 'answer') {   $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(&mt('Foils without names exist. This can cause problems to malfunction.'));
     $name=$Apache::lonxml::curdepth;      $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 [_1] appears more than once. Foil names need to be unique."
                                         ,'<b><tt>'.$name.'</tt></b>'));
  }   }
  $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 {
Line 461  sub end_text { Line 691  sub end_text {
  || $target eq 'answer') {   || $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()
      ) {       ) {
     $Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection;      $Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection;
  } else {   } else {
Line 476  sub end_text { Line 706  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='';
       my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures'));
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze'      if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze'
  || $target eq 'answer') {    || $target eq 'answer') { 
  &Apache::lonxml::startredirection;    &Apache::lonxml::startredirection; 
Line 486  sub start_image { Line 717  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 503  sub end_image { Line 734  sub end_image {
  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 {
Line 512  sub end_image { Line 743  sub end_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 {
Line 539  sub end_image { Line 770  sub end_image {
     my ($commentline, $restofstuff) = split(/\n/, $src);      my ($commentline, $restofstuff) = split(/\n/, $src);
     $graphinclude = $src;      $graphinclude = $src;
     $graphinclude =~ s/^$commentline//;      $graphinclude =~ s/^$commentline//;
  } else {   } elsif (!($src =~ /\\/)) {
     my ($path,$file) = &Apache::londefdef::get_eps_image($src);      my ($path,$file) = &Apache::londefdef::get_eps_image($src);
     my ($height_param,$width_param)=      my ($height_param,$width_param)=
  &Apache::londefdef::image_size($src,0.3,$parstack,$safeeval);   &Apache::londefdef::image_size($src,0.3,$parstack,$safeeval);
     $graphinclude = '\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'}';      $graphinclude = '\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'}';
    } else {
       $graphinclude = $src;   # Already fully formed.
  }   }
  $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent '.$graphinclude;   $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent '.$graphinclude;
     }       } 
Line 592  sub end_rectangle { Line 825  sub end_rectangle {
  $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"} },"rectangle:$area";      push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area";
  } else {   } else {
Line 673  sub end_polygon { Line 906  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 {
Removed from v.1.77  
changed lines
  Added in v.1.103

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