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

version 1.13, 2002/05/19 15:47:25 version 1.17, 2003/01/08 03:31:54
Line 30 Line 30
 # 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/, 5/13, 5/15  # 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 46  my @data11=split(/\,/,$data1); Line 48  my @data11=split(/\,/,$data1);
 my @data12=split(/\,/,$data2);  my @data12=split(/\,/,$data2);
   
 my @xlabels;  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);  my @data =(\@xlabels,\@data11,\@data12);
   
Line 60  my $Range2; Line 70  my $Range2;
 if ($xlab=~/^Concepts$/){  if ($xlab=~/^Concepts$/){
     $Range1=270;      $Range1=270;
     $Range2=200;      $Range2=200;
 } else {  } elsif ($xlab=~/^Percentage$/){
     if ( $PNo > 10 ) {      $Range1=250+20*$PNo; 
  $Range1 = 20*$PNo;  
     } else {   
         $Range1 = 250+30*$PNo;   
     }  
     $Range2=200;       $Range2=200; 
   } else {
       $Range1=450;
       $Range2=200;
 }  }
   
   
 my $MyGraph = GD::Graph::bars->new($Range1,$Range2);  my $MyGraph = GD::Graph::bars->new($Range1,$Range2);
   
 $MyGraph->set(   $MyGraph->set( 
  #   x_label         => $xlab,      x_label         => $xlab,
     y_label         => $ylab,      y_label         => $ylab,
     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,
Line 103  $MyGraph->set( Line 111  $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 gif graphic  # Tell the server we are sending a png graphic
 print <<END;  print <<END;
 Content-type: image/gif  Content-type: image/png
   
 END  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;  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.13  
changed lines
  Added in v.1.17


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