Mercurial > dive4elements > river
changeset 6552:95aecf6cc5ad
issue1235: Fix determination of SedimentLoadLSGenerators Y-Axis (m3/a or t/a).
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 10 Jul 2013 10:33:56 +0200 |
| parents | 8c226c5089e0 |
| children | e89e5163973f |
| files | artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadLSGenerator.java |
| diffstat | 1 files changed, 9 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadLSGenerator.java Wed Jul 10 10:05:52 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadLSGenerator.java Wed Jul 10 10:33:56 2013 +0200 @@ -73,8 +73,6 @@ public static final String I18N_YAXIS_D_LABEL_DEFAULT = "delta S [m]"; public static final String I18N_YAXIS_V_LABEL_DEFAULT = "Geschwindigkeit v [m/s]"; - private String yLabel = ""; - @Override protected YAxisWalker getYAxisWalker() { return new YAxisWalker() { @@ -106,14 +104,6 @@ Facet facet = bundle.getFacet(); D4EArtifact artifact = (D4EArtifact)bundle.getArtifact(); - SedimentLoadAccess slaccess = new SedimentLoadAccess(artifact); - String unit = slaccess.getUnit(); - if (unit != null && unit.equals("m3_per_a")) { - yLabel = msg(I18N_YAXIS_LABEL_2, I18N_YAXIS_LABEL_DEFAULT_2); - } - else { - yLabel = msg(I18N_YAXIS_LABEL_1, I18N_YAXIS_LABEL_DEFAULT_1); - } if (facet == null) { return; } @@ -242,7 +232,15 @@ protected String getDefaultYAxisLabel(int pos) { String label = "default"; if (pos == YAXIS.L.idx) { - label = yLabel; + SedimentLoadAccess slaccess = + new SedimentLoadAccess((D4EArtifact) getMaster()); + String unit = slaccess.getUnit(); + if (unit != null && unit.equals("m3_per_a")) { + label = msg(I18N_YAXIS_LABEL_2, I18N_YAXIS_LABEL_DEFAULT_2); + } + else { + label = msg(I18N_YAXIS_LABEL_1, I18N_YAXIS_LABEL_DEFAULT_1); + } } else if (pos == YAXIS.V.idx) { label = msg(I18N_YAXIS_V_LABEL, I18N_YAXIS_V_LABEL_DEFAULT);