[Dive4elements-commits] [PATCH] Enable manual points for s/q diagrams

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1354083546 -3600
# Node ID c2ec7f5ac422d135a1bb105ec26b1fc99ac4886d
# Parent  319565a48182f01f18a29e55723e41cd69ad5b69
Enable manual points for s/q diagrams.

diff -r 319565a48182 -r c2ec7f5ac422 flys-artifacts/doc/conf/artifacts/manualpoints.xml
--- a/flys-artifacts/doc/conf/artifacts/manualpoints.xml	Tue Nov 27 17:43:19 2012 +0100
+++ b/flys-artifacts/doc/conf/artifacts/manualpoints.xml	Wed Nov 28 07:19:06 2012 +0100
@@ -27,6 +27,12 @@
             <facet name="sedimentload_ls.manualpoints"/>
             <facet name="flow_velocity.manualpoints"/>
             <facet name="bedheight_difference.manualpoints" />
+            <facet name="sq_relation_a.manualpoints" />
+            <facet name="sq_relation_b.manualpoints" />
+            <facet name="sq_relation_c.manualpoints" />
+            <facet name="sq_relation_d.manualpoints" />
+            <facet name="sq_relation_e.manualpoints" />
+            <facet name="sq_relation_f.manualpoints" />
           </facets>
         </outputmode>
       </outputmodes>
diff -r 319565a48182 -r c2ec7f5ac422 flys-artifacts/doc/conf/artifacts/minfo.xml
--- a/flys-artifacts/doc/conf/artifacts/minfo.xml	Tue Nov 27 17:43:19 2012 +0100
+++ b/flys-artifacts/doc/conf/artifacts/minfo.xml	Wed Nov 28 07:19:06 2012 +0100
@@ -260,6 +260,7 @@
                         <facet name="sq_a_outlier" description="A facet fo sq outliers"/>
                         <facet name="sq_a_curve" description="A facet for sq curve"/>
                         <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"/>
                     </facets>
                 </outputmode>
@@ -269,6 +270,7 @@
                         <facet name="sq_b_outlier" description="A facet fo sq outliers"/>
                         <facet name="sq_b_curve" description="A facet for sq curve"/>
                         <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"/>
                     </facets>
                 </outputmode>
@@ -278,6 +280,7 @@
                         <facet name="sq_c_outlier" description="A facet fo sq outliers"/>
                         <facet name="sq_c_curve" description="A facet for sq curve"/>
                         <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"/>
                     </facets>
                 </outputmode>
@@ -286,6 +289,7 @@
                         <facet name="sq_d_measurement" description="A facet for sq measurements"/>
                         <facet name="sq_d_outlier" description="A facet fo sq outliers"/>
                         <facet name="sq_d_curve" description="A facet for sq curve"/>
+                        <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"/>
                     </facets>
@@ -296,12 +300,14 @@
                         <facet name="sq_e_outlier" description="A facet fo sq outliers"/>
                         <facet name="sq_e_curve" description="A facet for sq curve"/>
                         <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"/>
                     </facets>
                 </outputmode>
                 <outputmode name="sq_relation_f" description="output.sq_relation" type="chart">
                     <facets>
                         <facet name="sq_f_measurement" description="A facet for sq measurements"/>
+                        <facet name="sq_relation_f.manualpoints" />
                         <facet name="sq_f_outlier" description="A facet fo sq outliers"/>
                         <facet name="sq_f_curve" description="A facet for sq curve"/>
                         <facet name="sq_f_outlier_curve" description="A facet for sq outlier curve"/>
diff -r 319565a48182 -r c2ec7f5ac422 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java	Tue Nov 27 17:43:19 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java	Wed Nov 28 07:19:06 2012 +0100
@@ -127,6 +127,12 @@
         BHM("bedheight_middle"),
         SLS("sedimentload_ls"),
         FV("flow_velocity"),
+        SQA("sq_relation_a"),
+        SQB("sq_relation_b"),
+        SQC("sq_relation_c"),
+        SQD("sq_relation_d"),
+        SQE("sq_relation_e"),
+        SQF("sq_relation_f"),
         HD("historical_discharge");
 
         private String chartTypeString;