Mercurial > dive4elements > river

changeset 8634:57e0bfda1c76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(issue1753) Fix theme for SQ Outliers and SQ Measurements
author Andre Heinecke <andre.heinecke@intevation.de>
date Fri, 27 Mar 2015 13:40:25 +0100
parents 8bff94ea044f
children c421c9530aba
files artifacts/doc/conf/themes.xml artifacts/doc/conf/themes/default.xml artifacts/doc/conf/themes/second.xml
diffstat 3 files changed, 144 insertions(+), 65 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/themes.xml	Thu Mar 26 18:21:18 2015 +0100
+++ b/artifacts/doc/conf/themes.xml	Fri Mar 27 13:40:25 2015 +0100
@@ -284,37 +284,37 @@
         <mapping from="sq_g_outlier_curve" to="SQOutlierCurveG" />
         <mapping from="sq_g_outlier_measurement" to="SQMeasurementsG" />
         <mapping from="sq_a_measurement_overview" to="SQMeasurementsOverviewA" />
-        <mapping from="sq_a_outlier_overview" to="SQOutliersA" />
+        <mapping from="sq_a_outlier_overview" to="SQOutliersOverviewA" />
         <mapping from="sq_a_curve_overview" to="SQCurveA" />
         <mapping from="sq_a_outlier_curve_overview" to="SQOutlierCurveA" />
         <mapping from="sq_a_outlier_measurement_overview" to="SQMeasurementsOverviewA" />
         <mapping from="sq_b_measurement_overview" to="SQMeasurementsOverviewB" />
-        <mapping from="sq_b_outlier_overview" to="SQOutliersB" />
+        <mapping from="sq_b_outlier_overview" to="SQOutliersOverviewB" />
         <mapping from="sq_b_curve_overview" to="SQCurveB" />
         <mapping from="sq_b_outlier_curve_overview" to="SQOutlierCurveB" />
         <mapping from="sq_b_outlier_measurement_overview" to="SQMeasurementsOverviewB" />
         <mapping from="sq_c_measurement_overview" to="SQMeasurementsOverviewC" />
-        <mapping from="sq_c_outlier_overview" to="SQOutliersC" />
+        <mapping from="sq_c_outlier_overview" to="SQOutliersOverviewC" />
         <mapping from="sq_c_curve_overview" to="SQCurveC" />
         <mapping from="sq_c_outlier_curve_overview" to="SQOutlierCurveC" />
         <mapping from="sq_c_outlier_measurement_overview" to="SQMeasurementsOverviewC" />
         <mapping from="sq_d_measurement_overview" to="SQMeasurementsOverviewD" />
-        <mapping from="sq_d_outlier_overview" to="SQOutliersD" />
+        <mapping from="sq_d_outlier_overview" to="SQOutliersOverviewD" />
         <mapping from="sq_d_curve_overview" to="SQCurveD" />
         <mapping from="sq_d_outlier_curve_overview" to="SQOutlierCurveD" />
         <mapping from="sq_d_outlier_measurement_overview" to="SQMeasurementsOverviewD" />
         <mapping from="sq_e_measurement_overview" to="SQMeasurementsOverviewE" />
-        <mapping from="sq_e_outlier_overview" to="SQOutliersE" />
+        <mapping from="sq_e_outlier_overview" to="SQOutliersOverviewE" />
         <mapping from="sq_e_curve_overview" to="SQCurveE" />
         <mapping from="sq_e_outlier_curve_overview" to="SQOutlierCurveE" />
         <mapping from="sq_e_outlier_measurement_overview" to="SQMeasurementsOverviewE" />
         <mapping from="sq_f_measurement_overview" to="SQMeasurementsOverviewF" />
-        <mapping from="sq_f_outlier_overview" to="SQOutliersF" />
+        <mapping from="sq_f_outlier_overview" to="SQOutliersOverviewF" />
         <mapping from="sq_f_curve_overview" to="SQCurveF" />
         <mapping from="sq_f_outlier_curve_overview" to="SQOutlierCurveF" />
         <mapping from="sq_f_outlier_measurement_overview" to="SQMeasurementsOverviewF" />
         <mapping from="sq_g_measurement_overview" to="SQMeasurementsOverviewG" />
-        <mapping from="sq_g_outlier_overview" to="SQOutliersG" />
+        <mapping from="sq_g_outlier_overview" to="SQOutliersOverviewG" />
         <mapping from="sq_g_curve_overview" to="SQCurveG" />
         <mapping from="sq_g_outlier_curve_overview" to="SQOutlierCurveG" />
         <mapping from="sq_g_outlier_measurement_overview" to="SQMeasurementsOverviewG" />
--- a/artifacts/doc/conf/themes/default.xml	Thu Mar 26 18:21:18 2015 +0100
+++ b/artifacts/doc/conf/themes/default.xml	Fri Mar 27 13:40:25 2015 +0100
@@ -2441,19 +2441,10 @@
 
     <theme name="SQMeasurements">
         <inherits>
-            <inherit from="Lines" />
             <inherit from="Points" />
             <inherit from="Label" />
         </inherits>
         <fields>
-            <field name="showlines" type="boolean" display="Linie anzeigen"
-                default="false" hints="hidden" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="1" hints="hidden" />
-            <field name="linetype" type="Dash" display="Linienart"
-                default="10" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" hints="hidden" />
             <field name="textorientation" type="boolean" display="Textausrichtung"
                 default="true" />
             <field name="showpointlabel" type="boolean"
@@ -2463,19 +2454,10 @@
 
     <theme name="SQMeasurementsOverview">
         <inherits>
-            <inherit from="Lines" />
             <inherit from="Points" />
             <inherit from="Label" />
         </inherits>
         <fields>
