[PATCH 2 of 2] Definitions for U-Info salix line

Wald Commits scm-commit at wald.intevation.org
Tue Jul 24 18:53:06 CEST 2018


# HG changeset patch
# User mschaefer
# Date 1532451160 -7200
# Node ID 77f24792d75f7fd03d552d3ad12a080db6e17d19
# Parent  385b52ccde23a2ae5fc126398a156b9686258ba2
Definitions for U-Info salix line

diff -r 385b52ccde23 -r 77f24792d75f artifacts/doc/conf/generators/longitudinal-diagram-defaults.xml
--- a/artifacts/doc/conf/generators/longitudinal-diagram-defaults.xml	Tue Jul 24 18:51:47 2018 +0200
+++ b/artifacts/doc/conf/generators/longitudinal-diagram-defaults.xml	Tue Jul 24 18:52:40 2018 +0200
@@ -71,4 +71,7 @@
     <processor class="org.dive4elements.river.artifacts.sinfo.collision.CollisionCountProcessor" axis="countAxis"/>
 
     <chartextender class="org.dive4elements.river.artifacts.sinfo.flowdepth.FlowDepthChartExtender" />
+    
+    <!-- U-INFO -->
+    <processor class="org.dive4elements.river.artifacts.uinfo.salix.SalixLineProcessor" axis="W"/>
 </longitudinal-defaults>
\ No newline at end of file
diff -r 385b52ccde23 -r 77f24792d75f artifacts/doc/conf/generators/longitudinal-diagrams.xml
--- a/artifacts/doc/conf/generators/longitudinal-diagrams.xml	Tue Jul 24 18:51:47 2018 +0200
+++ b/artifacts/doc/conf/generators/longitudinal-diagrams.xml	Tue Jul 24 18:52:40 2018 +0200
@@ -191,5 +191,18 @@
             <arg expr="artifact.river"/>
         </subtitle>
     </output-generator>
+
+    <output-generator
+        names="uinfo_salix_line,uinfo_salix_line_chartinfo"
+        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
+        converter="org.dive4elements.river.exports.DiagramAttributes">
+        <title key="uinfo.chart.salix_line.section.title" default="Salix-Linie (DEFAULT)"/>
+        &longitudinal-defaults;
+        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
+            axis="W"/>
+        <subtitle key="chart.w_differences.subtitle" default="-">
+            <arg expr="artifact.river"/>
+        </subtitle>
+    </output-generator>
     
 </longitudinal-diagrams>
\ No newline at end of file
diff -r 385b52ccde23 -r 77f24792d75f artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Tue Jul 24 18:51:47 2018 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Tue Jul 24 18:52:40 2018 +0200
@@ -142,6 +142,10 @@
                   <dc:when test="$out = 'sinfo_flood_height'">
                     <dc:call-macro name="annotations" />
                   </dc:when>
+                  
+                  <dc:when test="$out = 'uinfo_salix_line'">
+                    <dc:call-macro name="annotations" />
+                  </dc:when>
                 </dc:choose>
               </dc:iterate>
             </dc:when>
@@ -318,6 +322,10 @@
                   <dc:when test="$out = 'sinfo_flood_duration_curve'">
                     <dc:call-macro name="longitudinal-section-prototype" />
                   </dc:when>
+                  
+                  <dc:when test="$out = 'uinfo_salix_line'">
+                    <dc:call-macro name="longitudinal-section-prototype" />
+                  </dc:when>
                 </dc:choose>
               </dc:iterate>
             </dc:otherwise>


More information about the Dive4Elements-commits mailing list