[PATCH] And Developer said, Let there be Q symmetry and there was Q symmetry

[Wald Commits]

# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1411569493 -7200
# Node ID d15dafd41b4114da46d0c40c5abd8b368e3048c1
# Parent  c04c66839288b36c2ac047b4bf33ce5cf2034c02
And Developer said, Let there be Q symmetry and there was Q symmetry.

diff -r c04c66839288 -r d15dafd41b41 artifacts/doc/conf/generators/discharge-diagrams.xml
--- a/artifacts/doc/conf/generators/discharge-diagrams.xml	Wed Sep 24 16:24:32 2014 +0200
+++ b/artifacts/doc/conf/generators/discharge-diagrams.xml	Wed Sep 24 16:38:13 2014 +0200
@@ -1,46 +1,115 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <discharge-diagrams>
 
-  <output-generator names="historical_discharge_wq_chartinfo" class="org.dive4elements.river.exports.HistoricalDischargeWQCurveInfoGenerator"/>
-  <output-generator names="historical_discharge_wq" class="org.dive4elements.river.exports.HistoricalDischargeWQCurveGenerator"/>
+  <output-generator names="historical_discharge_wq,historical_discharge_wq_chartinfo"
+      class="org.dive4elements.river.exports.DischargeGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes"
+      injectors="org.dive4elements.river.exports.injector.HistoricalDischargeInjector">
+    <title key="chart.historical.discharge.title" default="chart.historical.discharge.title"/>
+    &discharge-defaults;
+  </output-generator>
 
-  <output-generator names="computed_discharge_curve_chartinfo" class="org.dive4elements.river.exports.ComputedDischargeCurveInfoGenerator"/>
-  <output-generator names="computed_discharge_curve" class="org.dive4elements.river.exports.ComputedDischargeCurveGenerator"/>
+  <output-generator names="computed_discharge_curve_chartinfo,computed_discharge_curve"
+      class="org.dive4elements.river.exports.DischargeGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes"
+      injectors="org.dive4elements.river.exports.injector.ComputedDischargeInjector">
+    <title key="chart.computed.discharge.curve.title" default="chart.computed.discharge.curve.title"/>
+    <subtitle key="chart.computed.discharge.curve.subtitle" default="-">
+        <arg expr="artifact.river"/>
+        <arg expr="artifact.ld_locations" type="double"/>
+    </subtitle>
+    &discharge-defaults;
+  </output-generator>
 
-  <output-generator names="discharge_curve_chartinfo" class="org.dive4elements.river.exports.DischargeCurveInfoGenerator"/>
-  <output-generator names="discharge_curve" class="org.dive4elements.river.exports.DischargeCurveGenerator"/>
+  <output-generator names="discharge_curve_chartinfo,discharge_curve"
+      class="org.dive4elements.river.exports.DischargeGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes"
+      injectors="org.dive4elements.river.exports.injector.DischargeInjector">
+    <title key="chart.discharge.curve.title" default="chart.discharge.curve.title"/>
+    <subtitle key="chart.computed.discharge.curve.subtitle" default="-">
+        <arg expr="artifact.river"/>
+        <arg expr="artifact.ld_locations" type="double"/>
+    </subtitle>
+    &discharge-defaults;
+  </output-generator>
 
-  <output-generator names="fix_wq_curve" class="org.dive4elements.river.exports.fixings.FixWQCurveGenerator"/>
-  <output-generator names="fix_wq_curve_chartinfo" class="org.dive4elements.river.exports.fixings.FixWQCurveInfoGenerator"/>
+  <output-generator names="fix_wq_curve,fix_wq_curve_chartinfo"
+      class="org.dive4elements.river.exports.DischargeGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes"
+      injectors="org.dive4elements.river.exports.injector.FixWQInjector">
+      <title key="chart.fixings.discharge.curve.title" default="Fixierungsanalyse W/Q"/>
+    <subtitle key="chart.computed.discharge.curve.subtitle" default="-">
+        <arg expr="artifact.river"/>
+        <arg expr="artifact.ld_locations" type="double"/>
+    </subtitle>
+    &discharge-defaults;
+  </output-generator>
 
