X-Git-Url: https://git.tokkee.org/?p=rrdtool-all.git;a=blobdiff_plain;f=program%2Fsrc%2Frrd_graph.c;h=3f8ee1bff143af2dc004eb0e83ffaac4200b8e9f;hp=ef51b7c4b6cd6f42af7195b07d20e7ec115802f8;hb=9589222eef0b8bab19aec132dc339124658d3a2f;hpb=711ea600e6b1bf485b35d592d23f3038cb874a61 diff --git a/program/src/rrd_graph.c b/program/src/rrd_graph.c index ef51b7c4..3f8ee1bf 100644 --- a/program/src/rrd_graph.c +++ b/program/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,10 @@ 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"} + week_fmt} , {6 * 3600, 0, TMT_MONTH, 1, TMT_MONTH, 1, TMT_MONTH, 1, 30 * 24 * 3600, "%b"} @@ -337,6 +339,12 @@ int im_free( free(im->gdes[i].rpnp); } free(im->gdes); + + for (i = 0; i < DIM(text_prop);i++){ + pango_font_description_free(im->text_prop[i].font_desc); + im->text_prop[i].font_desc = NULL; + } + if (im->font_options) cairo_font_options_destroy(im->font_options); @@ -344,6 +352,8 @@ int im_free( status = cairo_status(im->cr); cairo_destroy(im->cr); } + + if (im->rendered_image) { free(im->rendered_image); } @@ -886,11 +896,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, @@ -1462,6 +1476,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: @@ -1492,7 +1513,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; @@ -1574,7 +1595,7 @@ int print_calc( } } /* prepare printval */ - if ((percent_s = strstr(im->gdes[i].format, "%S")) != NULL) { + if (!im->gdes[i].strftm && (percent_s = strstr(im->gdes[i].format, "%S")) != NULL) { /* Magfact is set to -1 upon entry to print_calc. If it * is still less than 0, then we need to run auto_scale. * Otherwise, put the value into the correct units. If @@ -1588,7 +1609,7 @@ int print_calc( printval /= magfact; } *(++percent_s) = 's'; - } else if (strstr(im->gdes[i].format, "%s") != NULL) { + } else if (!im->gdes[i].strftm && strstr(im->gdes[i].format, "%s") != NULL) { auto_scale(im, &printval, &si_symb, &magfact); } @@ -1851,7 +1872,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++) { @@ -2293,7 +2314,7 @@ int horizontal_log_grid( } } else { - sprintf(graph_label_right,im->second_axis_format,sval); + sprintf(graph_label_right,im->second_axis_format,sval,""); } gfx_text ( im, @@ -2498,19 +2519,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); @@ -2534,7 +2556,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 ? */ @@ -2560,9 +2582,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 */ @@ -2952,7 +2974,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) { @@ -3046,7 +3068,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') { @@ -3106,7 +3128,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') { @@ -3135,7 +3157,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; @@ -3156,7 +3178,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; @@ -3177,7 +3199,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; @@ -3198,7 +3220,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; @@ -3440,17 +3462,27 @@ int graph_paint( break; case GF_LINE: case GF_AREA: - case GF_GRAD: - /* fix data points at oo and -oo */ + case GF_GRAD: { + rrd_value_t diffval = im->maxval - im->minval; + rrd_value_t maxlimit = im->maxval + 9 * diffval; + rrd_value_t minlimit = im->minval - 9 * diffval; for (ii = 0; ii < im->xsize; ii++) { + /* fix data points at oo and -oo */ if (isinf(im->gdes[i].p_data[ii])) { if (im->gdes[i].p_data[ii] > 0) { im->gdes[i].p_data[ii] = im->maxval; } else { im->gdes[i].p_data[ii] = im->minval; } - } + /* some versions of cairo go unstable when trying + to draw way out of the canvas ... lets not even try */ + if (im->gdes[i].p_data[ii] > maxlimit) { + im->gdes[i].p_data[ii] = maxlimit; + } + if (im->gdes[i].p_data[ii] < minlimit) { + im->gdes[i].p_data[ii] = minlimit; + } } /* for */ /* ******************************************************* @@ -3718,6 +3750,7 @@ int graph_paint( } lastgdes = &(im->gdes[i]); break; + } /* GF_AREA, GF_LINE, GF_GRAD */ case GF_STACK: rrd_set_error ("STACK should already be turned into LINE or AREA here"); @@ -3983,15 +4016,18 @@ rrd_info_t *rrd_graph_v( char *old_locale; rrd_graph_init(&im); /* a dummy surface so that we can measure text sizes for placements */ - old_locale = setlocale(LC_NUMERIC, "C"); + old_locale = setlocale(LC_NUMERIC, NULL); + setlocale(LC_NUMERIC, "C"); rrd_graph_options(argc, argv, &im); if (rrd_test_error()) { + setlocale(LC_NUMERIC, old_locale); /* reenable locale */ rrd_info_free(im.grinfo); im_free(&im); return NULL; } if (optind >= argc) { + setlocale(LC_NUMERIC, old_locale); /* reenable locale */ rrd_info_free(im.grinfo); im_free(&im); rrd_set_error("missing filename"); @@ -3999,6 +4035,7 @@ rrd_info_t *rrd_graph_v( } if (strlen(argv[optind]) >= MAXPATH) { + setlocale(LC_NUMERIC, old_locale); /* reenable locale */ rrd_set_error("filename (including path) too long"); rrd_info_free(im.grinfo); im_free(&im); @@ -4068,6 +4105,8 @@ rrd_set_font_desc ( if (font){ strncpy(im->text_prop[prop].font, font, sizeof(text_prop[prop].font) - 1); im->text_prop[prop].font[sizeof(text_prop[prop].font) - 1] = '\0'; + /* if we already got one, drop it first */ + pango_font_description_free(im->text_prop[prop].font_desc); im->text_prop[prop].font_desc = pango_font_description_from_string( font ); }; if (size > 0){ @@ -4161,6 +4200,7 @@ void rrd_graph_init( for (i = 0; i < DIM(text_prop); i++) { im->text_prop[i].size = -1; + im->text_prop[i].font_desc = NULL; rrd_set_font_desc(im,i, deffont ? deffont : text_prop[i].font,text_prop[i].size); } @@ -4175,6 +4215,7 @@ void rrd_graph_init( pango_cairo_update_context(im->cr,context); im->layout = pango_layout_new(context); + g_object_unref (context); // im->layout = pango_cairo_create_layout(im->cr); @@ -4266,6 +4307,7 @@ 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}, { 0, 0, 0, 0} }; /* *INDENT-ON* */ @@ -4451,6 +4493,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, @@ -5232,44 +5278,119 @@ void grinfo_push( } } + void time_clean( char *result, char *format) { int j, jj; +/* Handling based on + - ANSI C99 Specifications http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1124.pdf + - Single UNIX Specification version 2 http://www.opengroup.org/onlinepubs/007908799/xsh/strftime.html + - POSIX:2001/Single UNIX Specification version 3 http://www.opengroup.org/onlinepubs/009695399/functions/strftime.html + - POSIX:2008 Specifications http://www.opengroup.org/onlinepubs/9699919799/functions/strftime.html + Specifications tells + "If a conversion specifier is not one of the above, the behavior is undefined." + + C99 tells + "A conversion specifier consists of a % character, possibly followed by an E or O modifier character (described below), followed by a character that determines the behavior of the conversion specifier. + + POSIX:2001 tells + "A conversion specification consists of a '%' character, possibly followed by an E or O modifier, and a terminating conversion specifier character that determines the conversion specification's behavior." + + POSIX:2008 introduce more complexe behavior that are not handled here. + + According to this, this code will replace: + - % followed by @ by a %@ + - % followed by by a %SPACE + - % followed by . by a %. + - % followed by % by a % + - % followed by t by a TAB + - % followed by E then anything by '-' + - % followed by O then anything by '-' + - % followed by anything else by at least one '-'. More characters may be added to better fit expected output length +*/ + jj = 0; - for(j = 0; j < FMT_LEG_LEN - 1; j++) { /* we don't need to parse the last char */ + for(j = 0; (j < FMT_LEG_LEN - 1) && (jj < FMT_LEG_LEN); j++) { /* we don't need to parse the last char */ if (format[j] == '%') { - if ((format[j+1] == 'A') || (format[j+1] == 'a') || - (format[j+1] == 'B') || (format[j+1] == 'b') || - (format[j+1] == 'C') || (format[j+1] == 'c') || - (format[j+1] == 'D') || (format[j+1] == 'd') || - (format[j+1] == 'E') || (format[j+1] == 'e') || - (format[j+1] == 'F') || - (format[j+1] == 'G') || (format[j+1] == 'g') || - (format[j+1] == 'H') || (format[j+1] == 'h') || - (format[j+1] == 'I') || - (format[j+1] == 'j') || - (format[j+1] == 'k') || - (format[j+1] == 'l') || - (format[j+1] == 'M') || (format[j+1] == 'm') || - (format[j+1] == 'O') || - (format[j+1] == 'P') || (format[j+1] == 'p') || - (format[j+1] == 'R') || (format[j+1] == 'r') || - (format[j+1] == 'S') || (format[j+1] == 's') || - (format[j+1] == 'T') || - (format[j+1] == 'U') || (format[j+1] == 'u') || - (format[j+1] == 'V') || (format[j+1] == 'v') || - (format[j+1] == 'W') || (format[j+1] == 'w') || - (format[j+1] == 'X') || (format[j+1] == 'x') || - (format[j+1] == 'Y') || (format[j+1] == 'y') || - (format[j+1] == 'Z') || (format[j+1] == 'z') || - (format[j+1] == '+')) { + if ((format[j+1] == 'E') || (format[j+1] == 'O')) { result[jj++] = '-'; + j+=2; /* We skip next 2 following char */ + } else if ((format[j+1] == 'C') || (format[j+1] == 'd') || + (format[j+1] == 'g') || (format[j+1] == 'H') || + (format[j+1] == 'I') || (format[j+1] == 'm') || + (format[j+1] == 'M') || (format[j+1] == 'S') || + (format[j+1] == 'U') || (format[j+1] == 'V') || + (format[j+1] == 'W') || (format[j+1] == 'y')) { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN) { + result[jj++] = '-'; + } j++; /* We skip the following char */ - } else if (format[j+1] == '%') { - result[jj++] = '%'; + } else if (format[j+1] == 'j') { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 1) { + result[jj++] = '-'; + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if ((format[j+1] == 'G') || (format[j+1] == 'Y')) { + /* Assuming Year on 4 digit */ + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 2) { + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == 'R') { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 3) { + result[jj++] = '-'; + result[jj++] = ':'; + result[jj++] = '-'; + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == 'T') { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 6) { + result[jj++] = '-'; + result[jj++] = ':'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = ':'; + result[jj++] = '-'; + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == 'F') { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 8) { + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == 'D') { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 6) { + result[jj++] = '-'; + result[jj++] = '/'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '/'; + result[jj++] = '-'; + result[jj++] = '-'; + } j++; /* We skip the following char */ } else if (format[j+1] == 'n') { result[jj++] = '\r'; @@ -5278,11 +5399,33 @@ void time_clean( } else if (format[j+1] == 't') { result[jj++] = '\t'; j++; /* We skip the following char */ + } else if (format[j+1] == '%') { + result[jj++] = '%'; + j++; /* We skip the following char */ + } else if (format[j+1] == ' ') { + if (jj < FMT_LEG_LEN - 1) { + result[jj++] = '%'; + result[jj++] = ' '; + } + j++; /* We skip the following char */ + } else if (format[j+1] == '.') { + if (jj < FMT_LEG_LEN - 1) { + result[jj++] = '%'; + result[jj++] = '.'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == '@') { + if (jj < FMT_LEG_LEN - 1) { + result[jj++] = '%'; + result[jj++] = '@'; + } + j++; /* We skip the following char */ } else { - result[jj++] = format[j]; + result[jj++] = '-'; + j++; /* We skip the following char */ } } else { - result[jj++] = format[j]; + result[jj++] = format[j]; } } result[jj] = '\0'; /* We must force the end of the string */