X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_gfx.c;h=bd84706dab17c45510b00caf2c1c6cb9db5b5dab;hb=3a4825306f808c36fb2c529f27c5457a0715dfaf;hp=724a0747fafee1b354ddafb9d8f8c65aacdbfe46;hpb=17b0dfc415713a413ec4aa7f5803539071828f07;p=rrdtool.git diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c index 724a074..bd84706 100644 --- a/src/rrd_gfx.c +++ b/src/rrd_gfx.c @@ -11,7 +11,7 @@ #else # define DPRINT(x) #endif - +#include "rrd_tool.h" #include #include #include FT_FREETYPE_H @@ -31,11 +31,13 @@ gfx_node_t *gfx_new_node( gfx_canvas_t *canvas,enum gfx_en type){ node->path = NULL; /* path */ node->points = 0; node->points_max =0; + node->closed_path = 0; node->svp = NULL; /* svp */ node->filename = NULL; /* font or image filename */ node->text = NULL; node->x = 0.0; node->y = 0.0; /* position */ + node->angle = 0; node->halign = GFX_H_NULL; /* text alignement */ node->valign = GFX_V_NULL; /* text alignement */ node->tabwidth = 0.0; @@ -54,6 +56,9 @@ gfx_canvas_t *gfx_new_canvas (void) { gfx_canvas_t *canvas = art_new(gfx_canvas_t,1); canvas->firstnode = NULL; canvas->lastnode = NULL; + canvas->imgformat = IF_PNG; /* we default to PNG output */ + canvas->interlaced = 0; + canvas->zoom = 1.0; return canvas; } @@ -62,6 +67,14 @@ gfx_node_t *gfx_new_line(gfx_canvas_t *canvas, double x0, double y0, double x1, double y1, double width, gfx_color_t color){ + return gfx_new_dashed_line(canvas, x0, y0, x1, y1, width, color, 0, 0); +} + +gfx_node_t *gfx_new_dashed_line(gfx_canvas_t *canvas, + double x0, double y0, + double x1, double y1, + double width, gfx_color_t color, + double dash_on, double dash_off){ gfx_node_t *node; ArtVpath *vec; @@ -77,6 +90,8 @@ gfx_node_t *gfx_new_line(gfx_canvas_t *canvas, node->points_max = 3; node->color = color; node->size = width; + node->dash_on = dash_on; + node->dash_off = dash_off; node->path = vec; return node; } @@ -151,7 +166,9 @@ int gfx_add_point (gfx_node_t *node, return 0; } - +void gfx_close_path (gfx_node_t *node) { + node->closed_path = 1; +} /* create a text node */ gfx_node_t *gfx_new_text (gfx_canvas_t *canvas, @@ -172,6 +189,7 @@ gfx_node_t *gfx_new_text (gfx_canvas_t *canvas, node->filename = strdup(font); node->x = x; node->y = y; + node->angle = angle; node->color = color; node->tabwidth = tabwidth; node->halign = h_align; @@ -179,7 +197,32 @@ gfx_node_t *gfx_new_text (gfx_canvas_t *canvas, return node; } -double gfx_get_text_width ( double start, char* font, double size, +int gfx_render(gfx_canvas_t *canvas, + art_u32 width, art_u32 height, + gfx_color_t background, FILE *fp){ + switch (canvas->imgformat) { + case IF_PNG: + return gfx_render_png (canvas, width, height, background, fp); + case IF_SVG: + return gfx_render_svg (canvas, width, height, background, fp); + default: + return -1; + } +} + +double gfx_get_text_width ( gfx_canvas_t *canvas, + double start, char* font, double size, + double tabwidth, char* text){ + switch (canvas->imgformat) { + case IF_PNG: + return gfx_get_text_width_libart (canvas, start, font, size, tabwidth, text); + default: + return size * strlen(text); + } +} + +double gfx_get_text_width_libart ( gfx_canvas_t *canvas, + double start, char* font, double size, double tabwidth, char* text){ FT_GlyphSlot slot; @@ -234,7 +277,6 @@ static int gfx_save_png (art_u8 *buffer, FILE *fp, /* render grafics into png image */ int gfx_render_png (gfx_canvas_t *canvas, art_u32 width, art_u32 height, - double zoom, gfx_color_t background, FILE *fp){ @@ -242,8 +284,8 @@ int gfx_render_png (gfx_canvas_t *canvas, gfx_node_t *node = canvas->firstnode; art_u8 red = background >> 24, green = (background >> 16) & 0xff; art_u8 blue = (background >> 8) & 0xff, alpha = ( background & 0xff ); - unsigned long pys_width = width * zoom; - unsigned long pys_height = height * zoom; + unsigned long pys_width = width * canvas->zoom; + unsigned long pys_height = height * canvas->zoom; const int bytes_per_pixel = 3; unsigned long rowstride = pys_width*bytes_per_pixel; /* bytes per pixel */ art_u8 *buffer = art_new (art_u8, rowstride*pys_height); @@ -256,12 +298,17 @@ int gfx_render_png (gfx_canvas_t *canvas, ArtVpath *vec; double dst[6]; ArtSVP *svp; - art_affine_scale(dst,zoom,zoom); + if (node->closed_path) { + /* libart uses end==start for closed as indicator of closed path */ + gfx_add_point(node, node->path[0].x, node->path[0].y); + node->closed_path = 0; + } + art_affine_scale(dst,canvas->zoom,canvas->zoom); vec = art_vpath_affine_transform(node->path,dst); if(node->type == GFX_LINE){ svp = art_svp_vpath_stroke ( vec, ART_PATH_STROKE_JOIN_ROUND, ART_PATH_STROKE_CAP_ROUND, - node->size*zoom,1,1); + node->size*canvas->zoom,1,1); } else { svp = art_svp_from_vpath ( vec ); } @@ -300,11 +347,11 @@ int gfx_render_png (gfx_canvas_t *canvas, error = FT_Set_Char_Size(face, /* handle to face object */ (long)(node->size*64), (long)(node->size*64), - (long)(100*zoom), - (long)(100*zoom)); + (long)(100*canvas->zoom), + (long)(100*canvas->zoom)); if ( error ) break; - pen_x = node->x * zoom; - pen_y = node->y * zoom; + pen_x = node->x * canvas->zoom; + pen_y = node->y * canvas->zoom; slot = face->glyph; for(text=(unsigned char *)node->text;*text;text++) { @@ -466,3 +513,424 @@ static int gfx_save_png (art_u8 *buffer, FILE *fp, long width, long height, lon png_destroy_write_struct(&png_ptr, &info_ptr); return 1; } + + +/* ------- SVG ------- + SVG reference: + http://www.w3.org/TR/SVG/ +*/ +static int svg_indent = 0; +static int svg_single_line = 0; +static const char *svg_default_font = "Helvetica"; + +static void svg_print_indent(FILE *fp) +{ + int i; + for (i = svg_indent - svg_single_line; i > 0; i--) { + putc(' ', fp); + putc(' ', fp); + } +} + +static void svg_start_tag(FILE *fp, const char *name) +{ + svg_print_indent(fp); + putc('<', fp); + fputs(name, fp); + svg_indent++; +} + +static void svg_close_tag_single_line(FILE *fp) +{ + svg_single_line++; + putc('>', fp); +} + +static void svg_close_tag(FILE *fp) +{ + putc('>', fp); + if (!svg_single_line) + putc('\n', fp); +} + +static void svg_end_tag(FILE *fp, const char *name) +{ + /* name is NULL if closing empty-node tag */ + svg_indent--; + if (svg_single_line) + svg_single_line--; + else if (name) + svg_print_indent(fp); + if (name != NULL) { + fputs("': fputs(">", fp); break; + case '"': fputs(""", fp); break; + default: putc(ch, fp); + } + } +} + +static void svg_write_number(FILE *fp, double d) +{ + /* omit decimals if integer to reduce filesize */ + char buf[60], *p; + snprintf(buf, sizeof(buf), "%.2f", d); + p = buf; /* doesn't trust snprintf return value */ + while (*p) + p++; + while (--p > buf) { + char ch = *p; + if (ch == '0') { + *p = '\0'; /* zap trailing zeros */ + continue; + } + if (ch == '.') + *p = '\0'; /* zap trailing dot */ + break; + } + fputs(buf, fp); +} + +static int svg_color_is_black(int c) +{ + /* gfx_color_t is RRGGBBAA */ + return c == 0x000000FF; +} + +static void svg_write_color(FILE *fp, gfx_color_t c, const char *attr) +{ + /* gfx_color_t is RRGGBBAA, svg can use #RRGGBB and #RGB like html */ + gfx_color_t rrggbb = (int)((c >> 8) & 0xFFFFFF); + gfx_color_t opacity = c & 0xFF; + fprintf(fp, " %s=\"", attr); + if ((rrggbb & 0x0F0F0F) == ((rrggbb >> 4) & 0x0F0F0F)) { + /* css2 short form, #rgb is #rrggbb, not #r0g0b0 */ + fprintf(fp, "#%03lX", + ( ((rrggbb >> 8) & 0xF00) + | ((rrggbb >> 4) & 0x0F0) + | ( rrggbb & 0x00F))); + } else { + fprintf(fp, "#%06lX", rrggbb); + } + fputs("\"", fp); + if (opacity != 0xFF) { + fprintf(fp, " stroke-opacity=\""); + svg_write_number(fp, opacity / 255.0); + fputs("\"", fp); + } +} + +static void svg_common_path_attributes(FILE *fp, gfx_node_t *node) +{ + fputs(" stroke-width=\"", fp); + svg_write_number(fp, node->size); + fputs("\"", fp); + svg_write_color(fp, node->color, "stroke"); + fputs(" fill=\"none\"", fp); + if (node->dash_on != 0 && node->dash_off != 0) { + fputs(" stroke-dasharray=\"", fp); + svg_write_number(fp, node->dash_on); + fputs(",", fp); + svg_write_number(fp, node->dash_off); + fputs("\"", fp); + } +} + +static int svg_is_int_step(double a, double b) +{ + double diff = fabs(a - b); + return floor(diff) == diff; +} + +static int svg_path_straight_segment(FILE *fp, + double lastA, double currentA, double currentB, + gfx_node_t *node, + int segment_idx, int isx, char absChar, char relChar) +{ + if (!svg_is_int_step(lastA, currentA)) { + putc(absChar, fp); + svg_write_number(fp, currentA); + return 0; + } + if (segment_idx < node->points - 1) { + ArtVpath *vec = node->path + segment_idx + 1; + if (vec->code == ART_LINETO) { + double nextA = (isx ? vec->x : vec->y) - LINEOFFSET; + double nextB = (isx ? vec->y : vec->x) - LINEOFFSET; + if (nextB == currentB + && ((currentA >= lastA) == (nextA >= currentA)) + && svg_is_int_step(currentA, nextA)) { + return 1; /* skip to next as it is a straight line */ + } + } + } + putc(relChar, fp); + svg_write_number(fp, currentA - lastA); + return 0; +} + +static void svg_path(FILE *fp, gfx_node_t *node, int multi) +{ + int i; + double lastX = 0, lastY = 0; + /* for straight lines tags take less space than + tags because of the efficient packing + in the 'd' attribute */ + svg_start_tag(fp, "path"); + if (!multi) + svg_common_path_attributes(fp, node); + fputs(" d=\"", fp); + /* specification of the 'd' attribute: */ + /* http://www.w3.org/TR/SVG/paths.html#PathDataGeneralInformation */ + for (i = 0; i < node->points; i++) { + ArtVpath *vec = node->path + i; + double x = vec->x - LINEOFFSET; + double y = vec->y - LINEOFFSET; + switch (vec->code) { + case ART_MOVETO_OPEN: /* fall-through */ + case ART_MOVETO: + putc('M', fp); + svg_write_number(fp, x); + putc(',', fp); + svg_write_number(fp, y); + break; + case ART_LINETO: + /* try optimize filesize by using minimal lineto commands */ + /* without introducing rounding errors. */ + if (x == lastX) { + if (svg_path_straight_segment(fp, lastY, y, x, node, i, 0, 'V', 'v')) + continue; + } else if (y == lastY) { + if (svg_path_straight_segment(fp, lastX, x, y, node, i, 1, 'H', 'h')) + continue; + } else { + putc('L', fp); + svg_write_number(fp, x); + putc(',', fp); + svg_write_number(fp, y); + } + break; + case ART_CURVETO: break; /* unsupported */ + case ART_END: break; /* nop */ + } + lastX = x; + lastY = y; + } + if (node->closed_path) + fputs(" Z", fp); + fputs("\"", fp); + svg_close_tag_empty_node(fp); +} + +static void svg_multi_path(FILE *fp, gfx_node_t **nodeR) +{ + /* optimize for multiple paths with the same color, penwidth, etc. */ + int num = 1; + gfx_node_t *node = *nodeR; + gfx_node_t *next = node->next; + while (next) { + if (next->type != node->type + || next->size != node->size + || next->color != node->color + || next->dash_on != node->dash_on + || next->dash_off != node->dash_off) + break; + next = next->next; + num++; + } + if (num == 1) { + svg_path(fp, node, 0); + return; + } + svg_start_tag(fp, "g"); + svg_common_path_attributes(fp, node); + svg_close_tag(fp); + while (num && node) { + svg_path(fp, node, 1); + if (!--num) + break; + node = node->next; + *nodeR = node; + } + svg_end_tag(fp, "g"); +} + +static void svg_area(FILE *fp, gfx_node_t *node) +{ + int i; + double startX = 0, startY = 0; + svg_start_tag(fp, "polygon"); + fputs(" ", fp); + svg_write_color(fp, node->color, "fill"); + fputs(" points=\"", fp); + for (i = 0; i < node->points; i++) { + ArtVpath *vec = node->path + i; + double x = vec->x - LINEOFFSET; + double y = vec->y - LINEOFFSET; + switch (vec->code) { + case ART_MOVETO_OPEN: /* fall-through */ + case ART_MOVETO: + svg_write_number(fp, x); + putc(',', fp); + svg_write_number(fp, y); + startX = x; + startY = y; + break; + case ART_LINETO: + if (i == node->points - 2 + && node->path[i + 1].code == ART_END + && fabs(x - startX) < 0.001 && fabs(y - startY) < 0.001) { + break; /* poly area always closed, no need for last point */ + } + putc(' ', fp); + svg_write_number(fp, x); + putc(',', fp); + svg_write_number(fp, y); + break; + case ART_CURVETO: break; /* unsupported */ + case ART_END: break; /* nop */ + } + } + fputs("\"", fp); + svg_close_tag_empty_node(fp); +} + +static void svg_text(FILE *fp, gfx_node_t *node) +{ + double x = node->x - LINEOFFSET; + double y = node->y - LINEOFFSET; + if (node->angle != 0) { + svg_start_tag(fp, "g"); + fputs(" transform=\"translate(", fp); + svg_write_number(fp, x); + fputs(",", fp); + svg_write_number(fp, y); + fputs(") rotate(", fp); + svg_write_number(fp, node->angle); + fputs(")\"", fp); + x = y = 0; + svg_close_tag(fp); + } + switch (node->valign) { + case GFX_V_TOP: y += node->size; break; + case GFX_V_CENTER: y += node->size / 2; break; + case GFX_V_BOTTOM: break; + case GFX_V_NULL: break; + } + svg_start_tag(fp, "text"); + fputs(" x=\"", fp); + svg_write_number(fp, x); + fputs("\" y=\"", fp); + svg_write_number(fp, y); + if (strcmp(node->filename, svg_default_font)) + fprintf(fp, " font-family=\"%s\"", node->filename); + fputs("\" font-size=\"", fp); + svg_write_number(fp, node->size); + fputs("\"", fp); + if (!svg_color_is_black(node->color)) + svg_write_color(fp, node->color, "fill"); + switch (node->halign) { + case GFX_H_RIGHT: fputs(" text-anchor=\"end\"", fp); break; + case GFX_H_CENTER: fputs(" text-anchor=\"middle\"", fp); break; + case GFX_H_LEFT: break; + case GFX_H_NULL: break; + } + svg_close_tag_single_line(fp); + /* support for node->tabwidth missing */ + svg_write_text(fp, node->text); + svg_end_tag(fp, "text"); + if (node->angle != 0) + svg_end_tag(fp, "g"); +} + +int gfx_render_svg (gfx_canvas_t *canvas, + art_u32 width, art_u32 height, + gfx_color_t background, FILE *fp){ + gfx_node_t *node = canvas->firstnode; + fputs( +"\n" +"\n" +"\n", fp); + svg_start_tag(fp, "svg"); + fputs(" width=\"", fp); + svg_write_number(fp, width * canvas->zoom); + fputs("\" height=\"", fp); + svg_write_number(fp, height * canvas->zoom); + fputs("\" x=\"0\" y=\"0\" viewBox=\"", fp); + svg_write_number(fp, -LINEOFFSET); + fputs(" ", fp); + svg_write_number(fp, -LINEOFFSET); + fputs(" ", fp); + svg_write_number(fp, width - LINEOFFSET); + fputs(" ", fp); + svg_write_number(fp, height - LINEOFFSET); + fputs("\" preserveAspectRatio=\"xMidYMid\"", fp); + fprintf(fp, " font-family=\"%s\"", svg_default_font); /* default font */ + fputs(" stroke-linecap=\"round\" stroke-linejoin=\"round\"", fp); + svg_close_tag(fp); + svg_start_tag(fp, "rect"); + fprintf(fp, " x=\"0\" y=\"0\" width=\"%d\" height=\"%d\"", width, height); + svg_write_color(fp, background, "fill"); + svg_close_tag_empty_node(fp); + while (node) { + switch (node->type) { + case GFX_LINE: + svg_multi_path(fp, &node); + break; + case GFX_AREA: + svg_area(fp, node); + break; + case GFX_TEXT: + svg_text(fp, node); + } + node = node->next; + } + svg_end_tag(fp, "svg"); + return 0; +}