Diff for /loncom/homework/functionplotresponse.pm between versions 1.5 and 1.6

version 1.5, 2010/10/04 20:47:29 version 1.6, 2010/10/05 00:10:07
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'));    &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline'));
 }  }
   
 #  #
Line 139  ENDUPDATESCRIPT Line 139  ENDUPDATESCRIPT
   
 sub update_register {  sub update_register {
    my ($id,$variable)=@_;     my ($id,$variable)=@_;
    return "document.ggbApplet_$id.registerObjectUpdateListener('$variable','updatePointCoordinates_$id')";     return "document.ggbApplet_$id.registerObjectUpdateListener('$variable','updatePointCoordinates_$id');\n";
   }
   
   #
   # Set a coordinate variable
   #
   sub set_coordinate {
      my ($id,$variable,$x,$y)=@_;
      return (<<ENDSETVARIABLE);
   coordinateMap_$id\['$variable.x'] = $x;
   coordinateMap_$id\['$variable.y'] = $y;
   document.ggbApplet_$id.evalCommand("$variable=("+coordinateMap_$id\["$variable.x"]+","+coordinateMap_$id\["$variable.y"]+")");
   ENDSETVARIABLE
   }
   
   #
   # Initialize a new coordinate variable at set a listener on it
   #
   sub new_coordinate {
       my ($id,$variable,$x,$y)=@_;
       return &set_coordinate($id,$variable,$x,$y).&update_register($id,$variable);
 }  }
   
 #  #
Line 179  ENDAXESSCRIPT Line 199  ENDAXESSCRIPT
 }  }
   
 sub plot_script {  sub plot_script {
    my ($id,$function)=@_;     my ($id,$function,$fixed)=@_;
    return (<<ENDPLOTSCRIPT);     if ($fixed) {
             document.ggbApplet_$id.evalCommand("y=$function");  # Use stupid trick to nail this to a location
         return (<<ENDPLOTSCRIPT);
               document.ggbApplet_$id.evalCommand("a=1");
               document.ggbApplet_$id.setVisible("a",false);
               // This MUST be a DEPENDENT OBJECT in order to be locked down:
               document.ggbApplet_$id.evalCommand("y=a*($function)");
 ENDPLOTSCRIPT  ENDPLOTSCRIPT
      } else {
          return "document.ggbApplet_$id.evalCommand('y=$function')";
      }
 }  }
   
 #  #
 # <backgroundplot function="..." />  # Subroutine that generates spline $label based on stored information
   #
   
   sub generate_spline {
      my ($id,$label)=@_;
      my $result='';
      return $result;
   }
   #
   # <backgroundplot function="..." fixed="yes/no" />
 #  #
 sub start_backgroundplot {  sub start_backgroundplot {
    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
    my $result='';     my $result='';
    my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1];     my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1];
    my $function=&Apache::lonxml::get_param('function',$parstack,$safeeval);     my $function=&Apache::lonxml::get_param('function',$parstack,$safeeval);
      my $fixed=(&Apache::lonxml::get_param('fixed',$parstack,$safeeval)=~/on|true|yes|1/i?1:0);
    
    unless ($function) { $function="0"; }     unless ($function) { $function="0"; }
    if ($target eq 'web') {     if ($target eq 'web') {
       $result.=&plot_script($internalid,$function);        $result.=&plot_script($internalid,$function,$fixed);
    }     }
    return $result;     return $result;
 }  }
   
 sub end_backgroundplot {  sub end_backgroundplot {
      return '';
   }
   
   #
   # <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
   #
   sub start_spline {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
      my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval);
      $Apache::functionplotresponse::counter++;
      unless ($label) { $label='S'.$Apache::functionplotresponse::counter; }
   
      my $order=&Apache::lonxml::get_param('order',$parstack,$safeeval);
      if (($order<2) || ($order>4)) { $order=2; }
      $Apache::functionplotresponse::splineorder{$label}=$order;
   
      my $x=&Apache::lonxml::get_param('initx',$parstack,$safeeval);
      unless ($x) { $x=0; }
      $Apache::functionplotresponse::splineinitx{$label}=$x;
   
      my $y=&Apache::lonxml::get_param('inity',$parstack,$safeeval);
      unless ($y) { $y=0; }
      $Apache::functionplotresponse::splineinity{$label}=$y;
   
      my $sx=&Apache::lonxml::get_param('scalex',$parstack,$safeeval);
      unless ($sx) { $sx=$order; }
      $Apache::functionplotresponse::splinescalex{$label}=$sx;
   
      my $sy=&Apache::lonxml::get_param('scaley',$parstack,$safeeval);
      unless ($sy) { $sy=2; }
      $Apache::functionplotresponse::splinescaley{$label}=$sy;
   }
   
   sub end_spline {
      return '';
 }  }
     
 sub end_init_script {  sub end_init_script {
Line 214  ENDENDINIT Line 290  ENDENDINIT
 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='';
   # To remember the splines - somehow, they need to come last
     undef %Apache::functionplotresponse::splineorder;
     undef %Apache::functionplotresponse::splineinitx;
     undef %Apache::functionplotresponse::splineinity;
     undef %Apache::functionplotresponse::splinescalex;
     undef %Apache::functionplotresponse::splinescaley;
     $Apache::functionplotresponse::counter=0;
   # Internal ID to mark the applet and its coordinates
   my $internalid = $Apache::inputtags::part.'_'.&Apache::response::start_response($parstack,$safeeval);    my $internalid = $Apache::inputtags::part.'_'.&Apache::response::start_response($parstack,$safeeval);
   # 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);
   my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval);    my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval);
Line 223  sub start_functionplotresponse { Line 308  sub start_functionplotresponse {
   $ymin=($ymin?$ymin:-10);    $ymin=($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=($ymax?$ymax:10);
   my $xaxisvisible=(&Apache::lonxml::get_param('xaxisvisible',$parstack,$safeeval)=~/on|true|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|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|1/i?'true':'false');    my $gridvisible=(&Apache::lonxml::get_param('gridvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false');
   
   if ($target eq 'web') {    if ($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
Line 248  sub end_functionplotresponse { Line 333  sub end_functionplotresponse {
   
 #  if ($target eq 'edit') { $result=&Apache::edit::end_table(); }  #  if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
   if ($target eq 'web') {    if ($target eq 'web') {
   # Now is the time to render all of the stored splines
        foreach my $label (keys(%Apache::functionplotresponse::splineorder)) {
           $result.=&generate_spline($internalid,$label);
        }
 # close the init script  # close the init script
      $result.=&end_init_script();       $result.=&end_init_script();
 # actually start the <applet>-tag  # actually start the <applet>-tag

Removed from v.1.5  
changed lines
  Added in v.1.6


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