--- loncom/homework/functionplotresponse.pm 2010/11/13 22:30:28 1.38
+++ loncom/homework/functionplotresponse.pm 2010/11/19 20:03:13 1.41
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: functionplotresponse.pm,v 1.38 2010/11/13 22:30:28 www Exp $
+# $Id: functionplotresponse.pm,v 1.41 2010/11/19 20:03:13 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -47,7 +47,7 @@ sub geogebra_startcode {
my ($id)=@_;
return (<<ENDSTARTCODE);
<applet name="ggbApplet_$id" code="geogebra.GeoGebraApplet" archive="geogebra.jar"
- codebase="/adm/geogebra/" width="714" height="447" MAYSCRIPT>
+ codebase="/adm/geogebra/" width="722" height="447" MAYSCRIPT>
<param name="java_arguments" value="-Xmx512m -Djnlp.packEnabled=true"/>
ENDSTARTCODE
}
@@ -74,9 +74,8 @@ sub geogebra_default_parameters {
<param name="image" value="/adm/lonIcons/lonanim.gif" />
<param name="boxborder" value="false" />
<param name="centerimage" value="true" />
- <param name="java_arguments" value="-Xmx512m" />
- <param name="cache_archive" value="geogebra.jar, geogebra_main.jar, geogebra_gui.jar, geogebra_cas.jar, geogebra_export.jar, geogebra_properties.jar" />
- <param name="cache_version" value="3.2.44.0, 3.2.44.0, 3.2.44.0, 3.2.44.0, 3.2.44.0, 3.2.44.0" />
+ <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="framePossible" value="false" />
<param name="showResetIcon" value="false" />
@@ -159,16 +158,40 @@ sub update_register {
}
#
-# Set a coordinate variable
+# Set a point coordinate variable
#
-sub set_coordinate {
+sub set_point_coordinate {
my ($id,$variable,$x,$y)=@_;
return (<<ENDSETVARIABLE);
document.ggbApplet_$id.evalCommand("$variable=($x,$y)");
+document.ggbApplet_$id.setLabelVisible("$variable",false);
ENDSETVARIABLE
}
#
+# Set a slope coordinate variable
+#
+sub set_slope_coordinate {
+ my ($id,$variable,$xrel,$yrel,$xmin,$xmax,$ymin,$ymax,$pointname)=@_;
+ my $xvariable=$variable.'x';
+ my $yvariable=$variable.'y';
+ my $domain=$xmax-$xmin;
+ my $range=$ymax-$ymin;
+ my $xinterval=$domain/100.;
+ my $yinterval=$range/200.;
+ return (<<ENDSETSVARIABLE);
+document.ggbApplet_$id.evalCommand("$xvariable=Slider[0,$domain,$xinterval]");
+document.ggbApplet_$id.setVisible("$xvariable", false);
+document.ggbApplet_$id.evalCommand("$xvariable=$xrel");
+document.ggbApplet_$id.evalCommand("$yvariable=Slider[-$range,$range,$yinterval]");
+document.ggbApplet_$id.setVisible("$yvariable", false);
+document.ggbApplet_$id.evalCommand("$yvariable=$yrel");
+document.ggbApplet_$id.evalCommand("$variable=($xvariable+x($pointname),$yvariable+y($pointname))");
+document.ggbApplet_$id.setLabelVisible("$variable", false);
+ENDSETSVARIABLE
+}
+
+#
# Input field name for a coordinate variable
#
@@ -189,9 +212,9 @@ sub generate_input_field {
}
#
-# Initialize a new coordinate variable at set a listener on it
+# Initialize a new point coordinate variable at set a listener on it
#
-sub new_coordinate {
+sub new_point_coordinate {
my ($id,$variable,$x,$y)=@_;
if (defined($Apache::functionplotresponse::previous{&field_name($id,$variable,'x')})) {
$x=$Apache::functionplotresponse::previous{&field_name($id,$variable,'x')};
@@ -200,7 +223,37 @@ sub new_coordinate {
$y=$Apache::functionplotresponse::previous{&field_name($id,$variable,'y')};
}
&generate_input_field($id,$variable,$x,$y);
- return &set_coordinate($id,$variable,$x,$y).&update_register($id,$variable);
+ return &set_point_coordinate($id,$variable,$x,$y).&update_register($id,$variable);
+}
+
+#
+# Initialize a new slope coordinate variable at set a listener on it
+#
+sub new_slope_coordinate {
+ my ($id,$variable,$x,$y,$pointname,$xp,$yp,$xmin,$xmax,$ymin,$ymax)=@_;
+#
+# $variable: name of the slope point
+# $x, $y: coordinates of the slope point
+# $pointname: name of the associated point point
+# $xp $yp: coordinates of the point point
+#
+ if (defined($Apache::functionplotresponse::previous{&field_name($id,$variable,'x')})) {
+ $x=$Apache::functionplotresponse::previous{&field_name($id,$variable,'x')};
+ }
+ if (defined($Apache::functionplotresponse::previous{&field_name($id,$variable,'y')})) {
+ $y=$Apache::functionplotresponse::previous{&field_name($id,$variable,'y')};
+ }
+ if (defined($Apache::functionplotresponse::previous{&field_name($id,$pointname,'x')})) {
+ $xp=$Apache::functionplotresponse::previous{&field_name($id,$pointname,'x')};
+ }
+ if (defined($Apache::functionplotresponse::previous{&field_name($id,$pointname,'y')})) {
+ $yp=$Apache::functionplotresponse::previous{&field_name($id,$pointname,'y')};
+ }
+
+ &generate_input_field($id,$variable,$x,$y);
+ my $xrel=$x-$xp;
+ my $yrel=$y-$yp;
+ return &set_slope_coordinate($id,$variable,$xrel,$yrel,$xmin,$xmax,$ymin,$ymax,$pointname).&update_register($id,$variable);
}
#
@@ -263,17 +316,21 @@ ENDYAXISLABELSCRIPT
}
sub plot_script {
- my ($id,$function,$fixed)=@_;
+ my ($id,$function,$fixed,$label,$xmin,$xmax)=@_;
+ $label=~s/\W//g;
+ if (($label) && ($label!~/^[A-Za-z]/)) {
+ $label='C'.$label;
+ }
+ my $visible=0;
+ if ($label) {
+ $visible="1";
+ } else {
+ $Apache::functionplotresponse::counter++;
+ $label='C'.$Apache::functionplotresponse::counter;
+ }
if ($fixed) {
-# Use stupid trick to nail this to a location
-# Oddly, it seems like only one plot cannot be nailed to a location
-# Non-nailed-down plots apparently get overwritten
- return (<<ENDPLOTSCRIPT);
- document.ggbApplet_$id.evalCommand("a=1");
- document.ggbApplet_$id.setVisible("a",false);
- // This MUST be a DEPENDENT OBJECT in order to be locked down:
- document.ggbApplet_$id.evalCommand("y=a*($function)");
-ENDPLOTSCRIPT
+ return "document.ggbApplet_$id.evalCommand('$label=Function[$function,$xmin,$xmax]')".
+ ($visible?'':"document.ggbApplet.setLabelVisible('$label', false);");
} else {
return "document.ggbApplet_$id.evalCommand('y=$function')";
}
@@ -284,7 +341,7 @@ ENDPLOTSCRIPT
#
sub generate_spline {
- my ($id,$label)=@_;
+ my ($id,$label,$xmin,$xmax,$ymin,$ymax)=@_;
my $result='';
my $order=$Apache::functionplotresponse::splineorder{$label};
my $x=$Apache::functionplotresponse::splineinitx{$label};
@@ -293,10 +350,11 @@ sub generate_spline {
my $sy=$Apache::functionplotresponse::splinescaley{$label};
my @coords=();
foreach my $i (1..$order) {
- $result.=&new_coordinate($id,$label.'P'.$i,$x,$y);
+ $result.=&new_point_coordinate($id,$label.'P'.$i,$x,$y);
+ my $xp=$x;
$x+=$sx/(2.*($order-1));
push(@coords,$label.'P'.$i);
- $result.=&new_coordinate($id,$label.'S'.$i,$x,$y+$sy);
+ $result.=&new_slope_coordinate($id,$label.'S'.$i,$x,$y+$sy,$label.'P'.$i,$xp,$y,$xmin,$xmax,$ymin,$ymax);
$x+=$sx/(2.*($order-1));
push(@coords,$label.'S'.$i);
}
@@ -311,21 +369,25 @@ sub start_backgroundplot {
my $result='';
my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1];
my $function=&Apache::lonxml::get_param('function',$parstack,$safeeval);
+ my $label=&Apache::lonxml::get_param('label',$parstack,$safeeval);
my $fixed=(&Apache::lonxml::get_param('fixed',$parstack,$safeeval)=~/on|true|yes|1/i?1:0);
unless ($function) { $function="0"; }
if ($target eq 'web') {
- $result.=&plot_script($internalid,$function,$fixed);
+ my ($xmin,$xmax,$ymin,$ymax)=&boundaries($parstack,$safeeval,-3);
+ $result.=&plot_script($internalid,$function,$fixed,$label,$xmin,$xmax);
} elsif ($target eq 'edit') {
$result=&Apache::edit::tag_start($target,$token,'Background Function Plot').
&Apache::edit::text_arg('Function:','function',
$token,'16').
+ &Apache::edit::text_arg('Label on Plot:','label',
+ $token,'8').
&Apache::edit::select_arg('Fixed location:','fixed',
['yes','no'],$token).
&Apache::edit::end_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
- $safeeval,'function','fixed');
+ $safeeval,'function','label','fixed');
if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
}
return $result;
@@ -699,22 +761,7 @@ sub start_functionplotresponse {
&decode_previous_answer($Apache::lonhomework::history{"resource.$partid.$id.submission"});
# Parameters of <functionplotresponse>
- my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval);
- $xmin=(defined($xmin)?$xmin:-10);
- my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval);
- $xmax=(defined($xmax)?$xmax:10);
- my $ymin=&Apache::lonxml::get_param('ymin',$parstack,$safeeval);
- $ymin=(defined($ymin)?$ymin:-10);
- my $ymax=&Apache::lonxml::get_param('ymax',$parstack,$safeeval);
- $ymax=(defined($ymax)?$ymax:10);
- if ($xmax<=$xmin) {
- &Apache::lonxml::warning('Maximum x-value needs to be larger than minimum value.');
- $xmax=$xmin+20;
- }
- if ($ymax<=$ymin) {
- &Apache::lonxml::warning('Maximum y-value needs to be larger than minimum value.');
- $ymax=$ymin+20;
- }
+ my ($xmin,$xmax,$ymin,$ymax)=&boundaries($parstack,$safeeval);
my $xaxisvisible=(&Apache::lonxml::get_param('xaxisvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false');
my $yaxisvisible=(&Apache::lonxml::get_param('yaxisvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false');
my $gridvisible=(&Apache::lonxml::get_param('gridvisible',$parstack,$safeeval)=~/on|true|yes|1/i?'true':'false');
@@ -981,14 +1028,7 @@ sub end_functionplotruleset {
#
# Actually grade
#
- my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval,-2);
- $xmin=(defined($xmin)?$xmin:-10);
- my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval,-2);
- $xmax=(defined($xmax)?$xmax:10);
- my $ymin=&Apache::lonxml::get_param('ymin',$parstack,$safeeval,-2);
- $ymin=(defined($ymin)?$ymin:-10);
- my $ymax=&Apache::lonxml::get_param('ymax',$parstack,$safeeval,-2);
- $ymax=(defined($ymax)?$ymax:10);
+ my ($xmin,$xmax,$ymin,$ymax)=&boundaries($parstack,$safeeval,-2);
my $ad='';
undef %Apache::functionplotresponse::functionplotrulelabels;
@@ -1068,8 +1108,9 @@ sub end_functionplotelements {
$result=&Apache::edit::end_table();
} elsif ($target eq 'web') {
# Now is the time to render all of the stored splines
+ my ($xmin,$xmax,$ymin,$ymax)=&boundaries($parstack,$safeeval,-2);
foreach my $label (keys(%Apache::functionplotresponse::splineorder)) {
- $result.=&generate_spline($internalid,$label);
+ $result.=&generate_spline($internalid,$label,$xmin,$xmax,$ymin,$ymax);
}
# close the init script
$result.=&end_init_script();
@@ -1094,6 +1135,25 @@ sub end_functionplotelements {
return $result;
}
+sub boundaries {
+ my ($parstack,$safeeval,$level)=@_;
+ my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval,$level);
+ $xmin=(defined($xmin)?$xmin:-10);
+ my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval,$level);
+ $xmax=(defined($xmax)?$xmax:10);
+ my $ymin=&Apache::lonxml::get_param('ymin',$parstack,$safeeval,$level);
+ $ymin=(defined($ymin)?$ymin:-10);
+ my $ymax=&Apache::lonxml::get_param('ymax',$parstack,$safeeval,$level);
+ $ymax=(defined($ymax)?$ymax:10);
+ if ($xmax<=$xmin) {
+ $xmax=$xmin+20;
+ }
+ if ($ymax<=$ymin) {
+ $ymax=$ymin+20;
+ }
+ return ($xmin,$xmax,$ymin,$ymax);
+}
+
sub start_functionplotelements {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
@@ -1113,20 +1173,7 @@ sub start_functionplotelements {
.&Apache::edit::start_spanning_row()
."\n";
} elsif ($target eq 'web') {
- my $xmin=&Apache::lonxml::get_param('xmin',$parstack,$safeeval,-2);
- $xmin=(defined($xmin)?$xmin:-10);
- my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval,-2);
- $xmax=(defined($xmax)?$xmax:10);
- my $ymin=&Apache::lonxml::get_param('ymin',$parstack,$safeeval,-2);
- $ymin=(defined($ymin)?$ymin:-10);
- my $ymax=&Apache::lonxml::get_param('ymax',$parstack,$safeeval,-2);
- $ymax=(defined($ymax)?$ymax:10);
- if ($xmax<=$xmin) {
- $xmax=$xmin+20;
- }
- if ($ymax<=$ymin) {
- $ymax=$ymin+20;
- }
+ my ($xmin,$xmax,$ymin,$ymax)=&boundaries($parstack,$safeeval,-2);
my $xaxisvisible=(&Apache::lonxml::get_param('xaxisvisible',$parstack,$safeeval,-2)=~/on|true|yes|1/i?'true':'false');
my $yaxisvisible=(&Apache::lonxml::get_param('yaxisvisible',$parstack,$safeeval,-2)=~/on|true|yes|1/i?'true':'false');
my $gridvisible=(&Apache::lonxml::get_param('gridvisible',$parstack,$safeeval,-2)=~/on|true|yes|1/i?'true':'false');