Mercurial > dive4elements > river
comparison flys-artifacts/ChangeLog @ 3811:1558ef7b0e7b
Picked rev3357, rev3359 and rev3360 from trunk.
flys-artifacts/tags/pre2.6-2011-12-05@3362 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Wed, 07 Dec 2011 13:36:36 +0000 |
parents | b6431052a694 |
children | b7b8e625ec82 |
comparison
equal
deleted
inserted
replaced
3810:b6431052a694 | 3811:1558ef7b0e7b |
---|---|
1 2011-12-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
2 | |
3 Further flys/issue420 fix (No Discharge Curves for Mosel). | |
4 | |
5 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
6 (includeYRange, mergeRanges): Moved NaN-guard to lowest level. | |
7 (combineXRanges): Also NaN guard the X Axis extent. | |
8 | |
9 2011-12-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
10 | |
11 Partial fix for flys/issue420 (Berechnete Abflusskurve: Kein Diagramm für | |
12 Mosel). Protect axis extent calculation from empty or invalid | |
13 datasets. | |
14 | |
15 * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: | |
16 (includeRange, includeYRange): Renamed, updated callers. | |
17 (includeYRange): Protect from merging extent with NaNs. | |
18 (debugDatasets): Be more verbose on the datasets. | |
19 (zoom): Doc. | |
20 | |
21 2011-12-06 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
22 | |
23 Fix flys/issue423 (Diagramm: Hauptwerte bei Abflusskurve am Pegel | |
24 werden an Y-Achse nicht angezeigt) - show not "raw" (vs interpolated) | |
25 values at Gauge. | |
26 | |
27 * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, | |
28 src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java: | |
29 Add parameterization to let facet know whether to fetch data at | |
30 Gauges or at Artifacts position. | |
31 | |
32 * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: | |
33 Let the MainValueFacets know whether to ask for interpolated | |
34 MainValues; (do not interpolate for Gauges Main Values). | |
35 (getMainValuesQ, getMainValuesW): Added parameter to control | |
36 interpolation. | |
37 | |
1 2011-12-05 Ingo Weinzierl <ingo@intevation.de> | 38 2011-12-05 Ingo Weinzierl <ingo@intevation.de> |
2 | 39 |
3 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Modified | 40 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Modified |
4 prefix constants for Mapserver layers and renamed constants (which have | 41 prefix constants for Mapserver layers and renamed constants (which have |
5 been postfixes before). | 42 been postfixes before). |
12 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | 49 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: |
13 Bugfix: Evaluate the correct parameter whether to set the floodplain or | 50 Bugfix: Evaluate the correct parameter whether to set the floodplain or |
14 not. In addition, the scenario parameter used by WSPLGEN is now set | 51 not. In addition, the scenario parameter used by WSPLGEN is now set |
15 correctly. | 52 correctly. |
16 | 53 |
54 >>>>>>> .r3356 | |
17 2011-12-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | 55 2011-12-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> |
18 | 56 |
19 Allow longitudinal_section.q facets in wdiff states output. | 57 Allow longitudinal_section.q facets in wdiff states output. |
20 | 58 |
21 * doc/conf/artifacts/winfo.xml: Added longitudinal_section.q facets | 59 * doc/conf/artifacts/winfo.xml: Added longitudinal_section.q facets |