--- loncom/homework/functionplotresponse.pm 2011/11/20 02:53:27 1.79 +++ loncom/homework/functionplotresponse.pm 2012/02/29 01:24:47 1.94 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # Functionplot responses # -# $Id: functionplotresponse.pm,v 1.79 2011/11/20 02:53:27 www Exp $ +# $Id: functionplotresponse.pm,v 1.94 2012/02/29 01:24:47 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,10 +32,14 @@ use Apache::response(); use Apache::lonlocal; use Apache::lonnet; use Apache::run; +use LONCAPA; BEGIN { &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline', - 'plotobject','plotvector','functionplotvectorrule','functionplotvectorsumrule', + 'plotobject','plotvector', + 'functionplotvectorrule','functionplotvectorsumrule', + 'drawvectorsum', + 'functionplotcustomrule', 'functionplotrule','functionplotruleset', 'functionplotelements')); } @@ -46,10 +50,14 @@ BEGIN { # sub geogebra_startcode { - my ($id)=@_; + my ($id,$width,$height)=@_; + $width=int(1.*$width); + $height=int(1.*$height); + unless ($width) { $width=700; } + unless ($height) { $height=400; } return (< + codebase="/adm/geogebra/" width="$width" height="$height" MAYSCRIPT> ENDSTARTCODE } @@ -403,7 +411,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; @@ -414,8 +422,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', @@ -582,6 +592,91 @@ sub end_plotvector { } +# +# Vector sum - have GeoGebra draw a sum of specified vectors to help students draw +# + +sub start_drawvectorsum { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1]; + my $tailx=&Apache::lonxml::get_param('tailx',$parstack,$safeeval); + my $taily=&Apache::lonxml::get_param('taily',$parstack,$safeeval); + my $showvalue=&Apache::lonxml::get_param('showvalue',$parstack,$safeeval); + my $vectorlist=&Apache::lonxml::get_param('vectorlist',$parstack,$safeeval); + my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval); + $label=~s/\W//gs; + $label=ucfirst($label); + unless ($label) { $label="NewVector"; } + if ($target eq 'web') { + my ($xmin,$xmax,$ymin,$ymax)=&boundaries($parstack,$safeeval,-3); + unless (defined($tailx)) { $tailx=$xmin; } + unless (defined($taily)) { $taily=$ymin; } + unless (defined($vectorlist)) { $vectorlist=''; } + my @vectors=split(/\,/,$vectorlist); + if ($#vectors>0) { + my @sumx=(); + my @sumy=(); + foreach my $thisvector (@vectors) { + $thisvector=~s/\W//gs; + $thisvector=ucfirst($thisvector); + unless ($thisvector) { next; } + my $vectorx=$thisvector.'X'; + my $vectory=$thisvector.'Y'; + $result.=(<'. + &Apache::edit::text_arg('Vector List:','vectorlist', + $token,'40'). + &Apache::edit::end_row(); + } elsif ($target eq 'modified') { + $env{'form.'.&Apache::edit::html_element_name('label')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('label')}); + my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'label','tailx','taily','showvalue','vectorlist'); + if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } + } + return $result; +} + + +sub end_drawvectorsum { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'edit') { + $result=&Apache::edit::end_table(); + } + return $result; +} + + # # @@ -654,10 +749,6 @@ sub start_functionplotrule { } else { $label='R'.$label; } - if ($Apache::functionplotresponse::splineorder{$label}) { - &Apache::lonxml::error(&mt('Rule indices must be unique.')); - } - if ($target eq 'grade') { # Simply remember - in order - for later @@ -772,9 +863,6 @@ sub start_functionplotvectorrule { } else { $label='R'.$label; } - if ($Apache::functionplotresponse::splineorder{$label}) { - &Apache::lonxml::error(&mt('Rule indices must be unique.')); - } if ($target eq 'grade') { # Simply remember - in order - for later @@ -787,39 +875,17 @@ sub start_functionplotvectorrule { $vector=~s/\W//gs; $vector=ucfirst($vector); - my $attachpoint=&Apache::lonxml::get_param('attachpoint',$parstack,$safeeval); - $attachpoint=~s/\W//gs; - $attachpoint=ucfirst($attachpoint); - - my $notattachpoint=&Apache::lonxml::get_param('notattachpoint',$parstack,$safeeval); - $notattachpoint=~s/\W//gs; - $notattachpoint=ucfirst($notattachpoint); - - my $tailpoint=&Apache::lonxml::get_param('tailpoint',$parstack,$safeeval); - $tailpoint=~s/\W//gs; - $tailpoint=ucfirst($tailpoint); - my $tippoint=&Apache::lonxml::get_param('tippoint',$parstack,$safeeval); - $tippoint=~s/\W//gs; - $tippoint=ucfirst($tippoint); - - my $nottailpoint=&Apache::lonxml::get_param('nottailpoint',$parstack,$safeeval); - $nottailpoint=~s/\W//gs; - $nottailpoint=ucfirst($nottailpoint); - my $nottippoint=&Apache::lonxml::get_param('nottippoint',$parstack,$safeeval); - $nottippoint=~s/\W//gs; - $nottippoint=ucfirst($nottippoint); - push(@Apache::functionplotresponse::functionplotvectorrules,join(':',( $label, 'vector', $internalid, $vector, - $attachpoint, - $notattachpoint, - $tailpoint, - $tippoint, - $nottailpoint, - $nottippoint, + &Apache::lonxml::get_param('attachpoint',$parstack,$safeeval), + &Apache::lonxml::get_param('notattachpoint',$parstack,$safeeval), + &Apache::lonxml::get_param('tailpoint',$parstack,$safeeval), + &Apache::lonxml::get_param('tippoint',$parstack,$safeeval), + &Apache::lonxml::get_param('nottailpoint',$parstack,$safeeval), + &Apache::lonxml::get_param('nottippoint',$parstack,$safeeval), &Apache::lonxml::get_param('length',$parstack,$safeeval), &Apache::lonxml::get_param('angle',$parstack,$safeeval), &Apache::lonxml::get_param('lengtherror',$parstack,$safeeval), @@ -844,22 +910,16 @@ sub start_functionplotvectorrule { &Apache::edit::text_arg('Tip not attached to object:','nottippoint', $token,'16').'
'. &Apache::edit::text_arg('Length:','length', - $token,'16'). - &Apache::edit::text_arg('Angle:','angle', - $token,'16'). + $token,'30'). &Apache::edit::text_arg('Absolute error length:','lengtherror', - $token,'8'). + $token,'8').'
'. + &Apache::edit::text_arg('Angle:','angle', + $token,'30'). &Apache::edit::text_arg('Absolute error angle:','angleerror', $token,'8'). &Apache::edit::end_row(); } elsif ($target eq 'modified') { $env{'form.'.&Apache::edit::html_element_name('vector')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('vector')}); - $env{'form.'.&Apache::edit::html_element_name('attachpoint')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('attachpoint')}); - $env{'form.'.&Apache::edit::html_element_name('notattachpoint')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('notattachpoint')}); - $env{'form.'.&Apache::edit::html_element_name('tailpoint')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('tailpoint')}); - $env{'form.'.&Apache::edit::html_element_name('tippoint')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('tippoint')}); - $env{'form.'.&Apache::edit::html_element_name('nottailpoint')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('nottailpoint')}); - $env{'form.'.&Apache::edit::html_element_name('nottippoint')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('nottippoint')}); my $constructtag=&Apache::edit::get_new_args($token,$parstack, $safeeval,'index','vector','attachpoint','notattachpoint', 'tailpoint','tippoint','nottailpoint','nottipoint', @@ -896,52 +956,43 @@ sub start_functionplotvectorsumrule { } else { $label='R'.$label; } - if ($Apache::functionplotresponse::splineorder{$label}) { - &Apache::lonxml::error(&mt('Rule indices must be unique.')); - } if ($target eq 'grade') { # Simply remember - in order - for later my $id=$Apache::inputtags::response[-1]; my $partid=$Apache::inputtags::part; my $internalid = $partid.'_'.$id; - my $object=&Apache::lonxml::get_param('object',$parstack,$safeeval); - $object=~s/\W//gs; - $object=ucfirst($object); + my $vectors=&Apache::lonxml::get_param('vectors',$parstack,$safeeval); push(@Apache::functionplotresponse::functionplotvectorrules,join(':',( $label, 'sum', $internalid, - $object, + $vectors, &Apache::lonxml::get_param('length',$parstack,$safeeval), &Apache::lonxml::get_param('angle',$parstack,$safeeval), - &Apache::lonxml::get_param('lengthpercenterror',$parstack,$safeeval), - &Apache::lonxml::get_param('lengthabserror',$parstack,$safeeval), + &Apache::lonxml::get_param('lengtherror',$parstack,$safeeval), &Apache::lonxml::get_param('angleerror',$parstack,$safeeval), ))); } elsif ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token,'Function Plot Vector Sum Rule'). &Apache::edit::text_arg('Index/Name:','index', $token,'10').' '. - &Apache::edit::text_arg('Vectors attached to object:','object', - $token,'16').'
'. + &Apache::edit::text_arg('Comma-separated list of vectors:','vectors', + $token,'30').'
'. &Apache::edit::text_arg('Sum vector length:','length', - $token,'16'). + $token,'30'). + &Apache::edit::text_arg('Absolute error length:','lengtherror', + $token,'8').'
'. &Apache::edit::text_arg('Sum vector angle:','angle', - $token,'16'). - &Apache::edit::text_arg('Percent error length:','lengthpercenterror', - $token,'8'). - &Apache::edit::text_arg('Absolute error length:','lengthabserror', - $token,'8'). - &Apache::edit::text_arg('Error angle:','angleerror', + $token,'30'). + &Apache::edit::text_arg('Absolute error angle:','angleerror', $token,'8'). &Apache::edit::end_row(); - } elsif ($target eq 'modified') { - $env{'form.'.&Apache::edit::html_element_name('object')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('object')}); - my $constructtag=&Apache::edit::get_new_args($token,$parstack, - $safeeval,'index','object', - 'length','angle', - 'lengthpercenterror','lengthabserror','angleerror'); - if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'index','vectors', + 'length','angle', + 'lengtherror','angleerror'); + if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } } return $result; } @@ -956,6 +1007,65 @@ sub end_functionplotvectorsumrule { } # +# +# +sub start_functionplotcustomrule { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + my $label=&Apache::lonxml::get_param('index',$parstack,$safeeval); + $Apache::functionplotresponse::counter++; + if ($label=~/\W/) { + &Apache::lonxml::warning(&mt('Rule indices should only contain alphanumeric characters.')); + } + $label=~s/\W//gs; + unless ($label) { + $label='R'.$Apache::functionplotresponse::counter; + } else { + $label='R'.$label; + } + &Apache::lonxml::register('Apache::response',('answer')); + if ($target eq 'edit') { + $result=&Apache::edit::tag_start($target,$token,'Function Plot Custom Rule'). + &Apache::edit::text_arg('Index/Name:','index',$token,'10'). + &Apache::edit::end_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'index'); + if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } + } + return $result; +} + +sub end_functionplotcustomrule { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'edit') { + $result=&Apache::edit::end_table(); + } elsif ($target eq 'grade') { +# Simply remember - in order - for later + my $label=&Apache::lonxml::get_param('index',$parstack,$safeeval); + $Apache::functionplotresponse::counter++; + if ($label=~/\W/) { + &Apache::lonxml::warning(&mt('Rule indices should only contain alphanumeric characters.')); + } + $label=~s/\W//gs; + unless ($label) { + $label='R'.$Apache::functionplotresponse::counter; + } else { + $label='R'.$label; + } + push(@Apache::functionplotresponse::functionplotvectorrules,join(':',( + $label, + 'custom', + &escape($Apache::response::custom_answer[-1]) + ))); + } + &Apache::lonxml::deregister('Apache::response',('answer')); + return $result; +} + + + +# # # # Unfortunately, GeoGebra seems to want all splines after everything else, so we need to store them @@ -1230,7 +1340,11 @@ sub start_functionplotresponse { .&Apache::edit::end_row() .&Apache::edit::start_spanning_row() ."\n"; - $result.=&Apache::edit::text_arg('Label x-axis:','xlabel', + $result.=&Apache::edit::text_arg('Width (pixels):','width', + $token,'6').' '. + &Apache::edit::text_arg('Height (pixels):','height', + $token,'6').'
'. + &Apache::edit::text_arg('Label x-axis:','xlabel', $token,'6').' '. &Apache::edit::text_arg('Minimum x-value:','xmin', $token,'4').' '. @@ -1253,7 +1367,7 @@ sub start_functionplotresponse { &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', + $safeeval,'width','height','xlabel','xmin','xmax','ylabel','ymin','ymax', 'xaxisvisible','yaxisvisible','gridvisible','answerdisplay'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } @@ -1263,27 +1377,16 @@ sub start_functionplotresponse { ($env{'form.answer_output_mode'} ne 'tex') && ($Apache::lonhomework::viewgrades == 'F')) { my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser(); - my $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); - my $start_page = &Apache::loncommon::start_page('Rules Log', undef, - {'only_body' => 1, - 'bgcolor' => '#FFFFFF', - 'js_ready' => 1,}); - my $end_page = &Apache::loncommon::end_page({'js_ready' => 1,}); $uname =~s/\W//g; $udom =~s/\W//g; my $function_name = join('_','LONCAPA_scriptvars',$uname,$udom, $env{'form.counter'},$Apache::lonxml::curdepth); - my $rules_var ="".&mt('Rules Log')."
"; - &Apache::lonxml::add_script_result($rules_var); - } - + &Apache::lonxml::add_script_result( + &Apache::loncommon::modal_adhoc_window($function_name,700,500, + '
'.$Apache::functionplotresponse::ruleslog.'
', + &mt('Rules Log'))."
"); + } return $result; } @@ -1371,6 +1474,43 @@ sub fpr_d2fdx2 { $arg)]; } +sub fpr_vectorcoords { + my ($arg)=@_; + $arg=~s/\W//gs; + $arg=ucfirst($arg); + my $id=$Apache::inputtags::response[-1]; + my $partid=$Apache::inputtags::part; + my $internalid = $partid.'_'.$id; + return ($env{'form.HWVAL_'.$internalid.'_'.$arg.'Start_x'}, + $env{'form.HWVAL_'.$internalid.'_'.$arg.'End_x'}, + $env{'form.HWVAL_'.$internalid.'_'.$arg.'Start_y'}, + $env{'form.HWVAL_'.$internalid.'_'.$arg.'End_y'}); +} + +sub fpr_objectcoords { + my ($arg)=@_; + $arg=~s/\W//gs; + $arg=ucfirst($arg); + my $id=$Apache::inputtags::response[-1]; + my $partid=$Apache::inputtags::part; + my $internalid = $partid.'_'.$id; + return ($env{'form.HWVAL_'.$internalid.'_'.$arg.'_x'}, + $env{'form.HWVAL_'.$internalid.'_'.$arg.'_y'}); +} + +sub fpr_vectorlength { + my ($arg)=@_; + my ($xs,$xe,$ys,$ye)=&fpr_vectorcoords($arg); + return sqrt(($xe-$xs)*($xe-$xs)+($ye-$ys)*($ye-$ys)); +} + +sub fpr_vectorangle { + my ($arg)=@_; + my ($xs,$xe,$ys,$ye)=&fpr_vectorcoords($arg); + my $angle=57.2957795*atan2(($ye-$ys),($xe-$xs)); + if ($angle<0) { $angle=360+$angle; } + return $angle; +} sub vectorcoords { my ($id,$label)=@_; @@ -1385,6 +1525,33 @@ sub objectcoords { return ($env{'form.HWVAL_'.$id.'_'.$label.'_x'}, $env{'form.HWVAL_'.$id.'_'.$label.'_y'}); } + +sub attached { + my ($id,$vector,$objects,$xmin,$xmax,$ymin,$ymax)=@_; + my ($xs,$xe,$ys,$ye)=&vectorcoords($id,$vector); + my $tolx=($xmax-$xmin)/100.; + my $toly=($ymax-$ymin)/100.; + my $tail=0; + my $tip=0; + foreach my $obj (split(/\s*\,\s*/,$objects)) { + $obj=~s/\W//g; + unless ($obj) { next; } + $obj=ucfirst($obj); + my ($xo,$yo)=&objectcoords($id,$obj); + &addlog("Proximity $vector ($xs,$ys)-($xe,$ye) to $obj ($xo,$yo)"); + if ((abs($xs-$xo)<$tolx) && (abs($ys-$yo)<$toly)) { + $tail=1; + &addlog("Attached tail: $obj"); + } + if ((abs($xe-$xo)<$tolx) && (abs($ye-$yo)<$toly)) { + $tip=1; + &addlog("Attached tip: $obj"); + } + } + &addlog("Result tail:$tail tip:$tip"); + return($tail,$tip); +} + sub vectorangle { my ($x,$y)=@_; @@ -1424,6 +1591,8 @@ sub functionplotvectorrulecheck { return &vectorcheck($rule,$xmin,$xmax,$ymin,$ymax,$safeeval); } elsif ($type eq 'sum') { return &sumcheck($rule,$xmin,$xmax,$ymin,$ymax,$safeeval); + } elsif ($type eq 'custom') { + return &customcheck($rule,$safeeval); } } @@ -1445,15 +1614,130 @@ sub vectorcheck { return 0; } } + if ($angle ne '') { + &addlog("Checking for angle $angle with error $angleerror"); + $angle=&Apache::run::run($angle,$safeeval); + &addlog("Angle evaluated to $angle"); + my $thisangle=&plotvectorangle($id,$vector); + &addlog("Found angle $thisangle"); + my $anglediff=abs($thisangle-$angle); + &addlog("Angle difference: $anglediff"); + if ($anglediff>360.-$anglediff) { + $anglediff=360.-$anglediff; + } + &addlog("Smallest angle difference: $anglediff"); + if ($anglediff>$angleerror) { + &setfailed($label); + return 0; + } + } + if ($attachpoint ne '') { + &addlog("Checking attached: ".$attachpoint); + my ($tail,$tip)=&attached($id,$vector,$attachpoint,$xmin,$xmax,$ymin,$ymax); + unless ($tail || $tip) { + &setfailed($label); + return 0; + } + } + if ($notattachpoint ne '') { + &addlog("Checking not attached: ".$notattachpoint); + my ($tail,$tip)=&attached($id,$vector,$notattachpoint,$xmin,$xmax,$ymin,$ymax); + if ($tail || $tip) { + &setfailed($label); + return 0; + } + } + if ($tailpoint ne '') { + &addlog("Checking tail: ".$tailpoint); + my ($tail,$tip)=&attached($id,$vector,$tailpoint,$xmin,$xmax,$ymin,$ymax); + unless ($tail) { + &setfailed($label); + return 0; + } + } + if ($nottailpoint ne '') { + &addlog("Checking not tail: ".$nottailpoint); + my ($tail,$tip)=&attached($id,$vector,$nottailpoint,$xmin,$xmax,$ymin,$ymax); + if ($tail) { + &setfailed($label); + return 0; + } + } + if ($tippoint ne '') { + &addlog("Checking tip: ".$tippoint); + my ($tail,$tip)=&attached($id,$vector,$tippoint,$xmin,$xmax,$ymin,$ymax); + unless ($tip) { + &setfailed($label); + return 0; + } + } + if ($nottippoint ne '') { + &addlog("Checking not tip: ".$nottippoint); + my ($tail,$tip)=&attached($id,$vector,$nottippoint,$xmin,$xmax,$ymin,$ymax); + if ($tip) { + &setfailed($label); + return 0; + } + } + &addlog("Rule $label passed."); return 1; } sub sumcheck { my ($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)=@_; - my ($label,$type,$id,$object,$length,$angle,$lengthpercenterror,$lengthabserror,$angleerror)=split(/\:/,$rule); - &addlog("Vector Sum Rule $label for vectors attached to ".$object); + my ($label,$type,$id,$vectors,$length,$angle,$lengtherror,$angleerror)=split(/\:/,$rule); + &addlog("Vector Sum Rule $label for vectors ".$vectors); + my $sumx=0; + my $sumy=0; + foreach my $sv (split(/\s*\,\s*/,$vectors)) { + my ($rx,$ry)=&relvector(&vectorcoords($id,$sv)); + $sumx+=$rx; + $sumy+=$ry; + } + &addlog("Sum vector ($sumx,$sumy)"); + if ($length ne '') { + &addlog("Checking length $length with error $lengtherror"); + $length=&Apache::run::run($length,$safeeval); + &addlog("Evaluated to $length"); + my $thislength=&vectorlength($sumx,$sumy); + &addlog("Actual length $thislength"); + if (abs($length-$thislength)>$lengtherror) { + &setfailed($label); + return 0; + } + } + if ($angle ne '') { + &addlog("Checking angle $angle with error $angleerror"); + $angle=&Apache::run::run($angle,$safeeval); + &addlog("Evaluated to $angle"); + my $thisangle=&vectorangle($sumx,$sumy); + &addlog("Actual angle $thisangle"); + my $anglediff=abs($thisangle-$angle); + &addlog("Angle difference: $anglediff"); + if ($anglediff>360.-$anglediff) { + $anglediff=360.-$anglediff; + } + &addlog("Smallest angle difference: $anglediff"); + if ($anglediff>$angleerror) { + &setfailed($label); + return 0; + } + } + &addlog("Rule $label passed."); + return 1; +} +sub customcheck { + my ($rule,$safeeval)=@_; + my ($label,$type,$prg)=split(/\:/,$rule); + &addlog("Custom Rule ".$label); + my $result=&Apache::run::run(&unescape($prg),$safeeval); + &addlog("Algorithm returned $result"); + unless ($result) { + &setfailed($label); + return 0; + } &addlog("Rule $label passed."); return 1; } @@ -1473,7 +1757,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); @@ -1787,7 +2071,9 @@ sub end_functionplotelements { # generate the input fields $result.=$Apache::functionplotresponse::inputfields; # actually start the -tag - $result.=&geogebra_startcode($internalid); + $result.=&geogebra_startcode($internalid, + &Apache::lonxml::get_param('width',$parstack,$safeeval,-2), + &Apache::lonxml::get_param('height',$parstack,$safeeval,-2)); # load the spline bytecode $result.=&geogebra_spline_program(); # set default parameters