Mercurial > dive4elements > river
changeset 2730:0657e7966c87
Add cross-section output to dischargelong.section.
flys-artifacts/trunk@4463 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 22 May 2012 18:23:32 +0000 |
| parents | a441be7f1589 |
| children | 55a3b575f644 |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/artifacts/winfo.xml flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java |
| diffstat | 3 files changed, 26 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Tue May 22 17:09:27 2012 +0000 +++ b/flys-artifacts/ChangeLog Tue May 22 18:23:32 2012 +0000 @@ -1,3 +1,11 @@ +2012-05-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * doc/conf/artifacts/winfo.xml: Allow cross-section stuff in + dischargelongitudinal state. + + * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java: + Add CrossSectionWaterLineFacets, will trigger the cross section output. + 2012-05-22 Felix Wolfsteller <felix.wolfsteller@intevation.de> * src/main/java/de/intevation/flys/artifacts/FixationArtifact.java:
--- a/flys-artifacts/doc/conf/artifacts/winfo.xml Tue May 22 17:09:27 2012 +0000 +++ b/flys-artifacts/doc/conf/artifacts/winfo.xml Tue May 22 18:23:32 2012 +0000 @@ -282,6 +282,7 @@ <facet name="computed_discharge_curve.mainvalues.q" description="facet.computed_discharge_curve.mainvalues.q"/> <facet name="computed_discharge_curve.mainvalues.w" description="facet.computed_discharge_curve.mainvalues.w"/> <facet name="discharge_curve.curve" description="facet.discharge_curve.curve"/> + <facet name="heightmarks_points" description="facet.other.wqkms"/> <facet name="other.wqkms" description="facet.other.wqkms"/> <facet name="other.wq" description="Point-like data like fixations"/> <facet name="other.wq" description="Point-like data like fixations"/> @@ -390,6 +391,16 @@ <facet name="report" description="facet.discharge_longitudinal_section_export.report"/> </facets> </outputmode> + <outputmode name="cross_section" description="output.cross_section" mime-type="image/png" type="chart"> + <facets> + <facet name="cross_section_water_line" description="facet.cross_section_water_line"/> + <facet name="cross_section" description="facet.cross_section"/> + <facet name="area" description="an area"/> + <facet name="cross_section.area" description="an area"/> + <facet name="cross_section.manualpoints" description="points"/> + <facet name="hyk" description="hyks"/> + </facets> + </outputmode> </outputmodes> </state>
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java Tue May 22 17:09:27 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java Tue May 22 18:23:32 2012 +0000 @@ -12,6 +12,7 @@ import de.intevation.flys.artifacts.WINFOArtifact; import de.intevation.flys.artifacts.ChartArtifact; +import de.intevation.flys.artifacts.model.CrossSectionWaterLineFacet; import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.ReportFacet; import de.intevation.flys.artifacts.model.WaterlevelFacet; @@ -76,6 +77,9 @@ Facet q = new WaterlevelFacet( i, DISCHARGE_LONGITUDINAL_Q, nameQ); + Facet s = new CrossSectionWaterLineFacet(i, nameW); + + facets.add(s); facets.add(w); facets.add(q); @@ -89,7 +93,10 @@ Facet c = new WaterlevelFacet( i, DISCHARGE_LONGITUDINAL_C, nameC); + Facet r = new CrossSectionWaterLineFacet(i, nameC); + facets.add(c); + facets.add(r); } }