Mercurial > dive4elements > river

changeset 7517:46f902aa6b54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
issue1658: Fix theme styles for sediment load (t/a and m^3/a) facets.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Mon, 04 Nov 2013 15:57:47 +0100
parents 7e95bdb72a40
children b6e127ffc325
files artifacts/doc/conf/themes.xml artifacts/doc/conf/themes/default.xml artifacts/doc/conf/themes/second.xml
diffstat 3 files changed, 227 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/themes.xml	Mon Nov 04 15:15:13 2013 +0100
+++ b/artifacts/doc/conf/themes.xml	Mon Nov 04 15:57:47 2013 +0100
@@ -307,15 +307,24 @@
         <mapping from="gauge_discharge_curve" to="GaugeDischargeCurve" />
         <mapping from="extreme_wq_curve" to="ExtremeWQCurve" />
         <mapping from="extreme_wq_curve_base" to="ExtremeWQBaseCurve" />
-        <mapping from="sedimentload.coarse" to="SedimentLoadCoarse" />
-        <mapping from="sedimentload.finemiddle" to="SedimentLoadFineMid" />
-        <mapping from="sedimentload.sand" to="SedimentLoadSand" />
-        <mapping from="sedimentload.susp_sand" to="SedimentLoadSuspSand" />
-        <mapping from="sedimentload.susp_sand_bed" to="SedimentLoadSuspSandBed" />
-        <mapping from="sedimentload.susp_sediment" to="SedimentLoadSediment" />
-        <mapping from="sedimentload.total_load" to="SedimentLoadTotalLoad" />
-        <mapping from="sedimentload.total" to="SedimentLoadTotal" />
-        <mapping from="sedimentload.unknown" to="SedimentLoadUnknown" />
+        <mapping from="sedimentload.ta.coarse" to="SedimentLoadTACoarse" />
+        <mapping from="sedimentload.ta.finemiddle" to="SedimentLoadTAFineMid" />
+        <mapping from="sedimentload.ta.sand" to="SedimentLoadTASand" />
+        <mapping from="sedimentload.ta.susp_sand" to="SedimentLoadTASuspSand" />
+        <mapping from="sedimentload.ta.susp_sand_bed" to="SedimentLoadTASuspSandBed" />
+        <mapping from="sedimentload.ta.susp_sediment" to="SedimentLoadTASediment" />
+        <mapping from="sedimentload.ta.total_load" to="SedimentLoadTATotalLoad" />
+        <mapping from="sedimentload.ta.total" to="SedimentLoadTATotal" />
+        <mapping from="sedimentload.ta.unknown" to="SedimentLoadTAUnknown" />
+        <mapping from="sedimentload.m3a.coarse" to="SedimentLoadM3ACoarse" />
+        <mapping from="sedimentload.m3a.finemiddle" to="SedimentLoadM3AFineMid" />
+        <mapping from="sedimentload.m3a.sand" to="SedimentLoadM3ASand" />
+        <mapping from="sedimentload.m3a.susp_sand" to="SedimentLoadM3ASuspSand" />
+        <mapping from="sedimentload.m3a.susp_sand_bed" to="SedimentLoadM3ASuspSandBed" />
+        <mapping from="sedimentload.m3a.susp_sediment" to="SedimentLoadM3ASediment" />
+        <mapping from="sedimentload.m3a.total_load" to="SedimentLoadM3ATotalLoad" />
+        <mapping from="sedimentload.m3a.total" to="SedimentLoadM3ATotal" />
+        <mapping from="sedimentload.m3a.unknown" to="SedimentLoadM3AUnknown" />
     </mappings>
 
 </themes>
--- a/artifacts/doc/conf/themes/default.xml	Mon Nov 04 15:15:13 2013 +0100
+++ b/artifacts/doc/conf/themes/default.xml	Mon Nov 04 15:57:47 2013 +0100
@@ -1100,8 +1100,8 @@
         </fields>
     </theme>
 
-    <!-- Sediment load -->
-    <theme name="SedimentLoadCoarse">
+    <!-- Sediment load, M^3/A -->
+    <theme name="SedimentLoadM3ACoarse">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1110,7 +1110,7 @@
         </fields>
     </theme>
 
-    <theme name="SedimentLoadFineMid">
+    <theme name="SedimentLoadM3AFineMid">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1118,7 +1118,8 @@
             <field name="linecolor" type="Color" default="255, 0, 0" />
         </fields>
     </theme>
