Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java @ 2792:fe987587ebc9
Merged revisions 4539-4540,4543,4545-4546 via svnmerge from
file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-artifacts/trunk
........
r4539 | teichmann | 2012-05-27 20:02:13 +0200 (So, 27 Mai 2012) | 1 line
FixA: Added forgotten csv/report facets/generators to conf.
........
r4540 | teichmann | 2012-05-27 20:11:31 +0200 (So, 27 Mai 2012) | 1 line
FixA: Fixed class cast bug in report facet.
........
r4543 | teichmann | 2012-05-28 20:35:01 +0200 (Mo, 28 Mai 2012) | 1 line
FixA: Added facet to return delta w/t as CSV
........
r4545 | teichmann | 2012-05-28 22:59:27 +0200 (Mo, 28 Mai 2012) | 1 line
FixA: Made Delta W/t calculation finally work
........
r4546 | teichmann | 2012-05-28 23:34:24 +0200 (Mo, 28 Mai 2012) | 1 line
FixA: corrected fitting (Q->W instead W->Q).
........
flys-artifacts/tags/2.7@4547 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Tue, 29 May 2012 04:58:29 +0000 |
| parents | ea80e652f033 |
| children |
comparison
equal
deleted
inserted
replaced
| 2791:c9815016a3bb | 2792:fe987587ebc9 |
|---|---|
| 6 import de.intevation.artifactdatabase.state.DefaultFacet; | 6 import de.intevation.artifactdatabase.state.DefaultFacet; |
| 7 import de.intevation.artifactdatabase.state.Facet; | 7 import de.intevation.artifactdatabase.state.Facet; |
| 8 | 8 |
| 9 import de.intevation.flys.artifacts.states.DefaultState.ComputeType; | 9 import de.intevation.flys.artifacts.states.DefaultState.ComputeType; |
| 10 | 10 |
| 11 import de.intevation.flys.artifacts.WINFOArtifact; | 11 import de.intevation.flys.artifacts.FLYSArtifact; |
| 12 | 12 |
| 13 | 13 |
| 14 import org.apache.log4j.Logger; | 14 import org.apache.log4j.Logger; |
| 15 | 15 |
| 16 public class ReportFacet | 16 public class ReportFacet |
| 41 } | 41 } |
| 42 | 42 |
| 43 public Object getData(Artifact artifact, CallContext context) { | 43 public Object getData(Artifact artifact, CallContext context) { |
| 44 logger.debug("get report data"); | 44 logger.debug("get report data"); |
| 45 | 45 |
| 46 WINFOArtifact winfo = (WINFOArtifact)artifact; | 46 FLYSArtifact flys = (FLYSArtifact)artifact; |
| 47 | 47 |
| 48 CalculationResult cr = (CalculationResult)winfo.compute( | 48 CalculationResult cr = (CalculationResult)flys.compute( |
| 49 context, hash, stateId, type, false); | 49 context, hash, stateId, type, false); |
| 50 | 50 |
| 51 return cr.getReport(); | 51 return cr.getReport(); |
| 52 } | 52 } |
| 53 | 53 |