diff artifacts/doc/conf/generators/discharge-diagrams.xml @ 8387:8c60595fd74c

Unify discharge curve subtitles.
author Tom Gottfried <tom@intevation.de>
date Tue, 07 Oct 2014 15:23:08 +0200
parents 5f0bc8b28024
children caba2157ed97
line wrap: on
line diff
--- a/artifacts/doc/conf/generators/discharge-diagrams.xml	Tue Oct 07 13:41:54 2014 +0200
+++ b/artifacts/doc/conf/generators/discharge-diagrams.xml	Tue Oct 07 15:23:08 2014 +0200
@@ -6,6 +6,9 @@
       converter="org.dive4elements.river.exports.DiagramAttributes"
       injectors="org.dive4elements.river.exports.injector.KmFromGaugeNumberInjector,org.dive4elements.river.exports.injector.PNPInjector">
     <title key="chart.historical.discharge.title" default="chart.historical.discharge.title"/>
+    <subtitle key="chart.discharge.curve.subtitle" default="-">
+        <arg expr="artifact.river"/>
+    </subtitle>
     &discharge-defaults;
   </output-generator>
 
@@ -14,9 +17,8 @@
       converter="org.dive4elements.river.exports.DiagramAttributes"
       injectors="org.dive4elements.river.exports.injector.KmFromLocationInjector,org.dive4elements.river.exports.injector.PNPInjector">
     <title key="chart.computed.discharge.curve.title" default="chart.computed.discharge.curve.title"/>
-    <subtitle key="chart.computed.discharge.curve.subtitle" default="-">
+    <subtitle key="chart.discharge.curve.subtitle" default="-">
         <arg expr="artifact.river"/>
-        <arg expr="artifact.ld_locations" type="double"/>
     </subtitle>
     &discharge-defaults;
   </output-generator>
@@ -26,9 +28,8 @@
       converter="org.dive4elements.river.exports.DiagramAttributes"
       injectors="org.dive4elements.river.exports.injector.KmFromGaugeNameInjector,org.dive4elements.river.exports.injector.PNPInjector">
     <title key="chart.discharge.curve.title" default="chart.discharge.curve.title"/>
-    <subtitle key="chart.computed.discharge.curve.subtitle" default="-">
+    <subtitle key="chart.discharge.curve.subtitle" default="-">
         <arg expr="artifact.river"/>
-        <arg expr="artifact.ld_locations" type="double"/>
     </subtitle>
     &discharge-defaults;
   </output-generator>
@@ -38,7 +39,7 @@
       converter="org.dive4elements.river.exports.DiagramAttributes"
       injectors="org.dive4elements.river.exports.injector.KmFromRequestInjector,org.dive4elements.river.exports.injector.PNPInjector">
       <title key="chart.fixings.discharge.curve.title" default="Fixierungsanalyse W/Q"/>
-    <subtitle key="chart.fix.discharge.curve.subtitle" default="-">
+    <subtitle key="chart.discharge.curve.subtitle" default="-">
         <arg expr="artifact.river"/>
     </subtitle>
     &discharge-defaults;
@@ -49,7 +50,7 @@
       injectors="org.dive4elements.river.exports.injector.KmFromRequestInjector,org.dive4elements.river.exports.injector.PNPInjector"
       converter="org.dive4elements.river.exports.DiagramAttributes">
     <title key="chart.fixings.derivedcurve.title" default="-"/>
-    <subtitle key="chart.fix.discharge.curve.subtitle" default="-">
+    <subtitle key="chart.discharge.curve.subtitle" default="-">
         <arg expr="artifact.river"/>
     </subtitle>
     &discharge-defaults;
@@ -60,6 +61,9 @@
       injectors="org.dive4elements.river.exports.injector.PNPInjector"
       converter="org.dive4elements.river.exports.DiagramAttributes">
     <title key="chart.vollmer.discharge.curve.title" default="chart.vollmer.discharge.curve.title"/>
+    <subtitle key="chart.discharge.curve.subtitle" default="-">
+        <arg expr="artifact.river"/>
+    </subtitle>
     &discharge-defaults;
   </output-generator>
 

http://dive4elements.wald.intevation.org