-    <theme name="SedimentLoadSand">
+
+    <theme name="SedimentLoadM3ASand">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1127,7 +1128,7 @@
         </fields>
     </theme>
 
-    <theme name="SedimentLoadSuspSand">
+    <theme name="SedimentLoadM3ASuspSand">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1136,7 +1137,7 @@
         </fields>
     </theme>
 
-     <theme name="SedimentLoadSediment">
+    <theme name="SedimentLoadM3ASediment">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1144,7 +1145,8 @@
             <field name="linecolor" type="Color" default="0, 255, 255" />
         </fields>
     </theme>
-     <theme name="SedimentLoadSuspSandBed">
+
+    <theme name="SedimentLoadM3ASuspSandBed">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1154,7 +1156,8 @@
                 display="Beschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
-     <theme name="SedimentLoadTotalLoad">
+
+    <theme name="SedimentLoadM3ATotalLoad">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1164,7 +1167,8 @@
                 display="Beschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
-    <theme name="SedimentLoadTotal">
+
+    <theme name="SedimentLoadM3ATotal">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1175,7 +1179,97 @@
         </fields>
     </theme>
 
-    <theme name="SedimentLoadUnknown">
+    <theme name="SedimentLoadM3AUnknown">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 0, 0" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <!-- Sediment load, T/A -->
+    <theme name="SedimentLoadTACoarse">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadTAFineMid">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadTASand">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadTASuspSand">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 255, 0" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadTASediment">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 255, 255" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadTASuspSandBed">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 255, 0" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadTATotalLoad">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 100, 100" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadTATotal">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 100, 200" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadTAUnknown">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
--- a/artifacts/doc/conf/themes/second.xml	Mon Nov 04 15:15:13 2013 +0100
+++ b/artifacts/doc/conf/themes/second.xml	Mon Nov 04 15:57:47 2013 +0100
@@ -1100,8 +1100,8 @@
         </fields>
     </theme>
 
-    <!-- Sediment load -->
-    <theme name="SedimentLoadCoarse">
+    <!-- Sediment load, M^3/A -->
+    <theme name="SedimentLoadM3ACoarse">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1110,7 +1110,7 @@
         </fields>
     </theme>
 
-    <theme name="SedimentLoadFineMid">
+    <theme name="SedimentLoadM3AFineMid">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1118,7 +1118,8 @@
             <field name="linecolor" type="Color" default="255, 0, 0" />
         </fields>
     </theme>
-    <theme name="SedimentLoadSand">
+
+    <theme name="SedimentLoadM3ASand">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1127,7 +1128,7 @@
         </fields>
     </theme>
 
-    <theme name="SedimentLoadSuspSand">
+    <theme name="SedimentLoadM3ASuspSand">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1136,7 +1137,7 @@
         </fields>
     </theme>
 
-     <theme name="SedimentLoadSediment">
+    <theme name="SedimentLoadM3ASediment">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1144,7 +1145,8 @@
             <field name="linecolor" type="Color" default="0, 255, 255" />
         </fields>
     </theme>
-     <theme name="SedimentLoadSuspSandBed">
+
+    <theme name="SedimentLoadM3ASuspSandBed">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1154,7 +1156,8 @@
                 display="Beschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
-     <theme name="SedimentLoadTotalLoad">
+
+    <theme name="SedimentLoadM3ATotalLoad">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1164,7 +1167,8 @@
                 display="Beschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
-    <theme name="SedimentLoadTotal">
+
+    <theme name="SedimentLoadM3ATotal">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1175,7 +1179,7 @@
         </fields>
     </theme>
 
-    <theme name="SedimentLoadUnknown">
+    <theme name="SedimentLoadM3AUnknown">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1186,6 +1190,97 @@
         </fields>
     </theme>
 
+    <!-- Sediment load, T/A -->
+    <theme name="SedimentLoadTACoarse">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadTAFineMid">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadTASand">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 0, 255" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadTASuspSand">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 255, 0" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadTASediment">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 255, 255" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadTASuspSandBed">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 255, 0" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadTATotalLoad">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="255, 100, 100" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadTATotal">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 100, 200" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="SedimentLoadTAUnknown">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 0, 0" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+
     <theme name="LongitudinalSectionArea">
         <inherits>
             <inherit from="Areas" />
http://dive4elements.wald.intevation.org