--- loncom/homework/functionplotresponse.pm 2011/11/18 19:32:48 1.74
+++ loncom/homework/functionplotresponse.pm 2011/11/19 13:45:36 1.75
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# Functionplot responses
#
-# $Id: functionplotresponse.pm,v 1.74 2011/11/18 19:32:48 www Exp $
+# $Id: functionplotresponse.pm,v 1.75 2011/11/19 13:45:36 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,7 +35,7 @@ use Apache::run;
BEGIN {
&Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline',
- 'plotobject','plotvector',
+ 'plotobject','plotvector','functionplotvectorrule',
'functionplotrule','functionplotruleset',
'functionplotelements'));
}
@@ -509,6 +509,7 @@ sub start_plotobject {
$token,'8').
&Apache::edit::end_row();
} elsif ($target eq 'modified') {
+ $env{'form.'.&Apache::edit::html_element_name('label')}=lcfirst($env{'form.'.&Apache::edit::html_element_name('label')});
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'label','x','y');
if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
}
@@ -563,6 +564,7 @@ sub start_plotvector {
&Apache::edit::end_row();
} elsif ($target eq 'modified') {
+ $env{'form.'.&Apache::edit::html_element_name('label')}=lcfirst($env{'form.'.&Apache::edit::html_element_name('label')});
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'label','tailx','taily','tipx','tipy');
if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
}
@@ -691,7 +693,7 @@ sub start_functionplotrule {
&Apache::lonxml::get_param('percenterror',$parstack,$safeeval)
)));
} elsif ($target eq 'edit') {
- $result=&Apache::edit::tag_start($target,$token,'Function Plot Evaluation Rule').
+ $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',
@@ -753,6 +755,108 @@ sub end_functionplotrule {
#
+# <functionplotvectorrule ... />
+#
+sub start_functionplotvectorrule {
+ 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='V'.$Apache::functionplotresponse::counter;
+ } else {
+ $label='V'.$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 $vector=&Apache::lonxml::get_param('vector',$parstack,$safeeval);
+ $vector=~s/\W//gs;
+ $vector=ucfirst($vector);
+ 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,
+ $tailpoint,
+ $tippoint,
+ $nottailpoint,
+ $nottippoint,
+ &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('anglepercenterror',$parstack,$safeeval),
+ )));
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::tag_start($target,$token,'Function Plot Vector Rule').
+ &Apache::edit::text_arg('Index/Name:','index',
+ $token,'10').' '.
+ &Apache::edit::text_arg('Vector:','vector',
+ $token,'16').'<br />'.
+ &Apache::edit::text_arg('Tail attached to object:','tailpoint',
+ $token,'16').
+ &Apache::edit::text_arg('Tip attached to object:','tippoint',
+ $token,'16').
+ &Apache::edit::text_arg('Tail not attached to object:','nottailpoint',
+ $token,'16').
+ &Apache::edit::text_arg('Tip not attached to object:','nottippoint',
+ $token,'16').'<br />'.
+ &Apache::edit::text_arg('Length:','length',
+ $token,'16').
+ &Apache::edit::text_arg('Angle:','angle',
+ $token,'16').
+ &Apache::edit::text_arg('Percent error length:','lengthpercenterror',
+ $token,'8').
+ &Apache::edit::text_arg('Percent error angle:','anglepercenterror',
+ $token,'8').
+ &Apache::edit::end_row();
+ } elsif ($target eq 'modified') {
+ $env{'form.'.&Apache::edit::html_element_name('vector')}=lcfirst($env{'form.'.&Apache::edit::html_element_name('vector')});
+ $env{'form.'.&Apache::edit::html_element_name('tailpoint')}=lcfirst($env{'form.'.&Apache::edit::html_element_name('tailpoint')});
+ $env{'form.'.&Apache::edit::html_element_name('tippoint')}=lcfirst($env{'form.'.&Apache::edit::html_element_name('tippoint')});
+ $env{'form.'.&Apache::edit::html_element_name('nottailpoint')}=lcfirst($env{'form.'.&Apache::edit::html_element_name('nottailpoint')});
+ $env{'form.'.&Apache::edit::html_element_name('nottippoint')}=lcfirst($env{'form.'.&Apache::edit::html_element_name('nottippoint')});
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'index','vector',
+ 'tailpoint','tippoint','nottailpoint','nottipoint',
+ 'length','angle',
+ 'lengthpercenterror','anglepercenterror');
+ if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+ }
+ return $result;
+}
+
+sub end_functionplotvectorrule {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ if ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
+ }
+ return $result;
+}
+
+
+
+#
# <spline index="..." order="1,2,3,4" initx="..." inity="..." scalex="..." scaley="..." />
#
# Unfortunately, GeoGebra seems to want all splines after everything else, so we need to store them
@@ -993,6 +1097,7 @@ sub start_functionplotresponse {
$Apache::functionplotresponse::counter=0;
# Remember rules
undef @Apache::functionplotresponse::functionplotrules;
+ undef @Apache::functionplotresponse::functionplotvectorrules;
# Remember failed rules
if ($target eq 'grade') {
undef @Apache::functionplotresponse::failedrules;