Mercurial > dive4elements > river

changeset 8116:fdb29e8b7ec0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make a difference between themes representing loads in different units.
author "Tom Gottfried <tom@intevation.de>"
date Thu, 21 Aug 2014 15:48:01 +0200
parents 9a8ddd37a1a7
children ca072278ad02
files artifacts/doc/conf/themes/default.xml artifacts/doc/conf/themes/second.xml
diffstat 2 files changed, 42 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/themes/default.xml	Wed Aug 20 17:54:12 2014 +0200
+++ b/artifacts/doc/conf/themes/default.xml	Thu Aug 21 15:48:01 2014 +0200
@@ -169,6 +169,7 @@
                 display="Flächenbeschriftung anzeigen" default="false"/>
         </fields>
     </theme>
+
     <!-- top level classes defining additional attributes-->
     <theme name="LongitudinalSection">
         <inherits>
@@ -1100,9 +1101,18 @@
     </theme>
 
     <!-- Sediment load, M^3/A -->
+    <theme name="SedimentLoadM3A">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linesize" type="int" default="2" />
+        </fields>
+    </theme>
+
     <theme name="SedimentLoadM3ACoarse">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="255, 0, 255" />
@@ -1111,7 +1121,7 @@
 
     <theme name="SedimentLoadM3AFineMid">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="255, 0, 0" />
@@ -1120,7 +1130,7 @@
 
     <theme name="SedimentLoadM3ASand">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="0, 0, 255" />
@@ -1129,7 +1139,7 @@
 
     <theme name="SedimentLoadM3ASuspSand">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="255, 255, 0" />
@@ -1138,7 +1148,7 @@
 
     <theme name="SedimentLoadM3ASediment">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="0, 255, 255" />
@@ -1147,7 +1157,7 @@
 
     <theme name="SedimentLoadM3ASuspSandBed">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="0, 255, 0" />
@@ -1158,7 +1168,7 @@
 
     <theme name="SedimentLoadM3ATotalLoad">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="255, 100, 100" />
@@ -1169,7 +1179,7 @@
 
     <theme name="SedimentLoadM3ATotal">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="0, 100, 200" />
@@ -1180,7 +1190,7 @@
 
     <theme name="SedimentLoadM3AUnknown">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="0, 0, 0" />
@@ -1191,7 +1201,7 @@
 
     <theme name="SedimentLoadM3ABed">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="45, 255, 241" />
@@ -1200,7 +1210,7 @@
 
     <theme name="SedimentLoadM3ASusp">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="85, 255, 0" />
--- a/artifacts/doc/conf/themes/second.xml	Wed Aug 20 17:54:12 2014 +0200
+++ b/artifacts/doc/conf/themes/second.xml	Thu Aug 21 15:48:01 2014 +0200
@@ -169,6 +169,7 @@
                 display="Flächenbeschriftung anzeigen" default="false"/>
         </fields>
     </theme>
+
     <!-- top level classes defining additional attributes-->
     <theme name="LongitudinalSection">
         <inherits>
@@ -1100,9 +1101,18 @@
     </theme>
 
     <!-- Sediment load, M^3/A -->
+    <theme name="SedimentLoadM3A">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linesize" type="int" default="2" />
+        </fields>
+    </theme>
+
     <theme name="SedimentLoadM3ACoarse">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="255, 0, 255" />
@@ -1111,7 +1121,7 @@
 
     <theme name="SedimentLoadM3AFineMid">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="255, 0, 0" />
@@ -1120,7 +1130,7 @@
 
     <theme name="SedimentLoadM3ASand">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="0, 0, 255" />
@@ -1129,7 +1139,7 @@
 
     <theme name="SedimentLoadM3ASuspSand">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="255, 255, 0" />
@@ -1138,7 +1148,7 @@
 
     <theme name="SedimentLoadM3ASediment">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="0, 255, 255" />
@@ -1147,7 +1157,7 @@
 
     <theme name="SedimentLoadM3ASuspSandBed">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="0, 255, 0" />
@@ -1158,7 +1168,7 @@
 
     <theme name="SedimentLoadM3ATotalLoad">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="255, 100, 100" />
@@ -1169,7 +1179,7 @@
 
     <theme name="SedimentLoadM3ATotal">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="0, 100, 200" />
@@ -1180,7 +1190,7 @@
 
     <theme name="SedimentLoadM3AUnknown">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="0, 0, 0" />
@@ -1191,7 +1201,7 @@
 
     <theme name="SedimentLoadM3ABed">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="45, 255, 241" />
@@ -1200,7 +1210,7 @@
 
     <theme name="SedimentLoadM3ASusp">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="SedimentLoadM3A" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" default="85, 255, 0" />
http://dive4elements.wald.intevation.org