Mercurial > dive4elements > river
changeset 7876:5951d6430ade
merged.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Fri, 16 May 2014 09:32:51 +0200 |
| parents | b320826b1183 (current diff) 553829e7666a (diff) |
| children | 43f18dc56c5a |
| files | |
| diffstat | 5 files changed, 21 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/resources/messages.properties Fri May 16 09:32:19 2014 +0200 +++ b/artifacts/src/main/resources/messages.properties Fri May 16 09:32:51 2014 +0200 @@ -343,8 +343,7 @@ chart.beddifference.year.title = Bedheight Difference chart.beddifference.yaxis.label.morph = Width [m] chart.beddifference.yaxis.label.heights = Absolute Height [{0}] -chart.beddifference.subtitle.radius = Fensterbreite für gewichtete Mittel: {0}km -chart.subtitle.radius = Radius for weighted Average: {0}km +chart.subtitle.radius = Width of sample window for moving average: {0}km export.waterlevel.csv.header.km = River-Km export.waterlevel.csv.header.w = W [{0}]
--- a/artifacts/src/main/resources/messages_de.properties Fri May 16 09:32:19 2014 +0200 +++ b/artifacts/src/main/resources/messages_de.properties Fri May 16 09:32:51 2014 +0200 @@ -344,7 +344,7 @@ chart.beddifference.year.title = Sohlh\u00f6hendifferenz chart.beddifference.yaxis.label.morph = Breite [m] chart.beddifference.yaxis.label.heights = Absolute H\u00f6he [m] -chart.subtitle.radius = Fensterbreite f\u00fcr gewichtete Mittel: {0}km +chart.subtitle.radius = Fensterbreite f\u00fcr gleitenden Mittelwert: {0}km export.waterlevel.csv.header.km = Fluss-Km export.waterlevel.csv.header.w = W [{0}]
--- a/artifacts/src/main/resources/messages_de_DE.properties Fri May 16 09:32:19 2014 +0200 +++ b/artifacts/src/main/resources/messages_de_DE.properties Fri May 16 09:32:51 2014 +0200 @@ -341,7 +341,7 @@ chart.beddifference.year.title = Sohlh\u00f6hendifferenz chart.beddifference.yaxis.label.morph = Breite [m] chart.beddifference.yaxis.label.heights = Absolute H\u00f6he [{0}] -chart.subtitle.radius = Fensterbreite f\u00fcr gewichtete Mittel: {0}km +chart.subtitle.radius = Fensterbreite f\u00fcr gleitenden Mittelwert: {0}km export.waterlevel.csv.header.km = Fluss-Km export.waterlevel.csv.header.w = W [{0}]
--- a/doc/INSTALL_DE Fri May 16 09:32:19 2014 +0200 +++ b/doc/INSTALL_DE Fri May 16 09:32:51 2014 +0200 @@ -56,10 +56,22 @@ Installation von D4E-river aus Binärpaket ========================================= -Entpacken des Dive4Elements-river Installer-Pakets --------------------------------------------------- - $ tar -xzf d4e-river.tar.gz - @TODO: eventuell anpassen + Herunterladen von + - d4e-river-3.1.2.tar.bz2 + - d4river-3.1.2.war + + Als root-User: + # cd /opt/ + # tar xvjf d4e-river-3.1.2.tar.bz2 + # chown -R d4e d4e-river + + In das Verzeichnis /opt/d4e-river/dgm/ müssen noch die DGMs der + Demo-Daten kopiert werden. (s.u.) + + # mv d4river-3.1.2.war /var/lib/tomcat6/webapps/d4e-river.war + + Der Tomcat muss wie unten dokumentiert konfiguriert werden. + Gleiches gilt für die MapServer-Installation. Erfolgt die Installation von D4E-river aus den Binärpaketen, können die folgenden Schritte übersprungen werden.
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationListGrid.java Fri May 16 09:32:19 2014 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationListGrid.java Fri May 16 09:32:51 2014 +0200 @@ -38,8 +38,8 @@ ListGridField sfield = new ListGridField("kmstart", "Start [km]", 60); ListGridField efield = new ListGridField("kmend", "Ende [km]", 60); ListGridField stfield = new ListGridField("station", "Station [km]"); - ListGridField lfield = new ListGridField("infolink", "Link"); - ListGridField cfield = new ListGridField("curvelink", "SQ"); + ListGridField lfield = new ListGridField("infolink", "Info"); + ListGridField cfield = new ListGridField("curvelink", "Feststofftransport-Abfluss-Beziehung"); cfield.addRecordClickHandler(this); this.setShowRecordComponents(true);