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.99 and 1.118.2.2

version 1.99, 2004/06/28 17:02:27	version 1.118.2.2, 2007/09/18 23:30:25
Line 35 use Apache::File;	Line 35 use Apache::File;
use Apache::response;	use Apache::response;
use Apache::lonxml;	use Apache::lonxml;
use Apache::edit;	use Apache::edit;
	use Apache::lonnet;
	use lib '/home/httpd/lib/perl/';
	use LONCAPA;


use vars qw/$weboutputformat $versionstring/;	use vars qw/$weboutputformat $versionstring/;



BEGIN {	BEGIN {
&Apache::lonxml::register('Apache::lonplot',('gnuplot'));	&Apache::lonxml::register('Apache::lonplot',('gnuplot'));
#	#
Line 47 BEGIN {	Line 53 BEGIN {
if ($versionstring =~ /^gnuplot 4/) {	if ($versionstring =~ /^gnuplot 4/) {
$weboutputformat = 'png';	$weboutputformat = 'png';
}	}

}	}


##	##
## Description of data structures:	## Description of data structures:
##	##
Line 97 my %linestyles =	Line 105 my %linestyles =
yerrorbars => [3,4],	yerrorbars => [3,4],
xyerrorbars => [4,6],	xyerrorbars => [4,6],
boxes => 3,	boxes => 3,
	filledcurves => 2,
vector => 4	vector => 4
);	);

