[PATCH 2 of 6] Added definitions for the S-Info collision workflow and output
Wald Commits
scm-commit at wald.intevation.org
Tue Jun 19 14:25:09 CEST 2018
# HG changeset patch
# User mschaefer
# Date 1529410605 -7200
# Node ID 568961ff709aa4603e60956565d1ffee9b1cbb33
# Parent 9b4f5e61c02e58448e905ba5f9d3df6026d1c185
Added definitions for the S-Info collision workflow and output
diff -r 9b4f5e61c02e -r 568961ff709a artifacts/doc/conf/artifacts/manualpoints.xml
--- a/artifacts/doc/conf/artifacts/manualpoints.xml Tue Jun 19 14:15:32 2018 +0200
+++ b/artifacts/doc/conf/artifacts/manualpoints.xml Tue Jun 19 14:16:45 2018 +0200
@@ -41,6 +41,7 @@
<facet name="sinfo_flow_depth_development.manualpoints" />
<facet name="sinfo_flow_depth_development_peryear.manualpoints" />
<facet name="sinfo_tkk" />
+ <facet name="sinfo_collision.manualpoints" />
</facets>
</outputmode>
</outputmodes>
diff -r 9b4f5e61c02e -r 568961ff709a artifacts/doc/conf/artifacts/sinfo.xml
--- a/artifacts/doc/conf/artifacts/sinfo.xml Tue Jun 19 14:15:32 2018 +0200
+++ b/artifacts/doc/conf/artifacts/sinfo.xml Tue Jun 19 14:16:45 2018 +0200
@@ -280,17 +280,9 @@
<outputmodes>
<outputmode name="sinfo_collision" description="output.sinfo_collision" mime-type="image/png" type="chart">
<facets>
- <!--
- <facet name="sinfo_facet_flow_depth.filtered" description="flow depth, filtered by current zoom state" />
- <facet name="sinfo_facet_flow_depth" description="flow depth" />
-
- <facet name="sinfo_facet_flow_depth_with_tkh.filtered" description="flow depth including tkh, filtered by current zoom state" />
- <facet name="sinfo_facet_flow_depth_with_tkh" description="flow depth including tkh" />
-
- <facet name="sinfo_facet_tkh" description="Facet for tkh" />
-
+ <facet name="sinfo_facet_collision_calc_count" description="bed collisions" />
<facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations" />
- -->
+ <facet name="sinfo_collision.manualpoints" description="Manual Points" />
</facets>
</outputmode>
diff -r 9b4f5e61c02e -r 568961ff709a artifacts/doc/conf/generators/longitudinal-diagram-defaults.xml
--- a/artifacts/doc/conf/generators/longitudinal-diagram-defaults.xml Tue Jun 19 14:15:32 2018 +0200
+++ b/artifacts/doc/conf/generators/longitudinal-diagram-defaults.xml Tue Jun 19 14:16:45 2018 +0200
@@ -56,6 +56,7 @@
<processor class="org.dive4elements.river.artifacts.sinfo.common.VelocityProcessor" axis="Velocity"/>
<processor class="org.dive4elements.river.artifacts.sinfo.common.FlowDepthDevelopmentProcessor" axis="flowdepthDevelopmentAxis"/>
<processor class="org.dive4elements.river.artifacts.sinfo.common.FlowDepthDevelopmentPerYearProcessor" axis="flowdepthDevelopmentPerYearAxis"/>
+ <processor class="org.dive4elements.river.artifacts.sinfo.common.CollisionCalcProcessor" axis="countAxis"/>
<processor class="org.dive4elements.river.artifacts.sinfo.common.PredefinedChannelWidthProcessor" axis="Width"/>
<processor class="org.dive4elements.river.artifacts.sinfo.common.PredefinedChannelDepthProcessor" axis="flowdepthAxis"/>
@@ -65,7 +66,6 @@
<processor class="org.dive4elements.river.artifacts.sinfo.common.PredefinedFlowDepthProcessor" axis="flowdepthAxis"/>
<processor class="org.dive4elements.river.artifacts.sinfo.common.InfrastructureHeightProcessor" axis="W"/>
<processor class="org.dive4elements.river.artifacts.sinfo.common.CollisionCountProcessor" axis="countAxis"/>
- <processor class="org.dive4elements.river.artifacts.sinfo.common.CollisionGaugeWProcessor" axis="W"/>
<chartextender class="org.dive4elements.river.artifacts.sinfo.flowdepth.FlowDepthChartExtender" />
</longitudinal-defaults>
\ No newline at end of file
diff -r 9b4f5e61c02e -r 568961ff709a artifacts/doc/conf/generators/longitudinal-diagrams.xml
--- a/artifacts/doc/conf/generators/longitudinal-diagrams.xml Tue Jun 19 14:15:32 2018 +0200
+++ b/artifacts/doc/conf/generators/longitudinal-diagrams.xml Tue Jun 19 14:16:45 2018 +0200
@@ -152,5 +152,18 @@
<arg expr="artifact.river"/>
</subtitle>
</output-generator>
+
+ <output-generator
+ names="sinfo_collision,sinfo_collision_chartinfo"
+ class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
+ converter="org.dive4elements.river.exports.DiagramAttributes">
+ <title key="sinfo.chart.collision.section.title" default="Grundberührungen (DEFAULT)"/>
+ &longitudinal-defaults;
+ <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
+ axis="countAxis"/>
+ <subtitle key="chart.w_differences.subtitle" default="-">
+ <arg expr="artifact.river"/>
+ </subtitle>
+ </output-generator>
</longitudinal-diagrams>
\ No newline at end of file
diff -r 9b4f5e61c02e -r 568961ff709a artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml Tue Jun 19 14:15:32 2018 +0200
+++ b/artifacts/doc/conf/meta-data.xml Tue Jun 19 14:16:45 2018 +0200
@@ -133,6 +133,9 @@
<dc:when test="$out = 'sinfo_tkk'">
<dc:call-macro name="annotations" />
</dc:when>
+ <dc:when test="$out = 'sinfo_collision'">
+ <dc:call-macro name="annotations" />
+ </dc:when>
</dc:choose>
</dc:iterate>
</dc:when>
@@ -297,6 +300,9 @@
<dc:when test="$out = 'sinfo_tkk'">
<dc:call-macro name="longitudinal-section-prototype" />
</dc:when>
+ <dc:when test="$out = 'sinfo_collision'">
+ <dc:call-macro name="longitudinal-section-prototype" />
+ </dc:when>
</dc:choose>
</dc:iterate>
</dc:otherwise>
@@ -1646,6 +1652,7 @@
<dc:call-macro name="sinfo_flowdepths_minmax" />
<dc:call-macro name="sinfo_flow_depth_development" />
<dc:call-macro name="sinfo_tkh" />
+ <dc:call-macro name="sinfo_collision" />
<dc:comment> WINFO/DIFF/FIX </dc:comment>
<dc:call-macro name="longitudinal" />
@@ -3388,6 +3395,25 @@
</dc:filter>
</dc:macro>
+ <dc:macro name="sinfo_collision">
+ <dc:filter expr="$a_state = 'state.sinfo.collision'">
+ <dc:if test="dc:has-result()">
+ <sinfo_collision>
+ <dc:for-each>
+ <dc:element name="${facet_name}">
+ <dc:attribute name="factory" value="sinfo" />
+ <dc:attribute name="target_out" value="${out}" />
+ <dc:attribute name="description" value="${facet_description}" />
+ <dc:attribute name="ids" value="${facet_num}" />
+ <dc:attribute name="artifact-id" value="${a_gid}" />
+ <dc:attribute name="out" value="${out_name}" />
+ </dc:element>
+ </dc:for-each>
+ </sinfo_collision>
+ </dc:if>
+ </dc:filter>
+ </dc:macro>
+
<!-- channel size imported from CSV-files for S-INFO -->
<dc:macro name="sinfo_predefined_channel">
<dc:context>
diff -r 9b4f5e61c02e -r 568961ff709a artifacts/doc/conf/themes.xml
--- a/artifacts/doc/conf/themes.xml Tue Jun 19 14:15:32 2018 +0200
+++ b/artifacts/doc/conf/themes.xml Tue Jun 19 14:16:45 2018 +0200
@@ -441,6 +441,8 @@
<mapping from="sinfo_facet_waterlevel_difference.filtered" to="SInfoWaterlevelDifference" />
<mapping from="sinfo_facet_bedheight_difference.filtered" to="SInfoBedHeightDifference" />
+ <mapping from ="sinfo_facet_collision_calc_count" to="SInfoCollisionCount" />
+
<mapping from="sinfo_facet_predefined_channel_width" to="SInfoPredefinedChannelWidth" />
<mapping from="sinfo_facet_predefined_channel_depth" to="SInfoPredefinedChannelDepth" />
<mapping from="sinfo_facet_predefined_tkh" to="SInfoPredefinedTkh" />
@@ -449,12 +451,12 @@
<mapping from="sinfo_facet_predefined_flowdepth" to="SInfoPredefinedFlowDepth" />
<mapping from="sinfo_facet_infrastructure_height" to="SInfoInfrastructureHeight" />
<mapping from="sinfo_facet_collision_count" to="SInfoCollisionCount" />
- <mapping from="sinfo_facet_collision_gaugew" to="SInfoCollisionGaugeW" />
<mapping from="sinfo_flow_depth.manualpoints" to="ManualPoints" />
<mapping from="sinfo_flow_depth_minmax.manualpoints" to="ManualPoints" />
<mapping from="sinfo_flow_depth_development.manualpoints" to="ManualPoints" />
<mapping from="sinfo_flow_depth_development_peryear.manualpoints" to="ManualPoints" />
<mapping from="sinfo_tkk" to="ManualPoints" />
+ <mapping from="sinfo_collision.manualpoints" to="ManualPoints" />
</mappings>
</themes>
\ No newline at end of file
diff -r 9b4f5e61c02e -r 568961ff709a artifacts/doc/conf/themes/default.xml
--- a/artifacts/doc/conf/themes/default.xml Tue Jun 19 14:15:32 2018 +0200
+++ b/artifacts/doc/conf/themes/default.xml Tue Jun 19 14:16:45 2018 +0200
@@ -3063,13 +3063,4 @@
<field name="pointcolor" type="Color" display="Punktfarbe" default="48, 96, 255" />
</fields>
</theme>
- <theme name="SInfoCollisionGaugeW">
- <inherits>
- <inherit from="LongitudinalSectionPoints" />
- </inherits>
- <fields>
- <field name="pointsize" type="int" display="Punktdicke" default="3" />
- <field name="pointcolor" type="Color" display="Linienfarbe" default="64, 64, 128" />
- </fields>
- </theme>
</themegroup>
\ No newline at end of file
diff -r 9b4f5e61c02e -r 568961ff709a artifacts/doc/conf/themes/second.xml
--- a/artifacts/doc/conf/themes/second.xml Tue Jun 19 14:15:32 2018 +0200
+++ b/artifacts/doc/conf/themes/second.xml Tue Jun 19 14:16:45 2018 +0200
@@ -3050,13 +3050,4 @@
<field name="pointcolor" type="Color" display="Punktfarbe" default="48, 96, 192" />
</fields>
</theme>
- <theme name="SInfoCollisionGaugeW">
- <inherits>
- <inherit from="LongitudinalSectionPoints" />
- </inherits>
- <fields>
- <field name="pointsize" type="int" display="Punktdicke" default="3" />
- <field name="pointcolor" type="Color" display="Linienfarbe" default="64, 64, 96" />
- </fields>
- </theme>
</themegroup>
\ No newline at end of file
More information about the Dive4Elements-commits
mailing list