[BACK]Return to graph.png CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / cgi

Diff for /loncom/cgi/graph.png between versions 1.14 and 1.20

version 1.14, 2002/08/06 18:10:03 version 1.20, 2003/01/13 17:41:45
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/, 1/13
 # 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;  
 }   
   
   
   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,\@data11,\@data12);  my @data =(\@xlabels,\@data11,\@data12);
   
 my $Range1;  my $Range1;
 my $Range2;  my $Range2 = 200;
   
 if ($xlab=~/^Concepts$/){  if ($xlab=~/^Concepts$/){
     $Range1=270;      $Range1=270;
     $Range2=200;  } elsif ($xlab=~/^Problem_number$/){
       $Range1=450;
 } else {  } else {
     if ( $PNo > 10 ) {      $Range1=($PNo==100) ? 800 : (120+$PNo*10); 
  $Range1 = 20*$PNo;      $skip_x=5;
     } else {       $bar_space=1;
         $Range1 = 250+30*$PNo;   
   }  
     $Range2=200;   
 }  }
   
   
Line 81  $MyGraph->set( Line 92  $MyGraph->set(
     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( 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,
   
Line 103  $MyGraph->set( Line 115  $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
   
 #$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.14  
changed lines
  Added in v.1.20

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