Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineProcessor.java @ 9316:72b3270e1568
U-Info salix line with regional and supraregional scenario calculation and chart display
author | mschaefer |
---|---|
date | Thu, 26 Jul 2018 17:28:32 +0200 |
parents | 385b52ccde23 |
children | b3d3c958a594 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineProcessor.java Thu Jul 26 17:23:49 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineProcessor.java Thu Jul 26 17:28:32 2018 +0200 @@ -18,6 +18,7 @@ import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.common.AbstractCalculationResult; +import org.dive4elements.river.artifacts.resources.Resources; import org.dive4elements.river.artifacts.uinfo.commons.UInfoResultType; import org.dive4elements.river.exports.DiagramGenerator; import org.dive4elements.river.exports.StyledSeriesBuilder; @@ -36,29 +37,47 @@ */ public final class SalixLineProcessor extends DefaultProcessor { - private static final String FACET_SALIX_LINE = "uinfo_facet_salix"; + private static final String FACET_SALIX_LINE = "uinfo_facet_salix_line"; - private static final String FACET_SALIX_MNWMW = "uinfo_facet_mnwmw"; + private static final String FACET_SALIX_LINE_DESCRIPTION = "uinfo_facet_salix_line.description"; + + private static final String FACET_SALIX_MNWMW = "uinfo_facet_salix_mnwmw"; + + private static final String FACET_SALIX_MNWMW_DESCRIPTION = "uinfo_facet_salix_mnwmw.description"; + + public static final String FACET_SALIX_SCENARIO = "uinfo_facet_salix_scenario"; + + private static final String FACET_SALIX_SCENARIO_DESCRIPTION = "uinfo_facet_salix_scenario.description"; private static final Set<String> HANDLED_FACET_TYPES = new HashSet<>(); static { HANDLED_FACET_TYPES.add(FACET_SALIX_LINE); HANDLED_FACET_TYPES.add(FACET_SALIX_MNWMW); + HANDLED_FACET_TYPES.add(FACET_SALIX_SCENARIO); } public static Facet createSalixLineFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, - final int facetIndex, final int resultIndex, final String description) { + final int facetIndex, final int resultIndex) { + final String description = Resources.getMsg(context.getMeta(), FACET_SALIX_LINE_DESCRIPTION, FACET_SALIX_LINE_DESCRIPTION); return new SalixLineResultFacet(FACET_SALIX_LINE, description); } public static Facet createSalixMnwMwFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, - final int facetIndex, final int resultIndex, final String description) { + final int facetIndex, final int resultIndex) { + final String description = Resources.getMsg(context.getMeta(), FACET_SALIX_MNWMW_DESCRIPTION, FACET_SALIX_MNWMW_DESCRIPTION); return new SalixMnwMwResultFacet(FACET_SALIX_MNWMW, description); } + public static Facet createSalixScenarioFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, + final int facetIndex, final int resultIndex, final String subLabel) { + + final String description = Resources.getMsg(context.getMeta(), FACET_SALIX_SCENARIO_DESCRIPTION, FACET_SALIX_SCENARIO_DESCRIPTION, subLabel); + return new SalixScenarioResultFacet(FACET_SALIX_SCENARIO, description, facetIndex, hash, id); + } + @Override public final String getAxisLabel(final DiagramGenerator generator) { @@ -80,15 +99,26 @@ final Object data = bundle.getData(context); final XYSeries series = new StyledXYSeries(bundle.getFacetDescription(), theme); + final SalixLineCalculationNoScenarioResult result = (SalixLineCalculationNoScenarioResult) data; if (bundle.getFacetName().equals(FACET_SALIX_LINE)) { - StyledSeriesBuilder.addPoints(series, ((SalixLineCalculationNoScenarioResult) data).getStationPoints(UInfoResultType.salixline), true); + StyledSeriesBuilder.addPoints(series, result.getStationPoints(UInfoResultType.salixline), true); generator.addAxisSeries(series, this.axisName, visible); return; } if (bundle.getFacetName().equals(FACET_SALIX_MNWMW)) { - StyledSeriesBuilder.addPoints(series, ((SalixLineCalculationNoScenarioResult) data).getStationPoints(UInfoResultType.salix_delta_mw), true); + StyledSeriesBuilder.addPoints(series, result.getStationPoints(UInfoResultType.salix_delta_mw), true); + generator.addAxisSeries(series, this.axisName, visible); + return; + } + + if (bundle.getFacetName().equals(FACET_SALIX_SCENARIO)) { + // TODO Differenzieren, Scenario 1 bis max. 5 bei Regional + if (data instanceof SalixLineCalculationRegionalResult) + StyledSeriesBuilder.addPoints(series, ((SalixLineCalculationRegionalResult) data).getScenarioPoints(bundle.getFacet().getIndex()), true); + else + StyledSeriesBuilder.addPoints(series, result.getStationPoints(UInfoResultType.salix_line_scenario), false); generator.addAxisSeries(series, this.axisName, visible); return; }