--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java	Tue Jul 03 08:46:14 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java	Tue Jul 03 09:32:47 2012 +0000
@@ -225,22 +225,40 @@
         // DO NOT SORT DATA! This destroys the gaps indicated by NaNs.
         StyledXYSeries series = new StyledXYSeries(seriesName, false, theme);
 
+        if (!ThemeUtil.parseShowLineLabel(theme)) {
+            series.setLabel("");
+        }
         if (ThemeUtil.parseShowWidth(theme)) {
             NumberFormat nf = nf = Formatter.getMeterFormat(this.context);
-            series.setLabel(series.getLabel() + ", b=" +
-                nf.format(lines.width) + "m");
+            String labelAdd = "b=" + nf.format(lines.width) + "m";
+            if (series.getLabel().equals("")) {
+               series.setLabel(labelAdd);
+            }
+            else {
+                series.setLabel(series.getLabel() + ", " + labelAdd);
+            }
         }
         if (ThemeUtil.parseShowLevel(theme) && lines.points.length >0
             && lines.points[1].length > 0) {
             NumberFormat nf = nf = Formatter.getMeterFormat(this.context);
-            series.setLabel(series.getLabel() + ", W=" +
-                nf.format(lines.points[1][0]) + "NN+m");
+            String labelAdd = "W=" + nf.format(lines.points[1][0]) + "NN+m";
+            if (series.getLabel().equals("")) {
+               series.setLabel(labelAdd);
+            }
+            else {
+                series.setLabel(series.getLabel() + ", " + labelAdd);
+            }
         }
         if (ThemeUtil.parseShowMiddleHeight(theme) && lines.width != 0) {
             NumberFormat nf = nf = Formatter.getMeterFormat(this.context);
-            series.setLabel(series.getLabel() + ",H=" +
-                nf.format(lines.area / lines.width) + "m");
+            String labelAdd = "H=" + nf.format(lines.area / lines.width) + "m";
                 // : " + lines.area + "/" + lines.width);
+            if (series.getLabel().equals("")) {
+               series.setLabel(labelAdd);
+            }
+            else {
+                series.setLabel(series.getLabel() + ", " + labelAdd);
+            }
         }
 
         StyledSeriesBuilder.addPoints(series, lines.points, false);