# HG changeset patch
# User Christian Lins <christian.lins@intevation.de>
# Date 1340030230 0
# Node ID 6ea299c208cd8113a91587510662c3bfd2fb22ca
# Parent  164c344ef743bcb84ee9cd38db78bd82c2e160a5
Themes for fixing curves and debug output

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

diff -r 164c344ef743 -r 6ea299c208cd flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Mon Jun 18 14:34:22 2012 +0000
+++ b/flys-artifacts/ChangeLog	Mon Jun 18 14:37:10 2012 +0000
@@ -1,3 +1,15 @@
+2012-06-18	Christian Lins <christian.lins@intevation.de>
+
+	* doc/conf/artifacts/fixanalysis.xml:
+	  Remove fix_analysis_periods_wq from fix_wq_curve facet.
+
+	* doc/conf/themes.xml:
+	  Add fixing themes for other theme groups.
+
+	* src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java,
+	  src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java:
+	  Debug output added.
+
 2012-06-18	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/model/fixings/FixFacetUtils.java:
diff -r 164c344ef743 -r 6ea299c208cd flys-artifacts/doc/conf/artifacts/fixanalysis.xml
--- a/flys-artifacts/doc/conf/artifacts/fixanalysis.xml	Mon Jun 18 14:34:22 2012 +0000
+++ b/flys-artifacts/doc/conf/artifacts/fixanalysis.xml	Mon Jun 18 14:37:10 2012 +0000
@@ -134,7 +134,6 @@
                         <facet name="fix_sector_average_wq" 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_analysis_periods_wq" description="Dateranges of analysis periods."/>
                         <facet name="fix_wq_curve" description="WQ curve"/>
                         <facet name="fix_outlier" description="The outliers"/>
                     </facets>
diff -r 164c344ef743 -r 6ea299c208cd flys-artifacts/doc/conf/themes.xml
--- a/flys-artifacts/doc/conf/themes.xml	Mon Jun 18 14:34:22 2012 +0000
+++ b/flys-artifacts/doc/conf/themes.xml	Mon Jun 18 14:37:10 2012 +0000
@@ -934,41 +934,37 @@
         
         <theme name="FixingSectorAverageWQ">
             <inherits>
-                <inherit from="HiddenColorLines"/>
                 <inherit from="ColorPoints"/>
             </inherits>
             <fields>
-                <field name="pointcolor" type="Color" default="#0011FF"/>
+                <field name="showlines" type="boolean" default="false"/>
             </fields>
         </theme>
 
         <theme name="FixingAnalysisEventsWQ">
             <inherits>
-                <inherit from="HiddenColorLines"/>
                 <inherit from="ColorPoints"/>
             </inherits>
             <fields>
-                <field name="pointcolor" type="Color" default="#0011FF"/>
+                <field name="showlines" type="boolean" default="false"/>
             </fields>
         </theme>
 
         <theme name="FixingReferenceEventsWQ">
             <inherits>
-                <inherit from="HiddenColorLines"/>
                 <inherit from="ColorPoints"/>
             </inherits>
             <fields>
-                <field name="pointcolor" type="Color" default="#0011FF"/>
+                <field name="showlines" type="boolean" default="false"/>
             </fields>
         </theme>
 
         <theme name="FixingOutliers">
             <inherits>
-                <inherit from="HiddenColorLines"/>
                 <inherit from="ColorPoints"/>
             </inherits>
             <fields>
-                <field name="pointcolor" type="Color" default="#0011FF"/>
+                <field name="showlines" type="boolean" default="false"/>
             </fields>
         </theme>
 
@@ -1866,6 +1862,48 @@
             </fields>
         </theme>
 
