# HG changeset patch
# User Tom Gottfried <tom@intevation.de>
# Date 1413204047 -7200
# Node ID e316361229cdb13ad3b40d5558ee7b5b6ca184c8
# Parent 35b3bbd1365f25f0f44e48fea8d2cefbd5e8e619
Theme-style cleanup for discharge curves.
diff -r 35b3bbd1365f -r e316361229cd artifacts/doc/conf/themes.xml
--- a/artifacts/doc/conf/themes.xml Fri Oct 10 15:44:34 2014 +0200
+++ b/artifacts/doc/conf/themes.xml Mon Oct 13 14:40:47 2014 +0200
@@ -139,12 +139,12 @@
<mapping from="historical_discharge.historicalq.diff" to="HistoricalDischargeCurveQDiff" />
<mapping from="historical_discharge.historicalw" to="HistoricalDischargeCurveW" />
<mapping from="historical_discharge.historicalw.diff" to="HistoricalDischargeCurveWDiff" />
- <mapping from="historical_discharge.wq.curve" to="HistoricalDischargeWQCurve" />
+ <mapping from="historical_discharge.wq.curve" to="DischargeCurve" />
<mapping from="historical_discharge.wq.w" to="HistoricalDischargeWQW" />
<mapping from="historical_discharge.wq.q" to="HistoricalDischargeWQQ" />
<mapping from="cross_section" to="CrossSection" />
<mapping from="cross_section_water_line" to="CrossSectionWaterLine" />
- <mapping from="computed_discharge_curve.q" to="ComputedDischargeCurve" />
+ <mapping from="computed_discharge_curve.q" to="DischargeCurve" />
<mapping from="duration_curve.w" to="DurationCurveW" />
<mapping from="duration_curve.q" to="DurationCurveQ" />
<mapping from="discharge_longitudinal_section.w" to="DischargeLongitudinalSectionW" />
@@ -343,7 +343,7 @@
<mapping from="fix_deltawt_curve.manualpoints" to="ManualPoints" />
<mapping from="fix_events_wqkms" to="FixPoints" />
<mapping from="qsectors" to="QSectors" />
- <mapping from="gauge_discharge_curve" to="GaugeDischargeCurve" />
+ <mapping from="gauge_discharge_curve" to="DischargeCurve" />
<mapping from="extreme_wq_curve" to="ExtremeWQCurve" />
<mapping from="extreme_wq_curve_base" to="ExtremeWQBaseCurve" />
diff -r 35b3bbd1365f -r e316361229cd artifacts/doc/conf/themes/default.xml
--- a/artifacts/doc/conf/themes/default.xml Fri Oct 10 15:44:34 2014 +0200
+++ b/artifacts/doc/conf/themes/default.xml Mon Oct 13 14:40:47 2014 +0200
@@ -1590,26 +1590,6 @@
<theme name="DischargeCurve">
<inherits>
<inherit from="Lines" />
- <inherit from="Points" />
- <inherit from="Label" />
- <inherit from="MinMaxPoints" />
- </inherits>
- <fields>
- <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
- default="false" hints="hidden" />
- <field name="showpointlabel" type="boolean"
- display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
- <field name="linecolor" type="Color" display="Linienfarbe"
- default="0, 0, 153" />
- <field name="linesize" type="int" display="Liniendicke"
- default="2" />
- </fields>
- </theme>
-
- <theme name="ComputedDischargeCurve">
- <inherits>
- <inherit from="Lines" />
- <inherit from="Points" />
<inherit from="Label" />
<inherit from="MinMaxPoints" />
</inherits>
@@ -1618,10 +1598,6 @@
default="0, 0, 153" />
<field name="linesize" type="int" display="Liniendicke"
default="2" />
- <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
- default="false" />
- <field name="showpointlabel" type="boolean"
- display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
</fields>
</theme>
@@ -1653,18 +1629,6 @@
</fields>
</theme>
- <theme name="GaugeDischargeCurve">
- <inherits>
- <inherit from="DischargeCurve" />
- </inherits>
- <fields>
- <field name="linecolor" type="Color" display="Linienfarbe"
- default="0, 0, 153" />
- <field name="linesize" type="int" display="Liniendicke"
- default="2" />
- </fields>
- </theme>
-
<theme name="ExtremeWQCurve">
<inherits>
<inherit from="Lines" />
@@ -1678,7 +1642,7 @@
<field name="linesize" type="int" display="Liniendicke"
default="2" />
<field name="showlinelabel" type="boolean"
- display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+ display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
</fields>
</theme>
@@ -2325,22 +2289,6 @@
</fields>
</theme>
- <theme name="HistoricalDischargeWQCurve">
- <inherits>
- <inherit from="HistoricalDischargeCurve" />
- </inherits>
- <fields>
- <field name="linecolor" type="Color" display="Linienfarbe"
- default="0, 0, 204" />
- <field name="showlinelabel" type="boolean"
- display="Beschriftung anzeigen" default="false" hints="hidden" />
- <field name="showpointlabel" type="boolean"
- display="Beschriftung anzeigen" default="false" hints="hidden" />
- <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
- default="false" />
- </fields>
- </theme>
-
<theme name="HistoricalDischargeWQW">
<!-- the facet has no styling...
<inherits>
diff -r 35b3bbd1365f -r e316361229cd artifacts/doc/conf/themes/second.xml
--- a/artifacts/doc/conf/themes/second.xml Fri Oct 10 15:44:34 2014 +0200
+++ b/artifacts/doc/conf/themes/second.xml Mon Oct 13 14:40:47 2014 +0200
@@ -1590,26 +1590,6 @@
<theme name="DischargeCurve">
<inherits>
<inherit from="Lines" />
- <inherit from="Points" />
- <inherit from="Label" />
- <inherit from="MinMaxPoints" />
- </inherits>
- <fields>
- <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
- default="false" hints="hidden" />
- <field name="showpointlabel" type="boolean"
- display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
- <field name="linecolor" type="Color" display="Linienfarbe"
- default="0, 0, 153" />
- <field name="linesize" type="int" display="Liniendicke"
- default="2" />
- </fields>
- </theme>
-
- <theme name="ComputedDischargeCurve">
- <inherits>
- <inherit from="Lines" />
- <inherit from="Points" />
<inherit from="Label" />
<inherit from="MinMaxPoints" />
</inherits>
@@ -1618,10 +1598,6 @@
default="0, 0, 153" />
<field name="linesize" type="int" display="Liniendicke"
default="2" />
- <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
- default="false" />
- <field name="showpointlabel" type="boolean"
- display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
</fields>
</theme>
@@ -1653,18 +1629,6 @@
</fields>
</theme>
- <theme name="GaugeDischargeCurve">
- <inherits>
- <inherit from="DischargeCurve" />
- </inherits>
- <fields>
- <field name="linecolor" type="Color" display="Linienfarbe"
- default="0, 0, 153" />
- <field name="linesize" type="int" display="Liniendicke"
- default="2" />
- </fields>
- </theme>
-
<theme name="ExtremeWQCurve">
<inherits>
<inherit from="Lines" />
@@ -1678,7 +1642,7 @@
<field name="linesize" type="int" display="Liniendicke"
default="2" />
<field name="showlinelabel" type="boolean"
- display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+ display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
</fields>
</theme>
@@ -2325,22 +2289,6 @@
</fields>
</theme>
- <theme name="HistoricalDischargeWQCurve">
- <inherits>
- <inherit from="HistoricalDischargeCurve" />
- </inherits>
- <fields>
- <field name="linecolor" type="Color" display="Linienfarbe"
- default="0, 0, 204" />
- <field name="showlinelabel" type="boolean"
- display="Beschriftung anzeigen" default="false" hints="hidden" />
- <field name="showpointlabel" type="boolean"
- display="Beschriftung anzeigen" default="false" hints="hidden" />
- <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
- default="false" />
- </fields>
- </theme>
-
<theme name="HistoricalDischargeWQW">
<!-- the facet has no styling...
<inherits>