Diff for /loncom/cgi/graph.png between versions 1.11 and 1.18

version 1.11, 2002/05/13 16:52:11 version 1.18, 2003/01/11 06:28:19
Line 29 Line 29
 # YEAR=2001  # YEAR=2001
 # 9/13/01, 9/25/01, 10/6/01, 10/9/01, 12/25/01  # 9/13/01, 9/25/01, 10/6/01, 10/9/01, 12/25/01
 # YEAR=2002  # YEAR=2002
 # 2/1/02, 5/13/02,   # 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.
 #   # 
 ####   #### 
Line 44  my ($Titr,$xlab,$ylab,$Max,$PNo,$data1,$ Line 46  my ($Titr,$xlab,$ylab,$Max,$PNo,$data1,$
   
 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;
 for (my $nIdx=0; $nIdx<$PNo; $nIdx++ ) {  
     $xlabels[$nIdx]=$nIdx+1;  
 }   
   
 #my $bg = (defined(@data2)) ? 'lorange' : 'white';  if ($xlab=~/^Percentage$/){
       for (my $nIdx=0; $nIdx<$PNo; $nIdx++ ) {
   #        $xlabels[$nIdx]=$data11[$nIdx];
           $xlabels[$nIdx]=$nIdx;
       }
       @data11=();
       @data11=split(/\,/,$data2);
       @data12=();  
   } else {
        for (my $nIdx=0; $nIdx<$PNo; $nIdx++ ) {
            $xlabels[$nIdx]=$nIdx+1;
        }
   } 
   
 my @data =(\@xlabels,\@data11,\@data12);  my @data =(\@xlabels,\@data11,\@data12);
   
 my $Range;  my $Range1;
   my $Range2;
   
 if ($xlab=~/^Concepts$/){  if ($xlab=~/^Concepts$/){
     $Range=500;      $Range1=270;
 }       $Range2=200;
 else {  } elsif ($xlab=~/^Percentage$/){
     if ( $PNo > 10 ) {$Range = 30*$PNo;}      $Range1=800;#*$PNo; 
     else { $Range = 400+30*$PNo; }      $Range2=200;
       $skip_x=5;
       $bar_space=1;
       $xlab='Percentage_of_Correct_Problems';
   } else {
       $Range1=450;
       $Range2=200;
 }  }
   
   
 my $MyGraph = GD::Graph::bars->new($Range, 400);  my $MyGraph = GD::Graph::bars->new($Range1,$Range2);
   
 $MyGraph->set(   $MyGraph->set( 
     x_label         => $xlab,      x_label         => $xlab,
Line 72  $MyGraph->set( Line 93  $MyGraph->set(
     long_ticks      => 1,      long_ticks      => 1,
     tick_length     => 0,      tick_length     => 0,
     x_ticks         => 0,      x_ticks         => 0,
 #    title           => 'LON-CAPA Option Response Problem:'.$cid,  
     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,   
   
     dclrs           => [ qw( green 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,
   
 #    legend_placement    => 'RT',  #    legend_placement    => 'RT',
   
     fgclr               => 'black',      fgclr               => 'black',
     boxclr              => 'lorange',      boxclr              => 'white',
     accentclr           => 'dblue',      accentclr           => 'dblue',
     valuesclr           => '#ffff77',      valuesclr           => '#ffff77',
   
     l_margin            => 10,      l_margin            => 10,
     b_margin            => 10,      b_margin            => 10,
     r_margin            => 10,      r_margin            => 10,
Line 98  $MyGraph->set( Line 118  $MyGraph->set(
   
     transparent     => 0,      transparent     => 0,
 ) or warn $MyGraph->error;   ) or warn $MyGraph->error; 
 if ($xlab=~/^Concepts$/){  
     $MyGraph->set_legend( 'Correct Answers', 'Incorrect Answers');  
 }  # Tell the server we are sending a png graphic
 # Tell the server we are sending a gif graphic  
 print <<END;  print <<END;
 Content-type: image/gif  Content-type: image/png
   
 END  END
   
 my $BinaryData=$MyGraph->plot(\@data)->png;  my $BinaryData=$MyGraph->plot(\@data)->png;
 undef $MyGraph;  undef $MyGraph;
 binmode(STDOUT);  binmode(STDOUT);
 open IMG,"|pngtopnm|ppmtogif 2>/dev/null"; # convert into a gif image  #open IMG,"|pngtopnm|ppmtogif 2>/dev/null"; # convert into a gif image
 print IMG $BinaryData; # output image  #print IMG $BinaryData; # output image
 $|=1; # be sure to flush before closing  #$|=1; # be sure to flush before closing
 close IMG;  #close IMG;
   print $BinaryData;

Removed from v.1.11  
changed lines
  Added in v.1.18


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