[PATCH 4 of 4] Activated theme 'streckeninformation
Wald Commits
scm-commit at wald.intevation.org
Mon Feb 19 18:04:47 CET 2018
# HG changeset patch
# User gernotbelger
# Date 1519059865 -3600
# Node ID 863f2850dbcf3bfafa13c8304a08659539576d70
# Parent b4aec671051fc2801a5018ed264a1710434848c2
Activated theme 'streckeninformation
diff -r b4aec671051f -r 863f2850dbcf artifacts/doc/conf/artifacts/sinfo.xml
--- a/artifacts/doc/conf/artifacts/sinfo.xml Mon Feb 19 18:04:06 2018 +0100
+++ b/artifacts/doc/conf/artifacts/sinfo.xml Mon Feb 19 18:04:25 2018 +0100
@@ -56,7 +56,7 @@
<state id="state.sinfo.flow_depth" description="state.sinfo.flow_depth" state="org.dive4elements.river.artifacts.sinfo.flowdepth.FlowDepthState" helpText="help.state.sinfo.flow_depth">
<outputmodes>
- <outputmode name="sinfo_flow_depth" description="output.flow_velocity" mime-type="image/png" type="chart">
+ <outputmode name="sinfo_flow_depth" description="output.flow_depth" mime-type="image/png" type="chart">
<facets>
<!-- REMARK: id's that ends with 'filtered' are handled differently ' -->
<facet name="sinfo_flow_depth.filtered" description="Facet for mean flow depth, filtered by current zoom state"/>
@@ -64,22 +64,7 @@
<facet name="sinfo_flow_depth.tkh" description="Facet for tkh"/>
- <!--
- <facet name="flow_velocity.totalchannel" description="A facet for total channels"/>
- <facet name="flow_velocity.mainchannel" description="A facet for main channels"/>
- <facet name="flow_velocity.mainchannel" description="A facet for main channels"/>
- <facet name="flow_velocity.tau" description="A facet for tau"/>
- <facet name="flow_velocity.totalchannel.filtered" description="A facet for total channels"/>
- <facet name="flow_velocity.mainchannel.filtered" description="A facet for main channels"/>
- <facet name="flow_velocity.tau.filtered" description="A facet for tau"/>
- <facet name="flow_velocity.discharge" description="A facet for discharges"/>
- <facet name="flow_velocity.measurement" description="A facet for measured flow velocities"/>
<facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
- <facet name="flow_velocity.manualpoints"/>
- <facet name="bed_longitudinal_section.diameter.toplayer"/>
- <facet name="bed_longitudinal_section.diameter.sublayer"/>
- <facet name="bed_longitudinal_section.diameter.bedload"/>
- -->
</facets>
</outputmode>
diff -r b4aec671051f -r 863f2850dbcf artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml Mon Feb 19 18:04:06 2018 +0100
+++ b/artifacts/doc/conf/meta-data.xml Mon Feb 19 18:04:25 2018 +0100
@@ -117,6 +117,10 @@
<dc:when test="$out = 'floodmap'">
<dc:call-macro name="flood-map-recommended"/>
</dc:when>
+
+ <dc:when test="$out = 'sinfo_flow_depth'">
+ <dc:call-macro name="annotations"/>
+ </dc:when>
</dc:choose>
</dc:iterate>
</dc:when>
@@ -255,6 +259,12 @@
<dc:call-macro name="basedata_4_heightmarks-points"/>
<dc:call-macro name="basedata_5_flood-protections"/>
</dc:when>
+
+ <dc:when test="$out = 'sinfo_flow_depth'">
+ <!-- FIXME: chcck -->
+ <dc:call-macro name="longitudinal-section-prototype"/>
+ </dc:when>
+
</dc:choose>
</dc:iterate>
</dc:otherwise>
More information about the Dive4Elements-commits
mailing list