loncom/xml/lonplot.pm - diff

Return to lonplot.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonplot.pm between versions 1.40 and 1.48

version 1.40, 2002/01/15 16:21:39	version 1.48, 2002/02/06 10:24:55
Line 29	Line 29
# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 12/30 12/31 Matthew	# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 12/30 12/31 Matthew
# 01/01/02 Matthew	# 01/01/02 Matthew
# 01/02 01/03 01/04 01/07 01/08 01/09 Matthew	# 01/02 01/03 01/04 01/07 01/08 01/09 Matthew
	# 01/21 02/05 Matthew

# Current issues
# 1. Gnuplot is unable to vary the color or linestyle of <data> plots.
# The key does not know this so it is misleading for the user.
# Multiple <function>s can be plotted with varying line styles and
# colors.
#
package Apache::lonplot;	package Apache::lonplot;

use strict;	use strict;
Line 45 use Apache::lonxml;	Line 40 use Apache::lonxml;
use Apache::edit;	use Apache::edit;

BEGIN {	BEGIN {
&Apache::lonxml::register('Apache::lonplot',('plot'));	&Apache::lonxml::register('Apache::lonplot',('gnuplot'));
}	}

##	##
Line 118 my $words_test = sub {$_[0]=~s/\s+/	Line 113 my $words_test = sub {$_[0]=~s/\s+/
## Attribute metadata ##	## Attribute metadata ##
## ##	## ##
###################################################################	###################################################################
my @plot_edit_order =	my @gnuplot_edit_order =
qw/bgcolor fgcolor height width font transparent grid border align/;	qw/bgcolor fgcolor height width font transparent grid border align/;
my %plot_defaults =
	my $gnuplot_help_text = <<"ENDPLOTHELP";
	<p>
	The <b>gnuplot</b> tag allows an author to design a plot which can
	be created on the fly. This is intended for use in homework problems
	where each student needs to see a distinct plot. It can be used in
	conjunction with a <b>script</b> tag to generate random plots.
	</p><p>
	A <b>gnuplot</b> tag can contain the following sub-tags:
	</p>
	<dl>
	<dt> Plot Label
	<dd> Allows you to place text at a given (x,y) coordinate on the plot.
	<dt> Plot Title
	<dd> The title of the plot
	<dt> Plot Xlabel
	<dd> The label on the horizontal axis of the plot
	<dt> Plot Ylabel
	<dd> The label on the vertical axis of the plot
	<dt> Plot Axes
	<dd> allows specification of the x and y ranges displayed in the plot
	<dt> Plot Key
	<dd> Lists the functions displayed in the plot.
	<dt> Plot Curve
	<dd> Sets the data used in the plot.
	<dt> Plot Tics
	<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>
	ENDPLOTHELP

	my %gnuplot_defaults =
(	(
height => {	height => {
default => 200,	default => 200,
Line 154 my %plot_defaults =	Line 180 my %plot_defaults =
default => 'off',	default => 'off',
test => $onoff_test,	test => $onoff_test,
description => 'Transparent image',	description => 'Transparent image',
edit_type => 'on_off'	edit_type => 'onoff'
},	},
grid => {	grid => {
default => 'off',	default => 'off',
test => $onoff_test,	test => $onoff_test,
description => 'Display grid',	description => 'Display grid',
edit_type => 'on_off'	edit_type => 'onoff'
},	},
border => {	border => {
default => 'on',	default => 'on',
test => $onoff_test,	test => $onoff_test,
description => 'Draw border around plot',	description => 'Draw border around plot',
edit_type => 'on_off'	edit_type => 'onoff'
},	},
font => {	font => {
default => 'medium',	default => 'medium',
Line 197 my %key_defaults =	Line 223 my %key_defaults =
default => 'off',	default => 'off',
test => $onoff_test,	test => $onoff_test,
description => 'Draw a box around the key?',	description => 'Draw a box around the key?',
edit_type => 'on_off'	edit_type => 'onoff'
},	},
pos => {	pos => {
default => 'top right',	default => 'top right',
Line 234 my %label_defaults =	Line 260 my %label_defaults =
}	}
);	);

	my @tic_edit_order = ('location','mirror','start','increment','end');
	my %tic_defaults =
	(
	location => {
	default => 'border',
	test => sub {$_[0]=~/^(border\|axis)$/},
	description => 'Location of tick marks',
	edit_type => 'choice',
	choices => ['border','axis']
	},
	mirror => {
	default => 'on',
	test => $onoff_test,
	description => 'mirror ticks on opposite axis?',
	edit_type => 'onoff'
	},
	start => {
	default => '-10.0',
	test => $real_test,
	description => 'Start ticks at',
	edit_type => 'entry',
	size => '10'
	},
	increment => {
	default => '1.0',
	test => $real_test,
	description => 'Place a tick every',
	edit_type => 'entry',
	size => '10'
	},
	end => {
	default => ' 10.0',
	test => $real_test,
	description => 'Stop ticks at ',
	edit_type => 'entry',
	size => '10'
	},
	);

my %axis_defaults =	my %axis_defaults =
(	(
color => {	color => {
Line 273 my %axis_defaults =	Line 338 my %axis_defaults =
}	}
);	);

	my $curve_help_text = <<"ENDCURVEHELP";
	The <b>curve</b> tag is where you set the data to be plotted by gnuplot.
	There are two ways of entering the information:
	<dl>
	<dt> Curve Data
	<dd> Using a <b>data</b> tag you can specify the numbers used to produce
	the plot.
	<p>
	By default, two <b>data</b> tags will be available in a plot. The
	first will specify X coordinates of the data and the second will
	give the Y coordinates of the data. When working with a linestyle that
	requires more than two data sets, inserting another <b>data</b> tag is
	required. Unfortunately, you must make sure the <b>data</b> tags appear
	in the order gnuplot expects the data.
	</p><p>
	Specifying the data should usually be done with a perl variable or array,
	such as \@Xdata and \@Ydata. You may also specify numerical data seperated
	by commas. Again, the order of the <b>data</b> tags is important. The
	first tag will be the X data and the second will be the Y data.
	</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
	with properly. Be explicit: 2sin(23.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
	is an error in your <b>function</b> tag.
	</dl>
	ENDCURVEHELP

my %curve_defaults =	my %curve_defaults =
(	(
color => {	color => {
Line 303 my %curve_defaults =	Line 399 my %curve_defaults =
## parsing and edit rendering ##	## parsing and edit rendering ##
## ##	## ##
###################################################################	###################################################################
my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves);	my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics);

sub start_plot {	sub start_gnuplot {
%plot = (); %key = (); %axis = ();	%plot = (); %key = (); %axis = ();
$title = undef; $xlabel = undef; $ylabel = undef;	$title = undef; $xlabel = undef; $ylabel = undef;
$#labels = -1; $#curves = -1;	$#labels = -1; $#curves = -1;
	%xtics = (); %ytics = ();
#	#
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',	&Apache::lonxml::register('Apache::lonplot',
('title','xlabel','ylabel','key','axis','label','curve'));	('title','xlabel','ylabel','key','axis','label','curve',
	'xtics','ytics'));
push (@Apache::lonxml::namespace,'lonplot');	push (@Apache::lonxml::namespace,'lonplot');
if ($target eq 'web') {	if ($target eq 'web') {
my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]);	my $inside = &Apache::lonxml::get_all_text("/gnuplot",$$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);
&get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval,	&get_attributes(\%plot,\%gnuplot_defaults,$parstack,$safeeval,
$tagstack->[-1]);	$tagstack->[-1]);
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Plot');	$result .= &Apache::edit::tag_start($target,$token,'GnuPlot');
$result .= &edit_attributes($target,$token,\%plot_defaults,	$result .= &make_javascript();
\@plot_edit_order);	$result .= &help_win($gnuplot_help_text);
	$result .= &edit_attributes($target,$token,\%gnuplot_defaults,
	\@gnuplot_edit_order);
} 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(%gnuplot_defaults));
if ($constructtag) {	if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);	$result = &Apache::edit::rebuild_tag($token);
}	}
Line 335 sub start_plot {	Line 435 sub start_plot {
return $result;	return $result;
}	}

