X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_graph.c;h=5081c8a9341d9c689f71c12bf43150730d8c8c66;hp=d902a933fc9606417f9afeaac40115cb5fc1436f;hb=79888cec49c5530b1ff095d963f818848605affb;hpb=9d1b36962ce04d82d32284807df44d349e0ac4f3 diff --git a/src/rrd_graph.c b/src/rrd_graph.c index d902a93..5081c8a 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -59,6 +59,8 @@ text_prop_t text_prop[] = { {5.5, RRD_DEFAULT_FONT,NULL} /* watermark */ }; +char week_fmt[128] = "Week %V"; + xlab_t xlab[] = { {0, 0, TMT_SECOND, 30, TMT_MINUTE, 5, TMT_MINUTE, 5, 0, "%H:%M"} , @@ -87,10 +89,9 @@ xlab_t xlab[] = { , {2400, 0, TMT_HOUR, 12, TMT_DAY, 1, TMT_DAY, 2, 24 * 3600, "%a"} , - {3600, 0, TMT_DAY, 1, TMT_WEEK, 1, TMT_WEEK, 1, 7 * 24 * 3600, "Week %V"} + {3600, 0, TMT_DAY, 1, TMT_WEEK, 1, TMT_WEEK, 1, 7 * 24 * 3600, week_fmt} , - {3 * 3600, 0, TMT_WEEK, 1, TMT_MONTH, 1, TMT_WEEK, 2, 7 * 24 * 3600, - "Week %V"} + {3 * 3600, 0, TMT_WEEK, 1, TMT_MONTH, 1, TMT_WEEK, 2, 7 * 24 * 3600, week_fmt} , {6 * 3600, 0, TMT_MONTH, 1, TMT_MONTH, 1, TMT_MONTH, 1, 30 * 24 * 3600, "%b"} @@ -255,10 +256,25 @@ enum gfx_if_en if_conv( conv_if(SVG, IF_SVG); conv_if(EPS, IF_EPS); conv_if(PDF, IF_PDF); + conv_if(XML, IF_XML); + conv_if(XMLENUM, IF_XMLENUM); + conv_if(CSV, IF_CSV); + conv_if(TSV, IF_TSV); + conv_if(SSV, IF_SSV); + conv_if(JSON, IF_JSON); + conv_if(JSONTIME, IF_JSONTIME); return (enum gfx_if_en)(-1); } +enum gfx_type_en type_conv( + char *string) +{ + conv_if(TIME , GTYPE_TIME); + conv_if(XY, GTYPE_XY); + return (enum gfx_type_en)(-1); +} + enum tmt_en tmt_conv( char *string) { @@ -411,8 +427,11 @@ void auto_scale( } } +/* power prefixes */ static char si_symbol[] = { + 'y', /* 10e-24 Yocto */ + 'z', /* 10e-21 Zepto */ 'a', /* 10e-18 Atto */ 'f', /* 10e-15 Femto */ 'p', /* 10e-12 Pico */ @@ -426,8 +445,10 @@ static char si_symbol[] = { 'T', /* 10e12 Tera */ 'P', /* 10e15 Peta */ 'E', /* 10e18 Exa */ + 'Z', /* 10e21 Zeta */ + 'Y' /* 10e24 Yotta */ }; -static const int si_symbcenter = 6; +static const int si_symbcenter = 8; /* find SI magnitude symbol for the numbers on the y-axis*/ void si_unit( @@ -894,11 +915,15 @@ int data_fetch( &im->gdes[i].ds_cnt, &im->gdes[i].ds_namv, &im->gdes[i].data)) == -1) { - return -1; - } + return -1; + } } im->gdes[i].data_first = 1; + /* must reduce to at least im->step + otherwhise we end up with more data than we can handle in the + chart and visibility of data will be random */ + im->gdes[i].step = max(im->gdes[i].step,im->step); if (ft_step < im->gdes[i].step) { reduce_data(im->gdes[i].cf_reduce, ft_step, @@ -1470,6 +1495,13 @@ time_t find_next_time( localtime_r(¤t, &tm); + int limit = 2; + switch (baseint) { + case TMT_SECOND: limit = 7200; break; + case TMT_MINUTE: limit = 120; break; + case TMT_HOUR: limit = 2; break; + default: limit = 2; break; + } do { switch (baseint) { case TMT_SECOND: @@ -1500,7 +1532,7 @@ time_t find_next_time( tm. tm_year += basestep; } madetime = mktime(&tm); - } while (madetime == -1); /* this is necessary to skip impssible times + } while (madetime == -1 && limit-- >= 0); /* this is necessary to skip impossible times like the daylight saving time skips */ return madetime; @@ -1773,6 +1805,7 @@ int leg_place( prt_fctn != 'j' && prt_fctn != 'c' && prt_fctn != 'u' && + prt_fctn != '.' && prt_fctn != 's' && prt_fctn != '\0' && prt_fctn != 'g') { free(legspace); rrd_set_error @@ -1784,6 +1817,10 @@ int leg_place( if (prt_fctn == 'n') { prt_fctn = 'l'; } + /* \. is a null operation to allow strings ending in \x */ + if (prt_fctn == '.') { + prt_fctn = '\0'; + } /* remove exess space from the end of the legend for \g */ while (prt_fctn == 'g' && @@ -1859,7 +1896,7 @@ int leg_place( glue = 0; } if (prt_fctn == 'c') - leg_x = (double)(legendwidth - fill) / 2.0; + leg_x = border + (double)(legendwidth - fill) / 2.0; if (prt_fctn == 'r') leg_x = legendwidth - fill + border; for (ii = mark; ii <= i; ii++) { @@ -2506,19 +2543,20 @@ void vertical_grid( mgridtm, im->xlab_user. mgridst); - ti < im->end; + ti < im->end && ti != -1; 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) { + while (timajor < ti && timajor != -1) { timajor = find_next_time(timajor, im-> xlab_user. mgridtm, im->xlab_user.mgridst); } + if (timajor == -1) break; /* fail in case of problems with time increments */ if (ti == timajor) continue; /* skip as falls on major grid line */ X0 = xtr(im, ti); @@ -2542,7 +2580,7 @@ void vertical_grid( im-> xlab_user. mgridst); - ti < im->end; + ti < im->end && ti != -1; ti = find_next_time(ti, im->xlab_user.mgridtm, im->xlab_user.mgridst) ) { /* are we inside the graph ? */ @@ -2568,9 +2606,9 @@ void vertical_grid( labtm, im->xlab_user. labst); - ti <= + (ti <= im->end - - im->xlab_user.precis / 2; + im->xlab_user.precis / 2) && ti != -1; ti = find_next_time(ti, im->xlab_user.labtm, im->xlab_user.labst) ) { tilab = ti + im->xlab_user.precis / 2; /* correct time for the label */ @@ -2929,6 +2967,7 @@ int graph_size_location( im->ximg = im->xsize; im->yimg = im->ysize; im->yorigin = im->ysize; + xtr(im, 0); ytr(im, DNAN); return 0; } @@ -2960,7 +2999,7 @@ int graph_size_location( } else{ // we have no title; get a little clearing from the top - Ytitle = 1.5 * Yspacing; + Ytitle = Yspacing; } if (elements) { @@ -3054,7 +3093,7 @@ int graph_size_location( /* reserve space for padding below the graph */ if (im->extra_flags & NOLEGEND) { - Ymain -= Yspacing; + Ymain -= 0.5*Yspacing; } if (im->watermark[0] != '\0') { @@ -3114,7 +3153,7 @@ int graph_size_location( } /* reserve space for padding below the graph */ if (im->extra_flags & NOLEGEND) { - im->yimg += Yspacing; + im->yimg += 0.5*Yspacing; } if (im->watermark[0] != '\0') { @@ -3143,7 +3182,7 @@ int graph_size_location( */ switch(im->legendposition){ case NORTH: - im->xOriginTitle = Xvertical + Xylabel + (im->xsize / 2); + im->xOriginTitle = (im->ximg / 2); im->yOriginTitle = 0; im->xOriginLegend = 0; @@ -3164,7 +3203,7 @@ int graph_size_location( break; case WEST: - im->xOriginTitle = im->legendwidth + Xvertical + Xylabel + im->xsize / 2; + im->xOriginTitle = im->legendwidth + im->xsize / 2; im->yOriginTitle = 0; im->xOriginLegend = 0; @@ -3185,7 +3224,7 @@ int graph_size_location( break; case SOUTH: - im->xOriginTitle = Xvertical + Xylabel + im->xsize / 2; + im->xOriginTitle = im->ximg / 2; im->yOriginTitle = 0; im->xOriginLegend = 0; @@ -3206,7 +3245,7 @@ int graph_size_location( break; case EAST: - im->xOriginTitle = Xvertical + Xylabel + im->xsize / 2; + im->xOriginTitle = im->xsize / 2; im->yOriginTitle = 0; im->xOriginLegend = Xvertical + Xylabel + Xmain + Xvertical2; @@ -3263,13 +3302,15 @@ static cairo_status_t cairo_output( int graph_paint( image_desc_t *im) { - int i, ii; int lazy = lazy_check(im); - double areazero = 0.0; - graph_desc_t *lastgdes = NULL; - rrd_infoval_t info; + int i; -// PangoFontMap *font_map = pango_cairo_font_map_get_default(); + /* imgformat XML or higher dispatch to xport + * output format there is selected via graph_type + */ + if (im->imgformat >= IF_XML) { + return rrd_graph_xport(im); + } /* pull the data from the rrd files ... */ if (data_fetch(im) == -1) @@ -3290,6 +3331,28 @@ int graph_paint( if (i == 0) return 0; + /* otherwise call graph_paint_timestring */ + switch (im->graph_type) { + case GTYPE_TIME: + return graph_paint_timestring(im,lazy); + break; + case GTYPE_XY: + return graph_paint_xy(im,lazy); + break; + } + /* final return with error*/ + rrd_set_error("Graph type %i is not implemented",im->graph_type); + return -1; +} + +int graph_paint_timestring( + image_desc_t *im, int lazy) +{ + int i, ii; + double areazero = 0.0; + graph_desc_t *lastgdes = NULL; + rrd_infoval_t info; + /************************************************************** *** Calculating sizes and locations became a bit confusing *** *** so I moved this into a separate function. *** @@ -3342,67 +3405,11 @@ int graph_paint( ytr(im, DNAN); /* if (im->gridfit) apply_gridfit(im); */ - /* the actual graph is created by going through the individual - graph elements and then drawing them */ - cairo_surface_destroy(im->surface); - switch (im->imgformat) { - case IF_PNG: - im->surface = - cairo_image_surface_create(CAIRO_FORMAT_ARGB32, - im->ximg * im->zoom, - im->yimg * im->zoom); - break; - case IF_PDF: - im->gridfit = 0; - im->surface = strlen(im->graphfile) - ? cairo_pdf_surface_create(im->graphfile, im->ximg * im->zoom, - im->yimg * im->zoom) - : cairo_pdf_surface_create_for_stream - (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom); - break; - case IF_EPS: - im->gridfit = 0; - im->surface = strlen(im->graphfile) - ? - cairo_ps_surface_create(im->graphfile, im->ximg * im->zoom, - im->yimg * im->zoom) - : cairo_ps_surface_create_for_stream - (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom); - break; - case IF_SVG: - im->gridfit = 0; - im->surface = strlen(im->graphfile) - ? - cairo_svg_surface_create(im-> - graphfile, - im->ximg * im->zoom, im->yimg * im->zoom) - : cairo_svg_surface_create_for_stream - (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom); - cairo_svg_surface_restrict_to_version - (im->surface, CAIRO_SVG_VERSION_1_1); - break; - }; - cairo_destroy(im->cr); - im->cr = cairo_create(im->surface); - cairo_set_antialias(im->cr, im->graph_antialias); - cairo_scale(im->cr, im->zoom, im->zoom); -// pango_cairo_font_map_set_resolution(PANGO_CAIRO_FONT_MAP(font_map), 100); - gfx_new_area(im, 0, 0, 0, im->yimg, - im->ximg, im->yimg, im->graph_col[GRC_BACK]); - gfx_add_point(im, im->ximg, 0); - gfx_close_path(im); - gfx_new_area(im, im->xorigin, - im->yorigin, - im->xorigin + - im->xsize, im->yorigin, - im->xorigin + - im->xsize, - im->yorigin - im->ysize, im->graph_col[GRC_CANVAS]); - gfx_add_point(im, im->xorigin, im->yorigin - im->ysize); - gfx_close_path(im); - cairo_rectangle(im->cr, im->xorigin, im->yorigin - im->ysize - 1.0, - im->xsize, im->ysize + 2.0); - cairo_clip(im->cr); + + /* set up cairo */ + if (graph_cairo_setup(im)) { return -1; } + + /* other stuff */ if (im->minval > 0.0) areazero = im->minval; if (im->maxval < 0.0) @@ -3796,7 +3803,86 @@ int graph_paint( break; } } + /* close the graph via cairo*/ + return graph_cairo_finish(im); +} +int graph_cairo_setup (image_desc_t *im) +{ + /* the actual graph is created by going through the individual + graph elements and then drawing them */ + cairo_surface_destroy(im->surface); + switch (im->imgformat) { + case IF_PNG: + im->surface = + cairo_image_surface_create(CAIRO_FORMAT_ARGB32, + im->ximg * im->zoom, + im->yimg * im->zoom); + break; + case IF_PDF: + im->gridfit = 0; + im->surface = strlen(im->graphfile) + ? cairo_pdf_surface_create(im->graphfile, im->ximg * im->zoom, + im->yimg * im->zoom) + : cairo_pdf_surface_create_for_stream + (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom); + break; + case IF_EPS: + im->gridfit = 0; + im->surface = strlen(im->graphfile) + ? + cairo_ps_surface_create(im->graphfile, im->ximg * im->zoom, + im->yimg * im->zoom) + : cairo_ps_surface_create_for_stream + (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom); + break; + case IF_SVG: + im->gridfit = 0; + im->surface = strlen(im->graphfile) + ? + cairo_svg_surface_create(im-> + graphfile, + im->ximg * im->zoom, im->yimg * im->zoom) + : cairo_svg_surface_create_for_stream + (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom); + cairo_svg_surface_restrict_to_version + (im->surface, CAIRO_SVG_VERSION_1_1); + break; + case IF_XML: + case IF_XMLENUM: + case IF_CSV: + case IF_TSV: + case IF_SSV: + case IF_JSON: + case IF_JSONTIME: + break; + }; + cairo_destroy(im->cr); + im->cr = cairo_create(im->surface); + cairo_set_antialias(im->cr, im->graph_antialias); + cairo_scale(im->cr, im->zoom, im->zoom); +// pango_cairo_font_map_set_resolution(PANGO_CAIRO_FONT_MAP(font_map), 100); + gfx_new_area(im, 0, 0, 0, im->yimg, + im->ximg, im->yimg, im->graph_col[GRC_BACK]); + gfx_add_point(im, im->ximg, 0); + gfx_close_path(im); + gfx_new_area(im, im->xorigin, + im->yorigin, + im->xorigin + + im->xsize, im->yorigin, + im->xorigin + + im->xsize, + im->yorigin - im->ysize, im->graph_col[GRC_CANVAS]); + gfx_add_point(im, im->xorigin, im->yorigin - im->ysize); + gfx_close_path(im); + cairo_rectangle(im->cr, im->xorigin, im->yorigin - im->ysize - 1.0, + im->xsize, im->ysize + 2.0); + cairo_clip(im->cr); + return 0; +} + +int graph_cairo_finish (image_desc_t *im) +{ switch (im->imgformat) { case IF_PNG: @@ -3814,6 +3900,14 @@ int graph_paint( } break; } + case IF_XML: + case IF_XMLENUM: + case IF_CSV: + case IF_TSV: + case IF_SSV: + case IF_JSON: + case IF_JSONTIME: + break; default: if (strlen(im->graphfile)) { cairo_show_page(im->cr); @@ -3826,6 +3920,12 @@ int graph_paint( return 0; } +int graph_paint_xy( + image_desc_t *im, int lazy) +{ + rrd_set_error("XY diagramm not implemented"); + return -1; +} /***************************************************** * graph stuff @@ -3993,6 +4093,7 @@ int rrd_graph( ** - options parsing now in rrd_graph_options() ** - script parsing now in rrd_graph_script() */ + rrd_info_t *rrd_graph_v( int argc, char **argv) @@ -4043,16 +4144,14 @@ rrd_info_t *rrd_graph_v( im_free(&im); return NULL; } - + /* Everything is now read and the actual work can start */ - if (graph_paint(&im) == -1) { - rrd_info_free(im.grinfo); - im_free(&im); - return NULL; + rrd_info_free(im.grinfo); + im_free(&im); + return NULL; } - /* The image is generated and needs to be output. ** Also, if needed, print a line with information about the image. */ @@ -4112,10 +4211,13 @@ void rrd_graph_init( static PangoFontMap *fontmap = NULL; PangoContext *context; + /* zero the whole structure first */ + memset(im,0,sizeof(image_desc_t)); + #ifdef HAVE_TZSET tzset(); #endif - + im->graph_type = GTYPE_TIME; im->base = 1000; im->daemon_addr = NULL; im->draw_x_grid = 1; @@ -4144,6 +4246,7 @@ void rrd_graph_init( im->maxval = DNAN; im->minval = 0; im->minval = DNAN; + im->magfact = 1; im->prt_c = 0; im->rigid = 0; im->rendered_image_size = 0; @@ -4293,6 +4396,8 @@ void rrd_graph_options( { "border", required_argument, 0, 1007}, { "grid-dash", required_argument, 0, 1008}, { "dynamic-labels", no_argument, 0, 1009}, + { "week-fmt", required_argument, 0, 1010}, + { "graph-type", required_argument, 0, 1011}, { 0, 0, 0, 0} }; /* *INDENT-ON* */ @@ -4478,6 +4583,10 @@ void rrd_graph_options( case 1009: /* enable dynamic labels */ im->dynamic_labels = 1; break; + case 1010: + strncpy(week_fmt,optarg,sizeof week_fmt); + week_fmt[(sizeof week_fmt)-1]='\0'; + break; case 1002: /* right y axis */ if(sscanf(optarg, @@ -4558,6 +4667,13 @@ void rrd_graph_options( return; } break; + case 1011: + if ((int) + (im->graph_type = type_conv(optarg)) == -1) { + rrd_set_error("unsupported graphics type '%s'", optarg); + return; + } + break; case 'z': im->lazy = 1; break;