Mercurial > dive4elements > river

changeset 7239:a62c5b48ccab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Configure SQ Relations to use new diagram way
author Andre Heinecke <aheinecke@intevation.de>
date Fri, 04 Oct 2013 16:59:30 +0200
parents f4612310f12f
children bb4a6b0077cf
files artifacts/doc/conf/conf.xml artifacts/doc/conf/generators.xml artifacts/doc/conf/sqrelation-diagram-defaults.xml
diffstat 3 files changed, 50 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/conf.xml	Wed Oct 02 18:27:14 2013 +0200
+++ b/artifacts/doc/conf/conf.xml	Fri Oct 04 16:59:30 2013 +0200
@@ -9,6 +9,7 @@
     <!ENTITY rivermap	 SYSTEM "rivermap.xml">
     <!ENTITY generators  SYSTEM "generators.xml">
     <!ENTITY longitudinal-defaults SYSTEM "longitudinal-diagram-defaults.xml">
+    <!ENTITY sqrelation-defaults SYSTEM "sqrelation-diagram-defaults.xml">
 ]>
 <artifact-database>
     <export-secret>YOUR_SECRET</export-secret>
--- a/artifacts/doc/conf/generators.xml	Wed Oct 02 18:27:14 2013 +0200
+++ b/artifacts/doc/conf/generators.xml	Fri Oct 04 16:59:30 2013 +0200
@@ -84,6 +84,42 @@
         <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
             axis="Velocity"/>
     </output-generator>
+    <output-generator names="sq_relation_a,sq_relation_a_chartinfo"
+      class="org.dive4elements.river.exports.DiagramGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes">
+      <title key="chart.sq_relation_a.title" default=""/>
+      &sqrelation-defaults;
+    </output-generator>
+    <output-generator names="sq_relation_b,sq_relation_b_chartinfo"
+      class="org.dive4elements.river.exports.DiagramGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes">
+      <title key="chart.sq_relation_b.title" default=""/>
+      &sqrelation-defaults;
+    </output-generator>
+    <output-generator names="sq_relation_c,sq_relation_c_chartinfo"
+      class="org.dive4elements.river.exports.DiagramGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes">
+      <title key="chart.sq_relation_e.title" default=""/>
+      &sqrelation-defaults;
+    </output-generator>
+    <output-generator names="sq_relation_d,sq_relation_d_chartinfo"
+      class="org.dive4elements.river.exports.DiagramGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes">
+      <title key="chart.sq_relation_d.title" default=""/>
+      &sqrelation-defaults;
+    </output-generator>
+    <output-generator names="sq_relation_e,sq_relation_e_chartinfo"
+      class="org.dive4elements.river.exports.DiagramGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes">
+      <title key="chart.sq_relation_e.title" default=""/>
+      &sqrelation-defaults;
+    </output-generator>
+    <output-generator names="sq_relation_f,sq_relation_f_chartinfo"
+      class="org.dive4elements.river.exports.DiagramGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes">
+      <title key="chart.sq_relation_f.title" default=""/>
+      &sqrelation-defaults;
+    </output-generator>
     <output-generator names="duration_curve" class="org.dive4elements.river.exports.DurationCurveGenerator"/>
     <output-generator names="duration_curve_chartinfo" class="org.dive4elements.river.exports.DurationCurveInfoGenerator"/>
     <output-generator names="waterlevel_export" class="org.dive4elements.river.exports.WaterlevelExporter"/>
@@ -114,18 +150,6 @@
     <output-generator names="bed_difference_epoch" class="org.dive4elements.river.exports.minfo.BedDifferenceEpochGenerator"/>
     <output-generator names="bed_difference_epoch_chartinfo" class="org.dive4elements.river.exports.minfo.BedDiffEpochInfoGenerator"/>
     <output-generator names="bedheight_difference_export" class="org.dive4elements.river.exports.minfo.BedDifferenceExporter"/>
-    <output-generator names="sq_relation_a" class="org.dive4elements.river.exports.sq.SQRelationGeneratorA"/>
-    <output-generator names="sq_relation_b" class="org.dive4elements.river.exports.sq.SQRelationGeneratorB"/>
-    <output-generator names="sq_relation_c" class="org.dive4elements.river.exports.sq.SQRelationGeneratorC"/>
-    <output-generator names="sq_relation_d" class="org.dive4elements.river.exports.sq.SQRelationGeneratorD"/>
-    <output-generator names="sq_relation_e" class="org.dive4elements.river.exports.sq.SQRelationGeneratorE"/>
-    <output-generator names="sq_relation_f" class="org.dive4elements.river.exports.sq.SQRelationGeneratorF"/>
-    <output-generator names="sq_relation_a_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"/>
-    <output-generator names="sq_relation_b_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"/>
-    <output-generator names="sq_relation_c_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"/>
-    <output-generator names="sq_relation_d_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"/>
-    <output-generator names="sq_relation_e_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"/>
-    <output-generator names="sq_relation_f_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"/>
     <output-generator names="sq_relation_export" class="org.dive4elements.river.exports.sq.SQRelationExporter"/>
     <output-generator names="sq_overview" class="org.dive4elements.river.exports.sq.SQOverviewGenerator"/>
     <output-generator names="fix_parameters_export" class="org.dive4elements.river.exports.fixings.ParametersExporter"/>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/doc/conf/sqrelation-diagram-defaults.xml	Fri Oct 04 16:59:30 2013 +0200
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<longitudinal-defaults>
+    <axis name="Transport" logarithmic="true"/>
+    <domain-axis key="chart.sq_relation.xaxis.label" default="" logarithmic="true"/>
+    <processor class="org.dive4elements.river.exports.process.SQRelationProcessor" axis="Transport"/>
+    <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
+        axis="Transport"/>
+    <subtitle key="chart.computed.discharge.curve.subtitle" default="-">
+      <arg expr="artifact.river"/>
+      <arg expr="artifact.ld_locations"/>
+    </subtitle>
+</longitudinal-defaults>
+
http://dive4elements.wald.intevation.org