--- loncom/homework/functionplotresponse.pm 2011/04/04 21:06:46 1.59 +++ loncom/homework/functionplotresponse.pm 2011/05/27 23:00:58 1.63 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: functionplotresponse.pm,v 1.59 2011/04/04 21:06:46 www Exp $ +# $Id: functionplotresponse.pm,v 1.63 2011/05/27 23:00:58 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -74,8 +74,8 @@ sub geogebra_default_parameters { - - + + @@ -380,7 +380,7 @@ sub answer_spline_script { if ($order<2) { $order=2; } if ($order>8) { $order=8; } $Apache::functionplotresponse::counter++; - my $label='C'.$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]),"; @@ -388,8 +388,12 @@ sub answer_spline_script { $output=~s/\,$//; $output.=']");'."\n"; for (my $i=2; $i<2*$order; $i+=2) { - $output.='document.ggbApplet_'.$id.'.setColor("'.$label.'_'.$i.'",0,170,0);'."\n"; + $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; } @@ -876,8 +880,7 @@ sub start_functionplotresponse { &Apache::edit::select_arg('Grid visible:','gridvisible', ['yes','no'],$token).'
'. &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(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack,