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

Diff for /loncom/homework/imageresponse.pm between versions 1.37 and 1.89

version 1.37, 2003/10/27 19:27:09 version 1.89, 2007/10/08 09:22:50
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 30
 #currently  #currently
   
 package Apache::imageresponse;  package Apache::imageresponse;
 use Apache::randomlylabel;  
 use strict;  use strict;
 use Image::Magick;  use Image::Magick();
 use GD;  use Apache::randomlylabel();
   use Apache::londefdef();
   use Apache::Constants qw(:common :http);
   use Apache::lonlocal;
   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 42  sub start_imageresponse { Line 49  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',
          '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') {
  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);
       } 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;
 }  }
   
 sub end_imageresponse {  sub end_imageresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     &Apache::response::end_response;  
     pop @Apache::lonxml::namespace;      my $part_id = $Apache::inputtags::part;
   
       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'));
   
     my $result;      my $result;
     if ($target eq 'edit') { $result=&Apache::edit::end_table(); }      if ($target eq 'edit') {
    $result=&Apache::edit::end_table();
       } elsif ($target eq 'tex'
        && $Apache::lonhomework::type eq 'exam') {
    $result=&Apache::inputtags::exam_score_line($target);
       }
   
       undef(%Apache::response::foilnames);
       
       if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
    $target eq 'tex' || $target eq 'analyze') {
    &Apache::lonxml::increment_counter(&Apache::response::repetition(), 
      $part_id);
    if ($target eq 'analyze') {
       &Apache::lonhomework::set_bubble_lines();
    }
   
       }
       &Apache::response::end_response();
   
     return $result;      return $result;
 }  }
   
Line 68  sub end_imageresponse { Line 112  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 84  sub getfoilcounts { Line 128  sub getfoilcounts {
   
 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;
Line 98  sub whichfoils { Line 142  sub whichfoils {
  &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 {
       my ($image,$mode,$name)=@_;
   
       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 (%x,$i);
       $x{"cgi.$id.BGIMG"}=&escape($image);
   
       #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
   
       if (defined($x)    && $x =~/\S/ 
    && defined($y) && $y =~/\S/ 
    && ($mode eq 'submission' || !&Apache::response::show_answer())
    && $mode ne 'answeronly') {
    my $length = 6;
    my $width = 1;
    my $extrawidth = 2;
    my $xmin=($x-$length);
    my $xmax=($x+$length); 
    my $ymin=($y-$length);
    my $ymax=($y+$length);
   
    $x{"cgi.$id.OBJTYPE"}.='LINE:';
    $i=$x{"cgi.$id.OBJCOUNT"}++;
    $x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymin),($xmax),($ymax),
         "FFFFFF",($width+$extrawidth)));
    $x{"cgi.$id.OBJTYPE"}.='LINE:';
    $i=$x{"cgi.$id.OBJCOUNT"}++;
    $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' || $mode eq 'answeronly') {
    my $width = 1;
    my $extrawidth = 2;
    foreach my $area (@{ $areas }) {
       if ($area=~/^rectangle:/) {
    $x{"cgi.$id.OBJTYPE"}.='RECTANGLE:';
    $i=$x{"cgi.$id.OBJCOUNT"}++;
    my ($x1,$y1,$x2,$y2)=
       ($area=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/);
    $x{"cgi.$id.OBJ$i"}=join(':',($x1,$y1,$x2,$y2,"FFFFFF",
         ($width+$extrawidth)));
    $x{"cgi.$id.OBJTYPE"}.='RECTANGLE:';
    $i=$x{"cgi.$id.OBJCOUNT"}++;
    $x{"cgi.$id.OBJ$i"}=join(':',($x1,$y1,$x2,$y2,"00FF00",$width));
       } elsif ($area=~/^polygon:(.*)/) {
    $x{"cgi.$id.OBJTYPE"}.='POLYGON:';
    $i=$x{"cgi.$id.OBJCOUNT"}++;
    $x{"cgi.$id.OBJ$i"}=join(':',("FFFFFF",($width+$extrawidth)));
    $x{"cgi.$id.OBJEXTRA$i"}=$1;
    $x{"cgi.$id.OBJTYPE"}.='POLYGON:';
    $i=$x{"cgi.$id.OBJCOUNT"}++;
    $x{"cgi.$id.OBJ$i"}=join(':',("00FF00",$width));
    $x{"cgi.$id.OBJEXTRA$i"}=$1;
       }
    }
       }
       &Apache::lonnet::appenv(%x);
       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:/ ) {
       $image=&clean_up_image($image);
    }
    push(@images,$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";   my $token=&prep_image($image,'answer',$name);
    $result.="<img src=\"/adm/randomlabel.png?token=$token\" /><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";   my $respid=$Apache::inputtags::response['-1'];
    my $token=&prep_image($image,'submission',$name);
    my $input_id = "HWVAL_$respid:$temp";
    my $id = $env{'form.request.prefix'}.$input_id;
    $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') {
    &Apache::response::setup_prior_tries_hash(\&format_prior_response,
     [\@images,\@whichopt]);
       }
       return $result;
   }
   
   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;
   }
   
   sub display_answers {
       my ($target,$whichopt)=@_;
   
       my $result=&Apache::response::answer_header('imageresponse');
       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_part('imageresponse',"<img src=\"/adm/randomlabel.png?token=$token\" /><br />\n");
       }
       $result.=&Apache::response::answer_footer('imageresponse');
     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);
    &Apache::lonxml::debug("repcopying: $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 $y;      my $partid = $Apache::inputtags::part;
     my $result;      my $id     = $Apache::inputtags::response['-1'];
     my $id=$Apache::inputtags::response['-1'];  
       if ($Apache::lonhomework::type eq 'exam') {
    &Apache::response::scored_response($partid,$id);
    return;
       }
       
       my @results;
     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 153  sub gradefoils { Line 360  sub gradefoils {
  &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);
    } elsif ($1 eq 'polygon') {
       $grade=&grade_polygon($area,$x,$y);
  } else {   } else {
     &Apache::lonxml::error("Unknown area style $area");      &Apache::lonxml::error("Unknown area style $area");
  }   }
