--- loncom/homework/functionplotresponse.pm	2010/11/24 15:30:45	1.48
+++ loncom/homework/functionplotresponse.pm	2011/03/24 20:05:25	1.55
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: functionplotresponse.pm,v 1.48 2010/11/24 15:30:45 www Exp $
+# $Id: functionplotresponse.pm,v 1.55 2011/03/24 20:05:25 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -75,7 +75,7 @@ sub geogebra_default_parameters {
         <param name="boxborder" value="false"  />
         <param name="centerimage" value="true"  />
 	<param name="cache_archive" value="geogebra.jar, geogebra_main.jar, geogebra_gui.jar, geogebra_cas.jar, geogebra_algos.jar, geogebra_export.jar, geogebra_javascript.jar, jlatexmath.jar, jlm_greek.jar, jlm_cyrillic.jar, geogebra_properties.jar" />
-	<param name="cache_version" value="3.9.115.0, 3.9.115.0, 3.9.115.0, 3.9.115.0, 3.9.115.0, 3.9.115.0, 3.9.115.0, 3.9.115.0, 3.9.115.0, 3.9.115.0, 3.9.115.0" />
+	<param name="cache_version" value="3.9.183.0, 3.9.183.0, 3.9.183.0, 3.9.183.0, 3.9.183.0, 3.9.183.0, 3.9.183.0, 3.9.183.0, 3.9.183.0, 3.9.183.0, 3.9.183.0" />
         <param name="framePossible" value="false" />
 
         <param name="showResetIcon" value="false" />
@@ -108,7 +108,7 @@ sub init_script {
           $script.="if (param=='applet_$id') { loaded_$id=true; }\n";
       }
       $script.="if (".join(' && ',map { "loaded_$_" } (@Apache::functionplotresponse::callscripts)).
-               ") { setTimeout('ggbInitAll()',20) }";
+               ") { setTimeout('ggbInitAll()',200) }";
       my $calls=join("\n",map { "ggbInit_$_();" } (@Apache::functionplotresponse::callscripts)); 
       return (<<ENDGGBINIT);
 <script type="text/javascript">
@@ -184,7 +184,7 @@ sub set_slope_coordinate {
    my $mult=($fixed?'a*':'');
    return (<<ENDSETSVARIABLE);
 document.ggbApplet_$id.evalCommand("a=1");
-document.ggbApplet_$id.evalCommand("$xvariable=Slider[0,$domain,$xinterval]");
+document.ggbApplet_$id.evalCommand("$xvariable=Slider[$xinterval,$domain,$xinterval]");
 document.ggbApplet_$id.setVisible("$xvariable", false);
 document.ggbApplet_$id.evalCommand("$xvariable=$xrel");
 document.ggbApplet_$id.evalCommand("$yvariable=Slider[-$range,$range,$yinterval]");
@@ -536,6 +536,12 @@ sub start_functionplotrule {
                                      $token,'8').
              &Apache::edit::end_row();
   } elsif ($target eq 'modified') {
+    if (($env{'form.'.&Apache::edit::html_element_name('xinitial')} ne '') && ($env{'form.'.&Apache::edit::html_element_name('xinitiallabel')} eq 'start')) {
+       $env{'form.'.&Apache::edit::html_element_name('xinitiallabel')}='';
+    }
+    if (($env{'form.'.&Apache::edit::html_element_name('xfinal')} ne '') && ($env{'form.'.&Apache::edit::html_element_name('xfinallabel')} eq 'end')) {
+       $env{'form.'.&Apache::edit::html_element_name('xfinallabel')}='';
+    }
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
                                                  $safeeval,'index','derivativeorder',
                                                            'xinitial','xinitiallabel','xfinal','xfinallabel',
@@ -816,7 +822,8 @@ sub start_functionplotresponse {
        .'<tr><td><span class="LC_nobreak">'.&mt('Function Plot Question').'</span></td>'
        .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
        .&Apache::edit::deletelist($target,$token).'&nbsp;&nbsp;&nbsp;'
-       .&Apache::edit::insertlist($target,$token)
+       .&Apache::edit::insertlist($target,$token).'&nbsp;&nbsp;&nbsp;'
+       .&Apache::loncommon::help_open_topic('Function_Plot_Response_Question','Function Plot Responses')
        .'</span></td>'
        ."<td>&nbsp;"
        .&Apache::edit::end_row()
@@ -943,6 +950,9 @@ sub functionplotrulecheck {
    $percent=($percent>0?$percent:5);
    &addlog("=================");
    &addlog("Rule $label for ".($derivative<0?'integral':('function itself','first derivative','second derivative')[$derivative])." $relationship $value");
+   if ((defined($minimumlength)) || (defined($maximumlength))) {
+      &addlog("Minimumlength $minimumlength Maximumlength $maximumlength");
+   }
    my $li=0;
    my $lh=400;
 
@@ -1037,38 +1047,59 @@ sub functionplotrulecheck {
            &addlog("Actual value ".(defined($val)?$val:'undef').", expected $value, tolerance $tol");
            &addlog("Condition not fulfilled at x=".&actualval($i,$xmin,$xmax)." (".$Apache::functionplotresponse::actualxval[$i]."; index $i)");
            if (($findupper) && ($i>$li)) {
-# check for minimum and maximum lengths
-              my $length=&actualval($i,$xmin,$xmax)-&actualval($li,$xmin,$xmax);
-              if ($minimumlength) {
-                 if ($length<$minimumlength) {
-                    &addlog("Rule $label failed, actual length $length, minimum length $minimumlength");
-                    return 0;
-                 }
-              }
-              if ($maximumlength) {
-                 if ($length>$maximumlength) {
-                    &addlog("Rule $label failed, actual length $length, maximum length $maximumlength");
-                    return 0;
-                 }
-              }
+# Check lengths
+              unless (&checklength($i,$li,$minimumlength,$maximumlength,$xmin,$xmax,$label)) { return 0; }
+# Successfully found a new label, set it
               $Apache::functionplotresponse::functionplotrulelabels{$xfinallabel}=$i;
               &addlog("Rule $label passed, setting label $xfinallabel");
               return 1;
            } else {
               &addlog("Rule $label failed.");
-              my $hintlabel=$label;
-              $hintlabel=~s/^R//;
-              push(@Apache::functionplotresponse::failedrules,$hintlabel);
-              &addlog("Set hint condition $hintlabel");
+              &setfailed($label);
               return 0; 
            }
         }
      }
    }
+# Corner case where this makes sense: using start or stop as defined labels
+   unless (&checklength($lh,$li,$minimumlength,$maximumlength,$xmin,$xmax,$label)) { return 0; }
    &addlog("Rule $label passed.");
    return 1;
 }
 
