# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1344598228 0
# Node ID 416288f88763c8c7cd0a3f61a977e855b58347ba
# Parent  374c2d70b98264aa2dc7caee59ae1e2bd82c5773
Add more qsectory infrastructure.

flys-artifacts/trunk@5189 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 374c2d70b982 -r 416288f88763 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Fri Aug 10 10:25:47 2012 +0000
+++ b/flys-artifacts/ChangeLog	Fri Aug 10 11:30:28 2012 +0000
@@ -1,3 +1,15 @@
+2012-08-10	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* doc/conf/artifacts/fixanalysis.xml: Add qsectors-facet to
+	  compatibility list.
+
+	* doc/conf/conf.xml: Register qsector artifact and its factory.
+
+	* doc/conf/meta-data.xml: Recommend qsectors in fix w/q settings.
+
+	* src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java:
+	  Add qsector facet type.
+
 2012-08-10	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* doc/conf/artifacts/qsector.xml:
diff -r 374c2d70b982 -r 416288f88763 flys-artifacts/doc/conf/artifacts/fixanalysis.xml
--- a/flys-artifacts/doc/conf/artifacts/fixanalysis.xml	Fri Aug 10 10:25:47 2012 +0000
+++ b/flys-artifacts/doc/conf/artifacts/fixanalysis.xml	Fri Aug 10 11:30:28 2012 +0000
@@ -143,21 +143,10 @@
                         <facet name="fix_analysis_events_wq" description="Raw event values used in the calculation"/>
                         <facet name="fix_reference_events_wq" description="Raw event values used in the calculation"/>
                         <facet name="fix_wq_curve" description="WQ curve"/>
+                        <facet name="qsectors" description="qsectors."/>
                         <facet name="fix_outlier" description="The outliers"/>
                     </facets>
                 </outputmode>
-                <outputmode name="fix_deltawt_curve" description="output.fix_deltawt_curve" mine-type="image/png" type="chart">
-                    <facets>
-                        <facet name="fix_sector_average_dwt_0" description="Average values for Ws in Q sectors."/>
-                        <facet name="fix_sector_average_dwt_1" description="Average values for Ws in Q sectors."/>
-                        <facet name="fix_sector_average_dwt_2" description="Average values for Ws in Q sectors."/>
-                        <facet name="fix_sector_average_dwt_3" description="Average values for Ws in Q sectors."/>
-                        <facet name="fix_analysis_events_dwt" description="Raw event values used in the calculation"/>
-                        <facet name="fix_reference_events_dwt" description="Raw event values used in the calculation"/>
-                        <facet name="fix_analysis_periods_dwt" description="Dateranges of analysis periods."/>
-                        <facet name="fix_deviation_dwt" description="The standard variance"/>
-                    </facets>
-                </outputmode>
                 <outputmode name="fix_longitudinal_section_curve" description="output.fix_longitudinal_section_curve" mine-type="image/png" type="chart">
                     <facets>
                         <facet name="fix_sector_average_ls_0" description="Average values for Ws in Q sectors."/>
@@ -230,6 +219,18 @@
                     	<facet name="longitudinal_section.q" description="facet.longitudinal_section.q"/>
                     </facets>
                 </outputmode>
+                <outputmode name="fix_wq_curve" description="output.fix_wq_curve" mine-type="image/png" type="chart">
+                    <facets>
+                        <facet name="fix_sector_average_wq_0" description="Average values for Ws in Q sectors."/>
+                        <facet name="fix_sector_average_wq_1" description="Average values for Ws in Q sectors."/>
+                        <facet name="fix_sector_average_wq_2" description="Average values for Ws in Q sectors."/>
+                        <facet name="fix_sector_average_wq_3" description="Average values for Ws in Q sectors."/>
+                        <facet name="fix_analysis_events_wq" description="Raw event values used in the calculation"/>
+                        <facet name="fix_reference_events_wq" description="Raw event values used in the calculation"/>
+                        <facet name="fix_wq_curve" description="WQ curve"/>
+                        <facet name="fix_outlier" description="The outliers"/>
+                    </facets>
+                </outputmode>
                 <outputmode name="fix_vollmer_wq_curve" description="output.fix_vollmer_wq_curve" mine-type="image/png" type="chart">
                     <facets>
                         <facet name="fix_wq_curve" description="WQ curve"/>
diff -r 374c2d70b982 -r 416288f88763 flys-artifacts/doc/conf/conf.xml
--- a/flys-artifacts/doc/conf/conf.xml	Fri Aug 10 10:25:47 2012 +0000
+++ b/flys-artifacts/doc/conf/conf.xml	Fri Aug 10 11:30:28 2012 +0000
@@ -110,6 +110,9 @@
             <artifact-factory name="gaugedischarge" description="Factory to create an artifact to host historical qs."
                 ttl="3600000"
                 artifact="de.intevation.flys.artifacts.GaugeDischargeArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+            <artifact-factory name="qsector" description="Factory to create an artifact to host qsectors."
+                ttl="3600000"
+                artifact="de.intevation.flys.artifacts.QSectorArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
 
             <!-- MINFO specific Artifacts -->
             <artifact-factory name="minfo" description="Factory to create an artifact to be used in module minfo."
@@ -206,6 +209,7 @@
         <artifact name="staticwqkms" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/artifacts/staticwqkms.xml" />
         <artifact name="fixanalysis" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/artifacts/fixanalysis.xml" />
         <artifact name="gaugedischarge" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/artifacts/gaugedischarge.xml" />
+        <artifact name="qsector" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/artifacts/qsector.xml" />
     </artifacts>
 
 
diff -r 374c2d70b982 -r 416288f88763 flys-artifacts/doc/conf/meta-data.xml
--- a/flys-artifacts/doc/conf/meta-data.xml	Fri Aug 10 10:25:47 2012 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Fri Aug 10 11:30:28 2012 +0000
@@ -521,6 +521,13 @@
           </mainvalue>
         </dc:macro>
 
+        <dc:macro name="qsectors">
+          <qsector>
+            <dc:attribute name="factory" value="qsectors"/>
+            <dc:attribute name="ids"     value="${river_id}"/>
+          </qsector>
+        </dc:macro>
+
         <dc:macro name="annotations">
           <annotation>
             <dc:attribute name="factory" value="annotations"/>
@@ -593,6 +600,9 @@
                  <dc:call-macro name="annotations"/>
                  <dc:call-macro name="mainvalues"/>
                </dc:if>
+               <dc:if test="dc:contains($artifact-outs, 'fix_wq_curve')">
+                 <dc:call-macro name="qsectors"/>
+               </dc:if>
             </dc:when>
             <dc:otherwise>
               <dc:comment>
diff -r 374c2d70b982 -r 416288f88763 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	Fri Aug 10 10:25:47 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java	Fri Aug 10 11:30:28 2012 +0000
@@ -181,6 +181,8 @@
     String MANUALPOINTS = "manualpoints";
     String MANUALLINE = "manualline";
 
+    String QSECTOR        = "qsectors";
+
     String STATIC_WQ      = "other.wq";
     String STATIC_WQ_ANNOTATIONS = "other.wq.annotations";
     String STATIC_WKMS    = "other.wkms";