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.77

version 1.40, 2002/01/15 16:21:39	version 1.77, 2002/06/13 17:58:47
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 02/06 2/28Matthew

# 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 96 my %linestyles =	Line 91 my %linestyles =
yerrorbars => [3,4],	yerrorbars => [3,4],
xyerrorbars => [4,6],	xyerrorbars => [4,6],
boxes => 3,	boxes => 3,
# boxerrorbars => [3,4,5],
# boxxyerrorbars => [4,6,7],
# financebars => 5,
# candlesticks => 5,
vector => 4	vector => 4
);	);

my $int_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^\d+$/};	my $int_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^\d+$/};
my $real_test =	my $real_test =
sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d\.?\d([eE][+-]\d+)?$/};	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 $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-f]{6}$/};
my $onoff_test = sub {$_[0]=~/^(on\|off)$/};	my $onoff_test = sub {$_[0]=~/^(on\|off)$/};
my $key_pos_test = sub {$_[0]=~/^(top\|bottom\|right\|left\|outside\|below\| )+$/};	my $key_pos_test = sub {$_[0]=~/^(top\|bottom\|right\|left\|outside\|below\| )+$/};
my $sml_test = sub {$_[0]=~/^(small\|medium\|large)$/};	my $sml_test = sub {$_[0]=~/^(small\|medium\|large)$/};
my $linestyle_test = sub {exists($linestyles{$_[0]})};	my $linestyle_test = sub {exists($linestyles{$_[0]})};
my $words_test = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w]+ ?)+$/};	my $words_test = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w~!\@\#\$\%^&\*-=_\+\[\]\{\}:\;\'<>,\.\/\?\\]+ ?)+$/};

###################################################################	###################################################################
## ##	## ##
## Attribute metadata ##	## Attribute metadata ##
## ##	## ##
###################################################################	###################################################################
my @plot_edit_order =	my @gnuplot_edit_order =
qw/bgcolor fgcolor height width font transparent grid border align/;	qw/alttag bgcolor fgcolor height width font transparent grid samples 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>
	If you are having trouble with your plot, please read the help
	available on Plot Curve.
	ENDPLOTHELP

	my %gnuplot_defaults =
