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

Diff for /loncom/homework/functionplotresponse.pm between versions 1.7 and 1.12

version 1.7, 2010/10/05 01:28:00 version 1.12, 2010/10/09 22:31:49
Line 33  use Apache::lonlocal; Line 33  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   
 BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline'));    &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline','splinerule'));
 }  }
   
 #  #
Line 116  ENDGGBINIT Line 116  ENDGGBINIT
   
 #  #
 # Each Geogebra applet is supposed to call this when parameters change  # Each Geogebra applet is supposed to call this when parameters change
   # Changes the hidden fields on the web page
 #  #
 sub update_script {  sub update_script {
     my ($id)=@_;      my ($id)=@_;
Line 125  sub update_script { Line 126  sub update_script {
 function updatePointCoordinates_$id(coordinateName) {  function updatePointCoordinates_$id(coordinateName) {
             var x = document.ggbApplet_$id.getXcoord(coordinateName);              var x = document.ggbApplet_$id.getXcoord(coordinateName);
             var y = document.ggbApplet_$id.getYcoord(coordinateName);              var y = document.ggbApplet_$id.getYcoord(coordinateName);
             coordinateMap_$id\[coordinateName + ".x"] = x;              document.lonhomework.elements["HWVAL_$id\_" + coordinateName + "_x"].value = x;
             coordinateMap_$id\[coordinateName + ".y"] = y;              document.lonhomework.elements["HWVAL_$id\_" + coordinateName + "_y"].value = y;
         }          }
 // ]]>  // ]]>
 </script>  </script>
Line 148  sub update_register { Line 149  sub update_register {
 sub set_coordinate {  sub set_coordinate {
    my ($id,$variable,$x,$y)=@_;     my ($id,$variable,$x,$y)=@_;
    return (<<ENDSETVARIABLE);     return (<<ENDSETVARIABLE);
 coordinateMap_$id\['$variable.x'] = $x;  document.ggbApplet_$id.evalCommand("$variable=($x,$y)");
 coordinateMap_$id\['$variable.y'] = $y;  
 document.ggbApplet_$id.evalCommand("$variable=("+coordinateMap_$id\["$variable.x"]+","+coordinateMap_$id\["$variable.y"]+")");  
 ENDSETVARIABLE  ENDSETVARIABLE
 }  }
   
 #  #
   # Input field name for a coordinate variable
   #
   
   sub field_name {
       my ($id,$variable,$name)=@_;
       return "HWVAL_$id\_$variable\_$name";
   }
   
   #
   # Generate an input field for a coordinate variable
   #
   
   sub generate_input_field {
       my ($id,$variable,$x,$y)=@_;
       $Apache::functionplotresponse::inputfields.=
          "<input type='hidden' name='".&field_name($id,$variable,'x')."' value='$x' />\n".
          "<input type='hidden' name='".&field_name($id,$variable,'y')."' value='$y' />\n";
   }
   
   #
 # Initialize a new coordinate variable at set a listener on it  # Initialize a new coordinate variable at set a listener on it
 #  #
 sub new_coordinate {  sub new_coordinate {
     my ($id,$variable,$x,$y)=@_;      my ($id,$variable,$x,$y)=@_;
       if (defined($Apache::functionplotresponse::previous{&field_name($id,$variable,'x')})) {
          $x=$Apache::functionplotresponse::previous{&field_name($id,$variable,'x')};
       }
       if (defined($Apache::functionplotresponse::previous{&field_name($id,$variable,'y')})) {
          $y=$Apache::functionplotresponse::previous{&field_name($id,$variable,'y')};
       }
       &generate_input_field($id,$variable,$x,$y);
     return &set_coordinate($id,$variable,$x,$y).&update_register($id,$variable);      return &set_coordinate($id,$variable,$x,$y).&update_register($id,$variable);
 }  }
   
Line 228  sub generate_spline { Line 254  sub generate_spline {
    my @coords=();     my @coords=();
    foreach my $i (1..$order) {     foreach my $i (1..$order) {
        $result.=&new_coordinate($id,$label.'P'.$i,$x,$y);         $result.=&new_coordinate($id,$label.'P'.$i,$x,$y);
        $x+=$sx/$order;         $x+=$sx/(2.*($order-1));
        push(@coords,$label.'P'.$i);         push(@coords,$label.'P'.$i);
        $result.=&new_coordinate($id,$label.'S'.$i,$x,$y+$sy);         $result.=&new_coordinate($id,$label.'S'.$i,$x,$y+$sy);
        $x+=$sx/$order;         $x+=$sx/(2.*($order-1));
        push(@coords,$label.'S'.$i);         push(@coords,$label.'S'.$i);
    }     }
    $result.='document.ggbApplet_'.$id.'.evalCommand("Spline'.$order.'['.join(',',@coords).']");'."\n";     $result.='document.ggbApplet_'.$id.'.evalCommand("Spline'.$order.'['.join(',',@coords).']");'."\n";
Line 259  sub end_backgroundplot { Line 285  sub end_backgroundplot {
 }  }
   
 #  #
   # <splinerule ... />
   #
   sub start_splinerule {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
      my $result='';
      my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1];
      return $result;
   }
   
   sub end_splinerule {
      return '';
   }
   
   
   #
 # <spline label="..." order="1,2,3,4" initx="..." inity="..." scalex="..." scaley="..." />  # <spline label="..." order="1,2,3,4" initx="..." inity="..." scalex="..." scaley="..." />
 #  #
 # Unfortunately, GeoGebra seems to want all splines after everything else, so we need to store them  # Unfortunately, GeoGebra seems to want all splines after everything else, so we need to store them
Line 267  sub start_spline { Line 308  sub start_spline {
    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
    my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval);     my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval);
    $Apache::functionplotresponse::counter++;     $Apache::functionplotresponse::counter++;
      $label=~s/\W//gs;
    unless ($label) { $label='S'.$Apache::functionplotresponse::counter; }     unless ($label) { $label='S'.$Apache::functionplotresponse::counter; }
   
    my $order=&Apache::lonxml::get_param('order',$parstack,$safeeval);     my $order=&Apache::lonxml::get_param('order',$parstack,$safeeval);
    if (($order<2) || ($order>4)) { $order=2; }     if ($order<2) { $order=2; }
      if ($order>8) { $order=8; }
    $Apache::functionplotresponse::splineorder{$label}=$order;     $Apache::functionplotresponse::splineorder{$label}=$order;
   
    my $x=&Apache::lonxml::get_param('initx',$parstack,$safeeval);     my $x=&Apache::lonxml::get_param('initx',$parstack,$safeeval);
Line 303  sub end_init_script { Line 346  sub end_init_script {
 ENDENDINIT  ENDENDINIT
 }  }
   
   #
   # Storing and restoring spline coordinates from part answers
   #
   sub decode_previous_answer {
      my ($answer)=@_;
      foreach my $coordinate (split(/\,/,$answer)) {
         my ($key,$value)=split(/\=/,$coordinate);
         $Apache::functionplotresponse::previous{$key}=$value;
      }
   }
   
   sub get_answer_from_form_fields {
      my ($id)=@_;
      my $answer='';
      my %coords=();
      foreach my $field (keys(%env)) {
         if ($field=~/^form\.HWVAL\_$id/) {
            $field=~/^form\.(.*)$/;
            $coords{$1}=$env{$field};
         }
      }
      $answer=join(',',map { $_.'='.$coords{$_} } (sort(keys(%coords))));
      return ($answer,%coords);
   }
   
 sub start_functionplotresponse {  sub start_functionplotresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';    my $result='';
Line 312  sub start_functionplotresponse { Line 380  sub start_functionplotresponse {
   undef %Apache::functionplotresponse::splineinity;    undef %Apache::functionplotresponse::splineinity;
   undef %Apache::functionplotresponse::splinescalex;    undef %Apache::functionplotresponse::splinescalex;
   undef %Apache::functionplotresponse::splinescaley;    undef %Apache::functionplotresponse::splinescaley;
   # Remember input fields, etc
     undef %Apache::functionplotresponse::previous;
     $Apache::functionplotresponse::inputfields='';
   $Apache::functionplotresponse::counter=0;    $Apache::functionplotresponse::counter=0;
   # Part and ID
     my $partid=$Apache::inputtags::part;
     my $id=&Apache::response::start_response($parstack,$safeeval);
 # Internal ID to mark the applet and its coordinates  # Internal ID to mark the applet and its coordinates
   my $internalid = $Apache::inputtags::part.'_'.&Apache::response::start_response($parstack,$safeeval);    my $internalid = $partid.'_'.$id;
   # Previous answer
     &decode_previous_answer($Apache::lonhomework::history{"resource.$partid.$id.submission"});
   
 # 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=($xmin?$xmin:-10);
Line 327  sub start_functionplotresponse { Line 404  sub start_functionplotresponse {
   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');
     if ($target eq 'edit') {
   if ($target eq 'web') {      $result.=&Apache::edit::start_table($token)
          .'<tr><td><span class="LC_nobreak">'.&mt('Function Plot Question').'</span></td>'
          .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
          .&Apache::edit::deletelist($target,$token)
          .'</span></td>'
          ."<td>&nbsp;"
          .&Apache::edit::end_row()
          .&Apache::edit::start_spanning_row()
          ."\n";
       $result.=&Apache::edit::text_arg('Minimum x-value:','xmin',
                                        $token,'4').
                &Apache::edit::text_arg('Maximum x-value:','xmax',
                                        $token,'4').
                &Apache::edit::select_arg('x-axis visible:','xaxisvisible',
                                     ['yes','no'],$token).
                &Apache::edit::text_arg('Minimum y-value:','ymin',
                                        $token,'4').
                &Apache::edit::text_arg('Maximum y-value:','ymax',
                                        $token,'4').
                &Apache::edit::select_arg('y-axis visible:','yaxisvisible',
                                     ['yes','no'],$token).
                &Apache::edit::select_arg('Grid visible:','gridvisible',
                                     ['yes','no'],$token).
                &Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
       my $constructtag=&Apache::edit::get_new_args($token,$parstack,
                                                    $safeeval,'xmin','xmax','ymin','ymax',
                                                              'xaxisvisible','yaxisvisible','gridvisible');
       if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   
     } elsif ($target eq 'meta') {
          $result=&Apache::response::meta_package_write('functionplotresponse');
     } elsif ($target eq 'web') {
 # paste in the update routine to receive stuff back from the applet  # paste in the update routine to receive stuff back from the applet
      $result.=&update_script($internalid);       $result.=&update_script($internalid);
 # start the initscript for this applet  # start the initscript for this applet
Line 345  sub end_functionplotresponse { Line 454  sub end_functionplotresponse {
   &Apache::response::end_response;    &Apache::response::end_response;
   
   my $result;    my $result;
   my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1];    my $id=$Apache::inputtags::response[-1];
     my $partid=$Apache::inputtags::part;
     my $internalid = $partid.'_'.$id;
   
       if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
       if ($target eq 'grade'
            && &Apache::response::submitted()
            && $Apache::lonhomework::type eq 'exam') {
   
 #  if ($target eq 'edit') { $result=&Apache::edit::end_table(); }          #&Apache::response::scored_response($partid,$id);
   if ($target eq 'web') {  
       } elsif ($target eq 'grade'
            && &Apache::response::submitted()
            && $Apache::lonhomework::type ne 'exam') {
           my ($response,%coords)=&get_answer_from_form_fields($internalid);
           $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
           my %previous=&Apache::response::check_for_previous($response,$partid,$id);
   #
   # Actually grade
   #
           my $ad='INCORRECT';
   #
   # Store grading info
   #
           $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
           &Apache::response::handle_previous(\%previous,$ad);
      } elsif ($target eq 'web') {
 # Now is the time to render all of the stored splines  # Now is the time to render all of the stored splines
      foreach my $label (keys(%Apache::functionplotresponse::splineorder)) {       foreach my $label (keys(%Apache::functionplotresponse::splineorder)) {
         $result.=&generate_spline($internalid,$label);          $result.=&generate_spline($internalid,$label);
      }       }
 # close the init script  # close the init script
      $result.=&end_init_script();       $result.=&end_init_script();
   # generate the input fields
        $result.=$Apache::functionplotresponse::inputfields;
 # actually start the <applet>-tag  # actually start the <applet>-tag
      $result.=&geogebra_startcode($internalid);       $result.=&geogebra_startcode($internalid);
 # load the spline bytecode  # load the spline bytecode
Removed from v.1.7  
changed lines
  Added in v.1.12

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