Diff for /loncom/homework/functionplotresponse.pm between versions 1.15 and 1.19

version 1.15, 2010/10/19 02:04:27 version 1.19, 2010/10/30 15:32:36
Line 101  ENDDEFAULTPARAMETERS Line 101  ENDDEFAULTPARAMETERS
 #  #
   
 sub init_script {  sub init_script {
    if ($Apache::functionplotresponse::callscripts) {     if ($#Apache::functionplotresponse::callscripts>=0) {
         my $script='';
         foreach my $id (@Apache::functionplotresponse::callscripts) {
             $script.="if (param=='applet_$id') { loaded_$id=true; }\n";
         }
         $script.="if (".join(' && ',map { "loaded_$_" } (@Apache::functionplotresponse::callscripts)).
                  ") { setTimeout('ggbInitAll()',20) }";
         my $calls=join("\n",map { "ggbInit_$_();" } (@Apache::functionplotresponse::callscripts)); 
       return (<<ENDGGBINIT);        return (<<ENDGGBINIT);
 <script type="text/javascript">  <script type="text/javascript">
 // <![CDATA[  // <![CDATA[
   // Function that each applet will call when loaded
   // It will pass "its" parameter
   // Set flags for when an applet is loaded, wait till all are loaded, and then some
 function ggbOnInit(param) {  function ggbOnInit(param) {
 $Apache::functionplotresponse::callscripts  $script
   }
   function ggbInitAll() {
   $calls
 }  }
 // ]]>  // ]]>
 </script>  </script>
Line 194  sub new_coordinate { Line 207  sub new_coordinate {
 #  #
 sub start_init_script {  sub start_init_script {
     my ($id)=@_;      my ($id)=@_;
 # Add a line to ggbOnInit-function which calls the right function based on parameter passed from GeoGebra  # Add id to the list of ggbInit_$id functions that need to be called
     $Apache::functionplotresponse::callscripts.="if (param=='applet_$id') { ggbInit_$id(); }\n";      push(@Apache::functionplotresponse::callscripts,$id);
 # ... and open this function  # ... and open this function
     return (<<ENDSTARTINIT);      return (<<ENDSTARTINIT);
 <script type="text/javascript">  <script type="text/javascript">
 // <![CDATA[  // <![CDATA[
 // variable that will eventually be passed back to the server  // variable that will eventually be passed back to the server
 var coordinateMap_$id = [];  var coordinateMap_$id = [];
   // flag for not loaded yet
   var loaded_$id=false;
 // Init-function for applet  // Init-function for applet
 function ggbInit_$id() {  function ggbInit_$id() {
 ENDSTARTINIT  ENDSTARTINIT
Line 484  sub d2dt2_cubic_hermite { Line 499  sub d2dt2_cubic_hermite {
 }  }
   
 #  #
   # Array index calculation
   #
   sub array_index {
      my ($xmin,$xmax,$x)=@_;
      my $index=int(($x-$xmin)/($xmax-$xmin)*200.+0.5);
      return $index;
   }
   
   #
   # Populate the arrays
   #
   
   sub populate_arrays {
       my ($id,$xmin,$xmax)=@_;
       for (my $i=0; $i<=200; $i++) {
          $Apache::functionplotresponse::func[$i]=undef;
          $Apache::functionplotresponse::dfunddx[$i]=undef;
          $Apache::functionplotresponse::d2funcd2x[$i]=undef;
       }
       unless ($xmax>$xmin) { return 'no_func'; }
   # Run over all splines in response
       foreach my $label (split(/\,/,$env{"form.HWVAL_AllSplines_$id"})) {
           my $xiold=-1;
   # Run over all points in spline
           for (my $i=1; $i<$env{"form.HWVAL_SplineOrder_".$id."_".$label}; $i++) {
               my $ni=$i+1;
               my @xparms=($env{'form.HWVAL_'.$id.'_'.$label.'P'.$i.'_x'},
                           $env{'form.HWVAL_'.$id.'_'.$label.'S'.$i.'_x'},
                           $env{'form.HWVAL_'.$id.'_'.$label.'P'.$ni.'_x'},
                           $env{'form.HWVAL_'.$id.'_'.$label.'S'.$ni.'_x'});
               my @yparms=($env{'form.HWVAL_'.$id.'_'.$label.'P'.$i.'_y'},
                           $env{'form.HWVAL_'.$id.'_'.$label.'S'.$i.'_y'},
                           $env{'form.HWVAL_'.$id.'_'.$label.'P'.$ni.'_y'},
                           $env{'form.HWVAL_'.$id.'_'.$label.'S'.$ni.'_y'});
   # Run in small steps over spline parameter
               for (my $t=0; $t<=1; $t+=0.00025) {
                   my $xi=&array_index($xmin,$xmax,&cubic_hermite($t,@xparms));
                   if ($xi<$xiold) { return 'no_func'; }
                   if (($xi>$xiold) && ($xi>=0) && ($xi<=200)) {
                      if (defined($Apache::functionplotresponse::func[$xi])) { return 'no_func'; }
                      $xiold=$xi;
                      $Apache::functionplotresponse::func[$xi]=&cubic_hermite($t,@yparms);
                   }
               }
           }
       }
   }
   
   #
 # Implentation of <functionplotresponse>  # Implentation of <functionplotresponse>
 #  #
   
Line 510  sub start_functionplotresponse { Line 574  sub start_functionplotresponse {
   
 # Parameters of <functionplotresponse>  # Parameters of <functionplotresponse>
   my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval);    my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval);
   $xmin=($xmin?$xmin:-10);    $xmin=(defined($xmin)?$xmin:-10);
   my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval);    my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval);
   $xmax=($xmax?$xmax:10);    $xmax=(defined($xmax)?$xmax:10);
   my $ymin=&Apache::lonxml::get_param('ymin',$parstack,$safeeval);    my $ymin=&Apache::lonxml::get_param('ymin',$parstack,$safeeval);
   $ymin=($ymin?$ymin:-10);    $ymin=(defined($ymin)?$ymin:-10);
   my $ymax=&Apache::lonxml::get_param('ymax',$parstack,$safeeval);    my $ymax=&Apache::lonxml::get_param('ymax',$parstack,$safeeval);
   $ymax=($ymax?$ymax:10);    $ymax=(defined($ymax)?$ymax:10);
   my $xaxisvisible=(&Apache::lonxml::get_param('xaxisvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false');    my $xaxisvisible=(&Apache::lonxml::get_param('xaxisvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false');
   my $yaxisvisible=(&Apache::lonxml::get_param('yaxisvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false');    my $yaxisvisible=(&Apache::lonxml::get_param('yaxisvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false');
   my $gridvisible=(&Apache::lonxml::get_param('gridvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false');    my $gridvisible=(&Apache::lonxml::get_param('gridvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false');
Line 597  sub end_functionplotresponse { Line 661  sub end_functionplotresponse {
 #  #
 # Actually grade  # Actually grade
 #  #
         my $ad='INCORRECT';          my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval);
           $xmin=(defined($xmin)?$xmin:-10);
           my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval);
           $xmax=(defined($xmax)?$xmax:10);
           my $ad;
           if (&populate_arrays($internalid,$xmin,$xmax) eq 'no_func') {
              $ad='BAD_FORMULA';
           } else {
              $ad='INCORRECT';
           }
 #  #
 # Store grading info  # Store grading info
 #  #
Line 610  sub end_functionplotresponse { Line 683  sub end_functionplotresponse {
      }       }
 # close the init script  # close the init script
      $result.=&end_init_script();       $result.=&end_init_script();
   # register all splines in this response 
        $result.='<input type="hidden" name="HWVAL_AllSplines_'.$internalid.'" value="'.
                    join(',',keys(%Apache::functionplotresponse::splineorder)).'" />'."\n";
        foreach my $label (keys(%Apache::functionplotresponse::splineorder)) {
           $result.='<input type="hidden" name="HWVAL_SplineOrder_'.$internalid.'_'.$label.'" value="'.
                    $Apache::functionplotresponse::splineorder{$label}.'" />'."\n";
        }
 # generate the input fields  # generate the input fields
      $result.=$Apache::functionplotresponse::inputfields;       $result.=$Apache::functionplotresponse::inputfields;
 # actually start the <applet>-tag  # actually start the <applet>-tag

Removed from v.1.15  
changed lines
  Added in v.1.19


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