Line 160  sub gradefoils { Line 369  sub gradefoils {
  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++;
       }
       my ($result) = &Apache::inputtags::finalizeawards(\@results,[]);
       &Apache::lonxml::debug("Question is $result");
   
       my $part=$Apache::inputtags::part;
       my %previous=
    &Apache::response::check_for_previous(&stringify_submission(\%response),
         $part,$id);
       if ($result 
    && $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; }
       &Apache::response::handle_previous(\%previous,$result);
       $Apache::lonhomework::results{"resource.$part.$id.submission"}=
    &stringify_submission(\%response);
       $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$result;
       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});
     }      }
     $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' ||
    $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();
     }      }
       &Apache::response::poprandomnumber();
     return $result;      return $result;
 }  }
   
Line 229  sub insert_foil { Line 485  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' || $target eq 'answer') {
  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})) {
       &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);
  } 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 256  sub end_foil { Line 530  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);   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();
     } elsif ($target eq "modified") {      } elsif ($target eq "modified") {
  my $descr=&Apache::lonxml::get_all_text('/text',$parser);   $result=$token->[4].&Apache::edit::modifiedfield('/text',$parser);
  $result=$token->[4].&Apache::edit::modifiedfield($token);  
  &Apache::lonxml::debug($result);  
     }      }
     return $result;      return $result;
 }  }
Line 274  sub start_text { Line 547  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()
        ) {
     $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 291  sub end_text { Line 566  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);   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;
   
  $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") {
  my $bgimg=&Apache::lonxml::get_all_text('/image',$parser);   $result=$token->[4].&Apache::edit::modifiedfield('/image',$parser);
  $result=$token->[4].&Apache::edit::modifiedfield($token);  
  &Apache::lonxml::debug($result);  
     }      }
     return $result;      return $result;
 }  }
Line 315  sub end_image { Line 590  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");
  my $id=$Apache::inputtags::response['-1'];  
  my $temp=1;  
  my $x=$ENV{"form.HWVAL_$id:$temp.x"};  
  my $y=$ENV{"form.HWVAL_$id:$temp.y"};  
  if (defined ($x) && defined ($y)) {  
     &Apache::lonxml::debug("x and y defined as $x,$y");  
     my $currentImage = &Apache::randomlylabel::get_image('/home/httpd/html'.$image,1);  
     if (! defined($currentImage)) {  
  &Apache::lonnet::logthis('Unable to create image object for '.$image);  
  return '';  
     }  
     my $red;  
     if (!($red = $currentImage->colorResolve(255,0,0))) {  
  $red = $currentImage->colorClosestHWB(255,0,0);  
     }  
     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);  
   
     my ($nameWOext) = ($image =~ /^.*\/(.*)\..*$/);  
     &Apache::lonxml::debug("graph name $nameWOext");  
     my $webImageName = "/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_".  
  $nameWOext.'.png'; #needs to be more random or specific  
     my $newImageName = '/home/httpd'.$webImageName;  
       
     my $imgfh = Apache::File->new('>'.$newImageName);   
     print $imgfh $currentImage->png;  
     $image = $webImageName;  
  }  
  &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 '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 365  sub end_image { Line 612  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 {
     my $temp_file;      my ($path,$file) = &Apache::londefdef::get_eps_image($src);
     my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";      my ($height_param,$width_param)=
     $temp_file = Apache::File->new('>>'.$filename);    &Apache::londefdef::image_size($src,0.3,$parstack,$safeeval);
     print $temp_file "$src\n";      $graphinclude = '\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'}';
     $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \graphicspath{{/home/httpd/prtspool/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';  
  }   }
    $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent '.$graphinclude;
     }       } 
     return $result;      return $result;
 }  }
