Mercurial > dive4elements > river
changeset 2283:d4330439be3a
Let reference curve calculation result in wwqq.
flys-artifacts/trunk@3945 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 07 Feb 2012 09:52:55 +0000 |
| parents | 4d30e38600b8 |
| children | 5d1ba04d2f68 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation5.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java |
| diffstat | 4 files changed, 22 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Tue Feb 07 08:28:22 2012 +0000 +++ b/flys-artifacts/ChangeLog Tue Feb 07 09:52:55 2012 +0000 @@ -1,7 +1,18 @@ -2012-02-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> +2012-02-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + Let reference curve calculation result in specific WWQQ, extended CSV + + * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java + (getWW,getWWQQ): Renamed and changed result type. + + * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java, + src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: + Result in WWQQs, not in WWs. + +2012-02-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: - Log error as error. + Log error as warning. 2012-02-06 Sascha L. Teichmann <sascha.teichmann@intevation.de>
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation5.java Tue Feb 07 08:28:22 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation5.java Tue Feb 07 09:52:55 2012 +0000 @@ -26,7 +26,7 @@ WstValueTable wst, Map<Double, Double> kms2gaugeDatums ) { - ArrayList<WW> results = new ArrayList<WW>(); + ArrayList<WWQQ> results = new ArrayList<WWQQ>(); int numProblems = numProblems(); @@ -51,7 +51,7 @@ } return new CalculationResult( - results.toArray(new WW[results.size()]), + results.toArray(new WWQQ[results.size()]), this); }
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java Tue Feb 07 08:28:22 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java Tue Feb 07 09:52:55 2012 +0000 @@ -50,16 +50,16 @@ " /stateId: " + stateId); } - return getWW(artifact, context); + return getWWQQ(artifact, context); } - protected WW getWW(Artifact artifact, CallContext context) { + protected WWQQ getWWQQ(Artifact artifact, CallContext context) { FLYSArtifact winfo = (FLYSArtifact)artifact; CalculationResult res = (CalculationResult) winfo.compute(context, hash, stateId, type, false); - return ((WW [])res.getData())[index]; + return ((WWQQ [])res.getData())[index]; } @Override @@ -98,10 +98,10 @@ Object obj = context.getContextValue("reference.curve.axis.scale"); if (!(obj instanceof WWAxisTypes)) { - obj = new WWAxisTypes(getWW(artifact, context)); + obj = new WWAxisTypes(getWWQQ(artifact, context)); } else { - ((WWAxisTypes)obj).classify(getWW(artifact, context)); + ((WWAxisTypes)obj).classify(getWWQQ(artifact, context)); } return obj;
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java Tue Feb 07 08:28:22 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java Tue Feb 07 09:52:55 2012 +0000 @@ -12,7 +12,7 @@ import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.ReferenceCurveFacet; import de.intevation.flys.artifacts.model.ReportFacet; -import de.intevation.flys.artifacts.model.WW; +import de.intevation.flys.artifacts.model.WWQQ; import de.intevation.flys.artifacts.resources.Resources; @@ -54,7 +54,7 @@ return res; } - WW [] wws = (WW [])res.getData(); + WWQQ [] wws = (WWQQ [])res.getData(); for (int i = 0; i < wws.length; ++i) { facets.add(new ReferenceCurveFacet(i,