--- loncom/cgi/graph.png	2002/01/22 15:12:05	1.7
+++ loncom/cgi/graph.png	2003/01/13 17:41:45	1.20
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# $Id: graph.png,v 1.7 2002/01/22 15:12:05 minaeibi Exp $
+# $Id: graph.png,v 1.20 2003/01/13 17:41:45 minaeibi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,67 +27,106 @@
 # The LearningOnline Network with CAPA
 # Behrouz Minaei
 # YEAR=2001
-# 9/13/2001, 9/25/2001, 10/6/2001, 10/9/2001, 12/25/2001
-#
+# 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/, 1/13
 # A CGI script that dynamically outputs a graphical chart for lonstatistics.
 # 
 #### 
 
 use strict;
-use GD::Graph::bars3d;
+use GD::Graph::bars;
 use GD::Graph::colour;
 use GD::Graph::Data;
 
 $|=1;   # Autoflush after each print/write
-my ($cid, $Tag, $Max, $PNo, $data) = split(/&/,$ENV{'QUERY_STRING'});
+my ($Titr,$xlab,$ylab,$Max,$PNo,$data1,$data2)=split(/&/,$ENV{'QUERY_STRING'});
+
+my @data11=split(/\,/,$data1);
+my @data12=split(/\,/,$data2);
+my $skip_x = 1;
+my $bar_space=10;
 
-my @data1=split(/\,/,$data);
-   
 my @xlabels;
-for (my $nIdx=0; $nIdx<$PNo; $nIdx++ ) {
-    $xlabels[$nIdx]=$nIdx+1;
+
+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;
+     }
 } 
-my @data =(\@xlabels,\@data1);
 
-my $Range;
-if ( $PNo > 10 ) {$Range = 30*$PNo;}
-else { $Range = 300+30*$PNo; }
+my @data =(\@xlabels,\@data11,\@data12);
+
+my $Range1;
+my $Range2 = 200;
+
+if ($xlab=~/^Concepts$/){
+    $Range1=270;
+} elsif ($xlab=~/^Problem_number$/){
+    $Range1=450;
+} else {
+    $Range1=($PNo==100) ? 800 : (120+$PNo*10); 
+    $skip_x=5;
+    $bar_space=1;
+}
 
-$Max += (10 - $Max % 10);
 
-my $MyGraph = GD::Graph::bars3d->new($Range, 400);
+my $MyGraph = GD::Graph::bars->new($Range1,$Range2);
 
 $MyGraph->set( 
-    x_label         => 'Problems #',
-    y_label         => $Tag,
-    title           => 'LON-CAPA Graphical Chart, Course: '.$cid,
+    x_label         => $xlab,
+    y_label         => $ylab,
+    long_ticks      => 1,
+    tick_length     => 0,
+    x_ticks         => 0,
+    title           => $Titr,
     y_max_value     => $Max,
-    y_tick_number   => 10,
-    y_label_skip    => 1,
-    x_label_skip    => 2,
-    
-    # colors
-    dclrs           => [ qw( green lblue lyellow lpurple cyan lorange)],
+#    y_tick_number   => $ytic,
+    y_label_skip    => 5,
+    x_label_skip    => $skip_x,   
+
+    dclrs           => [ qw( lgreen dgreen lyellow lpurple cyan lorange)],
     
-    # shadows
-    bar_spacing     => 4,
-    shadow_depth    => 1,
-    shadowclr       => 'dred',
+    bar_spacing     => $bar_space,
+    cumulate        => 2,
+    zero_axis        => 1,
+
+#    legend_placement    => 'RT',
+
+    fgclr               => 'black',
+    boxclr              => 'white',
+    accentclr           => 'dblue',
+    valuesclr           => '#ffff77',
+    l_margin            => 10,
+    b_margin            => 10,
+    r_margin            => 10,
+    t_margin            => 10,
 
     transparent     => 0,
 ) or warn $MyGraph->error; 
 
-# 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
 
 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;