(	(
	alttag => {
	default => 'dynamically generated plot',
	test => $words_test,
	description => 'brief description of the plot',
	edit_type => 'entry',
	size => '40'
	},
height => {	height => {
default => 200,	default => 300,
test => $int_test,	test => $int_test,
description => 'height of image (pixels)',	description => 'height of image (pixels)',
edit_type => 'entry',	edit_type => 'entry',
size => '10'	size => '10'
},	},
width => {	width => {
default => 200,	default => 400,
test => $int_test,	test => $int_test,
description => 'width of image (pixels)',	description => 'width of image (pixels)',
edit_type => 'entry',	edit_type => 'entry',
Line 154 my %plot_defaults =	Line 187 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 => 'on',
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 175 my %plot_defaults =	Line 208 my %plot_defaults =
edit_type => 'choice',	edit_type => 'choice',
choices => ['small','medium','large']	choices => ['small','medium','large']
},	},
	samples => {
	default => '100',
	test => $int_test,
	description => 'Number of samples for non-data plots',
	edit_type => 'choice',
	choices => ['100','200','500','1000','2000','5000']
	},
align => {	align => {
default => 'left',	default => 'center',
test => sub {$_[0]=~/^(left\|right\|center)$/},	test => sub {$_[0]=~/^(left\|right\|center)$/},
description => 'alignment for image in html',	description => 'alignment for image in html',
edit_type => 'choice',	edit_type => 'choice',
Line 197 my %key_defaults =	Line 237 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 274 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_edit_order = ('color','xmin','xmax','ymin','ymax');
my %axis_defaults =	my %axis_defaults =
(	(
color => {	color => {
Line 273 my %axis_defaults =	Line 353 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. <b>Be careful using this
	tag.</b> 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_edit_order = ('color','name','linestyle','pointtype','pointsize');

my %curve_defaults =	my %curve_defaults =
(	(
color => {	color => {
Line 295 my %curve_defaults =	Line 408 my %curve_defaults =
description => 'Line style',	description => 'Line style',
edit_type => 'choice',	edit_type => 'choice',
choices => [keys(%linestyles)]	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]
	}
);	);

###################################################################	###################################################################
Line 303 my %curve_defaults =	Line 438 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' \|\| $target eq 'tex') {
my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]);	&get_attributes(\%plot,\%gnuplot_defaults,$parstack,$safeeval,
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
&Apache::lonxml::newparser($parser,\$inside);
&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,'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 471 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'));
my $result = '';	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	&check_inputs(); # Make sure we have all the data we need
##	##
## Determine filename	## Determine filename
my $tmpdir = '/home/httpd/perl/tmp/';	my $tmpdir = '/home/httpd/perl/tmp/';
my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.	my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.
'_'.time.'_'.$$.int(rand(1000)).'_plot.data';	'_'.time.'_'.$$.$randnumber.'_plot';
## Write the plot description to the file	## 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	## return image tag for the plot
$result .= <<"ENDIMAGE";	if ($target eq 'web') {
<img src = "/cgi-bin/plot.gif?$filename"	$result .= <<"ENDIMAGE";
width = "$plot{'width'}"	<img src = "/cgi-bin/plot.gif?file=$filename.data&output=gif"
	width = "$plot{'width'}"
height = "$plot{'height'}"	height = "$plot{'height'}"
align = "$plot{'align'}"	align = "$plot{'align'}"
alt = "/cgi-bin/plot.gif?$filename" />	alt = "$plot{'alttag'}" />
ENDIMAGE	ENDIMAGE
	} elsif ($target eq 'tex') {
	&Apache::lonnet::ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");
	$result = '\graphicspath{{/home/httpd/perl/tmp/}}\fbox{\includegraphics{'.&Apache::lonnet::unescape($filename).'.eps}}';
	}
	} elsif ($target eq 'edit') {
	$result.=&Apache::edit::tag_end($target,$token);
	}
	return $result;
	}


	##--------------------------------------------------------------- xtics
	sub start_xtics {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	my $result='';
	if ($target eq 'web' \|\| $target eq 'tex') {
	&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' \|\| $target eq 'tex') {
	} 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' \|\| $target eq 'tex') {
	&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' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
}	}
return $result;	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)=@_;
my $result='';	my $result='';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
&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') {
Line 380 sub start_key {	Line 593 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 389 sub start_key {	Line 601 sub start_key {
sub end_key {	sub end_key {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
}	}
Line 400 sub end_key {	Line 612 sub end_key {
sub start_title {	sub start_title {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]);	$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) {	if (length($title) > $max_str_len) {
$title = substr($title,0,$max_str_len);	$title = substr($title,0,$max_str_len);
}	}
Line 410 sub start_title {	Line 624 sub start_title {
my $text=&Apache::lonxml::get_all_text("/title",$$parser[-1]);	my $text=&Apache::lonxml::get_all_text("/title",$$parser[-1]);
$result.=&Apache::edit::end_row().	$result.=&Apache::edit::end_row().
&Apache::edit::start_spanning_row().	&Apache::edit::start_spanning_row().
&Apache::edit::editfield('',$text,'',60,1);	&Apache::edit::editline('',$text,'',60);
} 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 421 sub start_title {	Line 636 sub start_title {
sub end_title {	sub end_title {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
}	}
Line 431 sub end_title {	Line 646 sub end_title {
sub start_xlabel {	sub start_xlabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);	$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) {	if (length($xlabel) > $max_str_len) {
$xlabel = substr($xlabel,0,$max_str_len);	$xlabel = substr($xlabel,0,$max_str_len);
}	}
Line 441 sub start_xlabel {	Line 658 sub start_xlabel {
my $text=&Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);	my $text=&Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
$result.=&Apache::edit::end_row().	$result.=&Apache::edit::end_row().
&Apache::edit::start_spanning_row().	&Apache::edit::start_spanning_row().
&Apache::edit::editfield('',$text,'',60,1);	&Apache::edit::editline('',$text,'',60);
} 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 452 sub start_xlabel {	Line 670 sub start_xlabel {
sub end_xlabel {	sub end_xlabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
}	}
Line 463 sub end_xlabel {	Line 681 sub end_xlabel {
sub start_ylabel {	sub start_ylabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);	$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) {	if (length($ylabel) > $max_str_len) {
$ylabel = substr($ylabel,0,$max_str_len);	$ylabel = substr($ylabel,0,$max_str_len);
}	}
Line 473 sub start_ylabel {	Line 693 sub start_ylabel {
my $text = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);	my $text = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
$result .= &Apache::edit::end_row().	$result .= &Apache::edit::end_row().
&Apache::edit::start_spanning_row().	&Apache::edit::start_spanning_row().
&Apache::edit::editfield('',$text,'',60,1);	&Apache::edit::editline('',$text,'',60);
} 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 484 sub start_ylabel {	Line 705 sub start_ylabel {
sub end_ylabel {	sub end_ylabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
}	}
Line 495 sub end_ylabel {	Line 716 sub end_ylabel {
sub start_label {	sub start_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
my %label;	my %label;
&get_attributes(\%label,\%label_defaults,$parstack,$safeeval,	&get_attributes(\%label,\%label_defaults,$parstack,$safeeval,
$tagstack->[-1]);	$tagstack->[-1]);
my $text = &Apache::lonxml::get_all_text("/label",$$parser[-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);	$text = substr($text,0,$max_str_len) if (length($text) > $max_str_len);
$label{'text'} = $text;	$label{'text'} = $text;
push(@labels,\%label);	push(@labels,\%label);
Line 509 sub start_label {	Line 732 sub start_label {
my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]);	my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]);
$result .= &Apache::edit::end_row().	$result .= &Apache::edit::end_row().
&Apache::edit::start_spanning_row().	&Apache::edit::start_spanning_row().
&Apache::edit::editfield('',$text,'',60,1);	&Apache::edit::editline('',$text,'',60);
} 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 526 sub start_label {	Line 746 sub start_label {
sub end_label {	sub end_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
}	}
Line 539 sub start_curve {	Line 759 sub start_curve {
my $result='';	my $result='';
&Apache::lonxml::register('Apache::lonplot',('function','data'));	&Apache::lonxml::register('Apache::lonplot',('function','data'));
push (@Apache::lonxml::namespace,'curve');	push (@Apache::lonxml::namespace,'curve');
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
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);
} 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 .= &help_win($curve_help_text);
	$result .= &edit_attributes($target,$token,\%curve_defaults,
	\@curve_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(%curve_defaults));	($token,$parstack,$safeeval,keys(%curve_defaults));
Line 563 sub end_curve {	Line 785 sub end_curve {
my $result = '';	my $result = '';
pop @Apache::lonxml::namespace;	pop @Apache::lonxml::namespace;
&Apache::lonxml::deregister('Apache::lonplot',('function','data'));	&Apache::lonxml::deregister('Apache::lonplot',('function','data'));
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
}	}
Line 574 sub end_curve {	Line 796 sub end_curve {
sub start_function {	sub start_function {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
if (exists($curves[-1]->{'data'})) {	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.');	&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'} ;	delete $curves[-1]->{'data'} ;
}	}
$curves[-1]->{'function'} =	my $function = &Apache::lonxml::get_all_text("/function",$$parser[-1]);
&Apache::lonxml::get_all_text("/function",$$parser[-1]);	$function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]);
	$curves[-1]->{'function'} = $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[-1]);	my $text = &Apache::lonxml::get_all_text("/function",$$parser[-1]);
$result .= &Apache::edit::end_row().	$result .= &Apache::edit::end_row().
&Apache::edit::start_spanning_row().	&Apache::edit::start_spanning_row().
&Apache::edit::editfield('',$text,'',60,1);	&Apache::edit::editline('',$text,'',60);
} 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 598 sub start_function {	Line 821 sub start_function {
sub end_function {	sub end_function {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= &Apache::edit::end_table();	$result .= &Apache::edit::end_table();
}	}
Line 609 sub end_function {	Line 832 sub end_function {
sub start_data {	sub start_data {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
if (exists($curves[-1]->{'function'})) {	if (exists($curves[-1]->{'function'})) {
&Apache::lonxml::warning('Use of <data> precludes use of .'.	&Apache::lonxml::warning('Use of <data> precludes use of .'.
'<function>. The <function> will be omitted in favor of '.	'<function>. The <function> will be omitted in favor of '.
Line 617 sub start_data {	Line 840 sub start_data {
delete($curves[-1]->{'function'});	delete($curves[-1]->{'function'});
}	}
my $datatext = &Apache::lonxml::get_all_text("/data",$$parser[-1]);	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...	# Deal with cases where we're given an array...
if ($datatext =~ /^\@/) {	if ($datatext =~ /^\@/) {
$datatext = &Apache::run::run('return "'.$datatext.'"',	$datatext = &Apache::run::run('return "'.$datatext.'"',
$safeeval,1);	$safeeval,1);
}	}
$datatext =~ s/\s+/ /g;	$datatext =~ s/\s+/ /g;
# Need to do some error checking on the @data array -	# Need to do some error checking on the @data array -
# make sure it's all numbers and make sure each array	# make sure it's all numbers and make sure each array
# is of the same length.	# is of the same length.
Line 661 sub start_data {	Line 885 sub start_data {
my $text = &Apache::lonxml::get_all_text("/data",$$parser[-1]);	my $text = &Apache::lonxml::get_all_text("/data",$$parser[-1]);
$result .= &Apache::edit::end_row().	$result .= &Apache::edit::end_row().
&Apache::edit::start_spanning_row().	&Apache::edit::start_spanning_row().
&Apache::edit::editfield('',$text,'',60,1);	&Apache::edit::editline('',$text,'',60);
} 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 672 sub start_data {	Line 897 sub start_data {
sub end_data {	sub end_data {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= &Apache::edit::end_table();	$result .= &Apache::edit::end_table();
}	}
Line 683 sub end_data {	Line 908 sub end_data {
sub start_axis {	sub start_axis {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
&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,'Plot Axes');	$result .= &Apache::edit::tag_start($target,$token,'Plot Axes');
$result .= &edit_attributes($target,$token,\%axis_defaults);	$result .= &edit_attributes($target,$token,\%axis_defaults,
	\@axis_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(%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 703 sub start_axis {	Line 928 sub start_axis {
sub end_axis {	sub end_axis {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
Line 749 sub get_attributes{	Line 974 sub get_attributes{

##------------------------------------------------------- write_gnuplot_file	##------------------------------------------------------- write_gnuplot_file
sub write_gnuplot_file {	sub write_gnuplot_file {
my ($tmpdir,$filename)= @_;	my ($tmpdir,$filename,$target)= @_;
my $gnuplot_input = '';	my $gnuplot_input = '';
my $curve;	my $curve;
# Collect all the colors	# Collect all the colors
Line 763 sub write_gnuplot_file {	Line 988 sub write_gnuplot_file {
$plot{'fgcolor'} );	$plot{'fgcolor'} );
}	}
# set term	# set term
$gnuplot_input .= 'set term gif ';	if ($target eq 'web') {
$gnuplot_input .= 'transparent ' if ($plot{'transparent'} eq 'on');	$gnuplot_input .= 'set term gif ';
$gnuplot_input .= $plot{'font'} . ' ';	$gnuplot_input .= 'transparent ' if ($plot{'transparent'} eq 'on');
$gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' ';	$gnuplot_input .= $plot{'font'} . ' ';
$gnuplot_input .= "@Colors\n";	$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 solid\n";
	$gnuplot_input .= "set output \"/home/httpd/perl/tmp/".
	&Apache::lonnet::unescape($filename).".eps\"\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'.$/ );
$gnuplot_input .= "set output\n";	# sampling rate for non-data curves
	$gnuplot_input .= "set samples $plot{'samples'}\n";
	# title, xlabel, ylabel
	# 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 798 sub write_gnuplot_file {	Line 1050 sub write_gnuplot_file {
$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.	$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.
$label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'}.$/ ;	$label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'}.$/ ;
}	}
	if ($target eq 'tex') {
	$gnuplot_input .="set size 1,".$plot{'height'}/$plot{'width'}*1.38;
	$gnuplot_input .="\n";
	}
# curves	# curves
$gnuplot_input .= 'plot ';	$gnuplot_input .= 'plot ';
for (my $i = 0;$i<=$#curves;$i++) {	for (my $i = 0;$i<=$#curves;$i++) {
Line 807 sub write_gnuplot_file {	Line 1063 sub write_gnuplot_file {
$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');
	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'})) {	} elsif (exists($curve->{'data'})) {
# Store data values in $datatext	# Store data values in $datatext
my $datatext = '';	my $datatext = '';
# get new filename	# get new filename
my $datafilename = "$tmpdir/$filename.$i";	my $datafilename = "$tmpdir/$filename.data.$i";
my $fh=Apache::File->new(">$datafilename");	my $fh=Apache::File->new(">$datafilename");
# Compile data	# Compile data
my @Data = @{$curve->{'data'}};	my @Data = @{$curve->{'data'}};
Line 831 sub write_gnuplot_file {	Line 1097 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');
	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.	# Write the output to a file.
my $fh=Apache::File->new(">$tmpdir$filename");	my $fh=Apache::File->new(">$tmpdir$filename.data");
print $fh $gnuplot_input;	print $fh $gnuplot_input;
close($fh);	close($fh);
# That's all folks.	# That's all folks.
Line 845 sub write_gnuplot_file {	Line 1121 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 1161 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 1177 sub edit_attributes {
## ##	## ##
###################################################################	###################################################################

#------------------------------------------------ insert_xxxxxxx	sub insert_gnuplot {
sub insert_plot {
my $result = '';	my $result = '';
# plot attributes	# plot attributes
$result .= "<plot \n";	$result .= "\n<gnuplot ";
foreach my $attr (keys(%plot_defaults)) {	foreach my $attr (keys(%gnuplot_defaults)) {
$result .= " $attr=\"$plot_defaults{$attr}->{'default'}\"\n";	$result .= "\n $attr=\"$gnuplot_defaults{$attr}->{'default'}\"";
}	}
$result .= ">\n";	$result .= ">";
# 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 <gnuplot>
$result .= "</plot>\n";	$result .= "\n</gnuplot>";
	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 .= "\n $attr=\"$tic_defaults{$attr}->{'default'}\" ";
	}
	$result .= "/>";
	return $result;
	}

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

sub insert_key {	sub insert_key {
my $result;	my $result;
$result .= " <key \n";	$result .= "\n <key ";
foreach my $attr (keys(%key_defaults)) {	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;	return $result;
}	}

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 .= "\n $attr=\"$axis_defaults{$attr}->{'default'}\"";
}	}
$result .= " />\n";	$result .= " />";
return $result;	return $result;
}	}

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

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 .= "\n $attr=\"".
$label_defaults{$attr}->{'default'}."\"\n";	$label_defaults{$attr}->{'default'}."\"";
}	}
$result .= " ></label>\n";	$result .= "></label>";
return $result;	return $result;
}	}

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 .= "\n $attr=\"".
$curve_defaults{$attr}->{'default'}."\"\n";	$curve_defaults{$attr}->{'default'}."\"";
}	}
$result .= " ></curve>\n";	$result .= " >";
	$result .= &insert_data().&insert_data()."\n </curve>";
}	}

sub insert_function {	sub insert_function {
my $result;	my $result;
$result .= "<function></function>\n";	$result .= "\n <function></function>";
return $result;	return $result;
}	}

sub insert_data {	sub insert_data {
my $result;	my $result;
$result .= " <data></data>\n";	$result .= "\n <data></data>";
return $result;	return $result;
}	}

##----------------------------------------------------------------------	##----------------------------------------------------------------------
	# 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.77