# HG changeset patch
# User Christian Lins <christian.lins@intevation.de>
# Date 1340281568 0
# Node ID 6f6a8e5fb7a4df17f4644fafb8178d2eef8034f9
# Parent  459750878157ee5106781c51652f0000ac6150c6
Theme updates for sector average wq curves/points


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

diff -r 459750878157 -r 6f6a8e5fb7a4 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Thu Jun 21 09:03:43 2012 +0000
+++ b/flys-artifacts/ChangeLog	Thu Jun 21 12:26:08 2012 +0000
@@ -1,3 +1,15 @@
+2012-06-21	Christian Lins <christian.lins@intevation.de>
+
+	* doc/conf/artifacts/fixanalysis.xml,
+	  src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java:
+	  Split fix_sector_average_wq in four facet types, one for each class (_0, _1, ..)
+
+	* doc/conf/themes.xml:
+	  Update themes for WQ curve
+
+	* src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java:
+	  Fix for small issue with sector average points
+
 2012-06-21	Christian Lins <christian.lins@intevation.de>
 
 	* src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java:
diff -r 459750878157 -r 6f6a8e5fb7a4 flys-artifacts/doc/conf/artifacts/fixanalysis.xml
--- a/flys-artifacts/doc/conf/artifacts/fixanalysis.xml	Thu Jun 21 09:03:43 2012 +0000
+++ b/flys-artifacts/doc/conf/artifacts/fixanalysis.xml	Thu Jun 21 12:26:08 2012 +0000
@@ -131,7 +131,10 @@
                 </outputmode>
                 <outputmode name="fix_wq_curve" description="output.fix_wq_curve" mine-type="image/png" type="chart">
                     <facets>
-                        <facet name="fix_sector_average_wq" description="Average values for Ws in Q sectors."/>
+                        <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"/>
diff -r 459750878157 -r 6f6a8e5fb7a4 flys-artifacts/doc/conf/themes.xml
--- a/flys-artifacts/doc/conf/themes.xml	Thu Jun 21 09:03:43 2012 +0000
+++ b/flys-artifacts/doc/conf/themes.xml	Thu Jun 21 12:26:08 2012 +0000
@@ -930,23 +930,61 @@
                 <field name="linecolor" type="Color" default="#000000"/>
             </fields>
         </theme>
-
         
-        <theme name="FixingSectorAverageWQ">
+        <theme name="FixingSectorAverageWQ0">
             <inherits>
                 <inherit from="ColorPoints"/>
             </inherits>
             <fields>
                 <field name="showlines" type="boolean" default="false"/>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="h"/>
+                <field name="pointsize" type="int" display="Punktdicke" default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 128, 0"/>
+            </fields>
+        </theme>
+        <theme name="FixingSectorAverageWQ1">
+            <inherits>
+                <inherit from="ColorPoints"/>
+            </inherits>
+            <fields>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen"       default="false" hints="h"/>
+                <field name="showlines" type="boolean" default="false"/>
+                <field name="pointsize"  type="int"     display="Punktdicke"           default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 255"/>
+            </fields>
+        </theme>
+        <theme name="FixingSectorAverageWQ2">
+            <inherits>
+                <inherit from="ColorPoints"/>
+            </inherits>
+            <fields>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen"       default="false" hints="h"/>
+                <field name="showlines" type="boolean" default="false"/>
+                <field name="pointsize"  type="int"     display="Punktdicke"           default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 255"/>
+            </fields>
+        </theme>
+        <theme name="FixingSectorAverageWQ3">
+            <inherits>
+                <inherit from="ColorPoints"/>
+            </inherits>
+            <fields>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen"       default="false" hints="h"/>
+                <field name="showlines" type="boolean" default="false"/>
+                <field name="pointsize"  type="int"     display="Punktdicke"           default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 0"/>
             </fields>
         </theme>
 
         <theme name="FixingAnalysisEventsWQ">
-            <inherits>
+           <inherits>
                 <inherit from="ColorPoints"/>
             </inherits>
             <fields>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen"       default="false" hints="h"/>
                 <field name="showlines" type="boolean" default="false"/>
+                <field name="pointsize"  type="int"     display="Punktdicke"           default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 0"/>
             </fields>
         </theme>
 
@@ -955,7 +993,10 @@
                 <inherit from="ColorPoints"/>
             </inherits>
             <fields>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen"       default="false" hints="h"/>
                 <field name="showlines" type="boolean" default="false"/>
