Mercurial > dive4elements > river
diff gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixationPanel.java @ 9584:1a7cfeb1ff89
Punkt 10.8 WQ-Vorschau
author | gernotbelger |
---|---|
date | Wed, 09 Jan 2019 17:13:25 +0100 |
parents | 6c24c857ccf9 |
children |
line wrap: on
line diff
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixationPanel.java Wed Jan 09 14:48:53 2019 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixationPanel.java Wed Jan 09 17:13:25 2019 +0100 @@ -130,8 +130,8 @@ final AbstractFixBunduArtifact art = (AbstractFixBunduArtifact) this.artifact; - this.overviewService.generateOverview(locale, this.artifact.getUuid(), getOverviewFilter(art.getFilter()), - renderCheckboxes(), callBack, new AsyncCallback<FixingsOverviewInfo>() { + this.overviewService.generateOverview(locale, this.artifact.getUuid(), getOverviewFilter(art.getFilter()), renderCheckboxes(), callBack, + new AsyncCallback<FixingsOverviewInfo>() { @Override public void onFailure(final Throwable caught) { GWT.log("Could not receive overview."); @@ -141,14 +141,17 @@ @Override public void onSuccess(final FixingsOverviewInfo info) { GWT.log("Successfully loaded overview."); + FixationPanel.this.fixInfo = info; FixationPanel.this.htmlOverview = info.getHTML(); final AbstractFixBunduArtifact art = (AbstractFixBunduArtifact) FixationPanel.this.artifact; final FixFilter filter = art.getFilter(); filter.setRiver(info.getRiver()); - if (filter.getCurrentKm() == -Double.MAX_VALUE || filter.getCurrentKm() == -1d) { - filter.setCurrentKm(filter.getLowerKm()); - filter.setToKm(filter.getUpperKm()); + if (filter.getCurrentKm() == -Double.MAX_VALUE || filter.getCurrentKm() == -1d) { // do not compare doubles (works, because it is set in + // the same way) + + filter.setCurrentKm(info.getLowerKm()); + filter.setToKm(info.getUpperKm()); } if (FixationPanel.this.kmText != null) { final NumberFormat nf = NumberFormat.getDecimalFormat(); @@ -160,6 +163,17 @@ FixationPanel.this.kmText.setValue(filter.getCurrentKm()); } } + + if (FixationPanel.this.kmText != null) { + final NumberFormat nf = NumberFormat.getDecimalFormat(); + try { + final double d = Double.valueOf(filter.getCurrentKm()); + FixationPanel.this.kmText.setValue(nf.format(d)); + } + catch (final NumberFormatException e) { + FixationPanel.this.kmText.setValue(filter.getCurrentKm()); + } + } eventPane.setContents(FixationPanel.this.htmlOverview); updateChartTab(FixationPanel.this.fixInfo.getLowerKm()); FixationPanel.this.events.setPane(eventPane); @@ -273,10 +287,8 @@ hHeight = (int) (hWidth * 3f / 4); } - final String imgUrl = URL.encode(GWT.getModuleBaseURL() - + "fixings-km-chart" - + "?locale=" + locale - + "&filter=" + getChartFilter(filter, hWidth, hHeight)); + final String imgUrl = URL + .encode(GWT.getModuleBaseURL() + "fixings-km-chart" + "?locale=" + locale + "&filter=" + getChartFilter(filter, hWidth, hHeight)); if (this.chartContainer.hasMember(this.chartImg)) { this.chartImg.setWidth(hWidth);