vdef calc was using end_orig to determine for which range it should do its

calculations which is odd, since orig is only the requested range as
invocation time and not the data range deliverd by fetch. It does fall
completely flat when shifting since shifting does not affect the original
data. Bug #177 reported by hokiel

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1530 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index ea5d8c3b2be2715c9baa77a07f019c696d04103c..da3be8a6388736c8606cc202530f5d26f9b51f97 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -4523,21 +4523,16 @@ int vdef_calc(
     graph_desc_t *src, *dst;
     rrd_value_t *data;
     long      step, steps;
-    unsigned long end;
 
     dst = &im->gdes[gdi];
     src = &im->gdes[dst->vidx];
     data = src->data + src->ds;
-    end =
-        src->end_orig % (long) src->step ==
-        0 ? src->end_orig : (src->end_orig + (long) src->step -
-                             src->end_orig % (long) src->step);
 
-    steps = (end - src->start) / src->step;
+    steps = (src->end - src->start) / src->step;
 #if 0
     printf
         ("DEBUG: start == %lu, end == %lu, %lu steps\n",
-         src->start, src->end_orig, steps);
+         src->start, src->end, steps);
 #endif
     switch (dst->vf.op) {
     case VDEF_PERCENT:{

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index d054386074dcfe7915a370193d47a34c99ec785a..4da8019e36daddccd16714b64e32460530bd3d1c 100644 (file)
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -133,7 +133,7 @@ void PrintUsage(
            "\trrdtool graphv filename [-s|--start seconds] [-e|--end seconds]\n");
     const char *help_graph1 =
         N_("\t\t[-x|--x-grid x-axis grid and label]\n"
-           "\t\t[-Y|--alt-y-grid]\n"
+           "\t\t[-Y|--alt-y-grid] [--full-size-mode]\n"
            "\t\t[-y|--y-grid y-axis grid and label]\n"
            "\t\t[-v|--vertical-label string] [-w|--width pixels]\n"
            "\t\t[-h|--height pixels] [-o|--logarithmic]\n"