X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.h;h=0593d4a931207c1351c3d235c121d160c99a298c;hb=ed4f4a66c369a802b5abe831d2fd2bed64570b9c;hp=3f9a3f19fba4740645e9cec1cdb78152fa067dac;hpb=0c06404fd40724f9e1318715c1e737302658befb;p=rrdtool.git diff --git a/src/rrd_graph.h b/src/rrd_graph.h index 3f9a3f1..0593d4a 100644 --- a/src/rrd_graph.h +++ b/src/rrd_graph.h @@ -11,6 +11,7 @@ #include #include + #include "rrd_tool.h" #include "rrd_rpncalc.h" @@ -65,6 +66,7 @@ enum vdef_op_en { , VDEF_LSLSLOPE /* least squares line slope */ , VDEF_LSLINT /* least squares line y_intercept */ , VDEF_LSLCORREL /* least squares line correlation coefficient */ + , VDEF_PERCENTNAN /* Nth percentile ignoring NAN*/ }; enum text_prop_en { TEXT_PROP_DEFAULT = 0, /* default settings */ @@ -76,6 +78,8 @@ enum text_prop_en { TEXT_PROP_LAST }; +enum legend_pos{ NORTH = 0, WEST, SOUTH, EAST }; +enum legend_direction { TOP_DOWN = 0, BOTTOM_UP }; enum gfx_if_en { IF_PNG = 0, IF_SVG, IF_EPS, IF_PDF }; enum gfx_en { GFX_LINE = 0, GFX_AREA, GFX_TEXT }; @@ -227,6 +231,8 @@ typedef struct image_desc_t { reasonable probablility that the existing one is out of date */ int slopemode; /* connect the dots of the curve directly, not using a stair */ + enum legend_pos legendposition; /* the position of the legend: north, west, south or east */ + enum legend_direction legenddirection; /* The direction of the legend topdown or bottomup */ int logarithmic; /* scale the yaxis logarithmic */ double force_scale_min; /* Force a scale--min */ double force_scale_max; /* Force a scale--max */ @@ -234,7 +240,12 @@ typedef struct image_desc_t { /* status information */ int with_markup; long xorigin, yorigin; /* where is (0,0) of the graph */ + long xOriginTitle, yOriginTitle; /* where is the origin of the title */ + long xOriginLegendY, yOriginLegendY; /* where is the origin of the y legend */ + long xOriginLegendY2, yOriginLegendY2; /* where is the origin of the second y legend */ + long xOriginLegend, yOriginLegend; /* where is the origin of the legend */ long ximg, yimg; /* total size of the image */ + long legendwidth, legendheight; /* the calculated height and width of the legend */ size_t rendered_image_size; double zoom; double magfact; /* numerical magnitude */ @@ -325,7 +336,7 @@ int print_calc( image_desc_t *); int leg_place( image_desc_t *, - int *); + int); int calc_horizontal_grid( image_desc_t *); int draw_horizontal_grid(