Line 119 my $words_test = sub {$_[0]=~s/\s+/	Line 128 my $words_test = sub {$_[0]=~s/\s+/
###################################################################	###################################################################
my @gnuplot_edit_order =	my @gnuplot_edit_order =
qw/alttag bgcolor fgcolor height width font transparent grid samples	qw/alttag bgcolor fgcolor height width font transparent grid samples
border align texwidth texfont plottype/;	border align texwidth texfont plotcolor plottype gridtype lmargin rmargin
	tmargin bmargin major_ticscale minor_ticscale boxwidth gridlayer fillstyle
	pattern solid/;

	my $margin_choices = ['default',0..20];

my %gnuplot_defaults =	my %gnuplot_defaults =
(	(
Line 170 my %gnuplot_defaults =	Line 183 my %gnuplot_defaults =
description => 'Display grid',	description => 'Display grid',
edit_type => 'onoff'	edit_type => 'onoff'
},	},
	gridlayer => {
	default => 'off',
	test => $onoff_test,
	description => 'Display grid front layer over filled boxes or filled curves',
	edit_type => 'onoff'
	},
	box_border => {
	default => 'noborder',
	test => sub {$_[0]=~/^(noborder\|border)$/},
	description => 'Draw border for boxes',
	edit_type => 'choice',
	choices => ['border','noborder']
	},
border => {	border => {
default => 'on',	default => 'on',
test => $onoff_test,	test => $onoff_test,
Line 183 my %gnuplot_defaults =	Line 209 my %gnuplot_defaults =
edit_type => 'choice',	edit_type => 'choice',
choices => ['small','medium','large']	choices => ['small','medium','large']
},	},
samples => {	samples => {
default => '100',	default => '100',
test => $int_test,	test => $int_test,
description => 'Number of samples for non-data plots',	description => 'Number of samples for non-data plots',
Line 191 my %gnuplot_defaults =	Line 217 my %gnuplot_defaults =
choices => ['100','200','500','1000','2000','5000']	choices => ['100','200','500','1000','2000','5000']
},	},
align => {	align => {
default => 'center',	default => 'middle',
test => sub {$_[0]=~/^(left\|right\|center)$/},	test => sub {$_[0]=~/^(left\|right\|middle\|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','middle']
},	},
texwidth => {	texwidth => {
default => '93',	default => '93',
Line 204 my %gnuplot_defaults =	Line 230 my %gnuplot_defaults =
edit_type => 'entry',	edit_type => 'entry',
size => '5'	size => '5'
},	},
texfont => {	texfont => {
default => '22',	default => '22',
test => $int_test,	test => $int_test,
description => 'Font size to use in TeX output (pts):',	description => 'Font size to use in TeX output (pts):',
edit_type => 'choice',	edit_type => 'choice',
choices => [qw/8 10 12 14 16 18 20 22 24 26 28 30 32 34 36/],	choices => [qw/8 10 12 14 16 18 20 22 24 26 28 30 32 34 36/],
},	},
plottype => {	plotcolor => {
	default => 'monochrome',
	test => sub {$_[0]=~/^(monochrome\|color\|colour)$/},
	description => 'Color setting for printing:',
	edit_type => 'choice',
	choices => [qw/monochrome color colour/],
	},
	pattern => {
	default => '',
	test => $int_test,
	description => 'pattern value for boxes:',
	edit_type => 'choice',
	choices => [0,1,2,3,4,5,6]
	},
	solid => {
	default => 0,
	test => $real_test,
	description => 'The density of fill style for boxes',
	edit_type => 'entry',
	size => '5'
	},
	fillstyle => {
	default => 'empty',
	test => sub {$_[0]=~/^(empty\|solid\|pattern)$/},
	description => 'Filled style for boxes:',
	edit_type => 'choice',
	choices => ['empty','solid','pattern']
	},
	plottype => {
default => 'Cartesian',	default => 'Cartesian',
test => sub {$_[0]=~/^(Polar\|Cartesian)$/},	test => sub {$_[0]=~/^(Polar\|Cartesian)$/},
description => 'Plot type:',	description => 'Plot type:',
edit_type => 'choice',	edit_type => 'choice',
choices => ['Cartesian','Polar']	choices => ['Cartesian','Polar']
},	},
	gridtype => {
	default => 'Cartesian',
	test => sub {$_[0]=~/^(Polar\|Cartesian\|Linear-Log\|Log-Linear\|Log-Log)$/},
	description => 'Grid type:',
	edit_type => 'choice',
	choices => ['Cartesian','Polar','Linear-Log','Log-Linear','Log-Log']
	},
	lmargin => {
	default => 'default',
	test => sub {$_[0]=~/^(default\|\d+)$/},
	description => 'Left margin width (pts):',
	edit_type => 'choice',
	choices => $margin_choices,
	},
	rmargin => {
	default => 'default',
	test => sub {$_[0]=~/^(default\|\d+)$/},
	description => 'Right margin width (pts):',
	edit_type => 'choice',
	choices => $margin_choices,
	},
	tmargin => {
	default => 'default',
	test => sub {$_[0]=~/^(default\|\d+)$/},
	description => 'Top margin width (pts):',
	edit_type => 'choice',
	choices => $margin_choices,
	},
	bmargin => {
	default => 'default',
	test => sub {$_[0]=~/^(default\|\d+)$/},
	description => 'Bottom margin width (pts):',
	edit_type => 'choice',
	choices => $margin_choices,
	},
	boxwidth => {
	default => '',
	test => $real_test,
	description => 'width of boxes default auto',
	edit_type => 'entry',
	size => '5'
	},
	major_ticscale => {
	default => '1',
	test => $real_test,
	description => 'Size of major tic marks (plot coordinates)',
	edit_type => 'entry',
	size => '5'
	},
	minor_ticscale => {
	default => '0.5',
	test => $real_test,
	description => 'Size of minor tic mark (plot coordinates)',
	edit_type => 'entry',
	size => '5'
	},
);	);

my %key_defaults =	my %key_defaults =
Line 357 my %axis_defaults =	Line 467 my %axis_defaults =
}	}
);	);

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

