version 1.115, 2007/02/21 20:34:58
|
version 1.118.2.1, 2007/09/05 13:38:18
|
Line 217 my %gnuplot_defaults =
|
Line 217 my %gnuplot_defaults =
|
choices => ['100','200','500','1000','2000','5000'] |
choices => ['100','200','500','1000','2000','5000'] |
}, |
}, |
align => { |
align => { |
default => 'center', |
default => 'middle', |
test => sub {$_[0]=~/^(left|right|center)$/}, |
test => sub {$_[0]=~/^(left|right|middle|center)$/}, |
description => 'alignment for image in html', |
description => 'alignment for image in html', |
edit_type => 'choice', |
edit_type => 'choice', |
choices => ['left','right','center'] |
choices => ['left','right','middle'] |
}, |
}, |
texwidth => { |
texwidth => { |
default => '93', |
default => '93', |
Line 274 my %gnuplot_defaults =
|
Line 274 my %gnuplot_defaults =
|
}, |
}, |
gridtype => { |
gridtype => { |
default => 'Cartesian', |
default => 'Cartesian', |
test => sub {$_[0]=~/^(Polar|Cartesian)$/}, |
test => sub {$_[0]=~/^(Polar|Cartesian|Linear-Log|Log-Linear|Log-Log)$/}, |
description => 'Grid type:', |
description => 'Grid type:', |
edit_type => 'choice', |
edit_type => 'choice', |
choices => ['Cartesian','Polar'] |
choices => ['Cartesian','Polar','Linear-Log','Log-Linear','Log-Log'] |
}, |
}, |
lmargin => { |
lmargin => { |
default => 'default', |
default => 'default', |
Line 467 my %axis_defaults =
|
Line 467 my %axis_defaults =
|
} |
} |
); |
); |
|
|
my @curve_edit_order = ('color','name','linestyle','pointtype','pointsize','limit'); |
my @curve_edit_order = ('color','name','linestyle','linewidth','pointtype','pointsize','limit'); |
|
|
my %curve_defaults = |
my %curve_defaults = |
( |
( |
Line 492 my %curve_defaults =
|
Line 492 my %curve_defaults =
|
edit_type => 'choice', |
edit_type => 'choice', |
choices => [keys(%linestyles)] |
choices => [keys(%linestyles)] |
}, |
}, |
# gnuplots term=gif driver does not handle linewidth :( |
linewidth => { |
# linewidth => { |
default => 4, |
# default => 1, |
test => $int_test, |
# test => $int_test, |
description => 'Line width (may not apply to all line styles)', |
# description => 'Line width (may not apply to all line styles)', |
edit_type => 'choice', |
# edit_type => 'choice', |
choices => [1,2,3,4,5,6,7,8,9,10] |
# choices => [1,2,3,4,5,6,7,8,9,10] |
}, |
# }, |
|
pointsize => { |
pointsize => { |
default => 1, |
default => 1, |
test => $pos_real_test, |
test => $pos_real_test, |
Line 550 sub start_gnuplot {
|
Line 549 sub start_gnuplot {
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token,'GnuPlot'); |
$result .= &Apache::edit::tag_start($target,$token,'GnuPlot'); |
$result .= &edit_attributes($target,$token,\%gnuplot_defaults, |
$result .= &edit_attributes($target,$token,\%gnuplot_defaults, |
\@gnuplot_edit_order); |
\@gnuplot_edit_order) |
|
.&Apache::edit::end_row() |
|
.&Apache::edit::start_spanning_row(); |
} 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(%gnuplot_defaults)); |
($token,$parstack,$safeeval,keys(%gnuplot_defaults)); |
Line 717 sub start_title {
|
Line 718 sub start_title {
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token,'Plot Title'); |
$result.=&Apache::edit::tag_start($target,$token,'Plot Title'); |
my $text=&Apache::lonxml::get_all_text("/title",$parser,$style); |
my $text=&Apache::lonxml::get_all_text("/title",$parser,$style); |
$result.=&Apache::edit::end_row(). |
$result.=&Apache::edit::editline('',$text,'',60); |
&Apache::edit::start_spanning_row(). |
|
&Apache::edit::editline('',$text,'',60); |
|
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
$result.=&Apache::edit::rebuild_tag($token); |
$result.=&Apache::edit::rebuild_tag($token); |
$result.=&Apache::edit::modifiedfield("/title",$parser); |
$result.=&Apache::edit::modifiedfield("/title",$parser); |
Line 750 sub start_xlabel {
|
Line 749 sub start_xlabel {
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel'); |
$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel'); |
my $text=&Apache::lonxml::get_all_text("/xlabel",$parser,$style); |
my $text=&Apache::lonxml::get_all_text("/xlabel",$parser,$style); |
$result.=&Apache::edit::end_row(). |
$result.=&Apache::edit::editline('',$text,'',60); |
&Apache::edit::start_spanning_row(). |
|
&Apache::edit::editline('',$text,'',60); |
|
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
$result.=&Apache::edit::rebuild_tag($token); |
$result.=&Apache::edit::rebuild_tag($token); |
$result.=&Apache::edit::modifiedfield("/xlabel",$parser); |
$result.=&Apache::edit::modifiedfield("/xlabel",$parser); |
Line 784 sub start_ylabel {
|
Line 781 sub start_ylabel {
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel'); |
$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel'); |
my $text = &Apache::lonxml::get_all_text("/ylabel",$parser,$style); |
my $text = &Apache::lonxml::get_all_text("/ylabel",$parser,$style); |
$result .= &Apache::edit::end_row(). |
$result .= &Apache::edit::editline('',$text,'',60); |
&Apache::edit::start_spanning_row(). |
|
&Apache::edit::editline('',$text,'',60); |
|
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
$result.=&Apache::edit::rebuild_tag($token); |
$result.=&Apache::edit::rebuild_tag($token); |
$result.=&Apache::edit::modifiedfield("/ylabel",$parser); |
$result.=&Apache::edit::modifiedfield("/ylabel",$parser); |
Line 858 sub start_curve {
|
Line 853 sub start_curve {
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token,'Curve'); |
$result .= &Apache::edit::tag_start($target,$token,'Curve'); |
$result .= &edit_attributes($target,$token,\%curve_defaults, |
$result .= &edit_attributes($target,$token,\%curve_defaults, |
\@curve_edit_order); |
\@curve_edit_order) |
|
.&Apache::edit::end_row() |
|
.&Apache::edit::start_spanning_row(); |
|
|
} 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(%curve_defaults)); |
($token,$parstack,$safeeval,keys(%curve_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
|
} |
} |
} |
} |
return $result; |
return $result; |
Line 902 sub start_function {
|
Line 899 sub start_function {
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function'); |
$result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function'); |
my $text = &Apache::lonxml::get_all_text("/function",$parser,$style); |
my $text = &Apache::lonxml::get_all_text("/function",$parser,$style); |
$result .= &Apache::edit::end_row(). |
$result .= &Apache::edit::editline('',$text,'',60); |
&Apache::edit::start_spanning_row(). |
|
&Apache::edit::editline('',$text,'',60); |
|
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
$result.=&Apache::edit::rebuild_tag($token); |
$result.=&Apache::edit::rebuild_tag($token); |
$result.=&Apache::edit::modifiedfield("/function",$parser); |
$result.=&Apache::edit::modifiedfield("/function",$parser); |
Line 979 sub start_data {
|
Line 974 sub start_data {
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token,'Comma or space deliminated curve data'); |
$result .= &Apache::edit::tag_start($target,$token,'Comma or space deliminated curve data'); |
my $text = &Apache::lonxml::get_all_text("/data",$parser,$style); |
my $text = &Apache::lonxml::get_all_text("/data",$parser,$style); |
$result .= &Apache::edit::end_row(). |
$result .= &Apache::edit::editline('',$text,'',60); |
&Apache::edit::start_spanning_row(). |
|
&Apache::edit::editline('',$text,'',60); |
|
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
$result.=&Apache::edit::rebuild_tag($token); |
$result.=&Apache::edit::rebuild_tag($token); |
$result.=&Apache::edit::modifiedfield("/data",$parser); |
$result.=&Apache::edit::modifiedfield("/data",$parser); |
Line 1129 sub write_gnuplot_file {
|
Line 1122 sub write_gnuplot_file {
|
# cartesian or polar grid? |
# cartesian or polar grid? |
if (lc($Apache::lonplot::plot{'gridtype'}) eq 'polar') { |
if (lc($Apache::lonplot::plot{'gridtype'}) eq 'polar') { |
$gnuplot_input .= 'set grid polar'.$/; |
$gnuplot_input .= 'set grid polar'.$/; |
|
} elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'linear-log') { |
|
$gnuplot_input .= 'set logscale x'.$/; |
|
} elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'log-linear') { |
|
$gnuplot_input .= 'set logscale y'.$/; |
|
} elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'log-log') { |
|
$gnuplot_input .= 'set logscale x'.$/; |
|
$gnuplot_input .= 'set logscale y'.$/; |
} else { |
} else { |
# Assume Cartesian |
# Assume Cartesian |
} |
} |
Line 1238 sub write_gnuplot_file {
|
Line 1238 sub write_gnuplot_file {
|
for (my $i = 0;$i<=$#curves;$i++) { |
for (my $i = 0;$i<=$#curves;$i++) { |
$curve = $curves[$i]; |
$curve = $curves[$i]; |
$gnuplot_input.= ', ' if ($i > 0); |
$gnuplot_input.= ', ' if ($i > 0); |
|
if ($target eq 'tex') { |
|
$curve->{'linewidth'} *= 2; |
|
} |
if (exists($curve->{'function'})) { |
if (exists($curve->{'function'})) { |
$gnuplot_input.= |
$gnuplot_input.= |
$curve->{'function'}.' title "'. |
$curve->{'function'}.' title "'. |
$curve->{'name'}.'" with '. |
$curve->{'name'}.'" with '. |
$curve->{'linestyle'}; |
$curve->{'linestyle'}; |
$gnuplot_input.= ' linewidth 4 ' if ($target eq 'tex'); |
$gnuplot_input.= ' linewidth '.$curve->{'linewidth'}; |
|
|
if (($curve->{'linestyle'} eq 'points') || |
if (($curve->{'linestyle'} eq 'points') || |
($curve->{'linestyle'} eq 'linespoints') || |
($curve->{'linestyle'} eq 'linespoints') || |
($curve->{'linestyle'} eq 'errorbars') || |
($curve->{'linestyle'} eq 'errorbars') || |
Line 1278 sub write_gnuplot_file {
|
Line 1282 sub write_gnuplot_file {
|
$gnuplot_input.= '"'.$datafilename.'" title "'. |
$gnuplot_input.= '"'.$datafilename.'" title "'. |
$curve->{'name'}.'" with '. |
$curve->{'name'}.'" with '. |
$curve->{'linestyle'}; |
$curve->{'linestyle'}; |
$gnuplot_input.= ' linewidth 4 ' if ($target eq 'tex'); |
$gnuplot_input.= ' linewidth '.$curve->{'linewidth'}; |
if (($curve->{'linestyle'} eq 'points') || |
if (($curve->{'linestyle'} eq 'points') || |
($curve->{'linestyle'} eq 'linespoints') || |
($curve->{'linestyle'} eq 'linespoints') || |
($curve->{'linestyle'} eq 'errorbars') || |
($curve->{'linestyle'} eq 'errorbars') || |