version 1.87, 2011/11/24 15:43:08
|
version 1.90, 2011/12/10 18:10:56
|
Line 49 BEGIN {
|
Line 49 BEGIN {
|
# |
# |
|
|
sub geogebra_startcode { |
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); |
return (<<ENDSTARTCODE); |
<applet name="ggbApplet_$id" code="geogebra.GeoGebraApplet" archive="geogebra.jar" |
<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"/> |
<param name="java_arguments" value="-Xmx512m -Djnlp.packEnabled=true"/> |
ENDSTARTCODE |
ENDSTARTCODE |
} |
} |
Line 1248 sub start_functionplotresponse {
|
Line 1252 sub start_functionplotresponse {
|
.&Apache::edit::end_row() |
.&Apache::edit::end_row() |
.&Apache::edit::start_spanning_row() |
.&Apache::edit::start_spanning_row() |
."\n"; |
."\n"; |
$result.=&Apache::edit::text_arg('Label x-axis:','xlabel', |
$result.=&Apache::edit::text_arg('Width (pixels):','width', |
|
$token,'6').' '. |
|
&Apache::edit::text_arg('Height (pixels):','height', |
|
$token,'6').'<br />'. |
|
&Apache::edit::text_arg('Label x-axis:','xlabel', |
$token,'6').' '. |
$token,'6').' '. |
&Apache::edit::text_arg('Minimum x-value:','xmin', |
&Apache::edit::text_arg('Minimum x-value:','xmin', |
$token,'4').' '. |
$token,'4').' '. |
Line 1271 sub start_functionplotresponse {
|
Line 1279 sub start_functionplotresponse {
|
&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
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'); |
'xaxisvisible','yaxisvisible','gridvisible','answerdisplay'); |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
|
|
Line 1281 sub start_functionplotresponse {
|
Line 1289 sub start_functionplotresponse {
|
($env{'form.answer_output_mode'} ne 'tex') && |
($env{'form.answer_output_mode'} ne 'tex') && |
($Apache::lonhomework::viewgrades == 'F')) { |
($Apache::lonhomework::viewgrades == 'F')) { |
my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser(); |
my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser(); |
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); |
|
my $start_page = &Apache::loncommon::start_page('Rules Log', undef, |
|
{'only_body' => 1, |
|
'bgcolor' => '#FFFFFF', |
|
'js_ready' => 1,}); |
|
my $end_page = &Apache::loncommon::end_page({'js_ready' => 1,}); |
|
$uname =~s/\W//g; |
$uname =~s/\W//g; |
$udom =~s/\W//g; |
$udom =~s/\W//g; |
my $function_name = |
my $function_name = |
join('_','LONCAPA_scriptvars',$uname,$udom, |
join('_','LONCAPA_scriptvars',$uname,$udom, |
$env{'form.counter'},$Apache::lonxml::curdepth); |
$env{'form.counter'},$Apache::lonxml::curdepth); |
my $rules_var ="<script type=\"text/javascript\"> |
&Apache::lonxml::add_script_result( |
// <![CDATA[ |
&Apache::loncommon::modal_adhoc_window($function_name,700,500, |
function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page<pre>". |
'<pre>'.$Apache::functionplotresponse::ruleslog.'</pre>', |
$Apache::functionplotresponse::ruleslog. |
&mt('Rules Log'))."<br />"); |
"<\\/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); |
|
} |
|
|
|
return $result; |
return $result; |
} |
} |
|
|
Line 1986 sub end_functionplotelements {
|
Line 1983 sub end_functionplotelements {
|
# generate the input fields |
# generate the input fields |
$result.=$Apache::functionplotresponse::inputfields; |
$result.=$Apache::functionplotresponse::inputfields; |
# actually start the <applet>-tag |
# 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 |
# load the spline bytecode |
$result.=&geogebra_spline_program(); |
$result.=&geogebra_spline_program(); |
# set default parameters |
# set default parameters |