[LON-CAPA-cvs] cvs: loncom /homework edit.pm functionplotresponse.pm insertlist.xml

www www at source.lon-capa.org
Sat Nov 19 08:45:36 EST 2011


www		Sat Nov 19 13:45:36 2011 EDT

  Modified files:              
    /loncom/homework	edit.pm functionplotresponse.pm insertlist.xml 
  Log:
  Work on vector rules
  
  
-------------- next part --------------
Index: loncom/homework/edit.pm
diff -u loncom/homework/edit.pm:1.136 loncom/homework/edit.pm:1.137
--- loncom/homework/edit.pm:1.136	Fri Nov 18 16:39:22 2011
+++ loncom/homework/edit.pm	Sat Nov 19 13:45:36 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.136 2011/11/18 16:39:22 www Exp $
+# $Id: edit.pm,v 1.137 2011/11/19 13:45:36 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -434,6 +434,16 @@
 <functionplotrule />';
 }
 
+sub insert_functionplotvectorrule {
+    return '
+<functionplotvectorrule />';
+}
+
+sub insert_functionplotvectorsumrule {
+    return '
+<functionplotvectorsumrule />';
+}
+
 sub insert_functionplotruleset {
     return '
 <functionplotruleset>
Index: loncom/homework/functionplotresponse.pm
diff -u loncom/homework/functionplotresponse.pm:1.74 loncom/homework/functionplotresponse.pm:1.75
--- loncom/homework/functionplotresponse.pm:1.74	Fri Nov 18 19:32:48 2011
+++ loncom/homework/functionplotresponse.pm	Sat Nov 19 13:45:36 2011
@@ -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 @@
  
 BEGIN {
   &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline',
-                                                            'plotobject','plotvector',
+                                                            'plotobject','plotvector','functionplotvectorrule',
                                                             'functionplotrule','functionplotruleset',
                                                             'functionplotelements'));
 }
@@ -509,6 +509,7 @@
                                      $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 @@
 
              &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 @@
            &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 @@
 
 
 #
+# <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 @@
   $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;
Index: loncom/homework/insertlist.xml
diff -u loncom/homework/insertlist.xml:1.26 loncom/homework/insertlist.xml:1.27
--- loncom/homework/insertlist.xml:1.26	Fri Nov 18 17:44:07 2011
+++ loncom/homework/insertlist.xml	Sat Nov 19 13:45:36 2011
@@ -60,7 +60,7 @@
                 <description>Function Plot Rule Set</description>
                 <color>#99ff88</color>
                 <insert_sub>insert_functionplotruleset</insert_sub>
-                <allow>functionplotrule</allow>
+                <allow>functionplotrule,functionplotvectorrule,functionplotvectorsumrule</allow>
         <tag>
         <tag name="functionplotelements">
                 <description>Function Plot Elements</description>
@@ -70,7 +70,7 @@
         <tag>
 
         <tag name="functionplotrule">
-                <description>Function Plot Evaluation Rule</description>
+                <description>Function Plot Graph Rule</description>
                 <color>#99ff88</color>
                 <insert_sub>insert_functionplotrule</insert_sub>
                 <allow></allow>
@@ -80,6 +80,22 @@
                 </help>
 
         </tag>
+
+        <tag name="functionplotvectorrule">
+                <description>Function Plot Vector Rule</description>
+                <color>#99ff88</color>
+                <insert_sub>insert_functionplotvectorrule</insert_sub>
+                <allow></allow>
+        </tag>
+
+        <tag name="functionplotvectorsumrule">
+                <description>Function Plot Vector Sum Rule</description>
+                <color>#99ff88</color>
+                <insert_sub>insert_functionplotvectorsumrule</insert_sub>
+                <allow></allow>
+        </tag>
+
+
 	<tag name="caparesponse::answergroup">
 		<description>Collection of Answers</description>
 		<color>#55cc55</color>


More information about the LON-CAPA-cvs mailing list