Mercurial > dive4elements > river
comparison flys-artifacts/doc/conf/artifacts/winfo.xml @ 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 af3b5d9e91a4 |
children | 08dd826439ef |
comparison
equal
deleted
inserted
replaced
685:d45c3ddaed1b | 704:eab5e5089d77 |
---|---|
43 <data name="ld_locations" type="Double[]" /> | 43 <data name="ld_locations" type="Double[]" /> |
44 | 44 |
45 <outputmodes> | 45 <outputmodes> |
46 <outputmode name="discharge_curve" description="output.discharge_curve" mime-type="image/png"> | 46 <outputmode name="discharge_curve" description="output.discharge_curve" mime-type="image/png"> |
47 <facets> | 47 <facets> |
48 <facet name="discharge_curve.curve" description="facet.discharge_curve.curve"/> | |
49 <facet name="discharge_curve.w" description="facet.discharge_curve.w"/> | 48 <facet name="discharge_curve.w" description="facet.discharge_curve.w"/> |
50 <facet name="discharge_curve.q" description="facet.discharge_curve.q"/> | 49 <facet name="discharge_curve.q" description="facet.discharge_curve.q"/> |
51 </facets> | 50 </facets> |
52 </outputmode> | 51 </outputmode> |
53 </outputmodes> | 52 </outputmodes> |
129 | 128 |
130 <state id="state.winfo.computeddischargecurve" description="state.winfo.computeddischargecurve" state="de.intevation.flys.artifacts.states.ComputedDischargeCurveState"> | 129 <state id="state.winfo.computeddischargecurve" description="state.winfo.computeddischargecurve" state="de.intevation.flys.artifacts.states.ComputedDischargeCurveState"> |
131 <outputmodes> | 130 <outputmodes> |
132 <outputmode name="computed_discharge_curve" description="output.computed_discharge_curve" mime-type="image/png"> | 131 <outputmode name="computed_discharge_curve" description="output.computed_discharge_curve" mime-type="image/png"> |
133 <facets> | 132 <facets> |
134 <facet name="computed_discharge_curve.w" description="facet.computed_discharge_curve.w"/> | |
135 <facet name="computed_discharge_curve.q" description="facet.computed_discharge_curve.q"/> | 133 <facet name="computed_discharge_curve.q" description="facet.computed_discharge_curve.q"/> |
136 </facets> | 134 </facets> |
137 </outputmode> | 135 </outputmode> |
138 <outputmode name="computed_dischargecurve_export" description="output.computed_dischargecurve_export" mime-type="text/plain"> | 136 <outputmode name="computed_dischargecurve_export" description="output.computed_dischargecurve_export" mime-type="text/plain"> |
139 <facets> | 137 <facets> |
181 </facets> | 179 </facets> |
182 </outputmode> | 180 </outputmode> |
183 <outputmode name="discharge_longitudinal_section_export" description="output.discharge_longitudinal_section_export" mime-type="text/plain"> | 181 <outputmode name="discharge_longitudinal_section_export" description="output.discharge_longitudinal_section_export" mime-type="text/plain"> |
184 <facets> | 182 <facets> |
185 <facet name="csv" description="facet.discharge_longitudinal_section_export.csv" /> | 183 <facet name="csv" description="facet.discharge_longitudinal_section_export.csv" /> |
186 <facet name="wst" description="facet.discharge_longitudinal_section_export.csv" /> | 184 <facet name="wst" description="facet.discharge_longitudinal_section_export.wst" /> |
187 </facets> | 185 </facets> |
188 </outputmode> | 186 </outputmode> |
189 </outputmodes> | 187 </outputmodes> |
190 </state> | 188 </state> |
191 | 189 |