diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthProcessor.java @ 9617:1d4262a68f1f

#12 Minuend/Subtrahend + MergeConflict #19 CollisionCalculation
author dnt_bjoernsen <d.tironi@bjoernsen.de>
date Thu, 10 Oct 2019 15:29:02 +0200
parents 08f46ccd37ba
children
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthProcessor.java	Wed Oct 09 19:25:55 2019 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthProcessor.java	Thu Oct 10 15:29:02 2019 +0200
@@ -16,8 +16,10 @@
 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
 import org.dive4elements.artifactdatabase.state.Facet;
 import org.dive4elements.artifacts.CallContext;
+import org.dive4elements.artifacts.CallMeta;
 import org.dive4elements.river.artifacts.common.AbstractCalculationResult;
 import org.dive4elements.river.artifacts.common.AbstractProcessor;
+import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.exports.DiagramGenerator;
 import org.dive4elements.river.themes.ThemeDocument;
 
@@ -32,6 +34,7 @@
     // changes depending on zoom state
 
     /* flow depth */
+
     public static final String FACET_FLOW_DEPTH_FILTERED = "sinfo_facet_flow_depth.filtered";
 
     private static final String FACET_FLOW_DEPTH_FILTERED_DESCRIPTION = "sinfo.facet.flow_depth.filtered.description";
@@ -144,14 +147,16 @@
 
     public static Facet createFlowDepthFilteredFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
             final int index) {
-        return AbstractProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_FILTERED,
-                FACET_FLOW_DEPTH_FILTERED_DESCRIPTION);
+        final CallMeta meta = context.getMeta();
+        final String yAxisLabel = Resources.getMsg(meta, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL);
+        return AbstractProcessor.createFacet(context, hash, id, result, index, yAxisLabel, FACET_FLOW_DEPTH_FILTERED, FACET_FLOW_DEPTH_FILTERED_DESCRIPTION);
     }
 
     public static Facet createFlowDepthRawFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
             final int index) {
-        return AbstractProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_RAW,
-                FACET_FLOW_DEPTH_RAW_DESCRIPTION);
+        final CallMeta meta = context.getMeta();
+        final String yAxisLabel = Resources.getMsg(meta, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL);
+        return AbstractProcessor.createFacet(context, hash, id, result, index, yAxisLabel, FACET_FLOW_DEPTH_RAW, FACET_FLOW_DEPTH_RAW_DESCRIPTION);
     }
 
     public static Facet createFlowDepthTkhFilteredFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,

http://dive4elements.wald.intevation.org