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

Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.130 and 1.135

version 1.130, 2004/02/13 21:05:34 version 1.135, 2004/02/26 16:36:48
Line 384  sub get_table_sizes { Line 384  sub get_table_sizes {
  my $cell_width_real=0;   my $cell_width_real=0;
  if ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) {   if ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) {
     $cell_width_real=(length($1)+length($2)+length($5)+9)*$scale;      $cell_width_real=(length($1)+length($2)+length($5)+9)*$scale;
  } elsif ($member=~/(\d*)\.?(\d*)/) {   } elsif ($member=~/(\d*)\.(\d*)/) {
     $cell_width_real=(length($1)+length($2)+2)*$scale;      $cell_width_real=(length($1)+length($2)+3)*$scale;
  } else {   } else {
     $cell_width_real=(length($member)+1)*$scale;      $cell_width_real=(length($member)+1)*$scale;
  }   }
  if ($cell_width_real>$cell_width) {$cell_width=$cell_width_real;}   if ($cell_width_real>$cell_width) {$cell_width=$cell_width_real;}
     }      }
     $cell_width+=8;      $cell_width+=8; 
     my $textwidth;      my $textwidth;
     if ($ENV{'form.textwidth'} ne '') {      if ($ENV{'form.textwidth'} ne '') {
  $ENV{'form.textwidth'}=~/(\d+)/;   $ENV{'form.textwidth'}=~/(\d*)\.?(\d*)/;
  $textwidth=$1;   $textwidth=$1.'.'.$2;
     } else {      } else {
  $ENV{'textwidth'}=~/(\d+)/;   $ENV{'textwidth'}=~/(\d+)\.?(\d*)/;
  $textwidth=$1;   $textwidth=$1.'.'.$2;
     }      }
     my $bubbles_per_line=int($textwidth/$cell_width);      my $bubbles_per_line=int($textwidth/$cell_width);
       if (($bubbles_per_line > $number_of_bubbles/2) && ($number_of_bubbles % 2==0)) {$bubbles_per_line=$number_of_bubbles/2;}
     my $number_of_tables = int($number_of_bubbles/$bubbles_per_line);      my $number_of_tables = int($number_of_bubbles/$bubbles_per_line);
     my @table_range = ();      my @table_range = ();
     for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;}      for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;}
Line 458  sub make_numerical_bubbles { Line 459  sub make_numerical_bubbles {
     @bubble_values=sort {$a <=> $b} (@bubble_values,$answer);      @bubble_values=sort {$a <=> $b} (@bubble_values,$answer);
     &Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": whih are :".join(':',@bubble_values));      &Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": whih are :".join(':',@bubble_values));
     &Math::Random::random_set_seed(@oldseed);      &Math::Random::random_set_seed(@oldseed);
       if (defined($format) && $format ne '') {
    foreach my $value (@bubble_values) {
       $value=&format_number($value,$format,$target);
    }
       }
     return @bubble_values;      return @bubble_values;
  }   }
  if (defined($$incorrect[0]) &&   if (defined($$incorrect[0]) &&
Line 513  sub get_sigrange { Line 519  sub get_sigrange {
  }   }
  if (!$sig_ubound) { $sig_ubound=$sig_lbound; }   if (!$sig_ubound) { $sig_ubound=$sig_lbound; }
     }      }
       if (($sig_ubound<$sig_lbound) ||
    ($sig_lbound > 15) ||
    ($sig =~/(\+|-)/ ) ) {
    my $errormsg=&mt("Invalid Significant figures detected")." ($sig)";
    if ($ENV{'request.state'} eq 'construct') {
       $errormsg.=
    &Apache::loncommon::help_open_topic('Significant_Figures');
    }
    &Apache::lonxml::error($errormsg);
       }
     return ($sig_ubound,$sig_lbound);      return ($sig_ubound,$sig_lbound);
 }  }
   
Line 535  sub start_stringresponse { Line 551  sub start_stringresponse {
     [['inline','Inline']],$token);      [['inline','Inline']],$token);
  $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  &Apache::edit::get_new_args($token,$parstack,         my $constructtag;
     $safeeval,'answer','type');         $constructtag=&Apache::edit::get_new_args($token,$parstack,
  my $answerdisplay=$ENV{'form.'.&Apache::edit::html_element_name('answerdisplay')};                                                   $safeeval,'answer',
  if ($answerdisplay) {                                                   'type','answerdisplay');
     $token->[2]->{'answerdisplay'}=$answerdisplay;         if ($constructtag) {
  } else {             $result = &Apache::edit::rebuild_tag($token);
     delete $token->[2]->{'answerdisplay'};             $result.=&Apache::edit::handle_insert();
  }         }
  $result = &Apache::edit::rebuild_tag($token);  
  $result.=&Apache::edit::handle_insert();  
     } elsif ($target eq 'answer' || $target eq 'grade') {      } elsif ($target eq 'answer' || $target eq 'grade') {
  &Apache::response::reset_params();   &Apache::response::reset_params();
     }      }
Removed from v.1.130  
changed lines
  Added in v.1.135

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