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

Diff for /loncom/homework/imageresponse.pm between versions 1.26 and 1.31.2.1

version 1.26, 2003/05/05 22:36:54 version 1.31.2.1, 2003/09/23 01:52:57
Line 51  sub start_imageresponse { Line 51  sub start_imageresponse {
 }  }
   
 sub end_imageresponse {  sub end_imageresponse {
   &Apache::response::end_response;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   pop @Apache::lonxml::namespace;      &Apache::response::end_response;
   &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));      pop @Apache::lonxml::namespace;
   return '';      &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
       my $result;
       if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
       return $result;
 }  }
   
 %Apache::response::foilgroup=();  %Apache::response::foilgroup=();
Line 103  sub displayfoils { Line 106  sub displayfoils {
   my $temp=1;    my $temp=1;
   foreach $name (@whichopt) {    foreach $name (@whichopt) {
     $result.=$Apache::response::foilgroup{"$name.text"};      $result.=$Apache::response::foilgroup{"$name.text"};
       &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"};
     if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {      &Apache::lonxml::debug("image is $image");
       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 {
Line 134  sub gradefoils { Line 139  sub gradefoils {
     $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(@{ $Apache::response::foilgroup{"$name.area"} })) {      if (defined($x) && defined($y) &&
    defined(@{ $Apache::response::foilgroup{"$name.area"} })) {
       my @areas = @{ $Apache::response::foilgroup{"$name.area"} };        my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
       my $grade="INCORRECT";        my $grade="INCORRECT";
       foreach my $area (@areas) {        foreach my $area (@areas) {
Line 170  sub end_foilgroup { Line 176  sub end_foilgroup {
     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);
   } elsif ($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'}) {   if ( defined $ENV{'form.submitted'}) { &gradefoils(@whichopt); }
       &gradefoils(@whichopt);      } 
     }  
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
       $result=&Apache::edit::end_table();        $result=&Apache::edit::end_table();
   }    }
Line 213  sub end_conceptgroup { Line 218  sub end_conceptgroup {
   return $result;    return $result;
 }  }
   
   sub insert_foil {
       return '
          <foil>
              <image></image>
              <text></text>
              <rectangle></rectangle>
          </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)=@_;
Line 281  sub start_image { Line 296  sub start_image {
       &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);
       $Apache::edit::bgimgsrc=$bgimg;
       $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').' ';
Line 356  sub end_image { Line 374  sub end_image {
  $path = $1.'/';    $path = $1.'/'; 
     }      }
     my $newsrc = $src;      my $newsrc = $src;
     $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;      $newsrc =~ s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;
     $file=~s/(\.gif|\.jpg)$/\.eps/i;      $file=~s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;
     #do we have any specified size of the picture?      #do we have any specified size of the picture?
     my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval);       my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); 
     my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval);       my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); 
Line 394  sub start_rectangle { Line 412  sub start_rectangle {
     my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser);      my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser);
     $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::end_row();          &Apache::edit::end_row();
   } elsif ($target eq "modified") {    } elsif ($target eq "modified") {
     my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser);      my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser);
Removed from v.1.26  
changed lines
  Added in v.1.31.2.1

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