-  <output-generator names="fix_derivate_curve" class="org.dive4elements.river.exports.fixings.FixDerivedCurveGenerator"/>
-  <output-generator names="fix_derivate_curve_chartinfo" class="org.dive4elements.river.exports.fixings.FixDerivedCurveInfoGenerator"/>
+  <output-generator names="fix_derivate_curve,fix_derivate_curve_chartinfo"
+      class="org.dive4elements.river.exports.DischargeGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes">
+    <title key="chart.fixings.derived.discharge.curve.title" default="chart.fixings.derived.discharge.curve.title"/>
+    &discharge-defaults;
+  </output-generator>
 
-  <output-generator names="fix_vollmer_wq_curve" class="org.dive4elements.river.exports.fixings.FixWQCurveGenerator"/>
-  <output-generator names="fix_vollmer_wq_curve_chartinfo" class="org.dive4elements.river.exports.fixings.FixWQCurveInfoGenerator"/>
+  <output-generator names="fix_vollmer_wq_curve,fix_vollmer_wq_curve_chartinfo"
+      class="org.dive4elements.river.exports.DischargeGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes">
+    <title key="chart.vollmer.discharge.curve.title" default="chart.vollmer.discharge.curve.title"/>
+    &discharge-defaults;
+  </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_c.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 names="sq_relation_a,sq_relation_a_chartinfo"
+      class="org.dive4elements.river.exports.DischargeGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes">
+    <title key="chart.sq_relation_a.title" default=""/>
+    &sqrelation-defaults;
   </output-generator>
-  <output-generator names="sq_relation_g,sq_relation_g_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 names="sq_relation_b,sq_relation_b_chartinfo"
+      class="org.dive4elements.river.exports.DischargeGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes">
+    <title key="chart.sq_relation_b.title" default=""/>
+    &sqrelation-defaults;
   </output-generator>
-  <output-generator names="sq_overview,sq_overview_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 names="sq_relation_c,sq_relation_c_chartinfo"
+      class="org.dive4elements.river.exports.DischargeGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes">
+    <title key="chart.sq_relation_c.title" default=""/>
+    &sqrelation-defaults;
+  </output-generator>
+
+  <output-generator names="sq_relation_d,sq_relation_d_chartinfo"
+      class="org.dive4elements.river.exports.DischargeGenerator"
+      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.DischargeGenerator"
+      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.DischargeGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes">
+    <title key="chart.sq_relation_f.title" default=""/>
+    &sqrelation-defaults;
+  </output-generator>
+  <output-generator names="sq_relation_g,sq_relation_g_chartinfo"
+      class="org.dive4elements.river.exports.DischargeGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes">
+    <title key="chart.sq_relation_f.title" default=""/>
+    &sqrelation-defaults;
+  </output-generator>
+  <output-generator names="sq_overview,sq_overview_chartinfo"
+      class="org.dive4elements.river.exports.DischargeGenerator"
+      converter="org.dive4elements.river.exports.DiagramAttributes">
+    <title key="chart.sq_relation_f.title" default=""/>
+    &sqrelation-defaults;
   </output-generator>
 </discharge-diagrams>
