Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java @ 4241:49cb65d5932d
Improved the historical discharge calculation.
The calculation now creates new HistoricalWQKms (new subclass of WQKms). Those WQKms are used
to create new facets from (new) type 'HistoricalDischargeCurveFacet'. The chart generator is
improved to support those facets.
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Wed, 24 Oct 2012 14:34:35 +0200 |
| parents | 810db532803a |
| children | 420c553bc86d |
comparison
equal
deleted
inserted
replaced
| 4240:4774902b0389 | 4241:49cb65d5932d |
|---|---|
| 26 import de.intevation.artifacts.CallContext; | 26 import de.intevation.artifacts.CallContext; |
| 27 import de.intevation.artifacts.CallMeta; | 27 import de.intevation.artifacts.CallMeta; |
| 28 | 28 |
| 29 import de.intevation.flys.artifacts.FLYSArtifact; | 29 import de.intevation.flys.artifacts.FLYSArtifact; |
| 30 import de.intevation.flys.artifacts.model.CalculationResult; | 30 import de.intevation.flys.artifacts.model.CalculationResult; |
| 31 import de.intevation.flys.artifacts.model.HistoricalDischargeData; | |
| 31 import de.intevation.flys.artifacts.model.Timerange; | 32 import de.intevation.flys.artifacts.model.Timerange; |
| 32 import de.intevation.flys.artifacts.model.WQTimerange; | 33 import de.intevation.flys.artifacts.model.WQTimerange; |
| 33 import de.intevation.flys.artifacts.model.WQTJRDataSource; | 34 import de.intevation.flys.artifacts.model.WQTJRDataSource; |
| 34 import de.intevation.flys.artifacts.resources.Resources; | 35 import de.intevation.flys.artifacts.resources.Resources; |
| 35 import de.intevation.flys.utils.FLYSUtils; | 36 import de.intevation.flys.utils.FLYSUtils; |
| 83 if (d instanceof CalculationResult) { | 84 if (d instanceof CalculationResult) { |
| 84 d = ((CalculationResult) d).getData(); | 85 d = ((CalculationResult) d).getData(); |
| 85 | 86 |
| 86 logger.debug("Internal data of CalculationResult: " + d.getClass()); | 87 logger.debug("Internal data of CalculationResult: " + d.getClass()); |
| 87 | 88 |
| 88 if (d instanceof WQTimerange[]) { | 89 if (d instanceof HistoricalDischargeData) { |
| 89 logger.debug("Add new data of type WQTimerange"); | 90 d = (WQTimerange[]) ((HistoricalDischargeData) d).getWQTimeranges(); |
| 90 data.add((WQTimerange[]) d); | 91 |
| 92 if (d instanceof WQTimerange[]) { | |
| 93 logger.debug("Add new data of type WQTimerange"); | |
| 94 data.add((WQTimerange[]) d); | |
| 95 } | |
| 91 } | 96 } |
| 92 } | 97 } |
| 93 } | 98 } |
| 94 | 99 |
| 95 | 100 |