Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculator.java @ 9265:e5367900dd6d
Small cleanup concerning getPoints
Adding validStations as dataItem to flood duration calculation
Flood duration now km aware
| author | gernotbelger |
|---|---|
| date | Tue, 17 Jul 2018 19:48:28 +0200 |
| parents | 66b003701546 |
| children | 465347d12990 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculator.java Tue Jul 17 19:48:23 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculator.java Tue Jul 17 19:48:28 2018 +0200 @@ -144,8 +144,7 @@ ws[j] = underflow.getW(i); qs[j] = underflow.getQ(i); } - res.setData(new WQDay(days, ws, qs)); - results.setDurationCurve(res); + results.setDurationCurve(new WQDay(days, ws, qs)); } /** @@ -162,12 +161,12 @@ final StickyAxisAnnotation qAnnotation = new StickyAxisAnnotation(qLabel, (float) wqkmsArray[i].getQ(stationIndex), SimpleAxis.Y_AXIS, FloodDurationCurveGenerator.YAXIS.Q.idx); qs.add(qAnnotation); - FloodDurationMainValuesQFacet.setHitPoint((WQDay) results.getDurationCurve().getData(), qAnnotation); + FloodDurationMainValuesQFacet.setHitPoint(results.getDurationCurve(), qAnnotation); final String wLabel = !wqkmsArray[i].getName().startsWith("W=") ? "W(" + wqkmsArray[i].getName() + ")" : wqkmsArray[i].getName(); final StickyAxisAnnotation wAnnotation = new StickyAxisAnnotation(wLabel, (float) wqkmsArray[i].getW(stationIndex), SimpleAxis.Y_AXIS, FloodDurationCurveGenerator.YAXIS.W.idx); ws.add(wAnnotation); - FloodDurationMainValuesWFacet.setHitPoint((WQDay) results.getDurationCurve().getData(), wAnnotation); + FloodDurationMainValuesWFacet.setHitPoint(results.getDurationCurve(), wAnnotation); } results.getMainValueQAnnotations().clear(); results.getMainValueQAnnotations().addAll(qs); @@ -194,10 +193,10 @@ + ", " + SInfoResultType.riverside.exportValue(this.context, row.getValue(SInfoResultType.riverside))); final StickyAxisAnnotation qAnnotation = new StickyAxisAnnotation(label, (float) row.getDoubleValue(SInfoResultType.floodDischarge), SimpleAxis.Y_AXIS, FloodDurationCurveGenerator.YAXIS.Q.idx); - FloodDurationMainValuesQFacet.setHitPoint((WQDay) results.getDurationCurve().getData(), qAnnotation); + FloodDurationMainValuesQFacet.setHitPoint(results.getDurationCurve(), qAnnotation); final StickyAxisAnnotation wAnnotation = new StickyAxisAnnotation(label, (float) row.getDoubleValue(SInfoResultType.infrastructureHeight), SimpleAxis.Y_AXIS, FloodDurationCurveGenerator.YAXIS.W.idx); - FloodDurationMainValuesWFacet.setHitPoint((WQDay) results.getDurationCurve().getData(), wAnnotation); + FloodDurationMainValuesWFacet.setHitPoint(results.getDurationCurve(), wAnnotation); results.setInfrastructureQAnnotation(qAnnotation); results.setInfrastructureWAnnotation(wAnnotation);