comparison flys-artifacts/ChangeLog @ 704:eab5e5089d77

Merged revisions 2127-2133,2136-2137,2140,2143-2144,2146,2150-2151,2153-2154 via svnmerge from svn+ssh://teichmann@thoe/home/projects/Geospatial/bsh-generischer-viewer/Material/SVN/flys-artifacts/branches/facets-slt ........ r2127 | ingo | 2011-06-16 09:50:56 +0200 (Do, 16 Jun 2011) | 1 line Added a compute() method to WINFOArtifact which acts as a dispatcher for different computations. It triggers a calculation based on ComputeCallbacks that are generated by the current states. ........ r2128 | ingo | 2011-06-16 10:25:06 +0200 (Do, 16 Jun 2011) | 1 line Moved Waterlevel state into the correct package. ........ r2129 | ingo | 2011-06-16 10:43:58 +0200 (Do, 16 Jun 2011) | 1 line Added two more compute() methods to ComputeCallback to distinguish between different phases of the artifact. ........ r2130 | ingo | 2011-06-16 10:57:05 +0200 (Do, 16 Jun 2011) | 1 line Use enums to dispatch computeFeed() and computeAdvance(). ........ r2131 | ingo | 2011-06-16 11:04:59 +0200 (Do, 16 Jun 2011) | 1 line Store facets for each state. ........ r2132 | ingo | 2011-06-16 12:05:44 +0200 (Do, 16 Jun 2011) | 1 line Generated facets for each output aspect. ........ r2133 | ingo | 2011-06-16 15:24:00 +0200 (Do, 16 Jun 2011) | 1 line Write computed facets into artifacts describe document. ........ r2136 | ingo | 2011-06-16 16:10:49 +0200 (Do, 16 Jun 2011) | 1 line Add index and description of facets to collections describe document. ........ r2137 | ingo | 2011-06-16 16:31:41 +0200 (Do, 16 Jun 2011) | 1 line OutGenerators doOut() takes a facet object now instead of just its name. ........ r2140 | ingo | 2011-06-17 11:19:43 +0200 (Fr, 17 Jun 2011) | 1 line OutGenerators use now facets to fetch necessary data. ........ r2143 | teichmann | 2011-06-17 12:40:54 +0200 (Fr, 17 Jun 2011) | 1 line Removed ComputeCallback because this was thought too complicated. Fixed issue with facets not be re-generated if same state is entered again. ........ r2144 | teichmann | 2011-06-17 13:08:31 +0200 (Fr, 17 Jun 2011) | 1 line make getGauges() more robust ........ r2146 | teichmann | 2011-06-17 13:23:57 +0200 (Fr, 17 Jun 2011) | 1 line mico opt: inter cmps are faster than str cmps. ........ r2150 | teichmann | 2011-06-17 15:10:20 +0200 (Fr, 17 Jun 2011) | 1 line call computeAdvance() if we want to advance. ........ r2151 | teichmann | 2011-06-17 15:45:50 +0200 (Fr, 17 Jun 2011) | 1 line Base WST/CSV exports on facets. TODO: generate the facets. ........ r2153 | teichmann | 2011-06-17 16:03:29 +0200 (Fr, 17 Jun 2011) | 1 line Add facet to access raw computed data. ........ r2154 | teichmann | 2011-06-17 16:37:09 +0200 (Fr, 17 Jun 2011) | 1 line Generate data facets for the computed states. ........ flys-artifacts/trunk@2156 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Fri, 17 Jun 2011 16:17:03 +0000
parents d45c3ddaed1b 3dc61e00385e
children 853dceead0f4
comparison
equal deleted inserted replaced
685:d45c3ddaed1b 704:eab5e5089d77
1 2011-06-17 Sascha L. Teichmann <sascha.teichmann@intevation.de>
2
3 Merged in the facet-slt branch to bring in the 'facet' feature.
4
5 * doc/conf/artifacts/winfo.xml: Fixed some facets.
6
7 * doc/conf/cache.xml: Added a "computed.values" cache to store the
8 results of the WINFO calculations.
9
10 * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java:
11 Add support for index per facet to make them unique and identifiable.
12
13 * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java:
14 New. Inteface to be used to access the facet names of the configuration.
15
16 * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: New.
17 A facet to be used to have raw access to the computed data of an artifact.
18 Useful to export things like CSV and WST.
19
20 * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: New.
21 Specialized facet to access the water level data stored in WQKms arrays.
22
23 * src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java: New.
24 Specialized facet to access the duration data stored in WQDay data structures.
25
26 * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Facets are
27 now generated dynamically from the current available ones stored with
28 the artifact.
29
30 * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: Added
31 methods computeAdvance() and computeFeed() called if artifact is fed or
32 adance. This overwritten in subclasses to do the state depending calculations.
33
34 * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java,
35 src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java,
36 src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java,
37 src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java,
38 src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: These
39 states overwrites the computeAdvance() and computeFeed() methods to do
40 the corresponding WINFO calculations.
41
42 * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Calls
43 computeAdvance() and computeFeed() if artifact is fed or advanced. Centralized
44 the caching mechanism.
45
46 * src/main/java/de/intevation/flys/exports/AbstractExporter.java,
47 src/main/java/de/intevation/flys/collections/AttributeParser.java,
48 src/main/java/de/intevation/flys/collections/OutputParser.java,
49 src/main/java/de/intevation/flys/collections/AttributeWriter.java,
50 src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java:
51 Adjusted the code to cope with the indices of the facets. Used
52 DOM to access the attributes instead of XPath. Removed smaller bugs
53 concerning position generation.
54
55 * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java,
56 src/main/java/de/intevation/flys/exports/ChartGenerator.java,
57 src/main/java/de/intevation/flys/exports/OutGenerator.java:
58 Forwarded facet references.
59
60 * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java,
61 src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java,
62 src/main/java/de/intevation/flys/exports/DurationCurveExporter.java,
63 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java,
64 src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java,
65 src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java,
66 src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java,
67 src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java,
68 src/main/java/de/intevation/flys/exports/WaterlevelExporter.java:
69 Uses facets to fetch data and generate output now.
70
1 2011-06-17 Ingo Weinzierl <ingo@intevation.de> 71 2011-06-17 Ingo Weinzierl <ingo@intevation.de>
2 72
3 * doc/conf/artifacts/winfo.xml: Added a new parameter "wq_free" that 73 * doc/conf/artifacts/winfo.xml: Added a new parameter "wq_free" that
4 determines the mode of calculation 1. If it is "false" (default), 74 determines the mode of calculation 1. If it is "false" (default),
5 the calculation should be bound to a gauge. 75 the calculation should be bound to a gauge.

http://dive4elements.wald.intevation.org