Line 443  sub end_image { Line 644  sub end_image {
 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' ||
    $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);   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::entercoordpair(undef,'textnode').      &Apache::edit::entercoord(undef,'textnode',undef,undef,'box').
     &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);   &Apache::edit::deletecoorddata();
  $result=$token->[4].&Apache::edit::modifiedfield($token);   $result=$token->[4].&Apache::edit::modifiedfield('/rectangle',$parser);
  &Apache::lonxml::debug($result);  
     }      }
     return $result;      return $result;
 }  }
Line 462  sub start_rectangle { Line 663  sub start_rectangle {
 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]+)\)/;      my ($x1,$y1,$x2,$y2)=($spec=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/);
     my $x1=$1;  
     my $y1=$2;  
     my $x2=$3;  
     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; }
Line 479  sub grade_rectangle { Line 676  sub grade_rectangle {
 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' ||
    $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;
  &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;
   }
   
   sub start_polygon {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result='';
       if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
    $target eq 'analyze' || $target eq 'answer') { 
    &Apache::lonxml::startredirection; 
       } elsif ($target eq 'edit') {
    my $coords=&Apache::lonxml::get_all_text('/polygon',$parser,$style);
    $result=&Apache::edit::tag_start($target,$token,'Polygon').
       &Apache::edit::editline($token->[1],$coords,'Coordinate list',40).
       &Apache::edit::entercoord(undef,'textnode',undef,undef,'polygon').
       &Apache::edit::end_row();
       } elsif ($target eq "modified") {
    $result=$token->[4].&Apache::edit::modifiedfield('/polygon',$parser);
       }
       return $result;
   }
   
   sub grade_polygon {
       my ($spec,$x,$y) = @_;
       &Apache::lonxml::debug("Spec is $spec");
       $spec=~s/^polygon://;
       my @polygon;
       foreach my $coord (split('-',$spec)) {
    my ($x,$y)=($coord=~m/\(([0-9]+),([0-9]+)\)/);
    &Apache::lonxml::debug("x $x y $y");
    push @polygon, {'x'=>$x,'y'=>$y};
       }
       #make end point start point
       push @polygon, $polygon[0];
       # cribbed from
       # http://geometryalgorithms.com/Archive/algorithm_0103/algorithm_0103.htm
       my $crossing = 0;    # the crossing number counter
   
       # loop through all edges of the polygon
       for (my $i=0; $i<$#polygon; $i++) {    # edge from V[i] to V[i+1]
    if ((($polygon[$i]->{'y'} <= $y)
        && ($polygon[$i+1]->{'y'} > $y))    # an upward crossing
       || 
       (($polygon[$i]->{'y'} > $y) 
        && ($polygon[$i+1]->{'y'} <= $y))) { # a downward crossing
       # compute the actual edge-ray intersect x-coordinate
               my $vt = ($y - $polygon[$i]->{'y'}) 
    / ($polygon[$i+1]->{'y'} - $polygon[$i]->{'y'});
               if ($x < $polygon[$i]->{'x'} + $vt * 
    ($polygon[$i+1]->{'x'} - $polygon[$i]->{'x'})) { # x<intersect
                   $crossing++;   # a valid crossing of y=P.y right of P.x
       }
    }
       }
   
       # 0 if even (out), and 1 if odd (in)
       if ($crossing%2) {
    return 'APPROX_ANS';
       } else {
    return 'INCORRECT';
       }
   }
   
   sub end_polygon {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
       if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
    $target eq 'analyze' || $target eq 'answer') {
    my $name = $Apache::imageresponse::curname;
    my $area = &Apache::lonxml::endredirection;
    $area=~s/\s*//g;
    &Apache::lonxml::debug("out is $area for $name");
    if ( $Apache::imageresponse::conceptgroup
        && !&Apache::response::showallfoils()
        ) {
       push @{ $Apache::response::conceptgroup{"$name.area"} },"polygon:$area";
    } else {
       push @{ $Apache::response::foilgroup{"$name.area"} },"polygon:$area";
    }
       } elsif ($target eq 'edit') {
    $result=&Apache::edit::end_table();
     }      }
     return $result;      return $result;
 }  }
Removed from v.1.37  
changed lines
  Added in v.1.89

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