Mercurial > dive4elements > river
changeset 8405:a779ee47aa79
Unify colors of SQ-relations and distinguish outliers by point size.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Mon, 13 Oct 2014 17:22:52 +0200 |
| parents | 5ad3fd88c4c2 |
| children | 6ae0c5116d58 |
| files | artifacts/doc/conf/themes.xml artifacts/doc/conf/themes/default.xml |
| diffstat | 2 files changed, 51 insertions(+), 46 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/themes.xml Mon Oct 13 16:21:09 2014 +0200 +++ b/artifacts/doc/conf/themes.xml Mon Oct 13 17:22:52 2014 +0200 @@ -239,41 +239,42 @@ <mapping from="bedheight_difference.height_year.filtered" to="BedheightDiffHeightYear"/> <mapping from="morph-width" to="MorphologicWidth"/> <mapping from="relativepoint" to="RelativePoint" /> - <mapping from="sq_a_measurement" to="SQMeasurements" /> - <mapping from="sq_a_outlier" to="SQOutliers" /> - <mapping from="sq_a_curve" to="SQCurve" /> - <mapping from="sq_a_outlier_curve" to="SQCurve" /> - <mapping from="sq_a_outlier_measurement" to="SQMeasurements" /> - <mapping from="sq_b_measurement" to="SQMeasurements" /> - <mapping from="sq_b_outlier" to="SQOutliers" /> - <mapping from="sq_b_curve" to="SQCurve" /> - <mapping from="sq_b_outlier_curve" to="SQCurve" /> - <mapping from="sq_b_outlier_measurement" to="SQMeasurements" /> - <mapping from="sq_c_measurement" to="SQMeasurements" /> - <mapping from="sq_c_outlier" to="SQOutliers" /> - <mapping from="sq_c_curve" to="SQCurve" /> - <mapping from="sq_c_outlier_curve" to="SQCurve" /> - <mapping from="sq_c_outlier_measurement" to="SQMeasurements" /> - <mapping from="sq_d_measurement" to="SQMeasurements" /> - <mapping from="sq_d_outlier" to="SQOutliers" /> - <mapping from="sq_d_curve" to="SQCurve" /> - <mapping from="sq_d_outlier_curve" to="SQCurve" /> - <mapping from="sq_d_outlier_measurement" to="SQMeasurements" /> - <mapping from="sq_e_measurement" to="SQMeasurements" /> - <mapping from="sq_e_outlier" to="SQOutliers" /> - <mapping from="sq_e_curve" to="SQCurve" /> - <mapping from="sq_e_outlier_curve" to="SQCurve" /> - <mapping from="sq_e_outlier_measurement" to="SQMeasurements" /> - <mapping from="sq_f_measurement" to="SQMeasurements" /> - <mapping from="sq_f_outlier" to="SQOutliers" /> - <mapping from="sq_f_curve" to="SQCurve" /> - <mapping from="sq_f_outlier_curve" to="SQCurve" /> - <mapping from="sq_f_outlier_measurement" to="SQMeasurements" /> - <mapping from="sq_g_measurement" to="SQMeasurements" /> - <mapping from="sq_g_outlier" to="SQOutliers" /> - <mapping from="sq_g_curve" to="SQCurve" /> - <mapping from="sq_g_outlier_curve" to="SQCurve" /> - <mapping from="sq_g_outlier_measurement" to="SQMeasurements" /> + + <mapping from="sq_a_measurement" to="SQMeasurementsA" /> + <mapping from="sq_a_outlier" to="SQOutliersA" /> + <mapping from="sq_a_curve" to="SQCurveA" /> + <mapping from="sq_a_outlier_curve" to="SQCurveA" /> + <mapping from="sq_a_outlier_measurement" to="SQMeasurementsA" /> + <mapping from="sq_b_measurement" to="SQMeasurementsB" /> + <mapping from="sq_b_outlier" to="SQOutliersB" /> + <mapping from="sq_b_curve" to="SQCurveB" /> + <mapping from="sq_b_outlier_curve" to="SQCurveB" /> + <mapping from="sq_b_outlier_measurement" to="SQMeasurementsB" /> + <mapping from="sq_c_measurement" to="SQMeasurementsC" /> + <mapping from="sq_c_outlier" to="SQOutliersC" /> + <mapping from="sq_c_curve" to="SQCurveC" /> + <mapping from="sq_c_outlier_curve" to="SQCurveC" /> + <mapping from="sq_c_outlier_measurement" to="SQMeasurementsC" /> + <mapping from="sq_d_measurement" to="SQMeasurementsD" /> + <mapping from="sq_d_outlier" to="SQOutliersD" /> + <mapping from="sq_d_curve" to="SQCurveD" /> + <mapping from="sq_d_outlier_curve" to="SQCurveD" /> + <mapping from="sq_d_outlier_measurement" to="SQMeasurementsD" /> + <mapping from="sq_e_measurement" to="SQMeasurementsE" /> + <mapping from="sq_e_outlier" to="SQOutliersE" /> + <mapping from="sq_e_curve" to="SQCurveE" /> + <mapping from="sq_e_outlier_curve" to="SQCurveE" /> + <mapping from="sq_e_outlier_measurement" to="SQMeasurementsE" /> + <mapping from="sq_f_measurement" to="SQMeasurementsF" /> + <mapping from="sq_f_outlier" to="SQOutliersF" /> + <mapping from="sq_f_curve" to="SQCurveF" /> + <mapping from="sq_f_outlier_curve" to="SQCurveF" /> + <mapping from="sq_f_outlier_measurement" to="SQMeasurementsF" /> + <mapping from="sq_g_measurement" to="SQMeasurementsG" /> + <mapping from="sq_g_outlier" to="SQOutliersG" /> + <mapping from="sq_g_curve" to="SQCurveG" /> + <mapping from="sq_g_outlier_curve" to="SQCurveG" /> + <mapping from="sq_g_outlier_measurement" to="SQMeasurementsG" /> <mapping from="sq_a_measurement_overview" to="SQMeasurementsA" /> <mapping from="sq_a_outlier_overview" to="SQOutliersA" /> <mapping from="sq_a_curve_overview" to="SQCurveA" /> @@ -309,6 +310,7 @@ <mapping from="sq_g_curve_overview" to="SQCurveG" /> <mapping from="sq_g_outlier_curve_overview" to="SQCurveG" /> <mapping from="sq_g_outlier_measurement_overview" to="SQMeasurementsG" /> + <mapping from="fix_sector_average_wq_0" to="FixingSectorAverageWQ0" /> <mapping from="fix_sector_average_wq_1" to="FixingSectorAverageWQ1" /> <mapping from="fix_sector_average_wq_2" to="FixingSectorAverageWQ2" />
--- a/artifacts/doc/conf/themes/default.xml Mon Oct 13 16:21:09 2014 +0200 +++ b/artifacts/doc/conf/themes/default.xml Mon Oct 13 17:22:52 2014 +0200 @@ -2347,7 +2347,6 @@ <inherit from="Points" /> </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" @@ -2367,7 +2366,6 @@ <inherit from="Points" /> </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" @@ -2396,20 +2394,12 @@ </fields> </theme> - <theme name="MySQCurve"> - <inherits> - <inherit from="SQCurve" /> - </inherits> - <fields> - <field name="linecolor" type="Color" default="255, 0, 0" /> - </fields> - </theme> - <theme name="SQMeasurementsA"> <inherits> <inherit from="SQMeasurements" /> </inherits> <fields> + <field name="pointsize" type="int" default="4" /> <field name="pointcolor" type="color" default="0, 0, 255" /> </fields> </theme> @@ -2418,6 +2408,7 @@ <inherit from="SQMeasurements" /> </inherits> <fields> + <field name="pointsize" type="int" default="4" /> <field name="pointcolor" type="color" default="0, 255, 255" /> </fields> </theme> @@ -2426,6 +2417,7 @@ <inherit from="SQMeasurements" /> </inherits> <fields> + <field name="pointsize" type="int" default="4" /> <field name="pointcolor" type="color" default="0, 255, 0" /> </fields> </theme> @@ -2434,6 +2426,7 @@ <inherit from="SQMeasurements" /> </inherits> <fields> + <field name="pointsize" type="int" default="4" /> <field name="pointcolor" type="color" default="255, 0, 255" /> </fields> </theme> @@ -2442,6 +2435,7 @@ <inherit from="SQMeasurements" /> </inherits> <fields> + <field name="pointsize" type="int" default="4" /> <field name="pointcolor" type="color" default="255, 255, 0" /> </fields> </theme> @@ -2450,6 +2444,7 @@ <inherit from="SQMeasurements" /> </inherits> <fields> + <field name="pointsize" type="int" default="4" /> <field name="pointcolor" type="color" default="255, 0, 0" /> </fields> </theme> @@ -2458,6 +2453,7 @@ <inherit from="SQMeasurements" /> </inherits> <fields> + <field name="pointsize" type="int" default="4" /> <field name="pointcolor" type="color" default="0, 0, 0" /> </fields> </theme> @@ -2467,6 +2463,7 @@ <inherit from="SQOutliers" /> </inherits> <fields> + <field name="pointsize" type="int" default="6" /> <field name="pointcolor" type="color" default="100, 100, 255" /> </fields> </theme> @@ -2475,6 +2472,7 @@ <inherit from="SQOutliers" /> </inherits> <fields> + <field name="pointsize" type="int" default="6" /> <field name="pointcolor" type="color" default="100, 255, 255" /> </fields> </theme> @@ -2483,6 +2481,7 @@ <inherit from="SQOutliers" /> </inherits> <fields> + <field name="pointsize" type="int" default="6" /> <field name="pointcolor" type="color" default="100, 255, 100" /> </fields> </theme> @@ -2491,6 +2490,7 @@ <inherit from="SQOutliers" /> </inherits> <fields> + <field name="pointsize" type="int" default="6" /> <field name="pointcolor" type="color" default="255, 100, 255" /> </fields> </theme> @@ -2499,6 +2499,7 @@ <inherit from="SQOutliers" /> </inherits> <fields> + <field name="pointsize" type="int" default="6" /> <field name="pointcolor" type="color" default="255, 255, 100" /> </fields> </theme> @@ -2507,6 +2508,7 @@ <inherit from="SQOutliers" /> </inherits> <fields> + <field name="pointsize" type="int" default="6" /> <field name="pointcolor" type="color" default="255, 100, 100" /> </fields> </theme> @@ -2515,6 +2517,7 @@ <inherit from="SQOutliers" /> </inherits> <fields> + <field name="pointsize" type="int" default="6" /> <field name="pointcolor" type="color" default="100, 100, 100" /> </fields> </theme>