[LON-CAPA-cvs] cvs: loncom /cgi graph.png
minaeibi
lon-capa-cvs@mail.lon-capa.org
Wed, 08 Jan 2003 03:31:54 -0000
minaeibi Tue Jan 7 22:31:54 2003 EDT
Modified files:
/loncom/cgi graph.png
Log:
Fixed bug #1020.
It works for showing the graph for lonpercentage correctly.
Index: loncom/cgi/graph.png
diff -u loncom/cgi/graph.png:1.16 loncom/cgi/graph.png:1.17
--- loncom/cgi/graph.png:1.16 Fri Dec 13 16:33:30 2002
+++ loncom/cgi/graph.png Tue Jan 7 22:31:54 2003
@@ -1,6 +1,6 @@
#!/usr/bin/perl
#
-# $Id: graph.png,v 1.16 2002/12/13 21:33:30 albertel Exp $
+# $Id: graph.png,v 1.17 2003/01/08 03:31:54 minaeibi Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,6 +30,8 @@
# 9/13/01, 9/25/01, 10/6/01, 10/9/01, 12/25/01
# YEAR=2002
# 2/1/, 5/13, 5/15
+# YEAR=2003
+# 1/7/
# A CGI script that dynamically outputs a graphical chart for lonstatistics.
#
####
@@ -46,11 +48,19 @@
my @data12=split(/\,/,$data2);
my @xlabels;
-for (my $nIdx=0; $nIdx<$PNo; $nIdx++ ) {
- $xlabels[$nIdx]=$nIdx+1;
-}
-
+if ($xlab=~/^Percentage$/){
+ for (my $nIdx=0; $nIdx<$PNo; $nIdx++ ) {
+ $xlabels[$nIdx]=$data11[$nIdx];
+ }
+ @data11=();
+ @data11=split(/\,/,$data2);
+ @data12=();
+} else {
+ for (my $nIdx=0; $nIdx<$PNo; $nIdx++ ) {
+ $xlabels[$nIdx]=$nIdx+1;
+ }
+}
my @data =(\@xlabels,\@data11,\@data12);
@@ -60,9 +70,12 @@
if ($xlab=~/^Concepts$/){
$Range1=270;
$Range2=200;
-} else {
- $Range1=450;#250+30*$PNo;
+} elsif ($xlab=~/^Percentage$/){
+ $Range1=250+20*$PNo;
$Range2=200;
+} else {
+ $Range1=450;
+ $Range2=200;
}
@@ -99,25 +112,12 @@
transparent => 0,
) or warn $MyGraph->error;
-#if ($xlab=~/^Concepts$/){
-# $MyGraph->set_legend( 'Correct Answers', 'Incorrect Answers');
-#}
-
# Tell the server we are sending a png graphic
print <<END;
Content-type: image/png
END
-
-#$MyGraph->set_y_label_font('/home/httpd/cgi-bin/cetus.ttf', 16);
-#$MyGraph->set_x_label_font('/home/httpd/cgi-bin/cetus.ttf', 16);
-#$MyGraph->set_y_axis_font('/home/httpd/cgi-bin/cetus.ttf', 12);
-#$MyGraph->set_x_axis_font('/home/httpd/cgi-bin/cetus.ttf', 12);
-#$MyGraph->set_title_font('/home/httpd/cgi-bin/cetus.ttf', 18);
-#$MyGraph->set_legend_font('/home/httpd/cgi-bin/cetus.ttf', 10);
-#$MyGraph->set_values_font('/home/httpd/cgi-bin/cetus.ttf', 10);
-
my $BinaryData=$MyGraph->plot(\@data)->png;
undef $MyGraph;