my %curve_defaults =	my %curve_defaults =
(	(
Line 382 my %curve_defaults =	Line 492 my %curve_defaults =
edit_type => 'choice',	edit_type => 'choice',
choices => [keys(%linestyles)]	choices => [keys(%linestyles)]
},	},
# gnuplots term=gif driver does not handle linewidth :(	linewidth => {
# linewidth => {	default => 1,
# default => 1,	test => $int_test,
# test => $int_test,	description => 'Line width (may not apply to all line styles)',
# description => 'Line width (may not apply to all line styles)',	edit_type => 'choice',
# edit_type => 'choice',	choices => [1,2,3,4,5,6,7,8,9,10]
# choices => [1,2,3,4,5,6,7,8,9,10]	},
# },
pointsize => {	pointsize => {
default => 1,	default => 1,
test => $pos_real_test,	test => $pos_real_test,
Line 403 my %curve_defaults =	Line 512 my %curve_defaults =
description => 'point type (may not apply to all line styles)',	description => 'point type (may not apply to all line styles)',
edit_type => 'choice',	edit_type => 'choice',
choices => [0,1,2,3,4,5,6]	choices => [0,1,2,3,4,5,6]
}	},
	limit => {
	default => 'closed',
	test => sub {$_[0]=~/^(closed\|x1\|x2\|y1\|y2)$/},
	description => 'point to fill -- for filledcurves',
	edit_type => 'choice',
	choices => ['closed','x1','x2','y1','y2']
	},
);	);

###################################################################	###################################################################
Line 411 my %curve_defaults =	Line 527 my %curve_defaults =
## parsing and edit rendering ##	## parsing and edit rendering ##
## ##	## ##
###################################################################	###################################################################
my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics);
	undef %Apache::lonplot::plot;
	my (%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics);

sub start_gnuplot {	sub start_gnuplot {
undef(%plot); undef(%key); undef(%axis);	undef(%Apache::lonplot::plot); undef(%key); undef(%axis);
undef($title); undef($xlabel); undef($ylabel);	undef($title); undef($xlabel); undef($ylabel);
undef(@labels); undef(@curves);	undef(@labels); undef(@curves);
undef(%xtics); undef(%ytics);	undef(%xtics); undef(%ytics);
Line 426 sub start_gnuplot {	Line 544 sub start_gnuplot {
'xtics','ytics'));	'xtics','ytics'));
push (@Apache::lonxml::namespace,'lonplot');	push (@Apache::lonxml::namespace,'lonplot');
if ($target eq 'web' \|\| $target eq 'tex') {	if ($target eq 'web' \|\| $target eq 'tex') {
&get_attributes(\%plot,\%gnuplot_defaults,$parstack,$safeeval,	&get_attributes(\%Apache::lonplot::plot,\%gnuplot_defaults,$parstack,$safeeval,
$tagstack->[-1]);	$tagstack->[-1]);
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'GnuPlot');	$result .= &Apache::edit::tag_start($target,$token,'GnuPlot');
$result .= &edit_attributes($target,$token,\%gnuplot_defaults,	$result .= &edit_attributes($target,$token,\%gnuplot_defaults,
\@gnuplot_edit_order);	\@gnuplot_edit_order)
	.&Apache::edit::end_row()
	.&Apache::edit::start_spanning_row();
} 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(%gnuplot_defaults));	($token,$parstack,$safeeval,keys(%gnuplot_defaults));
Line 461 sub end_gnuplot {	Line 581 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';	'_'.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 = &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.data&output=$weboutputformat"	<img src = "/cgi-bin/plot.$weboutputformat?file=$filename.data"
width = "$plot{'width'}"	width = "$Apache::lonplot::plot{'width'}"
height = "$plot{'height'}"	height = "$Apache::lonplot::plot{'height'}"
align = "$plot{'align'}"	align = "$Apache::lonplot::plot{'align'}"
alt = "$plot{'alttag'}" />	alt = "$Apache::lonplot::plot{'alttag'}" />
ENDIMAGE	ENDIMAGE
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
	&Apache::lonxml::debug(" gnuplot wid = $Apache::lonplot::plot{'width'}");
	&Apache::lonxml::debug(" gnuplot ht = $Apache::lonplot::plot{'height'}");
#might be inside the safe space, register the URL for later	#might be inside the safe space, register the URL for later
&Apache::lonxml::register_ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");	&Apache::lonxml::register_ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");
$result = '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$plot{'texwidth'}.' mm]{'.&Apache::lonnet::unescape($filename).'.eps}';	$result = "%DYNAMICIMAGE:$Apache::lonplot::plot{'width'}:$Apache::lonplot::plot{'height'}:$Apache::lonplot::plot{'texwidth'}\n";
	$result .= '\graphicspath{{/home/httpd/perl/tmp/}}'."\n";
	$result .= '\includegraphics[width='.$Apache::lonplot::plot{'texwidth'}.' mm]{'.&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 585 sub start_title {	Line 709 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);	$title = &Apache::lonxml::get_all_text("/title",$parser,$style);
