version 1.13, 2010/10/10 00:14:15
|
version 1.18, 2010/10/30 02:31:27
|
Line 101 ENDDEFAULTPARAMETERS
|
Line 101 ENDDEFAULTPARAMETERS
|
# |
# |
|
|
sub init_script { |
sub init_script { |
if ($Apache::functionplotresponse::callscripts) { |
if ($#Apache::functionplotresponse::callscripts>=0) { |
|
my $script=''; |
|
foreach my $id (@Apache::functionplotresponse::callscripts) { |
|
$script.="if (param=='applet_$id') { loaded_$id=true; }\n"; |
|
} |
|
$script.="if (".join(' && ',map { "loaded_$_" } (@Apache::functionplotresponse::callscripts)). |
|
") { setTimeout('ggbInitAll()',20) }"; |
|
my $calls=join("\n",map { "ggbInit_$_();" } (@Apache::functionplotresponse::callscripts)); |
return (<<ENDGGBINIT); |
return (<<ENDGGBINIT); |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
|
// Function that each applet will call when loaded |
|
// It will pass "its" parameter |
|
// Set flags for when an applet is loaded, wait till all are loaded, and then some |
function ggbOnInit(param) { |
function ggbOnInit(param) { |
$Apache::functionplotresponse::callscripts |
$script |
|
} |
|
function ggbInitAll() { |
|
$calls |
} |
} |
// ]]> |
// ]]> |
</script> |
</script> |
Line 194 sub new_coordinate {
|
Line 207 sub new_coordinate {
|
# |
# |
sub start_init_script { |
sub start_init_script { |
my ($id)=@_; |
my ($id)=@_; |
# Add a line to ggbOnInit-function which calls the right function based on parameter passed from GeoGebra |
# Add id to the list of ggbInit_$id functions that need to be called |
$Apache::functionplotresponse::callscripts.="if (param=='applet_$id') { ggbInit_$id(); }\n"; |
push(@Apache::functionplotresponse::callscripts,$id); |
# ... and open this function |
# ... and open this function |
return (<<ENDSTARTINIT); |
return (<<ENDSTARTINIT); |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
// variable that will eventually be passed back to the server |
// variable that will eventually be passed back to the server |
var coordinateMap_$id = []; |
var coordinateMap_$id = []; |
|
// flag for not loaded yet |
|
var loaded_$id=false; |
// Init-function for applet |
// Init-function for applet |
function ggbInit_$id() { |
function ggbInit_$id() { |
ENDSTARTINIT |
ENDSTARTINIT |
Line 224 sub axes_script {
|
Line 239 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 367 sub start_spline {
|
Line 405 sub start_spline {
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::tag_start($target,$token,'Spline'). |
$result=&Apache::edit::tag_start($target,$token,'Spline'). |
&Apache::edit::text_arg('Label:','label', |
&Apache::edit::text_arg('Label:','label', |
$token,'4'). |
$token,'4').' '. |
&Apache::edit::select_arg('Order:','order', |
&Apache::edit::select_arg('Order:','order', |
['2','3','4','5','6','7','8','9'],$token). |
['2','3','4','5','6','7','8','9'],$token).' '. |
&Apache::edit::text_arg('Initial x-value:','initx', |
&Apache::edit::text_arg('Initial x-value:','initx', |
$token,'4'). |
$token,'4').' '. |
&Apache::edit::text_arg('Initial y-value:','inity', |
&Apache::edit::text_arg('Initial y-value:','inity', |
$token,'4'). |
$token,'4').' '. |
&Apache::edit::text_arg('Scale x:','scalex', |
&Apache::edit::text_arg('Scale x:','scalex', |
$token,'4'). |
$token,'4').' '. |
&Apache::edit::text_arg('Scale y:','scaley', |
&Apache::edit::text_arg('Scale y:','scaley', |
$token,'4'). |
$token,'4'). |
&Apache::edit::end_row(); |
&Apache::edit::end_row(); |
Line 430 sub get_answer_from_form_fields {
|
Line 468 sub get_answer_from_form_fields {
|
return ($answer,%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); |
|
} |
|
|
|
# |
|
# Array index calculation |
|
# |
|
sub array_index { |
|
my ($xmin,$xmax,$x)=@_; |
|
my $index=int(($x-$xmin)/($xmax-$xmin)*200.+0.5); |
|
return $index; |
|
} |
|
|
|
# |
|
# Populate the arrays |
|
# |
|
|
|
sub populate_arrays { |
|
my ($id,$xmin,$xmax)=@_; |
|
for (my $i=0; $i<=200; $i++) { |
|
undef $Apache::functionplotresponse::func[$i]; |
|
undef $Apache::functionplotresponse::dfunddx[$i]; |
|
undef $Apache::functionplotresponse::d2funcd2x[$i]; |
|
} |
|
unless ($xmax>$xmin) { return; } |
|
# Run over all splines in response |
|
foreach my $label (split(/\,/,$env{"form.HWVAL_AllSplines_$id"})) { |
|
# Run over all points in spline |
|
for (my $i=0; $i<$env{"form.HWVAL_SplineOrder_".$id."_".$label}; $i++) { |
|
my $xiold=-1; |
|
my $ni=$i+1; |
|
my @xparms=($env{'form.HWVAL_'.$id.'_'.$label.'P'.$i.'_x'}, |
|
$env{'form.HWVAL_'.$id.'_'.$label.'S'.$i.'_x'}, |
|
$env{'form.HWVAL_'.$id.'_'.$label.'P'.$ni.'_x'}, |
|
$env{'form.HWVAL_'.$id.'_'.$label.'S'.$ni.'_x'}); |
|
my @yparms=($env{'form.HWVAL_'.$id.'_'.$label.'P'.$i.'_y'}, |
|
$env{'form.HWVAL_'.$id.'_'.$label.'S'.$i.'_y'}, |
|
$env{'form.HWVAL_'.$id.'_'.$label.'P'.$ni.'_y'}, |
|
$env{'form.HWVAL_'.$id.'_'.$label.'S'.$ni.'_y'}); |
|
|
|
# Run in small steps over spline parameter |
|
for (my $t=0; $t<=1; $t+=0.00025) { |
|
my $xi=&array_index($xmin,$xmax,&cubic_hermite($t,@xparms)); |
|
if ($xi<$xiold-5) { return 'no_func'; } |
|
if ($xi>$xiold) { |
|
$xiold=$xi; |
|
$Apache::functionplotresponse::func[$xi]=&cubic_hermite($t,@yparms); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
|
|
# |
|
# 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 453 sub start_functionplotresponse {
|
Line 574 sub start_functionplotresponse {
|
|
|
# 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=(defined($xmin)?$xmin:-10); |
my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval); |
my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval); |
$xmax=($xmax?$xmax:10); |
$xmax=(defined($xmax)?$xmax:10); |
my $ymin=&Apache::lonxml::get_param('ymin',$parstack,$safeeval); |
my $ymin=&Apache::lonxml::get_param('ymin',$parstack,$safeeval); |
$ymin=($ymin?$ymin:-10); |
$ymin=(defined($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=(defined($ymax)?$ymax:10); |
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); |
|
my $ylabel=&Apache::lonxml::get_param('ylabel',$parstack,$safeeval); |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
$result.=&Apache::edit::start_table($token) |
$result.=&Apache::edit::start_table($token) |
.'<tr><td><span class="LC_nobreak">'.&mt('Function Plot Question').'</span></td>' |
.'<tr><td><span class="LC_nobreak">'.&mt('Function Plot Question').'</span></td>' |
Line 473 sub start_functionplotresponse {
|
Line 596 sub start_functionplotresponse {
|
.&Apache::edit::end_row() |
.&Apache::edit::end_row() |
.&Apache::edit::start_spanning_row() |
.&Apache::edit::start_spanning_row() |
."\n"; |
."\n"; |
$result.=&Apache::edit::text_arg('Minimum x-value:','xmin', |
$result.=&Apache::edit::text_arg('Label x-axis:','xlabel', |
$token,'4'). |
$token,'6').' '. |
|
&Apache::edit::text_arg('Minimum x-value:','xmin', |
|
$token,'4').' '. |
&Apache::edit::text_arg('Maximum x-value:','xmax', |
&Apache::edit::text_arg('Maximum x-value:','xmax', |
$token,'4'). |
$token,'4').' '. |
&Apache::edit::select_arg('x-axis visible:','xaxisvisible', |
&Apache::edit::select_arg('x-axis visible:','xaxisvisible', |
['yes','no'],$token). |
['yes','no'],$token).' '. |
|
&Apache::edit::text_arg('Label y-axis:','ylabel', |
|
$token,'6').' '. |
&Apache::edit::text_arg('Minimum y-value:','ymin', |
&Apache::edit::text_arg('Minimum y-value:','ymin', |
$token,'4'). |
$token,'4').' '. |
&Apache::edit::text_arg('Maximum y-value:','ymax', |
&Apache::edit::text_arg('Maximum y-value:','ymax', |
$token,'4'). |
$token,'4').' '. |
&Apache::edit::select_arg('y-axis visible:','yaxisvisible', |
&Apache::edit::select_arg('y-axis visible:','yaxisvisible', |
['yes','no'],$token). |
['yes','no'],$token).' '. |
&Apache::edit::select_arg('Grid visible:','gridvisible', |
&Apache::edit::select_arg('Grid visible:','gridvisible', |
['yes','no'],$token). |
['yes','no'],$token). |
&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
$safeeval,'xmin','xmax','ymin','ymax', |
$safeeval,'xlabel','xmin','xmax','ylabel','ymin','ymax', |
'xaxisvisible','yaxisvisible','gridvisible'); |
'xaxisvisible','yaxisvisible','gridvisible'); |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
|
|
Line 503 sub start_functionplotresponse {
|
Line 630 sub start_functionplotresponse {
|
$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 533 sub end_functionplotresponse {
|
Line 661 sub end_functionplotresponse {
|
# |
# |
# Actually grade |
# Actually grade |
# |
# |
my $ad='INCORRECT'; |
my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval); |
|
$xmin=(defined($xmin)?$xmin:-10); |
|
my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval); |
|
$xmax=(defined($xmax)?$xmax:10); |
|
my $ad; |
|
if (&populate_arrays($internalid,$xmin,$xmax) eq 'no_func') { |
|
$ad='BAD_FORMULA'; |
|
} else { |
|
$ad='INCORRECT'; |
|
} |
# |
# |
# Store grading info |
# Store grading info |
# |
# |
Line 546 sub end_functionplotresponse {
|
Line 683 sub end_functionplotresponse {
|
} |
} |
# close the init script |
# close the init script |
$result.=&end_init_script(); |
$result.=&end_init_script(); |
|
# register all splines in this response |
|
$result.='<input type="hidden" name="HWVAL_AllSplines_'.$internalid.'" value="'. |
|
join(',',keys(%Apache::functionplotresponse::splineorder)).'" />'."\n"; |
|
foreach my $label (keys(%Apache::functionplotresponse::splineorder)) { |
|
$result.='<input type="hidden" name="HWVAL_SplineOrder_'.$internalid.'_'.$label.'" value="'. |
|
$Apache::functionplotresponse::splineorder{$label}.'" />'."\n"; |
|
} |
# generate the input fields |
# generate the input fields |
$result.=$Apache::functionplotresponse::inputfields; |
$result.=$Apache::functionplotresponse::inputfields; |
# actually start the <applet>-tag |
# actually start the <applet>-tag |