![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7ad023c)
raw | patch | inline | side by side (parent: 7ad023c)
| author | oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa> | |
| Thu, 20 Aug 2009 22:02:22 +0000 (22:02 +0000) | ||
| committer | oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa> | |
| Thu, 20 Aug 2009 22:02:22 +0000 (22:02 +0000) |
-- Bernhard Reutner-Fischer
git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1899 a5681a0c-68f1-0310-ab6d-d61299d08faa
git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1899 a5681a0c-68f1-0310-ab6d-d61299d08faa
| program/src/rrd_graph.c | patch | blob | history | |
| program/src/rrd_tool.c | patch | blob | history |
index 002137fa00334af0a90980bb1d3fb530509e94f5..ff1859d6622cedfb85b3fc0d13c2dc9811604134 100644 (file)
--- a/program/src/rrd_graph.c
+++ b/program/src/rrd_graph.c
, /* unit */
{8.0, RRD_DEFAULT_FONT,NULL} /* legend */
,
- {5.5, RRD_DEFAULT_FONT,NULL} /* watermark */
+ {5.5, RRD_DEFAULT_FONT,NULL} /* watermark */
};
xlab_t xlab[] = {
if (status)
fprintf(stderr, "OOPS: Cairo has issues it can't even die: %s\n",
cairo_status_to_string(status));
-
+
return 0;
}
ytr(im, DNAN); /* reset precalc */
log10_range = log10(im->maxval) - log10(im->minval);
}
- /* make sure first y=10^x gridline is located on
- integer pixel position by moving scale slightly
+ /* make sure first y=10^x gridline is located on
+ integer pixel position by moving scale slightly
downwards (sub-pixel movement) */
ypix = ytr(im, ya) + im->ysize; /* add im->ysize so it always is positive */
ypixfrac = ypix - floor(ypix);
}
-/* get the data required for the graphs from the
+/* get the data required for the graphs from the
relevant rrds ... */
int data_fetch(
/* evaluate the expressions in the CDEF functions */
/*************************************************************
- * CDEF stuff
+ * CDEF stuff
*************************************************************/
long find_var_wrapper(
{
long i, ii;
double pixstep = (double) (im->end - im->start)
- / (double) im->xsize; /* how much time
+ / (double) im->xsize; /* how much time
passes in one pixel */
double paintval;
double minval = DNAN, maxval = DNAN;
minval = 0.0; /* catching this right away below */
maxval = 5.1;
}
- /* in logarithm mode, where minval is smaller or equal
+ /* in logarithm mode, where minval is smaller or equal
to 0 make the beast just way smaller than maxval */
if (minval <= 0) {
minval = maxval / 10e8;
double MaxY;
double second_axis_magfact = 0;
char *second_axis_symb = "";
-
+
scaledstep =
im->ygrid_scale.gridstep /
(double) im->magfact * (double) im->viewfactor;
auto_scale(im,&dummy,&second_axis_symb,&second_axis_magfact);
}
sval /= second_axis_magfact;
-
- if(MaxY < 10) {
+
+ if(MaxY < 10) {
sprintf(graph_label_right,"%5.1f %s",sval,second_axis_symb);
} else {
sprintf(graph_label_right,"%5.0f %s",sval,second_axis_symb);
}
else {
sprintf(graph_label_right,im->second_axis_format,sval);
- }
+ }
gfx_text ( im,
X1+7, Y0,
im->graph_col[GRC_FONT],
im->tabwidth,0.0, GFX_H_LEFT, GFX_V_CENTER,
graph_label_right );
}
-
+
gfx_text(im,
X0 -
im->
else
symbol = '?';
sprintf(graph_label, "%3.0f %c", pvalue, symbol);
- } else {
+ } else {
sprintf(graph_label, "%3.0e", value);
}
if (im->second_axis_scale != 0){
auto_scale(im,&sval,&symb,&mfac);
sprintf(graph_label_right,"%4.0f %s", sval,symb);
}
- else {
+ else {
sprintf(graph_label_right,"%3.0e", sval);
}
}
else {
sprintf(graph_label_right,im->second_axis_format,sval);
- }
-
+ }
+
gfx_text ( im,
X1+7, Y0,
im->graph_col[GRC_FONT],
im->tabwidth,0.0, GFX_H_LEFT, GFX_V_CENTER,
graph_label_right );
}
-
+
gfx_text(im,
X0 -
im->
gfx_line ( im, im->xorigin+im->xsize,im->yorigin+4,
im->xorigin+im->xsize,im->yorigin-im->ysize-4,
MGRIDWIDTH, im->graph_col[GRC_AXIS]);
- gfx_new_area ( im,
+ gfx_new_area ( im,
im->xorigin+im->xsize-2, im->yorigin-im->ysize-2,
im->xorigin+im->xsize+3, im->yorigin-im->ysize-2,
im->xorigin+im->xsize, im->yorigin-im->ysize-7, /* LINEOFFSET */
}
if (im->second_axis_legend[0] != '\0'){
gfx_text( im,
- im->xOriginLegendY2+10,
+ im->xOriginLegendY2+10,
im->yOriginLegendY2,
im->graph_col[GRC_FONT],
im->text_prop[TEXT_PROP_UNIT].font_desc,
- im->tabwidth,
+ im->tabwidth,
RRDGRAPH_YLEGEND_ANGLE,
GFX_H_CENTER, GFX_V_CENTER,
im->second_axis_legend);
- }
-
+ }
+
/* graph title */
gfx_text(im,
im->xOriginTitle, im->yOriginTitle+6,
text_prop[TEXT_PROP_WATERMARK].
font_desc, im->tabwidth,
-90, GFX_H_LEFT, GFX_V_TOP, "RRDTOOL / TOBI OETIKER");
- }
+ }
/* graph watermark */
if (im->watermark[0] != '\0') {
water_color = im->graph_col[GRC_FONT];
}
/* graph labels */
-/* didn't look closely, nor think.. but did you mean ') && !(' below? */
if (!(im->extra_flags & NOLEGEND) && !(im->extra_flags & ONLY_GRAPH)) {
for (i = 0; i < im->gdes_c; i++) {
if (im->gdes[i].legend[0] == '\0')
/* The actual size of the image to draw is determined from
** several sources. The size given on the command line is
** the graph area but we need more as we have to draw labels
- ** and other things outside the graph area. If the option
- ** --full-size-mode is selected the size defines the total
- ** image size and the size available for the graph is
+ ** and other things outside the graph area. If the option
+ ** --full-size-mode is selected the size defines the total
+ ** image size and the size available for the graph is
** calculated.
*/
** | +---+-------------------------------+
** | a | y | |
** | x | | |
- ** | i | a | |
+ ** | i | a | |
** | s | x | main graph area |
** | | i | |
** | t | s | |
Xylabel += Xspacing;
/* If the legend is printed besides the graph the width has to be
- ** calculated first. Placing the legend north or south of the
- ** graph requires the width calculation first, so the legend is
+ ** calculated first. Placing the legend north or south of the
+ ** graph requires the width calculation first, so the legend is
** skipped for the moment.
*/
im->legendheight = 0;
else{
Ymain -= Yxlabel;
}
-
+
/* reserve space for the title *or* some padding above the graph */
Ymain -= Ytitle;
}
}
}
-
+
im->yimg = Ymain + Yxlabel;
if( (im->legendposition == NORTH || im->legendposition == SOUTH) && !(im->extra_flags & NOLEGEND) ){
im->yimg += im->legendheight;
}
-
+
/* reserve space for the title *or* some padding above the graph */
if (Ytitle) {
im->yimg += Ytitle;
}
- /* In case of putting the legend in west or east position the first
- ** legend calculation might lead to wrong positions if some items
- ** are not aligned on the left hand side (e.g. centered) as the
+ /* In case of putting the legend in west or east position the first
+ ** legend calculation might lead to wrong positions if some items
+ ** are not aligned on the left hand side (e.g. centered) as the
** legendwidth wight have been increased after the item was placed.
** In this case the positions have to be recalculated.
*/
}
/* After calculating all dimensions
- ** it is now possible to calculate
+ ** it is now possible to calculate
** all offsets.
*/
switch(im->legendposition){
return -1;
/* calculate and PRINT and GPRINT definitions. We have to do it at
* this point because it will affect the length of the legends
- * if there are no graph elements (i==0) we stop here ...
- * if we are lazy, try to quit ...
+ * if there are no graph elements (i==0) we stop here ...
+ * if we are lazy, try to quit ...
*/
i = print_calc(im);
if (i < 0)
} /* for */
/* *******************************************************
- a ___. (a,t)
+ a ___. (a,t)
| | ___
____| | | |
| |___|
- -------|--t-1--t--------------------------------
+ -------|--t-1--t--------------------------------
- if we know the value at time t was a then
+ if we know the value at time t was a then
we draw a square from t-1 to t with the value a.
********************************************************* */
/*****************************************************
- * graph stuff
+ * graph stuff
*****************************************************/
int gdes_alloc(
rrd_info_t *grinfo;
rrd_graph_init(&im);
/* a dummy surface so that we can measure text sizes for placements */
-
+
rrd_graph_options(argc, argv, &im);
if (rrd_test_error()) {
rrd_info_free(im.grinfo);
return grinfo;
}
-static void
+static void
rrd_set_font_desc (
image_desc_t *im,int prop,char *font, double size ){
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';
- im->text_prop[prop].font_desc = pango_font_description_from_string( 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';
+ im->text_prop[prop].font_desc = pango_font_description_from_string( font );
};
- if (size > 0){
+ if (size > 0){
im->text_prop[prop].size = size;
};
if (im->text_prop[prop].font_desc && im->text_prop[prop].size ){
im->second_axis_scale = 0; /* 0 disables it */
im->second_axis_shift = 0; /* no shift by default */
im->second_axis_legend[0] = '\0';
- im->second_axis_format[0] = '\0';
+ im->second_axis_format[0] = '\0';
im->yorigin = 0;
im->yOriginLegend = 0;
im->yOriginLegendY = 0;
im->ysize = 100;
im->zoom = 1;
- im->surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 10, 10);
+ im->surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 10, 10);
im->cr = cairo_create(im->surface);
for (i = 0; i < DIM(text_prop); i++) {
/* *INDENT-OFF* */
struct option long_options[] = {
- { "start", required_argument, 0, 's'},
- { "end", required_argument, 0, 'e'},
- { "x-grid", required_argument, 0, 'x'},
- { "y-grid", required_argument, 0, 'y'},
- { "vertical-label", required_argument, 0, 'v'},
- { "width", required_argument, 0, 'w'},
- { "height", required_argument, 0, 'h'},
- { "full-size-mode", no_argument, 0, 'D'},
- { "interlaced", no_argument, 0, 'i'},
- { "upper-limit", required_argument, 0, 'u'},
- { "lower-limit", required_argument, 0, 'l'},
- { "rigid", no_argument, 0, 'r'},
+ { "alt-autoscale", no_argument, 0, 'A'},
+ { "imgformat", required_argument, 0, 'a'},
+ { "font-smoothing-threshold", required_argument, 0, 'B'},
{ "base", required_argument, 0, 'b'},
- { "logarithmic", no_argument, 0, 'o'},
{ "color", required_argument, 0, 'c'},
- { "border", required_argument, 0, 1007},
- { "font", required_argument, 0, 'n'},
- { "title", required_argument, 0, 't'},
+ { "full-size-mode", no_argument, 0, 'D'},
+ { "daemon", required_argument, 0, 'd'},
+ { "slope-mode", no_argument, 0, 'E'},
+ { "end", required_argument, 0, 'e'},
+ { "force-rules-legend", no_argument, 0, 'F'},
{ "imginfo", required_argument, 0, 'f'},
- { "imgformat", required_argument, 0, 'a'},
- { "lazy", no_argument, 0, 'z'},
- { "zoom", required_argument, 0, 'm'},
+ { "graph-render-mode", required_argument, 0, 'G'},
{ "no-legend", no_argument, 0, 'g'},
- { "legend-position", required_argument, 0, 1005},
- { "legend-direction", required_argument, 0, 1006},
- { "force-rules-legend", no_argument, 0, 'F'},
- { "only-graph", no_argument, 0, 'j'},
- { "alt-y-grid", no_argument, 0, 'Y'},
- {"disable-rrdtool-tag", no_argument, 0, 1001},
- {"right-axis", required_argument, 0, 1002},
- {"right-axis-label", required_argument, 0, 1003},
- {"right-axis-format", required_argument, 0, 1004},
- { "no-minor", no_argument, 0, 'I'},
- { "slope-mode", no_argument, 0, 'E'},
- { "alt-autoscale", no_argument, 0, 'A'},
+ { "height", required_argument, 0, 'h'},
+ { "no-minor", no_argument, 0, 'I'},
+ { "interlaced", no_argument, 0, 'i'},
{ "alt-autoscale-min", no_argument, 0, 'J'},
+ { "only-graph", no_argument, 0, 'j'},
+ { "units-length", required_argument, 0, 'L'},
+ { "lower-limit", required_argument, 0, 'l'},
{ "alt-autoscale-max", no_argument, 0, 'M'},
+ { "zoom", required_argument, 0, 'm'},
{ "no-gridfit", no_argument, 0, 'N'},
- { "units-exponent", required_argument, 0, 'X'},
- { "units-length", required_argument, 0, 'L'},
- { "units", required_argument, 0, LONGOPT_UNITS_SI},
+ { "font", required_argument, 0, 'n'},
+ { "logarithmic", no_argument, 0, 'o'},
+ { "pango-markup", no_argument, 0, 'P'},
+ { "font-render-mode", required_argument, 0, 'R'},
+ { "rigid", no_argument, 0, 'r'},
{ "step", required_argument, 0, 'S'},
+ { "start", required_argument, 0, 's'},
{ "tabwidth", required_argument, 0, 'T'},
- { "font-render-mode", required_argument, 0, 'R'},
- { "graph-render-mode", required_argument, 0, 'G'},
- { "font-smoothing-threshold", required_argument, 0, 'B'},
+ { "title", required_argument, 0, 't'},
+ { "upper-limit", required_argument, 0, 'u'},
+ { "vertical-label", required_argument, 0, 'v'},
{ "watermark", required_argument, 0, 'W'},
+ { "width", required_argument, 0, 'w'},
+ { "units-exponent", required_argument, 0, 'X'},
+ { "x-grid", required_argument, 0, 'x'},
+ { "alt-y-grid", no_argument, 0, 'Y'},
+ { "y-grid", required_argument, 0, 'y'},
+ { "lazy", no_argument, 0, 'z'},
+ { "units", required_argument, 0, LONGOPT_UNITS_SI},
{ "alt-y-mrtg", no_argument, 0, 1000}, /* this has no effect it is just here to save old apps from crashing when they use it */
- { "pango-markup", no_argument, 0, 'P'},
- { "daemon", required_argument, 0, 'd'},
+ { "disable-rrdtool-tag",no_argument, 0, 1001},
+ { "right-axis", required_argument, 0, 1002},
+ { "right-axis-label", required_argument, 0, 1003},
+ { "right-axis-format", required_argument, 0, 1004},
+ { "legend-position", required_argument, 0, 1005},
+ { "legend-direction", required_argument, 0, 1006},
+ { "border", required_argument, 0, 1007},
{ 0, 0, 0, 0}
};
/* *INDENT-ON* */
int col_start, col_end;
opt = getopt_long(argc, argv,
- "s:e:x:y:v:w:h:D:iu:l:rb:oc:n:m:t:f:a:I:zgjFYAMEX:L:S:T:NR:B:W:kPd:",
+ "Aa:B:b:c:Dd:Ee:Ff:G:gh:IiJjL:l:Nn:Bb:oPR:rS:s:T:t:u:v:W:w:X:x:Yy:z",
long_options, &option_index);
if (opt == EOF)
break;
break;
case 1001:
im->extra_flags |= NO_RRDTOOL_TAG;
- break;
+ break;
case LONGOPT_UNITS_SI:
if (im->extra_flags & FORCE_UNITS) {
rrd_set_error("--units can only be used once!");
for (propidx = sindex;
propidx < TEXT_PROP_LAST; propidx++) {
if (size > 0) {
- rrd_set_font_desc(im,propidx,NULL,size);
+ rrd_set_font_desc(im,propidx,NULL,size);
}
if ((int) strlen(optarg) > end+2) {
if (optarg[end] == ':') {
- rrd_set_font_desc(im,propidx,optarg + end + 1,0);
+ rrd_set_font_desc(im,propidx,optarg + end + 1,0);
} else {
rrd_set_error
("expected : after font size in '%s'",
int status = rrdc_connect(im->daemon_addr);
if (status != 0) return;
}
-
+
pango_cairo_context_set_font_options(pango_layout_get_context(im->layout), im->font_options);
pango_layout_context_changed(im->layout);
diff --git a/program/src/rrd_tool.c b/program/src/rrd_tool.c
index 1f7e6b09d07675553030af700ece8920801453ce..853f0db4c308fd21a828efc4d7c1cf25cae15cf8 100644 (file)
--- a/program/src/rrd_tool.c
+++ b/program/src/rrd_tool.c
"\t\t[-y|--y-grid y-axis grid and label]\n"
"\t\t[-v|--vertical-label string] [-w|--width pixels]\n"
"\t\t[--right-axis scale:shift] [--right-axis-label label]\n"
- "\t\t[--right-axis-format format]\n"
+ "\t\t[--right-axis-format format]\n"
"\t\t[-h|--height pixels] [-o|--logarithmic]\n"
"\t\t[-u|--upper-limit value] [-z|--lazy]\n"
"\t\t[-l|--lower-limit value] [-r|--rigid]\n"
"\t\t[-f|--imginfo printfstr]\n"
"\t\t[-a|--imgformat PNG]\n"
"\t\t[-c|--color COLORTAG#rrggbb[aa]]\n"
- "\t\t[-d|--border width\n"
+ "\t\t[--border width\n"
"\t\t[-t|--title string]\n"
"\t\t[-W|--watermark string]\n"
"\t\t[DEF:vname=rrd:ds-name:CF]\n");