$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 593 sub start_title {	Line 717 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);	my $text=&Apache::lonxml::get_all_text("/title",$parser,$style);
$result.=&Apache::edit::end_row().	$result.=&Apache::edit::editline('',$text,'',60);
&Apache::edit::start_spanning_row().
&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);
$result.=&Apache::edit::modifiedfield("/title",$parser);	$result.=&Apache::edit::modifiedfield("/title",$parser);
Line 618 sub start_xlabel {	Line 740 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);	$xlabel = &Apache::lonxml::get_all_text("/xlabel",$parser,$style);
$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 626 sub start_xlabel {	Line 748 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);	my $text=&Apache::lonxml::get_all_text("/xlabel",$parser,$style);
$result.=&Apache::edit::end_row().	$result.=&Apache::edit::editline('',$text,'',60);
&Apache::edit::start_spanning_row().
&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);
$result.=&Apache::edit::modifiedfield("/xlabel",$parser);	$result.=&Apache::edit::modifiedfield("/xlabel",$parser);
Line 652 sub start_ylabel {	Line 772 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);	$ylabel = &Apache::lonxml::get_all_text("/ylabel",$parser,$style);
$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 660 sub start_ylabel {	Line 780 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);	my $text = &Apache::lonxml::get_all_text("/ylabel",$parser,$style);
$result .= &Apache::edit::end_row().	$result .= &Apache::edit::editline('',$text,'',60);
&Apache::edit::start_spanning_row().
&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);
$result.=&Apache::edit::modifiedfield("/ylabel",$parser);	$result.=&Apache::edit::modifiedfield("/ylabel",$parser);
Line 689 sub start_label {	Line 807 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);	my $text = &Apache::lonxml::get_all_text("/label",$parser,$style);
$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 698 sub start_label {	Line 816 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);	my $text = &Apache::lonxml::get_all_text("/label",$parser,$style);
$result .= &Apache::edit::end_row().	$result .= &Apache::edit::end_row().
&Apache::edit::start_spanning_row().	&Apache::edit::start_spanning_row().
&Apache::edit::editline('',$text,'',60);	&Apache::edit::editline('',$text,'',60);
Line 735 sub start_curve {	Line 853 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 .= &edit_attributes($target,$token,\%curve_defaults,	$result .= &edit_attributes($target,$token,\%curve_defaults,
\@curve_edit_order);	\@curve_edit_order)
	.&Apache::edit::end_row()
	.&Apache::edit::start_spanning_row();

} 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));
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 772 sub start_function {	Line 892 sub start_function {
'curve function declaration.');	'curve function declaration.');
delete $curves[-1]->{'data'} ;	delete $curves[-1]->{'data'} ;
}	}
my $function = &Apache::lonxml::get_all_text("/function",$parser);	my $function = &Apache::lonxml::get_all_text("/function",$parser,
	$style);