+                <field name="pointsize"  type="int"     display="Punktdicke"           default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 80, 160"/>
             </fields>
         </theme>
 
@@ -970,7 +1011,11 @@
 
         <theme name="FixingWQCurve">
             <inherits>
+                <inherit from="HiddenColorLines"/>
             </inherits>
+            <fields>
+                <field name="linecolor" type="Color" default="227, 27, 162"/>
+            </fields>
         </theme>
 
         <theme name="FixingDeltaWtAverage0">
@@ -1990,21 +2035,60 @@
             </fields>
         </theme>
 
-        <theme name="FixingSectorAverageWQ">
+        <theme name="FixingSectorAverageWQ0">
             <inherits>
                 <inherit from="ColorPoints"/>
             </inherits>
             <fields>
-                <field name="showlines" value="false"/>
+                <field name="showlines" type="boolean" default="false"/>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="h"/>
+                <field name="pointsize" type="int" display="Punktdicke" default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 128, 0"/>
+            </fields>
+        </theme>
+        <theme name="FixingSectorAverageWQ1">
+            <inherits>
+                <inherit from="ColorPoints"/>
+            </inherits>
+            <fields>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen"       default="false" hints="h"/>
+                <field name="showlines" type="boolean" default="false"/>
+                <field name="pointsize"  type="int"     display="Punktdicke"           default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 255"/>
+            </fields>
+        </theme>
+        <theme name="FixingSectorAverageWQ2">
+            <inherits>
+                <inherit from="ColorPoints"/>
+            </inherits>
+            <fields>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen"       default="false" hints="h"/>
+                <field name="showlines" type="boolean" default="false"/>
+                <field name="pointsize"  type="int"     display="Punktdicke"           default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 255"/>
+            </fields>
+        </theme>
+        <theme name="FixingSectorAverageWQ3">
+            <inherits>
+                <inherit from="ColorPoints"/>
+            </inherits>
+            <fields>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen"       default="false" hints="h"/>
+                <field name="showlines" type="boolean" default="false"/>
+                <field name="pointsize"  type="int"     display="Punktdicke"           default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 0"/>
             </fields>
         </theme>
 
         <theme name="FixingAnalysisEventsWQ">
-            <inherits>
+           <inherits>
                 <inherit from="ColorPoints"/>
             </inherits>
             <fields>
-                <field name="showlines" value="false"/>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen"       default="false" hints="h"/>
+                <field name="showlines" type="boolean" default="false"/>
+                <field name="pointsize"  type="int"     display="Punktdicke"           default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 0"/>
             </fields>
         </theme>
 
@@ -2013,7 +2097,10 @@
                 <inherit from="ColorPoints"/>
             </inherits>
             <fields>
-                <field name="showlines" value="false"/>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen"       default="false" hints="h"/>
+                <field name="showlines" type="boolean" default="false"/>
+                <field name="pointsize"  type="int"     display="Punktdicke"           default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 80, 160"/>
             </fields>
         </theme>
 
@@ -2028,7 +2115,11 @@
 
         <theme name="FixingWQCurve">
             <inherits>
+                <inherit from="HiddenColorLines"/>
             </inherits>
+            <fields>
+                <field name="linecolor" type="Color" default="227, 27, 162"/>
+            </fields>
         </theme>
     </themegroup>
 
@@ -2335,22 +2426,60 @@
             </fields>
         </theme>
 
-
-        <theme name="FixingSectorAverageWQ">
+        <theme name="FixingSectorAverageWQ0">
             <inherits>
                 <inherit from="ColorPoints"/>
             </inherits>
             <fields>
-                <field name="showlines" value="false"/>
+                <field name="showlines" type="boolean" default="false"/>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="h"/>
+                <field name="pointsize" type="int" display="Punktdicke" default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 128, 0"/>
+            </fields>
+        </theme>
+        <theme name="FixingSectorAverageWQ1">
+            <inherits>
+                <inherit from="ColorPoints"/>
+            </inherits>
+            <fields>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen"       default="false" hints="h"/>
+                <field name="showlines" type="boolean" default="false"/>
+                <field name="pointsize"  type="int"     display="Punktdicke"           default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 255"/>
+            </fields>
+        </theme>
+        <theme name="FixingSectorAverageWQ2">
+            <inherits>
+                <inherit from="ColorPoints"/>
+            </inherits>
+            <fields>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen"       default="false" hints="h"/>
+                <field name="showlines" type="boolean" default="false"/>
+                <field name="pointsize"  type="int"     display="Punktdicke"           default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 255"/>
+            </fields>
+        </theme>
+        <theme name="FixingSectorAverageWQ3">
+            <inherits>
+                <inherit from="ColorPoints"/>
+            </inherits>
+            <fields>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen"       default="false" hints="h"/>
+                <field name="showlines" type="boolean" default="false"/>
+                <field name="pointsize"  type="int"     display="Punktdicke"           default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 0"/>
             </fields>
         </theme>
 
         <theme name="FixingAnalysisEventsWQ">