sub end_plot {	sub end_gnuplot {
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 357 sub end_plot {	Line 456 sub end_plot {
width = "$plot{'width'}"	width = "$plot{'width'}"
height = "$plot{'height'}"	height = "$plot{'height'}"
align = "$plot{'align'}"	align = "$plot{'align'}"
alt = "/cgi-bin/plot.gif?$filename" />	alt = "image should be /cgi-bin/plot.gif?$filename" />
ENDIMAGE	ENDIMAGE
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
Line 365 ENDIMAGE	Line 464 ENDIMAGE
return $result;	return $result;
}	}


	##--------------------------------------------------------------- xtics
	sub start_xtics {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	my $result='';
	if ($target eq 'web') {
	&get_attributes(\%xtics,\%tic_defaults,$parstack,$safeeval,
	$tagstack->[-1]);
	} elsif ($target eq 'edit') {
	$result .= &Apache::edit::tag_start($target,$token,'xtics');
	$result .= &edit_attributes($target,$token,\%tic_defaults,
	\@tic_edit_order);
	} elsif ($target eq 'modified') {
	my $constructtag=&Apache::edit::get_new_args
	($token,$parstack,$safeeval,keys(%tic_defaults));
	if ($constructtag) {
	$result = &Apache::edit::rebuild_tag($token);
	}
	}
	return $result;
	}

	sub end_xtics {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	my $result = '';
	if ($target eq 'web') {
	} elsif ($target eq 'edit') {
	$result.=&Apache::edit::tag_end($target,$token);
	}
	return $result;
	}

	##--------------------------------------------------------------- ytics
	sub start_ytics {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	my $result='';
	if ($target eq 'web') {
	&get_attributes(\%ytics,\%tic_defaults,$parstack,$safeeval,
	$tagstack->[-1]);
	} elsif ($target eq 'edit') {
	$result .= &Apache::edit::tag_start($target,$token,'ytics');
	$result .= &edit_attributes($target,$token,\%tic_defaults,
	\@tic_edit_order);
	} elsif ($target eq 'modified') {
	my $constructtag=&Apache::edit::get_new_args
	($token,$parstack,$safeeval,keys(%tic_defaults));
	if ($constructtag) {
	$result = &Apache::edit::rebuild_tag($token);
	}
	}
	return $result;
	}

	sub end_ytics {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	my $result = '';
	if ($target eq 'web') {
	} elsif ($target eq 'edit') {
	$result.=&Apache::edit::tag_end($target,$token);
	}
	return $result;
	}


##----------------------------------------------------------------- key	##----------------------------------------------------------------- key
sub start_key {	sub start_key {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
Line 380 sub start_key {	Line 543 sub start_key {
($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();
}	}
}	}
return $result;	return $result;
Line 413 sub start_title {	Line 575 sub start_title {
&Apache::edit::editfield('',$text,'',60,1);	&Apache::edit::editfield('',$text,'',60,1);
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/title");	my $text=$$parser[-1]->get_text("/title");
	$result.=&Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::modifiedfield($token);	$result.=&Apache::edit::modifiedfield($token);
}	}
return $result;	return $result;
Line 444 sub start_xlabel {	Line 607 sub start_xlabel {
&Apache::edit::editfield('',$text,'',60,1);	&Apache::edit::editfield('',$text,'',60,1);
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/xlabel");	my $text=$$parser[-1]->get_text("/xlabel");
	$result.=&Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::modifiedfield($token);	$result.=&Apache::edit::modifiedfield($token);
}	}
return $result;	return $result;
Line 476 sub start_ylabel {	Line 640 sub start_ylabel {
&Apache::edit::editfield('',$text,'',60,1);	&Apache::edit::editfield('',$text,'',60,1);
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/ylabel");	my $text=$$parser[-1]->get_text("/ylabel");
	$result.=&Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::modifiedfield($token);	$result.=&Apache::edit::modifiedfield($token);
}	}
return $result;	return $result;
Line 511 sub start_label {	Line 676 sub start_label {
&Apache::edit::start_spanning_row().	&Apache::edit::start_spanning_row().
&Apache::edit::editfield('',$text,'',60,1);	&Apache::edit::editfield('',$text,'',60,1);
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args	&Apache::edit::get_new_args
($token,$parstack,$safeeval,keys(%label_defaults));	($token,$parstack,$safeeval,keys(%label_defaults));
if ($constructtag) {	$result.=&Apache::edit::rebuild_tag($token);
$result = &Apache::edit::rebuild_tag($token);
$result.= &Apache::edit::handle_insert();
}
my $text=$$parser[-1]->get_text("/label");	my $text=$$parser[-1]->get_text("/label");
$result.=&Apache::edit::modifiedfield($token);	$result.=&Apache::edit::modifiedfield($token);
}	}
Line 546 sub start_curve {	Line 708 sub start_curve {
push (@curves,\%curve);	push (@curves,\%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 .= &help_win($curve_help_text);
$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
Line 588 sub start_function {	Line 751 sub start_function {
&Apache::edit::start_spanning_row().	&Apache::edit::start_spanning_row().
&Apache::edit::editfield('',$text,'',60,1);	&Apache::edit::editfield('',$text,'',60,1);
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
# Why do I do this?	$result.=&Apache::edit::rebuild_tag($token);
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 663 sub start_data {	Line 826 sub start_data {
&Apache::edit::start_spanning_row().	&Apache::edit::start_spanning_row().
&Apache::edit::editfield('',$text,'',60,1);	&Apache::edit::editfield('',$text,'',60,1);
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
	$result.=&Apache::edit::rebuild_tag($token);
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 694 sub start_axis {	Line 858 sub start_axis {
($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();
}	}
}	}
return $result;	return $result;
Line 768 sub write_gnuplot_file {	Line 931 sub write_gnuplot_file {
$gnuplot_input .= $plot{'font'} . ' ';	$gnuplot_input .= $plot{'font'} . ' ';
$gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' ';	$gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' ';
$gnuplot_input .= "@Colors\n";	$gnuplot_input .= "@Colors\n";
	# set output
	$gnuplot_input .= "set output\n";
# grid	# grid
$gnuplot_input .= 'set grid'.$/ if ($plot{'grid'} eq 'on');	$gnuplot_input .= 'set grid'.$/ if ($plot{'grid'} eq 'on');
# border	# border
$gnuplot_input .= ($plot{'border'} eq 'on'?	$gnuplot_input .= ($plot{'border'} eq 'on'?
'set border'.$/ :	'set border'.$/ :
'set noborder'.$/ ); # title, xlabel, ylabel	'set noborder'.$/ ); # title, xlabel, ylabel
$gnuplot_input .= "set output\n";	# titles
$gnuplot_input .= "set title \"$title\"\n" if (defined($title)) ;	$gnuplot_input .= "set title \"$title\"\n" if (defined($title)) ;
$gnuplot_input .= "set xlabel \"$xlabel\"\n" if (defined($xlabel));	$gnuplot_input .= "set xlabel \"$xlabel\"\n" if (defined($xlabel));
$gnuplot_input .= "set ylabel \"$ylabel\"\n" if (defined($ylabel));	$gnuplot_input .= "set ylabel \"$ylabel\"\n" if (defined($ylabel));
	# tics
	if (%xtics) {
	$gnuplot_input .= "set xtics $xtics{'location'} ";
	$gnuplot_input .= ( $xtics{'mirror'} eq 'on'?"mirror ":"nomirror ");
	$gnuplot_input .= "$xtics{'start'}, ";
	$gnuplot_input .= "$xtics{'increment'}, ";
	$gnuplot_input .= "$xtics{'end'}\n";
	}
	if (%ytics) {
	$gnuplot_input .= "set ytics $ytics{'location'} ";
	$gnuplot_input .= ( $ytics{'mirror'} eq 'on'?"mirror ":"nomirror ");
	$gnuplot_input .= "$ytics{'start'}, ";
	$gnuplot_input .= "$ytics{'increment'}, ";
	$gnuplot_input .= "$ytics{'end'}\n";
	}
	# axis
if (%axis) {	if (%axis) {
$gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";	$gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";
$gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n";	$gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n";
Line 786 sub write_gnuplot_file {	Line 967 sub write_gnuplot_file {
if (%key) {	if (%key) {
$gnuplot_input .= 'set key '.$key{'pos'}.' ';	$gnuplot_input .= 'set key '.$key{'pos'}.' ';
if ($key{'title'} ne '') {	if ($key{'title'} ne '') {
$gnuplot_input .= 'title "'.$key{'title'}.'" ';	$gnuplot_input .= 'title " '.$key{'title'}.'" ';
}	}
$gnuplot_input .= ($key{'box'} eq 'on' ? 'box ' : 'nobox ').$/;	$gnuplot_input .= ($key{'box'} eq 'on' ? 'box ' : 'nobox ').$/;
} else {	} else {
Line 845 sub write_gnuplot_file {	Line 1026 sub write_gnuplot_file {
sub check_inputs {	sub check_inputs {
## Note: no inputs, no outputs - this acts only on global variables.	## Note: no inputs, no outputs - this acts only on global variables.
## Make sure we have all the input we need:	## Make sure we have all the input we need:
if (! %plot) { &set_defaults(\%plot,\%plot_defaults); }	if (! %plot) { &set_defaults(\%plot,\%gnuplot_defaults); }
if (! %key ) {} # No key for this plot, thats okay	if (! %key ) {} # No key for this plot, thats okay
# if (! %axis) { &set_defaults(\%axis,\%axis_defaults); }	# if (! %axis) { &set_defaults(\%axis,\%axis_defaults); }
if (! defined($title )) {} # No title for this plot, thats okay	if (! defined($title )) {} # No title for this plot, thats okay
Line 885 sub edit_attributes {	Line 1066 sub edit_attributes {
} elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') {	} elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') {
$result .= &Apache::edit::select_arg	$result .= &Apache::edit::select_arg
($description,$attr,$defaults->{$attr}->{'choices'},$token);	($description,$attr,$defaults->{$attr}->{'choices'},$token);
} elsif ($defaults->{$attr}->{'edit_type'} eq 'on_off') {	} elsif ($defaults->{$attr}->{'edit_type'} eq 'onoff') {
$result .= &Apache::edit::select_arg	$result .= &Apache::edit::select_arg
($description,$attr,['on','off'],$token);	($description,$attr,['on','off'],$token);
}	}
Line 901 sub edit_attributes {	Line 1082 sub edit_attributes {
## ##	## ##
###################################################################	###################################################################

#------------------------------------------------ insert_xxxxxxx	sub insert_gnuplot {
sub insert_plot {
my $result = '';	my $result = '';
# plot attributes	# plot attributes
$result .= "<plot \n";	$result .= "<plot \n";
foreach my $attr (keys(%plot_defaults)) {	foreach my $attr (keys(%gnuplot_defaults)) {
$result .= " $attr=\"$plot_defaults{$attr}->{'default'}\"\n";	$result .= " $attr=\"$gnuplot_defaults{$attr}->{'default'}\"\n";
}	}
$result .= ">\n";	$result .= ">\n";
# Add the components	# Add the components (most are commented out for simplicity)
$result .= &insert_key();	# $result .= &insert_key();
$result .= &insert_axis();	# $result .= &insert_axis();
$result .= &insert_title();	# $result .= &insert_title();
$result .= &insert_xlabel();	# $result .= &insert_xlabel();
$result .= &insert_ylabel();	# $result .= &insert_ylabel();
$result .= &insert_curve();	$result .= &insert_curve();
# close up the <plot>	# close up the <plot>
$result .= "</plot>\n";	$result .= "</plot>\n";
return $result;	return $result;
}	}

	sub insert_tics {
	my $result;
	$result .= &insert_xtics() . &insert_ytics;
	return $result;
	}

	sub insert_xtics {
	my $result;
	$result .= "\n <xtics ";
	foreach my $attr (keys(%tic_defaults)) {
	$result .= "$attr=\"$tic_defaults{$attr}->{'default'}\" ";
	}
	$result .= "/>\n";
	return $result;
	}

	sub insert_ytics {
	my $result;
	$result .= "\n <ytics ";
	foreach my $attr (keys(%tic_defaults)) {
	$result .= "$attr=\"$tic_defaults{$attr}->{'default'}\" ";
	}
	$result .= "/>\n";
	return $result;
	}

sub insert_key {	sub insert_key {
my $result;	my $result;
$result .= " <key \n";	$result .= "\n <key \n";
foreach my $attr (keys(%key_defaults)) {	foreach my $attr (keys(%key_defaults)) {
$result .= " $attr=\"$key_defaults{$attr}->{'default'}\"\n";	$result .= " $attr=\"$key_defaults{$attr}->{'default'}\"\n";
}	}
Line 934 sub insert_key {	Line 1140 sub insert_key {

sub insert_axis{	sub insert_axis{
my $result;	my $result;
$result .= ' <axis ';	$result .= "\n <axis ";
foreach my $attr (keys(%axis_defaults)) {	foreach my $attr (keys(%axis_defaults)) {
$result .= " $attr=\"$axis_defaults{$attr}->{'default'}\"\n";	$result .= " $attr=\"$axis_defaults{$attr}->{'default'}\"\n";
}	}
Line 942 sub insert_axis{	Line 1148 sub insert_axis{
return $result;	return $result;
}	}

sub insert_title { return " <title></title>\n"; }	sub insert_title { return "\n <title></title>\n"; }
sub insert_xlabel { return " <xlabel></xlabel>\n"; }	sub insert_xlabel { return "\n <xlabel></xlabel>\n"; }
sub insert_ylabel { return " <ylabel></ylabel>\n"; }	sub insert_ylabel { return "\n <ylabel></ylabel>\n"; }

sub insert_label {	sub insert_label {
my $result;	my $result;
$result .= ' <label ';	$result .= "\n <label ";
foreach my $attr (keys(%label_defaults)) {	foreach my $attr (keys(%label_defaults)) {
$result .= ' '.$attr.'="'.	$result .= ' '.$attr.'="'.
$label_defaults{$attr}->{'default'}."\"\n";	$label_defaults{$attr}->{'default'}."\"\n";
Line 959 sub insert_label {	Line 1165 sub insert_label {

sub insert_curve {	sub insert_curve {
my $result;	my $result;
$result .= ' <curve ';	$result .= "\n <curve ";
foreach my $attr (keys(%curve_defaults)) {	foreach my $attr (keys(%curve_defaults)) {
$result .= ' '.$attr.'="'.	$result .= ' '.$attr.'="'.
$curve_defaults{$attr}->{'default'}."\"\n";	$curve_defaults{$attr}->{'default'}."\"\n";
}	}
$result .= " ></curve>\n";	$result .= " >\n";
	$result .= &insert_data().&insert_data()."</curve>\n";
}	}

sub insert_function {	sub insert_function {
Line 980 sub insert_data {	Line 1187 sub insert_data {
}	}

##----------------------------------------------------------------------	##----------------------------------------------------------------------
	# Javascript functions to display help for tags

	sub make_javascript {
	my $helpwindowwidth = 400;
	my $helpwindowheight = 400;
	my $result = '';
	$result.=<<"ENDFUNCTION";
	<script language="JavaScript">
	function openWin(text)
	{
	newWin = open("", "new_W", "width=$helpwindowwidth,height=$helpwindowheight,resizable=1,scrollbars=1");
	newWin.document.open("text/html", "replace");
	newWin.document.writeln(text);
	newWin.document.writeln('<center><a href=\"javascript:window.close()\">close this window</a></center>');
	newWin.document.close();
	}
	</script>
	ENDFUNCTION
	return $result;
	}

	sub help_win {
	my ($helptext)=@_;
	$helptext =~ s/\n/ /g;
	$helptext =~ s/\'/\\\'/g;
	my $result = '';
	$result.=<<"ENDWIN";
	<table width="100%"><tr><td align="right">
	<a href="javascript:openWin('$helptext')">help</a>
	</td></tr></table><hr />
	ENDWIN
	return $result;
	}
	##----------------------------------------------------------------------
1;	1;
__END__	__END__

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.40
changed lines
	Added in v.1.48