Add a --legend-direction=bottomup variant

The --legend-direction=bottomup2 variant will exempt leading and
trailing COMMENT lines from re-ordering. This might be useful for
generators like munin that use such lines for table headers and the
like.

Issue 419

diff --git a/doc/rrdgraph.pod b/doc/rrdgraph.pod
index e8e88450752f90a903e4826832b1ac58553dc3ab..a50732505a03437c3acae694f2d28b97ab152670 100644 (file)
--- a/doc/rrdgraph.pod
+++ b/doc/rrdgraph.pod
@@ -287,11 +287,13 @@ behavior of pre 1.0.42 versions).
 Place the legend at the given side of the graph. The default is south.
 In west or east position it is necessary to add line breaks manually.
 
-[B<--legend-direction>=(topdown|bottomup)]
+[B<--legend-direction>=(topdown|bottomup|bottomup2)]
 
 Place the legend items in the given vertical order. The default is topdown.
 Using bottomup the legend items appear in the same vertical order as a
-stack of lines or areas.
+stack of lines or areas. Using bottomup2 will keep leading and trailing
+COMMENT lines in order, this might be useful for generators that use them
+for table headers and the like.
 
 =head2 Miscellaneous
 

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 45995949799d82bc4b0983e58c1713aa4492e2a4..0cc4676e0665f2b671e0082dbf0a5c7c78c3a95e 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -2767,27 +2767,60 @@ void grid_paint(
 
     /* graph labels */
     if (!(im->extra_flags & NOLEGEND) && !(im->extra_flags & ONLY_GRAPH)) {
+        long first_noncomment = im->gdes_c, last_noncomment = 0;
         /* get smallest and biggest leg_y values. Assumes
          * im->gdes[i].leg_y is in order. */
         double min = 0, max = 0;
+        int gotcha = 0;
         for (i = 0; i < im->gdes_c; i++) {
             if (im->gdes[i].legend[0] == '\0')
                 continue;
-            min = im->gdes[i].leg_y;
-            break;
+            if (!gotcha) {
+                min = im->gdes[i].leg_y;
+                gotcha = 1;
+            }
+            if (im->gdes[i].gf != GF_COMMENT) {
+                if (im->legenddirection == BOTTOM_UP2)
+                    min = im->gdes[i].leg_y;
+                first_noncomment = i;
+                break;
+            }
         }
+        gotcha = 0;
         for (i = im->gdes_c - 1; i >= 0; i--) {
             if (im->gdes[i].legend[0] == '\0')
                 continue;
-            max = im->gdes[i].leg_y;
-            break;
+            if (!gotcha) {
+                max = im->gdes[i].leg_y;
+                gotcha = 1;
+            }
+            if (im->gdes[i].gf != GF_COMMENT) {
+                if (im->legenddirection == BOTTOM_UP2)
+                    max = im->gdes[i].leg_y;
+                last_noncomment = i;
+                break;
+            }
         }
         for (i = 0; i < im->gdes_c; i++) {
             if (im->gdes[i].legend[0] == '\0')
                 continue;
             /* im->gdes[i].leg_y is the bottom of the legend */
             X0 = im->xOriginLegend + im->gdes[i].leg_x;
-            Y0 = im->legenddirection == TOP_DOWN ? im->yOriginLegend + im->gdes[i].leg_y : im->yOriginLegend + max + min - im->gdes[i].leg_y;
+            int reverse = 0;
+            switch (im->legenddirection) {
+                case TOP_DOWN:
+                    reverse = 0;
+                    break;
+                case BOTTOM_UP:
+                    reverse = 1;
+                    break;
+                case BOTTOM_UP2:
+                    reverse = i >= first_noncomment && i <= last_noncomment;
+                    break;
+            }
+            Y0 = reverse ?
+                im->yOriginLegend + max + min - im->gdes[i].leg_y :
+                im->yOriginLegend + im->gdes[i].leg_y;
             gfx_text(im, X0, Y0,
                      im->graph_col[GRC_FONT],
                      im->
@@ -4463,6 +4496,8 @@ void rrd_graph_options(
                 im->legenddirection = TOP_DOWN;
             } else if (strcmp(optarg, "bottomup") == 0) {
                 im->legenddirection = BOTTOM_UP;
+            } else if (strcmp(optarg, "bottomup2") == 0) {
+                im->legenddirection = BOTTOM_UP2;
             } else {
                 rrd_set_error("unknown legend-position '%s'", optarg);
                 return;

diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index b97a742513a37262b59a249d993c19cf7e27b362..17245d0bc187aba7c908ad36019049e9fb30280b 100644 (file)
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
@@ -89,7 +89,7 @@ enum text_prop_en {
 };
 
 enum legend_pos{ NORTH = 0, WEST, SOUTH, EAST };
-enum legend_direction { TOP_DOWN = 0, BOTTOM_UP };
+enum legend_direction { TOP_DOWN = 0, BOTTOM_UP, BOTTOM_UP2 };
 
 enum gfx_if_en { IF_PNG = 0, IF_SVG, IF_EPS, IF_PDF, 
                 IF_XML=128, IF_CSV=129, IF_TSV=130, IF_SSV=131, IF_JSON=132,