--- loncom/cgi/graph.png	2002/05/13 16:52:11	1.11
+++ loncom/cgi/graph.png	2002/12/13 21:33:30	1.16
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# $Id: graph.png,v 1.11 2002/05/13 16:52:11 minaeibi Exp $
+# $Id: graph.png,v 1.16 2002/12/13 21:33:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,7 +29,7 @@
 # YEAR=2001
 # 9/13/01, 9/25/01, 10/6/01, 10/9/01, 12/25/01
 # YEAR=2002
-# 2/1/02, 5/13/02, 
+# 2/1/, 5/13, 5/15
 # A CGI script that dynamically outputs a graphical chart for lonstatistics.
 # 
 #### 
@@ -50,21 +50,23 @@ for (my $nIdx=0; $nIdx<$PNo; $nIdx++ ) {
     $xlabels[$nIdx]=$nIdx+1;
 } 
 
-#my $bg = (defined(@data2)) ? 'lorange' : 'white';
+
 
 my @data =(\@xlabels,\@data11,\@data12);
 
-my $Range;
+my $Range1;
+my $Range2;
+
 if ($xlab=~/^Concepts$/){
-    $Range=500;
-} 
-else {
-    if ( $PNo > 10 ) {$Range = 30*$PNo;}
-    else { $Range = 400+30*$PNo; }
+    $Range1=270;
+    $Range2=200;
+} else {
+    $Range1=450;#250+30*$PNo; 
+    $Range2=200; 
 }
 
 
-my $MyGraph = GD::Graph::bars->new($Range, 400);
+my $MyGraph = GD::Graph::bars->new($Range1,$Range2);
 
 $MyGraph->set( 
     x_label         => $xlab,
@@ -72,13 +74,12 @@ $MyGraph->set(
     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,
     y_label_skip    => 1,   
 
-    dclrs           => [ qw( green dgreen lyellow lpurple cyan lorange)],
+    dclrs           => [ qw( lgreen dgreen lyellow lpurple cyan lorange)],
     
     bar_spacing     => 10,
     cumulate        => 2,
@@ -87,10 +88,9 @@ $MyGraph->set(
 #    legend_placement    => 'RT',
 
     fgclr               => 'black',
-    boxclr              => 'lorange',
+    boxclr              => 'white',
     accentclr           => 'dblue',
     valuesclr           => '#ffff77',
-
     l_margin            => 10,
     b_margin            => 10,
     r_margin            => 10,
@@ -98,19 +98,32 @@ $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
+
+#if ($xlab=~/^Concepts$/){
+#    $MyGraph->set_legend( 'Correct Answers', 'Incorrect Answers');
+#}
+
+
+# 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;