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.58 and 1.87

version 1.58, 2002/03/22 13:45:59	version 1.87, 2003/08/28 20:38:25
Line 91 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 $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-f]{6}$/};	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-fA-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~!\@\#\$\%^&\*-=_\+\[\]\{\}:\;\'<>,\.\/\?\\]+ ?)+$/};

###################################################################	###################################################################
## ##	## ##
Line 114 my $words_test = sub {$_[0]=~s/\s+/	Line 112 my $words_test = sub {$_[0]=~s/\s+/
## ##	## ##
###################################################################	###################################################################
my @gnuplot_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 texwidth plottype/;

my $gnuplot_help_text = <<"ENDPLOTHELP";	my $gnuplot_help_text = <<"ENDPLOTHELP";
<p>	<p>
Line 150 ENDPLOTHELP	Line 149 ENDPLOTHELP

my %gnuplot_defaults =	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 185 my %gnuplot_defaults =	Line 191 my %gnuplot_defaults =
edit_type => 'onoff'	edit_type => 'onoff'
},	},
grid => {	grid => {
default => 'off',	default => 'on',
test => $onoff_test,	test => $onoff_test,
description => 'Display grid',	description => 'Display grid',
edit_type => 'onoff'	edit_type => 'onoff'
Line 203 my %gnuplot_defaults =	Line 209 my %gnuplot_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',
choices => ['left','right','center']	choices => ['left','right','center']
}	},
	texwidth => {
	default => '93',
	test => $int_test,
	description => 'Width of plot when printed (mm)',
	edit_type => 'entry',
	size => '5'
	},
	plottype => {
	default => 'Cartesian',
	test => sub {$_[0]=~/^(Polar\|Cartesian)$/},
	description => 'Plot type:',
	edit_type => 'choice',
	choices => ['Polar','Cartesian']
	},
);	);

my %key_defaults =	my %key_defaults =
Line 301 my %tic_defaults =	Line 328 my %tic_defaults =
},	},
);	);

	my @axis_edit_order = ('color','xmin','xmax','ymin','ymax');