$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);	my $text = &Apache::lonxml::get_all_text("/function",$parser,$style);
$result .= &Apache::edit::end_row().	$result .= &Apache::edit::editline('',$text,'',60);
&Apache::edit::start_spanning_row().
&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);
$result.=&Apache::edit::modifiedfield("/function",$parser);	$result.=&Apache::edit::modifiedfield("/function",$parser);
Line 811 sub start_data {	Line 930 sub start_data {
'curve data declaration.');	'curve data declaration.');
delete($curves[-1]->{'function'});	delete($curves[-1]->{'function'});
}	}
my $datatext = &Apache::lonxml::get_all_text("/data",$parser);	my $datatext = &Apache::lonxml::get_all_text("/data",$parser,$style);
$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 854 sub start_data {	Line 973 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);	my $text = &Apache::lonxml::get_all_text("/data",$parser,$style);
$result .= &Apache::edit::end_row().	$result .= &Apache::edit::editline('',$text,'',60);
&Apache::edit::start_spanning_row().
&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);
$result.=&Apache::edit::modifiedfield("/data",$parser);	$result.=&Apache::edit::modifiedfield("/data",$parser);
Line 953 sub write_gnuplot_file {	Line 1070 sub write_gnuplot_file {
my ($tmpdir,$filename,$target)= @_;	my ($tmpdir,$filename,$target)= @_;
my $gnuplot_input = '';	my $gnuplot_input = '';
my $curve;	my $curve;
my $pt = $plot{'texfont'};	my $pt = $Apache::lonplot::plot{'texfont'};
	#
	# Check to be sure we do not have any empty curves
	my @curvescopy;
	foreach my $curve (@curves) {
	if (exists($curve->{'function'})) {
	if ($curve->{'function'} !~ /^\s*$/) {
	push(@curvescopy,$curve);
	}
	} elsif (exists($curve->{'data'})) {
	foreach my $data (@{$curve->{'data'}}) {
	if (scalar(@$data) > 0) {
	push(@curvescopy,$curve);
	last;
	}
	}
	}
	}
	@curves = @curvescopy;
# Collect all the colors	# Collect all the colors
my @Colors;	my @Colors;
push @Colors, $plot{'bgcolor'};	push @Colors, $Apache::lonplot::plot{'bgcolor'};
push @Colors, $plot{'fgcolor'};	push @Colors, $Apache::lonplot::plot{'fgcolor'};
push @Colors, (defined($axis{'color'})?$axis{'color'}:$plot{'fgcolor'});	push @Colors, (defined($axis{'color'})?$axis{'color'}:$Apache::lonplot::plot{'fgcolor'});
foreach $curve (@curves) {	foreach $curve (@curves) {
push @Colors, ($curve->{'color'} ne '' ?	push @Colors, ($curve->{'color'} ne '' ?
$curve->{'color'} :	$curve->{'color'} :
$plot{'fgcolor'} );	$Apache::lonplot::plot{'fgcolor'} );
}	}
# set term	# set term
if ($target eq 'web') {	if ($target eq 'web') {
$gnuplot_input .= 'set term gif ';	$gnuplot_input .= 'set term '.$weboutputformat .' ';
$gnuplot_input .= 'transparent ' if ($plot{'transparent'} eq 'on');	$gnuplot_input .= 'transparent ' if ($Apache::lonplot::plot{'transparent'} eq 'on');
$gnuplot_input .= $plot{'font'} . ' ';	$gnuplot_input .= $Apache::lonplot::plot{'font'} . ' ';
$gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' ';	$gnuplot_input .= 'size '.$Apache::lonplot::plot{'width'}.','.$Apache::lonplot::plot{'height'}.' ';
$gnuplot_input .= "@Colors\n";	$gnuplot_input .= "@Colors\n";
# 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 solid \"Helvetica\" $pt \n";	$gnuplot_input .= "set term postscript eps $Apache::lonplot::plot{'plotcolor'} solid \"Helvetica\" $pt \n";
$gnuplot_input .= "set output \"/home/httpd/perl/tmp/".	$gnuplot_input .= "set output \"/home/httpd/perl/tmp/".
&Apache::lonnet::unescape($filename).".eps\"\n";	&unescape($filename).".eps\"\n";
}	}
# cartesian or polar?	# cartesian or polar plot?
if (lc($plot{'plottype'}) eq 'polar') {	if (lc($Apache::lonplot::plot{'plottype'}) eq 'polar') {
$gnuplot_input .= 'set polar'.$/;	$gnuplot_input .= 'set polar'.$/;
} else {	} else {
# Assume Cartesian	# Assume Cartesian
}	}
	# cartesian or polar grid?
	if (lc($Apache::lonplot::plot{'gridtype'}) eq 'polar') {
	$gnuplot_input .= 'set grid polar'.$/;
	} elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'linear-log') {
	$gnuplot_input .= 'set logscale x'.$/;
	} elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'log-linear') {
	$gnuplot_input .= 'set logscale y'.$/;
	} elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'log-log') {
	$gnuplot_input .= 'set logscale x'.$/;
	$gnuplot_input .= 'set logscale y'.$/;
	} else {
	# Assume Cartesian
	}
	# solid or pattern for boxes?
	if (lc($Apache::lonplot::plot{'fillstyle'}) eq 'solid') {
	$gnuplot_input .= 'set style fill solid '.
	$Apache::lonplot::plot{'solid'}.$Apache::lonplot::plot{'box_border'}.$/;
	} elsif (lc($Apache::lonplot::plot{'fillstyle'}) eq 'pattern') {
	$gnuplot_input .= 'set style fill pattern '.$Apache::lonplot::plot{'pattern'}.$Apache::lonplot::plot{'box_border'}.$/;
	} elsif (lc($Apache::lonplot::plot{'fillstyle'}) eq 'empty') {
	}
	# margin
	if (lc($Apache::lonplot::plot{'lmargin'}) ne 'default') {
	$gnuplot_input .= 'set lmargin '.$Apache::lonplot::plot{'lmargin'}.$/;
	}
	if (lc($Apache::lonplot::plot{'rmargin'}) ne 'default') {
	$gnuplot_input .= 'set rmargin '.$Apache::lonplot::plot{'rmargin'}.$/;
	}
	if (lc($Apache::lonplot::plot{'tmargin'}) ne 'default') {
	$gnuplot_input .= 'set tmargin '.$Apache::lonplot::plot{'tmargin'}.$/;
	}
	if (lc($Apache::lonplot::plot{'bmargin'}) ne 'default') {
	$gnuplot_input .= 'set bmargin '.$Apache::lonplot::plot{'bmargin'}.$/;
	}
	# tic scales
	$gnuplot_input .= 'set ticscale '.
	$Apache::lonplot::plot{'major_ticscale'}.' '.$Apache::lonplot::plot{'minor_ticscale'}.$/;
	#boxwidth
	if (lc($Apache::lonplot::plot{'boxwidth'}) ne '') {
	$gnuplot_input .= 'set boxwidth '.$Apache::lonplot::plot{'boxwidth'}.$/;
	}
	# gridlayer
	$gnuplot_input .= 'set grid noxtics noytics front '.$/
	if ($Apache::lonplot::plot{'gridlayer'} eq 'on');

