Mercurial > dive4elements > river

changeset 7864:d9d2bd78eff6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged.
author Raimund Renkert <rrenkert@intevation.de>
date Thu, 08 May 2014 13:52:47 +0200
parents 082284c4e0ad (current diff) 3fda73d9dc56 (diff)
children 8d4a4c645e61 5ec28ef7026b
files artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/PorosityFactory.java backend/src/main/java/org/dive4elements/river/importer/ImportPorosity.java backend/src/main/java/org/dive4elements/river/importer/parsers/PorosityParser.java
diffstat 11 files changed, 482 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
Binary file artifacts/doc/conf/jasper/sqrelation.jasper has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/doc/conf/jasper/sqrelation.jrxml	Thu May 08 13:52:47 2014 +0200
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="flysreport" language="groovy" pageWidth="595" pageHeight="842" columnWidth="515" leftMargin="60" rightMargin="20" topMargin="20" bottomMargin="20" uuid="b6d7de63-ee2d-42cc-ae0b-d518b3061f34">
+	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="197"/>
+	<subDataset name="dataset1" uuid="7f14a59c-4250-4060-90e5-c25f5c0be4de"/>
+	<field name="river" class="java.lang.String"/>
+	<field name="periods" class="java.lang.String"/>
+	<field name="outliertest" class="java.lang.String"/>
+	<field name="date" class="java.lang.String"/>
+	<field name="outliers" class="java.lang.String"/>
+	<field name="calculation" class="java.lang.String"/>
+	<field name="total" class="java.lang.String"/>
+	<field name="out" class="java.lang.String"/>
+	<field name="location" class="java.lang.String"/>
+	<field name="sd" class="java.lang.String"/>
+	<field name="a" class="java.lang.String"/>
+	<field name="b" class="java.lang.String"/>
+	<field name="km" class="java.lang.String"/>
+	<field name="param" class="java.lang.String"/>
+	<field name="r2" class="java.lang.String"/>
+	<field name="qmax" class="java.lang.String"/>
+	<field name="cferg" class="java.lang.String"/>
+	<field name="cduan" class="java.lang.String"/>
+	<field name="msName" class="java.lang.String"/>
+	<field name="msGauge" class="java.lang.String"/>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="562" splitType="Stretch">
+			<staticText>
+				<reportElement x="0" y="1" width="177" height="30" uuid="ea2c7f24-bfb8-4827-b578-4bd2b217a296"/>
+				<textElement>
+					<font size="18"/>
+				</textElement>
+				<text><![CDATA[Ergebnisausgabe]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="177" y="0" width="338" height="31" uuid="91b15a29-a4bf-4623-868c-4dea6797f696"/>
+				<textElement>
+					<font size="18"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{river}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="0" y="31" width="515" height="26" uuid="4a262597-f5d6-458e-af8b-afe554fc0102"/>
+				<textElement>
+					<font size="14"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{calculation}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="0" y="211" width="123" height="20" uuid="5939c51d-e441-490b-813e-14ef73d4a566"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[Gewässer:]]></text>
+			</staticText>
+			<textField isBlankWhenNull="false">
+				<reportElement x="123" y="211" width="392" height="20" isRemoveLineWhenBlank="true" uuid="1dc3bbce-49bc-4f21-90d0-f04690fc8f9e"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{river}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="0" y="231" width="123" height="20" uuid="7e0d3425-968a-4000-876c-a3fbbeb0a36c"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[Ort:]]></text>
+			</staticText>
+			<textField isBlankWhenNull="false">
+				<reportElement x="123" y="231" width="392" height="20" isRemoveLineWhenBlank="true" uuid="f9b20927-f244-4ed9-ab9f-a88cc2fd643b"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{location}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="0" y="291" width="123" height="20" uuid="629b34e1-8131-4202-950f-2811cb33982f"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[Datum der Erstellung:]]></text>
+			</staticText>
+			<textField isBlankWhenNull="false">
+				<reportElement x="123" y="291" width="392" height="20" isRemoveLineWhenBlank="true" uuid="6c88d0c9-e695-49c4-a6ec-c0dd4ddbb343"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{date}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="0" y="311" width="123" height="20" uuid="47d924ca-f38c-490a-aa3b-18838124e6af"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[Zeitraum:]]></text>
+			</staticText>
+			<textField isBlankWhenNull="false">
+				<reportElement x="123" y="311" width="392" height="20" isRemoveLineWhenBlank="true" uuid="f3602df3-74fe-40c1-ace6-f41e8216e221"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{periods}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="0" y="331" width="123" height="20" uuid="bb031cd0-2b45-43f4-88c4-7d6865208637"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[Ausreißertest:]]></text>
+			</staticText>
+			<textField isBlankWhenNull="false">
+				<reportElement x="123" y="331" width="392" height="20" isRemoveLineWhenBlank="true" uuid="b2eac7df-2616-4f2e-839c-731aaf0093c7"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{outliertest}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="0" y="351" width="123" height="20" uuid="f71b4e2d-a071-4f45-a058-7f4fe30ad408"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[Ausreißer:]]></text>
+			</staticText>
+			<textField isBlankWhenNull="false">
+				<reportElement x="123" y="351" width="392" height="20" isRemoveLineWhenBlank="true" uuid="5f453092-4a9a-497f-afd7-bee7be1290f7"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{outliers}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="0" y="57" width="346" height="20" uuid="d87807aa-6f27-492a-993a-5a49b7fccb83"/>
+				<textElement markup="styled">
+					<font size="12"/>
+				</textElement>
+				<text><![CDATA[in der Funktion S = aQ<sup>b</sup>]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="0" y="81" width="62" height="20" uuid="10110bb0-9bfa-42b8-802c-ca07d747234c"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[PARAMETER]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="84" y="81" width="400" height="20" uuid="d8c8dca8-b318-40f9-92bb-f707d5b7f848"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[FESTSTOFFFRAKTION]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="0" y="101" width="62" height="15" uuid="330bd2dc-04f0-4c74-9f34-330bc6915735"/>
+				<textElement textAlignment="Center"/>
+				<text><![CDATA[A]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="0" y="116" width="62" height="15" uuid="9069990a-ce8d-46e2-838a-f77f19b4f55c"/>
+				<textElement textAlignment="Center"/>
+				<text><![CDATA[B]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="0" y="146" width="62" height="15" uuid="c7a8c453-f31a-4231-a444-07a39df7af73"/>
+				<textElement textAlignment="Center"/>
+				<text><![CDATA[D]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="0" y="161" width="62" height="15" uuid="4d1c30d1-6ae2-48c2-ad70-ebab733aa1c7"/>
+				<textElement textAlignment="Center"/>
+				<text><![CDATA[E]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="0" y="176" width="62" height="15" uuid="dfab2652-3ae1-4e6e-b57b-6b0d66949e05"/>
+				<textElement textAlignment="Center"/>
+				<text><![CDATA[F]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="0" y="191" width="62" height="15" uuid="870fe372-d364-4431-948a-7fc4c271d6da"/>
+				<textElement textAlignment="Center"/>
+				<text><![CDATA[G]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="0" y="131" width="62" height="15" uuid="e5ad6c96-cbf0-4614-afbd-b72fece107b0"/>
+				<textElement textAlignment="Center"/>
+				<text><![CDATA[C]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="84" y="146" width="426" height="15" uuid="4d5c1309-c06f-457d-9fc5-363de9e26bef"/>
+				<text><![CDATA[Sedimenttransport von Fein- und Mittelkies (Geschiebetransport) (2-16 mm)]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="84" y="176" width="442" height="15" uuid="f790bd5a-39cc-411d-b5a4-545c925edfe4"/>
+				<text><![CDATA[Sedimenttransport von Geschiebe-gesamt (0,000-125 mm)]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="84" y="161" width="461" height="15" uuid="c25f74ed-cc4a-470a-a44a-cee0b6de3095"/>
+				<text><![CDATA[Sedimenttransport von Grobkornanteil (Geschiebetransport) (> Mittelkies 16-125 mm)]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="84" y="131" width="426" height="15" uuid="b03ec9c2-9ae9-41d7-98b7-17da2c1dda3f"/>
+				<text><![CDATA[Sedimenttransport von Sand (Geschiebetransport) (0,063-2 mm)]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="84" y="101" width="431" height="15" uuid="62c83306-ddfc-42ca-88fa-142adf68b11c"/>
+				<text><![CDATA[Sedimenttransport von Feinkornanteil (Suspensionstransport) (< 0,063 mm)]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="84" y="191" width="426" height="15" uuid="98d7b609-084b-404e-9cb6-d387953e13e1"/>
+				<text><![CDATA[Sedimenttransport von Geschiebe-gesamt-Sohlhöhenrelevant (0,063-125 mm)]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="84" y="116" width="426" height="15" uuid="c7f56c71-6ab0-4fa3-8921-050dde3c744d"/>
+				<text><![CDATA[Sedimenttransport von Sand (Suspensionstransort) (0,063-2 mm)]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="210" width="515" height="1" uuid="c93e6486-0e68-41b4-8e37-1feb20c3ff1d"/>
+			</line>
+			<textField isBlankWhenNull="false">
+				<reportElement x="123" y="251" width="392" height="20" isRemoveLineWhenBlank="true" uuid="00b164e3-ac40-4e38-8cb1-6e9fd27391c1"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{msName}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="0" y="251" width="123" height="20" uuid="a1052a1f-2e8b-4280-b99e-982aebfeaea8"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[Messstellenname:]]></text>
+			</staticText>
+			<textField isBlankWhenNull="false">
+				<reportElement x="123" y="271" width="392" height="20" isRemoveLineWhenBlank="true" uuid="e368adda-b9b8-4f6c-963c-af10b4555bd3"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{msGauge}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="0" y="271" width="123" height="20" uuid="400c6d08-b7ca-4e81-b301-d101c8f0237c"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[hdyr. Bezugspegel:]]></text>
+			</staticText>
+			<line>
+				<reportElement x="0" y="371" width="515" height="1" uuid="cd7640a7-b7de-4e19-b7be-08a39e0b75d3"/>
+			</line>
+			<elementGroup>
+				<staticText>
+					<reportElement mode="Transparent" x="18" y="512" width="76" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="bdfd6837-f8a6-4d83-9c67-63185810022b"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="styled">
+						<font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<text><![CDATA[C<sub>Duan</sub>]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="18" y="458" width="76" height="20" uuid="daf38337-b8d7-4272-8ba4-05a2189b2db1"/>
+					<textElement markup="none"/>
+					<text><![CDATA[r²]]></text>
+				</staticText>
+				<staticText>
+					<reportElement mode="Transparent" x="18" y="478" width="76" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="4865df94-3788-443b-b86b-1b44731fac34"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="styled">
+						<font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<text><![CDATA[n<sub>tot</sub>]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="109" y="492" width="100" height="20" uuid="acf7c8e0-a6ac-43ef-b598-c2315029e9d4"/>
+					<text><![CDATA[Anzahl Ausreißer]]></text>
+				</staticText>
+				<staticText>
+					<reportElement mode="Transparent" x="18" y="441" width="76" height="17" forecolor="#000000" backcolor="#FFFFFF" uuid="15f4318b-28bc-413a-b23e-f6b286317d86"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="styled">
+						<font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<text><![CDATA[Q<sub>max,gemessen</sub>]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="18" y="417" width="76" height="24" uuid="32e2af68-cec0-415c-b948-ad7073fc2471"/>
+					<textElement markup="none"/>
+					<text><![CDATA[Standardfehler]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="109" y="532" width="181" height="20" uuid="34ad1c35-e0dd-4391-a500-ff87ff80e776"/>
+					<text><![CDATA[Bias Korrektur nach Ferguson 1986]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="109" y="383" width="176" height="20" uuid="e0266375-b88c-4305-bd8a-855a062b940f"/>
+					<textElement markup="none"/>
+					<text><![CDATA[Transportkurvenkoeffizient]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="18" y="403" width="76" height="15" uuid="9c524667-e4e8-40e4-ae48-613c4135caa1"/>
+					<textElement markup="none"/>
+					<text><![CDATA[b]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="18" y="383" width="76" height="20" uuid="ac7f46ac-57d9-424e-a7a7-9f85dda492f6"/>
+					<textElement markup="none"/>
+					<text><![CDATA[a]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="109" y="512" width="181" height="20" uuid="836b4943-193f-4cf2-a866-13c35818dc7c"/>
+					<text><![CDATA[Bias Korrektur nach Duan 1983]]></text>
+				</staticText>
+				<staticText>
+					<reportElement mode="Transparent" x="109" y="441" width="285" height="17" forecolor="#000000" backcolor="#FFFFFF" uuid="6f74a211-c286-4025-88fe-b92a6de305b9"/>
+					<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+						<font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<text><![CDATA[maximal gemessener Abfluss [m³/s]]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="109" y="403" width="143" height="19" uuid="3ac94bf9-2dff-4ea9-8258-799cbbf7717d"/>
+					<textElement markup="none"/>
+					<text><![CDATA[Transportkurvenexponent]]></text>
+				</staticText>
+				<staticText>
+					<reportElement mode="Transparent" x="18" y="492" width="76" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="79e5c3d5-c55b-416d-b8bd-2b3ec87ce047"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="styled">
+						<font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<text><![CDATA[n<sub>Ausreißer</sub>]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="109" y="422" width="265" height="19" uuid="336f35ad-f64c-410a-b6b7-c6d3d6a4b90c"/>
+					<textElement markup="none"/>
+					<text><![CDATA[natürlicher Logarithmus der Standardabweichung]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="109" y="458" width="100" height="20" uuid="51d33fdd-6ed9-4400-8faf-a037ce8b0c90"/>
+					<textElement markup="none"/>
+					<text><![CDATA[Bestimmtheitsmaß]]></text>
+				</staticText>
+				<staticText>
+					<reportElement mode="Transparent" x="18" y="532" width="76" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="7959337f-da23-416e-b7d6-c0d260ec6665"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="styled">
+						<font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<text><![CDATA[C <sub>Ferguson</sub>]]></text>
+				</staticText>
+				<staticText>
+					<reportElement x="109" y="477" width="100" height="14" uuid="b499f108-5cca-4f1e-8022-a9baf1210917"/>
+					<text><![CDATA[Anzahl Messwerte]]></text>
+				</staticText>
+			</elementGroup>
+		</band>
+	</title>
+	<columnHeader>
+		<band height="20" splitType="Stretch">
+			<line>
+				<reportElement x="0" y="19" width="515" height="1" uuid="2a54c77e-73b7-4944-bcdd-be396d1e01bd"/>
+			</line>
+			<staticText>
+				<reportElement x="0" y="0" width="39" height="20" uuid="ac45c7e6-d865-47ed-90aa-602777d0a3c3"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[Fl-km	]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="39" y="0" width="55" height="20" uuid="56343a37-b55c-440c-9f26-986eb6799946"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[Parameter]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="94" y="0" width="60" height="20" uuid="cf06ea41-bad4-4c3f-a33a-ab8a3d5872d1"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[a]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="189" y="0" width="76" height="20" uuid="0ed39fb7-f5e9-4497-887d-50fa9288cbec"/>
+				<textElement verticalAlignment="Middle" markup="styled"/>
+				<text><![CDATA[Standardfehler]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="154" y="0" width="35" height="20" uuid="491aa9fa-d761-4df8-bbad-8ec892fec52a"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[b]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="265" y="0" width="60" height="20" uuid="a499ce7a-59ac-4a03-90d3-9a3bbc1712f3"/>
+				<textElement verticalAlignment="Middle" markup="styled"/>
+				<text><![CDATA[Q<sub>max,gemessen</sub>]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="391" y="0" width="44" height="20" uuid="e26c82e1-014b-48ad-bd4e-5f770e3cc519"/>
+				<textElement verticalAlignment="Middle" markup="styled"/>
+				<text><![CDATA[n <sub>Ausreißer</sub>]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="435" y="0" width="35" height="20" uuid="bbd6cfb0-660d-43d9-a7b0-5e31f4706553"/>
+				<textElement verticalAlignment="Middle" markup="styled"/>
+				<text><![CDATA[C<sub>Duan</sub>]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="470" y="0" width="45" height="20" uuid="48737bce-a759-4d53-b36a-96e8835e1f99"/>
+				<textElement verticalAlignment="Middle" markup="styled"/>
+				<text><![CDATA[C <sub>Ferguson</sub>]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="325" y="0" width="26" height="20" uuid="6e925143-ee09-4f4b-b455-95c67bb72442"/>
+				<textElement verticalAlignment="Middle" markup="styled"/>
+				<text><![CDATA[r²]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="351" y="0" width="40" height="20" uuid="8d5a7cdb-6312-40a9-8431-38a87d388dbd"/>
+				<textElement verticalAlignment="Middle" markup="styled"/>
+				<text><![CDATA[n<sub>gesamt</sub>]]></text>
+			</staticText>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="14" splitType="Stretch">
+			<textField isBlankWhenNull="true">
+				<reportElement x="0" y="0" width="39" height="14" uuid="160039f4-9963-4f02-8f7b-ab05a5813a3c"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{km}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="154" y="0" width="35" height="14" uuid="228414fa-6e08-40c0-81c6-2fa89842eb31"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{b}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="351" y="0" width="40" height="14" isPrintWhenDetailOverflows="true" uuid="a65c0f76-65dd-4003-8bde-60a8cfdbe03d"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{total}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="39" y="0" width="55" height="14" uuid="438cff27-6f30-42e1-9865-5a2aaf983f26"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{param}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="94" y="0" width="60" height="14" uuid="8a34ebd4-be25-4e3b-ac21-0906254fe67c"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{a}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="391" y="0" width="44" height="14" uuid="19a46282-3781-4b8f-9ea1-2b5e201d8143"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{out}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="189" y="0" width="76" height="14" uuid="fba053b1-adf2-4ccd-a0d4-60c3f57f51d1"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{sd}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="325" y="0" width="26" height="14" uuid="88626b31-52af-4748-9e02-d74639b9c813"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{r2}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="265" y="0" width="60" height="14" uuid="01c3500c-c3b2-4c8d-8df2-c1a238d4f79c"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{qmax}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="435" y="0" width="35" height="14" uuid="86ee4471-d2ed-43ea-8b35-ca759574077e"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{cduan}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToBandHeight" x="470" y="0" width="45" height="14" uuid="5d46cadc-2e8a-42e1-a284-e4319154090d"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$F{cferg}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<pageFooter>
+		<band height="29" splitType="Stretch">
+			<textField evaluationTime="Report">
+				<reportElement x="458" y="9" width="57" height="20" uuid="f198ce24-2d3e-4021-a481-61667820831c"/>
+				<textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="403" y="9" width="55" height="20" uuid="d513f77e-0880-4b4f-9846-f938b6959503"/>
+				<textElement textAlignment="Right"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageFooter>
+	<summary>
+		<band height="42" splitType="Stretch"/>
+	</summary>
+</jasperReport>
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java	Thu May 08 13:52:20 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java	Thu May 08 13:52:47 2014 +0200
@@ -14,8 +14,6 @@
 import org.dive4elements.artifactdatabase.state.DefaultOutput;
 import org.dive4elements.artifactdatabase.state.Facet;
 import org.dive4elements.artifactdatabase.state.State;
-import org.dive4elements.artifacts.ArtifactFactory;
-import org.dive4elements.artifacts.CallMeta;
 import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.artifacts.model.RiverFactory;
 import org.dive4elements.river.model.River;
@@ -26,7 +24,6 @@
 import java.util.List;
 
 import org.apache.log4j.Logger;
-import org.w3c.dom.Document;
 
 @Deprecated
 public class RiverAxisArtifact extends WMSDBArtifact {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSBuildingsArtifact.java	Thu May 08 13:52:20 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSBuildingsArtifact.java	Thu May 08 13:52:47 2014 +0200
@@ -10,15 +10,10 @@
 
 import java.util.List;
 
-import org.w3c.dom.Document;
-
 import org.apache.log4j.Logger;
 
 import com.vividsolutions.jts.geom.Envelope;
 
-import org.dive4elements.artifacts.ArtifactFactory;
-import org.dive4elements.artifacts.CallMeta;
-
 import org.dive4elements.artifactdatabase.state.DefaultOutput;
 import org.dive4elements.artifactdatabase.state.Facet;
 import org.dive4elements.artifactdatabase.state.State;
@@ -37,10 +32,6 @@
     public static final String NAME = "buildings";
 
 
-    private static final Logger logger =
-        Logger.getLogger(WMSBuildingsArtifact.class);
-
-
     @Override
     public String getName() {
         return NAME;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/DifferenceCurveFilterFacet.java	Thu May 08 13:52:20 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/DifferenceCurveFilterFacet.java	Thu May 08 13:52:47 2014 +0200
@@ -1,11 +1,9 @@
 package org.dive4elements.river.artifacts.model;
 
-import org.apache.log4j.Logger;
 import org.dive4elements.artifactdatabase.state.Facet;
 import org.dive4elements.artifacts.Artifact;
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.artifacts.D4EArtifact;
-import org.dive4elements.river.artifacts.WINFOArtifact;
 import org.dive4elements.river.artifacts.access.RiverAccess;
 import org.dive4elements.river.artifacts.context.RiverContext;
 import org.dive4elements.river.artifacts.math.MovingAverage;
@@ -15,9 +13,6 @@
 public class DifferenceCurveFilterFacet
 extends DifferenceCurveFacet
 {
-    private static Logger logger = Logger.getLogger(DifferenceCurveFacet.class);
-
-
     public DifferenceCurveFilterFacet() {
     }
 
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/StaticPorosityCacheKey.java	Thu May 08 13:52:20 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/StaticPorosityCacheKey.java	Thu May 08 13:52:47 2014 +0200
@@ -8,22 +8,25 @@
 
 package org.dive4elements.river.artifacts.model;
 
+import java.io.Serializable;
+
 
 public class StaticPorosityCacheKey
+implements   Serializable
 {
    public static final String CACHE_NAME = "porosity-table-static";
 
-    private int porosity_id;
+    private int porosityId;
 
     public StaticPorosityCacheKey(
-        int porosity_id
+        int porosityId
     ) {
-        this.porosity_id = porosity_id;
+        this.porosityId = porosityId;
     }
 
     @Override
     public int hashCode() {
-        return (String.valueOf(porosity_id)).hashCode();
+        return (String.valueOf(porosityId)).hashCode();
     }
 
     @Override
@@ -32,6 +35,6 @@
             return false;
         }
         StaticPorosityCacheKey o = (StaticPorosityCacheKey) other;
-        return this.porosity_id == o.porosity_id;
+        return this.porosityId == o.porosityId;
     }
 }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/PorosityFactory.java	Thu May 08 13:52:20 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/PorosityFactory.java	Thu May 08 13:52:47 2014 +0200
@@ -19,7 +19,6 @@
 import org.hibernate.type.StandardBasicTypes;
 
 import org.dive4elements.river.artifacts.cache.CacheFactory;
-import org.dive4elements.river.artifacts.model.StaticMorphoWidthCacheKey;
 import org.dive4elements.river.artifacts.model.StaticPorosityCacheKey;
 import org.dive4elements.river.backend.SessionHolder;
 
--- a/backend/doc/annotation-types.xml	Thu May 08 13:52:20 2014 +0200
+++ b/backend/doc/annotation-types.xml	Thu May 08 13:52:47 2014 +0200
@@ -21,8 +21,10 @@
         <type name="Staat"/>
         <type name="WSA"/>
         <type name="Zufluss"/>
-	<type name="Quelle"/>
-	<type name="Senke"/>
+        <type name="Quelle [t/a]"/>
+        <type name="Senke [t/a]"/>
+        <type name="Quelle [m³/a]"/>
+        <type name="Senke [m³/a]"/>
         <type name="Sonstige" default="true"/>
     </types>
 
@@ -61,7 +63,9 @@
         <line pattern="^WSA[:\s].*$" type="WSA"/>
         <line pattern="^Zufluß[:\s].*$" type="Zufluss"/>
         <line pattern="^Zufluss[:\s].*$" type="Zufluss"/>
-	<line pattern="^Quelle[:\s].*$" type="Quelle"/>
-	<line pattern="^Senke[:\s].*$" type="Senke"/>
+        <line pattern="^Quelle[:\s].*t/a.*$" type="Quelle [t/a]"/>
+        <line pattern="^Senke[:\s].*t/a.*$" type="Senke [t/a]"/>
+        <line pattern="^Quelle[:\s].*m3/a.*$" type="Quelle [m³/a]"/>
+        <line pattern="^Senke[:\s].*m3/a.*$" type="Senke [m³/a]"/>
     </patterns>
 </annotation>
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportPorosity.java	Thu May 08 13:52:20 2014 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/ImportPorosity.java	Thu May 08 13:52:47 2014 +0200
@@ -17,7 +17,6 @@
 
 import org.dive4elements.river.model.River;
 import org.dive4elements.river.model.Porosity;
-import org.dive4elements.river.model.TimeInterval;
 
 
 public class ImportPorosity {
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/PorosityParser.java	Thu May 08 13:52:20 2014 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/PorosityParser.java	Thu May 08 13:52:47 2014 +0200
@@ -11,8 +11,6 @@
 import org.dive4elements.river.importer.ImportDepth;
 import org.dive4elements.river.importer.ImportPorosity;
 import org.dive4elements.river.importer.ImportPorosityValue;
-import org.dive4elements.river.importer.ImportSedimentDensity;
-import org.dive4elements.river.importer.ImportSedimentDensityValue;
 import org.dive4elements.river.importer.ImportTimeInterval;
 
 import java.io.File;
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationListGrid.java	Thu May 08 13:52:20 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationListGrid.java	Thu May 08 13:52:47 2014 +0200
@@ -34,6 +34,7 @@
     public MeasurementStationListGrid(FLYS flys) {
         super(flys);
         ListGridField nfield = new ListGridField("name", "Messtelle");
+        ListGridField mfield = new ListGridField("measurementtype", "Messstellenart");
         ListGridField sfield = new ListGridField("kmstart", "Start [km]", 60);
         ListGridField efield = new ListGridField("kmend", "Ende [km]", 60);
         ListGridField stfield = new ListGridField("station", "Station [km]");
@@ -43,7 +44,7 @@
 
         this.setShowRecordComponents(true);
         this.setShowRecordComponentsByCell(true);
-        this.setFields(nfield, sfield, efield, stfield, lfield, cfield);
+        this.setFields(nfield, mfield, sfield, efield, stfield, lfield, cfield);
     }
 
     /**
http://dive4elements.wald.intevation.org