+
+        <theme name="FixingSectorAverageWQ">
+            <inherits>
+                <inherit from="ColorPoints"/>
+            </inherits>
+            <fields>
+                <field name="showlines" value="false"/>
+            </fields>
+        </theme>
+
+        <theme name="FixingAnalysisEventsWQ">
+            <inherits>
+                <inherit from="ColorPoints"/>
+            </inherits>
+            <fields>
+                <field name="showlines" value="false"/>
+            </fields>
+        </theme>
+
+        <theme name="FixingReferenceEventsWQ">
+            <inherits>
+                <inherit from="ColorPoints"/>
+            </inherits>
+            <fields>
+                <field name="showlines" value="false"/>
+            </fields>
+        </theme>
+
+        <theme name="FixingOutliers">
+            <inherits>
+                <inherit from="ColorPoints"/>
+            </inherits>
+            <fields>
+                <field name="showlines" value="false"/>
+            </fields>
+        </theme>
+
+        <theme name="FixingWQCurve">
+            <inherits>
+            </inherits>
+        </theme>
+
     </themegroup>
 
     <!-- Virtual themes are following now!
@@ -2171,6 +2209,48 @@
             </fields>
         </theme>
 
+
+        <theme name="FixingSectorAverageWQ">
+            <inherits>
+                <inherit from="ColorPoints"/>
+            </inherits>
+            <fields>
+                <field name="showlines" value="false"/>
+            </fields>
+        </theme>
+
+        <theme name="FixingAnalysisEventsWQ">
+            <inherits>
+                <inherit from="ColorPoints"/>
+            </inherits>
+            <fields>
+                <field name="showlines" value="false"/>
+            </fields>
+        </theme>
+
+        <theme name="FixingReferenceEventsWQ">
+            <inherits>
+                <inherit from="ColorPoints"/>
+            </inherits>
+            <fields>
+                <field name="showlines" value="false"/>
+            </fields>
+        </theme>
+
+        <theme name="FixingOutliers">
+            <inherits>
+                <inherit from="ColorPoints"/>
+            </inherits>
+            <fields>
+                <field name="showlines" value="false"/>
+            </fields>
+        </theme>
+
+        <theme name="FixingWQCurve">
+            <inherits>
+            </inherits>
+        </theme>
+
     </themegroup>
 
 
@@ -2306,7 +2386,7 @@
         <mapping from="sq_a_curve" to="SQCurve"/>
         <mapping from="fix_sector_average_wq" to="FixingSectorAverageWQ"/>
         <mapping from="fix_analysis_events_wq" to="FixingAnalysisEventsWQ"/>
-        <mapping from="fix_outlier" to="FixingOutlier"/>
+        <mapping from="fix_outliers" to="FixingOutlier"/>
         <mapping from="fix_wq_curve" to="FixingWQCurve"/>
         <mapping from="fix_reference_events_wq" to="FixingReferenceEventsWQ"/>
 
diff -r 164c344ef743 -r 6ea299c208cd flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java	Mon Jun 18 14:34:22 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java	Mon Jun 18 14:37:10 2012 +0000
@@ -69,7 +69,7 @@
                                                  false);
 
             FixResult result = (FixResult) res.getData();
-            Double currentKm =
+            double currentKm =
                 ((Double)context.getContextValue("currentKm")).doubleValue();
 
             KMIndex<AnalysisPeriod []> kmPeriods = result.getAnalysisPeriods();
@@ -77,11 +77,13 @@
                 kmPeriods.binarySearch(currentKm);
 
             if(kmPeriodsEntry == null) {
+                logger.debug("getData: kmPeriodsEntry == null");
                 return null;
             }
 
             AnalysisPeriod[] periods = kmPeriodsEntry.getValue();
             if (periods == null) {
+                logger.debug("getData: periods == null");
                 return null;
             }
             QWD[] qwdData = periods[index].getQWDs();
diff -r 164c344ef743 -r 6ea299c208cd 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	Mon Jun 18 14:34:22 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java	Mon Jun 18 14:37:10 2012 +0000
@@ -118,6 +118,9 @@
 
             addAxisSeries(series, 0, visible);
         }
+        else {
+            logger.debug("doAnalysisEventsOut: qwds == null");
+        }
     }
 
     /** Add reference event points to chart */