X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.c;h=c60717fa0828784601476464480d6d33a7e2f6dd;hb=88ec7a41d5ba332d0a902a17c0ef0cb01d133a30;hp=715f0dc76e160f97645f404d4739fd689e82f452;hpb=c20f3bfc89a81e291b6374b6f414a1a4cac0a2e6;p=rrdtool.git

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 715f0dc..c60717f 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -27,16 +27,18 @@
 /* some constant definitions */
 
 
-#ifndef RRD_DEFAULT_FONT
 #ifdef WIN32
-#define RRD_DEFAULT_FONT "c:/winnt/fonts/COUR.TTF"
-#else
-#define RRD_DEFAULT_FONT "/usr/share/fonts/truetype/openoffice/ariosor.ttf" 
+char rrd_win_default_font[80];
+#endif
+
+#ifndef RRD_DEFAULT_FONT
+#ifndef WIN32
+#define RRD_DEFAULT_FONT "VeraMono.ttf"
+/* #define RRD_DEFAULT_FONT "/usr/share/fonts/truetype/openoffice/ariosor.ttf" */
 /* #define RRD_DEFAULT_FONT "/usr/share/fonts/truetype/Arial.ttf" */
 #endif
 #endif
 
-
 text_prop_t text_prop[] = {   
      { 10.0, RRD_DEFAULT_FONT }, /* default */
      { 12.0, RRD_DEFAULT_FONT }, /* title */
@@ -1401,7 +1403,7 @@ leg_place(image_desc_t *im)
 				      im->text_prop[TEXT_PROP_LEGEND].font,
 				      im->text_prop[TEXT_PROP_LEGEND].size,
 				      im->tabwidth,
-				      im->gdes[i].legend);
+				      im->gdes[i].legend, 0);
 	    leg_c++;
 	} else {
 	   legspace[i]=0;
@@ -1449,7 +1451,7 @@ leg_place(image_desc_t *im)
 				      im->text_prop[TEXT_PROP_LEGEND].font,
 				      im->text_prop[TEXT_PROP_LEGEND].size,
 				      im->tabwidth,
-				      im->gdes[ii].legend) 
+				      im->gdes[ii].legend, 0) 
 		   + legspace[ii]
 		   + glue;
 		if (im->gdes[ii].gf != GF_GPRINT && 
@@ -1887,13 +1889,14 @@ grid_paint(image_desc_t   *im)
     }
 
     /* yaxis description */
-	if (im->canvas->imgformat != IF_PNG) {
+/*	if (im->canvas->imgformat != IF_PNG) {*/
+	if (1) {
 	    gfx_new_text( im->canvas,
 			  7, (im->yorigin - im->ysize/2),
 			  im->graph_col[GRC_FONT],
 			  im->text_prop[TEXT_PROP_AXIS].font,
 			  im->text_prop[TEXT_PROP_AXIS].size, im->tabwidth, 270.0,
-			  GFX_H_CENTER, GFX_V_CENTER,
+			  GFX_H_LEFT, GFX_V_CENTER,
 			  im->ylegend);
 	} else {
 	    /* horrible hack until we can actually print vertically */
@@ -1904,7 +1907,7 @@ grid_paint(image_desc_t   *im)
 		for (n=0;n<strlen(im->ylegend);n++) {
 		    s[0]=im->ylegend[n];
 		    s[1]='\0';
-		    gfx_new_text(im->canvas,7,im->text_prop[TEXT_PROP_AXIS].size*(l-n),
+		    gfx_new_text(im->canvas,7,im->text_prop[TEXT_PROP_AXIS].size*(n+1),
 			im->graph_col[GRC_FONT],
 			im->text_prop[TEXT_PROP_AXIS].font,
 			im->text_prop[TEXT_PROP_AXIS].size, im->tabwidth, 270.0,
@@ -1940,7 +1943,7 @@ grid_paint(image_desc_t   *im)
 		    boxH = gfx_get_text_width(im->canvas, 0,
 				im->text_prop[TEXT_PROP_AXIS].font,
 				im->text_prop[TEXT_PROP_AXIS].size,
-				im->tabwidth,"M") * 1.25;
+				im->tabwidth,"M", 0) * 1.25;
 		    boxV = boxH;
 
 		    node = gfx_new_area(im->canvas,
@@ -2092,7 +2095,7 @@ graph_size_location(image_desc_t *im, int elements, int piechart )
 		im->text_prop[TEXT_PROP_TITLE].font,
 		im->text_prop[TEXT_PROP_TITLE].size,
 		im->tabwidth,
-		im->title) + 2*Xspacing;
+		im->title, 0) + 2*Xspacing;
 	Ytitle = im->text_prop[TEXT_PROP_TITLE].size*2;
     }
 
@@ -2474,11 +2477,11 @@ graph_paint(image_desc_t *im, char ***calcpr)
 
   
   if (strcmp(im->graphfile,"-")==0) {
+    fo = im->graphhandle ? im->graphhandle : stdout;
 #ifdef WIN32
     /* Change translation mode for stdout to BINARY */
-    _setmode( _fileno( stdout ), O_BINARY );
+    _setmode( _fileno( fo ), O_BINARY );
 #endif
-    fo = stdout;
   } else {
     if ((fo = fopen(im->graphfile,"wb")) == NULL) {
       rrd_set_error("Opening '%s' for write: %s",im->graphfile,
@@ -2566,12 +2569,13 @@ scan_for_col(char *input, int len, char *output)
 ** - script parsing   now in rrd_graph_script()
 */
 int 
-rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize)
+rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize, FILE *stream)
 {
     image_desc_t   im;
             
     rrd_graph_init(&im);
-
+    im.graphhandle = stream;
+    
     rrd_graph_options(argc,argv,&im);
     if (rrd_test_error()) {
 	im_free(&im);
@@ -2674,7 +2678,19 @@ rrd_graph_init(image_desc_t *im)
 
     for(i=0;i<DIM(graph_col);i++)
         im->graph_col[i]=graph_col[i];
-
+#ifdef WIN32
+    {
+    char *windir; 
+    windir = getenv("windir");
+    /* %windir% is something like D:\windows or C:\winnt */
+    if (windir != NULL) {
+        strcpy(rrd_win_default_font,windir);
+        strcat(rrd_win_default_font,"\\fonts\\cour.ttf");
+        for(i=0;i<DIM(text_prop);i++)
+           text_prop[i].font = rrd_win_default_font;
+    }
+    }
+#endif
     for(i=0;i<DIM(text_prop);i++){        
       im->text_prop[i].size = text_prop[i].size;
       im->text_prop[i].font = text_prop[i].font;
@@ -2689,7 +2705,7 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im)
     char		scan_gtm[12],scan_mtm[12],scan_ltm[12],col_nam[12];
     time_t		start_tmp=0,end_tmp=0;
     long		long_tmp;
-    struct time_value	start_tv, end_tv;
+    struct rrd_time_value	start_tv, end_tv;
     gfx_color_t         color;
 
     parsetime("end-24h", &start_tv);