X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_graph.c;h=074ad448b543a6aed2ac7eb19f93db8b06fc804f;hp=135a8a0683a96ed7fc890845c08b407f66bc72d7;hb=c8c003d935cf3d272ae0ae87709193a9f2cbd093;hpb=0949f7e2a525302eaca15116374107e08b84fb4d

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 135a8a0..074ad44 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -6,6 +6,9 @@
 
 
 #include <sys/stat.h>
+
+#include "rrd_tool.h"
+
 #ifdef WIN32
 #include <io.h>
 #include <fcntl.h>
@@ -19,8 +22,6 @@
 #include <locale.h>
 #endif
 
-#include "rrd_tool.h"
-
 #include "rrd_graph.h"
 #include "rrd_graph_helper.h"
 
@@ -194,6 +195,7 @@ enum gfx_if_en if_conv(char *string){
     conv_if(PNG,IF_PNG)
     conv_if(SVG,IF_SVG)
     conv_if(EPS,IF_EPS)
+    conv_if(PDF,IF_PDF)
 
     return (-1);
 }
@@ -1569,16 +1571,18 @@ int draw_horizontal_grid(image_desc_t *im)
 			      im->text_prop[TEXT_PROP_AXIS].size,
 			      im->tabwidth, 0.0, GFX_H_RIGHT, GFX_V_CENTER,
 			      graph_label );
-	       gfx_new_line ( im->canvas,
+	       gfx_new_dashed_line ( im->canvas,
 			      X0-2,Y0,
 			      X1+2,Y0,
-			      MGRIDWIDTH, im->graph_col[GRC_MGRID] );	       
+			      MGRIDWIDTH, im->graph_col[GRC_MGRID],
+			      im->grid_dash_on, im->grid_dash_off);	       
 	       
 	    } else {		
-	       gfx_new_line ( im->canvas,
+	       gfx_new_dashed_line ( im->canvas,
 			      X0-1,Y0,
 			      X1+1,Y0,
-			      GRIDWIDTH, im->graph_col[GRC_GRID] );	       
+			      GRIDWIDTH, im->graph_col[GRC_GRID],
+			      im->grid_dash_on, im->grid_dash_off);	       
 	       
 	    }	    
 	}	
@@ -1629,10 +1633,11 @@ horizontal_log_grid(image_desc_t   *im)
 	while(yloglab[minoridx][++i] > 0){	    
 	   Y0 = ytr(im,value * yloglab[minoridx][i]);
 	   if (Y0 <= im->yorigin - im->ysize) break;
-	   gfx_new_line ( im->canvas,
+	   gfx_new_dashed_line ( im->canvas,
 			  X0-1,Y0,
 			  X1+1,Y0,
-			  GRIDWIDTH, im->graph_col[GRC_GRID] );
+			  GRIDWIDTH, im->graph_col[GRC_GRID],
+			  im->grid_dash_on, im->grid_dash_off);
 	}
     }
 
@@ -1646,10 +1651,11 @@ horizontal_log_grid(image_desc_t   *im)
 	while(yloglab[majoridx][++i] > 0){	    
 	   Y0 = ytr(im,value * yloglab[majoridx][i]);    
 	   if (Y0 <= im->yorigin - im->ysize) break;
-	   gfx_new_line ( im->canvas,
+	   gfx_new_dashed_line ( im->canvas,
 			  X0-2,Y0,
 			  X1+2,Y0,
-			  MGRIDWIDTH, im->graph_col[GRC_MGRID] );
+			  MGRIDWIDTH, im->graph_col[GRC_MGRID],
+			  im->grid_dash_on, im->grid_dash_off);
 	   
 	   sprintf(graph_label,"%3.0e",value * yloglab[majoridx][i]);
 	   gfx_new_text ( im->canvas,
@@ -1670,7 +1676,7 @@ vertical_grid(
     image_desc_t   *im )
 {   
     int xlab_sel;		/* which sort of label and grid ? */
-    time_t ti, tilab;
+    time_t ti, tilab, timajor;
     long factor;
     char graph_label[100];
     double X0,Y0,Y1; /* points for filled graph and more*/
@@ -1703,14 +1709,24 @@ vertical_grid(
     /* paint the minor grid */
     for(ti = find_first_time(im->start,
 			    im->xlab_user.gridtm,
-			    im->xlab_user.gridst);
+			    im->xlab_user.gridst),
+        timajor = find_first_time(im->start,
+			    im->xlab_user.mgridtm,
+			    im->xlab_user.mgridst);
 	ti < im->end; 
 	ti = find_next_time(ti,im->xlab_user.gridtm,im->xlab_user.gridst)
 	){
 	/* are we inside the graph ? */
 	if (ti < im->start || ti > im->end) continue;
+	while (timajor < ti) {
+	    timajor = find_next_time(timajor,
+		    im->xlab_user.mgridtm, im->xlab_user.mgridst);
+	}
+	if (ti == timajor) continue; /* skip as falls on major grid line */
        X0 = xtr(im,ti);       
-       gfx_new_line(im->canvas,X0,Y0+1, X0,Y1-1,GRIDWIDTH, im->graph_col[GRC_GRID]);
+       gfx_new_dashed_line(im->canvas,X0,Y0+1, X0,Y1-1,GRIDWIDTH,
+	   im->graph_col[GRC_GRID],
+	   im->grid_dash_on, im->grid_dash_off);
        
     }
 
@@ -1724,7 +1740,9 @@ vertical_grid(
 	/* are we inside the graph ? */
 	if (ti < im->start || ti > im->end) continue;
        X0 = xtr(im,ti);
-       gfx_new_line(im->canvas,X0,Y0+2, X0,Y1-2,MGRIDWIDTH, im->graph_col[GRC_MGRID]);
+       gfx_new_dashed_line(im->canvas,X0,Y0+3, X0,Y1-2,MGRIDWIDTH,
+	   im->graph_col[GRC_MGRID],
+	   im->grid_dash_on, im->grid_dash_off);
        
     }
     /* paint the labels below the graph */
@@ -2605,6 +2623,8 @@ rrd_graph_init(image_desc_t *im)
     im->gdes_c = 0;
     im->gdes = NULL;
     im->canvas = gfx_new_canvas();
+    im->grid_dash_on = 1;
+    im->grid_dash_off = 1;
 
     for(i=0;i<DIM(graph_col);i++)
         im->graph_col[i]=graph_col[i];