--- loncom/homework/functionplotresponse.pm 2011/11/26 01:35:26 1.88 +++ 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.88 2011/11/26 01:35:26 www Exp $ +# $Id: functionplotresponse.pm,v 1.94 2012/02/29 01:24:47 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,6 +38,7 @@ BEGIN { &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline', 'plotobject','plotvector', 'functionplotvectorrule','functionplotvectorsumrule', + 'drawvectorsum', 'functionplotcustomrule', 'functionplotrule','functionplotruleset', 'functionplotelements')); @@ -410,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; @@ -421,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', @@ -589,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; +} + + # # @@ -1289,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; } @@ -1680,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);