version 1.57, 2011/03/31 16:10:07
|
version 1.63, 2011/05/27 23:00:58
|
Line 74 sub geogebra_default_parameters {
|
Line 74 sub geogebra_default_parameters {
|
<param name="image" value="/adm/lonIcons/lonanim.gif" /> |
<param name="image" value="/adm/lonIcons/lonanim.gif" /> |
<param name="boxborder" value="false" /> |
<param name="boxborder" value="false" /> |
<param name="centerimage" value="true" /> |
<param name="centerimage" value="true" /> |
<param name="cache_archive" value="geogebra.jar, geogebra_main.jar, geogebra_gui.jar, geogebra_cas.jar, geogebra_algos.jar, geogebra_export.jar, geogebra_javascript.jar, jlatexmath.jar, jlm_greek.jar, jlm_cyrillic.jar, geogebra_properties.jar" /> |
<param name="cache_archive" value="geogebra.jar, geogebra_main.jar, geogebra_gui.jar, geogebra_cas.jar, geogebra_export.jar, geogebra_algos.jar, geogebra_javascript.jar, geogebra_properties.jar, jlatexmath.jar, jlm_cyrillic.jar, jlm_greek.jar" /> |
<param name="cache_version" value="3.9.214.0, 3.9.214.0, 3.9.214.0, 3.9.214.0, 3.9.214.0, 3.9.214.0, 3.9.214.0, 3.9.214.0, 3.9.214.0, 3.9.214.0, 3.9.214.0" /> |
<param name="cache_version" value="3.9.219.0, 3.9.219.0, 3.9.219.0, 3.9.219.0, 3.9.219.0, 3.9.219.0, 3.9.219.0, 3.9.219.0, 3.9.219.0, 3.9.219.0, 3.9.219.0" /> |
<param name="framePossible" value="false" /> |
<param name="framePossible" value="false" /> |
|
|
<param name="showResetIcon" value="false" /> |
<param name="showResetIcon" value="false" /> |
Line 333 ENDYOFFAXISLABEL
|
Line 333 ENDYOFFAXISLABEL
|
return $return; |
return $return; |
} |
} |
|
|
|
# |
|
# Subroutine to produce background and answer plots |
|
# |
|
|
sub plot_script { |
sub plot_script { |
my ($id,$function,$fixed,$label,$color,$xmin,$xmax,$thickness)=@_; |
my ($id,$function,$fixed,$label,$color,$xmin,$xmax,$thickness)=@_; |
$label=~s/\W//g; |
$label=~s/\W//g; |
Line 366 sub plot_script {
|
Line 370 sub plot_script {
|
} |
} |
|
|
# |
# |
|
# Answer spline display |
|
# |
|
# points: x,y,slope_x,slope_y |
|
|
|
sub answer_spline_script { |
|
my ($id,@points)=@_; |
|
my $order=int(($#points+1)/4); |
|
if ($order<2) { $order=2; } |
|
if ($order>8) { $order=8; } |
|
$Apache::functionplotresponse::counter++; |
|
my $label='CSpline'.$Apache::functionplotresponse::counter; |
|
my $output='document.ggbApplet_'.$id.'.evalCommand("'.$label.'=Spline'.$order.'['; |
|
for (my $i=0;$i<=$#points;$i+=4) { |
|
$output.="($points[$i],$points[$i+1]),($points[$i+2],$points[$i+3]),"; |
|
} |
|
$output=~s/\,$//; |
|
$output.=']");'."\n"; |
|
for (my $i=2; $i<2*$order; $i+=2) { |
|
$output.='document.ggbApplet_'.$id.'.setColor("'.$label.'_'.($i>=10?'{':'').$i.($i>=10?'}':'').'",0,170,0);'."\n"; |
|
} |
|
for (my $i=1; $i<2*$order; $i+=2) { |
|
$output.='document.ggbApplet_'.$id.'.setVisible("'.$label.'_'.($i>=10?'{':'').$i.($i>=10?'}':'').'",false);'."\n"; |
|
} |
|
|
|
return $output; |
|
} |
|
|
|
# |
# Subroutine that generates code for spline $label based on stored information |
# Subroutine that generates code for spline $label based on stored information |
# |
# |
|
|
Line 847 sub start_functionplotresponse {
|
Line 879 sub start_functionplotresponse {
|
['yes','no'],$token).'<br />'. |
['yes','no'],$token).'<br />'. |
&Apache::edit::select_arg('Grid visible:','gridvisible', |
&Apache::edit::select_arg('Grid visible:','gridvisible', |
['yes','no'],$token).'<br />'. |
['yes','no'],$token).'<br />'. |
&Apache::edit::text_arg('Background plot(s) for answer (function:xmin:xmax,function:xmin:xmax,...):', |
&Apache::edit::text_arg('Background plot(s) for answer (function(x):xmin:xmax,function(x):xmin:xmax,x1:y1:sx1:sy1:x2:y2:sx2:sy2,...):', |
'answerdisplay',$token,'50'); |
'answerdisplay',$token,'50'). |
|
|
&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, |
Line 1219 sub end_functionplotelements {
|
Line 1250 sub end_functionplotelements {
|
my $answerdisplay=&Apache::lonxml::get_param('answerdisplay',$parstack,$safeeval,-2); |
my $answerdisplay=&Apache::lonxml::get_param('answerdisplay',$parstack,$safeeval,-2); |
if ($answerdisplay=~/\S/s) { |
if ($answerdisplay=~/\S/s) { |
foreach my $plot (split(/\s*\,\s*/,$answerdisplay)) { |
foreach my $plot (split(/\s*\,\s*/,$answerdisplay)) { |
my ($func,$xl,$xh)=split(/\s*\:\s*/,$plot); |
my @components=split(/\s*\:\s*/,$plot); |
if ((!defined($xl)) || ($xl eq '')) { $xl=$xmin; } |
if ($#components<3) { |
if ((!defined($xh)) || ($xh eq '')) { $xh=$xmax; } |
# Just a simple plot |
$result.=&plot_script($internalid,$func,1,'','00aa00',$xl,$xh,6); |
my ($func,$xl,$xh)=@components; |
|
if ((!defined($xl)) || ($xl eq '')) { $xl=$xmin; } |
|
if ((!defined($xh)) || ($xh eq '')) { $xh=$xmax; } |
|
$result.=&plot_script($internalid,$func,1,'','00aa00',$xl,$xh,6); |
|
} else { |
|
# This is a spline |
|
$result.=&answer_spline_script($internalid,@components); |
|
} |
} |
} |
} |
} |
} |
} |