Mercurial > dive4elements > river
changeset 6204:6a4f530a2af7
merged
author | Tom Gottfried <tom.gottfried@intevation.de> |
---|---|
date | Wed, 05 Jun 2013 12:04:11 +0200 |
parents | 7053de3ca475 (current diff) cefad5546373 (diff) |
children | 1298c1c2dadf |
files | |
diffstat | 4 files changed, 39 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/themes/default.xml Wed Jun 05 09:36:01 2013 +0200 +++ b/artifacts/doc/conf/themes/default.xml Wed Jun 05 12:04:11 2013 +0200 @@ -14,6 +14,20 @@ </fields> </theme> + <theme name="MainValuesQVerticalText"> + <inherits> + <inherit from="Lines" /> + </inherits> + <fields> + <field name="linecolor" type="Color" display="Farbe" + default="200, 0, 15" /> + <field name="textorientation" type="boolean" display="Textausrichtung" + default="false" /> + <field name="showlinelabel" type="boolean" + display="Linienbeschriftung anzeigen" default="false" hints="hidden" /> + </fields> + </theme> + <theme name="MainValuesW"> <inherits> <inherit from="Lines" />
--- a/artifacts/doc/conf/themes/second.xml Wed Jun 05 09:36:01 2013 +0200 +++ b/artifacts/doc/conf/themes/second.xml Wed Jun 05 12:04:11 2013 +0200 @@ -28,6 +28,20 @@ </fields> </theme> + <theme name="MainValuesQVerticalText"> + <inherits> + <inherit from="Lines" /> + </inherits> + <fields> + <field name="linecolor" type="Color" display="Farbe" + default="200, 0, 15" /> + <field name="textorientation" type="boolean" display="Textausrichtung" + default="false" /> + <field name="showlinelabel" type="boolean" + display="Linienbeschriftung anzeigen" default="false" hints="hidden" /> + </fields> + </theme> + <theme name="RelativePoint"> <inherits> <inherit from="Points" />
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/WikiLinks.java Wed Jun 05 09:36:01 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/WikiLinks.java Wed Jun 05 12:04:11 2013 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde +/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde * Software engineering by Intevation GmbH * * This file is Free Software under the GNU AGPL (>=v3)
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/CrossSectionChartThemePanel.java Wed Jun 05 09:36:01 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/CrossSectionChartThemePanel.java Wed Jun 05 12:04:11 2013 +0200 @@ -79,7 +79,7 @@ /** Data item name for CrossSections selected km. */ protected static String CS_KM = "cross_section.km"; - /** Data item name for CrossSections selected km. */ + /** Data item name for CrossSections reference ('master') flag. */ protected static String CS_IS_MASTER = "cross_section.master?"; /** List of cross-section themes through which is moved through synchronously. */ @@ -178,6 +178,8 @@ } // There is none selected. Take the first one. if (firstCSUuid != null) { + // TODO better take the one closest to first km! + // issue1157, query next/prev kms, select the one which is closest. setCurrentCSMaster(firstCSUuid); feedTellMaster(firstCSUuid); } @@ -410,7 +412,11 @@ * \param to. */ @Override - public void spinnerValueEntered(KMSpinner spinner, final double enteredKm, final FacetRecord facetRecord, final boolean up) { + public void spinnerValueEntered(KMSpinner spinner, + final double enteredKm, + final FacetRecord facetRecord, + final boolean up + ) { disable(); Config config = Config.getInstance(); final String locale = config.getLocale(); @@ -502,6 +508,7 @@ String fieldName = this.getFieldName(colNum); + // Place KMSpinner in Grid with currently chosen km value. if (fieldName.equals(GRID_FIELD_ACTIONS)) { double currentValue = Double.valueOf(facetRecord.getTheme().getCollectionItem().getData().get(CS_KM)); @@ -520,6 +527,7 @@ list.setShowAllRecords(true); list.setShowHeaderContextMenu(false); list.setLeaveScrollbarGap(false); + return list; }