Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthDevelopmentPerYearProcessor.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 |
comparison
equal
deleted
inserted
replaced
| 9616:cedcee24a21a | 9617:1d4262a68f1f |
|---|---|
| 63 } | 63 } |
| 64 | 64 |
| 65 public static Facet createFlowDepthDevelopmentFilteredFacet(final CallContext context, final String hash, final String id, | 65 public static Facet createFlowDepthDevelopmentFilteredFacet(final CallContext context, final String hash, final String id, |
| 66 final AbstractCalculationResult result, final int index) { | 66 final AbstractCalculationResult result, final int index) { |
| 67 return AbstractProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_DEVELOPMENT_PER_YEAR_YAXIS_LABEL, | 67 return AbstractProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_DEVELOPMENT_PER_YEAR_YAXIS_LABEL, |
| 68 FACET_FLOW_DEPTH_DEVELOPMENT_PER_YEAR_FILTERED, FACET_FLOW_DEPTH_DEVELOPMENT_PER_YEAR_FILTERED_DESCRIPTION); | 68 FACET_FLOW_DEPTH_DEVELOPMENT_PER_YEAR_FILTERED, FACET_FLOW_DEPTH_DEVELOPMENT_PER_YEAR_FILTERED_DESCRIPTION, result.getLabel()); |
| 69 } | 69 } |
| 70 | 70 |
| 71 public static Facet createFlowDepthDevelopmentRawFacet(final CallContext context, final String hash, final String id, | 71 public static Facet createFlowDepthDevelopmentRawFacet(final CallContext context, final String hash, final String id, |
| 72 final AbstractCalculationResult result, final int index) { | 72 final AbstractCalculationResult result, final int index) { |
| 73 return AbstractProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_DEVELOPMENT_PER_YEAR_YAXIS_LABEL, | 73 return AbstractProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_DEVELOPMENT_PER_YEAR_YAXIS_LABEL, |