-            <inherits>
+           <inherits>
                 <inherit from="ColorPoints"/>
             </inherits>
             <fields>
-                <field name="showlines" value="false"/>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen"       default="false" hints="h"/>
+                <field name="showlines" type="boolean" default="false"/>
+                <field name="pointsize"  type="int"     display="Punktdicke"           default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 0"/>
             </fields>
         </theme>
 
@@ -2359,7 +2488,10 @@
                 <inherit from="ColorPoints"/>
             </inherits>
             <fields>
-                <field name="showlines" value="false"/>
+                <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen"       default="false" hints="h"/>
+                <field name="showlines" type="boolean" default="false"/>
+                <field name="pointsize"  type="int"     display="Punktdicke"           default="3"/>
+                <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 80, 160"/>
             </fields>
         </theme>
 
@@ -2374,7 +2506,11 @@
 
         <theme name="FixingWQCurve">
             <inherits>
+                <inherit from="HiddenColorLines"/>
             </inherits>
+            <fields>
+                <field name="linecolor" type="Color" default="227, 27, 162"/>
+            </fields>
         </theme>
 
     </themegroup>
@@ -2525,9 +2661,12 @@
         <mapping from="sq_f_measurement" to="SQMeasurements"/>
         <mapping from="sq_f_outlier" to="SQOutliers"/>
         <mapping from="sq_f_curve" to="SQCurve"/>
-        <mapping from="fix_sector_average_wq" to="FixingSectorAverageWQ"/>
+        <mapping from="fix_sector_average_wq_0" to="FixingSectorAverageWQ0"/>
+        <mapping from="fix_sector_average_wq_1" to="FixingSectorAverageWQ1"/>
+        <mapping from="fix_sector_average_wq_2" to="FixingSectorAverageWQ2"/>
+        <mapping from="fix_sector_average_wq_3" to="FixingSectorAverageWQ3"/>
         <mapping from="fix_analysis_events_wq" to="FixingAnalysisEventsWQ"/>
-        <mapping from="fix_outliers" to="FixingOutlier"/>
+        <mapping from="fix_outlier" to="FixingOutlier"/>
         <mapping from="fix_wq_curve" to="FixingWQCurve"/>
         <mapping from="fix_reference_events_wq" to="FixingReferenceEventsWQ"/>
         <mapping from="fix_sector_average_dwt_0" to="FixingDeltaWtAverage0"/>
diff -r 459750878157 -r 6f6a8e5fb7a4 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java	Thu Jun 21 09:03:43 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java	Thu Jun 21 12:26:08 2012 +0000
@@ -130,7 +130,7 @@
                                          description));
                 facets.add(
                     new FixAvSectorFacet(facetNdx,
-                                         FIX_SECTOR_AVERAGE_WQ,
+                                         FIX_SECTOR_AVERAGE_WQ + "_" + sectorNdx,
                                          description));
 
             }
diff -r 459750878157 -r 6f6a8e5fb7a4 flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java	Thu Jun 21 09:03:43 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java	Thu Jun 21 12:26:08 2012 +0000
@@ -64,7 +64,7 @@
         String name = aaf.getFacetName();
         logger.debug("doOut: " + name);
 
-        if(FIX_SECTOR_AVERAGE_WQ.equals(name)) {
+        if(name.startsWith(FIX_SECTOR_AVERAGE_WQ)) {
             doSectorAverageOut(aaf, doc, visible);
         }
         else if(FIX_ANALYSIS_EVENTS_WQ.equals(name)) {
@@ -96,6 +96,9 @@
             series.add(qwd.getQ(), qwd.getW());
             addAxisSeries(series, 0, visible);
         }
+        else {
+            logger.debug("doSectorAverageOut: qwd == null");
+        }
     }
 
     /** Add analysis event points to chart */