+#
+# check for minimum and maximum lengths
+#
+
+sub checklength {
+    my ($i,$li,$minimumlength,$maximumlength,$xmin,$xmax,$label)=@_;
+    unless (($minimumlength) || ($maximumlength)) { return 1; }
+    my $length=&actualval($i,$xmin,$xmax)-&actualval($li,$xmin,$xmax);
+    if ($minimumlength) {
+       if ($length<$minimumlength) {
+          &addlog("Rule $label failed, actual length $length, minimum length $minimumlength");
+          &setfailed($label);
+          return 0;
+       }
+    }
+    if ($maximumlength) {
+       if ($length>$maximumlength) {
+          &addlog("Rule $label failed, actual length $length, maximum length $maximumlength");
+          &setfailed($label);
+          return 0;
+       }
+    }
+    return 1;
+}
+
+sub setfailed {
+   my ($label)=@_;
+   my $hintlabel=$label;
+   $hintlabel=~s/^R//;
+   push(@Apache::functionplotresponse::failedrules,$hintlabel);
+   &addlog("Set hint condition $hintlabel");
+}
+
 sub start_functionplotruleset {
    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
    if ($target eq 'edit') {
@@ -1076,7 +1107,8 @@ sub start_functionplotruleset {
         '<tr><td><span class="LC_nobreak">'.&mt('Function Plot Rule Set').'</span></td>'
        .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
        .&Apache::edit::deletelist($target,$token).'&nbsp;&nbsp;&nbsp;'.
-        &Apache::edit::insertlist($target,$token)
+        &Apache::edit::insertlist($target,$token).'&nbsp;&nbsp;&nbsp;'
+       .&Apache::loncommon::help_open_topic('Function_Plot_Response_Rule_Set','Function Plot Rules')
        .'</span></td>'
        ."<td>&nbsp;"
        .&Apache::edit::end_row()
@@ -1254,7 +1286,8 @@ sub start_functionplotelements {
         '<tr><td><span class="LC_nobreak">'.&mt('Function Plot Elements').'</span></td>'
        .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
        .&Apache::edit::deletelist($target,$token).'&nbsp;&nbsp;&nbsp;'.
-        &Apache::edit::insertlist($target,$token)
+        &Apache::edit::insertlist($target,$token).'&nbsp;&nbsp;&nbsp;'
+       .&Apache::loncommon::help_open_topic('Function_Plot_Response_Elements','Function Plot Elements')
        .'</span></td>'
        ."<td>&nbsp;"
        .&Apache::edit::end_row()