--- loncom/homework/functionplotresponse.pm 2011/11/18 16:39:22 1.70
+++ loncom/homework/functionplotresponse.pm 2011/11/19 20:03:58 1.76
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# Functionplot responses
#
-# $Id: functionplotresponse.pm,v 1.70 2011/11/18 16:39:22 www Exp $
+# $Id: functionplotresponse.pm,v 1.76 2011/11/19 20:03:58 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','functionplotvectorsumrule',
'functionplotrule','functionplotruleset',
'functionplotelements'));
}
@@ -402,29 +402,27 @@ sub plotobject_script {
#
sub plotvector_script {
- my ($id,$label,$xs,$ys,$xe,$ye)=@_;
+ my ($id,$label,$xs,$ys,$xe,$ye,$xmin,$xmax)=@_;
unless ($label) {
$Apache::functionplotresponse::counter++;
$label='V'.$Apache::functionplotresponse::counter;
}
- return(<<ENDVECTOR);
-document.ggbApplet1.evalCommand("Gravitystart=(20,0)");
-document.ggbApplet1.setVisible("Gravitystart",false);
-document.ggbApplet1.setLabelVisible("Gravitystart",false);
-document.ggbApplet1.evalCommand("Gravityend=(20,-5)");
-document.ggbApplet1.setLabelVisible("Gravityend",false);
-document.ggbApplet1.evalCommand("Gravity=Vector[Gravitystart, Gravityend]");
-document.ggbApplet1.setLabelVisible("Gravity",true);
-document.ggbApplet1.setLineThickness("Gravity",8);
-// Displays the Angle
-document.ggbApplet1.evalCommand("Gravitypoint=(110,y(Gravitystart))"); //The x-value for this should be 2*(xmax-xmin)+xmax;
-document.ggbApplet1.evalCommand("GravityAngle=Angle[Gravitypoint,Gravitystart,Gravityend]");
-document.ggbApplet1.setLabelVisible("GravityAngle",true);
-document.ggbApplet1.setLabelStyle("GravityAngle",VALUE=2);
-// Keeps track of points we care about (This should use the same listener function we use in graph problems)
-//document.ggbApplet1.registerObjectUpdateListener('Gravitystart','updatePointCoordinates');
-//document.ggbApplet1.registerObjectUpdateListener('Gravityend','updatePointCoordinates');
-//document.ggbApplet1.registerObjectUpdateListener('GravityAngle','updatePointCoordinates');
+ my $startlabel=$label.'Start';
+ my $endlabel=$label.'End';
+ my $pointlabel=$label.'Point';
+ 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).
+ (<<ENDVECTOR);
+document.ggbApplet_$id.evalCommand("$label=Vector[$startlabel,$endlabel]");
+document.ggbApplet_$id.setLabelVisible("$label",true);
+document.ggbApplet_$id.setLineThickness("$label",8);
+document.ggbApplet_$id.evalCommand("$pointlabel=($pointx,y($startlabel))");
+document.ggbApplet_$id.evalCommand("$anglelabel=Angle[$pointlabel,$startlabel,$endlabel]");
+document.ggbApplet_$id.setLabelVisible("$anglelabel",true);
+document.ggbApplet_$id.setLabelStyle("$anglelabel",VALUE=2);
ENDVECTOR
}
@@ -511,6 +509,7 @@ sub start_plotobject {
$token,'8').
&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','x','y');
if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
}
@@ -526,6 +525,62 @@ sub end_plotobject {
return $result;
}
+#
+# Vector
+#
+
+sub start_plotvector {
+ 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 $tipx=&Apache::lonxml::get_param('tipx',$parstack,$safeeval);
+ my $tipy=&Apache::lonxml::get_param('tipy',$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($tipx)) { $tipx=$xmin; }
+ unless (defined($tipy)) { $tipy=$ymin; }
+ $result.=&plotvector_script($internalid,$label,$tailx,$taily,$tipx,$tipy,$xmin,$xmax);
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::tag_start($target,$token,'Plot Vector').
+ &Apache::edit::text_arg('Label on Plot:','label',
+ $token,'16').
+ &Apache::edit::text_arg('Tail x:','tailx',
+ $token,'8').
+ &Apache::edit::text_arg('Tail y:','taily',
+ $token,'8').
+ &Apache::edit::text_arg('Tip x:','tipx',
+ $token,'8').
+ &Apache::edit::text_arg('Tip y:','tipy',
+ $token,'8').
+
+ &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','tipx','tipy');
+ if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+ }
+ return $result;
+}
+
+sub end_plotvector {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result='';
+ if ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
+ }
+ return $result;
+}
+
+
#
# <backgroundplot function="..." fixed="yes/no" />
@@ -638,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',
@@ -700,6 +755,196 @@ 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 $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',
+ $vector,
+ $attachpoint,
+ $notattachpoint,
+ $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('Attached to object:','attachpoint',
+ $token,'16').
+ &Apache::edit::text_arg('Not attached to object:','notattachpoint',
+ $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')}=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',
+ '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;
+}
+
+#
+# <functionplotvectorsumrule ... />
+#
+sub start_functionplotvectorsumrule {
+ 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 $object=&Apache::lonxml::get_param('object',$parstack,$safeeval);
+ $object=~s/\W//gs;
+ $object=ucfirst($object);
+ push(@Apache::functionplotresponse::functionplotvectorrules,join(':',(
+ $label,
+ 'sum',
+ $object,
+ &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('anglepercenterror',$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').'<br />'.
+ &Apache::edit::text_arg('Sum vector length:','length',
+ $token,'16').
+ &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('Percent error angle:','anglepercenterror',
+ $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','anglepercenterror');
+ if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+ }
+ return $result;
+}
+
+sub end_functionplotvectorsumrule {
+ 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
@@ -940,6 +1185,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;