[LON-CAPA-cvs] cvs: loncom /homework functionplotresponse.pm
www
www@source.lon-capa.org
Tue, 05 Oct 2010 00:10:07 -0000
www Tue Oct 5 00:10:07 2010 EDT
Modified files:
/loncom/homework functionplotresponse.pm
Log:
<spine>-tag
Index: loncom/homework/functionplotresponse.pm
diff -u loncom/homework/functionplotresponse.pm:1.5 loncom/homework/functionplotresponse.pm:1.6
--- loncom/homework/functionplotresponse.pm:1.5 Mon Oct 4 20:47:29 2010
+++ loncom/homework/functionplotresponse.pm Tue Oct 5 00:10:07 2010
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: functionplotresponse.pm,v 1.5 2010/10/04 20:47:29 www Exp $
+# $Id: functionplotresponse.pm,v 1.6 2010/10/05 00:10:07 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,7 +33,7 @@
use Apache::lonnet;
BEGIN {
- &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot'));
+ &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline'));
}
#
@@ -139,7 +139,27 @@
sub update_register {
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);
}
#
@@ -179,28 +199,84 @@
}
sub plot_script {
- my ($id,$function)=@_;
- return (<<ENDPLOTSCRIPT);
- document.ggbApplet_$id.evalCommand("y=$function");
+ my ($id,$function,$fixed)=@_;
+ if ($fixed) {
+# 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
+ } 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 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1];
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"; }
if ($target eq 'web') {
- $result.=&plot_script($internalid,$function);
+ $result.=&plot_script($internalid,$function,$fixed);
}
return $result;
}
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 {
@@ -214,7 +290,16 @@
sub start_functionplotresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
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);
+# Parameters of <functionplotresponse>
my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval);
$xmin=($xmin?$xmin:-10);
my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval);
@@ -223,9 +308,9 @@
$ymin=($ymin?$ymin:-10);
my $ymax=&Apache::lonxml::get_param('ymax',$parstack,$safeeval);
$ymax=($ymax?$ymax:10);
- my $xaxisvisible=(&Apache::lonxml::get_param('xaxisvisible',$parstack,$safeeval)=~/on|true|1/i?'true':'false');
- my $yaxisvisible=(&Apache::lonxml::get_param('yaxisvisible',$parstack,$safeeval)=~/on|true|1/i?'true':'false');
- my $gridvisible=(&Apache::lonxml::get_param('gridvisible',$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|yes|1/i?'true':'false');
+ my $gridvisible=(&Apache::lonxml::get_param('gridvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false');
if ($target eq 'web') {
# paste in the update routine to receive stuff back from the applet
@@ -248,6 +333,10 @@
# if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
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
$result.=&end_init_script();
# actually start the <applet>-tag