--- loncom/homework/functionplotresponse.pm	2011/11/21 20:48:50	1.83
+++ loncom/homework/functionplotresponse.pm	2011/12/09 22:04:51	1.89
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # Functionplot responses
 #
-# $Id: functionplotresponse.pm,v 1.83 2011/11/21 20:48:50 www Exp $
+# $Id: functionplotresponse.pm,v 1.89 2011/12/09 22:04:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,10 +32,13 @@ 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',
+                                                            'functionplotcustomrule',
                                                             'functionplotrule','functionplotruleset',
                                                             'functionplotelements'));
 }
@@ -46,10 +49,14 @@ BEGIN {
 #
 
 sub geogebra_startcode {
-    my ($id)=@_;
+    my ($id,$width,$height)=@_;
+    $width=int(1.*$width);
+    $height=int(1.*$height);
+    unless ($width) { $width=700; }
+    unless ($height) { $height=400; }
     return (<<ENDSTARTCODE);
 <applet name="ggbApplet_$id" code="geogebra.GeoGebraApplet" archive="geogebra.jar"
-         codebase="/adm/geogebra/"  width="722" height="447" MAYSCRIPT>
+         codebase="/adm/geogebra/"  width="$width" height="$height" MAYSCRIPT>
        <param name="java_arguments" value="-Xmx512m -Djnlp.packEnabled=true"/>
 ENDSTARTCODE
 }
@@ -780,39 +787,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 +822,16 @@ sub start_functionplotvectorrule {
              &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').
+                                     $token,'30').
              &Apache::edit::text_arg('Absolute error length:','lengtherror',
-                                     $token,'8').
+                                     $token,'8').'<br />'.
+             &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',
@@ -912,21 +891,20 @@ sub start_functionplotvectorsumrule {
              &Apache::edit::text_arg('Comma-separated list of vectors:','vectors',
                                       $token,'30').'<br />'.
              &Apache::edit::text_arg('Sum vector length:','length',
-                                     $token,'16').
+                                     $token,'30').
+             &Apache::edit::text_arg('Absolute error length:','lengtherror',
+                                     $token,'8').'<br />'.
              &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','vectors',
-                                                           '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;
 }
@@ -941,6 +919,65 @@ sub end_functionplotvectorsumrule {
 }
 
 #
+# <functionplotcustom ... />
+#
+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;
+}
+
+
+
+#
 # <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
@@ -1215,7 +1252,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').'&nbsp;'.
+             &Apache::edit::text_arg('Height (pixels):','height',
+                                     $token,'6').'<br />'.
+             &Apache::edit::text_arg('Label x-axis:','xlabel',
                                      $token,'6').'&nbsp;'.
              &Apache::edit::text_arg('Minimum x-value:','xmin',
                                      $token,'4').'&nbsp;'.
@@ -1238,7 +1279,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); }
 
@@ -1259,14 +1300,18 @@ sub start_functionplotresponse {
       my $function_name =
                 join('_','LONCAPA_scriptvars',$uname,$udom,
                      $env{'form.counter'},$Apache::lonxml::curdepth);
-      my $rules_var ="<script type=\"text/javascript\">
-// <![CDATA[
-    function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page<pre>".
-    $Apache::functionplotresponse::ruleslog.
-    "<\\/pre>$end_page');newWindow.document.close();newWindow.focus()}
-// ]]>
-</script><a href=\"javascript:$function_name();void(0);\">".&mt('Rules Log')."</a><br />";
-            &Apache::lonxml::add_script_result($rules_var);
+      my $rulelogcontent= $start_page.
+              &Apache::loncommon::start_scrollbox('700px','680px','480px').
+             '<pre>'.
+              $Apache::functionplotresponse::ruleslog.
+              '</pre>'.
+              &Apache::loncommon::end_scrollbox().
+              $end_page;
+      $rulelogcontent=~s/\'/\\'/gs;
+      &Apache::lonxml::add_script_result(
+          &Apache::loncommon::modal_adhoc_script($function_name,700,500,$rulelogcontent).
+              "<a href=\"javascript:$function_name();void(0);\">".&mt('Rules Log')."</a><br />"
+                                        );
         }
 
   return $result;
@@ -1356,6 +1401,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)=@_;
@@ -1372,16 +1454,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);
 }
@@ -1425,6 +1518,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);
    }
 }
 
@@ -1560,6 +1655,20 @@ sub sumcheck {
    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;
+}
+
 #
 # Evaluate a functionplotrule
 #
@@ -1889,7 +1998,9 @@ sub end_functionplotelements {
 # generate the input fields
      $result.=$Apache::functionplotresponse::inputfields;
 # actually start the <applet>-tag
-     $result.=&geogebra_startcode($internalid);
+     $result.=&geogebra_startcode($internalid,
+                                  &Apache::lonxml::get_param('width',$parstack,$safeeval,-2),
+                                  &Apache::lonxml::get_param('height',$parstack,$safeeval,-2));
 # load the spline bytecode
      $result.=&geogebra_spline_program();
 # set default parameters