Diff for /loncom/cgi/graph.png between versions 1.17 and 1.22

version 1.17, 2003/01/08 03:31:54 version 1.22, 2003/10/08 15:44:49
Line 25 Line 25
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # Behrouz Minaei  #
 # YEAR=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/  
 # A CGI script that dynamically outputs a graphical chart for lonstatistics.  # A CGI script that dynamically outputs a graphical chart for lonstatistics.
 #   # 
 ####   #### 
   
   =pod
   
   =head1 NAME
   
   graph.png
   
   =head1 SYNOPSIS
   
   produces plots based on input
   
   =head1 DESCRIPTION
   
   graph.png is a cgi-bin script which produces plots based on input data.
   
   The query string is expected to be as follows (without whitespace):
   
   escape(Plot title) & escape(X label)& escape(Y label) & Maximum Y value &
   Number of bars & $data1 & $data2
   
   $data1 and $data2 are expected to be comma seperated lists of numbers.
   escape( value ) means the values must be run through lonnet::escape.
   
   =cut
   
 use strict;  use strict;
 use GD::Graph::bars;  use GD::Graph::bars;
 use GD::Graph::colour;  use GD::Graph::colour;
 use GD::Graph::Data;  use GD::Graph::Data;
   
   sub unescape {
       my $str=shift;
       $str =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
       return $str;
   }
   
 $|=1;   # Autoflush after each print/write  $|=1;   # Autoflush after each print/write
 my ($Titr,$xlab,$ylab,$Max,$PNo,$data1,$data2)=split(/&/,$ENV{'QUERY_STRING'});  my ($Titr,$xlab,$ylab,$Max,$PNo,$data1,$data2)=split(/&/,$ENV{'QUERY_STRING'});
   $Titr = &unescape($Titr);
   $xlab = &unescape($xlab);
   $ylab = &unescape($ylab);
   
 my @data11=split(/\,/,$data1);  my @data11=split(/\,/,$data1);
 my @data12=split(/\,/,$data2);  my @data12=split(/\,/,$data2);
   my $skip_x = 1;
   my $bar_space=10;
   
 my @xlabels;  my @xlabels;
   
 if ($xlab=~/^Percentage$/){  if ($Titr =~ /^Percentage$/){
     for (my $nIdx=0; $nIdx<$PNo; $nIdx++ ) {      for (my $nIdx=0; $nIdx<$PNo; $nIdx++ ) {
         $xlabels[$nIdx]=$data11[$nIdx];          $xlabels[$nIdx]=$nIdx;
     }      }
     @data11=();      @data11=();
     @data11=split(/\,/,$data2);      @data11=split(/\,/,$data2);
     @data12=();        @data12=();
       $Titr = '';
 } else {  } else {
      for (my $nIdx=0; $nIdx<$PNo; $nIdx++ ) {       for (my $nIdx=0; $nIdx<$PNo; $nIdx++ ) {
          $xlabels[$nIdx]=$nIdx+1;           $xlabels[$nIdx]=$nIdx+1;
Line 64  if ($xlab=~/^Percentage$/){ Line 94  if ($xlab=~/^Percentage$/){
   
 my @data =(\@xlabels,\@data11,\@data12);  my @data =(\@xlabels,\@data11,\@data12);
   
 my $Range1;  my $width;
 my $Range2;  my $height = 200;
   
 if ($xlab=~/^Concepts$/){  if ($xlab=~/^Concepts$/){
     $Range1=270;      $width=270;
     $Range2=200;  } elsif ($xlab=~/^Problem\snumber$/){
 } elsif ($xlab=~/^Percentage$/){      $width=450;
     $Range1=250+20*$PNo;   
     $Range2=200;   
 } else {  } else {
     $Range1=450;      $width=($PNo==100) ? 800 : (120+$PNo*10); 
     $Range2=200;      $skip_x=5;
       $bar_space=1;
 }  }
   
   my $x_tick_offset = 0;
   if ($skip_x > 1) {
       $x_tick_offset = $skip_x - 1;
   }
   
 my $MyGraph = GD::Graph::bars->new($Range1,$Range2);  my $MyGraph = GD::Graph::bars->new($width,$height);
   
 $MyGraph->set(   $MyGraph->set( 
     x_label         => $xlab,      x_label         => $xlab,
     y_label         => $ylab,      y_label         => $ylab,
       x_label_position => 0.5,
     long_ticks      => 1,      long_ticks      => 1,
     tick_length     => 0,      tick_length     => 0,
     x_ticks         => 0,      x_ticks         => 0,
     title           => $Titr,      title           => $Titr,
     y_max_value     => $Max,      y_max_value     => $Max,
 #    y_tick_number   => $ytic,  #    y_tick_number   => $ytic,
     y_label_skip    => 1,         y_label_skip    => 5,
       x_label_skip    => $skip_x,   
       x_tick_offset   => $x_tick_offset,
   
     dclrs           => [ qw( lgreen dgreen lyellow lpurple cyan lorange)],      dclrs           => [ qw( lgreen dgreen lyellow lpurple cyan lorange)],
           
     bar_spacing     => 10,      bar_spacing     => $bar_space,
     cumulate        => 2,      cumulate        => 2,
     zero_axis        => 1,      zero_axis        => 1,
   

Removed from v.1.17  
changed lines
  Added in v.1.22


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>