my %axis_defaults =	my %axis_defaults =
(	(
color => {	color => {
default => 'x000000',	default => 'x000000',
test => $color_test,	test => $color_test,
description => 'color of axes (x000000)',	description => 'color of grid lines (x000000)',
edit_type => 'entry',	edit_type => 'entry',
size => '10'	size => '10'
},	},
Line 371 is an error in your <b>function</b> tag.	Line 399 is an error in your <b>function</b> tag.
</dl>	</dl>
ENDCURVEHELP	ENDCURVEHELP

	my @curve_edit_order = ('color','name','linestyle','pointtype','pointsize');

my %curve_defaults =	my %curve_defaults =
(	(
color => {	color => {
Line 393 my %curve_defaults =	Line 423 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 454 sub end_gnuplot {	Line 506 sub end_gnuplot {
## 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.'_'.$$.$randnumber.'_plot.data';	'_'.time.'_'.$$.$randnumber.'_plot';
## Write the plot description to the file	## Write the plot description to the file
&write_gnuplot_file($tmpdir,$filename,$target);	&write_gnuplot_file($tmpdir,$filename,$target);
$filename = &Apache::lonnet::escape($filename);	$filename = &Apache::lonnet::escape($filename);
## return image tag for the plot	## return image tag for the plot
if ($target eq 'web') {	if ($target eq 'web') {
$result .= <<"ENDIMAGE";	$result .= <<"ENDIMAGE";
<img src = "/cgi-bin/plot.gif?file=$filename&output=gif"	<img src = "/cgi-bin/plot.gif?file=$filename.data&output=gif"
width = "$plot{'width'}"	width = "$plot{'width'}"
height = "$plot{'height'}"	height = "$plot{'height'}"
align = "$plot{'align'}"	align = "$plot{'align'}"
alt = "image should be /cgi-bin/plot.gif?$filename" />	alt = "$plot{'alttag'}" />
ENDIMAGE	ENDIMAGE
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
&Apache::lonnet::ssi('cgi-bin/plot.gif?file=$filename'.	&Apache::lonnet::ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");
'&output=eps');
$result = "$filename.eps";	$result = '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$plot{'texwidth'}.' mm]{'.&Apache::lonnet::unescape($filename).'.eps}';
}	}
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
Line 577 sub start_title {	Line 629 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' \|\| $target eq 'tex') {	if ($target eq 'web' \|\| $target eq 'tex') {
$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]);	$title = &Apache::lonxml::get_all_text("/title",$parser);
$title=&Apache::run::evaluate($title,$safeeval,$$parstack[-1]);	$title=&Apache::run::evaluate($title,$safeeval,$$parstack[-1]);
$title =~ s/\n/ /g;	$title =~ s/\n/ /g;
if (length($title) > $max_str_len) {	if (length($title) > $max_str_len) {
Line 585 sub start_title {	Line 637 sub start_title {
}	}
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,'Plot Title');	$result.=&Apache::edit::tag_start($target,$token,'Plot Title');
my $text=&Apache::lonxml::get_all_text("/title",$$parser[-1]);	my $text=&Apache::lonxml::get_all_text("/title",$parser);
$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::rebuild_tag($token);
Line 611 sub start_xlabel {	Line 663 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' \|\| $target eq 'tex') {	if ($target eq 'web' \|\| $target eq 'tex') {
$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);	$xlabel = &Apache::lonxml::get_all_text("/xlabel",$parser);
$xlabel=&Apache::run::evaluate($xlabel,$safeeval,$$parstack[-1]);	$xlabel=&Apache::run::evaluate($xlabel,$safeeval,$$parstack[-1]);
$xlabel =~ s/\n/ /g;	$xlabel =~ s/\n/ /g;
if (length($xlabel) > $max_str_len) {	if (length($xlabel) > $max_str_len) {
Line 619 sub start_xlabel {	Line 671 sub start_xlabel {
}	}
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel');	$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel');
my $text=&Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);	my $text=&Apache::lonxml::get_all_text("/xlabel",$parser);
$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::rebuild_tag($token);
Line 646 sub start_ylabel {	Line 698 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' \|\| $target eq 'tex') {	if ($target eq 'web' \|\| $target eq 'tex') {
$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);	$ylabel = &Apache::lonxml::get_all_text("/ylabel",$parser);
$ylabel = &Apache::run::evaluate($ylabel,$safeeval,$$parstack[-1]);	$ylabel = &Apache::run::evaluate($ylabel,$safeeval,$$parstack[-1]);
$ylabel =~ s/\n/ /g;	$ylabel =~ s/\n/ /g;
if (length($ylabel) > $max_str_len) {	if (length($ylabel) > $max_str_len) {
Line 654 sub start_ylabel {	Line 706 sub start_ylabel {
}	}
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel');	$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel');
my $text = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);	my $text = &Apache::lonxml::get_all_text("/ylabel",$parser);
$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::rebuild_tag($token);
Line 684 sub start_label {	Line 736 sub start_label {
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);
$text = &Apache::run::evaluate($text,$safeeval,$$parstack[-1]);	$text = &Apache::run::evaluate($text,$safeeval,$$parstack[-1]);
$text =~ s/\n/ /g;	$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);
Line 693 sub start_label {	Line 745 sub start_label {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Plot Label');	$result .= &Apache::edit::tag_start($target,$token,'Plot Label');
$result .= &edit_attributes($target,$token,\%label_defaults);	$result .= &edit_attributes($target,$token,\%label_defaults);
my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]);	my $text = &Apache::lonxml::get_all_text("/label",$parser);
$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') {
&Apache::edit::get_new_args	&Apache::edit::get_new_args
($token,$parstack,$safeeval,keys(%label_defaults));	($token,$parstack,$safeeval,keys(%label_defaults));
Line 731 sub start_curve {	Line 783 sub start_curve {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Curve');	$result .= &Apache::edit::tag_start($target,$token,'Curve');
$result .= &help_win($curve_help_text);	$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') {	} 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 761 sub start_function {	Line 814 sub start_function {
my $result='';	my $result='';
if ($target eq 'web' \|\| $target eq 'tex') {	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 the <b>curve function</b> tag precludes use of '.
	' the <b>curve data</b> tag. '.
	'The curve data tag will be omitted in favor of the '.
	'curve function declaration.');
delete $curves[-1]->{'data'} ;	delete $curves[-1]->{'data'} ;
}	}
my $function = &Apache::lonxml::get_all_text("/function",$$parser[-1]);	my $function = &Apache::lonxml::get_all_text("/function",$parser);
$function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]);	$function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]);
$curves[-1]->{'function'} = $function;	$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);
$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);	$result.=&Apache::edit::rebuild_tag($token);
my $text=$$parser[-1]->get_text("/function");	my $text=$$parser[-1]->get_text("/function");
Line 797 sub start_data {	Line 854 sub start_data {
my $result='';	my $result='';
if ($target eq 'web' \|\| $target eq 'tex') {	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
'<function>. The <function> will be omitted in favor of '.	('Use of the <b>curve function</b> tag precludes use of '.
'the <data> declaration.');	' the <b>curve data</b> tag. '.
	'The curve function tag will be omitted in favor of the '.
	'curve data declaration.');
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);
$datatext=&Apache::run::evaluate($datatext,$safeeval,$$parstack[-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 =~ /^\@/) {
Line 823 sub start_data {	Line 882 sub start_data {
# Check that it's non-empty	# Check that it's non-empty
if (! defined($data[$i])) {	if (! defined($data[$i])) {
&Apache::lonxml::warning(	&Apache::lonxml::warning(
'undefined <data> value. Replacing with '.	'undefined curve data value. Replacing with '.
' pi/e = 1.15572734979092');	' pi/e = 1.15572734979092');
$data[$i] = 1.15572734979092;	$data[$i] = 1.15572734979092;
}	}
# Check that it's a number	# Check that it's a number
if (! &$real_test($data[$i]) & ! &$int_test($data[$i])) {	if (! &$real_test($data[$i]) & ! &$int_test($data[$i])) {
&Apache::lonxml::warning(	&Apache::lonxml::warning(
'Bad <data> value of '.$data[$i].' Replacing with '.	'Bad curve data value of '.$data[$i].' Replacing with '.
' pi/e = 1.15572734979092');	' pi/e = 1.15572734979092');
$data[$i] = 1.15572734979092;	$data[$i] = 1.15572734979092;
}	}
Line 845 sub start_data {	Line 904 sub start_data {
push @{$curves[-1]->{'data'}},\@data;	push @{$curves[-1]->{'data'}},\@data;
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Comma or space deliminated curve data');	$result .= &Apache::edit::tag_start($target,$token,'Comma or space deliminated curve data');
my $text = &Apache::lonxml::get_all_text("/data",$$parser[-1]);	my $text = &Apache::lonxml::get_all_text("/data",$parser);
$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);	$result.=&Apache::edit::rebuild_tag($token);
my $text=$$parser[-1]->get_text("/data");	my $text=$$parser[-1]->get_text("/data");
Line 876 sub start_axis {	Line 935 sub start_axis {
$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));
Line 917 sub set_defaults {	Line 977 sub set_defaults {
sub get_attributes{	sub get_attributes{
my ($values,$defaults,$parstack,$safeeval,$tag) = @_;	my ($values,$defaults,$parstack,$safeeval,$tag) = @_;
foreach my $attr (keys(%{$defaults})) {	foreach my $attr (keys(%{$defaults})) {
$values->{$attr} =	if ($attr eq 'texwidth') {
&Apache::lonxml::get_param($attr,$parstack,$safeeval);	$values->{$attr} =
	&Apache::lonxml::get_param($attr,$parstack,$safeeval,undef,1);
	} else {
	$values->{$attr} =
	&Apache::lonxml::get_param($attr,$parstack,$safeeval);
	}
if ($values->{$attr} eq '' \| !defined($values->{$attr})) {	if ($values->{$attr} eq '' \| !defined($values->{$attr})) {
$values->{$attr} = $defaults->{$attr}->{'default'};	$values->{$attr} = $defaults->{$attr}->{'default'};
next;	next;
Line 959 sub write_gnuplot_file {	Line 1024 sub write_gnuplot_file {
# set output	# set output
$gnuplot_input .= "set output\n";	$gnuplot_input .= "set output\n";
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$gnuplot_input .= "set term postscript eps monochrome\n";	$gnuplot_input .= "set term postscript eps monochrome solid\n";
$gnuplot_input .= "set output \"$filename.eps\"\n";	$gnuplot_input .= "set output \"/home/httpd/perl/tmp/".
	&Apache::lonnet::unescape($filename).".eps\"\n";
	}
	# cartesian or polar?
	if (lc($plot{'plottype'}) eq 'polar') {
	$gnuplot_input .= 'set polar'.$/;
	} else {
	# Assume Cartesian
}	}
# 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'.$/ );
	# sampling rate for non-data curves
	$gnuplot_input .= "set samples $plot{'samples'}\n";
	# title, xlabel, ylabel
# titles	# 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));
Line 996 sub write_gnuplot_file {	Line 1071 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 1008 sub write_gnuplot_file {	Line 1083 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 1017 sub write_gnuplot_file {	Line 1096 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 1041 sub write_gnuplot_file {	Line 1130 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 1069 sub check_inputs {	Line 1168 sub check_inputs {
my $curve;	my $curve;
foreach $curve (@curves) {	foreach $curve (@curves) {
if (!defined($curve->{'function'})&&!defined($curve->{'data'})){	if (!defined($curve->{'function'})&&!defined($curve->{'data'})){
&Apache::lonxml::warning("One of the curves specified did not contain any <data> or <function> declarations\n");	&Apache::lonxml::warning("One of the curves specified did not contain any curve data or curve function declarations\n");
return '';	return '';
}	}
}	}
Line 1114 sub edit_attributes {	Line 1213 sub edit_attributes {
sub insert_gnuplot {	sub insert_gnuplot {
my $result = '';	my $result = '';
# plot attributes	# plot attributes
$result .= "<gnuplot \n";	$result .= "\n<gnuplot ";
foreach my $attr (keys(%gnuplot_defaults)) {	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)	# Add the components (most are commented out for simplicity)
# $result .= &insert_key();	# $result .= &insert_key();
# $result .= &insert_axis();	# $result .= &insert_axis();
Line 1127 sub insert_gnuplot {	Line 1226 sub insert_gnuplot {
# $result .= &insert_ylabel();	# $result .= &insert_ylabel();
$result .= &insert_curve();	$result .= &insert_curve();
# close up the <gnuplot>	# close up the <gnuplot>
$result .= "</gnuplot>\n";	$result .= "\n</gnuplot>";
return $result;	return $result;
}	}

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

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

sub insert_key {	sub insert_key {
my $result;	my $result;
$result .= "\n <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;
}	}

Line 1171 sub insert_axis{	Line 1270 sub insert_axis{
my $result;	my $result;
$result .= "\n <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 "\n <title></title>\n"; }	sub insert_title { return "\n <title></title>"; }
sub insert_xlabel { return "\n <xlabel></xlabel>\n"; }	sub insert_xlabel { return "\n <xlabel></xlabel>"; }
sub insert_ylabel { return "\n <ylabel></ylabel>\n"; }	sub insert_ylabel { return "\n <ylabel></ylabel>"; }

sub insert_label {	sub insert_label {
my $result;	my $result;
$result .= "\n <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;
}	}

Line 1196 sub insert_curve {	Line 1295 sub insert_curve {
my $result;	my $result;
$result .= "\n <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 .= " >\n";	$result .= " >";
$result .= &insert_data().&insert_data()."</curve>\n";	$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;
}	}

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

Removed from v.1.58
changed lines
	Added in v.1.87