[LON-CAPA-cvs] cvs: loncom /cgi graph.png
matthew
lon-capa-cvs@mail.lon-capa.org
Thu, 09 Oct 2003 15:56:41 -0000
matthew Thu Oct 9 11:56:41 2003 EDT
Modified files:
/loncom/cgi graph.png
Log:
Various changes. No longer modify look of plot based on title.
Index: loncom/cgi/graph.png
diff -u loncom/cgi/graph.png:1.22 loncom/cgi/graph.png:1.23
--- loncom/cgi/graph.png:1.22 Wed Oct 8 11:44:49 2003
+++ loncom/cgi/graph.png Thu Oct 9 11:56:41 2003
@@ -1,6 +1,6 @@
#!/usr/bin/perl
#
-# $Id: graph.png,v 1.22 2003/10/08 15:44:49 matthew Exp $
+# $Id: graph.png,v 1.23 2003/10/09 15:56:41 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -66,7 +66,7 @@
}
$|=1; # Autoflush after each print/write
-my ($Titr,$xlab,$ylab,$Max,$PNo,$data1,$data2)=split(/&/,$ENV{'QUERY_STRING'});
+my ($Titr,$xlab,$ylab,$Max,$NumBars,$data1,$data2)=split(/&/,$ENV{'QUERY_STRING'});
$Titr = &unescape($Titr);
$xlab = &unescape($xlab);
$ylab = &unescape($ylab);
@@ -74,37 +74,47 @@
my @data11=split(/\,/,$data1);
my @data12=split(/\,/,$data2);
my $skip_x = 1;
-my $bar_space=10;
+#my $bar_space=1;
+my $bar_width=10;
my @xlabels;
-if ($Titr =~ /^Percentage$/){
- for (my $nIdx=0; $nIdx<$PNo; $nIdx++ ) {
- $xlabels[$nIdx]=$nIdx;
- }
- @data11=();
- @data11=split(/\,/,$data2);
- @data12=();
- $Titr = '';
-} else {
- for (my $nIdx=0; $nIdx<$PNo; $nIdx++ ) {
- $xlabels[$nIdx]=$nIdx+1;
- }
-}
+for (my $nIdx=0; $nIdx<$NumBars; $nIdx++ ) {
+ $xlabels[$nIdx]=$nIdx+1;
+}
+
+#if ($Titr =~ /^Percentage$/){
+# for (my $nIdx=0; $nIdx<$NumBars; $nIdx++ ) {
+# $xlabels[$nIdx]=$nIdx;
+# }
+# @data11=();
+# @data11=split(/\,/,$data2);
+# @data12=();
+# $Titr = '';
+#} else {
+#}
my @data =(\@xlabels,\@data11,\@data12);
my $width;
my $height = 200;
-if ($xlab=~/^Concepts$/){
- $width=270;
-} elsif ($xlab=~/^Problem\snumber$/){
- $width=450;
+if ($NumBars < 10) {
+ $width = 120+$NumBars*15;
+ $skip_x = 1;
+ $bar_width = 15;
+} elsif ($NumBars <= 25) {
+ $width = 120+$NumBars*11;
+ $skip_x = 5;
+ $bar_width = 8;
+} elsif ($NumBars <= 50) {
+ $width = 120+$NumBars*8;
+ $skip_x = 5;
+ $bar_width = 4;
} else {
- $width=($PNo==100) ? 800 : (120+$PNo*10);
- $skip_x=5;
- $bar_space=1;
+ $width = 120+$NumBars*8;
+ $skip_x = 5;
+ $bar_width = 4;
}
my $x_tick_offset = 0;
@@ -124,13 +134,13 @@
title => $Titr,
y_max_value => $Max,
# y_tick_number => $ytic,
- y_label_skip => 5,
+# y_label_skip => 5,
x_label_skip => $skip_x,
x_tick_offset => $x_tick_offset,
dclrs => [ qw( lgreen dgreen lyellow lpurple cyan lorange)],
-
- bar_spacing => $bar_space,
+ bar_width => $bar_width,
+# bar_spacing => $bar_space,
cumulate => 2,
zero_axis => 1,