# HG changeset patch
# User Christian Lins <christian.lins@intevation.de>
# Date 1347183169 0
# Node ID 0c217de0d84be2a5d917cb8c2914eb302b56ef02
# Parent  893b2477208f7244184b5a10050ec105abf359e7
Modify every second theme to differ from default theme (#835)

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

diff -r 893b2477208f -r 0c217de0d84b flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Sat Sep 08 18:19:33 2012 +0000
+++ b/flys-artifacts/ChangeLog	Sun Sep 09 09:32:49 2012 +0000
@@ -1,3 +1,12 @@
+2012-09-09	Christian Lins	<christian.lins@intevation.de>
+
+	* doc/conf/second-themes.xml:
+	  Modify every theme to differ from default theme (#835).
+
+	* src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java:
+	  Use gauge.getMainValues() instead of gauge.fetchMainValues() which fixes
+	  a compiling issue on my setup.
+
 2012-09-08	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	Some models for representing results for the upcoming
diff -r 893b2477208f -r 0c217de0d84b flys-artifacts/doc/conf/second-themes.xml
--- a/flys-artifacts/doc/conf/second-themes.xml	Sat Sep 08 18:19:33 2012 +0000
+++ b/flys-artifacts/doc/conf/second-themes.xml	Sun Sep 09 09:32:49 2012 +0000
@@ -7,9 +7,9 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 153" />
+                default="153, 0, 153" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="2" hints="h" />
+                default="1" hints="h" />
         </fields>
     </theme>
 
@@ -21,9 +21,9 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 153" />
+                default="153, 0, 153" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="2" hints="h" />
+                default="1" hints="h" />
         </fields>
     </theme>
 
@@ -34,9 +34,9 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
+                default="0, 204, 204" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="2" hints="h" />
+                default="1" hints="h" />
         </fields>
     </theme>
 
@@ -48,8 +48,13 @@
             <inherit from="MinMaxPoints" />
         </inherits>
         <fields>
+            <field name="bandwidth" type="double" display="Bandbreite"
+                default="0"/>
+            <field name="fillcolor" type="Color" display="Bandbreitenfarbe"
+                default="104, 104, 104"/> 
+    	    <field name="alpha" type="int" default="50" display="Alpha-Transparenz"/>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
+                default="204, 0, 204" />
         </fields>
     </theme>
 
@@ -59,7 +64,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
+                default="102, 0, 102" />
         </fields>
     </theme>
 
@@ -69,7 +74,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
+                default="102, 0, 102" />
         </fields>
     </theme>
 
@@ -79,7 +84,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 153, 51" />
+                default="51, 153, 51" />
         </fields>
     </theme>
 
@@ -89,7 +94,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 204, 204" />
+                default="204, 0, 204" />
         </fields>
     </theme>
 
@@ -99,7 +104,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 153, 0" />
+                default="153, 0, 153" />
         </fields>
     </theme>
 
@@ -109,7 +114,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 51, 0" />
+                default="102, 0, 51" />
         </fields>
     </theme>
 
@@ -119,7 +124,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 153, 0" />
+                default="255, 153, 255" />
         </fields>
     </theme>
 
@@ -129,7 +134,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 255" />
+                default="255, 128, 255" />
         </fields>
     </theme>
 
@@ -139,7 +144,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 255" />
+                default="255, 128, 255" />
         </fields>
     </theme>
 
@@ -149,7 +154,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 0, 102" />
+                default="102, 128, 102" />
         </fields>
     </theme>
 
@@ -159,7 +164,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
+                default="0, 128, 0" />
         </fields>
     </theme>
 
@@ -169,7 +174,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 0, 102" />
+                default="102, 128, 102" />
         </fields>
     </theme>
 
@@ -179,7 +184,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="253, 153, 0" />
+                default="253, 153, 128" />
         </fields>
     </theme>
 
@@ -189,7 +194,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 255, 102" />
+                default="102, 0, 102" />
         </fields>
     </theme>
 
@@ -199,7 +204,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 255, 255" />
+                default="255, 0, 255" />
         </fields>
     </theme>
 
@@ -209,7 +214,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 51, 204" />
+                default="204, 51, 204" />
         </fields>
     </theme>
 
@@ -219,7 +224,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 204, 255" />
+                default="153, 204, 0" />
         </fields>
     </theme>
 
@@ -229,7 +234,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
+                default="0, 255, 0" />
         </fields>
     </theme>
 
@@ -251,7 +256,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
+                default="64, 0, 102" />
         </fields>
     </theme>
 
@@ -261,7 +266,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
+                default="64, 0, 102" />
         </fields>
     </theme>
 
@@ -271,7 +276,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 153, 51" />
+                default="64, 153, 51" />
         </fields>
     </theme>
 
@@ -281,7 +286,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 204, 204" />
+                default="64, 204, 204" />
         </fields>
     </theme>
 
@@ -291,7 +296,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 153, 0" />
+                default="153, 153, 64" />
         </fields>
     </theme>
 
@@ -301,7 +306,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 51, 0" />
+                default="102, 51, 64" />
         </fields>
     </theme>
 
@@ -311,7 +316,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 153, 153" />
+                default="255, 0, 153" />
         </fields>
     </theme>
 
@@ -321,7 +326,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 51" />
+                default="255, 10, 0" />
         </fields>
     </theme>
 
@@ -331,7 +336,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 255" />
+                default="255, 64, 255" />
         </fields>
     </theme>
 
@@ -341,7 +346,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 0, 102" />
+                default="102, 64, 102" />
         </fields>
     </theme>
 
@@ -351,7 +356,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
+                default="0, 0, 255" />
         </fields>
     </theme>
 
@@ -361,7 +366,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 0, 102" />
+                default="102, 64, 102" />
         </fields>
     </theme>
 
@@ -371,7 +376,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="253, 153, 0" />
+                default="253, 153, 64" />
         </fields>
     </theme>
 
@@ -381,7 +386,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 255, 102" />
+                default="102, 128, 102" />
         </fields>
     </theme>
 
@@ -391,7 +396,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 255, 255" />
+                default="0, 255, 0" />
         </fields>
     </theme>
 
@@ -401,7 +406,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 51, 204" />
+                default="64, 51, 178" />
         </fields>
     </theme>
 
@@ -411,7 +416,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 204, 255" />
+                default="153, 0, 255" />
         </fields>
     </theme>
 
@@ -421,7 +426,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
+                default="0, 64, 0" />
         </fields>
     </theme>
 
@@ -434,7 +439,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
+                default="204, 64, 204" />
         </fields>
     </theme>
 
@@ -444,7 +449,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
+                default="102, 0, 102" />
         </fields>
     </theme>
 
@@ -454,7 +459,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
+                default="102, 0, 102" />
         </fields>
     </theme>
 
@@ -464,7 +469,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 153, 51" />
+                default="102, 153, 51" />
         </fields>
     </theme>
 
@@ -474,7 +479,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 204, 204" />
+                default="204, 0, 204" />
         </fields>
     </theme>
 
@@ -484,7 +489,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 153, 0" />
+                default="153, 0, 153" />
         </fields>
     </theme>
 
@@ -494,7 +499,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 51, 0" />
+                default="102, 51, 102" />
         </fields>
     </theme>
 
@@ -504,7 +509,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 153, 153" />
+                default="255, 0, 153" />
         </fields>
     </theme>
 
@@ -514,7 +519,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 51" />
+                default="255, 50, 51" />
         </fields>
     </theme>
 
@@ -524,7 +529,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0, 255" />
+                default="255, 255, 0" />
         </fields>
     </theme>
 
@@ -534,7 +539,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 0, 102" />
+                default="102, 102, 64" />
         </fields>
     </theme>
 
@@ -544,7 +549,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
+                default="0, 102, 0" />
         </fields>
     </theme>
 
@@ -554,7 +559,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 0, 102" />
+                default="102, 102, 0" />
         </fields>
     </theme>
 
@@ -564,7 +569,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="253, 153, 0" />
+                default="253, 153, 102" />
         </fields>
     </theme>
 
@@ -574,7 +579,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="102, 255, 102" />
+                default="102, 0, 102" />
         </fields>
     </theme>
 
@@ -584,7 +589,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 255, 255" />
+                default="0, 0, 255" />
         </fields>
     </theme>
 
@@ -594,7 +599,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 51, 204" />
+                default="55, 51, 204" />
         </fields>
     </theme>
 
@@ -604,7 +609,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="153, 204, 255" />
+                default="153, 204, 0" />
         </fields>
     </theme>
 
@@ -614,7 +619,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
+                default="0, 128, 0" />
         </fields>
     </theme>
 
@@ -626,7 +631,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Farbe"
-                default="200, 0, 15" />
+                default="200, 64, 0" />
             <field name="textcolor" type="Color" display="Farbe"
                 default="200, 0, 15" />
             <field name="showhorizontalline" type="boolean"
@@ -645,7 +650,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Farbe"
-                default="0, 215, 0" />
+                default="0, 0, 215" />
             <field name="textcolor" type="Color" display="Farbe"
                 default="0, 215, 0" />
             <field name="showhorizontalline" type="boolean"
@@ -667,7 +672,7 @@
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="0, 0, 153" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="2" hints="h" />
+                default="4" hints="h" />
         </fields>
     </theme>
 
@@ -679,7 +684,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Farbe"
-                default="200, 0, 15" />
+                default="200, 255, 15" />
             <field name="textcolor" type="Color" display="Farbe"
                 default="200, 0, 15" />
         </fields>
@@ -693,7 +698,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Farbe"
-                default="0, 215, 0" />
+                default="0, 215, 128" />
             <field name="textcolor" type="Color" display="Farbe"
                 default="0, 215, 0" />
             <field name="textorientation" type="boolean" display="Textausrichtung"
@@ -711,7 +716,7 @@
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="0,0,0" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="1" hints="h" />
+                default="3" hints="h" />
         </fields>
     </theme>
 
@@ -721,13 +726,15 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0,0,153" />
+                default="255,0,153" />
             <field name="linesize" type="int" display="Liniendicke"
                 default="1" hints="h" />
             <field name="showwidth" type="boolean" display="Breite anzeigen"
                 default="false" />
             <field name="showlevel" type="boolean" display="Wasserstand anzeigen"
-                default="false" />
+                default="true" />
+            <field name="showlinelabel" type="boolean" default="true"
+                display="Beschriftung anzeigen" />
             <field name="showmiddleheight" type="boolean"
                 display="Wasserstand anzeigen" default="false" />
         </fields>
@@ -762,7 +769,7 @@
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="0,51,204" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="2" hints="h" />
+                default="1" hints="h" />
         </fields>
     </theme>
 
@@ -775,7 +782,7 @@
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="0,204,0" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="2" hints="h" />
+                default="1" hints="h" />
         </fields>
     </theme>
 
@@ -787,7 +794,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
+                default="204, 0, 204" />
         </fields>
     </theme>
 
@@ -799,7 +806,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
+                default="204, 0, 204" />
         </fields>
     </theme>
 
@@ -810,7 +817,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
+                default="204, 0, 204" />
         </fields>
     </theme>
 
@@ -822,7 +829,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
+                default="204, 0, 204" />
         </fields>
     </theme>
 
@@ -833,7 +840,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
+                default="204, 0, 204" />
         </fields>
     </theme>
 
@@ -847,7 +854,7 @@
             <field name="showpoints" type="boolean" display="Punkte anzeigen"
                 default="true" />
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 0, 0" />
+                default="204, 0, 200" />
         </fields>
     </theme>
 
@@ -859,7 +866,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
+                default="204, 0, 204" />
         </fields>
     </theme>
 
@@ -871,7 +878,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="255, 0 , 0" />
+                default="255, 0 , 255" />
         </fields>
     </theme>
 
@@ -882,7 +889,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
+                default="204, 0, 204" />
         </fields>
     </theme>
 
@@ -896,7 +903,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
+                default="99, 99, 99" />
         </fields>
     </theme>
 
@@ -907,7 +914,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="250, 0, 0" />
+                default="250, 255, 0" />
             <field name="font" type="Font" display="Schriftart"
                 default="arial" />
             <field name="textcolor" type="Color" display="Schriftfarbe"
@@ -917,9 +924,9 @@
             <field name="textstyle" type="Style" display="Schriftstil"
                 default="standard" />
             <field name="pointsize" type="int" display="Punktdicke"
-                default="3" hints="h" />
+                default="2" hints="h" />
             <field name="backgroundcolor" type="Color" display="Texthintergrund"
-                default="255, 255, 255" />
+                default="55, 55, 55" />
             <field name="textorientation" type="boolean" display="Textausrichtung"
                 default="true" />
             <field name="showbackground" type="boolean"
@@ -934,7 +941,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" />
+                default="330, 33, 33" />
         </fields>
     </theme>
 
@@ -1041,7 +1048,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
+                default="128, 128, 128" />
         </fields>
     </theme>
 
@@ -1051,7 +1058,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
+                default="64, 0, 102" />
         </fields>
     </theme>
 
@@ -1064,7 +1071,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
+                default="204, 0, 204" />
         </fields>
     </theme>
 
@@ -1074,7 +1081,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 102" />
+                default="64, 0, 102" />
         </fields>
     </theme>
 
@@ -1085,7 +1092,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 204, 204" />
+                default="0, 204, 0" />
         </fields>
     </theme>
 
@@ -1098,7 +1105,7 @@
         <fields>
             <field name="showlines" type="boolean" display="Linie anzeigen"
                 default="false" hidden="true" />
-            <field name="pointcolor" type="Color" default="#0099FF" />
+            <field name="pointcolor" type="Color" default="0, 99, 255" />
         </fields>
     </theme>
 
@@ -1109,7 +1116,7 @@
         <fields>
             <field name="showlines" type="boolean" display="Linie anzeigen"
                 default="false" hidden="true" />
-            <field name="pointcolor" type="Color" default="#CC0000" />
+            <field name="pointcolor" type="Color" default="0, 99, 0" />
         </fields>
     </theme>
 
@@ -1119,6 +1126,7 @@
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="#000000" />
+            <field name="linesize" type="int" default="3" />
         </fields>
     </theme>
 
@@ -1127,7 +1135,16 @@
             <inherit from="HiddenColorLines" />
         </inherits>
         <fields>
-            <field name="linecolor" type="Color" default="227, 27, 162" />
+            <field name="linecolor" type="Color" default="0, 27, 162" />
+        </fields>
+    </theme>
+
+    <theme name="FixingDerivedCurve">
+        <inherits>
+            <inherit from="HiddenColorLines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 27, 162" />
         </fields>
     </theme>
 
@@ -1142,9 +1159,9 @@
             <field name="pointsize" type="int" display="Punktdicke"
                 default="3" />
             <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 128, 0" />
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
+                default="0, 128, 128" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
         </fields>
     </theme>
     <theme name="FixingSectorAverageWQ1">
@@ -1158,9 +1175,9 @@
             <field name="pointsize" type="int" display="Punktdicke"
                 default="3" />
             <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 0, 255" />
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
+                default="0, 64, 255" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
         </fields>
     </theme>
     <theme name="FixingSectorAverageWQ2">
@@ -1172,11 +1189,11 @@
                 display="Beschriftung anzeigen" default="false" hints="h" />
             <field name="showlines" type="boolean" default="false" />
             <field name="pointsize" type="int" display="Punktdicke"
-                default="3" />
+                default="2" />
             <field name="pointcolor" type="Color" display="Punktfarbe"
                 default="255, 0, 255" />
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
         </fields>
     </theme>
     <theme name="FixingSectorAverageWQ3">
@@ -1190,9 +1207,9 @@
             <field name="pointsize" type="int" display="Punktdicke"
                 default="3" />
             <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="255, 0, 0" />
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
+                default="255, 0, 255" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
         </fields>
     </theme>
 
@@ -1201,15 +1218,13 @@
             <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" />
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
+                default="0, 255, 255" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
         </fields>
     </theme>
 
@@ -1225,11 +1240,11 @@
             <field name="linetype" type="Dash" display="Linienart"
                 default="10" hidden="true" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="1" hidden="true" />
+                default="2" hidden="true" />
             <field name="pointsize" type="int" display="Punktdicke"
-                default="3" />
+                default="4" />
             <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 80, 160" />
+                default="0, 80, 255" />
             <field name="showpointlabel" type="boolean"
                 display="Punktbeschriftung anzeigen" default="true"/>
         </fields>
@@ -1240,62 +1255,61 @@
             <inherit from="ColorPoints" />
         </inherits>
         <fields>
-            <field name="showlines" type="boolean" default="false" />
-            <field name="textorientation" type="boolean" display="Textausrichtung"
-                default="true" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
         </fields>
     </theme>
 
     <theme name="FixingDeltaWtAverage0">
         <inherits>
-            <inherit from="ColorPoints" />
-        </inherits>
-        <fields>
-            <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="FixingDeltaWtAverage1">
-        <inherits>
-            <inherit from="ColorPoints" />
+            <inherit from="ColorLines" />
         </inherits>
         <fields>
             <field name="showlinelabel" type="boolean"
                 display="Beschriftung anzeigen" default="false" hints="h" />
-            <field name="pointsize" type="int" display="Punktdicke"
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 128, 128" />
+            <field name="linesize" type="int" display="Liniendicke"
                 default="3" />
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="0, 0, 255" />
         </fields>
     </theme>
-    <theme name="FixingDeltaWtAverage2">
+    <theme name="FixingDeltaWtAverage1">
         <inherits>
-            <inherit from="ColorPoints" />
+            <inherit from="ColorLines" />
         </inherits>
         <fields>
             <field name="showlinelabel" type="boolean"
                 display="Beschriftung anzeigen" default="false" hints="h" />
-            <field name="pointsize" type="int" display="Punktdicke"
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="128, 0, 255" />
+            <field name="linesize" type="int" display="Liniendicke"
                 default="3" />
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="255, 0, 255" />
+        </fields>
+    </theme>
+    <theme name="FixingDeltaWtAverage2">
+        <inherits>
+            <inherit from="ColorLines" />
+        </inherits>
+        <fields>
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="h" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 128, 255" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="3" />
         </fields>
     </theme>
     <theme name="FixingDeltaWtAverage3">
         <inherits>
-            <inherit from="ColorPoints" />
+            <inherit from="ColorLines" />
         </inherits>
         <fields>
             <field name="showlinelabel" type="boolean"
                 display="Beschriftung anzeigen" default="false" hints="h" />
-            <field name="pointsize" type="int" display="Punktdicke"
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="255, 0, 0" />
+            <field name="linesize" type="int" display="Liniendicke"
                 default="3" />
-            <field name="pointcolor" type="Color" display="Punktfarbe"
-                default="255, 0, 0" />
         </fields>
     </theme>
 
@@ -1312,6 +1326,7 @@
                 default="3" />
             <field name="pointcolor" type="Color" display="Punktfarbe"
                 default="0, 255, 0" />
+            <field name="textorientation" type="boolean" default="true" display="Text horizontal"/>
         </fields>
     </theme>
 
@@ -1320,7 +1335,7 @@
             <inherit from="HiddenColorLines" />
         </inherits>
         <fields>
-            <field name="linecolor" type="Color" default="0, 128, 0" />
+            <field name="linecolor" type="Color" default="0, 128, 64" />
             <field name="showlinelabel" type="boolean"
                 display="Beschriftung anzeigen" default="false" hints="h" />
         </fields>
@@ -1330,7 +1345,7 @@
             <inherit from="HiddenColorLines" />
         </inherits>
         <fields>
-            <field name="linecolor" type="Color" default="0, 0, 255" />
+            <field name="linecolor" type="Color" default="0, 64, 255" />
             <field name="showlinelabel" type="boolean"
                 display="Beschriftung anzeigen" default="false" hints="h" />
         </fields>
@@ -1340,7 +1355,7 @@
             <inherit from="HiddenColorLines" />
         </inherits>
         <fields>
-            <field name="linecolor" type="Color" default="255, 0, 255" />
+            <field name="linecolor" type="Color" default="255, 64, 255" />
             <field name="showlinelabel" type="boolean"
                 display="Beschriftung anzeigen" default="false" hints="h" />
         </fields>
@@ -1350,7 +1365,7 @@
             <inherit from="HiddenColorLines" />
         </inherits>
         <fields>
-            <field name="linecolor" type="Color" default="255, 0, 0" />
+            <field name="linecolor" type="Color" default="255, 0, 64" />
             <field name="showlinelabel" type="boolean"
                 display="Beschriftung anzeigen" default="false" hints="h" />
         </fields>
@@ -1362,7 +1377,7 @@
         </inherits>
         <fields>
             <field name="fillcolor" type="Color" display="Fuellfarbe"
-                default="0, 128, 0" />
+                default="0, 128, 64" />
             <field name="transparent" type="boolean" display="Transparenz"
                 default="true" />
         </fields>
@@ -1373,7 +1388,7 @@
         </inherits>
         <fields>
             <field name="fillcolor" type="Color" display="Fuellfarbe"
-                default="0, 0, 255" />
+                default="64, 0, 255" />
             <field name="transparent" type="boolean" display="Transparenz"
                 default="true" />
         </fields>
@@ -1384,7 +1399,7 @@
         </inherits>
         <fields>
             <field name="fillcolor" type="Color" display="Fuellfarbe"
-                default="255, 0, 255" />
+                default="255, 64, 255" />
             <field name="transparent" type="boolean" display="Transparenz"
                 default="true" />
         </fields>
@@ -1395,7 +1410,7 @@
         </inherits>
         <fields>
             <field name="fillcolor" type="Color" display="Fuellfarbe"
-                default="255, 0, 0" />
+                default="255, 64, 0" />
             <field name="transparent" type="boolean" display="Transparenz"
                 default="true" />
         </fields>
@@ -1406,7 +1421,7 @@
         </inherits>
         <fields>
             <field name="fillcolor" type="Color" display="Fuellfarbe"
-                default="100, 100, 100" />
+                default="200, 200, 200" />
             <field name="transparent" type="boolean" display="Transparenz"
                 default="true" />
         </fields>
@@ -1416,7 +1431,7 @@
             <inherit from="HiddenColorLines" />
         </inherits>
         <fields>
-            <field name="linecolor" type="Color" default="0, 255, 0" />
+            <field name="linecolor" type="Color" default="0, 0, 255" />
             <field name="showlinelabel" type="boolean"
                 display="Beschriftung anzeigen" default="false" hints="h" />
         </fields>
@@ -1426,25 +1441,17 @@
             <inherit from="HiddenColorLines" />
         </inherits>
         <fields>
-            <field name="linecolor" type="Color" default="0, 80, 160" />
+            <field name="linecolor" type="Color" default="160, 80, 160" />
             <field name="showlinelabel" type="boolean"
                 display="Beschriftung anzeigen" default="false" hints="h" />
         </fields>
     </theme>
-    <theme name="FixingDerivedCurve">
-        <inherits>
-            <inherit from="HiddenColorLines" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="227, 27, 162" />
-        </fields>
-    </theme>
     <theme name="FixDeltaWtDeviation">
     	<inherits>
     		<inherit from="Areas"/>
     	</inherits>
     	<fields>
-    		<field name="alpha" type="int" default="50" disply="Alpha-Transparenz"/>
+    		<field name="alpha" type="int" default="70" display="Alpha-Transparenz"/>
     		<field name="fillcolor" type="Color" default="0, 0, 0" display="Füllfarbe"/>
     	</fields>
     </theme>
@@ -1453,10 +1460,30 @@
     		<inherit from="Areas"/>
     	</inherits>
     	<fields>
-    		<field name="alpha" type="int" default="80" disply="Alpha-Transparenz"/>
+    		<field name="alpha" type="int" default="40" display="Alpha-Transparenz"/>
     		<field name="fillcolor" type="Color" default="255, 0, 0" display="Hauptfarbe"/>
     		<field name="backgroundcolor" type="Color" default="0, 0, 255" display="Wechselfarbe"/>
     	</fields>
     </theme>
 
+    <theme name="QSectors">
+        <fields>
+            <field name="linecolor" type="Color" default="32, 27, 162" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="h" />
+            <field name="linetype" type="Dash" display="Linienart"
+                default="10" hidden="true" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="2" hidden="true" />
+            <field name="labelfontface" type="Font"
+                display="Beschriftung: Schriftart" default="arial" />
+            <field name="labelfontcolor" type="Color"
+                display="Beschriftung: Schriftfarbe" default="0, 0, 0" />
+            <field name="labelfontsize" type="int"
+                display="Beschriftung: Schriftgröße" default="9" />
+            <field name="labelfontstyle" type="Style"
+                display="Beschriftung: Schriftstil" default="standard" />
+        </fields>
+    </theme>
+
 </themegroup>
diff -r 893b2477208f -r 0c217de0d84b flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java	Sat Sep 08 18:19:33 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java	Sun Sep 09 09:32:49 2012 +0000
@@ -166,7 +166,7 @@
             logger.debug("Gauge: " + gauge.getName());
         }
 
-        List<MainValue> mainValues = gauge.fetchMainValues();
+        List<MainValue> mainValues = gauge.getMainValues();
 
         if (logger.isDebugEnabled()) {
             logger.debug(mainValues.size() + " main values found.");