Mercurial > dive4elements > river

changeset 3577:25cce741d03c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rudimentary Themeing for qsector lines. flys-artifacts/trunk@5192 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Fri, 10 Aug 2012 14:09:32 +0000
parents 6442f317a0c7
children bae185bf9d2d
files flys-artifacts/ChangeLog flys-artifacts/doc/conf/default-themes.xml flys-artifacts/doc/conf/themes.xml flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java
diffstat 4 files changed, 34 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Fri Aug 10 12:30:39 2012 +0000
+++ b/flys-artifacts/ChangeLog	Fri Aug 10 14:09:32 2012 +0000
@@ -1,3 +1,14 @@
+2012-08-10	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* doc/conf/themes.xml, doc/conf/default-themes.xml:
+	  Fix some typos, correct defaults and add mapping for qsector-theme.
+
+	* src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java:
+	  Cosmetics.
+
+	* src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java:
+	  Add accidentally omitted change, stub for style-handling.
+
 2012-08-10	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/model/QSectorFacet.java,
--- a/flys-artifacts/doc/conf/default-themes.xml	Fri Aug 10 12:30:39 2012 +0000
+++ b/flys-artifacts/doc/conf/default-themes.xml	Fri Aug 10 14:09:32 2012 +0000
@@ -50,6 +50,9 @@
         <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" />
         </fields>
@@ -1147,7 +1150,7 @@
             <inherit from="ColorPoints" />
         </inherits>
         <fields>
-            <field name="showlines" type="boolean" default="false" />
+            <field name="showlines" type="boolean" default="true" />
             <field name="showlinelabel" type="boolean"
                 display="Beschriftung anzeigen" default="false" hints="h" />
             <field name="pointsize" type="int" display="Punktdicke"
@@ -1165,7 +1168,7 @@
         <fields>
             <field name="showlinelabel" type="boolean"
                 display="Beschriftung anzeigen" default="false" hints="h" />
-            <field name="showlines" type="boolean" default="false" />
+            <field name="showlines" type="boolean" default="true" />
             <field name="pointsize" type="int" display="Punktdicke"
                 default="3" />
             <field name="pointcolor" type="Color" display="Punktfarbe"
@@ -1181,7 +1184,7 @@
         <fields>
             <field name="showlinelabel" type="boolean"
                 display="Beschriftung anzeigen" default="false" hints="h" />
-            <field name="showlines" type="boolean" default="false" />
+            <field name="showlines" type="boolean" default="true" />
             <field name="pointsize" type="int" display="Punktdicke"
                 default="3" />
             <field name="pointcolor" type="Color" display="Punktfarbe"
@@ -1197,7 +1200,7 @@
         <fields>
             <field name="showlinelabel" type="boolean"
                 display="Beschriftung anzeigen" default="false" hints="h" />
-            <field name="showlines" type="boolean" default="false" />
+            <field name="showlines" type="boolean" default="true" />
             <field name="pointsize" type="int" display="Punktdicke"
                 default="3" />
             <field name="pointcolor" type="Color" display="Punktfarbe"
@@ -1444,7 +1447,7 @@
     		<inherit from="Areas"/>
     	</inherits>
     	<fields>
-    		<field name="alpha" type="int" default="50" disply="Alpha-Transparenz"/>
+    		<field name="alpha" type="int" default="50" display="Alpha-Transparenz"/>
     		<field name="fillcolor" type="Color" default="0, 0, 0" display="Füllfarbe"/>
     	</fields>
     </theme>
@@ -1453,10 +1456,22 @@
     		<inherit from="Areas"/>
     	</inherits>
     	<fields>
-    		<field name="alpha" type="int" default="80" disply="Alpha-Transparenz"/>
+    		<field name="alpha" type="int" default="80" 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="227, 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="1" hidden="true" />
+        </fields>
+    </theme>
+
 </themegroup>
--- a/flys-artifacts/doc/conf/themes.xml	Fri Aug 10 12:30:39 2012 +0000
+++ b/flys-artifacts/doc/conf/themes.xml	Fri Aug 10 14:09:32 2012 +0000
@@ -195,5 +195,6 @@
         <mapping from="fix_analysis_events_ls" to="FixLSAnalysis"/>
         <mapping from="fix_reference_events_ls" to="FixLSReference"/>
         <mapping from="fix_derivate" to="FixingDerivedCurve"/>
+        <mapping from="qsectors" to="QSectors"/>
     </mappings>
 </themes>
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java	Fri Aug 10 12:30:39 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java	Fri Aug 10 14:09:32 2012 +0000
@@ -354,6 +354,7 @@
         return chart;
     }
 
+    /** Add domain markers to plot that indicate Q-sectors. */
     protected static void applyQSectorMarkers(
         XYPlot   plot,
         String   river,
http://dive4elements.wald.intevation.org