[PATCH 2 of 3] (issue1755) Fix Y Axis label in Bed Quality facets. It's used in the CSV Export

Wald Commits scm-commit at wald.intevation.org
Thu Apr 2 14:54:54 CEST 2015


# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1427976567 -7200
# Node ID 4b00ee8589640e69c0d47613349b51189441574e
# Parent  bf85900461201836c42919d7d5db910c3855f003
(issue1755) Fix Y Axis label in Bed Quality facets. It's used in the CSV Export.

diff -r bf8590046120 -r 4b00ee858964 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityDataFacet.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityDataFacet.java	Thu Apr 02 14:06:56 2015 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityDataFacet.java	Thu Apr 02 14:09:27 2015 +0200
@@ -41,7 +41,11 @@
         this.valueName = valueName;
         this.valueType = valueType;
         this.metaData.put("X", "chart.longitudinal.section.xaxis.label");
-        this.metaData.put("Y", ""); /* check if those <^ be removed? */
+        if (!valueName.equals("porosity") && !valueName.equals("density")) {
+            this.metaData.put("Y", "chart.bedquality.yaxis.label.diameter");
+        } else {
+            this.metaData.put("Y", "chart.bedquality.yaxis.label." + valueName);
+        }
     }
 
     @Override
diff -r bf8590046120 -r 4b00ee858964 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityInterpolFacet.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityInterpolFacet.java	Thu Apr 02 14:06:56 2015 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityInterpolFacet.java	Thu Apr 02 14:09:27 2015 +0200
@@ -42,7 +42,11 @@
         this.valueName = valueName;
         this.valueType = valueType;
         this.metaData.put("X", "chart.longitudinal.section.xaxis.label");
-        this.metaData.put("Y", ""); /* check if those <^ be removed? */
+        if (!valueName.equals("porosity") && !valueName.equals("density")) {
+            this.metaData.put("Y", "chart.bedquality.yaxis.label.diameter");
+        } else {
+            this.metaData.put("Y", "chart.bedquality.yaxis.label." + valueName);
+        }
     }
 
     @Override


More information about the Dive4Elements-commits mailing list