Mercurial > dive4elements > river
changeset 9342:0c621beceb2f
2.3.4.2.5 Beseitigung des Fehlers beim Laden eines Projektes
der BArt „ausgelagerte Wasserspiegellage“
| author | gernotbelger |
|---|---|
| date | Mon, 30 Jul 2018 14:24:17 +0200 |
| parents | f812880963a9 |
| children | 012ca0cf8756 |
| files | artifacts/src/main/java/org/dive4elements/river/artifacts/model/Segment.java artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java artifacts/src/main/resources/messages.properties artifacts/src/main/resources/messages_de.properties |
| diffstat | 4 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Segment.java Mon Jul 30 10:23:48 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Segment.java Mon Jul 30 14:24:17 2018 +0200 @@ -194,11 +194,11 @@ segment.backup(); for (int i = 0; i < values.length; ++i) { - double w = values[i] * 100.0; + double w = values[i]; // FIXED: * 100.0; double [] qs = DischargeTables.getQsForW(table, w); if (qs.length == 0) { - log.warn("No Qs found for W = " + values[i]); - report.addProblem("cannot.find.q.for.w", values[i]); + log.warn("No Qs found for W = " + w); + report.addProblem("cannot.find.q.for.w", w); values[i] = Double.NaN; success = false; } @@ -206,7 +206,7 @@ values[i] = qs[0]; if (qs.length > 1) { log.warn( - "More than one Q found for W = " + values[i]); + "More than one Q found for W = " + w); } } }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java Mon Jul 30 10:23:48 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java Mon Jul 30 14:24:17 2018 +0200 @@ -142,12 +142,13 @@ facets.add(new DataFacet(AT, "AT data", ComputeType.ADVANCE, hash, id)); - facets.add(new FixWQCurveFacet(0, Resources.getMsg(meta, I18N_WQ_CURVE, I18N_WQ_CURVE) + " (" + access.getFunction() + ")")); + if (fixRes != null) + facets.add(new FixWQCurveFacet(0, Resources.getMsg(meta, I18N_WQ_CURVE, I18N_WQ_CURVE) + " (" + access.getFunction() + ")")); - if (access.getPreprocessing()) { + if (access.getPreprocessing() && fixRes != null) { facets.add(new FixOutlierFacet(0, FIX_OUTLIER, Resources.getMsg(meta, I18N_WQ_OUTLIER, I18N_WQ_OUTLIER))); } return res; } -} +} \ No newline at end of file
--- a/artifacts/src/main/resources/messages.properties Mon Jul 30 10:23:48 2018 +0200 +++ b/artifacts/src/main/resources/messages.properties Mon Jul 30 14:24:17 2018 +0200 @@ -568,6 +568,7 @@ km.not.found = Cannot find km. cannot.create.wq.relation = Cannot create W/Q relation. cannot.create.index.q.relation = Cannot create index/Q relation. +cannot.find.q.for.w = Cannot find Q for W = {0,number,#.##}. w.w.qkm1.failed = Calculating Q for WST index {0,number,#.##} failed. w.w.wkm1.failed = Calculating W for Q = {0,number,#.##} / WST index {1,number,#.##} failed.
--- a/artifacts/src/main/resources/messages_de.properties Mon Jul 30 10:23:48 2018 +0200 +++ b/artifacts/src/main/resources/messages_de.properties Mon Jul 30 14:24:17 2018 +0200 @@ -568,6 +568,7 @@ km.not.found = Passender Kilometer konnte nicht gefunden werden. cannot.create.wq.relation = W/Q-Beziehung konnte nicht ermittelt werden. cannot.create.index.q.relation = Spaltenindex/Q-Beziehung konnte nicht erstellt werden. +cannot.find.q.for.w = Q zu W = {0,number,#.##} kann nicht ermittelt werden. w.w.qkm1.failed = Berechnung von Q f\u00fcr WST-Index {0,number,#.##} fehlgeschlagen. w.w.wkm1.failed = Berechnung von W f\u00fcr Q = {0,number,#.##} / WST-Index {1,number,#.##} fehlgeschlagen.