version 1.8, 2010/10/08 23:26:04
|
version 1.15, 2010/10/19 02:04:27
|
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 198 sub axes_script {
|
Line 224 sub axes_script {
|
ENDAXESSCRIPT |
ENDAXESSCRIPT |
} |
} |
|
|
|
sub axes_label { |
|
my ($id,$xlabel,$ylabel)=@_; |
|
unless ($xlabel || $ylabel) { return ''; } |
|
my $return='document.ggbApplet_'.$id.'.evalCommand("topRight=Corner[3]");'; |
|
if ($xlabel) { |
|
$return.=(<<ENDXAXISLABELSCRIPT); |
|
document.ggbApplet_$id.evalCommand("Xlabel=(x(topRight)-AxisStepX[],AxisStepY[]/6)"); |
|
document.ggbApplet_$id.setVisible("Xlabel",false); |
|
document.ggbApplet_$id.evalCommand("Text[\\"$xlabel\\", Xlabel]"); |
|
ENDXAXISLABELSCRIPT |
|
} |
|
if ($ylabel) { |
|
$return.=(<<ENDYAXISLABELSCRIPT); |
|
document.ggbApplet_$id.evalCommand("Ylabel=(AxisStepX[]/6,y(topRight)-AxisStepY[]/3)"); |
|
document.ggbApplet_$id.setVisible("Ylabel",false); |
|
document.ggbApplet_$id.evalCommand("Text[\\"$ylabel\\", Ylabel]"); |
|
ENDYAXISLABELSCRIPT |
|
} |
|
return $return; |
|
} |
|
|
sub plot_script { |
sub plot_script { |
my ($id,$function,$fixed)=@_; |
my ($id,$function,$fixed)=@_; |
if ($fixed) { |
if ($fixed) { |
# Use stupid trick to nail this to a location |
# Use stupid trick to nail this to a location |
|
# Oddly, it seems like only one plot cannot be nailed to a location |
|
# Non-nailed-down plots apparently get overwritten |
return (<<ENDPLOTSCRIPT); |
return (<<ENDPLOTSCRIPT); |
document.ggbApplet_$id.evalCommand("a=1"); |
document.ggbApplet_$id.evalCommand("a=1"); |
document.ggbApplet_$id.setVisible("a",false); |
document.ggbApplet_$id.setVisible("a",false); |
Line 250 sub start_backgroundplot {
|
Line 299 sub start_backgroundplot {
|
unless ($function) { $function="0"; } |
unless ($function) { $function="0"; } |
if ($target eq 'web') { |
if ($target eq 'web') { |
$result.=&plot_script($internalid,$function,$fixed); |
$result.=&plot_script($internalid,$function,$fixed); |
|
} elsif ($target eq 'edit') { |
|
$result=&Apache::edit::tag_start($target,$token,'Background Function Plot'). |
|
&Apache::edit::text_arg('Function:','function', |
|
$token,'16'). |
|
&Apache::edit::select_arg('Fixed location:','fixed', |
|
['yes','no'],$token). |
|
&Apache::edit::end_row(); |
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
|
$safeeval,'function','fixed'); |
|
if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } |
|
} |
|
return $result; |
|
} |
|
|
|
sub end_backgroundplot { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
my $result=''; |
|
if ($target eq 'edit') { |
|
$result=&Apache::edit::end_table(); |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
sub end_backgroundplot { |
# |
return ''; |
# <splinerule ... /> |
|
# |
|
sub start_splinerule { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
my $result=''; |
|
my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1]; |
|
if ($target eq 'edit') { |
|
$result=&Apache::edit::tag_start($target,$token,'Spline Evaluation Rule'). |
|
&Apache::edit::end_row(); |
|
} |
|
return $result; |
} |
} |
|
|
|
sub end_splinerule { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
my $result=''; |
|
if ($target eq 'edit') { |
|
$result=&Apache::edit::end_table(); |
|
} |
|
return $result; |
|
} |
|
|
|
|
# |
# |
# <spline label="..." order="1,2,3,4" initx="..." inity="..." scalex="..." scaley="..." /> |
# <spline label="..." order="1,2,3,4" initx="..." inity="..." scalex="..." scaley="..." /> |
# |
# |
Line 265 sub end_backgroundplot {
|
Line 354 sub end_backgroundplot {
|
# |
# |
sub start_spline { |
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 $result=''; |
$Apache::functionplotresponse::counter++; |
if ($target eq 'web') { |
unless ($label) { $label='S'.$Apache::functionplotresponse::counter; } |
my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval); |
|
$Apache::functionplotresponse::counter++; |
my $order=&Apache::lonxml::get_param('order',$parstack,$safeeval); |
if ($label=~/\W/) { |
if ($order<2) { $order=2; } |
&Apache::lonxml::warning(&mt('Spline labels should only contain alphanumeric characters.')); |
if ($order>8) { $order=8; } |
} |
$Apache::functionplotresponse::splineorder{$label}=$order; |
$label=~s/\W//gs; |
|
unless ($label) { $label='S'.$Apache::functionplotresponse::counter; } |
my $x=&Apache::lonxml::get_param('initx',$parstack,$safeeval); |
if ($Apache::functionplotresponse::splineorder{$label}) { |
unless ($x) { $x=0; } |
&Apache::lonxml::error(&mt('Spline labels must be unique.')); |
$Apache::functionplotresponse::splineinitx{$label}=$x; |
} |
|
|
my $y=&Apache::lonxml::get_param('inity',$parstack,$safeeval); |
my $order=&Apache::lonxml::get_param('order',$parstack,$safeeval); |
unless ($y) { $y=0; } |
if ($order<2) { $order=2; } |
$Apache::functionplotresponse::splineinity{$label}=$y; |
if ($order>8) { $order=8; } |
|
$Apache::functionplotresponse::splineorder{$label}=$order; |
my $sx=&Apache::lonxml::get_param('scalex',$parstack,$safeeval); |
|
unless ($sx) { $sx=$order; } |
my $x=&Apache::lonxml::get_param('initx',$parstack,$safeeval); |
$Apache::functionplotresponse::splinescalex{$label}=$sx; |
unless ($x) { $x=0; } |
|
$Apache::functionplotresponse::splineinitx{$label}=$x; |
my $sy=&Apache::lonxml::get_param('scaley',$parstack,$safeeval); |
|
unless ($sy) { $sy=2; } |
my $y=&Apache::lonxml::get_param('inity',$parstack,$safeeval); |
$Apache::functionplotresponse::splinescaley{$label}=$sy; |
unless ($y) { $y=0; } |
return ''; |
$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; |
|
} elsif ($target eq 'edit') { |
|
$result=&Apache::edit::tag_start($target,$token,'Spline'). |
|
&Apache::edit::text_arg('Label:','label', |
|
$token,'4').' '. |
|
&Apache::edit::select_arg('Order:','order', |
|
['2','3','4','5','6','7','8','9'],$token).' '. |
|
&Apache::edit::text_arg('Initial x-value:','initx', |
|
$token,'4').' '. |
|
&Apache::edit::text_arg('Initial y-value:','inity', |
|
$token,'4').' '. |
|
&Apache::edit::text_arg('Scale x:','scalex', |
|
$token,'4').' '. |
|
&Apache::edit::text_arg('Scale y:','scaley', |
|
$token,'4'). |
|
&Apache::edit::end_row(); |
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
|
$safeeval,'label','order','initx','inity', |
|
'scalex','scaley'); |
|
if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } |
|
} |
|
return $result; |
} |
} |
|
|
sub end_spline { |
sub end_spline { |
return ''; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
my $result=''; |
|
if ($target eq 'edit') { |
|
$result=&Apache::edit::end_table(); |
|
} |
|
return $result; |
} |
} |
|
|
sub end_init_script { |
sub end_init_script { |
Line 304 sub end_init_script {
|
Line 428 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); |
|
} |
|
|
|
# |
|
# The following functions calculate the cubic-hermite splines server-side |
|
# |
|
|
|
sub cubic_hermite { |
|
my ($t,$p1,$s1,$p2,$s2)=@_; |
|
return (2.*$t*$t*$t-3.*$t*$t+1.)*$p1 + 5.*($t*$t*$t-2.*$t*$t+$t)*($s1-$p1)+ |
|
(-2.*$t*$t*$t+3.*$t*$t) *$p2 + 5.*($t*$t*$t-$t*$t) *($s2-$p2); |
|
} |
|
|
|
# |
|
# d/dt(...) |
|
# |
|
|
|
sub ddt_cubic_hermite { |
|
my ($t,$p1,$s1,$p2,$s2)=@_; |
|
return (6.*$t*$t-6.*$t) *$p1 + 5.*(3.*$t*$t-4.*$t+1.)*($s1-$p1)+ |
|
(-6.*$t*$t+6.*$t)*$p2 + 5.*(3.*$t*$t-2.*$t) *($s2-$p2); |
|
} |
|
|
|
# |
|
# d^2/dt^2(...) |
|
# |
|
|
|
sub d2dt2_cubic_hermite { |
|
my ($t,$p1,$s1,$p2,$s2)=@_; |
|
return (12.*$t-6.) *$p1 + 5.*(6.*$t-4.)*($s1-$p1)+ |
|
(-12.*$t+6.)*$p2 + 5.*(6.*$t-2.)*($s2-$p2); |
|
} |
|
|
|
# |
|
# Implentation of <functionplotresponse> |
|
# |
|
|
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 313 sub start_functionplotresponse {
|
Line 496 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 328 sub start_functionplotresponse {
|
Line 520 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'); |
|
my $xlabel=&Apache::lonxml::get_param('xlabel',$parstack,$safeeval); |
if ($target eq 'web') { |
my $ylabel=&Apache::lonxml::get_param('ylabel',$parstack,$safeeval); |
|
if ($target eq 'edit') { |
|
$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> " |
|
.&Apache::edit::end_row() |
|
.&Apache::edit::start_spanning_row() |
|
."\n"; |
|
$result.=&Apache::edit::text_arg('Label x-axis:','xlabel', |
|
$token,'6').' '. |
|
&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('Label y-axis:','ylabel', |
|
$token,'6').' '. |
|
&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,'xlabel','xmin','xmax','ylabel','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 |
$result.=&start_init_script($internalid); |
$result.=&start_init_script($internalid); |
# put the axis commands inside |
# put the axis commands inside |
$result.=&axes_script($internalid,$xmin,$xmax,$ymin,$ymax,$xaxisvisible,$yaxisvisible,$gridvisible); |
$result.=&axes_script($internalid,$xmin,$xmax,$ymin,$ymax,$xaxisvisible,$yaxisvisible,$gridvisible); |
|
$result.=&axes_label($internalid,$xlabel,$ylabel); |
# init script is left open |
# init script is left open |
} |
} |
return $result; |
return $result; |
Line 346 sub end_functionplotresponse {
|
Line 577 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') { |
|
|
|
#&Apache::response::scored_response($partid,$id); |
|
|
# if ($target eq 'edit') { $result=&Apache::edit::end_table(); } |
} elsif ($target eq 'grade' |
if ($target eq 'web') { |
&& &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 |