--- loncom/xml/lonplot.pm 2002/03/14 21:44:37 1.57
+++ loncom/xml/lonplot.pm 2002/03/22 15:43:42 1.60
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Dynamic plot
#
-# $Id: lonplot.pm,v 1.57 2002/03/14 21:44:37 matthew Exp $
+# $Id: lonplot.pm,v 1.60 2002/03/22 15:43:42 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -91,10 +91,6 @@ my %linestyles =
yerrorbars => [3,4],
xyerrorbars => [4,6],
boxes => 3,
-# boxerrorbars => [3,4,5],
-# boxxyerrorbars => [4,6,7],
-# financebars => 5,
-# candlesticks => 5,
vector => 4
);
@@ -371,6 +367,8 @@ is an error in your function tag.
ENDCURVEHELP
+my @curve_edit_order = ('color','name','linestyle','pointsize');
+
my %curve_defaults =
(
color => {
@@ -393,7 +391,22 @@ my %curve_defaults =
description => 'Line style',
edit_type => 'choice',
choices => [keys(%linestyles)]
- }
+ },
+# gnuplots term=gif driver does not handle linewidth :(
+# linewidth => {
+# default => 1,
+# test => $int_test,
+# description => 'Line width (may not apply to all line styles)',
+# edit_type => 'choice',
+# choices => [1,2,3,4,5,6,7,8,9,10]
+# },
+ pointsize => {
+ default => 1,
+ test => $int_test,
+ description => 'point size (may not apply to all line styles)',
+ edit_type => 'choice',
+ choices => [0,1,2,3,4,5,6,7,8,9,10]
+ }
);
###################################################################
@@ -416,9 +429,6 @@ sub start_gnuplot {
'xtics','ytics'));
push (@Apache::lonxml::namespace,'lonplot');
if ($target eq 'web' || $target eq 'tex') {
- my $inside = &Apache::lonxml::get_all_text("/gnuplot",$$parser[-1]);
- $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
- &Apache::lonxml::newparser($parser,\$inside);
&get_attributes(\%plot,\%gnuplot_defaults,$parstack,$safeeval,
$tagstack->[-1]);
} elsif ($target eq 'edit') {
@@ -581,6 +591,7 @@ sub start_title {
my $result='';
if ($target eq 'web' || $target eq 'tex') {
$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]);
+ $title=&Apache::run::evaluate($title,$safeeval,$$parstack[-1]);
$title =~ s/\n/ /g;
if (length($title) > $max_str_len) {
$title = substr($title,0,$max_str_len);
@@ -590,7 +601,7 @@ sub start_title {
my $text=&Apache::lonxml::get_all_text("/title",$$parser[-1]);
$result.=&Apache::edit::end_row().
&Apache::edit::start_spanning_row().
- &Apache::edit::editfield('',$text,'',60,1);
+ &Apache::edit::textfield('',$text,'',60);
} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/title");
$result.=&Apache::edit::rebuild_tag($token);
@@ -614,6 +625,7 @@ sub start_xlabel {
my $result='';
if ($target eq 'web' || $target eq 'tex') {
$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
+ $xlabel=&Apache::run::evaluate($xlabel,$safeeval,$$parstack[-1]);
$xlabel =~ s/\n/ /g;
if (length($xlabel) > $max_str_len) {
$xlabel = substr($xlabel,0,$max_str_len);
@@ -623,7 +635,7 @@ sub start_xlabel {
my $text=&Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
$result.=&Apache::edit::end_row().
&Apache::edit::start_spanning_row().
- &Apache::edit::editfield('',$text,'',60,1);
+ &Apache::edit::textfield('',$text,'',60);
} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/xlabel");
$result.=&Apache::edit::rebuild_tag($token);
@@ -648,6 +660,7 @@ sub start_ylabel {
my $result='';
if ($target eq 'web' || $target eq 'tex') {
$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
+ $ylabel = &Apache::run::evaluate($ylabel,$safeeval,$$parstack[-1]);
$ylabel =~ s/\n/ /g;
if (length($ylabel) > $max_str_len) {
$ylabel = substr($ylabel,0,$max_str_len);
@@ -657,7 +670,7 @@ sub start_ylabel {
my $text = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
$result .= &Apache::edit::end_row().
&Apache::edit::start_spanning_row().
- &Apache::edit::editfield('',$text,'',60,1);
+ &Apache::edit::textfield('',$text,'',60);
} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/ylabel");
$result.=&Apache::edit::rebuild_tag($token);
@@ -685,6 +698,7 @@ sub start_label {
&get_attributes(\%label,\%label_defaults,$parstack,$safeeval,
$tagstack->[-1]);
my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]);
+ $text = &Apache::run::evaluate($text,$safeeval,$$parstack[-1]);
$text =~ s/\n/ /g;
$text = substr($text,0,$max_str_len) if (length($text) > $max_str_len);
$label{'text'} = $text;
@@ -695,7 +709,7 @@ sub start_label {
my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]);
$result .= &Apache::edit::end_row().
&Apache::edit::start_spanning_row().
- &Apache::edit::editfield('',$text,'',60,1);
+ &Apache::edit::textfield('',$text,'',60);
} elsif ($target eq 'modified') {
&Apache::edit::get_new_args
($token,$parstack,$safeeval,keys(%label_defaults));
@@ -730,7 +744,8 @@ sub start_curve {
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Curve');
$result .= &help_win($curve_help_text);
- $result .= &edit_attributes($target,$token,\%curve_defaults);
+ $result .= &edit_attributes($target,$token,\%curve_defaults,
+ \@curve_edit_order);
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
($token,$parstack,$safeeval,keys(%curve_defaults));
@@ -763,14 +778,15 @@ sub start_function {
&Apache::lonxml::warning('Use of precludes use of . The will be omitted in favor of the declaration.');
delete $curves[-1]->{'data'} ;
}
- $curves[-1]->{'function'} =
- &Apache::lonxml::get_all_text("/function",$$parser[-1]);
+ my $function = &Apache::lonxml::get_all_text("/function",$$parser[-1]);
+ $function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]);
+ $curves[-1]->{'function'} = $function;
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function');
my $text = &Apache::lonxml::get_all_text("/function",$$parser[-1]);
$result .= &Apache::edit::end_row().
&Apache::edit::start_spanning_row().
- &Apache::edit::editfield('',$text,'',60,1);
+ &Apache::edit::textfield('',$text,'',60);
} elsif ($target eq 'modified') {
$result.=&Apache::edit::rebuild_tag($token);
my $text=$$parser[-1]->get_text("/function");
@@ -801,6 +817,7 @@ sub start_data {
delete($curves[-1]->{'function'});
}
my $datatext = &Apache::lonxml::get_all_text("/data",$$parser[-1]);
+ $datatext=&Apache::run::evaluate($datatext,$safeeval,$$parstack[-1]);
# Deal with cases where we're given an array...
if ($datatext =~ /^\@/) {
$datatext = &Apache::run::run('return "'.$datatext.'"',
@@ -845,7 +862,7 @@ sub start_data {
my $text = &Apache::lonxml::get_all_text("/data",$$parser[-1]);
$result .= &Apache::edit::end_row().
&Apache::edit::start_spanning_row().
- &Apache::edit::editfield('',$text,'',60,1);
+ &Apache::edit::textfield('',$text,'',60);
} elsif ($target eq 'modified') {
$result.=&Apache::edit::rebuild_tag($token);
my $text=$$parser[-1]->get_text("/data");
@@ -1015,6 +1032,18 @@ sub write_gnuplot_file {
$curve->{'function'}.' title "'.
$curve->{'name'}.'" with '.
$curve->{'linestyle'};
+#
+# gnuplot's term=gif driver does not handle linewidths :(
+# . ' linewidth '. $curve->{'linewidth'};
+#
+ if (($curve->{'linestyle'} eq 'points') ||
+ ($curve->{'linestyle'} eq 'linespoints') ||
+ ($curve->{'linestyle'} eq 'errorbars') ||
+ ($curve->{'linestyle'} eq 'xerrorbars') ||
+ ($curve->{'linestyle'} eq 'yerrorbars') ||
+ ($curve->{'linestyle'} eq 'xyerrorbars')) {
+ $gnuplot_input.=' pointsize '.$curve->{'pointsize'};
+ }
} elsif (exists($curve->{'data'})) {
# Store data values in $datatext
my $datatext = '';