minor fixes to the hardcopy output code

This commit is contained in:
Dima Kogan 2009-12-03 11:37:50 -08:00
parent e028ed2d40
commit 772f07d3c7

View File

@ -130,18 +130,20 @@ sub mainThread {
($outputfileType) = $outputfile =~ /\.(ps|pdf|png)$/; ($outputfileType) = $outputfile =~ /\.(ps|pdf|png)$/;
if(!$outputfileType) { die("Only .ps, .pdf and .png supported\n"); } if(!$outputfileType) { die("Only .ps, .pdf and .png supported\n"); }
if ($outputfileType eq "png")
{
print PIPE "set terminal png\n";
}
else
{
print PIPE "set terminal postscript solid color landscape 10\n";
}
# write to a temporary file first # write to a temporary file first
$temphardcopyfile = $outputfile; $temphardcopyfile = $outputfile;
$temphardcopyfile =~ s{/}{_}g; $temphardcopyfile =~ s{/}{_}g;
$temphardcopyfile = "/tmp/$temphardcopyfile"; $temphardcopyfile = "/tmp/$temphardcopyfile";
if ($outputfileType eq "png")
{
print PIPE "set terminal png\n";
$temphardcopyfile .= '.png';
}
else
{
print PIPE "set terminal postscript solid color landscape 10\n";
$temphardcopyfile .= '.ps';
}
print PIPE "set output \"$temphardcopyfile\"\n"; print PIPE "set output \"$temphardcopyfile\"\n";
} }
else else
@ -242,6 +244,7 @@ sub mainThread {
usleep(100_000) until -e $temphardcopyfile; usleep(100_000) until -e $temphardcopyfile;
usleep(100_000) until(system("fuser -s $temphardcopyfile")); usleep(100_000) until(system("fuser -s $temphardcopyfile"));
print "Finished gnuplotting. Converting...\n";
if($outputfileType eq "pdf") if($outputfileType eq "pdf")
{ {
system("ps2pdf $temphardcopyfile $outputfile"); system("ps2pdf $temphardcopyfile $outputfile");
@ -250,7 +253,7 @@ sub mainThread {
{ {
system("mv $temphardcopyfile $outputfile"); system("mv $temphardcopyfile $outputfile");
} }
printf "Wrote output to $outputfile\n"; print "Wrote output to $outputfile\n";
return; return;
} }