X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_gfx.c;h=778ba0800d6298d440f905294b14420b99d2afd8;hp=1a09a4ef915c1a6c2de6a087265a0f83655be10b;hb=f9e5bd6a9d41c4607291cbbd88280129184ab325;hpb=5ef54f1d335624d9a30306a3105b84fe21255fa1 diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c index 1a09a4e..778ba08 100644 --- a/src/rrd_gfx.c +++ b/src/rrd_gfx.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002 + * RRDtool 1.2rc6 Copyright by Tobi Oetiker, 1997-2005 **************************************************************************** * rrd_gfx.c graphics wrapper for rrdtool **************************************************************************/ @@ -46,7 +46,7 @@ static void compute_string_bbox(gfx_string string); /* create a freetype glyph string */ gfx_string gfx_string_create ( FT_Face face, - const char *text, int rotation); + const char *text, int rotation, double tabwidth); /* create a freetype glyph string */ static void gfx_string_destroy ( gfx_string string ); @@ -62,7 +62,6 @@ gfx_node_t *gfx_new_node( gfx_canvas_t *canvas,enum gfx_en type){ 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; @@ -114,7 +113,7 @@ gfx_node_t *gfx_new_dashed_line(gfx_canvas_t *canvas, if (vec == NULL) return NULL; vec[0].code = ART_MOVETO_OPEN; vec[0].x=X0+LINEOFFSET; vec[0].y=Y0+LINEOFFSET; vec[1].code = ART_LINETO; vec[1].x=X1+LINEOFFSET; vec[1].y=Y1+LINEOFFSET; - vec[2].code = ART_END; + vec[2].code = ART_END; vec[2].x=0;vec[2].y=0; node->points = 3; node->points_max = 3; @@ -143,7 +142,7 @@ gfx_node_t *gfx_new_area (gfx_canvas_t *canvas, vec[1].code = ART_LINETO; vec[1].x=X1; vec[1].y=Y1; vec[2].code = ART_LINETO; vec[2].x=X2; vec[2].y=Y2; vec[3].code = ART_LINETO; vec[3].x=X0; vec[3].y=Y0; - vec[4].code = ART_END; + vec[4].code = ART_END; vec[4].x=0; vec[4].y=0; node->points = 5; node->points_max = 5; @@ -211,10 +210,6 @@ gfx_node_t *gfx_new_text (gfx_canvas_t *canvas, enum gfx_v_align_en v_align, char* text){ gfx_node_t *node = gfx_new_node(canvas,GFX_TEXT); -/* if (angle != 0.0){*/ - /* currently we only support 0 and 270 */ -/* angle = 270.0; - }*/ node->text = strdup(text); node->size = size; @@ -280,7 +275,7 @@ double gfx_get_text_width ( gfx_canvas_t *canvas, double tabwidth, char* text, int rotation){ switch (canvas->imgformat) { case IF_PNG: - return gfx_get_text_width_libart (canvas, start, font, size, tabwidth, text, rotation); + return gfx_get_text_width_libart (start, font, size, tabwidth, text, rotation); case IF_SVG: /* fall through */ case IF_EPS: case IF_PDF: @@ -290,7 +285,7 @@ double gfx_get_text_width ( gfx_canvas_t *canvas, } } -double gfx_get_text_width_libart ( gfx_canvas_t *canvas, +double gfx_get_text_width_libart ( double start, char* font, double size, double tabwidth, char* text, int rotation){ @@ -306,15 +301,14 @@ double gfx_get_text_width_libart ( gfx_canvas_t *canvas, error = FT_Set_Char_Size(face, size*64,size*64, 100,100); if ( error ) return -1; - string = gfx_string_create( face, text, rotation); + string = gfx_string_create( face, text, rotation,tabwidth); text_width = string->width; gfx_string_destroy(string); FT_Done_FreeType(library); return text_width/64; } -static void gfx_libart_close_path(gfx_canvas_t *canvas, - gfx_node_t *node, ArtVpath **vec) +static void gfx_libart_close_path(gfx_node_t *node, ArtVpath **vec) { /* libart must have end==start for closed paths, even if using ART_MOVETO and not ART_MOVETO_OPEN @@ -326,15 +320,6 @@ static void gfx_libart_close_path(gfx_canvas_t *canvas, art_vpath_add_point (vec, &points, &points_max, ART_END, 0, 0); } -static void gfx_round_scaled_coordinates(gfx_canvas_t *canvas, - gfx_node_t *node, ArtVpath *vec) -{ - while (vec->code != ART_END) { - vec->x = floor(vec->x - LINEOFFSET + 0.5) + LINEOFFSET; - vec->y = floor(vec->y - LINEOFFSET + 0.5) + LINEOFFSET; - vec++; - } -} /* find bbox of a string */ static void compute_string_bbox(gfx_string string) { @@ -374,7 +359,7 @@ static void compute_string_bbox(gfx_string string) { /* create a free type glyph string */ gfx_string gfx_string_create(FT_Face face,const char *text, - int rotation) + int rotation, double tabwidth) { FT_GlyphSlot slot = face->glyph; /* a small shortcut */ @@ -386,6 +371,7 @@ gfx_string gfx_string_create(FT_Face face,const char *text, gfx_char glyph; /* current glyph in table */ unsigned int n; int error; + int gottab = 0; ft_pen.x = 0; /* start at (0,0) !! */ ft_pen.y = 0; @@ -406,14 +392,29 @@ gfx_string gfx_string_create(FT_Face face,const char *text, glyph = string->glyphs; for (n=0; ncount; n++, glyph++) { FT_Vector vec; - + /* handle the tabs ... + have a witespace glyph inserted, but set its width such that the distance + of the new right edge is x times tabwidth from 0,0 where x is an integer. */ + char letter = text[n]; + gottab = 0; + if (letter == '\\' && n+1 < string->count && text[n+1] == 't'){ + /* we have a tab here so skip the backslash and + set t to ' ' so that we get a white space */ + gottab = 1; + n++; + letter = ' '; + } + if (letter == '\t'){ + letter = ' '; + gottab = 1 ; + } /* initialize each struct gfx_char_s */ glyph->index = 0; glyph->pos.x = 0; glyph->pos.y = 0; glyph->image = NULL; - glyph->index = FT_Get_Char_Index( face, text[n] ); + glyph->index = FT_Get_Char_Index( face, letter ); /* compute glyph origin */ if ( use_kerning && previous && glyph->index ) { @@ -424,24 +425,30 @@ gfx_string gfx_string_create(FT_Face face,const char *text, ft_pen.y += kerning.y; } - /* store current pen position */ - glyph->pos.x = ft_pen.x; - glyph->pos.y = ft_pen.y; - /* load the glyph image (in its native format) */ /* for now, we take a monochrome glyph bitmap */ error = FT_Load_Glyph (face, glyph->index, FT_LOAD_DEFAULT); if (error) { - fprintf (stderr, "couldn't load glyph: %c\n", text[n]); + fprintf (stderr, "couldn't load glyph: %c\n", letter); continue; } error = FT_Get_Glyph (slot, &glyph->image); if (error) { - fprintf (stderr, "couldn't get glyph from slot: %c\n", text[n]); + fprintf (stderr, "couldn't get glyph from slot: %c\n", letter); continue; } + /* if we are in tabbing mode, we replace the tab with a space and shift the position + of the space so that its left edge is where the tab was supposed to land us */ + if (gottab){ + /* we are in gridfitting mode so the calculations happen in 1/64 pixles */ + ft_pen.x = tabwidth*64.0 * (float)(1 + (long)(ft_pen.x / (tabwidth * 64.0))) - slot->advance.x; + } + /* store current pen position */ + glyph->pos.x = ft_pen.x; + glyph->pos.y = ft_pen.y; + - ft_pen.x += slot->advance.x; + ft_pen.x += slot->advance.x; ft_pen.y += slot->advance.y; /* rotate glyph */ @@ -454,7 +461,7 @@ gfx_string gfx_string_create(FT_Face face,const char *text, } /* convert to a bitmap - destroy native image */ - error = FT_Glyph_To_Bitmap (&glyph->image, ft_render_mode_normal, 0, 1); + error = FT_Glyph_To_Bitmap (&glyph->image, FT_RENDER_MODE_NORMAL, 0, 1); if (error) { fprintf (stderr, "couldn't convert glyph to bitmap\n"); continue; @@ -466,9 +473,13 @@ gfx_string gfx_string_create(FT_Face face,const char *text, } /* printf ("number of glyphs = %d\n", string->num_glyphs);*/ compute_string_bbox( string ); - string->width = string->bbox.xMax - string->bbox.xMin; + /* the last character was a tab */ + if (gottab) { + string->width = ft_pen.x; + } else { + string->width = string->bbox.xMax - string->bbox.xMin; + } string->height = string->bbox.yMax - string->bbox.yMin; - return string; } @@ -484,44 +495,60 @@ int gfx_render_png (gfx_canvas_t *canvas, FT_Library library; 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 * canvas->zoom; unsigned long pys_height = height * canvas->zoom; - const int bytes_per_pixel = 3; + const int bytes_per_pixel = 4; unsigned long rowstride = pys_width*bytes_per_pixel; /* bytes per pixel */ art_u8 *buffer = art_new (art_u8, rowstride*pys_height); - art_rgb_run_alpha (buffer, red, green, blue, alpha, pys_width*pys_height); + /* fill that buffer with out background color */ + gfx_color_t *buffp; + long i; + for (i=0,buffp=(gfx_color_t *)buffer; + itype) { case GFX_LINE: case GFX_AREA: { - ArtVpath *vec; + ArtVpath *vec,*pvec; double dst[6]; - ArtSVP *svp; + ArtSVP *svp,*svpt; art_affine_scale(dst,canvas->zoom,canvas->zoom); vec = art_vpath_affine_transform(node->path,dst); if (node->closed_path) - gfx_libart_close_path(canvas, node, &vec); - gfx_round_scaled_coordinates(canvas, node, vec); + gfx_libart_close_path(node, &vec); + /* gfx_round_scaled_coordinates(vec); */ + pvec = art_vpath_perturb(vec); + art_free(vec); if(node->type == GFX_LINE){ - svp = art_svp_vpath_stroke ( vec, ART_PATH_STROKE_JOIN_ROUND, + svp = art_svp_vpath_stroke ( pvec, ART_PATH_STROKE_JOIN_ROUND, ART_PATH_STROKE_CAP_ROUND, - node->size*canvas->zoom,1,1); + node->size*canvas->zoom,4,0.25); } else { - svp = art_svp_from_vpath ( vec ); + svp = art_svp_from_vpath ( pvec ); + svpt = art_svp_uncross( svp ); + art_svp_free(svp); + svp = art_svp_rewind_uncrossed(svpt,ART_WIND_RULE_NONZERO); + art_svp_free(svpt); } - art_free(vec); - art_rgb_svp_alpha (svp ,0,0, pys_width, pys_height, - node->color, buffer, rowstride, NULL); - art_free(svp); + art_free(pvec); + /* this is from gnome since libart does not have this yet */ + gnome_print_art_rgba_svp_alpha (svp ,0,0, pys_width, pys_height, + node->color, buffer, rowstride, NULL); + art_svp_free(svp); break; } case GFX_TEXT: { unsigned int n; int error; - art_u8 fcolor[3],falpha; + art_u8 fcolor[4],falpha; FT_Face face; gfx_char glyph; gfx_string string; @@ -529,7 +556,7 @@ int gfx_render_png (gfx_canvas_t *canvas, float pen_x = 0.0 , pen_y = 0.0; /* double x,y; */ - long ix,iy,iz; + long ix,iy; fcolor[0] = node->color >> 24; fcolor[1] = (node->color >> 16) & 0xff; @@ -539,8 +566,10 @@ int gfx_render_png (gfx_canvas_t *canvas, (char *)node->filename, 0, &face ); - if ( error ) break; - + if ( error ) { + rrd_set_error("failed to load %s",node->filename); + break; + } error = FT_Set_Char_Size(face, /* handle to face object */ (long)(node->size*64), (long)(node->size*64), @@ -550,7 +579,7 @@ int gfx_render_png (gfx_canvas_t *canvas, pen_x = node->x * canvas->zoom; pen_y = node->y * canvas->zoom; - string = gfx_string_create (face, node->text, node->angle); + string = gfx_string_create (face, node->text, node->angle, node->tabwidth); switch(node->halign){ case GFX_H_RIGHT: vec.x = -string->bbox.xMax; break; @@ -581,7 +610,7 @@ int gfx_render_png (gfx_canvas_t *canvas, int gr; FT_Glyph image; FT_BitmapGlyph bit; - + /* long buf_x,comp_n; */ /* make copy to transform */ if (! glyph->image) { fprintf (stderr, "no image\n"); @@ -598,17 +627,52 @@ int gfx_render_png (gfx_canvas_t *canvas, FT_Vector_Transform (&vec, &string->transform); bit = (FT_BitmapGlyph) image; - gr = bit->bitmap.num_grays -1; - for (iy=0; iy < bit->bitmap.rows; iy++){ +/* + buf_x = (pen_x + 0.5) + (double)bit->left; + comp_n = buf_x + bit->bitmap.width > pys_width ? pys_width - buf_x : bit->bitmap.width; + if (buf_x < 0 || buf_x >= (long)pys_width) continue; + buf_x *= bytes_per_pixel ; + for (iy=0; iy < bit->bitmap.rows; iy++){ + long buf_y = iy+(pen_y+0.5)-(double)bit->top; + if (buf_y < 0 || buf_y >= (long)pys_height) continue; + buf_y *= rowstride; + for (ix=0;ix < bit->bitmap.width;ix++){ + *(letter + (ix*bytes_per_pixel+3)) = *(bit->bitmap.buffer + iy * bit->bitmap.width + ix); + } + art_rgba_rgba_composite(buffer + buf_y + buf_x ,letter,comp_n); + } + art_free(letter); +*/ + + for (iy=0; iy < bit->bitmap.rows; iy++){ + long buf_y = iy+(pen_y+0.5)-bit->top; + if (buf_y < 0 || buf_y >= (long)pys_height) continue; + buf_y *= rowstride; + for (ix=0;ix < bit->bitmap.width;ix++){ + long buf_x = ix + (pen_x + 0.5) + (double)bit->left ; + art_u8 font_alpha; + + if (buf_x < 0 || buf_x >= (long)pys_width) continue; + buf_x *= bytes_per_pixel ; + font_alpha = *(bit->bitmap.buffer + iy * bit->bitmap.width + ix); + if (font_alpha > 0){ + fcolor[3] = (art_u8)((double)font_alpha / gr * falpha); + art_rgba_rgba_composite(buffer + buf_y + buf_x ,fcolor,1); + } + } + } + +/* + for (iy=0; iy < bit->bitmap.rows; iy++){ long buf_y = iy+(pen_y+0.5)-bit->top; - if (buf_y < 0 || buf_y >= pys_height) continue; + if (buf_y < 0 || buf_y >= (long)pys_height) continue; buf_y *= rowstride; for (ix=0;ix < bit->bitmap.width;ix++){ long buf_x = ix + (pen_x + 0.5) + (double)bit->left ; art_u8 font_alpha; - if (buf_x < 0 || buf_x >= pys_width) continue; + if (buf_x < 0 || buf_x >= (long)pys_width) continue; buf_x *= bytes_per_pixel ; font_alpha = *(bit->bitmap.buffer + iy * bit->bitmap.width + ix); font_alpha = (art_u8)((double)font_alpha / gr * falpha); @@ -619,6 +683,7 @@ int gfx_render_png (gfx_canvas_t *canvas, } } } +*/ FT_Done_Glyph (image); } gfx_string_destroy(string); @@ -640,12 +705,12 @@ gfx_destroy (gfx_canvas_t *canvas){ while(node){ next = node->next; art_free(node->path); - art_free(node->svp); free(node->text); free(node->filename); art_free(node); node = next; } + art_free(canvas); return 0; } @@ -672,6 +737,7 @@ static int gfx_save_png (art_u8 *buffer, FILE *fp, long width, long height, lon if (info_ptr == NULL) { + png_free(png_ptr,row_pointers); png_destroy_write_struct(&png_ptr, (png_infopp)NULL); return (1); } @@ -685,7 +751,7 @@ static int gfx_save_png (art_u8 *buffer, FILE *fp, long width, long height, lon png_init_io(png_ptr, fp); png_set_IHDR (png_ptr, info_ptr,width, height, - 8, PNG_COLOR_TYPE_RGB, + 8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); @@ -695,14 +761,23 @@ static int gfx_save_png (art_u8 *buffer, FILE *fp, long width, long height, lon text[0].compression = PNG_TEXT_COMPRESSION_NONE; png_set_text (png_ptr, info_ptr, text, 1); + /* lets make this fast */ + png_set_filter(png_ptr,0,PNG_FILTER_NONE); + png_set_compression_level(png_ptr,1); + png_set_compression_strategy(png_ptr,Z_HUFFMAN_ONLY); + /* + png_set_filter(png_ptr,PNG_FILTER_TYPE_BASE,PNG_FILTER_SUB); + png_set_compression_strategy(png_ptr,Z_HUFFMAN_ONLY); + png_set_compression_level(png_ptr,Z_BEST_SPEED); */ + /* Write header data */ png_write_info (png_ptr, info_ptr); - for (i = 0; i < height; i++) row_pointers[i] = (png_bytep) (buffer + i*rowstride); - + png_write_image(png_ptr, row_pointers); png_write_end(png_ptr, info_ptr); + png_free(png_ptr,row_pointers); png_destroy_write_struct(&png_ptr, &info_ptr); return 1; } @@ -1304,9 +1379,9 @@ static int eps_prologue(eps_state *state) gfx_node_t *node; fputs( "%!PS-Adobe-3.0 EPSF-3.0\n" - "%%Creator: RRDtool 1.1.x, Tobias Oetiker, http://tobi.oetiker.ch\n" + "%%Creator: RRDtool 1.2rc6 Tobias Oetiker, http://tobi.oetiker.ch\n" /* can't like weird chars here */ - "%%Title: (RRDTool output)\n" + "%%Title: (RRDtool output)\n" "%%DocumentData: Clean7Bit\n" "", state->fp); fprintf(state->fp, "%%%%BoundingBox: 0 0 %d %d\n",