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

Diff for /loncom/homework/imageresponse.pm between versions 1.42.2.1 and 1.48

version 1.42.2.1, 2004/01/15 22:25:31 version 1.48, 2004/02/18 00:23:01
Line 1 Line 1
   
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # image click response style  # image click response style
 #  #
Line 32  package Apache::imageresponse; Line 33  package Apache::imageresponse;
 use strict;  use strict;
 use Image::Magick;  use Image::Magick;
 use Apache::randomlylabel;  use Apache::randomlylabel;
   use Apache::londefdef;
 use Apache::Constants qw(:common :http);  use Apache::Constants qw(:common :http);
   
 BEGIN {  BEGIN {
Line 42  sub start_imageresponse { Line 44  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);
     if ($target eq 'meta') {      if ($target eq 'meta') {
Line 109  sub prep_image { Line 113  sub prep_image {
     my $respid=$Apache::inputtags::response['-1'];      my $respid=$Apache::inputtags::response['-1'];
     my $id=&Apache::loncommon::get_cgi_id();      my $id=&Apache::loncommon::get_cgi_id();
     my %x;      my %x;
     $x{"cgi.$id.BGIMG"}=$image;      $x{"cgi.$id.BGIMG"}=&Apache::lonnet::escape($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) && defined($y)) {      if (defined($x) && $x=~/\S/ && defined($y) && $y =~/\S/) {
  $x{"cgi.$id.LINECOUNT"}=4;   $x{"cgi.$id.LINECOUNT"}=4;
  my $length = 6;   my $length = 6;
  my $width = 1;   my $width = 1;
  my $extrawidth = 2;   my $extrawidth = 2;
    my $xmin=($x-$length);
    my $xmax=($x+$length); 
    my $ymin=($y-$length);
    my $ymax=($y+$length);
   
  $x{"cgi.$id.LINE0"}=   $x{"cgi.$id.LINE0"}=
     join(':',(($x-$length),($y-$length),($x+$length),($y+$length),      join(':',(($xmin),($ymin),($xmax),($ymax),
       "FFFFFF",($width+$extrawidth)));        "FFFFFF",($width+$extrawidth)));
  $x{"cgi.$id.LINE1"}=   $x{"cgi.$id.LINE1"}=
     join(':',(($x-$length),($y+$length),($x+$length),($y-$length),      join(':',(($xmin),($ymax),($xmax),($ymin),
       "FFFFFF",($width+$extrawidth)));        "FFFFFF",($width+$extrawidth)));
  $x{"cgi.$id.LINE2"}=   $x{"cgi.$id.LINE2"}=
     join(':',(($x-$length),($y-$length),($x+$length),($y+$length),      join(':',(($xmin),($ymin),($xmax),($ymax),
       "FF0000",($width)));        "FF0000",($width)));
  $x{"cgi.$id.LINE3"}=   $x{"cgi.$id.LINE3"}=
     join(':',(($x-$length),($y+$length),($x+$length),($y-$length),      join(':',(($xmin),($ymax),($xmax),($ymin),
       "FF0000",($width)));        "FF0000",($width)));
     }      }
     if ($mode eq 'answer') {      if ($mode eq 'answer') {
Line 136  sub prep_image { Line 145  sub prep_image {
  my $extrawidth = 2;   my $extrawidth = 2;
  my @areas = @{ $Apache::response::foilgroup{"$name.area"} };   my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
  foreach my $area (@areas) {   foreach my $area (@areas) {
     my ($x1,$y1,$x2,$y2)=      if ($area=~/^rectangle:/) {
  ($area=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/);   my ($x1,$y1,$x2,$y2)=
     my $i=$x{"cgi.$id.BOXCOUNT"}++;      ($area=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/);
     $x{"cgi.$id.BOX$i"}=join(':',($x1,$y1,$x2,$y2,"FFFFFF",   my $i=$x{"cgi.$id.BOXCOUNT"}++;
   ($width+$extrawidth)));   $x{"cgi.$id.BOX$i"}=join(':',($x1,$y1,$x2,$y2,"FFFFFF",
     $i=$x{"cgi.$id.BOXCOUNT"}++;        ($width+$extrawidth)));
     $x{"cgi.$id.BOX$i"}=join(':',($x1,$y1,$x2,$y2,"00FF00",$width));   $i=$x{"cgi.$id.BOXCOUNT"}++;
    $x{"cgi.$id.BOX$i"}=join(':',($x1,$y1,$x2,$y2,"00FF00",$width));
       } elsif ($area=~/^polygon:(.*)/) {
    my $i=$x{"cgi.$id.POLYCOUNT"}++;
    $x{"cgi.$id.POLYOPT$i"}=join(':',("FFFFFF",($width+$extrawidth)));
    $x{"cgi.$id.POLY$i"}=$1;
    $i=$x{"cgi.$id.POLYCOUNT"}++;
    $x{"cgi.$id.POLYOPT$i"}=join(':',("00FF00",$width));
    $x{"cgi.$id.POLY$i"}=$1;
       }
  }   }
     }      }
     &Apache::lonnet::appenv(%x);      &Apache::lonnet::appenv(%x);
Line 161  sub displayfoils { Line 179  sub displayfoils {
  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' && $image !~ /^http:/ ) {
     $image=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$image);      $image=&clean_up_image($image);
     if (&Apache::lonnet::repcopy($image) ne OK) {   } 
  $image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';  
     }  
  }  
  &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 190  sub displayfoils { Line 205  sub displayfoils {
     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);
    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 $x;
Line 211  sub gradefoils { Line 245  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 455  sub end_image { Line 491  sub end_image {
  $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';   $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
     }      }
  } else {   } else {
     my $temp_file;      #care about eps dynamical generation
     my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";      $Apache::response::foilgroup{"$name.image"}='\vskip 0 mm '.&Apache::londefdef::eps_generation($src,$file,$width_param);
     $temp_file = Apache::File->new('>>'.$filename);   
     print $temp_file "$src\n";  
     $newsrc=~s/\/home\/httpd\/html\/res//;  
     $newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//;  
     $newsrc=~s/\/\.\//\//;  
     $newsrc=~s/\/([^\/]+)\.(ps|eps)/\//;  
     $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';  
  }   }
     }       } 
     return $result;      return $result;
Line 479  sub start_rectangle { Line 508  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::entercoord(undef,'textnode',undef,undef,'box').
     &Apache::edit::end_row();      &Apache::edit::end_row();
     } elsif ($target eq "modified") {      } elsif ($target eq "modified") {
    &Apache::edit::deletecoorddata();
  $result=$token->[4].&Apache::edit::modifiedfield('/rectangle',$parser);   $result=$token->[4].&Apache::edit::modifiedfield('/rectangle',$parser);
     }      }
     return $result;      return $result;
Line 490  sub start_rectangle { Line 520  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 520  sub end_rectangle { Line 546  sub end_rectangle {
  }   }
     } 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') { 
    &Apache::lonxml::startredirection; 
       } elsif ($target eq 'edit') {
    my $coords=&Apache::lonxml::get_all_text('/polygon',$parser);
    $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') {
    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.42.2.1  
changed lines
  Added in v.1.48

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