--- loncom/cgi/graph.png	2002/05/19 15:47:25	1.13
+++ loncom/cgi/graph.png	2003/01/08 03:31:54	1.17
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# $Id: graph.png,v 1.13 2002/05/19 15:47:25 minaeibi 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 @data11=split(/\,/,$data1);
 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,25 +70,23 @@ my $Range2;
 if ($xlab=~/^Concepts$/){
     $Range1=270;
     $Range2=200;
-} else {
-    if ( $PNo > 10 ) {
-	$Range1 = 20*$PNo;
-    } else { 
-        $Range1 = 250+30*$PNo; 
-    }
+} elsif ($xlab=~/^Percentage$/){
+    $Range1=250+20*$PNo; 
     $Range2=200; 
+} else {
+    $Range1=450;
+    $Range2=200;
 }
 
 
 my $MyGraph = GD::Graph::bars->new($Range1,$Range2);
 
 $MyGraph->set( 
- #   x_label         => $xlab,
+    x_label         => $xlab,
     y_label         => $ylab,
     long_ticks      => 1,
     tick_length     => 0,
     x_ticks         => 0,
-#    title           => 'LON-CAPA Option Response Problem:'.$cid,
     title           => $Titr,
     y_max_value     => $Max,
 #    y_tick_number   => $ytic,
@@ -103,30 +111,19 @@ $MyGraph->set(
 
     transparent     => 0,
 ) or warn $MyGraph->error; 
-#if ($xlab=~/^Concepts$/){
-#    $MyGraph->set_legend( 'Correct Answers', 'Incorrect Answers');
-#}
 
 
-# Tell the server we are sending a gif graphic
+# Tell the server we are sending a png graphic
 print <<END;
-Content-type: image/gif
+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;
 binmode(STDOUT);
-open IMG,"|pngtopnm|ppmtogif 2>/dev/null"; # convert into a gif image
-print IMG $BinaryData; # output image
-$|=1; # be sure to flush before closing
-close IMG;
+#open IMG,"|pngtopnm|ppmtogif 2>/dev/null"; # convert into a gif image
+#print IMG $BinaryData; # output image
+#$|=1; # be sure to flush before closing
+#close IMG;
+print $BinaryData;