/****************************************************************************
- * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd_gfx.c graphics wrapper for rrdtool
**************************************************************************/
#endif /* _MSC_VER */
#include "rrd_tool.h"
-#include "rrd_gfx.h"
+#include "rrd_graph.h"
/* create a new line */
void gfx_line(
- cairo_t * cr,
+ image_desc_t *im,
double X0,
double Y0,
double X1,
double width,
gfx_color_t color)
{
- gfx_dashed_line(cr, X0, Y0, X1, Y1, width, color, 0, 0);
+ gfx_dashed_line(im, X0, Y0, X1, Y1, width, color, 0, 0);
}
void gfx_dashed_line(
- cairo_t * cr,
+ image_desc_t *im,
double X0,
double Y0,
double X1,
double dash_on,
double dash_off)
{
- double dashes[] = { dash_on, dash_off };
+ cairo_t *cr = im->cr;
+ double dashes[2];
double x = 0;
double y = 0;
+ dashes[0] = dash_on;
+ dashes[1] = dash_off;
+
cairo_save(cr);
cairo_new_path(cr);
cairo_set_line_width(cr, width);
- gfx_line_fit(cr, &x, &y);
- gfx_line_fit(cr, &X0, &Y0);
+ gfx_line_fit(im, &x, &y);
+ gfx_line_fit(im, &X0, &Y0);
cairo_move_to(cr, X0, Y0);
- gfx_line_fit(cr, &X1, &Y1);
+ gfx_line_fit(im, &X1, &Y1);
cairo_line_to(cr, X1, Y1);
if (dash_on > 0 || dash_off > 0)
cairo_set_dash(cr, dashes, 2, x);
/* create a new area */
void gfx_new_area(
- cairo_t * cr,
+ image_desc_t *im,
double X0,
double Y0,
double X1,
double Y2,
gfx_color_t color)
{
+ cairo_t *cr = im->cr;
+
cairo_new_path(cr);
- gfx_area_fit(cr, &X0, &Y0);
+ gfx_area_fit(im, &X0, &Y0);
cairo_move_to(cr, X0, Y0);
- gfx_area_fit(cr, &X1, &Y1);
+ gfx_area_fit(im, &X1, &Y1);
cairo_line_to(cr, X1, Y1);
- gfx_area_fit(cr, &X2, &Y2);
+ gfx_area_fit(im, &X2, &Y2);
cairo_line_to(cr, X2, Y2);
cairo_set_source_rgba(cr, color.red, color.green, color.blue,
color.alpha);
/* add a point to a line or to an area */
void gfx_add_point(
- cairo_t * cr,
+ image_desc_t *im,
double x,
double y)
{
- gfx_area_fit(cr, &x, &y);
+ cairo_t *cr = im->cr;
+
+ gfx_area_fit(im, &x, &y);
cairo_line_to(cr, x, y);
}
void gfx_close_path(
- cairo_t * cr)
+ image_desc_t *im)
{
+ cairo_t *cr = im->cr;
+
cairo_close_path(cr);
cairo_fill(cr);
}
/* create a text node */
static PangoLayout *gfx_prep_text(
- cairo_t * cr,
+ image_desc_t *im,
double x,
gfx_color_t color,
- char *font,
- double size,
+ PangoFontDescription *font_desc,
double tabwidth,
const char *text)
{
- PangoLayout *layout;
- PangoFontDescription *font_desc;
+ PangoLayout *layout = im->layout;
+ const PangoFontDescription *pfd;
+ cairo_t *cr = im->cr;
+
+ static double last_tabwidth = -1;
+
+
/* for performance reasons we might
want todo that only once ... tabs will always
long i;
long tab_count = strlen(text);
long tab_shift = fmod(x, tabwidth);
+ int border = im->text_prop[TEXT_PROP_LEGEND].size * 2.0;
+
+ gchar *utf8_text;
- PangoTabArray *tab_array;
-
- tab_array = pango_tab_array_new(tab_count, (gboolean) (1));
- for (i = 1; i <= tab_count; i++) {
- pango_tab_array_set_tab(tab_array,
- i, PANGO_TAB_LEFT, tabwidth * i - tab_shift);
+ if (last_tabwidth < 0 || last_tabwidth != tabwidth){
+ PangoTabArray *tab_array;
+ // fprintf(stderr,"t");
+ last_tabwidth = tabwidth;
+ tab_array = pango_tab_array_new(tab_count, (gboolean) (1));
+ for (i = 1; i <= tab_count; i++) {
+ pango_tab_array_set_tab(tab_array,
+ i, PANGO_TAB_LEFT,
+ tabwidth * i - tab_shift + border);
+ }
+ pango_layout_set_tabs(layout, tab_array);
+ pango_tab_array_free(tab_array);
}
- cairo_new_path(cr);
- cairo_set_source_rgba(cr, color.red, color.green, color.blue,
+ pfd = pango_layout_get_font_description(layout);
+
+ if (!pfd || !pango_font_description_equal (pfd,font_desc)){
+ pango_layout_set_font_description(layout, font_desc);
+ }
+// fprintf(stderr,"%s\n",pango_font_description_to_string(pango_layout_get_font_description(layout)));
+
+ cairo_new_path(cr);
+ cairo_set_source_rgba(cr, color.red, color.green, color.blue,
color.alpha);
- layout = pango_cairo_create_layout(cr);
+/* layout = pango_cairo_create_layout(cr); */
+
+// pango_cairo_context_set_font_options(pango_context, im->font_options);
+// pango_cairo_context_set_resolution(pango_context, 100);
+
+/* pango_cairo_update_context(cr, pango_context); */
+
+
+ /* pango expects the string to be utf-8 encoded */
+ utf8_text = g_locale_to_utf8((const gchar *) text, -1, NULL, NULL, NULL);
- pango_layout_set_tabs(layout, tab_array);
- font_desc = pango_font_description_from_string(font);
- pango_font_description_set_size(font_desc, size * PANGO_SCALE);
- pango_layout_set_font_description(layout, font_desc);
- pango_layout_set_markup(layout, text, -1);
+ /* In case of an error, i.e. utf8_text == NULL (locale settings messed
+ * up?), we fall back to a possible "invalid UTF-8 string" warning instead
+ * of provoking a failed assertion in libpango. */
+ if (im->with_markup)
+ pango_layout_set_markup(layout, utf8_text ? utf8_text : text, -1);
+ else
+ pango_layout_set_text(layout, utf8_text ? utf8_text : text, -1);
+
+ g_free(utf8_text);
return layout;
}
/* Size Text Node */
double gfx_get_text_width(
- cairo_t * cr,
+ image_desc_t *im,
double start,
- char *font,
- double size,
+ PangoFontDescription *font_desc,
double tabwidth,
char *text)
{
PangoLayout *layout;
PangoRectangle log_rect;
gfx_color_t color = { 0, 0, 0, 0 };
- char *tab;
-
- /* turn \\t into tab */
- while (tab = strstr(text, "\\t")) {
- memmove(tab + 1, tab + 2, strlen(tab + 2));
- tab[0] = (char) 9;
- }
- layout = gfx_prep_text(cr, start, color, font, size, tabwidth, text);
+ layout = gfx_prep_text(im, start, color, font_desc, tabwidth, text);
pango_layout_get_pixel_extents(layout, NULL, &log_rect);
- pango_tab_array_free(pango_layout_get_tabs(layout));
- g_object_unref(layout);
+/* g_object_unref(layout); */
return log_rect.width;
}
void gfx_text(
- cairo_t * cr,
+ image_desc_t *im,
double x,
double y,
gfx_color_t color,
- char *font,
- double size,
+ PangoFontDescription *font_desc,
double tabwidth,
double angle,
enum gfx_h_align_en h_align,
{
PangoLayout *layout;
PangoRectangle log_rect;
- PangoRectangle ink_rect;
+ cairo_t *cr = im->cr;
double sx = 0;
double sy = 0;
cairo_translate(cr, x, y);
/* gfx_line(cr,-2,0,2,0,1,color);
gfx_line(cr,0,-2,0,2,1,color); */
- layout = gfx_prep_text(cr, x, color, font, size, tabwidth, text);
- pango_layout_get_pixel_extents(layout, &ink_rect, &log_rect);
+ layout = gfx_prep_text(im, x, color, font_desc, tabwidth, text);
+ pango_layout_get_pixel_extents(layout, NULL, &log_rect);
cairo_rotate(cr, -angle * G_PI / 180.0);
sx = log_rect.x;
- sy = ink_rect.y;
switch (h_align) {
case GFX_H_RIGHT:
sx -= log_rect.width;
case GFX_H_NULL:
break;
}
- sy += log_rect.y;
+ sy = log_rect.y;
switch (v_align) {
case GFX_V_TOP:
break;
pango_cairo_update_layout(cr, layout);
cairo_move_to(cr, sx, sy);
pango_cairo_show_layout(cr, layout);
- pango_tab_array_free(pango_layout_get_tabs(layout));
- g_object_unref(layout);
+/* g_object_unref(layout); */
cairo_restore(cr);
}
/* gridfit_lines */
void gfx_line_fit(
- cairo_t * cr,
+ image_desc_t *im,
double *x,
double *y)
{
+ cairo_t *cr = im->cr;
double line_width;
double line_height;
+ if (!im->gridfit)
+ return;
cairo_user_to_device(cr, x, y);
line_width = cairo_get_line_width(cr);
line_height = line_width;
cairo_user_to_device_distance(cr, &line_width, &line_height);
line_width = line_width / 2.0 - (long) (line_width / 2.0);
line_height = line_height / 2.0 - (long) (line_height / 2.0);
- *x = (double) ((long) (*x + 0.5)) + line_width;
+ *x = (double) ((long) (*x + 0.5)) - line_width;
*y = (double) ((long) (*y + 0.5)) + line_height;
cairo_device_to_user(cr, x, y);
}
/* gridfit_areas */
void gfx_area_fit(
- cairo_t * cr,
+ image_desc_t *im,
double *x,
double *y)
{
+ cairo_t *cr = im->cr;
+
+ if (!im->gridfit)
+ return;
cairo_user_to_device(cr, x, y);
*x = (double) ((long) (*x + 0.5));
*y = (double) ((long) (*y + 0.5));
projects / rrdtool.git / blobdiff