Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/D50Processor.java @ 8948:a4f1ac81f26d
Work on SINFO-FlowDepthMinMax.
Also rework of result row stuff, in order to reduce abstraction, using result type concept
| author | gernotbelger |
|---|---|
| date | Wed, 14 Mar 2018 14:10:32 +0100 |
| parents | 5d5d482da3e9 |
| children | ee5ce13016ed |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/D50Processor.java Wed Mar 14 14:09:33 2018 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/D50Processor.java Wed Mar 14 14:10:32 2018 +0100 @@ -18,7 +18,7 @@ import org.dive4elements.river.artifacts.resources.Resources; import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; -public final class D50Processor extends AbstractSInfoLineProcessor<AbstractTkhCalculationResult<?>> { +public final class D50Processor extends AbstractSInfoLineProcessor<AbstractTkhCalculationResult> { // FIXME: check: filtered or not? public static final String FACET_TKH_D50_FILTERED = "sinfo_facet_d50.filtered"; @@ -40,16 +40,16 @@ } @Override - protected double[][] doGetPoints(final AbstractTkhCalculationResult<?> data, final String facetName) { + protected double[][] doGetPoints(final AbstractTkhCalculationResult data, final String facetName) { if (FACET_TKH_D50_FILTERED.contentEquals(facetName)) - return data.getD50Points(); + return data.getStationPoints(SInfoResultType.d50); final String error = String.format("Unknown facet name: %s", facetName); throw new UnsupportedOperationException(error); } - public static Facet createD50Facet(final CallContext context, final String hash, final String id, final AbstractSInfoCalculationResult<?> result, + public static Facet createD50Facet(final CallContext context, final String hash, final String id, final AbstractSInfoCalculationResult result, final int index) { final String facetFlowDepthFilteredDescription = Resources.getMsg(context.getMeta(), I18N_FACET_TKH_D50_FILTERED_DESCRIPTION, I18N_FACET_TKH_D50_FILTERED_DESCRIPTION, result.getLabel());