X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph_helper.c;h=0ab38fed9c96605feb3419789931f84d8da27fcc;hb=7f4b880d9d5c7a48e273f52e8dfa54fae39006e3;hp=29bcb5d6122926b0a4df83325305ad7957d9f327;hpb=fcbf2878a231442f4b62ee95fca39e28f04fc8d2;p=rrdtool.git

diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c
index 29bcb5d..0ab38fe 100644
--- a/src/rrd_graph_helper.c
+++ b/src/rrd_graph_helper.c
@@ -1,3 +1,10 @@
+/****************************************************************************
+ * RRDtool 1.2.0  Copyright by Tobi Oetiker, 1997-2005
+ ****************************************************************************
+ * rrd_graph_helper.c  commandline parser functions 
+ *                     this code initially written by Alex van den Bogaerdt
+ ****************************************************************************/
+
 #include "rrd_graph.h"
 
 #define dprintf if (gdp->debug) printf
@@ -90,9 +97,9 @@ rrd_parse_color(char *string, graph_desc_t *gdp) {
     sscanf(string, "#%02x%02x%02x%n%02x%n%*s%n",
 				&r,&g,&b,&i1,&a,&i2,&i3);
 
-    if (i3) return 1; /* garbage after color */
-    if (!i2) a=0xFF;
-    if (!i1) return 1; /* no color after '#' */
+    if (i3) return 1;	/* garbage after color */
+    if (!i2) a=0xFF;	/* default no transparency */
+    if (!i1) return 1;	/* no color after '#' */
     gdp->col = r<<24|g<<16|b<<8|a;
     return 0;
 }
@@ -156,10 +163,10 @@ rrd_parse_print(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t
     }
 
     if (rrd_parse_legend(line,eaten,gdp)) return 1;
-
-    /* Why is there a separate structure member "format" ??? */
+    /* for *PRINT the legend itself gets rendered later. We only
+       get the format at this juncture */
     strcpy(gdp->format,gdp->legend);
-
+    gdp->legend[0]='\0';	
     return 0;
 }
 
@@ -168,7 +175,7 @@ rrd_parse_shift(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t
 	char	*l = strdup(line + *eaten), *p;
 	int	rc = 1;
 
-	p = strchr(l, ',');
+	p = strchr(l, ':');
 	if (p == NULL) {
 		rrd_set_error("Invalid SHIFT syntax");
 		goto out;
@@ -325,13 +332,24 @@ rrd_parse_PVHLAST(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc
 	}
 	dprintf("- looking for optional legend\n");
 	dprintf("- in '%s'\n",&line[*eaten]);
+	/* the legend for a graph item must start with "m " the first
+           m will then be over drawn with a color box. Since there
+           is ample space I overwrite the first few characters of the line
+	   with the material that I want to see in the legend */
+	if (line[*eaten] != '\0' && line[*eaten] != ':'){
+		*eaten = *eaten - 2;
+		line[*eaten] = 'm';
+		line[*eaten+1] = ' ';
+	}	
 	if (rrd_parse_legend(line, eaten, gdp)) return 1;
     }
 
     /* PART, HRULE, VRULE and TICK cannot be stacked.  We're finished */
     if (   (gdp->gf == GF_HRULE)
 	|| (gdp->gf == GF_VRULE)
+#ifdef WITH_PIECHART
 	|| (gdp->gf == GF_PART)
+#endif
 	|| (gdp->gf == GF_TICK)
 	) return 0;
 
@@ -352,7 +370,10 @@ rrd_parse_PVHLAST(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc
 	    return 1;
 	}
     }
-
+    /* have simpler code in the drawing section */
+    if ( gdp->gf == GF_STACK ){
+	    gdp->stack=1;
+    }
     return 0;
 }
 
@@ -572,12 +593,14 @@ rrd_graph_script(int argc, char *argv[], image_desc_t *im, int optno) {
             case GF_COMMENT:	/* text */
 		if (rrd_parse_legend(argv[i],&eaten,gdp)) return;
 		break;
+	    case GF_STACK:	/* vname-or-value[#color[:legend]] */		
+#ifdef WITH_PIECHART
 	    case GF_PART:	/* value[#color[:legend]] */
+#endif
 	    case GF_VRULE:	/* value#color[:legend] */
 	    case GF_HRULE:	/* value#color[:legend] */
 	    case GF_LINE:	/* vname-or-value[#color[:legend]][:STACK] */
 	    case GF_AREA:	/* vname-or-value[#color[:legend]][:STACK] */
-	    case GF_STACK:	/* vname-or-value[#color[:legend]] */
 	    case GF_TICK:	/* vname#color[:num[:legend]] */
 		if (rrd_parse_PVHLAST(argv[i],&eaten,gdp,im)) return;
 		break;