--- loncom/xml/lonplot.pm 2002/02/06 10:24:55 1.48
+++ loncom/xml/lonplot.pm 2002/03/22 20:05:19 1.63
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Dynamic plot
#
-# $Id: lonplot.pm,v 1.48 2002/02/06 10:24:55 matthew Exp $
+# $Id: lonplot.pm,v 1.63 2002/03/22 20:05:19 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,7 +29,7 @@
# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 12/30 12/31 Matthew
# 01/01/02 Matthew
# 01/02 01/03 01/04 01/07 01/08 01/09 Matthew
-# 01/21 02/05 Matthew
+# 01/21 02/05 02/06 2/28Matthew
package Apache::lonplot;
@@ -91,16 +91,14 @@ my %linestyles =
yerrorbars => [3,4],
xyerrorbars => [4,6],
boxes => 3,
-# boxerrorbars => [3,4,5],
-# boxxyerrorbars => [4,6,7],
-# financebars => 5,
-# candlesticks => 5,
vector => 4
);
my $int_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^\d+$/};
my $real_test =
sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*([eE][+-]\d+)?$/};
+my $pos_real_test =
+ sub {$_[0]=~s/\s+//g;$_[0]=~/^[+]?\d*\.?\d*([eE][+-]\d+)?$/};
my $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-f]{6}$/};
my $onoff_test = sub {$_[0]=~/^(on|off)$/};
my $key_pos_test = sub {$_[0]=~/^(top|bottom|right|left|outside|below| )+$/};
@@ -144,6 +142,8 @@ A <b>gnuplot</b> tag can contain the fol
<dd> Allows specification of the x and y coordinate 'tics' on the axes.
This is mostly used to adjust the grid lines when a grid is displayed.
</dl>
+If you are having trouble with your plot, please read the help
+available on Plot Curve.
ENDPLOTHELP
my %gnuplot_defaults =
@@ -360,8 +360,8 @@ first tag will be the X data and the sec
</p>
<dt> Curve Function
<dd> The <b>function</b> tag allows you to specify the curve to be
-plotted as a formula that gnuplot can understand. Be careful using this
-tag - it is surprisingly easy to give gnuplot a function it cannot deal
+plotted as a formula that gnuplot can understand. <b>Be careful using this
+tag.</b> It is surprisingly easy to give gnuplot a function it cannot deal
with properly. Be explicit: 2*sin(2*3.141592*x/4) will work but
2sin(2*3.141592x/4) will not. If you do not receive any errors in the
gnuplot data but still do not have an image produced, it is likely there
@@ -369,6 +369,8 @@ is an error in your <b>function</b> tag.
</dl>
ENDCURVEHELP
+my @curve_edit_order = ('color','name','linestyle','pointtype','pointsize');
+
my %curve_defaults =
(
color => {
@@ -391,7 +393,29 @@ 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 => $pos_real_test,
+ description => 'point size (may not apply to all line styles)',
+ edit_type => 'entry',
+ size => '5'
+ },
+ pointtype => {
+ default => 1,
+ test => $int_test,
+ description => 'point type (may not apply to all line styles)',
+ edit_type => 'choice',
+ choices => [0,1,2,3,4,5,6]
+ }
);
###################################################################
@@ -413,10 +437,7 @@ sub start_gnuplot {
('title','xlabel','ylabel','key','axis','label','curve',
'xtics','ytics'));
push (@Apache::lonxml::namespace,'lonplot');
- if ($target eq 'web') {
- my $inside = &Apache::lonxml::get_all_text("/gnuplot",$$parser[-1]);
- $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
- &Apache::lonxml::newparser($parser,\$inside);
+ if ($target eq 'web' || $target eq 'tex') {
&get_attributes(\%plot,\%gnuplot_defaults,$parstack,$safeeval,
$tagstack->[-1]);
} elsif ($target eq 'edit') {
@@ -441,23 +462,38 @@ sub end_gnuplot {
&Apache::lonxml::deregister('Apache::lonplot',
('title','xlabel','ylabel','key','axis','label','curve'));
my $result = '';
- if ($target eq 'web') {
+ my $randnumber;
+ # need to call rand everytime start_script would evaluate, as the
+ # safe space rand number generator and the global rand generator
+ # are not seperate
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
+ $target eq 'answer') {
+ $randnumber=int(rand(1000));
+ }
+ if ($target eq 'web' || $target eq 'tex') {
&check_inputs(); # Make sure we have all the data we need
##
## Determine filename
my $tmpdir = '/home/httpd/perl/tmp/';
my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.
- '_'.time.'_'.$$.int(rand(1000)).'_plot.data';
+ '_'.time.'_'.$$.$randnumber.'_plot.data';
## Write the plot description to the file
- &write_gnuplot_file($tmpdir,$filename);
+ &write_gnuplot_file($tmpdir,$filename,$target);
+ $filename = &Apache::lonnet::escape($filename);
## return image tag for the plot
- $result .= <<"ENDIMAGE";
-<img src = "/cgi-bin/plot.gif?$filename"
+ if ($target eq 'web') {
+ $result .= <<"ENDIMAGE";
+<img src = "/cgi-bin/plot.gif?file=$filename&output=gif"
width = "$plot{'width'}"
height = "$plot{'height'}"
align = "$plot{'align'}"
alt = "image should be /cgi-bin/plot.gif?$filename" />
ENDIMAGE
+ } elsif ($target eq 'tex') {
+ &Apache::lonnet::ssi('cgi-bin/plot.gif?file=$filename'.
+ '&output=eps');
+ $result = "$filename.eps";
+ }
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -469,7 +505,7 @@ ENDIMAGE
sub start_xtics {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
&get_attributes(\%xtics,\%tic_defaults,$parstack,$safeeval,
$tagstack->[-1]);
} elsif ($target eq 'edit') {
@@ -489,7 +525,7 @@ sub start_xtics {
sub end_xtics {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -500,7 +536,7 @@ sub end_xtics {
sub start_ytics {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
&get_attributes(\%ytics,\%tic_defaults,$parstack,$safeeval,
$tagstack->[-1]);
} elsif ($target eq 'edit') {
@@ -520,7 +556,7 @@ sub start_ytics {
sub end_ytics {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -532,7 +568,7 @@ sub end_ytics {
sub start_key {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
&get_attributes(\%key,\%key_defaults,$parstack,$safeeval,
$tagstack->[-1]);
} elsif ($target eq 'edit') {
@@ -551,7 +587,7 @@ sub start_key {
sub end_key {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -562,8 +598,10 @@ sub end_key {
sub start_title {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
+ 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);
}
@@ -572,7 +610,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::editline('',$text,'',60);
} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/title");
$result.=&Apache::edit::rebuild_tag($token);
@@ -584,7 +622,7 @@ sub start_title {
sub end_title {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -594,8 +632,10 @@ sub end_title {
sub start_xlabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
+ 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);
}
@@ -604,7 +644,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::editline('',$text,'',60);
} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/xlabel");
$result.=&Apache::edit::rebuild_tag($token);
@@ -616,7 +656,7 @@ sub start_xlabel {
sub end_xlabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -627,8 +667,10 @@ sub end_xlabel {
sub start_ylabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
+ 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);
}
@@ -637,7 +679,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::editline('',$text,'',60);
} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/ylabel");
$result.=&Apache::edit::rebuild_tag($token);
@@ -649,7 +691,7 @@ sub start_ylabel {
sub end_ylabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -660,11 +702,13 @@ sub end_ylabel {
sub start_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
my %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;
push(@labels,\%label);
@@ -674,7 +718,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::editline('',$text,'',60);
} elsif ($target eq 'modified') {
&Apache::edit::get_new_args
($token,$parstack,$safeeval,keys(%label_defaults));
@@ -688,7 +732,7 @@ sub start_label {
sub end_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -701,7 +745,7 @@ sub start_curve {
my $result='';
&Apache::lonxml::register('Apache::lonplot',('function','data'));
push (@Apache::lonxml::namespace,'curve');
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
my %curve;
&get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval,
$tagstack->[-1]);
@@ -709,7 +753,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));
@@ -726,7 +771,7 @@ sub end_curve {
my $result = '';
pop @Apache::lonxml::namespace;
&Apache::lonxml::deregister('Apache::lonplot',('function','data'));
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -737,19 +782,20 @@ sub end_curve {
sub start_function {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
if (exists($curves[-1]->{'data'})) {
&Apache::lonxml::warning('Use of <function> precludes use of <data>. The <data> will be omitted in favor of the <function> 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::editline('',$text,'',60);
} elsif ($target eq 'modified') {
$result.=&Apache::edit::rebuild_tag($token);
my $text=$$parser[-1]->get_text("/function");
@@ -761,7 +807,7 @@ sub start_function {
sub end_function {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result .= &Apache::edit::end_table();
}
@@ -772,7 +818,7 @@ sub end_function {
sub start_data {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
if (exists($curves[-1]->{'function'})) {
&Apache::lonxml::warning('Use of <data> precludes use of .'.
'<function>. The <function> will be omitted in favor of '.
@@ -780,12 +826,13 @@ 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.'"',
$safeeval,1);
}
- $datatext =~ s/\s+/ /g;
+ $datatext =~ s/\s+/ /g;
# Need to do some error checking on the @data array -
# make sure it's all numbers and make sure each array
# is of the same length.
@@ -824,7 +871,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::editline('',$text,'',60);
} elsif ($target eq 'modified') {
$result.=&Apache::edit::rebuild_tag($token);
my $text=$$parser[-1]->get_text("/data");
@@ -836,7 +883,7 @@ sub start_data {
sub end_data {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result .= &Apache::edit::end_table();
}
@@ -847,7 +894,7 @@ sub end_data {
sub start_axis {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
&get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval,
$tagstack->[-1]);
} elsif ($target eq 'edit') {
@@ -866,7 +913,7 @@ sub start_axis {
sub end_axis {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
} elsif ($target eq 'modified') {
@@ -912,7 +959,7 @@ sub get_attributes{
##------------------------------------------------------- write_gnuplot_file
sub write_gnuplot_file {
- my ($tmpdir,$filename)= @_;
+ my ($tmpdir,$filename,$target)= @_;
my $gnuplot_input = '';
my $curve;
# Collect all the colors
@@ -926,13 +973,18 @@ sub write_gnuplot_file {
$plot{'fgcolor'} );
}
# set term
- $gnuplot_input .= 'set term gif ';
- $gnuplot_input .= 'transparent ' if ($plot{'transparent'} eq 'on');
- $gnuplot_input .= $plot{'font'} . ' ';
- $gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' ';
- $gnuplot_input .= "@Colors\n";
- # set output
- $gnuplot_input .= "set output\n";
+ if ($target eq 'web') {
+ $gnuplot_input .= 'set term gif ';
+ $gnuplot_input .= 'transparent ' if ($plot{'transparent'} eq 'on');
+ $gnuplot_input .= $plot{'font'} . ' ';
+ $gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' ';
+ $gnuplot_input .= "@Colors\n";
+ # set output
+ $gnuplot_input .= "set output\n";
+ } elsif ($target eq 'tex') {
+ $gnuplot_input .= "set term postscript eps monochrome\n";
+ $gnuplot_input .= "set output \"$filename.eps\"\n";
+ }
# grid
$gnuplot_input .= 'set grid'.$/ if ($plot{'grid'} eq 'on');
# border
@@ -989,6 +1041,19 @@ 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.=' pointtype '.$curve->{'pointtype'};
+ $gnuplot_input.=' pointsize '.$curve->{'pointsize'};
+ }
} elsif (exists($curve->{'data'})) {
# Store data values in $datatext
my $datatext = '';
@@ -1012,6 +1077,15 @@ sub write_gnuplot_file {
$gnuplot_input.= '"'.$datafilename.'" title "'.
$curve->{'name'}.'" with '.
$curve->{'linestyle'};
+ 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.=' pointtype '.$curve->{'pointtype'};
+ $gnuplot_input.=' pointsize '.$curve->{'pointsize'};
+ }
}
}
# Write the output to a file.
@@ -1085,11 +1159,11 @@ sub edit_attributes {
sub insert_gnuplot {
my $result = '';
# plot attributes
- $result .= "<plot \n";
+ $result .= "\n<gnuplot ";
foreach my $attr (keys(%gnuplot_defaults)) {
- $result .= " $attr=\"$gnuplot_defaults{$attr}->{'default'}\"\n";
+ $result .= "\n $attr=\"$gnuplot_defaults{$attr}->{'default'}\"";
}
- $result .= ">\n";
+ $result .= ">";
# Add the components (most are commented out for simplicity)
# $result .= &insert_key();
# $result .= &insert_axis();
@@ -1097,8 +1171,8 @@ sub insert_gnuplot {
# $result .= &insert_xlabel();
# $result .= &insert_ylabel();
$result .= &insert_curve();
- # close up the <plot>
- $result .= "</plot>\n";
+ # close up the <gnuplot>
+ $result .= "\n</gnuplot>";
return $result;
}
@@ -1112,9 +1186,9 @@ sub insert_xtics {
my $result;
$result .= "\n <xtics ";
foreach my $attr (keys(%tic_defaults)) {
- $result .= "$attr=\"$tic_defaults{$attr}->{'default'}\" ";
+ $result .= "\n $attr=\"$tic_defaults{$attr}->{'default'}\" ";
}
- $result .= "/>\n";
+ $result .= "/>";
return $result;
}
@@ -1122,19 +1196,19 @@ sub insert_ytics {
my $result;
$result .= "\n <ytics ";
foreach my $attr (keys(%tic_defaults)) {
- $result .= "$attr=\"$tic_defaults{$attr}->{'default'}\" ";
+ $result .= "\n $attr=\"$tic_defaults{$attr}->{'default'}\" ";
}
- $result .= "/>\n";
+ $result .= "/>";
return $result;
}
sub insert_key {
my $result;
- $result .= "\n <key \n";
+ $result .= "\n <key ";
foreach my $attr (keys(%key_defaults)) {
- $result .= " $attr=\"$key_defaults{$attr}->{'default'}\"\n";
+ $result .= "\n $attr=\"$key_defaults{$attr}->{'default'}\"";
}
- $result .= " />\n";
+ $result .= " />";
return $result;
}
@@ -1142,24 +1216,24 @@ sub insert_axis{
my $result;
$result .= "\n <axis ";
foreach my $attr (keys(%axis_defaults)) {
- $result .= " $attr=\"$axis_defaults{$attr}->{'default'}\"\n";
+ $result .= "\n $attr=\"$axis_defaults{$attr}->{'default'}\"";
}
- $result .= " />\n";
+ $result .= " />";
return $result;
}
-sub insert_title { return "\n <title></title>\n"; }
-sub insert_xlabel { return "\n <xlabel></xlabel>\n"; }
-sub insert_ylabel { return "\n <ylabel></ylabel>\n"; }
+sub insert_title { return "\n <title></title>"; }
+sub insert_xlabel { return "\n <xlabel></xlabel>"; }
+sub insert_ylabel { return "\n <ylabel></ylabel>"; }
sub insert_label {
my $result;
$result .= "\n <label ";
foreach my $attr (keys(%label_defaults)) {
- $result .= ' '.$attr.'="'.
- $label_defaults{$attr}->{'default'}."\"\n";
+ $result .= "\n $attr=\"".
+ $label_defaults{$attr}->{'default'}."\"";
}
- $result .= " ></label>\n";
+ $result .= "></label>";
return $result;
}
@@ -1167,22 +1241,22 @@ sub insert_curve {
my $result;
$result .= "\n <curve ";
foreach my $attr (keys(%curve_defaults)) {
- $result .= ' '.$attr.'="'.
- $curve_defaults{$attr}->{'default'}."\"\n";
+ $result .= "\n $attr=\"".
+ $curve_defaults{$attr}->{'default'}."\"";
}
- $result .= " >\n";
- $result .= &insert_data().&insert_data()."</curve>\n";
+ $result .= " >";
+ $result .= &insert_data().&insert_data()."\n </curve>";
}
sub insert_function {
my $result;
- $result .= "<function></function>\n";
+ $result .= "\n <function></function>";
return $result;
}
sub insert_data {
my $result;
- $result .= " <data></data>\n";
+ $result .= "\n <data></data>";
return $result;
}