version 1.23, 2001/12/28 19:40:47
|
version 1.28, 2001/12/31 19:02:00
|
Line 26
|
Line 26
|
# http://www.lon-capa.org/ |
# http://www.lon-capa.org/ |
# |
# |
# 12/15/01 Matthew |
# 12/15/01 Matthew |
# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 Matthew |
# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 12/30 Matthew |
package Apache::lonplot; |
package Apache::lonplot; |
|
|
use strict; |
use strict; |
Line 193 my %label_defaults =
|
Line 193 my %label_defaults =
|
|
|
my %axis_defaults = |
my %axis_defaults = |
( |
( |
color => { |
color => { |
default => 'x000000', |
default => 'x000000', |
test => $color_test, |
test => $color_test, |
description => 'color of axes (x000000)', |
description => 'color of axes (x000000)', |
Line 222 my %axis_defaults =
|
Line 222 my %axis_defaults =
|
test => $real_test, |
test => $real_test, |
description => 'maximum y-value shown in plot', |
description => 'maximum y-value shown in plot', |
edit_type => 'entry' |
edit_type => 'entry' |
}, |
|
linestyle => { |
|
default => 'points', |
|
test => $linestyle_test, |
|
description => 'Style of the axis lines', |
|
edit_type => 'choice', |
|
choices => ['lines','linespoints','dots','points'] |
|
} |
} |
); |
); |
|
|
Line 269 sub start_plot {
|
Line 262 sub start_plot {
|
# |
# |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
|
&Apache::lonxml::register('Apache::lonplot', |
|
('title','xlabel','ylabel','key','axis','label','curve')); |
|
push (@Apache::lonxml::namespace,'plot'); |
|
my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]); |
if ($target eq 'web') { |
if ($target eq 'web') { |
&Apache::lonxml::register('Apache::lonplot', |
|
('title','xlabel','ylabel','key','axis','label','curve')); |
|
push (@Apache::lonxml::namespace,'plot'); |
|
## Always evaluate the insides of the <plot></plot> tags |
|
my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]); |
|
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
&Apache::lonxml::newparser($parser,\$inside); |
} |
##------------------------------------------------------- |
&Apache::lonxml::newparser($parser,\$inside); |
|
if ($target eq 'web') { |
&get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval, |
&get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval, |
$tagstack->[-1]); |
$tagstack->[-1]); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token); |
$result .= &Apache::edit::tag_start($target,$token,'Plot'); |
$result .= &edit_attributes($target,$token,\%plot_defaults); |
$result .= &edit_attributes($target,$token,\%plot_defaults); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys %plot_defaults); |
($token,$parstack,$safeeval,keys(%plot_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
# $result.= &Apache::edit::handle_insert(); |
} |
} |
} |
} |
return $result; |
return $result; |
Line 296 sub start_plot {
|
Line 289 sub start_plot {
|
|
|
sub end_plot { |
sub end_plot { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
pop @Apache::lonxml::namespace; |
pop @Apache::lonxml::namespace; |
&Apache::lonxml::deregister('Apache::lonplot', |
&Apache::lonxml::deregister('Apache::lonplot', |
('title','xlabel','ylabel','key','axis','label','curve')); |
('title','xlabel','ylabel','key','axis','label','curve')); |
Line 333 sub start_key {
|
Line 327 sub start_key {
|
&get_attributes(\%key,\%key_defaults,$parstack,$safeeval, |
&get_attributes(\%key,\%key_defaults,$parstack,$safeeval, |
$tagstack->[-1]); |
$tagstack->[-1]); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token); |
$result .= &Apache::edit::tag_start($target,$token,'Plot Key'); |
$result .= &edit_attributes($target,$token,\%key_defaults); |
$result .= &edit_attributes($target,$token,\%key_defaults); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys %key_defaults); |
($token,$parstack,$safeeval,keys(%key_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
$result.= &Apache::edit::handle_insert(); |
Line 363 sub start_title {
|
Line 357 sub start_title {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]); |
$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::tag_start($target,$token,'Plot Title'); |
my $text=&Apache::lonxml::get_all_text("/title",$$parser[-1]); |
my $text=&Apache::lonxml::get_all_text("/title",$$parser[-1]); |
$result.='</td></tr><tr><td colspan="3">'. |
$result.='</td></tr><tr><td colspan="3">'. |
&Apache::edit::editfield('',$text,'',20,1). |
&Apache::edit::editfield('',$text,'',20,1); |
&Apache::edit::end_table(); |
|
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $text=$$parser[-1]->get_text("/function"); |
my $text=$$parser[-1]->get_text("/function"); |
$result.=&Apache::edit::modifiedfield($token); |
$result.=&Apache::edit::modifiedfield($token); |
Line 391 sub start_xlabel {
|
Line 384 sub start_xlabel {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]); |
$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel'); |
my $text=&Apache::lonxml::get_all_text("/xlabel",$$parser[-1]); |
my $text=&Apache::lonxml::get_all_text("/xlabel",$$parser[-1]); |
$result.='</td></tr><tr><td colspan="3">'. |
$result.='</td></tr><tr><td colspan="3">'. |
&Apache::edit::editfield('',$text,'',20,1). |
&Apache::edit::editfield('',$text,'',20,1); |
&Apache::edit::end_table(); |
|
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $text=$$parser[-1]->get_text("/function"); |
my $text=$$parser[-1]->get_text("/function"); |
$result.=&Apache::edit::modifiedfield($token); |
$result.=&Apache::edit::modifiedfield($token); |
Line 420 sub start_ylabel {
|
Line 412 sub start_ylabel {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]); |
$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token); |
$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel'); |
my $text = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]); |
my $text = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]); |
$result .= '</td></tr><tr><td colspan="3">'. |
$result .= '</td></tr><tr><td colspan="3">'. |
&Apache::edit::editfield('',$text,'',20,1). |
&Apache::edit::editfield('',$text,'',20,1); |
&Apache::edit::end_table(); |
|
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $text=$$parser[-1]->get_text("/function"); |
my $text=$$parser[-1]->get_text("/function"); |
$result.=&Apache::edit::modifiedfield($token); |
$result.=&Apache::edit::modifiedfield($token); |
Line 457 sub start_label {
|
Line 448 sub start_label {
|
} |
} |
push(@labels,\%label); |
push(@labels,\%label); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token); |
$result .= &Apache::edit::tag_start($target,$token,'Plot Label'); |
$result .= &edit_attributes($target,$token,\%label_defaults); |
$result .= &edit_attributes($target,$token,\%label_defaults); |
my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]); |
my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]); |
$result .= '</td></tr><tr><td colspan="3">'. |
$result .= '</td></tr><tr><td colspan="3">'. |
&Apache::edit::editfield('',$text,'',20,1). |
&Apache::edit::editfield('',$text,'',20,1); |
&Apache::edit::end_table(); |
|
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys %label_defaults); |
($token,$parstack,$safeeval,keys(%label_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
$result.= &Apache::edit::handle_insert(); |
Line 490 sub end_label {
|
Line 480 sub end_label {
|
sub start_curve { |
sub start_curve { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
|
&Apache::lonxml::register('Apache::lonplot',('function','data')); |
|
push (@Apache::lonxml::namespace,'curve'); |
if ($target eq 'web') { |
if ($target eq 'web') { |
my %curve; |
my %curve; |
&get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval, |
&get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval, |
$tagstack->[-1]); |
$tagstack->[-1]); |
push (@curves,\%curve); |
push (@curves,\%curve); |
&Apache::lonxml::register('Apache::lonplot',('function','data')); |
|
push (@Apache::lonxml::namespace,'curve'); |
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token); |
$result .= &Apache::edit::tag_start($target,$token,'Curve'); |
$result .= &edit_attributes($target,$token,\%curve_defaults); |
$result .= &edit_attributes($target,$token,\%curve_defaults); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys %label_defaults); |
($token,$parstack,$safeeval,keys(%label_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
$result.= &Apache::edit::handle_insert(); |
Line 514 sub start_curve {
|
Line 504 sub start_curve {
|
sub end_curve { |
sub end_curve { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result = ''; |
my $result = ''; |
|
pop @Apache::lonxml::namespace; |
|
&Apache::lonxml::deregister('Apache::lonplot',('function','data')); |
if ($target eq 'web') { |
if ($target eq 'web') { |
pop @Apache::lonxml::namespace; |
|
&Apache::lonxml::deregister('Apache::lonplot',('function','data')); |
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_end($target,$token); |
$result.=&Apache::edit::tag_end($target,$token); |
} |
} |
Line 535 sub start_function {
|
Line 525 sub start_function {
|
$curves[-1]->{'function'} = |
$curves[-1]->{'function'} = |
&Apache::lonxml::get_all_text("/function",$$parser[-1]); |
&Apache::lonxml::get_all_text("/function",$$parser[-1]); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token); |
$result .= &Apache::edit::tag_start($target,$token,'Curve Function'); |
my $text = &Apache::lonxml::get_all_text("/function",$$parser[-1]); |
my $text = &Apache::lonxml::get_all_text("/function",$$parser[-1]); |
$result .= '</td></tr><tr><td colspan="3">'. |
$result .= '</td></tr><tr><td colspan="3">'. |
&Apache::edit::editfield('',$text,'',20,1). |
&Apache::edit::editfield('',$text,'',20,1); |
&Apache::edit::end_table(); |
|
|
|
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
# Why do I do this? |
# Why do I do this? |
my $text=$$parser[-1]->get_text("/function"); |
my $text=$$parser[-1]->get_text("/function"); |
Line 554 sub end_function {
|
Line 542 sub end_function {
|
my $result = ''; |
my $result = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
|
$result .= &Apache::edit::end_table(); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 598 sub start_data {
|
Line 587 sub start_data {
|
} |
} |
push @{$curves[-1]->{'data'}},\@data; |
push @{$curves[-1]->{'data'}},\@data; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token); |
$result .= &Apache::edit::tag_start($target,$token,'Curve Data'); |
my $text = &Apache::lonxml::get_all_text("/data",$$parser[-1]); |
my $text = &Apache::lonxml::get_all_text("/data",$$parser[-1]); |
$result .= '</td></tr><tr><td colspan="3">'. |
$result .= '</td></tr><tr><td colspan="3">'. |
&Apache::edit::editfield('',$text,'',20,1). |
&Apache::edit::editfield('',$text,'',20,1); |
&Apache::edit::end_table(); |
|
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $text=$$parser[-1]->get_text("/data"); |
my $text=$$parser[-1]->get_text("/data"); |
$result.=&Apache::edit::modifiedfield($token); |
$result.=&Apache::edit::modifiedfield($token); |
Line 615 sub end_data {
|
Line 603 sub end_data {
|
my $result = ''; |
my $result = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
|
$result .= &Apache::edit::end_table(); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 627 sub start_axis {
|
Line 616 sub start_axis {
|
&get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval, |
&get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval, |
$tagstack->[-1]); |
$tagstack->[-1]); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token); |
$result .= &Apache::edit::tag_start($target,$token,'Plot Axes'); |
$result .= &edit_attributes($target,$token,\%axis_defaults); |
$result .= &edit_attributes($target,$token,\%axis_defaults); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
} |
} |
Line 642 sub end_axis {
|
Line 631 sub end_axis {
|
$result.=&Apache::edit::tag_end($target,$token); |
$result.=&Apache::edit::tag_end($target,$token); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys %axis_defaults); |
($token,$parstack,$safeeval,keys(%axis_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
$result.= &Apache::edit::handle_insert(); |
Line 661 sub end_axis {
|
Line 650 sub end_axis {
|
sub set_defaults { |
sub set_defaults { |
my ($var,$defaults) = @_; |
my ($var,$defaults) = @_; |
my $key; |
my $key; |
foreach $key (keys %$defaults) { |
foreach $key (keys(%$defaults)) { |
$var->{$key} = $defaults->{$key}->{'default'}; |
$var->{$key} = $defaults->{$key}->{'default'}; |
} |
} |
} |
} |
Line 669 sub set_defaults {
|
Line 658 sub set_defaults {
|
##------------------------------------------------------------------- misc |
##------------------------------------------------------------------- misc |
sub get_attributes{ |
sub get_attributes{ |
my ($values,$defaults,$parstack,$safeeval,$tag) = @_; |
my ($values,$defaults,$parstack,$safeeval,$tag) = @_; |
foreach my $attr (keys %{$defaults}) { |
foreach my $attr (keys(%{$defaults})) { |
$values->{$attr} = |
$values->{$attr} = |
&Apache::lonxml::get_param($attr,$parstack,$safeeval); |
&Apache::lonxml::get_param($attr,$parstack,$safeeval); |
if ($values->{$attr} eq '' | !defined($values->{$attr})) { |
if ($values->{$attr} eq '' | !defined($values->{$attr})) { |
Line 795 sub check_inputs {
|
Line 784 sub check_inputs {
|
sub edit_attributes { |
sub edit_attributes { |
my ($target,$token,$defaults) = @_; |
my ($target,$token,$defaults) = @_; |
my $result; |
my $result; |
foreach my $attr (%$defaults) { |
foreach my $attr (sort keys(%$defaults)) { |
if ($defaults->{$attr}->{'edit_type'} eq 'entry') { |
if ($defaults->{$attr}->{'edit_type'} eq 'entry') { |
$result .= &Apache::edit::text_arg( |
$result .= &Apache::edit::text_arg( |
$defaults->{$attr}->{'description'}, |
$defaults->{$attr}->{'description'}, |
Line 808 sub edit_attributes {
|
Line 797 sub edit_attributes {
|
$defaults->{$attr}->{'choices'}, |
$defaults->{$attr}->{'choices'}, |
$token); |
$token); |
} |
} |
|
$result .= '<br />'; |
} |
} |
return $result; |
return $result; |
} |
} |
Line 825 sub insert_plot {
|
Line 815 sub insert_plot {
|
# plot attributes |
# plot attributes |
$result .= '<plot '; |
$result .= '<plot '; |
foreach my $attr (%plot_defaults) { |
foreach my $attr (%plot_defaults) { |
$result .= ' '.$attr.' "'.$plot_defaults{$attr}->{'default'}. |
$result .= ' '.$attr.'="'.$plot_defaults{$attr}->{'default'}. |
"\"\n"; |
"\"\n"; |
} |
} |
$result .= ">\n"; |
$result .= ">\n"; |
Line 848 sub insert_key {
|
Line 838 sub insert_key {
|
my $result; |
my $result; |
$result .= ' <key '; |
$result .= ' <key '; |
foreach my $attr (%key_defaults) { |
foreach my $attr (%key_defaults) { |
$result .= ' '.$attr.' "'.$key_defaults{$attr}->{'default'}. |
$result .= ' '.$attr.'="'.$key_defaults{$attr}->{'default'}. |
"\"\n"; |
"\"\n"; |
} |
} |
$result .= " />\n"; |
$result .= " />\n"; |
Line 859 sub insert_axis{
|
Line 849 sub insert_axis{
|
my $result; |
my $result; |
$result .= ' <axis '; |
$result .= ' <axis '; |
foreach my $attr (%axis_defaults) { |
foreach my $attr (%axis_defaults) { |
$result .= ' '.$attr.' "'.$axis_defaults{$attr}->{'default'}. |
$result .= ' '.$attr.'="'.$axis_defaults{$attr}->{'default'}. |
"\"\n"; |
"\"\n"; |
} |
} |
$result .= " />\n"; |
$result .= " />\n"; |
return $result; |
return $result; |
} |
} |
|
|
|
sub insert_title { return " <title></title>\n"; } |
|
sub insert_title { return " <xlabel></xlabel>\n"; } |
|
sub insert_title { return " <ylabel></ylabel>\n"; } |
|
|
sub insert_label { |
sub insert_label { |
my $result; |
my $result; |
$result .= ' <label '; |
$result .= ' <label '; |
foreach my $attr (%label_defaults) { |
foreach my $attr (%label_defaults) { |
$result .= ' '.$attr.' "'. |
$result .= ' '.$attr.'="'. |
$label_defaults{$attr}->{'default'}."\"\n"; |
$label_defaults{$attr}->{'default'}."\"\n"; |
} |
} |
$result .= " ></label>\n"; |
$result .= " ></label>\n"; |
Line 881 sub insert_curve {
|
Line 875 sub insert_curve {
|
my $result; |
my $result; |
$result .= ' <curve '; |
$result .= ' <curve '; |
foreach my $attr (%curve_defaults) { |
foreach my $attr (%curve_defaults) { |
$result .= ' '.$attr.' "'. |
$result .= ' '.$attr.'="'. |
$curve_defaults{$attr}->{'default'}."\"\n"; |
$curve_defaults{$attr}->{'default'}."\"\n"; |
} |
} |
$result .= " >\n"; |
$result .= " >\n"; |