# grid	# grid
$gnuplot_input .= 'set grid'.$/ if ($plot{'grid'} eq 'on');	$gnuplot_input .= 'set grid'.$/ if ($Apache::lonplot::plot{'grid'} eq 'on');
# border	# border
$gnuplot_input .= ($plot{'border'} eq 'on'?	$gnuplot_input .= ($Apache::lonplot::plot{'border'} eq 'on'?
'set border'.$/ :	'set border'.$/ :
'set noborder'.$/ );	'set noborder'.$/ );
# sampling rate for non-data curves	# sampling rate for non-data curves
$gnuplot_input .= "set samples $plot{'samples'}\n";	$gnuplot_input .= "set samples $Apache::lonplot::plot{'samples'}\n";
# title, xlabel, ylabel	# title, xlabel, ylabel
# titles	# titles
if ($target eq 'tex') {	if ($target eq 'tex') {
Line 1043 sub write_gnuplot_file {	Line 1223 sub write_gnuplot_file {
my $label;	my $label;
foreach $label (@labels) {	foreach $label (@labels) {
$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.	$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.
$label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'}.' font "Helvetica,'.$pt.'pt"'.$/ ;	$label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'};
	if ($target eq 'tex') {
	$gnuplot_input .=' font "Helvetica,'.$pt.'pt"' ;
	}
	$gnuplot_input .= $/;
}	}
if ($target eq 'tex') {	if ($target eq 'tex') {
$gnuplot_input .="set size 1,".$plot{'height'}/$plot{'width'}*1.38;	$gnuplot_input .="set size 1,".$Apache::lonplot::plot{'height'}/$Apache::lonplot::plot{'width'}*1.38;
$gnuplot_input .="\n";	$gnuplot_input .="\n";
}	}
# curves	# curves
Line 1054 sub write_gnuplot_file {	Line 1238 sub write_gnuplot_file {
for (my $i = 0;$i<=$#curves;$i++) {	for (my $i = 0;$i<=$#curves;$i++) {
$curve = $curves[$i];	$curve = $curves[$i];
$gnuplot_input.= ', ' if ($i > 0);	$gnuplot_input.= ', ' if ($i > 0);
	if ($target eq 'tex') {
	$curve->{'linewidth'} *= 2;
	}
if (exists($curve->{'function'})) {	if (exists($curve->{'function'})) {
$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');	$gnuplot_input.= ' linewidth '.$curve->{'linewidth'};

if (($curve->{'linestyle'} eq 'points') \|\|	if (($curve->{'linestyle'} eq 'points') \|\|
($curve->{'linestyle'} eq 'linespoints') \|\|	($curve->{'linestyle'} eq 'linespoints') \|\|
($curve->{'linestyle'} eq 'errorbars') \|\|	($curve->{'linestyle'} eq 'errorbars') \|\|
Line 1068 sub write_gnuplot_file {	Line 1256 sub write_gnuplot_file {
($curve->{'linestyle'} eq 'xyerrorbars')) {	($curve->{'linestyle'} eq 'xyerrorbars')) {
$gnuplot_input.=' pointtype '.$curve->{'pointtype'};	$gnuplot_input.=' pointtype '.$curve->{'pointtype'};
$gnuplot_input.=' pointsize '.$curve->{'pointsize'};	$gnuplot_input.=' pointsize '.$curve->{'pointsize'};
	} elsif ($curve->{'linestyle'} eq 'filledcurves') {
	$gnuplot_input.= ' '.$curve->{'limit'};
}	}
} elsif (exists($curve->{'data'})) {	} elsif (exists($curve->{'data'})) {
# Store data values in $datatext	# Store data values in $datatext
Line 1092 sub write_gnuplot_file {	Line 1282 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');	$gnuplot_input.= ' linewidth '.$curve->{'linewidth'};
if (($curve->{'linestyle'} eq 'points') \|\|	if (($curve->{'linestyle'} eq 'points') \|\|
($curve->{'linestyle'} eq 'linespoints') \|\|	($curve->{'linestyle'} eq 'linespoints') \|\|
($curve->{'linestyle'} eq 'errorbars') \|\|	($curve->{'linestyle'} eq 'errorbars') \|\|
Line 1101 sub write_gnuplot_file {	Line 1291 sub write_gnuplot_file {
($curve->{'linestyle'} eq 'xyerrorbars')) {	($curve->{'linestyle'} eq 'xyerrorbars')) {
$gnuplot_input.=' pointtype '.$curve->{'pointtype'};	$gnuplot_input.=' pointtype '.$curve->{'pointtype'};
$gnuplot_input.=' pointsize '.$curve->{'pointsize'};	$gnuplot_input.=' pointsize '.$curve->{'pointsize'};
	} elsif ($curve->{'linestyle'} eq 'filledcurves') {
	$gnuplot_input.= ' '.$curve->{'limit'};
}	}
}	}
}	}
Line 1116 sub write_gnuplot_file {	Line 1308 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,\%gnuplot_defaults); }	if (! %Apache::lonplot::plot) { &set_defaults(\%Apache::lonplot::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 1154 sub edit_attributes {	Line 1346 sub edit_attributes {
($description,$attr,$token,	($description,$attr,$token,
$defaults->{$attr}->{'size'});	$defaults->{$attr}->{'size'});
} elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') {	} elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') {
$result .= &Apache::edit::select_arg	$result .= &Apache::edit::select_or_text_arg
($description,$attr,$defaults->{$attr}->{'choices'},$token);	($description,$attr,$defaults->{$attr}->{'choices'},$token);
} elsif ($defaults->{$attr}->{'edit_type'} eq 'onoff') {	} elsif ($defaults->{$attr}->{'edit_type'} eq 'onoff') {
$result .= &Apache::edit::select_arg	$result .= &Apache::edit::select_or_text_arg
($description,$attr,['on','off'],$token);	($description,$attr,['on','off'],$token);
}	}
$result .= '<br />';	$result .= '<br />';

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

Removed from v.1.99
changed lines
	Added in v.1.118.2.2