--- loncom/homework/functionplotresponse.pm 2011/12/10 18:10:56 1.90 +++ loncom/homework/functionplotresponse.pm 2012/02/28 15:46:55 1.92 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # Functionplot responses # -# $Id: functionplotresponse.pm,v 1.90 2011/12/10 18:10:56 www Exp $ +# $Id: functionplotresponse.pm,v 1.92 2012/02/28 15:46:55 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -410,7 +410,7 @@ sub plotobject_script { # sub plotvector_script { - my ($id,$label,$xs,$ys,$xe,$ye,$xmin,$xmax)=@_; + my ($id,$label,$xs,$ys,$xe,$ye,$xmin,$xmax,$fixed)=@_; unless ($label) { $Apache::functionplotresponse::counter++; $label='V'.$Apache::functionplotresponse::counter; @@ -421,8 +421,8 @@ sub plotvector_script { my $pointx=2.*($xmax-$xmin)+$xmax; my $anglelabel=$label.'Angle'; return - &new_point_coordinate($id,$startlabel,$xs,$ys,0). - &new_point_coordinate($id,$endlabel,$xe,$ye,0). + &new_point_coordinate($id,$startlabel,$xs,$ys,$fixed). + &new_point_coordinate($id,$endlabel,$xe,$ye,$fixed). (<=2)) { $fixed=1; } + $result.=&plotvector_script($internalid,$label,$tailx,$taily,$tipx,$tipy,$xmin,$xmax,$fixed); } elsif ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token,'Plot Vector'). &Apache::edit::text_arg('Label on Plot:','label', @@ -1669,7 +1671,7 @@ sub functionplotrulecheck { # # Evaluate the value # - if ($value=~/\D/) { + if (($value=~/\D/) && ($value ne 'undef')) { $Apache::functionplotresponse::fpr_xmin=$xmin; $Apache::functionplotresponse::fpr_xmax=$xmax; $value=&Apache::run::run($value,$safeeval);