[PATCH] (issue1753) Use different theme for measurements overview and single diagrams
Wald Commits
scm-commit at wald.intevation.org
Mon Mar 16 10:00:45 CET 2015
# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1426496439 -3600
# Node ID 3fae08a8cb9010cddb40cd9a756e5b2f2268ee4b
# Parent 0d711ecbcd49a23d41b3e64e5f96bb731951359c
(issue1753) Use different theme for measurements overview and single diagrams
The difference in the theme is the enabled "Date" label. It's
enabled in the single parameter diagrams but not in the overview.
diff -r 0d711ecbcd49 -r 3fae08a8cb90 artifacts/doc/conf/themes.xml
--- a/artifacts/doc/conf/themes.xml Wed Mar 11 17:44:27 2015 +0100
+++ b/artifacts/doc/conf/themes.xml Mon Mar 16 10:00:39 2015 +0100
@@ -276,41 +276,41 @@
<mapping from="sq_g_curve" to="SQCurveG" />
<mapping from="sq_g_outlier_curve" to="SQOutlierCurveG" />
<mapping from="sq_g_outlier_measurement" to="SQMeasurementsG" />
- <mapping from="sq_a_measurement_overview" to="SQMeasurementsA" />
+ <mapping from="sq_a_measurement_overview" to="SQMeasurementsOverviewA" />
<mapping from="sq_a_outlier_overview" to="SQOutliersA" />
<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="SQMeasurementsA" />
- <mapping from="sq_b_measurement_overview" to="SQMeasurementsB" />
+ <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_curve_overview" to="SQCurveB" />
<mapping from="sq_b_outlier_curve_overview" to="SQOutlierCurveB" />
- <mapping from="sq_b_outlier_measurement_overview" to="SQMeasurementsB" />
- <mapping from="sq_c_measurement_overview" to="SQMeasurementsC" />
+ <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_curve_overview" to="SQCurveC" />
<mapping from="sq_c_outlier_curve_overview" to="SQOutlierCurveC" />
- <mapping from="sq_c_outlier_measurement_overview" to="SQMeasurementsC" />
- <mapping from="sq_d_measurement_overview" to="SQMeasurementsD" />
+ <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_curve_overview" to="SQCurveD" />
<mapping from="sq_d_outlier_curve_overview" to="SQOutlierCurveD" />
- <mapping from="sq_d_outlier_measurement_overview" to="SQMeasurementsD" />
- <mapping from="sq_e_measurement_overview" to="SQMeasurementsE" />
+ <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_curve_overview" to="SQCurveE" />
<mapping from="sq_e_outlier_curve_overview" to="SQOutlierCurveE" />
- <mapping from="sq_e_outlier_measurement_overview" to="SQMeasurementsE" />
- <mapping from="sq_f_measurement_overview" to="SQMeasurementsF" />
+ <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_curve_overview" to="SQCurveF" />
<mapping from="sq_f_outlier_curve_overview" to="SQOutlierCurveF" />
- <mapping from="sq_f_outlier_measurement_overview" to="SQMeasurementsF" />
- <mapping from="sq_g_measurement_overview" to="SQMeasurementsG" />
+ <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_curve_overview" to="SQCurveG" />
<mapping from="sq_g_outlier_curve_overview" to="SQOutlierCurveG" />
- <mapping from="sq_g_outlier_measurement_overview" to="SQMeasurementsG" />
+ <mapping from="sq_g_outlier_measurement_overview" to="SQMeasurementsOverviewG" />
<mapping from="fix_sector_average_wq_0" to="FixingSectorAverageWQ0" />
<mapping from="fix_sector_average_wq_1" to="FixingSectorAverageWQ1" />
diff -r 0d711ecbcd49 -r 3fae08a8cb90 artifacts/doc/conf/themes/default.xml
--- a/artifacts/doc/conf/themes/default.xml Wed Mar 11 17:44:27 2015 +0100
+++ b/artifacts/doc/conf/themes/default.xml Mon Mar 16 10:00:39 2015 +0100
@@ -2363,6 +2363,28 @@
</fields>
</theme>
+ <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"
+ display="Punktbeschriftung anzeigen" default="false"/>
+ </fields>
+ </theme>
+
<theme name="SQOutliers">
<inherits>
<inherit from="Lines" />
@@ -2462,6 +2484,70 @@
</fields>
</theme>
+ <theme name="SQMeasurementsOverviewA">
+ <inherits>
+ <inherit from="SQMeasurementsOverview" />
+ </inherits>
+ <fields>
+ <field name="pointsize" type="int" default="4" />
+ <field name="pointcolor" type="color" default="0, 0, 255" />
+ </fields>
+ </theme>
+ <theme name="SQMeasurementsOverviewB">
+ <inherits>
+ <inherit from="SQMeasurementsOverview" />
+ </inherits>
+ <fields>
+ <field name="pointsize" type="int" default="4" />
+ <field name="pointcolor" type="color" default="0, 255, 255" />
+ </fields>
+ </theme>
+ <theme name="SQMeasurementsOverviewC">
+ <inherits>
+ <inherit from="SQMeasurementsOverview" />
+ </inherits>
+ <fields>
+ <field name="pointsize" type="int" default="4" />
+ <field name="pointcolor" type="color" default="0, 255, 0" />
+ </fields>
+ </theme>
+ <theme name="SQMeasurementsOverviewD">
+ <inherits>
+ <inherit from="SQMeasurementsOverview" />
+ </inherits>
+ <fields>
+ <field name="pointsize" type="int" default="4" />
+ <field name="pointcolor" type="color" default="255, 0, 255" />
+ </fields>
+ </theme>
+ <theme name="SQMeasurementsOverviewE">
+ <inherits>
+ <inherit from="SQMeasurementsOverview" />
+ </inherits>
+ <fields>
+ <field name="pointsize" type="int" default="4" />
+ <field name="pointcolor" type="color" default="255, 255, 0" />
+ </fields>
+ </theme>
+ <theme name="SQMeasurementsOverviewF">
+ <inherits>
+ <inherit from="SQMeasurementsOverview" />
+ </inherits>
+ <fields>
+ <field name="pointsize" type="int" default="4" />
+ <field name="pointcolor" type="color" default="255, 0, 0" />
+ </fields>
+ </theme>
+ <theme name="SQMeasurementsOverviewG">
+ <inherits>
+ <inherit from="SQMeasurementsOverview" />
+ </inherits>
+ <fields>
+ <field name="pointsize" type="int" default="4" />
+ <field name="pointcolor" type="color" default="0, 0, 0" />
+ </fields>
+ </theme>
+
<theme name="SQOutliersA">
<inherits>
<inherit from="SQOutliers" />
diff -r 0d711ecbcd49 -r 3fae08a8cb90 artifacts/doc/conf/themes/second.xml
--- a/artifacts/doc/conf/themes/second.xml Wed Mar 11 17:44:27 2015 +0100
+++ b/artifacts/doc/conf/themes/second.xml Mon Mar 16 10:00:39 2015 +0100
@@ -2364,6 +2364,28 @@
</fields>
</theme>
+ <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"
+ display="Punktbeschriftung anzeigen" default="false"/>
+ </fields>
+ </theme>
+
<theme name="SQOutliers">
<inherits>
<inherit from="Lines" />
@@ -2466,6 +2488,70 @@
</fields>
</theme>
+ <theme name="SQMeasurementsOverviewA">
+ <inherits>
+ <inherit from="SQMeasurementsOverview" />
+ </inherits>
+ <fields>
+ <field name="pointsize" type="int" default="4" />
+ <field name="pointcolor" type="color" default="0, 0, 255" />
+ </fields>
+ </theme>
+ <theme name="SQMeasurementsOverviewB">
+ <inherits>
+ <inherit from="SQMeasurementsOverview" />
+ </inherits>
+ <fields>
+ <field name="pointsize" type="int" default="4" />
+ <field name="pointcolor" type="color" default="0, 255, 255" />
+ </fields>
+ </theme>
+ <theme name="SQMeasurementsOverviewC">
+ <inherits>
+ <inherit from="SQMeasurementsOverview" />
+ </inherits>
+ <fields>
+ <field name="pointsize" type="int" default="4" />
+ <field name="pointcolor" type="color" default="0, 255, 0" />
+ </fields>
+ </theme>
+ <theme name="SQMeasurementsOverviewD">
+ <inherits>
+ <inherit from="SQMeasurementsOverview" />
+ </inherits>
+ <fields>
+ <field name="pointsize" type="int" default="4" />
+ <field name="pointcolor" type="color" default="255, 0, 255" />
+ </fields>
+ </theme>
+ <theme name="SQMeasurementsOverviewE">
+ <inherits>
+ <inherit from="SQMeasurementsOverview" />
+ </inherits>
+ <fields>
+ <field name="pointsize" type="int" default="4" />
+ <field name="pointcolor" type="color" default="255, 255, 0" />
+ </fields>
+ </theme>
+ <theme name="SQMeasurementsOverviewF">
+ <inherits>
+ <inherit from="SQMeasurementsOverview" />
+ </inherits>
+ <fields>
+ <field name="pointsize" type="int" default="4" />
+ <field name="pointcolor" type="color" default="255, 0, 0" />
+ </fields>
+ </theme>
+ <theme name="SQMeasurementsOverviewG">
+ <inherits>
+ <inherit from="SQMeasurementsOverview" />
+ </inherits>
+ <fields>
+ <field name="pointsize" type="int" default="4" />
+ <field name="pointcolor" type="color" default="0, 0, 0" />
+ </fields>
+ </theme>
+
<theme name="SQOutliersA">
<inherits>
<inherit from="SQOutliers" />
More information about the Dive4Elements-commits
mailing list