diff -r c04c66839288 -r d15dafd41b41 artifacts/doc/conf/generators/discharge-diagrams2.xml
--- a/artifacts/doc/conf/generators/discharge-diagrams2.xml	Wed Sep 24 16:24:32 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<discharge-diagrams>
-
-  <output-generator names="historical_discharge_wq,historical_discharge_wq_chartinfo"
-      class="org.dive4elements.river.exports.DischargeGenerator"
-      converter="org.dive4elements.river.exports.DiagramAttributes"
-      injectors="org.dive4elements.river.exports.injector.HistoricalDischargeInjector">
-    <title key="chart.historical.discharge.title" default="chart.historical.discharge.title"/>
-    &discharge-defaults;
-  </output-generator>
-
-  <output-generator names="computed_discharge_curve_chartinfo,computed_discharge_curve"
-      class="org.dive4elements.river.exports.DischargeGenerator"
-      converter="org.dive4elements.river.exports.DiagramAttributes"
-      injectors="org.dive4elements.river.exports.injector.ComputedDischargeInjector">
-    <title key="chart.computed.discharge.curve.title" default="chart.computed.discharge.curve.title"/>
-    <subtitle key="chart.computed.discharge.curve.subtitle" default="-">
-        <arg expr="artifact.river"/>
-        <arg expr="artifact.ld_locations" type="double"/>
-    </subtitle>
-    &discharge-defaults;
-  </output-generator>
-
-  <output-generator names="discharge_curve_chartinfo,discharge_curve"
-      class="org.dive4elements.river.exports.DischargeGenerator"
-      converter="org.dive4elements.river.exports.DiagramAttributes"
-      injectors="org.dive4elements.river.exports.injector.DischargeInjector">
-    <title key="chart.discharge.curve.title" default="chart.discharge.curve.title"/>
-    <subtitle key="chart.computed.discharge.curve.subtitle" default="-">
-        <arg expr="artifact.river"/>
-        <arg expr="artifact.ld_locations" type="double"/>
-    </subtitle>
-    &discharge-defaults;
-  </output-generator>
-
-  <output-generator names="fix_wq_curve,fix_wq_curve_chartinfo"
-      class="org.dive4elements.river.exports.DischargeGenerator"
-      converter="org.dive4elements.river.exports.DiagramAttributes"
-      injectors="org.dive4elements.river.exports.injector.FixWQInjector">
-      <title key="chart.fixings.discharge.curve.title" default="Fixierungsanalyse W/Q"/>
-    <subtitle key="chart.computed.discharge.curve.subtitle" default="-">
-        <arg expr="artifact.river"/>
-        <arg expr="artifact.ld_locations" type="double"/>
-    </subtitle>
-    &discharge-defaults;
-  </output-generator>
-
-  <output-generator names="fix_derivate_curve,fix_derivate_curve_chartinfo"
-      class="org.dive4elements.river.exports.DischargeGenerator"
-      converter="org.dive4elements.river.exports.DiagramAttributes">
-    <title key="chart.fixings.derived.discharge.curve.title" default="chart.fixings.derived.discharge.curve.title"/>
-    &discharge-defaults;
-  </output-generator>
-
-  <output-generator names="fix_vollmer_wq_curve,fix_vollmer_wq_curve_chartinfo"
-      class="org.dive4elements.river.exports.DischargeGenerator"
-      converter="org.dive4elements.river.exports.DiagramAttributes">
-    <title key="chart.vollmer.discharge.curve.title" default="chart.vollmer.discharge.curve.title"/>
-    &discharge-defaults;
-  </output-generator>
-
-  <output-generator names="sq_relation_a,sq_relation_a_chartinfo"
-      class="org.dive4elements.river.exports.DischargeGenerator"
-      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.DischargeGenerator"
-      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.DischargeGenerator"
-      converter="org.dive4elements.river.exports.DiagramAttributes">
-    <title key="chart.sq_relation_c.title" default=""/>
-    &sqrelation-defaults;
-  </output-generator>
-
-  <output-generator names="sq_relation_d,sq_relation_d_chartinfo"
-      class="org.dive4elements.river.exports.DischargeGenerator"
-      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.DischargeGenerator"
-      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.DischargeGenerator"
-      converter="org.dive4elements.river.exports.DiagramAttributes">
-    <title key="chart.sq_relation_f.title" default=""/>
-    &sqrelation-defaults;
-  </output-generator>
-  <output-generator names="sq_relation_g,sq_relation_g_chartinfo"
-      class="org.dive4elements.river.exports.DischargeGenerator"
-      converter="org.dive4elements.river.exports.DiagramAttributes">
-    <title key="chart.sq_relation_f.title" default=""/>
-    &sqrelation-defaults;
-  </output-generator>
-  <output-generator names="sq_overview,sq_overview_chartinfo"
-      class="org.dive4elements.river.exports.DischargeGenerator"
-      converter="org.dive4elements.river.exports.DiagramAttributes">
-    <title key="chart.sq_relation_f.title" default=""/>
-    &sqrelation-defaults;
-  </output-generator>
-</discharge-diagrams>