-            <field name="showlines" type="boolean" display="Linie anzeigen"
-                default="false" hints="hidden" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="1" hints="hidden" />
-            <field name="linetype" type="Dash" display="Linienart"
-                default="10" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" hints="hidden" />
             <field name="textorientation" type="boolean" display="Textausrichtung"
                 default="true" />
             <field name="showpointlabel" type="boolean"
@@ -2485,20 +2467,14 @@
 
     <theme name="SQOutliers">
         <inherits>
-            <inherit from="Lines" />
             <inherit from="Points" />
+            <inherit from="Label" />
         </inherits>
         <fields>
-            <field name="showlines" type="boolean" display="Linie anzeigen"
-                default="false" hints="hidden" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="1" hints="hidden" />
-            <field name="linetype" type="Dash" display="Linienart"
-                default="10" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" hints="hidden" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="textorientation" type="boolean" display="Textausrichtung"
+                default="true" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="true"/>
         </fields>
     </theme>
 
@@ -2710,6 +2686,69 @@
         </fields>
     </theme>
 
+    <theme name="SQOutliersOverviewA">
+        <inherits>
+            <inherit from="SQOutliersA" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
+        </fields>
+    </theme>
+    <theme name="SQOutliersOverviewB">
+        <inherits>
+            <inherit from="SQOutliersB" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
+        </fields>
+    </theme>
+    <theme name="SQOutliersOverviewC">
+        <inherits>
+            <inherit from="SQOutliersC" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
+        </fields>
+    </theme>
+    <theme name="SQOutliersOverviewD">
+        <inherits>
+            <inherit from="SQOutliersD" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
+        </fields>
+    </theme>
+    <theme name="SQOutliersOverviewE">
+        <inherits>
+            <inherit from="SQOutliersE" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
+        </fields>
+    </theme>
+    <theme name="SQOutliersOverviewF">
+        <inherits>
+            <inherit from="SQOutliersF" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
+        </fields>
+    </theme>
+    <theme name="SQOutliersOverviewG">
+        <inherits>
+            <inherit from="SQOutliersG" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
+        </fields>
+    </theme>
 
     <theme name="SQCurveA">
         <inherits>
--- a/artifacts/doc/conf/themes/second.xml	Thu Mar 26 18:21:18 2015 +0100
+++ b/artifacts/doc/conf/themes/second.xml	Fri Mar 27 13:40:25 2015 +0100
@@ -2440,20 +2440,11 @@
 
     <theme name="SQMeasurements">
         <inherits>
-            <inherit from="Lines" />
             <inherit from="Points" />
             <inherit from="Label" />
         </inherits>
         <fields>
             <field name="pointcolor" type="Color" default="0, 153, 255" />
-            <field name="showlines" type="boolean" display="Linie anzeigen"
-                default="false" hints="hidden" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="1" hints="hidden" />
-            <field name="linetype" type="Dash" display="Linienart"
-                default="10" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" hints="hidden" />
             <field name="textorientation" type="boolean" display="Textausrichtung"
                 default="true" />
             <field name="showpointlabel" type="boolean"
@@ -2463,19 +2454,10 @@
 
     <theme name="SQMeasurementsOverview">
         <inherits>
-            <inherit from="Lines" />
             <inherit from="Points" />
             <inherit from="Label" />
         </inherits>
         <fields>
-            <field name="showlines" type="boolean" display="Linie anzeigen"
-                default="false" hints="hidden" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="1" hints="hidden" />
-            <field name="linetype" type="Dash" display="Linienart"
-                default="10" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" hints="hidden" />
             <field name="textorientation" type="boolean" display="Textausrichtung"
                 default="true" />
             <field name="showpointlabel" type="boolean"
@@ -2485,21 +2467,15 @@
 
     <theme name="SQOutliers">
         <inherits>
-            <inherit from="Lines" />
             <inherit from="Points" />
+            <inherit from="Label" />
         </inherits>
         <fields>
             <field name="pointcolor" type="Color" default="204, 0, 0" />
-            <field name="showlines" type="boolean" display="Linie anzeigen"
-                default="false" hints="hidden" />
-            <field name="linesize" type="int" display="Liniendicke"
-                default="1" hints="hidden" />
-            <field name="linetype" type="Dash" display="Linienart"
-                default="10" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 0" hints="hidden" />
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="textorientation" type="boolean" display="Textausrichtung"
+                default="true" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="true"/>
         </fields>
     </theme>
 
@@ -2707,6 +2683,70 @@
     </theme>
 
 
+    <theme name="SQOutliersOverviewA">
+        <inherits>
+            <inherit from="SQOutliersA" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
+        </fields>
+    </theme>
+    <theme name="SQOutliersOverviewB">
+        <inherits>
+            <inherit from="SQOutliersB" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
+        </fields>
+    </theme>
+    <theme name="SQOutliersOverviewC">
+        <inherits>
+            <inherit from="SQOutliersC" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
+        </fields>
+    </theme>
+    <theme name="SQOutliersOverviewD">
+        <inherits>
+            <inherit from="SQOutliersD" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
+        </fields>
+    </theme>
+    <theme name="SQOutliersOverviewE">
+        <inherits>
+            <inherit from="SQOutliersE" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
+        </fields>
+    </theme>
+    <theme name="SQOutliersOverviewF">
+        <inherits>
+            <inherit from="SQOutliersF" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
+        </fields>
+    </theme>
+    <theme name="SQOutliersOverviewG">
+        <inherits>
+            <inherit from="SQOutliersG" />
+        </inherits>
+        <fields>
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false"/>
+        </fields>
+    </theme>
+
     <theme name="SQCurveA">
         <inherits>
             <inherit from="SQCurve" />
http://dive4elements.wald.intevation.org