--- loncom/homework/functionplotresponse.pm 2011/11/21 19:48:52 1.81 +++ loncom/homework/functionplotresponse.pm 2015/04/05 17:09:12 1.110 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # Functionplot responses # -# $Id: functionplotresponse.pm,v 1.81 2011/11/21 19:48:52 www Exp $ +# $Id: functionplotresponse.pm,v 1.110 2015/04/05 17:09:12 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,52 +32,159 @@ 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')); } # +# Use old Java or HTML5/Javascript for GeoGebra? Depends on browser! +# Return a true value if HTML5 should be used. + +sub useHTML5 { + if ($env{'browser.type'} eq 'chrome') { + if ($env{'browser.version'} >= 14) { + return 1; + } + } elsif ($env{'browser.type'} eq 'safari') { + if ($env{'browser.os'} eq 'mac') { + my ($prefix,$version) = ($env{'browser.version'} =~ /^(\d*)(\d{3})\./); + if ($version >= 536) { + return 1; + } + } + } elsif ($env{'browser.type'} eq 'mozilla') { + if ($env{'browser.info'} =~ /^firefox\-(\d+)/) { + my $firefox = $1; + if ((($env{'browser.os'} eq 'mac') && ($firefox >= 20)) || + (($env{'browser.os'} eq 'unix') && ($firefox >= 17)) || + (($env{'browser.os'} eq 'win') && ($firefox >= 14))) { + return 1; + } + } + } elsif ($env{'browser.type'} eq 'explorer') { + if (($env{'browser.os'} eq 'win') && ($env{'browser.version'} >= 10)) { + return 1; + } + } elsif ($env{'browser.type'} eq 'opera') { + if ($env{'browser.version'} >= 18) { + return 1; + } + } + return 0; +} + +# +# HTML5 version does not understand "_" in IDs +# +sub appid { + my ($id)=@_; + $id=~s/\_/rid/gs; + $id=~s/\W//gs; + return $id; +} + +# +# Routines to start the applet (Java) or the HTML5/JavaScript +# # There can be a number of applets on a page, each called ggbApplet_$id, # where $id is the "_"-concatenated part and responseid # sub geogebra_startcode { + my ($id,$width,$height)=@_; + if (&useHTML5()) { + return &html5_geogebra_startcode(@_); + } else { + return &java_geogebra_startcode(@_). + &java_geogebra_code_param(); + } +} + +sub geogebra_endcode { + if (&useHTML5()) { + return ''; + } else { + return &java_geogebra_endcode(); + } +} + +sub geogebra_default_parameters { my ($id)=@_; + if (&useHTML5()) { + return ''; + } else { + return &java_geogebra_default_parameters($id); + } +} +# === Java code + +sub java_geogebra_startcode { + my ($id,$width,$height)=@_; + my $appid=&appid($id); + $width=int(1.*$width); + $height=int(1.*$height); + unless ($width) { $width=700; } + unless ($height) { $height=400; } return (< + ENDSTARTCODE } -sub geogebra_endcode { +sub java_geogebra_endcode { return &Apache::lonhtmlcommon::java_not_enabled()."\n"; } +sub java_geogebra_code_param { + return ''; +} + +# === HTML5 code + +sub html5_geogebra_startcode { + my ($id,$width,$height)=@_; + my $appid=&appid($id); + $width=int(1.*$width); + $height=int(1.*$height); + unless ($width) { $width=700; } + unless ($height) { $height=400; } + my $code=&geogebra_internal_program(); + return (< +ENDSTARTCODE +} + # # This is the internal GeoGebra bytecode which defines the spline functions # -sub geogebra_spline_program { - return (< -ENDSPLINEPROGRAM +sub geogebra_internal_program { + return +'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'; } # # The standard set of parameters inside # -sub geogebra_default_parameters { +sub java_geogebra_default_parameters { my ($id)=@_; + my $appid=&appid($id); return(< - + @@ -92,7 +199,7 @@ sub geogebra_default_parameters { - + ENDDEFAULTPARAMETERS } @@ -107,12 +214,18 @@ sub init_script { if ($#Apache::functionplotresponse::callscripts>=0) { my $script=''; foreach my $id (@Apache::functionplotresponse::callscripts) { - $script.="if (param=='applet_$id') { loaded_$id=true; }\n"; + $script.="if (param=='ggbApplet".&appid($id)."') { loaded_$id=true; }\n"; } $script.="if (".join(' && ',map { "loaded_$_" } (@Apache::functionplotresponse::callscripts)). ") { setTimeout('ggbInitAll()',200) }"; my $calls=join("\n",map { "ggbInit_$_();" } (@Apache::functionplotresponse::callscripts)); + my $html5init=''; + if (&useHTML5()) { + $html5init= + ''; + } return (< // // 0)) { $return.=(<0)) { $return.=(<8) { $order=8; } $Apache::functionplotresponse::counter++; my $label='CSpline'.$Apache::functionplotresponse::counter; - my $output='document.ggbApplet_'.$id.'.evalCommand("'.$label.'=Spline'.$order.'['; + my $output='document.ggbApplet'.$appid.'.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"; + $output.='document.ggbApplet'.$appid.'.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"; + $output.='document.ggbApplet'.$appid.'.setVisible("'.$label.'_'.($i>=10?'{':'').$i.($i>=10?'}':'').'",false);'."\n"; } return $output; @@ -461,6 +584,7 @@ sub answer_spline_script { sub generate_spline { my ($id,$label,$xmin,$xmax,$ymin,$ymax,$fixed)=@_; + my $appid=&appid($id); my $result=''; my $order=$Apache::functionplotresponse::splineorder{$label}; my $x=$Apache::functionplotresponse::splineinitx{$label}; @@ -477,7 +601,7 @@ sub generate_spline { $x+=$sx/(2.*($order-1)); push(@coords,$label.'S'.$i); } - $result.='document.ggbApplet_'.$id.'.evalCommand("Spline'.$order.'['.join(',',@coords).']");'."\n"; + $result.='document.ggbApplet'.$appid.'.evalCommand("Spline'.$order.'['.join(',',@coords).']");'."\n"; return $result; } @@ -543,13 +667,19 @@ sub start_plotvector { $label=~s/\W//gs; $label=ucfirst($label); unless ($label) { $label="NewVector"; } + if ($Apache::functionplotresponse::vectorlabels{$label}) { + &Apache::lonxml::warning(&mt('Vector labels must be unique: [_1]',$label)); + } + $Apache::functionplotresponse::vectorlabels{$label}=1; 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($tipx)) { $tipx=$xmin; } unless (defined($tipy)) { $tipy=$ymin; } - $result.=&plotvector_script($internalid,$label,$tailx,$taily,$tipx,$tipy,$xmin,$xmax); + my $fixed=0; + if ((&Apache::response::show_answer()) || (&Apache::response::check_status()>=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 +712,96 @@ 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 $internalappid=&appid($internalid); + 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; } + unless ($Apache::functionplotresponse::vectorlabels{$thisvector}) { + &Apache::lonxml::warning(&mt('Vectors must be defined before using them for drawing vector sums: [_1]',$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; +} + + # # @@ -616,7 +836,7 @@ sub start_backgroundplot { &Apache::edit::text_arg('Label on Plot:','label', $token,'8'). &Apache::edit::text_arg('Color (hex code):','color', - $token,'8'). + $token,'8', 'colorchooser'). &Apache::edit::select_arg('Fixed location:','fixed', ['yes','no'],$token). &Apache::edit::end_row(); @@ -693,7 +913,7 @@ sub start_functionplotrule { $result=&Apache::edit::tag_start($target,$token,'Function Plot Graph Rule'). &Apache::edit::text_arg('Index/Name:','index', $token,'10').' '. - &Apache::edit::select_arg(&mt('Function:'),'derivativeorder', + &Apache::edit::select_arg('Function:','derivativeorder', [['0','Function itself'], ['1','First derivative'], ['2','Second derivative'], @@ -780,39 +1000,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), @@ -837,22 +1035,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', @@ -894,14 +1086,12 @@ sub start_functionplotvectorsumrule { 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('lengtherror',$parstack,$safeeval), @@ -911,24 +1101,23 @@ sub start_functionplotvectorsumrule { $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('Error length:','lengtherror', - $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', - ,'lengtherror','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; } @@ -943,6 +1132,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 @@ -1181,6 +1429,8 @@ sub start_functionplotresponse { undef %Apache::functionplotresponse::previous; $Apache::functionplotresponse::inputfields=''; $Apache::functionplotresponse::counter=0; +# Remember vectors + undef %Apache::functionplotresponse::vectorlabels; # Remember rules undef @Apache::functionplotresponse::functionplotrules; undef @Apache::functionplotresponse::functionplotvectorrules; @@ -1207,7 +1457,7 @@ sub start_functionplotresponse { my $ylabel=&Apache::lonxml::get_param('ylabel',$parstack,$safeeval); if ($target eq 'edit') { $result.=&Apache::edit::start_table($token) - .''.&mt('Function Plot Question').'' + .''.&Apache::loncommon::insert_folding_button().&mt('Function Plot Question').'' .''.&mt('Delete?').' ' .&Apache::edit::deletelist($target,$token).'   ' .&Apache::edit::insertlist($target,$token).'   ' @@ -1217,7 +1467,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').' '. @@ -1240,7 +1494,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); } @@ -1250,27 +1504,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; } @@ -1358,6 +1601,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)=@_; @@ -1374,16 +1654,27 @@ sub objectcoords { } sub attached { - my ($id,$vector,$object,$xmin,$xmax,$ymin,$ymax)=@_; + my ($id,$vector,$objects,$xmin,$xmax,$ymin,$ymax)=@_; my ($xs,$xe,$ys,$ye)=&vectorcoords($id,$vector); - my ($xo,$yo)=&objectcoords($id,$object); my $tolx=($xmax-$xmin)/100.; my $toly=($ymax-$ymin)/100.; my $tail=0; my $tip=0; - &addlog("Proximity $vector ($xs,$xe,$ys,$ye) to $object ($xo,$yo)"); - if ((abs($xs-$xo)<$tolx) && (abs($ys-$yo)<$toly)) { $tail=1; } - if ((abs($xe-$xo)<$tolx) && (abs($ye-$yo)<$toly)) { $tip=1; } + 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); } @@ -1427,6 +1718,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); } } @@ -1520,9 +1813,58 @@ sub vectorcheck { sub sumcheck { my ($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)=@_; - my ($label,$type,$id,$object,$length,$angle,$lengtherror,$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; } @@ -1542,7 +1884,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); @@ -1702,7 +2044,7 @@ sub start_functionplotruleset { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; if ($target eq 'edit') { return &Apache::edit::start_table($token). - ''.&mt('Function Plot Rule Set').'' + ''.&Apache::loncommon::insert_folding_button().&mt('Function Plot Rule Set').'' .''.&mt('Delete?').' ' .&Apache::edit::deletelist($target,$token).'   '. &Apache::edit::insertlist($target,$token).'   ' @@ -1856,9 +2198,9 @@ sub end_functionplotelements { # generate the input fields $result.=$Apache::functionplotresponse::inputfields; # actually start the -tag - $result.=&geogebra_startcode($internalid); -# load the spline bytecode - $result.=&geogebra_spline_program(); + $result.=&geogebra_startcode($internalid, + &Apache::lonxml::get_param('width',$parstack,$safeeval,-2), + &Apache::lonxml::get_param('height',$parstack,$safeeval,-2)); # set default parameters $result.=&geogebra_default_parameters($internalid); # close the -tag @@ -1895,7 +2237,8 @@ sub start_functionplotelements { if ($target eq 'edit') { return &Apache::edit::start_table($token). - ''.&mt('Function Plot Elements').'' + ''.&Apache::loncommon::insert_folding_button() + .&mt('Function Plot Elements').'' .''.&mt('Delete?').' ' .&Apache::edit::deletelist($target,$token).'   '. &Apache::edit::insertlist($target,$token).'   ' 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.