--- loncom/homework/functionplotresponse.pm 2010/10/04 20:47:29 1.5
+++ loncom/homework/functionplotresponse.pm 2010/10/09 20:02:02 1.11
@@ -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.11 2010/10/09 20:02:02 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,7 +33,7 @@ use Apache::lonlocal;
use Apache::lonnet;
BEGIN {
- &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot'));
+ &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline'));
}
#
@@ -116,6 +116,7 @@ ENDGGBINIT
#
# Each Geogebra applet is supposed to call this when parameters change
+# Changes the hidden fields on the web page
#
sub update_script {
my ($id)=@_;
@@ -125,8 +126,8 @@ sub update_script {
function updatePointCoordinates_$id(coordinateName) {
var x = document.ggbApplet_$id.getXcoord(coordinateName);
var y = document.ggbApplet_$id.getYcoord(coordinateName);
- coordinateMap_$id\[coordinateName + ".x"] = x;
- coordinateMap_$id\[coordinateName + ".y"] = y;
+ document.lonhomework.elements["HWVAL_$id\_" + coordinateName + "_x"].value = x;
+ document.lonhomework.elements["HWVAL_$id\_" + coordinateName + "_y"].value = y;
}
// ]]>
@@ -139,7 +140,52 @@ ENDUPDATESCRIPT
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 (<\n".
+ "\n";
+}
+
+#
+# Initialize a new coordinate variable at set a listener on it
+#
+sub new_coordinate {
+ 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);
}
#
@@ -179,28 +225,102 @@ ENDAXESSCRIPT
}
sub plot_script {
- my ($id,$function)=@_;
- return (<
+# Subroutine that generates code for spline $label based on stored information
+#
+
+sub generate_spline {
+ my ($id,$label)=@_;
+ my $result='';
+ my $order=$Apache::functionplotresponse::splineorder{$label};
+ my $x=$Apache::functionplotresponse::splineinitx{$label};
+ my $y=$Apache::functionplotresponse::splineinity{$label};
+ my $sx=$Apache::functionplotresponse::splinescalex{$label};
+ my $sy=$Apache::functionplotresponse::splinescaley{$label};
+ my @coords=();
+ foreach my $i (1..$order) {
+ $result.=&new_coordinate($id,$label.'P'.$i,$x,$y);
+ $x+=$sx/(2.*($order-1));
+ push(@coords,$label.'P'.$i);
+ $result.=&new_coordinate($id,$label.'S'.$i,$x,$y+$sy);
+ $x+=$sx/(2.*($order-1));
+ push(@coords,$label.'S'.$i);
+ }
+ $result.='document.ggbApplet_'.$id.'.evalCommand("Spline'.$order.'['.join(',',@coords).']");'."\n";
+ return $result;
+}
+#
+#
#
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 '';
+}
+
+#
+#
+#
+# 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++;
+ $label=~s/\W//gs;
+ unless ($label) { $label='S'.$Apache::functionplotresponse::counter; }
+
+ my $order=&Apache::lonxml::get_param('order',$parstack,$safeeval);
+ if ($order<2) { $order=2; }
+ if ($order>8) { $order=8; }
+ $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;
+ return '';
+}
+
+sub end_spline {
+ return '';
}
sub end_init_script {
@@ -211,10 +331,53 @@ sub end_init_script {
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 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- my $internalid = $Apache::inputtags::part.'_'.&Apache::response::start_response($parstack,$safeeval);
+# 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;
+# Remember input fields, etc
+ undef %Apache::functionplotresponse::previous;
+ $Apache::functionplotresponse::inputfields='';
+ $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
+ my $internalid = $partid.'_'.$id;
+# Previous answer
+ &decode_previous_answer($Apache::lonhomework::history{"resource.$partid.$id.submission"});
+
+# Parameters of
my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval);
$xmin=($xmin?$xmin:-10);
my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval);
@@ -223,11 +386,13 @@ sub start_functionplotresponse {
$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');
-
- if ($target eq 'web') {
+ 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 'meta') {
+ $result=&Apache::response::meta_package_write('functionplotresponse');
+ } elsif ($target eq 'web') {
# paste in the update routine to receive stuff back from the applet
$result.=&update_script($internalid);
# start the initscript for this applet
@@ -244,12 +409,33 @@ sub end_functionplotresponse {
&Apache::response::end_response;
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 'web') {
+ if ($target eq 'grade'
+ && &Apache::response::submitted()
+ && $Apache::lonhomework::type eq 'exam') {
+
+ #&Apache::response::scored_response($partid,$id);
+
+ } 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;
+ $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}='INCORRECT';
+
+ } elsif ($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();
+# generate the input fields
+ $result.=$Apache::functionplotresponse::inputfields;
# actually start the