[PATCH] Q-main values as recommendations in SQ. TODO: solve DDZ

[Wald Commits]

# HG changeset patch
# User "Tom Gottfried <tom at intevation.de>"
# Date 1411721606 -7200
# Node ID 38f57e854977e1422e098d9a94a3bf44283ce2d8
# Parent  be7864b4fabbd5db4d2eeeccc8095ef8b50f61ab
Q-main values as recommendations in SQ. TODO: solve DDZ.

diff -r be7864b4fabb -r 38f57e854977 artifacts/doc/conf/artifacts/minfo.xml
--- a/artifacts/doc/conf/artifacts/minfo.xml	Fri Sep 26 10:50:54 2014 +0200
+++ b/artifacts/doc/conf/artifacts/minfo.xml	Fri Sep 26 10:53:26 2014 +0200
@@ -319,6 +319,7 @@
                         <facet name="sq_a_outlier_curve" description="A facet for sq outlier curve"/>
                         <facet name="sq_relation_a.manualpoints" />
                         <facet name="sq_a_outlier_measurement" description="A facet for sq outlier measurement"/>
+                        <facet name="mainvalues.q" />
                     </facets>
                 </outputmode>
                 <outputmode name="sq_relation_b" description="output.sq_relation" type="chart">
@@ -329,6 +330,7 @@
                         <facet name="sq_b_outlier_curve" description="A facet for sq outlier curve"/>
                         <facet name="sq_relation_b.manualpoints" />
                         <facet name="sq_b_outlier_measurement" description="A facet for sq outlier measurement"/>
+                        <facet name="mainvalues.q" />
                     </facets>
                 </outputmode>
                 <outputmode name="sq_relation_c" description="output.sq_relation" type="chart">
@@ -339,6 +341,7 @@
                         <facet name="sq_c_outlier_curve" description="A facet for sq outlier curve"/>
                         <facet name="sq_relation_c.manualpoints" />
                         <facet name="sq_c_outlier_measurement" description="A facet for sq outlier measurement"/>
+                        <facet name="mainvalues.q" />
                     </facets>
                 </outputmode>
                 <outputmode name="sq_relation_d" description="output.sq_relation" type="chart">
@@ -349,6 +352,7 @@
                         <facet name="sq_relation_d.manualpoints" />
                         <facet name="sq_d_outlier_curve" description="A facet for sq outlier curve"/>
                         <facet name="sq_d_outlier_measurement" description="A facet for sq outlier measurement"/>
+                        <facet name="mainvalues.q" />
                     </facets>
                 </outputmode>
                 <outputmode name="sq_relation_e" description="output.sq_relation" type="chart">
@@ -359,6 +363,7 @@
                         <facet name="sq_e_outlier_curve" description="A facet for sq outlier curve"/>
                         <facet name="sq_relation_e.manualpoints" />
                         <facet name="sq_e_outlier_measurement" description="A facet for sq outlier measurement"/>
+                        <facet name="mainvalues.q" />
                     </facets>
                 </outputmode>
                 <outputmode name="sq_relation_f" description="output.sq_relation" type="chart">
@@ -369,6 +374,7 @@
                         <facet name="sq_f_curve" description="A facet for sq curve"/>
                         <facet name="sq_f_outlier_curve" description="A facet for sq outlier curve"/>
                         <facet name="sq_f_outlier_measurement" description="A facet for sq outlier measurement"/>
+                        <facet name="mainvalues.q" />
                     </facets>
                 </outputmode>
                 <outputmode name="sq_relation_g" description="output.sq_relation" type="chart">
@@ -379,6 +385,7 @@
                         <facet name="sq_g_curve" description="A facet for sq curve"/>
                         <facet name="sq_g_outlier_curve" description="A facet for sq outlier curve"/>
                         <facet name="sq_g_outlier_measurement" description="A facet for sq outlier measurement"/>
+                        <facet name="mainvalues.q" />
                     </facets>
                 </outputmode>
                 <outputmode name="sq_overview" description="output.sq_overview" type="chart">
@@ -425,6 +432,7 @@
                         <facet name="sq_g_curve_overview" description="A facet for sq curve"/>
                         <facet name="sq_g_outlier_curve_overview" description="A facet for sq outlier curve"/>
                         <facet name="sq_g_outlier_measurement_overview" description="A facet for sq outlier measurement"/>
+                        <facet name="mainvalues.q" />
                     </facets>
                 </outputmode>
                 <outputmode name="sq_relation_export" description="output.sq_relation_export" type="export">
diff -r be7864b4fabb -r 38f57e854977 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Fri Sep 26 10:50:54 2014 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Fri Sep 26 10:53:26 2014 +0200
@@ -90,6 +90,10 @@
                     <dc:call-macro name="mainvalues"/>
                     <dc:call-macro name="qsectors"/>
                   </dc:when>
+                  <dc:when test="starts-with($out, 'sq_') and
+                                 not($out = 'sq_relation_export')">
+                    <dc:call-macro name="qmainvalues"/>
+                  </dc:when>
                   <dc:comment> Cross sections </dc:comment>
                   <dc:when test="$out = 'cross_section'">
                     <dc:call-macro name="cross_sections"/>
@@ -1082,9 +1086,13 @@
       <annotation factory="annotations" ids="{$river_id}" target_out="{$out}" />
     </dc:macro>
 
+    <dc:macro name="qmainvalues">
+      <qmainvalue factory="mainvalue" ids="{$river_id}:q" target_out="{$out}"/>
+    </dc:macro>
+
     <dc:macro name="mainvalues">
-      <wmainvalue factory="mainvalue" ids="{$river_id}:w" target_out="{$out}" />
-      <qmainvalue factory="mainvalue" ids="{$river_id}:q" target_out="{$out}" />
+      <wmainvalue factory="mainvalue" ids="{$river_id}:w" target_out="{$out}"/>
+      <dc:call-macro name="qmainvalues"/>
     </dc:macro>
 
     <dc:macro name="cross_sections">